From 67a6bc3d19afffffe75b1e6ffa1f0e1b89dea39f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 12 Dec 2022 21:34:43 +0100 Subject: [PATCH 0001/5754] package/libbluray: bump version to 1.3.4 Changelog: https://code.videolan.org/videolan/libbluray/-/blob/1.3.4/ChangeLog Added a configure option to build without external libudfread introduced in version 1.3.4: https://code.videolan.org/videolan/libbluray/-/commit/2f10fb73b869337f2a2fb6fc8c8b45ef88383b78 Using --with-external-libudfread is broken so this option was not added. Since the default to build with optional libudfread support was kept upstream there is no change in behaviour. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/libbluray/libbluray.hash | 4 ++-- package/libbluray/libbluray.mk | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/libbluray/libbluray.hash b/package/libbluray/libbluray.hash index 6e62bb49a1..a631722bb0 100644 --- a/package/libbluray/libbluray.hash +++ b/package/libbluray/libbluray.hash @@ -1,4 +1,4 @@ -# From http://download.videolan.org/pub/videolan/libbluray/1.3.1/libbluray-1.3.1.tar.bz2.sha512 -sha512 f39fc8a11771e8fdd5eeebf0ab23535ffab44721f64b350e5d153eee44555b31c618b6d765da114254dc83ff0ff89e84c6b185f61cdbcfedd2d47a5f6e26b75a libbluray-1.3.1.tar.bz2 +# From http://download.videolan.org/pub/videolan/libbluray/1.3.4/libbluray-1.3.4.tar.bz2.sha512 +sha512 94dbf3b68d1c23fe4648c153cc2f0c251886fac0a6b6bbe3a77caabaa5322682f712afe4a7b6b16ca3f06744fbc0e1ca872209a32898dcf0ae182055d335aec1 libbluray-1.3.4.tar.bz2 # Locally computed sha256 b3aa400aca6d2ba1f0bd03bd98d03d1fe7489a3bbb26969d72016360af8a5c9d COPYING diff --git a/package/libbluray/libbluray.mk b/package/libbluray/libbluray.mk index a9eb3c67c6..54f4caa368 100644 --- a/package/libbluray/libbluray.mk +++ b/package/libbluray/libbluray.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBBLURAY_VERSION = 1.3.1 +LIBBLURAY_VERSION = 1.3.4 LIBBLURAY_SITE = http://download.videolan.org/pub/videolan/libbluray/$(LIBBLURAY_VERSION) LIBBLURAY_SOURCE = libbluray-$(LIBBLURAY_VERSION).tar.bz2 LIBBLURAY_INSTALL_STAGING = YES @@ -21,6 +21,8 @@ endif ifeq ($(BR2_PACKAGE_LIBUDFREAD),y) LIBBLURAY_DEPENDENCIES += libudfread +else +LIBBLURAY_CONF_OPTS += --without-external-libudfread endif ifeq ($(BR2_PACKAGE_FREETYPE),y) From c31087182fa545784d9a0a01f0b32715d78c3955 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 12 Dec 2022 21:56:10 +0100 Subject: [PATCH 0002/5754] package/libdeflate: bump version to 1.15 Release notes: https://github.com/ebiggers/libdeflate/blob/master/NEWS.md Switch to cmake. Added CFLAGS to fix uClibc build: /home/bernd/buildroot/output/build/libdeflate-1.15/programs/gzip.c:367:10: error: 'const struct stat' has no member named 'st_atim'; did you mean 'st_atime'? /home/bernd/buildroot/output/build/libdeflate-1.15/programs/gzip.c:367:26: error: 'const struct stat' has no member named 'st_mtim'; did you mean 'st_mtime'? Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/libdeflate/libdeflate.hash | 2 +- package/libdeflate/libdeflate.mk | 27 ++++----------------------- 2 files changed, 5 insertions(+), 24 deletions(-) diff --git a/package/libdeflate/libdeflate.hash b/package/libdeflate/libdeflate.hash index 7dae12921f..79de3439d7 100644 --- a/package/libdeflate/libdeflate.hash +++ b/package/libdeflate/libdeflate.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ba89fb167a5ab6bbdfa6ee3b1a71636e8140fa8471cce8a311697584948e4d06 libdeflate-1.12.tar.gz +sha256 58b95040df7383dc0413defb700d9893c194732474283cc4c8f144b00a68154b libdeflate-1.15.tar.gz sha256 5d246dd2537307b80fed9ba5fdddf5d0fe7a8f023393a071182b9daed56b40fe COPYING diff --git a/package/libdeflate/libdeflate.mk b/package/libdeflate/libdeflate.mk index 93ec5909a5..2305af4dc9 100644 --- a/package/libdeflate/libdeflate.mk +++ b/package/libdeflate/libdeflate.mk @@ -4,31 +4,12 @@ # ################################################################################ -LIBDEFLATE_VERSION = 1.12 +LIBDEFLATE_VERSION = 1.15 LIBDEFLATE_SITE = $(call github,ebiggers,libdeflate,v$(LIBDEFLATE_VERSION)) LIBDEFLATE_LICENSE = MIT LIBDEFLATE_LICENSE_FILES = COPYING LIBDEFLATE_INSTALL_STAGING = YES +LIBDEFLATE_CONF_OPTS = \ + -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -D_DEFAULT_SOURCE" -ifeq ($(BR2_STATIC_LIBS),y) -LIBDEFLATE_MAKE_OPTS += DISABLE_SHARED=yes -endif - -define LIBDEFLATE_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) \ - $(LIBDEFLATE_MAKE_OPTS) -endef - -define LIBDEFLATE_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) \ - $(LIBDEFLATE_MAKE_OPTS) \ - DESTDIR="$(STAGING_DIR)" PREFIX=/usr install -endef - -define LIBDEFLATE_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) \ - $(LIBDEFLATE_MAKE_OPTS) \ - DESTDIR="$(TARGET_DIR)" PREFIX=/usr install -endef - -$(eval $(generic-package)) +$(eval $(cmake-package)) From 148ae3338c70881cc2caebdd9b45cc6212362a2b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 12 Dec 2022 22:01:26 +0100 Subject: [PATCH 0003/5754] package/php: bump version to 8.1.13 Release notes: https://news-web.php.net/php.announce/341 Changelog: https://www.php.net/ChangeLog-8.php#8.1.13 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 bf81ebf3e8..461dc36031 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 08243359e2204d842082269eedc15f08d2eca726d0e65b93fb11f4bfc51bbbab php-8.1.12.tar.xz +sha256 b15ef0ccdd6760825604b3c4e3e73558dcf87c75ef1d68ef4289d8fd261ac856 php-8.1.13.tar.xz # License file sha256 a188db807d711536f71e27b7d36879d63480f7994dc18adc08e624b3c5430fff LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index a400a38af7..1fdf5c68a2 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.1.12 +PHP_VERSION = 8.1.13 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From a182f3a7edcaf771d350604abc132e157b47f7ee Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 12 Dec 2022 22:04:43 +0100 Subject: [PATCH 0004/5754] package/sqlite: bump version to 3.40.0 Release notes: https://sqlite.org/releaselog/3_40_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 936f42e8e9..ea4e30a463 100644 --- a/package/sqlite/sqlite.hash +++ b/package/sqlite/sqlite.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 f31d445b48e67e284cf206717cc170ab63cbe4fd7f79a82793b772285e78fdbb sqlite-autoconf-3390400.tar.gz +sha256 0333552076d2700c75352256e91c78bf5cd62491589ba0c69aed0a81868980e7 sqlite-autoconf-3400000.tar.gz sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 tea/license.terms diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index 4f4164c374..9d0b60ab59 100644 --- a/package/sqlite/sqlite.mk +++ b/package/sqlite/sqlite.mk @@ -4,8 +4,8 @@ # ################################################################################ -SQLITE_VERSION = 3.39.4 -SQLITE_TAR_VERSION = 3390400 +SQLITE_VERSION = 3.40.0 +SQLITE_TAR_VERSION = 3400000 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_TAR_VERSION).tar.gz SQLITE_SITE = https://www.sqlite.org/2022 SQLITE_LICENSE = Public domain From 8b8c1f832b88b10efac754bb3e011a2e929bb5a2 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 12 Dec 2022 22:08:37 +0100 Subject: [PATCH 0005/5754] package/tor: bump version to 0.4.7.12 Changelog: https://gitlab.torproject.org/tpo/core/tor/-/blob/main/ChangeLog?expanded=true&viewer=simple 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 dba08f51b5..2a2953dc29 100644 --- a/package/tor/tor.hash +++ b/package/tor/tor.hash @@ -1,4 +1,4 @@ -# From https://dist.torproject.org/tor-0.4.7.10.tar.gz.sha256sum -sha256 647e56dfa59ea36dab052027fcfc7663905c826c03509363c456900ecd435a5b tor-0.4.7.10.tar.gz +# From https://dist.torproject.org/tor-0.4.7.12.tar.gz.sha256sum +sha256 3b5d969712c467851bd028f314343ef15a97ea457191e93ffa97310b05b9e395 tor-0.4.7.12.tar.gz # Locally computed sha256 47b54ed17e8fdcab3c44729a1789a09b208f9a63a845a7e50def9df729eebad0 LICENSE diff --git a/package/tor/tor.mk b/package/tor/tor.mk index ed3714f2db..6812005618 100644 --- a/package/tor/tor.mk +++ b/package/tor/tor.mk @@ -4,7 +4,7 @@ # ################################################################################ -TOR_VERSION = 0.4.7.10 +TOR_VERSION = 0.4.7.12 TOR_SITE = https://dist.torproject.org TOR_LICENSE = BSD-3-Clause TOR_LICENSE_FILES = LICENSE From 3e250593ceabbdbc19365e56c679948f80ed6b9c Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 12 Dec 2022 22:22:49 +0100 Subject: [PATCH 0006/5754] package/x11r7/xdriver_xf86-input-libinput: bump version to 1.2.1 Release notes: https://lists.x.org/archives/xorg-announce/2022-January/003129.html Switched tarball to xz, updated _SITE. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- .../xdriver_xf86-input-libinput.hash | 7 +++---- .../xdriver_xf86-input-libinput.mk | 6 +++--- 2 files changed, 6 insertions(+), 7 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 a2f295d6b5..480886b295 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,6 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2021-September/003110.html -sha256 f80da3c514fe1cbf57fa1b1bd6ff97f6b0a1f87466ad89247bac59cd0a5869f6 xf86-input-libinput-1.2.0.tar.bz2 -sha512 ebff9490d33fd7495df2e03203060a76b3274f0e638bc92f3d95257fac57cdb9dac308e90e54006fe9522b6de3b1f1c38fd5f0b0b75b7051e5422290f43de52d xf86-input-libinput-1.2.0.tar.bz2 - +# 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 # 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 21d962aa52..d1f93ffb5b 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,9 +4,9 @@ # ################################################################################ -XDRIVER_XF86_INPUT_LIBINPUT_VERSION = 1.2.0 -XDRIVER_XF86_INPUT_LIBINPUT_SOURCE = xf86-input-libinput-$(XDRIVER_XF86_INPUT_LIBINPUT_VERSION).tar.bz2 -XDRIVER_XF86_INPUT_LIBINPUT_SITE = https://xorg.freedesktop.org/releases/individual/driver +XDRIVER_XF86_INPUT_LIBINPUT_VERSION = 1.2.1 +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 XDRIVER_XF86_INPUT_LIBINPUT_LICENSE_FILES = COPYING XDRIVER_XF86_INPUT_LIBINPUT_DEPENDENCIES = libinput xserver_xorg-server xorgproto From acf4a7d1c72c468e269058ba52df40c9734c8801 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 12 Dec 2022 23:05:02 +0100 Subject: [PATCH 0007/5754] package/libglfw: bump version to 3.3.8 Changelog: https://www.glfw.org/changelog.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/libglfw/libglfw.hash | 2 +- package/libglfw/libglfw.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libglfw/libglfw.hash b/package/libglfw/libglfw.hash index 5bffc55d26..9d38946f3c 100644 --- a/package/libglfw/libglfw.hash +++ b/package/libglfw/libglfw.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ed07b90e334dcd39903e6288d90fa1ae0cf2d2119fec516cf743a0a404527c02 libglfw-3.3.6.tar.gz +sha256 f30f42e05f11e5fc62483e513b0488d5bceeab7d9c5da0ffe2252ad81816c713 libglfw-3.3.8.tar.gz sha256 149704059b5d0bf551637e50042dd4de9c2cae921021f6636298911e3a5f9462 LICENSE.md diff --git a/package/libglfw/libglfw.mk b/package/libglfw/libglfw.mk index 0a3986f662..eee8e7b298 100644 --- a/package/libglfw/libglfw.mk +++ b/package/libglfw/libglfw.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGLFW_VERSION = 3.3.6 +LIBGLFW_VERSION = 3.3.8 LIBGLFW_SITE = $(call github,glfw,glfw,$(LIBGLFW_VERSION)) LIBGLFW_INSTALL_STAGING = YES LIBGLFW_LICENSE = Zlib From 32c0225b7240c24002038779ad2035a5c16c6299 Mon Sep 17 00:00:00 2001 From: Quentin Schulz Date: Tue, 13 Dec 2022 15:17:19 +0100 Subject: [PATCH 0008/5754] package/libxkbcommon: add LIBXKBCOMMON_CPE_ID_VENDOR cpe:2.3:a:xkbcommon:libxkbcommon is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Axkbcommon%3Alibxkbcommon Cc: Quentin Schulz Signed-off-by: Quentin Schulz Signed-off-by: Peter Korsgaard --- package/libxkbcommon/libxkbcommon.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libxkbcommon/libxkbcommon.mk b/package/libxkbcommon/libxkbcommon.mk index f2c49cc700..236bf4c5d9 100644 --- a/package/libxkbcommon/libxkbcommon.mk +++ b/package/libxkbcommon/libxkbcommon.mk @@ -9,6 +9,7 @@ LIBXKBCOMMON_SITE = https://xkbcommon.org/download LIBXKBCOMMON_SOURCE = libxkbcommon-$(LIBXKBCOMMON_VERSION).tar.xz LIBXKBCOMMON_LICENSE = MIT/X11 LIBXKBCOMMON_LICENSE_FILES = LICENSE +LIBXKBCOMMON_CPE_ID_VENDOR = xkbcommon LIBXKBCOMMON_INSTALL_STAGING = YES LIBXKBCOMMON_DEPENDENCIES = host-bison host-flex LIBXKBCOMMON_CONF_OPTS = \ From adc8355150e876b3301b35405d411fd1ea98dff0 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 12 Dec 2022 08:17:44 +0100 Subject: [PATCH 0009/5754] nezha_defconfig: bump u-boot to current top of d1-wip This is now based on U-Boot 2022.10 and has gained SPL support, so use that instead of sun20-d1-spl. With this we can also drop the u-boot patch and patch directory. Signed-off-by: Peter Korsgaard --- board/nezha/genimage.cfg | 26 ++------- ...pport-building-u-boot.toc1-for-nezda.patch | 54 ------------------- configs/nezha_defconfig | 7 +-- 3 files changed, 6 insertions(+), 81 deletions(-) delete mode 100644 board/nezha/patches/uboot/0001-Makefile-HACK-Support-building-u-boot.toc1-for-nezda.patch diff --git a/board/nezha/genimage.cfg b/board/nezha/genimage.cfg index 783391fb99..836666ff8e 100644 --- a/board/nezha/genimage.cfg +++ b/board/nezha/genimage.cfg @@ -4,34 +4,16 @@ image sdcard.img { hdimage { } - partition boot0-1 { - in-partition-table = "no" - image = "boot0_sdcard_sun20iw1p1.bin" + partition u-boot { + in-partition-table = false + image = "u-boot-sunxi-with-spl.bin" offset = 8K } - partition boot0-2 { - in-partition-table = "no" - image = "boot0_sdcard_sun20iw1p1.bin" - offset = 128K - } - - partition u-boot-1 { - in-partition-table = "no" - image = "u-boot.toc1" - offset = 12M - } - - partition u-boot-2 { - in-partition-table = "no" - image = "u-boot.toc1" - offset = 16400K - } - partition rootfs { partition-type = 0x83 image = "rootfs.ext4" bootable = "true" - offset = 18M + offset = 1M } } diff --git a/board/nezha/patches/uboot/0001-Makefile-HACK-Support-building-u-boot.toc1-for-nezda.patch b/board/nezha/patches/uboot/0001-Makefile-HACK-Support-building-u-boot.toc1-for-nezda.patch deleted file mode 100644 index 6e89a921df..0000000000 --- a/board/nezha/patches/uboot/0001-Makefile-HACK-Support-building-u-boot.toc1-for-nezda.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 4a923e0e4ef6d2b41cb89d658e269adada847573 Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -Date: Thu, 4 Nov 2021 22:32:04 +0100 -Subject: [PATCH] Makefile: HACK: Support building u-boot.toc1 for nezda board - -For easier integration into Buildroot. The boot0 / toc1 logic is WIP until -U-Boot gains SPL support for the D1, so add a hack to make it easier to -integrate in Buildroot as-is. - -Signed-off-by: Peter Korsgaard ---- - Makefile | 9 +++++++++ - nezha.cfg | 9 +++++++++ - 2 files changed, 18 insertions(+) - create mode 100644 nezha.cfg - -diff --git a/Makefile b/Makefile -index f911f70344..259d93bf80 100644 ---- a/Makefile -+++ b/Makefile -@@ -1084,6 +1084,15 @@ endif - .binman_stamp: FORCE - @touch $@ - -+fw_dynamic.bin: $(OPENSBI) -+ $(call if_changed,copy) -+ -+MKIMAGEFLAGS_u-boot.toc1 = -T sunxi_toc1 -+u-boot.toc1: nezha.cfg fw_dynamic.bin inputs -+ $(call if_changed,mkimage) -+ -+all: u-boot.toc1 -+ - ifeq ($(CONFIG_DEPRECATED),y) - $(warning "You have deprecated configuration options enabled in your .config! Please check your configuration.") - endif -diff --git a/nezha.cfg b/nezha.cfg -new file mode 100644 -index 0000000000..2d23b9b388 ---- /dev/null -+++ b/nezha.cfg -@@ -0,0 +1,9 @@ -+[opensbi] -+file = fw_dynamic.bin -+addr = 0x40000000 -+[dtb] -+file = arch/riscv/dts/sun20i-d1-nezha.dtb -+addr = 0x44000000 -+[u-boot] -+file = u-boot-nodtb.bin -+addr = 0x4a000000 --- -2.20.1 - diff --git a/configs/nezha_defconfig b/configs/nezha_defconfig index 5d0948a013..02f351d483 100644 --- a/configs/nezha_defconfig +++ b/configs/nezha_defconfig @@ -1,5 +1,4 @@ BR2_riscv=y -BR2_GLOBAL_PATCH_DIR="board/nezha/patches" BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_19=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_OVERLAY="board/nezha/overlay" @@ -20,18 +19,16 @@ BR2_TARGET_OPENSBI_CUSTOM_TARBALL=y BR2_TARGET_OPENSBI_CUSTOM_TARBALL_LOCATION="$(call github,smaeul,opensbi,e6793dc36a71537023f078034fe795c64a9992a3)/opensbi-e6793dc36a71537023f078034fe795c64a9992a3.tar.gz" BR2_TARGET_OPENSBI_PLAT="generic" # BR2_TARGET_OPENSBI_INSTALL_JUMP_IMG is not set -BR2_TARGET_SUN20I_D1_SPL=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,smaeul,u-boot,d1-2022-05-26)/uboot-d1-2022-05-26.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,smaeul,u-boot,528ae9bc6c55edd3ffe642734b4132a8246ea777)/uboot-528ae9bc6c55edd3ffe642734b4132a8246ea777.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nezha" 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_NEEDS_OPENSBI=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.toc1" +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" BR2_PACKAGE_HOST_GENIMAGE=y From 300610e11e76bbd75469243f88ae243f03523ea3 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 12 Dec 2022 08:17:45 +0100 Subject: [PATCH 0010/5754] nezha_defconfig: use upstream OpenSBI 1.1 release The D1 support is now upstream, so we can use the upstream 1.1 release instead of a custom version. Signed-off-by: Peter Korsgaard --- configs/nezha_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/nezha_defconfig b/configs/nezha_defconfig index 02f351d483..f845d918d9 100644 --- a/configs/nezha_defconfig +++ b/configs/nezha_defconfig @@ -15,8 +15,8 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_OPENSBI=y -BR2_TARGET_OPENSBI_CUSTOM_TARBALL=y -BR2_TARGET_OPENSBI_CUSTOM_TARBALL_LOCATION="$(call github,smaeul,opensbi,e6793dc36a71537023f078034fe795c64a9992a3)/opensbi-e6793dc36a71537023f078034fe795c64a9992a3.tar.gz" +BR2_TARGET_OPENSBI_CUSTOM_VERSION=y +BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.1" BR2_TARGET_OPENSBI_PLAT="generic" # BR2_TARGET_OPENSBI_INSTALL_JUMP_IMG is not set BR2_TARGET_UBOOT=y From 8e8d312418e7eb4b0b2c14fdb17560d185f0ea9b Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 12 Dec 2022 08:17:46 +0100 Subject: [PATCH 0011/5754] nezha_defconfig: bump Linux to current top of d1/wip This is now based on Linux 6.1-rc3. We don't have an option for 6.1 yes, so mark it as 6.0 headers. Signed-off-by: Peter Korsgaard --- configs/nezha_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/nezha_defconfig b/configs/nezha_defconfig index f845d918d9..2936746c49 100644 --- a/configs/nezha_defconfig +++ b/configs/nezha_defconfig @@ -1,12 +1,12 @@ BR2_riscv=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_19=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_0=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_OVERLAY="board/nezha/overlay" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/nezha/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,smaeul,linux,fe178cf0153d98b71cb01a46c8cc050826a17e77)/linux-fe178cf0153d98b71cb01a46c8cc050826a17e77.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,smaeul,linux,ca67838d84af4c9f85d06311c9e98e1adf46308f)/linux-ca67838d84af4c9f85d06311c9e98e1adf46308f.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="nezha" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun20i-d1-nezha" From 0a3a7169d66b610c968128688b6475ffc333cc96 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 12 Dec 2022 08:17:47 +0100 Subject: [PATCH 0012/5754] boot/sun20i-d1-spl: drop package U-Boot has now gained SPL support for D1, so this temporary bootloader is no longer supported. Signed-off-by: Peter Korsgaard --- Config.in.legacy | 7 +++++++ DEVELOPERS | 1 - boot/Config.in | 1 - boot/sun20i-d1-spl/Config.in | 8 -------- boot/sun20i-d1-spl/sun20i-d1-spl.hash | 2 -- boot/sun20i-d1-spl/sun20i-d1-spl.mk | 23 ----------------------- 6 files changed, 7 insertions(+), 35 deletions(-) delete mode 100644 boot/sun20i-d1-spl/Config.in delete mode 100644 boot/sun20i-d1-spl/sun20i-d1-spl.hash delete mode 100644 boot/sun20i-d1-spl/sun20i-d1-spl.mk diff --git a/Config.in.legacy b/Config.in.legacy index 28c6822689..852189f0ff 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2023.02" +config BR2_TARGET_SUN20I_D1_SPL + bool "sun20-d1-spl removed" + select BR2_LEGACY + help + U-Boot has gained SPL support for D1, so this temporary + bootloader is no longer supported. + config BR2_PACKAGE_PYTHON_M2R bool "python-m2r removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index f0dcc42de7..831e60982e 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2305,7 +2305,6 @@ F: board/pandaboard/ F: board/roseapplepi/ F: board/visionfive/ F: boot/shim/ -F: boot/sun20i-d1-spl/ F: configs/avenger96_defconfig F: configs/beagleboneai_defconfig F: configs/lafrite_defconfig diff --git a/boot/Config.in b/boot/Config.in index ce17b2df6b..2d4d077632 100644 --- a/boot/Config.in +++ b/boot/Config.in @@ -20,7 +20,6 @@ source "boot/optee-os/Config.in" source "boot/opensbi/Config.in" source "boot/s500-bootloader/Config.in" source "boot/shim/Config.in" -source "boot/sun20i-d1-spl/Config.in" source "boot/syslinux/Config.in" source "boot/ti-k3-r5-loader/Config.in" source "boot/uboot/Config.in" diff --git a/boot/sun20i-d1-spl/Config.in b/boot/sun20i-d1-spl/Config.in deleted file mode 100644 index 9d94d87b1c..0000000000 --- a/boot/sun20i-d1-spl/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_TARGET_SUN20I_D1_SPL - bool "sun20-d1-spl" - depends on BR2_RISCV_64 - help - Allwinner D1 boot0 code with modifications to use as U-Boot - SPL. - - https://github.com/smaeul/sun20i_d1_spl diff --git a/boot/sun20i-d1-spl/sun20i-d1-spl.hash b/boot/sun20i-d1-spl/sun20i-d1-spl.hash deleted file mode 100644 index 11d17a9a16..0000000000 --- a/boot/sun20i-d1-spl/sun20i-d1-spl.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 08e2d0574e58c99734cd1d9ea89b86464242bf2db4f6769b23803bf9dcdac3c4 sun20i-d1-spl-882671fcf53137aaafc3a94fa32e682cb7b921f1.tar.gz diff --git a/boot/sun20i-d1-spl/sun20i-d1-spl.mk b/boot/sun20i-d1-spl/sun20i-d1-spl.mk deleted file mode 100644 index 6bcea0fa96..0000000000 --- a/boot/sun20i-d1-spl/sun20i-d1-spl.mk +++ /dev/null @@ -1,23 +0,0 @@ -################################################################################ -# -# sun20i-d1-spl -# -################################################################################ - -# Commit on the 'mainline' branch -SUN20I_D1_SPL_VERSION = 882671fcf53137aaafc3a94fa32e682cb7b921f1 -SUN20I_D1_SPL_SITE = $(call github,smaeul,sun20i_d1_spl,$(SUN20I_D1_SPL_VERSION)) -SUN20I_D1_SPL_INSTALL_TARGET = NO -SUN20I_D1_SPL_INSTALL_IMAGES = YES -SUN20I_D1_SPL_LICENSE = GPL-2.0+ - -define SUN20I_D1_SPL_BUILD_CMDS - $(MAKE) -C $(@D) CROSS_COMPILE="$(TARGET_CROSS)" p=sun20iw1p1 mmc -endef - -define SUN20I_D1_SPL_INSTALL_IMAGES_CMDS - $(INSTALL) -D -m 0644 $(@D)/nboot/boot0_sdcard_sun20iw1p1.bin \ - $(BINARIES_DIR)/boot0_sdcard_sun20iw1p1.bin -endef - -$(eval $(generic-package)) From b8881d4d7e4822337c222fadf4630a49eec1e9ce Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 14 Dec 2022 19:22:10 +0100 Subject: [PATCH 0013/5754] package/x11r7/xserver_xorg-server: security bump version to 21.1.5 Release notes: https://lists.x.org/archives/xorg-announce/2022-December/003303.html Security advisory: https://lists.x.org/archives/xorg-announce/2022-December/003302.html Fixes CVE-2022-46340, CVE-2022-46341, CVE-2022-46342, CVE-2022-46343, CVE-2022-46344 and CVE-2022-4283. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xserver_xorg-server/xserver_xorg-server.hash | 7 +++---- package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash index 4b2090fa99..654552c8b6 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash @@ -1,6 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2022-July/003193.html -sha256 5cc4be8ee47edb58d4a90e603a59d56b40291ad38371b0bd2471fc3cbee1c587 xorg-server-21.1.4.tar.xz -sha512 eb5b8520d02908f72719e6ecfbf7a9bf139acb65ccae04d1db4223a8a2384cd3a94bd5afef10cce327b751b800cc2b79bfaa5ae35c95c3a217f775168082e68f xorg-server-21.1.4.tar.xz - +# From https://lists.x.org/archives/xorg-announce/2022-December/003303.html +sha256 05b0c8301cee7c5a78083df421ba3a071891553541a417b3d85adf5cf20f8720 xorg-server-21.1.5.tar.xz +sha512 a39c6ba36f94241d330b679a9a6fe2c5fda73fc3f5a9308a7a9cfd0d58503e407291759c9e553455c07cf5a3862952ae3904334eeca29c97ff5af7cffd2e6953 xorg-server-21.1.5.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 8dba9f1ed0..16b7438ee6 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.4 +XSERVER_XORG_SERVER_VERSION = 21.1.5 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 ee8d02ea6d76493324180e0131fea6c227d1d284 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 14 Dec 2022 19:50:18 +0100 Subject: [PATCH 0014/5754] package/iproute2: bump to version 6.1.0 Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/iproute2/iproute2.hash | 2 +- package/iproute2/iproute2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/iproute2/iproute2.hash b/package/iproute2/iproute2.hash index 45af05a200..9e8be43f2b 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 523139e9e72aec996374fa2de74be4c53d2dd05589488934d21ff97bae19580a iproute2-6.0.0.tar.xz +sha256 5ce12a0fec6b212725ef218735941b2dab76244db7e72646a76021b0537b43ab iproute2-6.1.0.tar.xz sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk index 287c6b14e2..9792630f15 100644 --- a/package/iproute2/iproute2.mk +++ b/package/iproute2/iproute2.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPROUTE2_VERSION = 6.0.0 +IPROUTE2_VERSION = 6.1.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 e38d5190ea16a7fda9f3045ba9ba316e4da53f5c Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Wed, 14 Dec 2022 07:29:56 -0700 Subject: [PATCH 0015/5754] package/python-lxml: bump to version 4.9.2 Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-lxml/python-lxml.hash | 2 +- package/python-lxml/python-lxml.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-lxml/python-lxml.hash b/package/python-lxml/python-lxml.hash index cd1943b0b4..72df6d0278 100644 --- a/package/python-lxml/python-lxml.hash +++ b/package/python-lxml/python-lxml.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 fe749b052bb7233fe5d072fcb549221a8cb1a16725c47c37e42b0b9cb3ff2c3f lxml-4.9.1.tar.gz +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 050495c3f3..657622a962 100644 --- a/package/python-lxml/python-lxml.mk +++ b/package/python-lxml/python-lxml.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_LXML_VERSION = 4.9.1 -PYTHON_LXML_SITE = https://files.pythonhosted.org/packages/70/bb/7a2c7b4f8f434aa1ee801704bf08f1e53d7b5feba3d5313ab17003477808 +PYTHON_LXML_VERSION = 4.9.2 +PYTHON_LXML_SITE = https://files.pythonhosted.org/packages/06/5a/e11cad7b79f2cf3dd2ff8f81fa8ca667e7591d3d8451768589996b65dec1 PYTHON_LXML_SOURCE = lxml-$(PYTHON_LXML_VERSION).tar.gz # Not including the GPL, because it is used only for the test scripts. From b38286d7e5919693cad2dc5b19024b1c03d29c18 Mon Sep 17 00:00:00 2001 From: Quentin Schulz Date: Wed, 14 Dec 2022 12:16:01 +0100 Subject: [PATCH 0016/5754] package/cairo: fix CVE-2019-6462 Add an upstream patch to fix CVE-2019-6462: An issue was discovered in cairo 1.16.0. There is an infinite loop in the function _arc_error_normalized in the file cairo-arc.c, related to _arc_max_angle_for_tolerance_normalized. Cc: Quentin Schulz Signed-off-by: Quentin Schulz Signed-off-by: Peter Korsgaard --- ...or_tolerance_normalized-fix-infinite.patch | 39 +++++++++++++++++++ package/cairo/cairo.mk | 2 + 2 files changed, 41 insertions(+) create mode 100644 package/cairo/0003-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch diff --git a/package/cairo/0003-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch b/package/cairo/0003-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch new file mode 100644 index 0000000000..078e90fa42 --- /dev/null +++ b/package/cairo/0003-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch @@ -0,0 +1,39 @@ +From ab2c5ee21e5f3d3ee4b3f67cfcd5811a4f99c3a0 Mon Sep 17 00:00:00 2001 +From: Heiko Lewin +Date: Sun, 1 Aug 2021 11:16:03 +0000 +Subject: [PATCH] _arc_max_angle_for_tolerance_normalized: fix infinite loop + +[Retrieved from: +https://gitlab.freedesktop.org/cairo/cairo/-/commit/ab2c5ee21e5f3d3ee4b3f67cfcd5811a4f99c3a0] +Signed-off-by: Quentin Schulz +--- + src/cairo-arc.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/cairo-arc.c b/src/cairo-arc.c +index 390397bae..1c891d1a0 100644 +--- a/src/cairo-arc.c ++++ b/src/cairo-arc.c +@@ -90,16 +90,18 @@ _arc_max_angle_for_tolerance_normalized (double tolerance) + { M_PI / 11.0, 9.81410988043554039085e-09 }, + }; + int table_size = ARRAY_LENGTH (table); ++ const int max_segments = 1000; /* this value is chosen arbitrarily. this gives an error of about 1.74909e-20 */ + + for (i = 0; i < table_size; i++) + if (table[i].error < tolerance) + return table[i].angle; + + ++i; ++ + do { + angle = M_PI / i++; + error = _arc_error_normalized (angle); +- } while (error > tolerance); ++ } while (error > tolerance && i < max_segments); + + return angle; + } +-- +2.38.1 + diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk index f479aa252a..8bb7ca121d 100644 --- a/package/cairo/cairo.mk +++ b/package/cairo/cairo.mk @@ -14,6 +14,8 @@ CAIRO_INSTALL_STAGING = YES # 0002-ft-Use-FT_Done_MM_Var-instead-of-free-when-available-in-cairo_ft_apply_variation.patch CAIRO_IGNORE_CVES += CVE-2018-19876 +# 0003-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch +CAIRO_IGNORE_CVES += CVE-2019-6462 CAIRO_CONF_ENV = LIBS="$(CAIRO_LIBS)" From 111ab56d840a6c82367b4a3306494faccd7f934b Mon Sep 17 00:00:00 2001 From: Quentin Schulz Date: Wed, 14 Dec 2022 12:16:02 +0100 Subject: [PATCH 0017/5754] package/cairo: fix CVE-2020-35492 Add an upstream patch to fix CVE-2020-35492: A flaw was found in cairo's image-compositor.c in all versions prior to 1.17.4. This flaw allows an attacker who can provide a crafted input file to cairo's image-compositor (for example, by convincing a user to open a file in an application using cairo, or if an application uses cairo on untrusted input) to cause a stack buffer overflow -> out-of-bounds WRITE. The highest impact from this vulnerability is to confidentiality, integrity, as well as system availability. Important note: this is not the exact upstream patch. Indeed, the upstream patch[1] contains a png file which appears as a binary diff inside the patch. The `patch` tool which is used by Buildroot to apply patches does not handle that kind of diff. Since it is just a test, it shouldn't impact the quality of the CVE fix and all changes related to the test are removed from the patch. [1] https://gitlab.freedesktop.org/cairo/cairo/-/commit/03a820b173ed1fdef6ff14b4468f5dbc02ff59be Cc: Quentin Schulz Signed-off-by: Quentin Schulz Signed-off-by: Peter Korsgaard --- ...4-Fix-mask-usage-in-image-compositor.patch | 56 +++++++++++++++++++ package/cairo/cairo.mk | 2 + 2 files changed, 58 insertions(+) create mode 100644 package/cairo/0004-Fix-mask-usage-in-image-compositor.patch diff --git a/package/cairo/0004-Fix-mask-usage-in-image-compositor.patch b/package/cairo/0004-Fix-mask-usage-in-image-compositor.patch new file mode 100644 index 0000000000..54a95593c5 --- /dev/null +++ b/package/cairo/0004-Fix-mask-usage-in-image-compositor.patch @@ -0,0 +1,56 @@ +From 03a820b173ed1fdef6ff14b4468f5dbc02ff59be Mon Sep 17 00:00:00 2001 +From: Heiko Lewin +Date: Tue, 15 Dec 2020 16:48:19 +0100 +Subject: [PATCH] Fix mask usage in image-compositor + +[Retrieved from +https://gitlab.freedesktop.org/cairo/cairo/-/commit/03a820b173ed1fdef6ff14b4468f5dbc02ff59be] +[Removed changes in test/ directory to remove binary diff so that the +patch can be applied by `patch` tool] +Signed-off-by: Quentin Schulz +--- + src/cairo-image-compositor.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/cairo-image-compositor.c b/src/cairo-image-compositor.c +index bbf4cf228..2352c478e 100644 +--- a/src/cairo-image-compositor.c ++++ b/src/cairo-image-compositor.c +@@ -2601,14 +2601,14 @@ _inplace_src_spans (void *abstract_renderer, int y, int h, + unsigned num_spans) + { + cairo_image_span_renderer_t *r = abstract_renderer; +- uint8_t *m; ++ uint8_t *m, *base = (uint8_t*)pixman_image_get_data(r->mask); + int x0; + + if (num_spans == 0) + return CAIRO_STATUS_SUCCESS; + + x0 = spans[0].x; +- m = r->_buf; ++ m = base; + do { + int len = spans[1].x - spans[0].x; + if (len >= r->u.composite.run_length && spans[0].coverage == 0xff) { +@@ -2646,7 +2646,7 @@ _inplace_src_spans (void *abstract_renderer, int y, int h, + spans[0].x, y, + spans[1].x - spans[0].x, h); + +- m = r->_buf; ++ m = base; + x0 = spans[1].x; + } else if (spans[0].coverage == 0x0) { + if (spans[0].x != x0) { +@@ -2675,7 +2675,7 @@ _inplace_src_spans (void *abstract_renderer, int y, int h, + #endif + } + +- m = r->_buf; ++ m = base; + x0 = spans[1].x; + } else { + *m++ = spans[0].coverage; +-- +2.38.1 + diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk index 8bb7ca121d..e8a704c7da 100644 --- a/package/cairo/cairo.mk +++ b/package/cairo/cairo.mk @@ -16,6 +16,8 @@ CAIRO_INSTALL_STAGING = YES CAIRO_IGNORE_CVES += CVE-2018-19876 # 0003-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch CAIRO_IGNORE_CVES += CVE-2019-6462 +# 0004-Fix-mask-usage-in-image-compositor.patch +CAIRO_IGNORE_CVES += CVE-2020-35492 CAIRO_CONF_ENV = LIBS="$(CAIRO_LIBS)" From be3a6bf2e7130b084ec4ed65274ff7c4bf67510c Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 14 Dec 2022 19:50:48 +0100 Subject: [PATCH 0018/5754] package/xz: bump to version 5.2.10 Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/xz/xz.hash | 3 ++- package/xz/xz.mk | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/xz/xz.hash b/package/xz/xz.hash index 3aa68791fd..1153e02b4d 100644 --- a/package/xz/xz.hash +++ b/package/xz/xz.hash @@ -1,5 +1,6 @@ # Locally calculated after checking pgp signature -sha256 b65f1d0c2708e57716f4dd2216989a73847ac6fdb4168ffceb155767e22b834b xz-5.2.7.tar.bz2 +# https://tukaani.org/xz/xz-5.2.10.tar.bz2.sig +sha256 01b71df61521d9da698ce3c33148bff06a131628ff037398c09482f3a26e5408 xz-5.2.10.tar.bz2 # Hash for license files sha256 bcb02973ef6e87ea73d331b3a80df7748407f17efdb784b61b47e0e610d3bb5c COPYING diff --git a/package/xz/xz.mk b/package/xz/xz.mk index 004eea94b2..0120d23b85 100644 --- a/package/xz/xz.mk +++ b/package/xz/xz.mk @@ -4,7 +4,7 @@ # ################################################################################ -XZ_VERSION = 5.2.7 +XZ_VERSION = 5.2.10 XZ_SOURCE = xz-$(XZ_VERSION).tar.bz2 XZ_SITE = https://tukaani.org/xz XZ_INSTALL_STAGING = YES From 319d2735f99e95955c2a75c8fc6282ddf7de232a Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 20 Nov 2022 21:42:26 +0100 Subject: [PATCH 0019/5754] fs/ext2: generate Y2K38-resilient filesystems When creating a filesystem, mkfs.ext will chose the inode size depending on the size of the filesystem. Small filesystem get 128-bytes inodes, while bigger filesystems use 256-byte inodes (inode must be a power of 2 larger or equal to 128, and smaller or equal to the blocksize). However, 128-byte inodes can't store timestamps past the dreaded 2038-01-19 03:14:07Z deadline, while inodes larger than or equal to 256 do not have the issue. It turns out that the tipping point to decide whether a filesystem is small or big, is about around the size of the filesystems we generate for our runtime tests. This causes the kernel to emit warning like: ext2 filesystem being remounted at / supports timestamps until 2038 (0x7fffffff) We add a new option to our ext2 filesystem, so that user can specify the size of the inode. That new option defaults to 256 to be resilient to the Y2K38 problem. Note: it was already possible for users to explicitly pass the -I option, through BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS. We could have chosen to extend the existing value with a -I 256, but that is not satisfactory. Indeed, we do want to ensure that the default is now Y2K38-OK, even for existing configurations that did not have explicit setting. We also pass that new option before the user-specified arbitrary ones, so that BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS still wins (in case -I was set there). Signed-off-by: Yann E. MORIN [Peter: tweak help text] Signed-off-by: Peter Korsgaard --- fs/ext2/Config.in | 13 +++++++++++++ fs/ext2/ext2.mk | 1 + 2 files changed, 14 insertions(+) diff --git a/fs/ext2/Config.in b/fs/ext2/Config.in index 705446df57..4451d0797f 100644 --- a/fs/ext2/Config.in +++ b/fs/ext2/Config.in @@ -60,6 +60,19 @@ config BR2_TARGET_ROOTFS_EXT2_INODES int "exact number of inodes (leave at 0 for auto calculation)" default 0 +config BR2_TARGET_ROOTFS_EXT2_INODE_SIZE + int "inode size" + default 256 + help + Set the size of inodes, in bytes, as a power of 2 larger or + equal to 128. + + Set to 0 to let the filesystem generator decide based on the + file system size. If unsure, keep the default, 256. + + Note: 128-byte inodes suffer of the Y2K38 problem, and can't + store timestamps beyond 2038-01-19 03:14:07Z. + config BR2_TARGET_ROOTFS_EXT2_RESBLKS int "reserved blocks percentage" default 5 diff --git a/fs/ext2/ext2.mk b/fs/ext2/ext2.mk index 5b5393f092..e69e79cd2e 100644 --- a/fs/ext2/ext2.mk +++ b/fs/ext2/ext2.mk @@ -22,6 +22,7 @@ ROOTFS_EXT2_OPTS = \ -N $(BR2_TARGET_ROOTFS_EXT2_INODES) \ -m $(BR2_TARGET_ROOTFS_EXT2_RESBLKS) \ -L "$(ROOTFS_EXT2_LABEL)" \ + -I $(BR2_TARGET_ROOTFS_EXT2_INODE_SIZE) \ $(ROOTFS_EXT2_MKFS_OPTS) ROOTFS_EXT2_DEPENDENCIES = host-e2fsprogs From 4d05fa00fd07c3d0cd3f1b6ee676e6dd20c5430f Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Wed, 14 Dec 2022 07:47:52 -0700 Subject: [PATCH 0020/5754] package/wayland-protocols: bump to version 1.31 Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/wayland-protocols/wayland-protocols.hash | 6 +++--- package/wayland-protocols/wayland-protocols.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/wayland-protocols/wayland-protocols.hash b/package/wayland-protocols/wayland-protocols.hash index 8884babbc0..45c62a396b 100644 --- a/package/wayland-protocols/wayland-protocols.hash +++ b/package/wayland-protocols/wayland-protocols.hash @@ -1,4 +1,4 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2022-November/042490.html -sha256 c7659fb6bf14905e68ef605f898de60d1c066bf66dbea92798573dddec1535b6 wayland-protocols-1.28.tar.xz -sha512 092454c6a7e5cc47729de49e9061fb91dfdc5610859e17c495642806ca14dcfb3850a5d3a7459ddb70b2adb08d2590d4b0f92c3a97600e48598682d59adb102f wayland-protocols-1.28.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2022-November/042524.html +sha256 a07fa722ed87676ec020d867714bc9a2f24c464da73912f39706eeef5219e238 wayland-protocols-1.31.tar.xz +sha512 402ce1915300e29afe554d77965ee0a28a5f22fdb5b901c4c640e59b9f3a9c11094e1edae87eea1e76eea557f6faf0c34a0c28ee7f6babb4dc3719329c4e25bf wayland-protocols-1.31.tar.xz sha256 f1a2b233e8a9a71c40f4aa885be08a0842ac85bb8588703c1dd7e6e6502e3124 COPYING diff --git a/package/wayland-protocols/wayland-protocols.mk b/package/wayland-protocols/wayland-protocols.mk index 830136ce06..54f9ed8a3a 100644 --- a/package/wayland-protocols/wayland-protocols.mk +++ b/package/wayland-protocols/wayland-protocols.mk @@ -4,7 +4,7 @@ # ################################################################################ -WAYLAND_PROTOCOLS_VERSION = 1.28 +WAYLAND_PROTOCOLS_VERSION = 1.31 WAYLAND_PROTOCOLS_SITE = https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/$(WAYLAND_PROTOCOLS_VERSION)/downloads WAYLAND_PROTOCOLS_SOURCE = wayland-protocols-$(WAYLAND_PROTOCOLS_VERSION).tar.xz WAYLAND_PROTOCOLS_LICENSE = MIT From 380341b249175382691f268de4b41d3843ff0acc Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 14 Dec 2022 20:47:06 +0100 Subject: [PATCH 0021/5754] package/libarchive: bump to version 3.6.2 remove merged patch Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- ...chive-Handle-a-calloc-returning-NULL.patch | 38 ------------------- package/libarchive/Config.in | 2 +- package/libarchive/libarchive.hash | 2 +- package/libarchive/libarchive.mk | 5 +-- 4 files changed, 3 insertions(+), 44 deletions(-) delete mode 100644 package/libarchive/0001-libarchive-Handle-a-calloc-returning-NULL.patch diff --git a/package/libarchive/0001-libarchive-Handle-a-calloc-returning-NULL.patch b/package/libarchive/0001-libarchive-Handle-a-calloc-returning-NULL.patch deleted file mode 100644 index 75ce6112fe..0000000000 --- a/package/libarchive/0001-libarchive-Handle-a-calloc-returning-NULL.patch +++ /dev/null @@ -1,38 +0,0 @@ -From bff38efe8c110469c5080d387bec62a6ca15b1a5 Mon Sep 17 00:00:00 2001 -From: obiwac -Date: Fri, 22 Jul 2022 22:41:10 +0200 -Subject: [PATCH] libarchive: Handle a `calloc` returning NULL (fixes #1754) - -[Retrieved from: -https://github.com/libarchive/libarchive/commit/bff38efe8c110469c5080d387bec62a6ca15b1a5] -Signed-off-by: Fabrice Fontaine ---- - libarchive/archive_write.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/libarchive/archive_write.c b/libarchive/archive_write.c -index 66592e826..27626b541 100644 ---- a/libarchive/archive_write.c -+++ b/libarchive/archive_write.c -@@ -201,6 +201,10 @@ __archive_write_allocate_filter(struct archive *_a) - struct archive_write_filter *f; - - f = calloc(1, sizeof(*f)); -+ -+ if (f == NULL) -+ return (NULL); -+ - f->archive = _a; - f->state = ARCHIVE_WRITE_FILTER_STATE_NEW; - if (a->filter_first == NULL) -@@ -548,6 +552,10 @@ archive_write_open2(struct archive *_a, void *client_data, - a->client_data = client_data; - - client_filter = __archive_write_allocate_filter(_a); -+ -+ if (client_filter == NULL) -+ return (ARCHIVE_FATAL); -+ - client_filter->open = archive_write_client_open; - client_filter->write = archive_write_client_write; - client_filter->close = archive_write_client_close; diff --git a/package/libarchive/Config.in b/package/libarchive/Config.in index fd429acb60..ffa4cff7b3 100644 --- a/package/libarchive/Config.in +++ b/package/libarchive/Config.in @@ -8,7 +8,7 @@ config BR2_PACKAGE_LIBARCHIVE Libarchive is a reusable C library for reading and writing a variety of streaming archive formats. - http://www.libarchive.org/ + https://www.libarchive.org/ if BR2_PACKAGE_LIBARCHIVE diff --git a/package/libarchive/libarchive.hash b/package/libarchive/libarchive.hash index ca580b4977..b03bef3de5 100644 --- a/package/libarchive/libarchive.hash +++ b/package/libarchive/libarchive.hash @@ -1,4 +1,4 @@ # From https://www.libarchive.de/downloads/sha256sums -sha256 5a411aceb978f43e626f0c2d1812ddd8807b645ed892453acabd532376c148e6 libarchive-3.6.1.tar.xz +sha256 9e2c1b80d5fbe59b61308fdfab6c79b5021d7ff4ff2489fb12daf0a96a83551d libarchive-3.6.2.tar.xz # Locally computed: sha256 b2cdf763345de2de34cebf54394df3c61a105c3b71288603c251f2fa638200ba COPYING diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk index 649b7dd4dc..cfc148d01d 100644 --- a/package/libarchive/libarchive.mk +++ b/package/libarchive/libarchive.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBARCHIVE_VERSION = 3.6.1 +LIBARCHIVE_VERSION = 3.6.2 LIBARCHIVE_SOURCE = libarchive-$(LIBARCHIVE_VERSION).tar.xz LIBARCHIVE_SITE = https://www.libarchive.de/downloads LIBARCHIVE_INSTALL_STAGING = YES @@ -12,9 +12,6 @@ LIBARCHIVE_LICENSE = BSD-2-Clause, BSD-3-Clause, CC0-1.0, OpenSSL, Apache-2.0 LIBARCHIVE_LICENSE_FILES = COPYING LIBARCHIVE_CPE_ID_VENDOR = libarchive -# 0001-libarchive-Handle-a-calloc-returning-NULL.patch -LIBARCHIVE_IGNORE_CVES += CVE-2022-36227 - ifeq ($(BR2_PACKAGE_LIBARCHIVE_BSDTAR),y) ifeq ($(BR2_STATIC_LIBS),y) LIBARCHIVE_CONF_OPTS += --enable-bsdtar=static From f095f5a8bec8352ffa182f606c5c7349ec2d6dca Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 14 Dec 2022 20:47:26 +0100 Subject: [PATCH 0022/5754] package/sudo: bump to version 1.9.12p1 remove merged patch diff LICENSE.md - Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler + Copyright (C) 1995-2022 Jean-loup Gailly and Mark Adler - Copyright (c) 2008-2018, Dave Benson and the protobuf-c authors. + Copyright (c) 2008-2022, Dave Benson and the protobuf-c authors. Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/sudo/0001-Fix-CVE-2022-43995.patch | 53 ---------------------- package/sudo/Config.in | 2 +- package/sudo/sudo.hash | 6 +-- package/sudo/sudo.mk | 7 +-- 4 files changed, 6 insertions(+), 62 deletions(-) delete mode 100644 package/sudo/0001-Fix-CVE-2022-43995.patch diff --git a/package/sudo/0001-Fix-CVE-2022-43995.patch b/package/sudo/0001-Fix-CVE-2022-43995.patch deleted file mode 100644 index 3f544dcf81..0000000000 --- a/package/sudo/0001-Fix-CVE-2022-43995.patch +++ /dev/null @@ -1,53 +0,0 @@ -From bd209b9f16fcd1270c13db27ae3329c677d48050 Mon Sep 17 00:00:00 2001 -From: "Todd C. Miller" -Date: Fri, 28 Oct 2022 07:29:55 -0600 -Subject: [PATCH] Fix CVE-2022-43995, potential heap overflow for passwords < 8 - characters. Starting with sudo 1.8.0 the plaintext password buffer is - dynamically sized so it is not safe to assume that it is at least 9 bytes in - size. Found by Hugo Lefeuvre (University of Manchester) with ConfFuzz. - -[Retrieved from: -https://github.com/sudo-project/sudo/commit/bd209b9f16fcd1270c13db27ae3329c677d48050] -Signed-off-by: Fabrice Fontaine ---- - plugins/sudoers/auth/passwd.c | 11 +++++------ - 1 file changed, 5 insertions(+), 6 deletions(-) - -diff --git a/plugins/sudoers/auth/passwd.c b/plugins/sudoers/auth/passwd.c -index b2046eca2..0416861e9 100644 ---- a/plugins/sudoers/auth/passwd.c -+++ b/plugins/sudoers/auth/passwd.c -@@ -63,7 +63,7 @@ sudo_passwd_init(struct passwd *pw, sudo_auth *auth) - int - sudo_passwd_verify(struct passwd *pw, char *pass, sudo_auth *auth, struct sudo_conv_callback *callback) - { -- char sav, *epass; -+ char des_pass[9], *epass; - char *pw_epasswd = auth->data; - size_t pw_len; - int matched = 0; -@@ -75,12 +75,12 @@ sudo_passwd_verify(struct passwd *pw, char *pass, sudo_auth *auth, struct sudo_c - - /* - * Truncate to 8 chars if standard DES since not all crypt()'s do this. -- * If this turns out not to be safe we will have to use OS #ifdef's (sigh). - */ -- sav = pass[8]; - pw_len = strlen(pw_epasswd); -- if (pw_len == DESLEN || HAS_AGEINFO(pw_epasswd, pw_len)) -- pass[8] = '\0'; -+ if (pw_len == DESLEN || HAS_AGEINFO(pw_epasswd, pw_len)) { -+ strlcpy(des_pass, pass, sizeof(des_pass)); -+ pass = des_pass; -+ } - - /* - * Normal UN*X password check. -@@ -88,7 +88,6 @@ sudo_passwd_verify(struct passwd *pw, char *pass, sudo_auth *auth, struct sudo_c - * only compare the first DESLEN characters in that case. - */ - epass = (char *) crypt(pass, pw_epasswd); -- pass[8] = sav; - if (epass != NULL) { - if (HAS_AGEINFO(pw_epasswd, pw_len) && strlen(epass) == DESLEN) - matched = !strncmp(pw_epasswd, epass, DESLEN); diff --git a/package/sudo/Config.in b/package/sudo/Config.in index cbef15d67b..ee5ea542ab 100644 --- a/package/sudo/Config.in +++ b/package/sudo/Config.in @@ -8,4 +8,4 @@ config BR2_PACKAGE_SUDO basic philosophy is to give as few privileges as possible but still allow people to get their work done. - http://www.sudo.ws/sudo/ + https://www.sudo.ws/sudo/ diff --git a/package/sudo/sudo.hash b/package/sudo/sudo.hash index 63c98e2c4e..a3476df96b 100644 --- a/package/sudo/sudo.hash +++ b/package/sudo/sudo.hash @@ -1,4 +1,4 @@ -# From: http://www.sudo.ws/download.html -sha256 a21918eb9fc0063794f6887464fa2d924ab6d192e19063191a429605c22791d2 sudo-1.9.11p2.tar.gz +# From: https://www.sudo.ws/getting/download/ +sha256 475a18a8eb3da8b2917ceab063a6baf51ea09128c3c47e3e0e33ab7497bab7d8 sudo-1.9.12p1.tar.gz # Locally calculated -sha256 cf3a83366f9aabfd76d693ce03843106fcaaf6c76dfa97610f7c0b719a06e6bb LICENSE.md +sha256 d2f93a3b17ed5586fddd07be33ad767146c1a81a22682baa68bb4360a31d020a LICENSE.md diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk index 8e237bd36a..a16b6863aa 100644 --- a/package/sudo/sudo.mk +++ b/package/sudo/sudo.mk @@ -4,8 +4,8 @@ # ################################################################################ -SUDO_VERSION_MAJOR = 1.9.11 -SUDO_VERSION_MINOR = p2 +SUDO_VERSION_MAJOR = 1.9.12 +SUDO_VERSION_MINOR = p1 SUDO_VERSION = $(SUDO_VERSION_MAJOR)$(SUDO_VERSION_MINOR) SUDO_SITE = https://www.sudo.ws/sudo/dist SUDO_LICENSE = ISC, BSD-3-Clause @@ -25,9 +25,6 @@ SUDO_CONF_OPTS = \ --without-interfaces \ --with-env-editor -# 0001-Fix-CVE-2022-43995.patch -SUDO_IGNORE_CVES += CVE-2022-43995 - ifeq ($(BR2_PACKAGE_LINUX_PAM),y) define SUDO_INSTALL_PAM_CONF $(INSTALL) -D -m 0644 package/sudo/sudo.pam $(TARGET_DIR)/etc/pam.d/sudo From f83377b7b30c82da363c7937f693fe979318f598 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 14 Dec 2022 20:58:25 +0100 Subject: [PATCH 0023/5754] package/intel-microcode: security bump version to 20221108 Fixes the following security issues: - CVE-2021-0146: Hardware allows activation of test or debug logic at runtime for some Intel(R) processors which may allow an unauthenticated user to potentially enable escalation of privilege via physical access. https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00528.html - CVE-2021-0127: Insufficient control flow management in some Intel(R) Processors may allow an authenticated user to potentially enable a denial of service via local access. https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00532.html - CVE-2022-21151: Processor optimization removal or modification of security-critical code for some Intel(R) Processors may allow an authenticated user to potentially enable information disclosure via local access. https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00617.html - CVE-2022-0005: Sensitive information accessible by physical probing of JTAG interface for some Intel(R) Processors with SGX may allow an unprivileged user to potentially enable information disclosure via physical access. https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00614.html - CVE-2022-21233: Improper isolation of shared resources in some Intel(R) Processors may allow a privileged user to potentially enable information disclosure via local access. https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00657.html For more details, see the release notes: https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/blob/main/releasenote.md Signed-off-by: Bernd Kuhls [Peter: extend commit message with security fix details] 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 6687d4c0eb..56f0237277 100644 --- a/package/intel-microcode/intel-microcode.hash +++ b/package/intel-microcode/intel-microcode.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 fd85b6b769efd029dec6a2c07106fd18fb4dcb548b7bc4cde09295a8344ef6d7 intel-microcode-20210608.tar.gz +sha256 8d14a914815f56c27b1f41be0fd699d1afcfdbc05432056427e455100798975e intel-microcode-20221108.tar.gz sha256 03efb1491c7e899feb2665fa299363e64035e5444c1b8bc1f6ebed30de964e12 license diff --git a/package/intel-microcode/intel-microcode.mk b/package/intel-microcode/intel-microcode.mk index af7f6fa804..787537da78 100644 --- a/package/intel-microcode/intel-microcode.mk +++ b/package/intel-microcode/intel-microcode.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_MICROCODE_VERSION = 20210608 +INTEL_MICROCODE_VERSION = 20221108 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 aa409d82fc64ee28e7ef9a649875fc577c33f01b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 14 Dec 2022 20:58:26 +0100 Subject: [PATCH 0024/5754] DEVELOPERS: add Bernd Kuhls to package intel-microcode Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 831e60982e..3a0e3c14ab 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -353,6 +353,7 @@ F: package/inih/ F: package/intel-gmmlib/ F: package/intel-mediadriver/ F: package/intel-mediasdk/ +F: package/intel-microcode/ F: package/jsoncpp/ F: package/kodi* F: package/lame/ From f62d409cb8d1bcd015b9ca4aeca31b2d1c8dbf02 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 14 Dec 2022 20:04:36 +0100 Subject: [PATCH 0025/5754] package/x11r7/xapp_xhost: bump version to 1.0.9 Release notes: https://lists.x.org/archives/xorg-announce/2022-December/003301.html Updated license hash due to copyright year bump: https://gitlab.freedesktop.org/xorg/app/xhost/-/commit/167ad7fa3a339da96798da49d05c3125045a87c2 Switched tarball to xz, updated _SITE. Added optional support for gettext: https://gitlab.freedesktop.org/xorg/app/xhost/-/commit/167ad7fa3a339da96798da49d05c3125045a87c2 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xapp_xhost/xapp_xhost.hash | 10 ++++------ package/x11r7/xapp_xhost/xapp_xhost.mk | 9 +++++---- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/package/x11r7/xapp_xhost/xapp_xhost.hash b/package/x11r7/xapp_xhost/xapp_xhost.hash index 71eabccc44..fea2588c6d 100644 --- a/package/x11r7/xapp_xhost/xapp_xhost.hash +++ b/package/x11r7/xapp_xhost/xapp_xhost.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-February/002950.html -md5 a48c72954ae6665e0616f6653636da8c xhost-1.0.8.tar.bz2 -sha1 971670858a464d4f8eeb6f4e182f9fcd94149790 xhost-1.0.8.tar.bz2 -sha256 a2dc3c579e13674947395ef8ccc1b3763f89012a216c2cc6277096489aadc396 xhost-1.0.8.tar.bz2 -sha512 55581f9bc45a70a73b13fe718ca83c4cb0a6116d26addc0f07659ebeb5bf7d2379e84cab5a1702ae77a298a66f42ae03f41ddc7d5acd61c6f18448e58ad7cb6b xhost-1.0.8.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003301.html +sha256 ea86b531462035b19a2e5e01ef3d9a35cca7d984086645e2fc844d8f0e346645 xhost-1.0.9.tar.xz +sha512 d281a0df0a036d693ce7dbe0d1d53839110d203f42454bf4d33a49fbfddec078149969b6ad76641e40e207ddc8317ea563088c59025fc57d8245e5ed27f79818 xhost-1.0.9.tar.xz # Locally computed -sha256 7e69bed6fcfff05ecf454d7e4b29cd265172385833f1978f04b638f92f2cfecf COPYING +sha256 d3106697fb05dea4e9899b9e782ae7c3c17086d5b3dc7966494fc83fda9e468e COPYING diff --git a/package/x11r7/xapp_xhost/xapp_xhost.mk b/package/x11r7/xapp_xhost/xapp_xhost.mk index e9fb155216..55f7ca5cc7 100644 --- a/package/x11r7/xapp_xhost/xapp_xhost.mk +++ b/package/x11r7/xapp_xhost/xapp_xhost.mk @@ -4,11 +4,12 @@ # ################################################################################ -XAPP_XHOST_VERSION = 1.0.8 -XAPP_XHOST_SOURCE = xhost-$(XAPP_XHOST_VERSION).tar.bz2 -XAPP_XHOST_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XHOST_VERSION = 1.0.9 +XAPP_XHOST_SOURCE = xhost-$(XAPP_XHOST_VERSION).tar.xz +XAPP_XHOST_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XHOST_LICENSE = MIT XAPP_XHOST_LICENSE_FILES = COPYING -XAPP_XHOST_DEPENDENCIES = xlib_libX11 xlib_libXmu +XAPP_XHOST_DEPENDENCIES = xlib_libX11 xlib_libXmu $(TARGET_NLS_DEPENDENCIES) +XAPP_XHOST_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) $(eval $(autotools-package)) From 9febd64bb01f0660a9ac877d2484525438955333 Mon Sep 17 00:00:00 2001 From: Marcus Folkesson Date: Mon, 28 Nov 2022 10:11:58 +0100 Subject: [PATCH 0026/5754] package/libostree: bump to version 2022.7 Signed-off-by: Marcus Folkesson Signed-off-by: Peter Korsgaard --- 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 582af4b7b9..ed31109fdb 100644 --- a/package/libostree/libostree.hash +++ b/package/libostree/libostree.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 835ef47d9a0b35a10c77ffd7f0fbd2e2b87f7cccb588da27442a05ff71ffad8c libostree-2022.6.tar.xz +sha256 8be2a9261c94e8b9ec4113380ffc480f8598245fb321a009bad4fae4b822411f libostree-2022.7.tar.xz sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/libostree/libostree.mk b/package/libostree/libostree.mk index e99da9d2cb..8e8ec63213 100644 --- a/package/libostree/libostree.mk +++ b/package/libostree/libostree.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOSTREE_VERSION = 2022.6 +LIBOSTREE_VERSION = 2022.7 LIBOSTREE_SOURCE = libostree-$(LIBOSTREE_VERSION).tar.xz LIBOSTREE_SITE = https://github.com/ostreedev/ostree/releases/download/v$(LIBOSTREE_VERSION) From c2baa583c350b9d594e87f9cab1db597789904df Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 14 Dec 2022 23:26:58 +0100 Subject: [PATCH 0027/5754] package/mbedtls: security bump to version 2.28.2 Fix the following security issues: - Fix potential heap buffer overread and overwrite in DTLS if MBEDTLS_SSL_DTLS_CONNECTION_ID is enabled and MBEDTLS_SSL_CID_IN_LEN_MAX > 2 * MBEDTLS_SSL_CID_OUT_LEN_MAX. - An adversary with access to precise enough information about memory accesses (typically, an untrusted operating system attacking a secure enclave) could recover an RSA private key after observing the victim performing a single private-key operation if the window size used for the exponentiation was 3 or smaller. Drop patch (already in version: https://github.com/Mbed-TLS/mbedtls/commit/9d9d45c6b2aeaedfdfdadfec3d05d168db685968) https://github.com/Mbed-TLS/mbedtls/releases/tag/v2.28.2 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...-PIC-inline-ASM-compilation-with-GCC.patch | 74 ------------------- package/mbedtls/mbedtls.hash | 4 +- package/mbedtls/mbedtls.mk | 2 +- 3 files changed, 3 insertions(+), 77 deletions(-) delete mode 100644 package/mbedtls/0001-bn_mul.h-fix-x86-PIC-inline-ASM-compilation-with-GCC.patch diff --git a/package/mbedtls/0001-bn_mul.h-fix-x86-PIC-inline-ASM-compilation-with-GCC.patch b/package/mbedtls/0001-bn_mul.h-fix-x86-PIC-inline-ASM-compilation-with-GCC.patch deleted file mode 100644 index 60bf53f6e4..0000000000 --- a/package/mbedtls/0001-bn_mul.h-fix-x86-PIC-inline-ASM-compilation-with-GCC.patch +++ /dev/null @@ -1,74 +0,0 @@ -From a0ae2ba37ca479c6edddec8634b25686be965e0d Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -Date: Mon, 27 Aug 2018 22:50:57 +0200 -Subject: [PATCH] bn_mul.h: fix x86 PIC inline ASM compilation with GCC < 5 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes #1910 - -With ebx added to the MULADDC_STOP clobber list to fix #1550, the inline -assembly fails to build with GCC < 5 in PIC mode with the following error: - -include/mbedtls/bn_mul.h:46:13: error: PIC register clobbered by ‘ebx’ in ‘asm’ - -This is because older GCC versions treated the x86 ebx register (which is -used for the GOT) as a fixed reserved register when building as PIC. - -This is fixed by an improved register allocator in GCC 5+. From the release -notes: - -Register allocation improvements: Reuse of the PIC hard register, instead of -using a fixed register, was implemented on x86/x86-64 targets. This -improves generated PIC code performance as more hard registers can be used. - -https://www.gnu.org/software/gcc/gcc-5/changes.html - -As a workaround, detect this situation and disable the inline assembly, -similar to the MULADDC_CANNOT_USE_R7 logic. - -Signed-off-by: Peter Korsgaard -Upstream: https://github.com/ARMmbed/mbedtls/pull/1986 ---- - include/mbedtls/bn_mul.h | 18 +++++++++++++++++- - 1 file changed, 17 insertions(+), 1 deletion(-) - -diff --git a/include/mbedtls/bn_mul.h b/include/mbedtls/bn_mul.h -index b587317d9..74a2d29be 100644 ---- a/include/mbedtls/bn_mul.h -+++ b/include/mbedtls/bn_mul.h -@@ -50,13 +50,29 @@ - #if defined(__GNUC__) && \ - ( !defined(__ARMCC_VERSION) || __ARMCC_VERSION >= 6000000 ) - -+/* -+ * GCC < 5.0 treated the x86 ebx (which is used for the GOT) as a -+ * fixed reserved register when building as PIC, leading to errors -+ * like: bn_mul.h:46:13: error: PIC register clobbered by ‘ebx’ in ‘asm’ -+ * -+ * This is fixed by an improved register allocator in GCC 5+. From the -+ * release notes: -+ * Register allocation improvements: Reuse of the PIC hard register, -+ * instead of using a fixed register, was implemented on x86/x86-64 -+ * targets. This improves generated PIC code performance as more hard -+ * registers can be used. -+ */ -+#if defined(__GNUC__) && __GNUC__ < 5 && defined(__PIC__) -+#define MULADDC_CANNOT_USE_EBX -+#endif -+ - /* - * Disable use of the i386 assembly code below if option -O0, to disable all - * compiler optimisations, is passed, detected with __OPTIMIZE__ - * This is done as the number of registers used in the assembly code doesn't - * work with the -O0 option. - */ --#if defined(__i386__) && defined(__OPTIMIZE__) -+#if defined(__i386__) && defined(__OPTIMIZE__) && !defined(MULADDC_CANNOT_USE_EBX) - - #define MULADDC_INIT \ - asm( \ --- -2.11.0 - diff --git a/package/mbedtls/mbedtls.hash b/package/mbedtls/mbedtls.hash index 38182fe119..876cd7b77e 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.1: -sha256 6797a7b6483ef589deeab8d33d401ed235d7be25eeecda1be8ddfed406d40ff4 mbedtls-2.28.1.tar.gz +# From https://github.com/ARMmbed/mbedtls/releases/tag/v2.28.2: +sha256 bc55232bf71fd66045122ba9050a29ea7cb2e8f99b064a9e6334a82f715881a0 mbedtls-2.28.2.tar.gz # Locally calculated sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/mbedtls/mbedtls.mk b/package/mbedtls/mbedtls.mk index 49ea7886f6..7a605ac5b1 100644 --- a/package/mbedtls/mbedtls.mk +++ b/package/mbedtls/mbedtls.mk @@ -4,7 +4,7 @@ # ################################################################################ -MBEDTLS_VERSION = 2.28.1 +MBEDTLS_VERSION = 2.28.2 MBEDTLS_SITE = $(call github,ARMmbed,mbedtls,v$(MBEDTLS_VERSION)) MBEDTLS_CONF_OPTS = \ -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -std=c99" \ From 1975c531764828fbdaff673e4cf1f25ea009aa2c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 14 Dec 2022 23:20:12 +0100 Subject: [PATCH 0028/5754] package/arp-scan: bump to version 1.10.0 - Use official tarball and so drop autoreconf - libcap is an optional dependency since https://github.com/royhills/arp-scan/commit/923f123a281139f1ec3daceb1db4bc7317ec6978 https://github.com/royhills/arp-scan/releases/tag/1.10.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/arp-scan/arp-scan.hash | 2 +- package/arp-scan/arp-scan.mk | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/package/arp-scan/arp-scan.hash b/package/arp-scan/arp-scan.hash index b18c6ceb38..3a2977f906 100644 --- a/package/arp-scan/arp-scan.hash +++ b/package/arp-scan/arp-scan.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b9b75ceaef6348f5951b06c773ec7a243a9e780e160eafebc369f9c27f6a7d3f arp-scan-1.9.8.tar.gz +sha256 a078fe8711ecbb8b99121c3d8be26ae7e7f339f11010ef61318be4f33394d012 arp-scan-1.10.0.tar.gz sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING diff --git a/package/arp-scan/arp-scan.mk b/package/arp-scan/arp-scan.mk index 73d1b99bc7..89644be9d3 100644 --- a/package/arp-scan/arp-scan.mk +++ b/package/arp-scan/arp-scan.mk @@ -4,12 +4,11 @@ # ################################################################################ -ARP_SCAN_VERSION = 1.9.8 -ARP_SCAN_SITE = $(call github,royhills,arp-scan,$(ARP_SCAN_VERSION)) +ARP_SCAN_VERSION = 1.10.0 +ARP_SCAN_SITE = https://github.com/royhills/arp-scan/releases/download/$(ARP_SCAN_VERSION) ARP_SCAN_LICENSE = GPL-3.0+ ARP_SCAN_LICENSE_FILES = COPYING ARP_SCAN_DEPENDENCIES = libpcap -ARP_SCAN_AUTORECONF = YES ifeq ($(BR2_STATIC_LIBS),y) ARP_SCAN_CONF_OPTS += LIBS="`$(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs`" @@ -17,4 +16,11 @@ endif ARP_SCAN_CONF_ENV = pgac_cv_snprintf_long_long_int_format='%lld' +ifeq ($(BR2_PACKAGE_LIBCAP),y) +ARP_SCAN_DEPENDENCIES += libcap +ARP_SCAN_CONF_OPTS += --with-libcap +else +ARP_SCAN_CONF_OPTS += --without-libcap +endif + $(eval $(autotools-package)) From b382fb4a0467a329c22e01a3feafe8029dfe3811 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 15 Dec 2022 18:46:29 +0100 Subject: [PATCH 0029/5754] package/{mesa3d, mesa3d-headers}: bump version to 22.3.1 Release notes: https://lists.freedesktop.org/archives/mesa-announce/2022-December/000697.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 d33d492ba7..e5988cad5e 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.0 +MESA3D_HEADERS_VERSION = 22.3.1 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 77223676ea..613ebce89f 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2022-November/000695.html -sha256 644bf936584548c2b88762111ad58b4aa3e4688874200e5a4eb74e53ce301746 mesa-22.3.0.tar.xz -sha512 bf4d344459f97d266a5943b33aecf062b0825e13c1617afdab71c4ba6a87a201440761c9a32a6e0060910a0917122e3f4d29f666d6b94a38a71c94b9ff3ab9da mesa-22.3.0.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2022-December/000697.html +sha256 3c9cd611c0859d307aba0659833386abdca4c86162d3c275ba5be62d16cf31eb mesa-22.3.1.tar.xz +sha512 8a7aee67f6351de293d23425229eb7c42d6918fe9ffb46c6e5df9609f79633c98ab78e892507fe48055c51fa88bf103d7b7baa58e826b1758f66067048baed5b mesa-22.3.1.tar.xz # License sha256 a00275a53178e2645fb65be99a785c110513446a5071ff2c698ed260ad917d75 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index c3bd44c2fa..b6f1214102 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.0 +MESA3D_VERSION = 22.3.1 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos From de93736550f8443925dc218b04f82daedfc63c79 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 16 Dec 2022 07:34:56 +0100 Subject: [PATCH 0030/5754] package/x11r7/xlib_libX11: bump version to 1.8.3 Release notes: https://lists.x.org/archives/xorg-announce/2022-December/003305.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 4f5027d62d..62b67ad544 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/2022-November/003253.html -sha256 ed91d573d570db83b8ae546f4890dccfcd0b9dfe1e50a1b401b63a74c152ed04 libX11-1.8.2.tar.xz -sha512 662ee8043d9ba27df82f647515b701d6f302a52715f21afdaba391f3b70691753e3649e7ff8322e07858be4297df9cbb19227958d676ed6dea198cce64330d1d libX11-1.8.2.tar.xz +# From https://lists.x.org/archives/xorg-announce/2022-December/003305.html +sha256 e31565c84006b6b8e01dc9399c806085739710bc2db2e0930f1511ed9d6585bd libX11-1.8.3.tar.xz +sha512 bc862338fed855986659e9ffa641db6b36c3ac9abced590d1b164e3cc24446671936e3688cdca18393129c4ea41777977eeb37e87d8edc14d6cc5d194a9c0325 libX11-1.8.3.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 26d4b4d306..3bb3fffce0 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.2 +XLIB_LIBX11_VERSION = 1.8.3 XLIB_LIBX11_SOURCE = libX11-$(XLIB_LIBX11_VERSION).tar.xz XLIB_LIBX11_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBX11_LICENSE = MIT From 46686174e55c4f53d4fd680e65371ee8d227fbce Mon Sep 17 00:00:00 2001 From: Maxim Kochetkov Date: Sat, 17 Dec 2022 08:39:58 +0300 Subject: [PATCH 0031/5754] package/libgeos: bump version to 3.11.1 Changelog: https://github.com/libgeos/geos/releases/tag/3.11.1 Signed-off-by: Maxim Kochetkov Signed-off-by: Peter Korsgaard --- 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 34b2b855d6..cd0a4e0330 100644 --- a/package/libgeos/libgeos.hash +++ b/package/libgeos/libgeos.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 79ab8cabf4aa8604d161557b52e3e4d84575acdc0d08cb09ab3f7aaefa4d858a geos-3.11.0.tar.bz2 +sha256 6d0eb3cfa9f92d947731cc75f1750356b3bdfc07ea020553daf6af1c768e0be2 geos-3.11.1.tar.bz2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libgeos/libgeos.mk b/package/libgeos/libgeos.mk index 55c975eb4a..c6d470dc97 100644 --- a/package/libgeos/libgeos.mk +++ b/package/libgeos/libgeos.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGEOS_VERSION = 3.11.0 +LIBGEOS_VERSION = 3.11.1 LIBGEOS_SITE = http://download.osgeo.org/geos LIBGEOS_SOURCE = geos-$(LIBGEOS_VERSION).tar.bz2 LIBGEOS_LICENSE = LGPL-2.1 From 7aeb6c654e16863dc9d7f0d5b92414b52669299f Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 17 Dec 2022 16:09:09 +0100 Subject: [PATCH 0032/5754] Revert "package/gperf: add _CPE_ID_VENDOR and _CPE_ID_PRODUCT" This reverts commit 3712e1dee7626b0c3262c054b5b9c2769fd2a61e. gperf -- the GNU perfect hash function generator https://www.gnu.org/software/gperf/ and gperftools -- the Google Performance Tools https://github.com/gperftools/gperftools are two different and unrelated projects. Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- package/gperf/gperf.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/gperf/gperf.mk b/package/gperf/gperf.mk index c2f042c464..4b928a0ebd 100644 --- a/package/gperf/gperf.mk +++ b/package/gperf/gperf.mk @@ -8,8 +8,6 @@ GPERF_VERSION = 3.1 GPERF_SITE = $(BR2_GNU_MIRROR)/gperf GPERF_LICENSE = GPL-3.0+ GPERF_LICENSE_FILES = COPYING -GPERF_CPE_ID_VENDOR = gperftools_project -GPERF_CPE_ID_PRODUCT = gperftools $(eval $(autotools-package)) $(eval $(host-autotools-package)) From 48a3fc3f361f2720007f7fd3851fab0cfa25f092 Mon Sep 17 00:00:00 2001 From: Maxim Kochetkov Date: Sat, 17 Dec 2022 08:30:34 +0300 Subject: [PATCH 0033/5754] package/timescaledb: bump version to 2.9.0 Release notes: https://github.com/timescale/timescaledb/blob/2.9.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 f546b17d0a..a970ffa1ad 100644 --- a/package/timescaledb/timescaledb.hash +++ b/package/timescaledb/timescaledb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 22a057c4472d23bf08778932e391f38f350ef0307cf99fb8e279c8245667d3e9 timescaledb-2.8.1.tar.gz +sha256 666f5427cb036500bca731d24d845285299cff82f576ad4474f85da682b2ee78 timescaledb-2.9.0.tar.gz sha256 0378e0948feefd85f579319c74d6e2b671194037f550c7176ef26649d94c895b LICENSE diff --git a/package/timescaledb/timescaledb.mk b/package/timescaledb/timescaledb.mk index 659d07bd0c..7530368498 100644 --- a/package/timescaledb/timescaledb.mk +++ b/package/timescaledb/timescaledb.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIMESCALEDB_VERSION = 2.8.1 +TIMESCALEDB_VERSION = 2.9.0 TIMESCALEDB_SITE = $(call github,timescale,timescaledb,$(TIMESCALEDB_VERSION)) TIMESCALEDB_LICENSE = Apache-2.0 TIMESCALEDB_LICENSE_FILES = LICENSE From a6105112e82e3ca5162a56aa3a47bf6b49af2e0b Mon Sep 17 00:00:00 2001 From: Bagas Sanjaya Date: Tue, 13 Dec 2022 21:03:06 +0700 Subject: [PATCH 0034/5754] package/git: bump to version 2.39.0 The git package in Buildroot is quite lagging behind (v2.31.4, released on July 12, 2022 while the baseline v2.31.0 was released on March 15, 2021). Bump the package to v2.39.0 (released December 12, 2022). While at it, also replace patch fixing uclibc no threads build with two patches cherry-picked from upstream next branch, which fixes the same issue by fixing the handling of flockfile(), funlockfile(), and getc_unlocked() declarations. These patches missed the release but planned for next maintenance release (v2.39.1). The reason for replacing the patch is when original fix patch was upstreamed [1], Jeff King noted that the build failure root cause was flockfile() is defined regardless of whether uclibc is configured with threads support or not [2]. Release notes for v2.39.0 is available on release announcement on Git mailing list at [3]. [1]: https://lore.kernel.org/git/20221125092339.29433-1-bagasdotme@gmail.com/ [2]: https://lore.kernel.org/git/Y4RAr04vS%2FTOM5uh@coredump.intra.peff.net/ [3]: https://lore.kernel.org/git/xmqqlencspnl.fsf@gitster.g/ Signed-off-by: Bagas Sanjaya Signed-off-by: Peter Korsgaard --- .../git/0001-Fix-build-without-threads.patch | 100 ---------------- ...avoid-redefining-system-function-nam.patch | 107 ++++++++++++++++++ ...undefine-system-names-before-redecla.patch | 55 +++++++++ package/git/git.hash | 2 +- package/git/git.mk | 4 +- 5 files changed, 164 insertions(+), 104 deletions(-) delete mode 100644 package/git/0001-Fix-build-without-threads.patch create mode 100644 package/git/0001-git-compat-util-avoid-redefining-system-function-nam.patch create mode 100644 package/git/0002-git-compat-util-undefine-system-names-before-redecla.patch diff --git a/package/git/0001-Fix-build-without-threads.patch b/package/git/0001-Fix-build-without-threads.patch deleted file mode 100644 index 7ce85ffaf8..0000000000 --- a/package/git/0001-Fix-build-without-threads.patch +++ /dev/null @@ -1,100 +0,0 @@ -From 07d66af3b0800764087c4151d4f6562d4f8cce05 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 14 Dec 2020 23:00:33 +0100 -Subject: [PATCH] Fix build without threads - -Build without threads is broken since version 2.29.0 and -https://github.com/git/git/commit/15b52a44e0c92a0658e891194a5b0610d1f53afc: - -In file included from cache.h:4, - from blame.c:1: -git-compat-util.h:1238:20: error: static declaration of 'flockfile' follows non-static declaration - static inline void flockfile(FILE *fh) - ^~~~~~~~~ -In file included from git-compat-util.h:168, - from cache.h:4, - from blame.c:1: -/nvme/rc-buildroot-test/scripts/instance-0/output-1/host/arm-buildroot-linux-uclibcgnueabihf/sysroot/usr/include/stdio.h:806:13: note: previous declaration of 'flockfile' was here - extern void flockfile (FILE *__stream) __THROW; - ^~~~~~~~~ -In file included from cache.h:4, - from blame.c:1: -git-compat-util.h:1242:20: error: static declaration of 'funlockfile' follows non-static declaration - static inline void funlockfile(FILE *fh) - ^~~~~~~~~~~ -In file included from git-compat-util.h:168, - from cache.h:4, - from blame.c:1: -/nvme/rc-buildroot-test/scripts/instance-0/output-1/host/arm-buildroot-linux-uclibcgnueabihf/sysroot/usr/include/stdio.h:813:13: note: previous declaration of 'funlockfile' was here - extern void funlockfile (FILE *__stream) __THROW; - ^~~~~~~~~~~ - -To avoid this build failure, check if flockfile is available before -defining flockfile, funlockfile and getc_unlocked - -Fixes: - - http://autobuild.buildroot.org/results/d41638d1ad8e78dd6f654367c905996b838ee649 - -Signed-off-by: Fabrice Fontaine ---- - Makefile | 5 +++++ - configure.ac | 6 ++++++ - git-compat-util.h | 2 +- - 3 files changed, 12 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 6fb86c5862..58d0893a12 100644 ---- a/Makefile -+++ b/Makefile -@@ -232,6 +232,8 @@ all:: - # Define NO_STRUCT_ITIMERVAL if you don't have struct itimerval - # This also implies NO_SETITIMER - # -+# Define NO_FLOCKFILE if you don't have flockfile() -+# - # Define NO_FAST_WORKING_DIRECTORY if accessing objects in pack files is - # generally faster on your platform than accessing the working directory. - # -@@ -1638,6 +1640,9 @@ endif - ifdef NO_SETITIMER - COMPAT_CFLAGS += -DNO_SETITIMER - endif -+ifdef NO_FLOCKFILE -+ COMPAT_CFLAGS += -DNO_FLOCKFILE -+endif - ifdef NO_PREAD - COMPAT_CFLAGS += -DNO_PREAD - COMPAT_OBJS += compat/pread.o -diff --git a/configure.ac b/configure.ac -index 66aedb9288..d4295b5c69 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1132,6 +1132,12 @@ GIT_CHECK_FUNC(setitimer, - [NO_SETITIMER=YesPlease]) - GIT_CONF_SUBST([NO_SETITIMER]) - # -+# Define NO_FLOCKFILE if you don't have flockfile. -+GIT_CHECK_FUNC(flockfile, -+[NO_FLOCKFILE=], -+[NO_FLOCKFILE=YesPlease]) -+GIT_CONF_SUBST([NO_FLOCKFILE]) -+# - # Define NO_STRCASESTR if you don't have strcasestr. - GIT_CHECK_FUNC(strcasestr, - [NO_STRCASESTR=], -diff --git a/git-compat-util.h b/git-compat-util.h -index 7d509c5022..279cdd941e 100644 ---- a/git-compat-util.h -+++ b/git-compat-util.h -@@ -1236,7 +1236,7 @@ int warn_on_fopen_errors(const char *path); - # define SHELL_PATH "/bin/sh" - #endif - --#ifndef _POSIX_THREAD_SAFE_FUNCTIONS -+#if !defined(_POSIX_THREAD_SAFE_FUNCTIONS) && defined(NO_FLOCKFILE) - static inline void flockfile(FILE *fh) - { - ; /* nothing */ --- -2.29.2 - 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 new file mode 100644 index 0000000000..dbde87940a --- /dev/null +++ b/package/git/0001-git-compat-util-avoid-redefining-system-function-nam.patch @@ -0,0 +1,107 @@ +From 385f67eb2254edb1fb4cf523e5e3d5a8f123d72c 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 a76d0526f7..e3456bdd0d 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 +@@ -1471,14 +1472,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 + +-- +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 new file mode 100644 index 0000000000..9e3c9b662c --- /dev/null +++ b/package/git/0002-git-compat-util-undefine-system-names-before-redecla.patch @@ -0,0 +1,55 @@ +From 6d406390b870fdb2cd9d18b12ebfabc12f5096df 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 e3456bdd0d..211861da0f 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 + +@@ -1480,6 +1481,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 af09ea817b..57a77b2810 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 dbc80f88d36fcde2c7acaaa9343cfab0f56effe9aee60e5eb00f3f36b8a619b4 git-2.31.5.tar.xz +sha256 ba199b13fb5a99ca3dec917b0bd736bc0eb5a9df87737d435eddfdf10d69265b git-2.39.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 653b4f46ad..9918d4c1ef 100644 --- a/package/git/git.mk +++ b/package/git/git.mk @@ -4,7 +4,7 @@ # ################################################################################ -GIT_VERSION = 2.31.5 +GIT_VERSION = 2.39.0 GIT_SOURCE = git-$(GIT_VERSION).tar.xz GIT_SITE = $(BR2_KERNEL_MIRROR)/software/scm/git GIT_LICENSE = GPL-2.0, LGPL-2.1+ @@ -12,8 +12,6 @@ GIT_LICENSE_FILES = COPYING LGPL-2.1 GIT_CPE_ID_VENDOR = git-scm GIT_SELINUX_MODULES = apache git xdg GIT_DEPENDENCIES = zlib $(TARGET_NLS_DEPENDENCIES) -# We're patching configure.ac -GIT_AUTORECONF = YES ifeq ($(BR2_PACKAGE_OPENSSL),y) GIT_DEPENDENCIES += host-pkgconf openssl From 5ebc1545b2f6f192d5abf2d61d9203c3f2095366 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Wed, 14 Dec 2022 07:34:33 -0700 Subject: [PATCH 0035/5754] package/python-traitlets: bump to version 5.7.1 Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-traitlets/python-traitlets.hash | 4 ++-- package/python-traitlets/python-traitlets.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-traitlets/python-traitlets.hash b/package/python-traitlets/python-traitlets.hash index 3b48fb6ab8..0c68e04518 100644 --- a/package/python-traitlets/python-traitlets.hash +++ b/package/python-traitlets/python-traitlets.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/traitlets/json -md5 bae965c0e6ab468079f233e8a9caf581 traitlets-5.7.0.tar.gz -sha256 bd0fca5c890a09bf66b33cce67ca14156b080429bc39c7ef26b075a4bd4f9fc3 traitlets-5.7.0.tar.gz +md5 74ad03a0c8dd45d5621b12e0be0ab38f traitlets-5.7.1.tar.gz +sha256 fde8f62c05204ead43c2c1b9389cfc85befa7f54acb5da28529d671175bb4108 traitlets-5.7.1.tar.gz # Locally computed sha256 checksums sha256 3dcd47086529bf178cf7d10f35a8c188a1e9710391acecceef700898a4cf099b COPYING.md diff --git a/package/python-traitlets/python-traitlets.mk b/package/python-traitlets/python-traitlets.mk index 71bb775a45..8cda56817f 100644 --- a/package/python-traitlets/python-traitlets.mk +++ b/package/python-traitlets/python-traitlets.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TRAITLETS_VERSION = 5.7.0 +PYTHON_TRAITLETS_VERSION = 5.7.1 PYTHON_TRAITLETS_SOURCE = traitlets-$(PYTHON_TRAITLETS_VERSION).tar.gz -PYTHON_TRAITLETS_SITE = https://files.pythonhosted.org/packages/a2/88/5b2a191dd0287b45b933405d951ebfc490a9dfee2494442e5977653ec43b +PYTHON_TRAITLETS_SITE = https://files.pythonhosted.org/packages/0b/db/9adbbb2bef9a43ecfa4f1cbcec1d662adade10262328a4b7ef65effc6341 PYTHON_TRAITLETS_LICENSE = BSD-3-Clause PYTHON_TRAITLETS_LICENSE_FILES = COPYING.md PYTHON_TRAITLETS_SETUP_TYPE = pep517 From 4b869587c6c88a15dc2ecf6c417896de18501a17 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Wed, 14 Dec 2022 07:38:58 -0700 Subject: [PATCH 0036/5754] package/python-pip: bump to version 22.3.1 Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-pip/python-pip.hash | 4 ++-- package/python-pip/python-pip.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pip/python-pip.hash b/package/python-pip/python-pip.hash index d1442ca39d..b41ce47d4c 100644 --- a/package/python-pip/python-pip.hash +++ b/package/python-pip/python-pip.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pip/json -md5 f0dd02265e7ccd2f8758c840fba64810 pip-22.3.tar.gz -sha256 8182aec21dad6c0a49a2a3d121a87cd524b950e0b6092b181625f07ebdde7530 pip-22.3.tar.gz +md5 996f58a94fe0b8b82b6795c42bd171ba pip-22.3.1.tar.gz +sha256 65fd48317359f3af8e593943e6ae1506b66325085ea64b706a998c6e83eeaf38 pip-22.3.1.tar.gz # Locally computed sha256 checksums sha256 634300a669d49aeae65b12c6c48c924c51a4cdf3d1ff086dc3456dc8bcaa2104 LICENSE.txt diff --git a/package/python-pip/python-pip.mk b/package/python-pip/python-pip.mk index 0f2c5d8e02..8cf3aaa3ec 100644 --- a/package/python-pip/python-pip.mk +++ b/package/python-pip/python-pip.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PIP_VERSION = 22.3 +PYTHON_PIP_VERSION = 22.3.1 PYTHON_PIP_SOURCE = pip-$(PYTHON_PIP_VERSION).tar.gz -PYTHON_PIP_SITE = https://files.pythonhosted.org/packages/f8/08/7f92782ff571c7c7cb6c5eeb8ebbb1f68cb02bdb24e55c5de4dd9ce98bc3 +PYTHON_PIP_SITE = https://files.pythonhosted.org/packages/a3/50/c4d2727b99052780aad92c7297465af5fe6eec2dbae490aa9763273ffdc1 PYTHON_PIP_SETUP_TYPE = setuptools PYTHON_PIP_LICENSE = MIT PYTHON_PIP_LICENSE_FILES = LICENSE.txt From 7165965fe57725c32ce3a9c69274d1a4c2c54c80 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Wed, 14 Dec 2022 07:42:44 -0700 Subject: [PATCH 0037/5754] package/python-ipdb: bump to version 0.13.11 Drop no longer required setuptools runtime dependency. Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-ipdb/Config.in | 1 - package/python-ipdb/python-ipdb.hash | 4 ++-- package/python-ipdb/python-ipdb.mk | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package/python-ipdb/Config.in b/package/python-ipdb/Config.in index a9d6af1684..9259421c6a 100644 --- a/package/python-ipdb/Config.in +++ b/package/python-ipdb/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_IPDB bool "python-ipdb" - select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime select BR2_PACKAGE_PYTHON_IPYTHON # runtime help IPython-enabled pdb. diff --git a/package/python-ipdb/python-ipdb.hash b/package/python-ipdb/python-ipdb.hash index 7d483e1777..1e8a45fbd6 100644 --- a/package/python-ipdb/python-ipdb.hash +++ b/package/python-ipdb/python-ipdb.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/ipdb/json -md5 4f5ffb71cd6551319acf8cbceabd8936 ipdb-0.13.9.tar.gz -sha256 951bd9a64731c444fd907a5ce268543020086a697f6be08f7cc2c9a752a278c5 ipdb-0.13.9.tar.gz +md5 e624221cbc9261f68f412b748179d5e2 ipdb-0.13.11.tar.gz +sha256 c23b6736f01fd4586cc2ecbebdf79a5eb454796853e1cd8f2ed3b7b91d4a3e93 ipdb-0.13.11.tar.gz # Locally computed sha256 checksums sha256 4eeb49de04f4894f8ea1f69a04f500799041b750b3d554c06de5ca877258e734 COPYING.txt diff --git a/package/python-ipdb/python-ipdb.mk b/package/python-ipdb/python-ipdb.mk index 7828f83020..151a3d45a4 100644 --- a/package/python-ipdb/python-ipdb.mk +++ b/package/python-ipdb/python-ipdb.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_IPDB_VERSION = 0.13.9 +PYTHON_IPDB_VERSION = 0.13.11 PYTHON_IPDB_SOURCE = ipdb-$(PYTHON_IPDB_VERSION).tar.gz -PYTHON_IPDB_SITE = https://files.pythonhosted.org/packages/fc/56/9f67dcd4a4b9960373173a31be1b8c47fe351a1c9385677a7bdd82810e57 +PYTHON_IPDB_SITE = https://files.pythonhosted.org/packages/23/b2/c972cc266b0ba8508b42dab7f5dea1be03ea32213258441bf1b00baca555 PYTHON_IPDB_SETUP_TYPE = setuptools PYTHON_IPDB_LICENSE = BSD-3-Clause PYTHON_IPDB_LICENSE_FILES = COPYING.txt From af6f7aa76db5aed1eada0b27bd0375610a2fc728 Mon Sep 17 00:00:00 2001 From: Paul Cercueil Date: Wed, 14 Dec 2022 18:17:54 +0100 Subject: [PATCH 0038/5754] package/lightning: bump version to 2.2.0 Notable changes in this new version include support for the Apple Aarch64 ABI, and compare-and-swap atomic instructions. Signed-off-by: Paul Cercueil [Peter: drop _AUTORECONF] Signed-off-by: Peter Korsgaard --- ...e.am-don-t-install-lightning.h-twice.patch | 38 ------------------- package/lightning/lightning.hash | 2 +- package/lightning/lightning.mk | 4 +- 3 files changed, 2 insertions(+), 42 deletions(-) delete mode 100644 package/lightning/0001-include-Makefile.am-don-t-install-lightning.h-twice.patch diff --git a/package/lightning/0001-include-Makefile.am-don-t-install-lightning.h-twice.patch b/package/lightning/0001-include-Makefile.am-don-t-install-lightning.h-twice.patch deleted file mode 100644 index fb5299c25f..0000000000 --- a/package/lightning/0001-include-Makefile.am-don-t-install-lightning.h-twice.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 604c931bc673c507254a84c0f423c9ec8ce6e3a1 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 10 Oct 2019 20:36:46 +0200 -Subject: [PATCH] include/Makefile.am: don't install lightning.h twice - -Commit 17164ed32d8f3530153b9cad67a4399c65f24512 added lightning.h to -nodist_include_HEADERS without removing it from include_HEADERS - -This raises the following error on one of the buildroot autobuilders: -/usr/bin/install -c -m 644 lightning.h '/home/test/autobuild/run/instance-3/output-1/target/usr/include' -/usr/bin/install -c -m 644 lightning.h '/home/test/autobuild/run/instance-3/output-1/target/usr/include' -/usr/bin/install: cannot create regular file `/home/test/autobuild/run/instance-3/output-1/target/usr/include/lightning.h': File exists - -Fix this by removing lightning.h from include_HEADERS - -Fixes: - - http://autobuild.buildroot.org/results/05ebc75598627d2a08e08e194f51cb8464f97b95 - -Signed-off-by: Fabrice Fontaine ---- - include/Makefile.am | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/include/Makefile.am b/include/Makefile.am -index e754dd3..8f91594 100644 ---- a/include/Makefile.am -+++ b/include/Makefile.am -@@ -14,7 +14,6 @@ - # License for more details. - # - --include_HEADERS = lightning.h - SUBDIRS = \ - lightning - --- -2.23.0 - diff --git a/package/lightning/lightning.hash b/package/lightning/lightning.hash index 2840a97f91..998ae3743b 100644 --- a/package/lightning/lightning.hash +++ b/package/lightning/lightning.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ed856b866dc6f68678dc1151579118fab1c65fad687cf847fc2d94ca045efdc9 lightning-2.1.3.tar.gz +sha256 4e3984ff1ccf0ba30a985211d40fc5c06b25f014ebdf3d80d0fe3d0c80dd7c0e lightning-2.2.0.tar.gz sha256 a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c COPYING.LESSER diff --git a/package/lightning/lightning.mk b/package/lightning/lightning.mk index da8c07e61f..8ab2ca1f9d 100644 --- a/package/lightning/lightning.mk +++ b/package/lightning/lightning.mk @@ -4,14 +4,12 @@ # ################################################################################ -LIGHTNING_VERSION = 2.1.3 +LIGHTNING_VERSION = 2.2.0 LIGHTNING_SITE = $(BR2_GNU_MIRROR)/lightning LIGHTNING_LICENSE = LGPL-3.0+ LIGHTNING_LICENSE_FILES = COPYING.LESSER LIGHTNING_INSTALL_STAGING = YES LIGHTNING_CPE_ID_VENDOR = gnu -# We're patching include/Makefile.am -LIGHTNING_AUTORECONF = YES ifeq ($(BR2_PACKAGE_LIGHTNING_DISASSEMBLER),y) LIGHTNING_DEPENDENCIES += binutils zlib From d005917d7256c79b2f50010d48f36846333a457a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 12 Dec 2022 22:43:34 +0100 Subject: [PATCH 0039/5754] package/x11r7/xutil_makedepend: bump version to 1.0.8 Release notes: https://lists.x.org/archives/xorg-announce/2022-December/003300.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xutil_makedepend/xutil_makedepend.hash | 6 +++--- package/x11r7/xutil_makedepend/xutil_makedepend.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/x11r7/xutil_makedepend/xutil_makedepend.hash b/package/x11r7/xutil_makedepend/xutil_makedepend.hash index 3a7496e1a4..e2fe117f10 100644 --- a/package/x11r7/xutil_makedepend/xutil_makedepend.hash +++ b/package/x11r7/xutil_makedepend/xutil_makedepend.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2022-October/003243.html -sha256 a729cfd3c0f4e16c0db1da351e7f53335222e058e3434e84f91251fd6d407065 makedepend-1.0.7.tar.xz -sha512 fd575de737aa56ef8e475d1ddb7b2392e730ee1b23c0b853bbb21975b757c3fc56f94d57ecc5a784dceed2be653feb10909e86fd96fdc074b50fbbd0e27a19db makedepend-1.0.7.tar.xz +# From https://lists.x.org/archives/xorg-announce/2022-December/003300.html +sha256 bfb26f8025189b2a01286ce6daacc2af8fe647440b40bb741dd5c397572cba5b makedepend-1.0.8.tar.xz +sha512 6707b1107c07d4ffbcf008181e877d18a0bcc4aea03860ee1158f5630c7fdce4cf9ad7bee3b38ee420c3a44819ed4b56a6f2428a5b695c0dbd17fb3e60825a6d makedepend-1.0.8.tar.xz # Locally computed sha256 0530078db78c47ae978dc2bd77f4f427e6cd97df868672c95b1ef284113c8cb7 COPYING diff --git a/package/x11r7/xutil_makedepend/xutil_makedepend.mk b/package/x11r7/xutil_makedepend/xutil_makedepend.mk index b16bbe0978..0c4a32c006 100644 --- a/package/x11r7/xutil_makedepend/xutil_makedepend.mk +++ b/package/x11r7/xutil_makedepend/xutil_makedepend.mk @@ -4,7 +4,7 @@ # ################################################################################ -XUTIL_MAKEDEPEND_VERSION = 1.0.7 +XUTIL_MAKEDEPEND_VERSION = 1.0.8 XUTIL_MAKEDEPEND_SOURCE = makedepend-$(XUTIL_MAKEDEPEND_VERSION).tar.xz XUTIL_MAKEDEPEND_SITE = https://xorg.freedesktop.org/archive/individual/util XUTIL_MAKEDEPEND_LICENSE = MIT From 4b879cfe0e2b03373bdedc7ae97b956aa102e486 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 12 Dec 2022 22:58:36 +0100 Subject: [PATCH 0040/5754] package/libfreeglut: bump version to 3.4.0 Release notes: https://github.com/FreeGLUTProject/freeglut/releases/tag/v3.4.0 Upstream switched to github: https://freeglut.sourceforge.net/news.php https://sourceforge.net/p/freeglut/mailman/message/37622871/ Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/libfreeglut/libfreeglut.hash | 5 +---- package/libfreeglut/libfreeglut.mk | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/package/libfreeglut/libfreeglut.hash b/package/libfreeglut/libfreeglut.hash index ce9fb9e299..249a780f04 100644 --- a/package/libfreeglut/libfreeglut.hash +++ b/package/libfreeglut/libfreeglut.hash @@ -1,6 +1,3 @@ -# From http://sourceforge.net/projects/freeglut/files/freeglut/3.2.2/ -md5 485c1976165315fc42c0b0a1802816d9 freeglut-3.2.2.tar.gz -sha1 8e53cc0251165d02cce8d6d5054159c310958b74 freeglut-3.2.2.tar.gz # Locally computed -sha256 c5944a082df0bba96b5756dddb1f75d0cd72ce27b5395c6c1dde85c2ff297a50 freeglut-3.2.2.tar.gz +sha256 3c0bcb915d9b180a97edaebd011b7a1de54583a838644dcd42bb0ea0c6f3eaec freeglut-3.4.0.tar.gz sha256 b6593d5ec4c113a274abb85b10e8615895cb0ddb89f7912af5fe5aa8df38a275 COPYING diff --git a/package/libfreeglut/libfreeglut.mk b/package/libfreeglut/libfreeglut.mk index 484b0f4b97..09309aeceb 100644 --- a/package/libfreeglut/libfreeglut.mk +++ b/package/libfreeglut/libfreeglut.mk @@ -4,9 +4,9 @@ # ################################################################################ -LIBFREEGLUT_VERSION = 3.2.2 +LIBFREEGLUT_VERSION = 3.4.0 LIBFREEGLUT_SOURCE = freeglut-$(LIBFREEGLUT_VERSION).tar.gz -LIBFREEGLUT_SITE = http://downloads.sourceforge.net/freeglut +LIBFREEGLUT_SITE = https://github.com/FreeGLUTProject/freeglut/releases/download/v$(LIBFREEGLUT_VERSION) LIBFREEGLUT_LICENSE = MIT LIBFREEGLUT_LICENSE_FILES = COPYING LIBFREEGLUT_INSTALL_STAGING = YES From 30bc9e5aef772432a9c2753296d89984e0097159 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 12 Dec 2022 23:07:57 +0100 Subject: [PATCH 0041/5754] package/inih: bump version to 56 Release notes: https://github.com/benhoyt/inih/releases/tag/r56 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/inih/inih.hash | 2 +- package/inih/inih.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/inih/inih.hash b/package/inih/inih.hash index af921b294d..e2ed923c7a 100644 --- a/package/inih/inih.hash +++ b/package/inih/inih.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ba55f8ae2a8caf0653f30f48567241e14ea916acfc13481f502d8a9c8f507f68 inih-55.tar.gz +sha256 4f2ba6bd122d30281a8c7a4d5723b7af90b56aa828c0e88256d7fceda03a491a inih-56.tar.gz sha256 9ae3b39e83e9158e44b67733baa3bb2d84e80efdcfb14a5820210a42c7abdf7f LICENSE.txt diff --git a/package/inih/inih.mk b/package/inih/inih.mk index 7f36175576..c43412894a 100644 --- a/package/inih/inih.mk +++ b/package/inih/inih.mk @@ -4,7 +4,7 @@ # ################################################################################ -INIH_VERSION = 55 +INIH_VERSION = 56 INIH_SITE = $(call github,benhoyt,inih,r$(INIH_VERSION)) INIH_INSTALL_STAGING = YES INIH_LICENSE = BSD-3-Clause From b9c948df185f61131133d9d8a8cc39beae0ad299 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 12 Dec 2022 22:32:44 +0100 Subject: [PATCH 0042/5754] package/x11r7/xlib_libXft: bump version to 2.3.7 Release notes: https://lists.x.org/archives/xorg/2022-November/061175.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- 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 484764be3d..5074365aed 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-announce/2022-September/003211.html -sha256 60a6e7319fc938bbb8d098c9bcc86031cc2327b5d086d3335fc5c76323c03022 libXft-2.3.6.tar.xz -sha512 732f8c635fcac6010012ba8c10c23d2dd6ec79b0f096d6bcc9b7e36d2ca0817387faa7ee5bb6f43cff02adc68e4234c1b8f95021ebc548f61c492e0b76836d90 libXft-2.3.6.tar.xz +# 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 # Locally computed sha256 7cda22286b1379b9b73df695f72cbad36595e65b039a5fbc5c89b69ecc44438c COPYING diff --git a/package/x11r7/xlib_libXft/xlib_libXft.mk b/package/x11r7/xlib_libXft/xlib_libXft.mk index a86501900c..845b612669 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.6 +XLIB_LIBXFT_VERSION = 2.3.7 XLIB_LIBXFT_SOURCE = libXft-$(XLIB_LIBXFT_VERSION).tar.xz XLIB_LIBXFT_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXFT_LICENSE = MIT From 10b329956a378f9f3806339355cd6df32133690c Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 12 Dec 2022 22:27:13 +0100 Subject: [PATCH 0043/5754] package/x11r7/xkeyboard-config: bump version to 2.37 Release notes: https://gitlab.freedesktop.org/xorg/data/xkeyboard-config/-/blob/master/NEWS Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- 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 e7e3765e59..08e36da1d0 100644 --- a/package/x11r7/xkeyboard-config/xkeyboard-config.hash +++ b/package/x11r7/xkeyboard-config/xkeyboard-config.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 1f1bb1292a161d520a3485d378609277d108cd07cde0327c16811ff54c3e1595 xkeyboard-config-2.36.tar.xz +sha256 eb1383a5ac4b6210d7c7302b9d6fab052abdf51c5d2c9b55f1f779997ba68c6c xkeyboard-config-2.37.tar.xz sha256 6ca90f4b67dced4062894d6d77f4cc39343df9e359fc12f5e5d3c89ef2a3ef6d COPYING diff --git a/package/x11r7/xkeyboard-config/xkeyboard-config.mk b/package/x11r7/xkeyboard-config/xkeyboard-config.mk index 0f45d9f74a..b82c15a23a 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.36 +XKEYBOARD_CONFIG_VERSION = 2.37 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 b7963d4a5dd86e2fce9c70371d10509220d3bda2 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Wed, 14 Dec 2022 07:25:30 -0700 Subject: [PATCH 0044/5754] package/python-fire: bump to version 0.5.0 Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-fire/python-fire.hash | 4 ++-- package/python-fire/python-fire.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-fire/python-fire.hash b/package/python-fire/python-fire.hash index d86376c52b..ce44bef96e 100644 --- a/package/python-fire/python-fire.hash +++ b/package/python-fire/python-fire.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/fire/json -md5 799be84cbbd7df2cf159cdcb538ab6f9 fire-0.4.0.tar.gz -sha256 c5e2b8763699d1142393a46d0e3e790c5eb2f0706082df8f647878842c216a62 fire-0.4.0.tar.gz +md5 8b24d579bd2a1b344b4f9670fa49ebc8 fire-0.5.0.tar.gz +sha256 a6b0d49e98c8963910021f92bba66f65ab440da2982b78eb1bbf95a0a34aacc6 fire-0.5.0.tar.gz # Locally computed sha256 checksums sha256 a5de77b62266bca0bb97bf058992f0b0f308a83a8ca55ee10fbf6bd8ed8f7ed0 LICENSE diff --git a/package/python-fire/python-fire.mk b/package/python-fire/python-fire.mk index 40631fce86..7a6c31e8a4 100644 --- a/package/python-fire/python-fire.mk +++ b/package/python-fire/python-fire.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FIRE_VERSION = 0.4.0 +PYTHON_FIRE_VERSION = 0.5.0 PYTHON_FIRE_SOURCE = fire-$(PYTHON_FIRE_VERSION).tar.gz -PYTHON_FIRE_SITE = https://files.pythonhosted.org/packages/11/07/a119a1aa04d37bc819940d95ed7e135a7dcca1c098123a3764a6dcace9e7 +PYTHON_FIRE_SITE = https://files.pythonhosted.org/packages/94/ed/3b9a10605163f48517931083aee8364d4d6d3bb1aa9b75eb0a4a5e9fbfc1 PYTHON_FIRE_SETUP_TYPE = setuptools PYTHON_FIRE_LICENSE = Apache-2.0 PYTHON_FIRE_LICENSE_FILES = LICENSE From 08dc145a751aa2d5c13ace718438c8ef084fcc84 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Wed, 14 Dec 2022 23:31:00 +0100 Subject: [PATCH 0045/5754] package/libnss: bump version to 3.86 Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- 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 e3c27170e5..50c5e583af 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_85_RTM/src/SHA256SUMS -sha256 afd9d64510b1154debbd6cab3571e9ff64a3373898e03483e4c85cdada13d297 nss-3.85.tar.gz +# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_86_RTM/src/SHA256SUMS +sha256 3f385fc686476bbba811035fa6821b542475d55747b18c20c221d4d66573b975 nss-3.86.tar.gz # Locally calculated sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index 627bea7de8..cee0e596a1 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSS_VERSION = 3.85 +LIBNSS_VERSION = 3.86 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 8332d747df3dab5fbd038a3adf3726cc6a165c12 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 12 Dec 2022 08:10:11 -0700 Subject: [PATCH 0046/5754] package/python-bleak: bump to version 0.19.5 Signed-off-by: James Hilliard Reviewed-by: Marcin Niestroj 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 9a8310b11c..001ef65b65 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 57564087d6e17ad1853109f530279b27 bleak-0.19.1.tar.gz -sha256 dff7c7f281dcb6629d0d722209c79ec3aa2a6c33867cb5c1ea3d44b72ca155c0 bleak-0.19.1.tar.gz +md5 d038483ec145c3d32c1ef03e04c42621 bleak-0.19.5.tar.gz +sha256 87845a96453c58c19031c735444a7b3156800534bcd3f23ba74e119e9ae3cd88 bleak-0.19.5.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 00a4946ef6..95ac1d1766 100644 --- a/package/python-bleak/python-bleak.mk +++ b/package/python-bleak/python-bleak.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BLEAK_VERSION = 0.19.1 +PYTHON_BLEAK_VERSION = 0.19.5 PYTHON_BLEAK_SOURCE = bleak-$(PYTHON_BLEAK_VERSION).tar.gz -PYTHON_BLEAK_SITE = https://files.pythonhosted.org/packages/30/b9/60e1f455365e2340fe076cf7683f4e6d03db0b759d4f93fa45e68dc371e5 +PYTHON_BLEAK_SITE = https://files.pythonhosted.org/packages/e6/b4/e63829826a157d180831a1c5d3720e75d613c1290cb239510d148b906836 PYTHON_BLEAK_SETUP_TYPE = setuptools PYTHON_BLEAK_LICENSE = MIT PYTHON_BLEAK_LICENSE_FILES = LICENSE From 15f7b944df8be0f20e88f1d2b50534700030981e Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 12 Dec 2022 08:14:29 -0700 Subject: [PATCH 0047/5754] package/python-aiocoap: bump to version 0.4.5 Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-aiocoap/python-aiocoap.hash | 4 ++-- package/python-aiocoap/python-aiocoap.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-aiocoap/python-aiocoap.hash b/package/python-aiocoap/python-aiocoap.hash index 176b3d22c7..ab50ff0958 100644 --- a/package/python-aiocoap/python-aiocoap.hash +++ b/package/python-aiocoap/python-aiocoap.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiocoap/json -md5 218178420e8fc3581001f52eb726b016 aiocoap-0.4.4.tar.gz -sha256 9d7c9626cbc4dc24a91c6b8694cbeb834e376ab7e20e4137609380f726a9540b aiocoap-0.4.4.tar.gz +md5 03ca0411b7401bfd6e9bdaefe09bd88a aiocoap-0.4.5.tar.gz +sha256 906c927822185c8acf04fdcc1dd98fd845f31dabf5d5e395c39137dcbd6ba1e3 aiocoap-0.4.5.tar.gz # Locally computed sha256 checksums sha256 2bb211d412a6bfa4b2a9cf01123c7fe90e5e6185938896e23ab07b84f8494180 LICENSE diff --git a/package/python-aiocoap/python-aiocoap.mk b/package/python-aiocoap/python-aiocoap.mk index 96d8619a84..92f47b7a4f 100644 --- a/package/python-aiocoap/python-aiocoap.mk +++ b/package/python-aiocoap/python-aiocoap.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOCOAP_VERSION = 0.4.4 +PYTHON_AIOCOAP_VERSION = 0.4.5 PYTHON_AIOCOAP_SOURCE = aiocoap-$(PYTHON_AIOCOAP_VERSION).tar.gz -PYTHON_AIOCOAP_SITE = https://files.pythonhosted.org/packages/6a/7c/139993da8dcdfc86446ee6df65b98c68e40c5fcb0caeff3a6b348d9f7d6f +PYTHON_AIOCOAP_SITE = https://files.pythonhosted.org/packages/65/63/9051af6a2fc498f50b71f23bdbde0cc1d1f0a69eb767776dbf6d1411e240 PYTHON_AIOCOAP_SETUP_TYPE = setuptools PYTHON_AIOCOAP_LICENSE = MIT PYTHON_AIOCOAP_LICENSE_FILES = LICENSE From 63cd5db50914536910b67a0a06e05c22ddcc5a22 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 12 Dec 2022 07:44:00 -0700 Subject: [PATCH 0048/5754] package/python-maturin: bump to version 0.14.5 Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- 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 d642119786..9d68751c03 100644 --- a/package/python-maturin/python-maturin.hash +++ b/package/python-maturin/python-maturin.hash @@ -1,5 +1,5 @@ # Locally calculated after vendoring -sha256 dd1ee5cd1bb76c434319f305cd30873be2f8221e310168fc376b53b7d0e166ff maturin-0.14.4.tar.gz +sha256 383f60977a330ec8699a51c37ea9c5175ee7e95fc36b06d9415e0eec1f3acaf0 maturin-0.14.5.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 ea055ffcf6..4570ad4535 100644 --- a/package/python-maturin/python-maturin.mk +++ b/package/python-maturin/python-maturin.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MATURIN_VERSION = 0.14.4 +PYTHON_MATURIN_VERSION = 0.14.5 PYTHON_MATURIN_SOURCE = maturin-$(PYTHON_MATURIN_VERSION).tar.gz -PYTHON_MATURIN_SITE = https://files.pythonhosted.org/packages/7c/51/36749c1a0881a4292e4f334bd9ddb0865e0991a83070834d1aaa1af7443f +PYTHON_MATURIN_SITE = https://files.pythonhosted.org/packages/36/83/2bdec738921e253d774ab8b9e99f4540a406ad0d8a1442c84575e5506686 PYTHON_MATURIN_SETUP_TYPE = setuptools PYTHON_MATURIN_LICENSE = Apache-2.0 or MIT PYTHON_MATURIN_LICENSE_FILES = license-apache license-mit From d4c41ac00c7d144f8aed1644a1b80eca8470d01d Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Mon, 12 Dec 2022 12:49:25 -0600 Subject: [PATCH 0049/5754] package/mtd: add lsmtd option lsmtd is a new utility added in v2.1.0[1]. [1] http://git.infradead.org/mtd-utils.git/commit/c26ce774a7209012c0505ee841d54898c6665e20 Signed-off-by: Brandon Maier Signed-off-by: Peter Korsgaard --- package/mtd/Config.in | 3 +++ package/mtd/mtd.mk | 1 + 2 files changed, 4 insertions(+) diff --git a/package/mtd/Config.in b/package/mtd/Config.in index c45dd1e2b7..3ba48da645 100644 --- a/package/mtd/Config.in +++ b/package/mtd/Config.in @@ -71,6 +71,9 @@ config BR2_PACKAGE_MTD_JFFS2DUMP bool "jffs2dump" select BR2_PACKAGE_MTD_JFFS_UTILS +config BR2_PACKAGE_MTD_LSMTD + bool "lsmtd" + config BR2_PACKAGE_MTD_MKFSJFFS2 bool "mkfs.jffs2" select BR2_PACKAGE_MTD_JFFS_UTILS diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk index 6e266a8760..db2b104586 100644 --- a/package/mtd/mtd.mk +++ b/package/mtd/mtd.mk @@ -94,6 +94,7 @@ MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_UNLOCK) += flash_unlock MTD_TARGETS_$(BR2_PACKAGE_MTD_FTL_CHECK) += ftl_check MTD_TARGETS_$(BR2_PACKAGE_MTD_FTL_FORMAT) += ftl_format MTD_TARGETS_$(BR2_PACKAGE_MTD_JFFS2DUMP) += jffs2dump +MTD_TARGETS_$(BR2_PACKAGE_MTD_LSMTD) += lsmtd MTD_TARGETS_$(BR2_PACKAGE_MTD_MKFSJFFS2) += mkfs.jffs2 MTD_TARGETS_$(BR2_PACKAGE_MTD_MTD_DEBUG) += mtd_debug MTD_TARGETS_$(BR2_PACKAGE_MTD_MTDPART) += mtdpart From af9454f8c1ca7f9dd02daaeb81a52690fac79a22 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 12 Dec 2022 18:26:10 +0100 Subject: [PATCH 0050/5754] package/davfs2: needs glibc davfs2 unconditionally uses fstab.h since https://git.savannah.nongnu.org/cgit/davfs2.git/commit/?id=6e2053cd7f44b0ca58af09905c044c178df34497 resulting in the following build failure since bump to version 1.7.0 in commit 76423bd3a657f0ca197e2301bbb21e4fc9eee992: mount_davfs.c:78:10: fatal error: fstab.h: No such file or directory 78 | #include | ^~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/793c71e4f731a18e203d6eaa3ac8b6e2a9620c27 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/davfs2/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/davfs2/Config.in b/package/davfs2/Config.in index 162753be3e..31a680563c 100644 --- a/package/davfs2/Config.in +++ b/package/davfs2/Config.in @@ -1,10 +1,10 @@ -comment "davfs2 needs a glibc or uClibc toolchain" +comment "davfs2 needs a glibc toolchain" depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_USES_MUSL + depends on !BR2_TOOLCHAIN_USES_GLIBC config BR2_PACKAGE_DAVFS2 bool "davfs2" - depends on !BR2_TOOLCHAIN_USES_MUSL # error.h + depends on BR2_TOOLCHAIN_USES_GLIBC # fstab.h depends on BR2_USE_MMU # fork() select BR2_PACKAGE_NEON select BR2_PACKAGE_NEON_XML From 6081a48f0f6a238236091fb1b302848997e96f72 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 18 Dec 2022 12:13:47 +0100 Subject: [PATCH 0051/5754] package/motion: bump to version 4.5.1 https://github.com/Motion-Project/motion/releases/tag/release-4.5.1 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/motion/motion.hash | 2 +- package/motion/motion.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/motion/motion.hash b/package/motion/motion.hash index 9b99256864..21f74b481f 100644 --- a/package/motion/motion.hash +++ b/package/motion/motion.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 42320a1c7b54a3f0b5a49cecf34a5d752760b28383bc573b3ca1240581786fe5 motion-4.5.0.tar.gz +sha256 0c824276bb23565b7cf10409ebdcb46b85fb1f6abca957252e52290bb1fe473e motion-4.5.1.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/motion/motion.mk b/package/motion/motion.mk index 18fe0eb630..4e9ccdc3f7 100644 --- a/package/motion/motion.mk +++ b/package/motion/motion.mk @@ -4,7 +4,7 @@ # ################################################################################ -MOTION_VERSION = 4.5.0 +MOTION_VERSION = 4.5.1 MOTION_SITE = $(call github,Motion-Project,motion,release-$(MOTION_VERSION)) MOTION_LICENSE = GPL-2.0 MOTION_LICENSE_FILES = LICENSE From 298bcb0455d0cbf4231f4b87a8e132202120ac79 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 18 Dec 2022 12:21:56 +0100 Subject: [PATCH 0052/5754] {linux, linux-headers}: bump 4.{9, 14, 19}.x / 5.{4, 10, 15}.x / 6.0.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 c1c690f4cc..fba3d90e6b 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.0.12" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.0.13" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.145-cip17" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.145-cip17-rt7" 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 9976a44489..9684dc5697 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 89b730edf8942b49e02f9894244205886c9a214d629b35b88c4ff06ee9304f01 linux-6.0.12.tar.xz +sha256 08d3118d6b755769f166de6babed54964393a7c0928029bef11bf55559a72da4 linux-6.0.13.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 fceef6bb79bac494663ccde34453521fc616cd94272fd30564752b3742381b65 linux-5.15.82.tar.xz -sha256 1e0a24bb5510caa18b3601b25e12cc2a1ce123948de551f4f2cdbb40aea707e7 linux-5.10.158.tar.xz -sha256 0c1f552a1d2f63b3ecd4d33189f0003bc91fb8ff79967a7e295d015c280c9a44 linux-5.4.226.tar.xz +sha256 40590843c04c85789105157f69efbd71a4efe87ae2568e40d1b7258c3f747ff3 linux-5.15.83.tar.xz +sha256 1ba9bf57b6bf36d76447d5044b80b746cb5fd61d981c811603dc763b7789cea7 linux-5.10.159.tar.xz +sha256 5eefc5037415f31c942d3cfa430b96c2a273246cf7e51db1e51b1d89887f0593 linux-5.4.227.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 ed4fd861fe9f6cd09f409f00dcccfa691e6d1a61c585723e587575dcb60aeb29 linux-4.9.335.tar.xz -sha256 acd2ee8e03da098fe9f7e52871dd0790850fc32b78657606bdf65bdd94bbf99b linux-4.14.301.tar.xz -sha256 219bce1ac3f542d06fc606ae6bcb10f8ab1940a46c7903113be59afc486c204f linux-4.19.268.tar.xz +sha256 1f6de11306cc9f82fe1d4dd03565cdf43906fa6f77302913d942fd63b77b500c linux-4.9.336.tar.xz +sha256 e32a230d71072a4ee50bd4386aa23ca4e617b8ad07b6f9fb223b65bf004c4c80 linux-4.14.302.tar.xz +sha256 6e0ba5d224ab216b7b938cc9ff2478be7882a884bbdf15374149bade4d58b20a linux-4.19.269.tar.xz # Locally computed sha256 4594c147bdc493c7c286688542bbe65e550fb7bd58e0649ec587a2fe893ec0ee linux-cip-5.10.145-cip17.tar.gz sha256 a5598f7f673b3ef819d6ed24f08d539eecb6febd11673a1d4752a1c05d4ee289 linux-cip-5.10.145-cip17-rt7.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 4c8b1fca27..93f443b78f 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -388,13 +388,13 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.9.335" if BR2_KERNEL_HEADERS_4_9 - default "4.14.301" if BR2_KERNEL_HEADERS_4_14 - default "4.19.268" if BR2_KERNEL_HEADERS_4_19 - default "5.4.226" if BR2_KERNEL_HEADERS_5_4 - default "5.10.158" if BR2_KERNEL_HEADERS_5_10 - default "5.15.82" if BR2_KERNEL_HEADERS_5_15 - default "6.0.12" if BR2_KERNEL_HEADERS_6_0 + default "4.9.336" if BR2_KERNEL_HEADERS_4_9 + default "4.14.302" if BR2_KERNEL_HEADERS_4_14 + default "4.19.269" if BR2_KERNEL_HEADERS_4_19 + default "5.4.227" if BR2_KERNEL_HEADERS_5_4 + default "5.10.159" if BR2_KERNEL_HEADERS_5_10 + default "5.15.83" if BR2_KERNEL_HEADERS_5_15 + default "6.0.13" if BR2_KERNEL_HEADERS_6_0 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 79bb1ab519448993dbd88e21ddf55b5cfc283115 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 18 Dec 2022 12:21:57 +0100 Subject: [PATCH 0053/5754] {toolchain, linux-headers}: add support for 6.1 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 9684dc5697..c7bbb6be99 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 2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb linux-6.1.tar.xz sha256 08d3118d6b755769f166de6babed54964393a7c0928029bef11bf55559a72da4 linux-6.0.13.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc sha256 40590843c04c85789105157f69efbd71a4efe87ae2568e40d1b7258c3f747ff3 linux-5.15.83.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 93f443b78f..cd36c7c763 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -6,7 +6,7 @@ config BR2_PACKAGE_HOST_LINUX_HEADERS choice prompt "Kernel Headers" default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL - default BR2_KERNEL_HEADERS_6_0 + default BR2_KERNEL_HEADERS_6_1 help Select the kernel version to get headers from. @@ -56,6 +56,10 @@ config BR2_KERNEL_HEADERS_5_15 config BR2_KERNEL_HEADERS_6_0 bool "Linux 6.0.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0 + +config BR2_KERNEL_HEADERS_6_1 + bool "Linux 6.1.x kernel headers" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 select BR2_KERNEL_HEADERS_LATEST config BR2_KERNEL_HEADERS_VERSION @@ -133,8 +137,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_1 + bool "6.1.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 + config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_0 - bool "6.0.x or later" + bool "6.0.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_19 @@ -395,6 +403,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "5.10.159" if BR2_KERNEL_HEADERS_5_10 default "5.15.83" if BR2_KERNEL_HEADERS_5_15 default "6.0.13" if BR2_KERNEL_HEADERS_6_0 + default "6.1" 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 \ diff --git a/toolchain/Config.in b/toolchain/Config.in index 4947ab3aae..544b423001 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -591,6 +591,10 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_19 config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0 bool select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_19 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0 select BR2_TOOLCHAIN_HEADERS_LATEST # This should be selected by the latest version, above, to indicate that @@ -604,6 +608,7 @@ config BR2_TOOLCHAIN_HEADERS_LATEST # stops affecting a value on the first matching default. config BR2_TOOLCHAIN_HEADERS_AT_LEAST string + 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 default "5.18" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_18 diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options index a9cb61365f..1c39334ddd 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_1 + bool "6.1.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 + config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_0 - bool "6.0.x or later" + bool "6.0.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_19 From 78504fca92c33cfd23beddd1c9b83fe58b9e0e9a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 18 Dec 2022 12:21:58 +0100 Subject: [PATCH 0054/5754] linux: bump _KERNEL_LATEST_VERSION to 6.1 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 fba3d90e6b..1bca082cbf 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.0)" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0 if BR2_KERNEL_HEADERS_AS_KERNEL + bool "Latest version (6.1)" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 if BR2_KERNEL_HEADERS_AS_KERNEL config BR2_LINUX_KERNEL_LATEST_CIP_VERSION bool "Latest CIP SLTS version (5.10.145-cip17)" @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.0.13" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.1" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.145-cip17" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.145-cip17-rt7" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ From 384b75098ba936277379fbaf6e9b78ad8e6fa25f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 18 Dec 2022 12:38:56 +0100 Subject: [PATCH 0055/5754] package/domoticz: bump to version 2022.2 https://github.com/domoticz/domoticz/blob/2022.2/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, 35 insertions(+), 2 deletions(-) create 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 new file mode 100644 index 0000000000..bc3e60023d --- /dev/null +++ b/package/domoticz/0001-hardware-EnOceanRawValue.h-include-stdarg.h.patch @@ -0,0 +1,33 @@ +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 9de241015c..c439238800 100644 --- a/package/domoticz/domoticz.hash +++ b/package/domoticz/domoticz.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 8282cb71c924b6ef92503976d50f966f2c785eab8f8cffa1136ac133f0241157 domoticz-2022.1.tar.gz +sha256 8f84098bb64bec12ff7aac5f1fb6b6230a88c5781c2b75bc89861caea73cbccf domoticz-2022.2.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 License.txt diff --git a/package/domoticz/domoticz.mk b/package/domoticz/domoticz.mk index bc4a2def41..451021150b 100644 --- a/package/domoticz/domoticz.mk +++ b/package/domoticz/domoticz.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOMOTICZ_VERSION = 2022.1 +DOMOTICZ_VERSION = 2022.2 DOMOTICZ_SITE = $(call github,domoticz,domoticz,$(DOMOTICZ_VERSION)) DOMOTICZ_LICENSE = GPL-3.0 DOMOTICZ_LICENSE_FILES = License.txt From d7c99eaa307d1417c8c8e222290df6512ee872ec Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 13 Dec 2022 18:11:03 +0100 Subject: [PATCH 0056/5754] package/hddtemp: link to libintl when needed Fixes: http://autobuild.buildroot.net/results/e84/e84b7131f996302301dd0a8fd47362c9f2eab0bf/ http://autobuild.buildroot.net/results/524/52428940034d59887e0172fbd8481943d86db13b/ Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/hddtemp/hddtemp.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/hddtemp/hddtemp.mk b/package/hddtemp/hddtemp.mk index 7023e11e59..4f45647dff 100644 --- a/package/hddtemp/hddtemp.mk +++ b/package/hddtemp/hddtemp.mk @@ -15,7 +15,8 @@ HDDTEMP_GETTEXTIZE = YES HDDTEMP_DB_PATH = /usr/share/misc/hddtemp.db HDDTEMP_CONF_OPTS = --with-db-path=$(HDDTEMP_DB_PATH) -HDDTEMP_CONF_ENV = LIBS="$(HDDTEMP_LIBS)" +HDDTEMP_CONF_ENV = LIBS="$(HDDTEMP_LIBS) $(TARGET_NLS_LIBS)" +HDDTEMP_DEPENDENCIES += $(TARGET_NLS_DEPENDENCIES) ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) HDDTEMP_DEPENDENCIES += libexecinfo From b9612601b037e6deb79af300e64e0557dda1be5c Mon Sep 17 00:00:00 2001 From: Andreas Klinger Date: Tue, 13 Dec 2022 15:28:52 +0100 Subject: [PATCH 0057/5754] package/ply: bump to version 2.3.0 Signed-off-by: Andreas Klinger Signed-off-by: Peter Korsgaard --- package/ply/ply.hash | 2 +- package/ply/ply.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ply/ply.hash b/package/ply/ply.hash index df01ae08e0..b6a56aa909 100644 --- a/package/ply/ply.hash +++ b/package/ply/ply.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8cd92fc8784873fb0507bc11f3f62a31d0345c64914ddaadb958d8b2d6de0100 ply-2.2.0.tar.gz +sha256 99be1ed3942370699cbfc7f493bc3ffd4601312a81471215ac7ccb2e04a0a8b2 ply-2.3.0.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/ply/ply.mk b/package/ply/ply.mk index b3c56bd9a5..dc02fc5472 100644 --- a/package/ply/ply.mk +++ b/package/ply/ply.mk @@ -4,7 +4,7 @@ # ################################################################################ -PLY_VERSION = 2.2.0 +PLY_VERSION = 2.3.0 PLY_SITE = $(call github,wkz,ply,$(PLY_VERSION)) PLY_AUTORECONF = YES PLY_LICENSE = GPL-2.0 From 8ef654997caba04dffecdc4105b214abf7d02ae5 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 13 Dec 2022 14:10:49 -0700 Subject: [PATCH 0058/5754] package/swupdate: bump to version 2022.12 Drop patch which is now upstream. Update service files based on latest versions in: https://github.com/sbabic/meta-swupdate/tree/master/recipes-support/swupdate/swupdate Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- ...der.c-fix-build-without-reallocarray.patch | 35 ------------------- package/swupdate/swupdate-usb@.service | 1 + package/swupdate/swupdate.hash | 2 +- package/swupdate/swupdate.mk | 2 +- package/swupdate/swupdate.service | 1 + 5 files changed, 4 insertions(+), 37 deletions(-) delete mode 100644 package/swupdate/0001-swupdate-core-bootloader.c-fix-build-without-reallocarray.patch diff --git a/package/swupdate/0001-swupdate-core-bootloader.c-fix-build-without-reallocarray.patch b/package/swupdate/0001-swupdate-core-bootloader.c-fix-build-without-reallocarray.patch deleted file mode 100644 index d90ae7906e..0000000000 --- a/package/swupdate/0001-swupdate-core-bootloader.c-fix-build-without-reallocarray.patch +++ /dev/null @@ -1,35 +0,0 @@ -From f30c4771e93cad7e77d7f2add94327865d226553 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 15 May 2022 14:53:35 +0200 -Subject: [PATCH] core/bootloader.c: fix build without reallocarray - -Use realloc instead of reallocarray to avoid the following build failure -with uclibc raised since version 2022.05 and -https://github.com/sbabic/swupdate/commit/b8897ed695e1cd954859142b14ec8546d2e7994a: - -microblaze-buildroot-linux-uclibc/bin/ld: core/built-in.o: in function `register_bootloader': -(.text.register_bootloader+0x30): undefined reference to `reallocarray' - -Fixes: - - http://autobuild.buildroot.org/results/7208e8189b4a6f35aaa4ed7777ecdd37421a7c7f - -Signed-off-by: Fabrice Fontaine -Backported from: f30c4771e93cad7e77d7f2add94327865d226553 -Signed-off-by: Ben Hutchings ---- - core/bootloader.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/core/bootloader.c b/core/bootloader.c -index f34cb414..5694d43d 100644 ---- a/core/bootloader.c -+++ b/core/bootloader.c -@@ -25,7 +25,7 @@ static unsigned int num_available = 0; - - int register_bootloader(const char *name, bootloader *bl) - { -- entry *tmp = reallocarray(available, num_available + 1, sizeof(entry)); -+ entry *tmp = realloc(available, (num_available + 1) * sizeof(entry)); - if (!tmp) { - return -ENOMEM; - } diff --git a/package/swupdate/swupdate-usb@.service b/package/swupdate/swupdate-usb@.service index eda9d1539c..df1a408421 100644 --- a/package/swupdate/swupdate-usb@.service +++ b/package/swupdate/swupdate-usb@.service @@ -1,5 +1,6 @@ [Unit] Description=usb media swupdate service +Requires=swupdate.service Requires=swupdate-progress.service [Service] diff --git a/package/swupdate/swupdate.hash b/package/swupdate/swupdate.hash index 638b586e8a..1b26f9e5e2 100644 --- a/package/swupdate/swupdate.hash +++ b/package/swupdate/swupdate.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 1e819f71b19626bde1a4906ced39d3406ca240b458d3c4a998bd9c7333eba260 swupdate-2022.05.tar.gz +sha256 e6335e87812a98a87f1c55df03c9f4e4ef042789570002c5db120b09f64b0d86 swupdate-2022.12.tar.gz sha256 4cf04ed34ff0ebbf5c71345b56e6af5093fc17206364cca0ebbae92ef3940683 LICENSES/BSD-1-Clause.txt sha256 e27a3e87706b3aa5ff2e50eaafe2e6ed5397fbf2d7679eaf444a6d000518a3a6 LICENSES/BSD-3-Clause.txt sha256 0558101984550fa84d1d13c2af11d116c20079d2be58711e8d99cadce7009192 LICENSES/CC0-1.0.txt diff --git a/package/swupdate/swupdate.mk b/package/swupdate/swupdate.mk index 1cd60d1b8f..8f05b83922 100644 --- a/package/swupdate/swupdate.mk +++ b/package/swupdate/swupdate.mk @@ -4,7 +4,7 @@ # ################################################################################ -SWUPDATE_VERSION = 2022.05 +SWUPDATE_VERSION = 2022.12 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 \ diff --git a/package/swupdate/swupdate.service b/package/swupdate/swupdate.service index a3d8d1939e..94d4526acf 100644 --- a/package/swupdate/swupdate.service +++ b/package/swupdate/swupdate.service @@ -4,6 +4,7 @@ Documentation=https://github.com/sbabic/swupdate Documentation=https://sbabic.github.io/swupdate [Service] +Type=notify ExecStart=/usr/lib/swupdate/swupdate.sh KillMode=mixed From 5aceee9b1dc2c1c3e7f22ff2892aa580378d741b Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Wed, 14 Dec 2022 22:52:32 +0100 Subject: [PATCH 0059/5754] package/rtl8189fs: bump to 2022-10-30 version to fix build failure with Linux up to 6.1 Drop local patch that has been upstreamed[0] and drop the endianness handling too since from this commit[1] on it's handled by using Linux macro __LITTLE_ENDIAN. [0]: https://github.com/jwrdegoede/rtl8189ES_linux/commit/4a555ffb77a5947814b6c7f330968318e265c496 [1]: https://github.com/jwrdegoede/rtl8189ES_linux/commit/b3da33576da5359d85c7cfe82716c9a08a592aff Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- ...TRA_CFLAGS-USER_EXTRA_CFLAGS-at-the-.patch | 40 ------------------- package/rtl8189fs/rtl8189fs.hash | 2 +- package/rtl8189fs/rtl8189fs.mk | 10 +---- 3 files changed, 3 insertions(+), 49 deletions(-) delete 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 deleted file mode 100644 index dc4deff9f1..0000000000 --- a/package/rtl8189fs/0001-Makefile-move-EXTRA_CFLAGS-USER_EXTRA_CFLAGS-at-the-.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 4a555ffb77a5947814b6c7f330968318e265c496 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. - -Signed-off-by: Giulio Benetti -[Upstream status: https://github.com/jwrdegoede/rtl8189ES_linux/pull/83] ---- - Makefile | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 8fcb7bd..e4664e9 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,4 +1,3 @@ --EXTRA_CFLAGS += $(USER_EXTRA_CFLAGS) - EXTRA_CFLAGS += -O1 - #EXTRA_CFLAGS += -O3 - #EXTRA_CFLAGS += -Wall -@@ -2239,6 +2238,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.hash b/package/rtl8189fs/rtl8189fs.hash index 1ab41db553..4f117cfd14 100644 --- a/package/rtl8189fs/rtl8189fs.hash +++ b/package/rtl8189fs/rtl8189fs.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 7cc80cb85ed6e7f7d5480e6094c377d3dbcd18a57b58cfba43a7e42ea59fc8d3 rtl8189fs-c93cfd712a3acd2ecdeda19a66d269c20f8803f1.tar.gz +sha256 96347dbfedd95a217fb89b7b295fe417b711dbad3db896ef0c2fa733c6d150fd rtl8189fs-e58bd86c9d9408c648b1246a0dd76b16856ec172.tar.gz diff --git a/package/rtl8189fs/rtl8189fs.mk b/package/rtl8189fs/rtl8189fs.mk index 8b7618fcc8..15a5329a45 100644 --- a/package/rtl8189fs/rtl8189fs.mk +++ b/package/rtl8189fs/rtl8189fs.mk @@ -4,20 +4,14 @@ # ################################################################################ -RTL8189FS_VERSION = c93cfd712a3acd2ecdeda19a66d269c20f8803f1 +RTL8189FS_VERSION = e58bd86c9d9408c648b1246a0dd76b16856ec172 RTL8189FS_SITE = $(call github,jwrdegoede,rtl8189ES_linux,$(RTL8189FS_VERSION)) RTL8189FS_LICENSE = GPL-2.0 -# Undefine the hardcoded CONFIG_LITTLE_ENDIAN -RTL8189FS_USER_EXTRA_CLAGS = -UCONFIG_LITTLE_ENDIAN -# Set endianness -RTL8189FS_USER_EXTRA_CLAGS += -DCONFIG_$(call qstrip,$(BR2_ENDIAN))_ENDIAN - RTL8189FS_MODULE_MAKE_OPTS = \ CONFIG_RTL8189FS=m \ KVER=$(LINUX_VERSION_PROBED) \ - KSRC=$(LINUX_DIR) \ - USER_EXTRA_CFLAGS="$(RTL8189FS_USER_EXTRA_CLAGS)" + KSRC=$(LINUX_DIR) define RTL8189FS_LINUX_CONFIG_FIXUPS $(call KCONFIG_ENABLE_OPT,CONFIG_WIRELESS) From f51e1f9522393864ea1543e581e485f2e7c1e683 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 18 Dec 2022 15:23:18 +0100 Subject: [PATCH 0060/5754] package/supertuxkart: bump version to 1.4 Changelog: https://github.com/supertuxkart/stk-code/blob/1.4/CHANGELOG.md Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/supertuxkart/supertuxkart.hash | 2 +- package/supertuxkart/supertuxkart.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/supertuxkart/supertuxkart.hash b/package/supertuxkart/supertuxkart.hash index 6ae3fae82b..446a9de8ec 100644 --- a/package/supertuxkart/supertuxkart.hash +++ b/package/supertuxkart/supertuxkart.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 eeabeb0d9801688a218f6f0a76ea3546a46a322ccaca9a258148ecacfe083ffd SuperTuxKart-1.3-src.tar.xz +sha256 9890392419baf4715313f14d5ad60746f276eed36eb580636caf44e2532c0f03 SuperTuxKart-1.4-src.tar.xz sha256 d27207a5213f746aac53893e9ecc18456e9595d3ffa662bd1ec9eb10787c214a COPYING diff --git a/package/supertuxkart/supertuxkart.mk b/package/supertuxkart/supertuxkart.mk index 8ec366f792..1f9ad4102b 100644 --- a/package/supertuxkart/supertuxkart.mk +++ b/package/supertuxkart/supertuxkart.mk @@ -4,7 +4,7 @@ # ################################################################################ -SUPERTUXKART_VERSION = 1.3 +SUPERTUXKART_VERSION = 1.4 SUPERTUXKART_SOURCE = SuperTuxKart-$(SUPERTUXKART_VERSION)-src.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 2a2db09451371d317ee119d742a62817d5f41c5f Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Fri, 16 Dec 2022 09:04:31 +0100 Subject: [PATCH 0061/5754] package/rtl8723ds-bt: new package This package install the required firmware for enabling the Bluetooth device embedded in the RTL8723DS chip. The driver is included in Linux main tree and can be enabled with the BT_HCIUART_RTL symbol. Signed-off-by: Angelo Compagnucci Tested-by: Indrek Kruusa [Peter: use install -D] Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + package/Config.in | 1 + package/rtl8723ds-bt/Config.in | 6 ++++++ package/rtl8723ds-bt/rtl8723ds-bt.hash | 2 ++ package/rtl8723ds-bt/rtl8723ds-bt.mk | 18 ++++++++++++++++++ 5 files changed, 28 insertions(+) create mode 100644 package/rtl8723ds-bt/Config.in create mode 100644 package/rtl8723ds-bt/rtl8723ds-bt.hash create mode 100644 package/rtl8723ds-bt/rtl8723ds-bt.mk diff --git a/DEVELOPERS b/DEVELOPERS index 3a0e3c14ab..b52a065dbc 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -185,6 +185,7 @@ F: package/qt5/qt5coap/ F: package/qt5/qt5knx/ F: package/qt5/qt5mqtt/ F: package/rtl8723ds/ +F: package/rtl8723ds-bt/ F: package/sam-ba/ F: package/sshguard/ F: package/sunwait/ diff --git a/package/Config.in b/package/Config.in index 914c3584e9..999feae08a 100644 --- a/package/Config.in +++ b/package/Config.in @@ -585,6 +585,7 @@ endmenu source "package/rtl8192eu/Config.in" source "package/rtl8723bu/Config.in" source "package/rtl8723ds/Config.in" + source "package/rtl8723ds-bt/Config.in" source "package/rtl8812au-aircrack-ng/Config.in" source "package/rtl8821au/Config.in" source "package/sane-backends/Config.in" diff --git a/package/rtl8723ds-bt/Config.in b/package/rtl8723ds-bt/Config.in new file mode 100644 index 0000000000..0a604310c0 --- /dev/null +++ b/package/rtl8723ds-bt/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_RTL8723DS_BT + bool "rtl8723ds-bt" + help + rtl8723ds UART attached Bluetooth module firmware. + + https://github.com/wsyco/RTL8723DS_BT_Linux diff --git a/package/rtl8723ds-bt/rtl8723ds-bt.hash b/package/rtl8723ds-bt/rtl8723ds-bt.hash new file mode 100644 index 0000000000..1ec4e350f9 --- /dev/null +++ b/package/rtl8723ds-bt/rtl8723ds-bt.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 9e70a981946abeeb6437d9a27d8437cea15aa4df72f8d56ded0ae28af484d2f4 rtl8723ds-bt-14cedf3a9fec1aa8c500fa52f3e3acc433cbcf08.tar.gz diff --git a/package/rtl8723ds-bt/rtl8723ds-bt.mk b/package/rtl8723ds-bt/rtl8723ds-bt.mk new file mode 100644 index 0000000000..423ad74df5 --- /dev/null +++ b/package/rtl8723ds-bt/rtl8723ds-bt.mk @@ -0,0 +1,18 @@ +################################################################################ +# +# rtl8723ds-bt +# +################################################################################ + +RTL8723DS_BT_VERSION = 14cedf3a9fec1aa8c500fa52f3e3acc433cbcf08 +RTL8723DS_BT_SITE = $(call github,wsyco,RTL8723DS_BT_Linux,$(RTL8723DS_BT_VERSION)) +RTL8723DS_BT_LICENSE = PROPRIETARY + +define RTL8723DS_BT_INSTALL_TARGET_CMDS + $(INSTALL) -m 644 -D $(@D)/8723D/rtl8723d_fw \ + $(TARGET_DIR)/lib/firmware/rtl_bt/rtl8723ds_fw.bin + $(INSTALL) -m 644 -D $(@D)/8723D/rtl8723d_config \ + $(TARGET_DIR)/lib/firmware/rtl_bt/rtl8723ds_config.bin +endef + +$(eval $(generic-package)) From 286628bcc2d1931807c4648ef4359873bb3ee559 Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Fri, 16 Dec 2022 09:04:32 +0100 Subject: [PATCH 0062/5754] configs/lichee_rv: new defconfig Lichee RV - Nezha CM is a compute module with modular design, equipped with Allwinner D1 chip (based on T-Head XuanTie C906 core), 512MB DDR3 RAM. Board support is based on the nezha defconfig already available in buildroot. https://wiki.sipeed.com/hardware/en/lichee/RV/RV.html https://linux-sunxi.org/Sipeed_Lichee_RV Signed-off-by: Angelo Compagnucci Reviewed-by: Indrek Kruusa Tested-by: Indrek Kruusa Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 ++ board/sipeed/lichee_rv/genimage.cfg | 19 +++++++++++ .../overlay/boot/extlinux/extlinux.conf | 4 +++ board/sipeed/lichee_rv/readme.txt | 26 +++++++++++++++ configs/sipeed_lichee_rv_defconfig | 33 +++++++++++++++++++ 5 files changed, 84 insertions(+) create mode 100644 board/sipeed/lichee_rv/genimage.cfg create mode 100644 board/sipeed/lichee_rv/overlay/boot/extlinux/extlinux.conf create mode 100644 board/sipeed/lichee_rv/readme.txt create mode 100644 configs/sipeed_lichee_rv_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index b52a065dbc..2f27ddb110 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -157,6 +157,8 @@ N: Andrey Yurovsky F: package/rauc/ N: Angelo Compagnucci +F: board/sipeed/lichee_rv/ +F: configs/sipeed_lichee_rv* F: package/apparmor/ F: package/corkscrew/ F: package/cups/ diff --git a/board/sipeed/lichee_rv/genimage.cfg b/board/sipeed/lichee_rv/genimage.cfg new file mode 100644 index 0000000000..d5df41203d --- /dev/null +++ b/board/sipeed/lichee_rv/genimage.cfg @@ -0,0 +1,19 @@ +# Minimal SD card image for the sipeed Lichee RV + +image sdcard.img { + hdimage { + } + + partition u-boot { + in-partition-table = false + image = "u-boot-sunxi-with-spl.bin" + offset = 8K + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + bootable = "true" + offset = 1M + } +} diff --git a/board/sipeed/lichee_rv/overlay/boot/extlinux/extlinux.conf b/board/sipeed/lichee_rv/overlay/boot/extlinux/extlinux.conf new file mode 100644 index 0000000000..91b2298628 --- /dev/null +++ b/board/sipeed/lichee_rv/overlay/boot/extlinux/extlinux.conf @@ -0,0 +1,4 @@ +label linux + kernel /boot/Image + # use devicetree from u-boot + append console=ttyS0,115200 root=/dev/mmcblk0p1 ro rootwait diff --git a/board/sipeed/lichee_rv/readme.txt b/board/sipeed/lichee_rv/readme.txt new file mode 100644 index 0000000000..24e8141851 --- /dev/null +++ b/board/sipeed/lichee_rv/readme.txt @@ -0,0 +1,26 @@ +Lichee RV +=============== + +Lichee RV - Nezha CM is a compute module with modular design, equipped +with Allwinner D1 chip (based on T-Head XuanTie C906 core), 512MB DDR3 RAM. +It can boot from TF card or SD-NAND, uses two sets of M.2 b key 67 pin +connectors to route all IO, making it convient for wide use and easy to replace. + +How to build +============ + +$ make sipeed_lichee_rv_defconfig +$ make + +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 + +Connect a TTL UART to the debug connector, insert the microSD card and +plug in a USB-C cable to the PWR connector to boot the system. diff --git a/configs/sipeed_lichee_rv_defconfig b/configs/sipeed_lichee_rv_defconfig new file mode 100644 index 0000000000..f9782f870b --- /dev/null +++ b/configs/sipeed_lichee_rv_defconfig @@ -0,0 +1,33 @@ +BR2_riscv=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_0=y +BR2_ROOTFS_OVERLAY="board/sipeed/lichee_rv/overlay" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/sipeed/lichee_rv/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,smaeul,linux,ca67838d84af4c9f85d06311c9e98e1adf46308f)/linux-ca67838d84af4c9f85d06311c9e98e1adf46308f.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="nezha" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun20i-d1-lichee-rv" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_OPENSBI=y +BR2_TARGET_OPENSBI_CUSTOM_VERSION=y +BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.1" +BR2_TARGET_OPENSBI_PLAT="generic" +# BR2_TARGET_OPENSBI_INSTALL_JUMP_IMG is not set +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,smaeul,u-boot,528ae9bc6c55edd3ffe642734b4132a8246ea777)/uboot-528ae9bc6c55edd3ffe642734b4132a8246ea777.tar.gz" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="lichee_rv_dock" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_OPENSBI=y +# BR2_TARGET_UBOOT_FORMAT_BIN is not set +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" +BR2_PACKAGE_HOST_GENIMAGE=y From f9ad317507cf8564200b88dda2463406d0171122 Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Fri, 16 Dec 2022 09:04:33 +0100 Subject: [PATCH 0063/5754] configs/lichee_rv_dock: new defconfig Lichee RV Dock is a RISC-V Linux development kits with high integration, small size and affordable price designed for opensource developer. https://wiki.sipeed.com/hardware/en/lichee/RV/Dock.html Signed-off-by: Angelo Compagnucci Tested-by: Indrek Kruusa Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + board/sipeed/lichee_rv_dock/genimage.cfg | 19 ++++++++ board/sipeed/lichee_rv_dock/linux.fragment | 7 +++ .../overlay/etc/network/interfaces | 6 +++ .../overlay/etc/wpa_supplicant.conf | 8 ++++ board/sipeed/lichee_rv_dock/readme.txt | 45 +++++++++++++++++++ configs/sipeed_lichee_rv_dock_defconfig | 41 +++++++++++++++++ 7 files changed, 127 insertions(+) create mode 100644 board/sipeed/lichee_rv_dock/genimage.cfg create mode 100644 board/sipeed/lichee_rv_dock/linux.fragment create mode 100644 board/sipeed/lichee_rv_dock/overlay/etc/network/interfaces create mode 100644 board/sipeed/lichee_rv_dock/overlay/etc/wpa_supplicant.conf create mode 100644 board/sipeed/lichee_rv_dock/readme.txt create mode 100644 configs/sipeed_lichee_rv_dock_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index 2f27ddb110..b0f10148b5 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -158,6 +158,7 @@ F: package/rauc/ N: Angelo Compagnucci F: board/sipeed/lichee_rv/ +F: board/sipeed/lichee_rv_dock/ F: configs/sipeed_lichee_rv* F: package/apparmor/ F: package/corkscrew/ diff --git a/board/sipeed/lichee_rv_dock/genimage.cfg b/board/sipeed/lichee_rv_dock/genimage.cfg new file mode 100644 index 0000000000..38078f0ae3 --- /dev/null +++ b/board/sipeed/lichee_rv_dock/genimage.cfg @@ -0,0 +1,19 @@ +# Minimal SD card image for the sipeed Lichee RV dock + +image sdcard.img { + hdimage { + } + + partition u-boot { + in-partition-table = false + image = "u-boot-sunxi-with-spl.bin" + offset = 8K + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + bootable = "true" + offset = 1M + } +} diff --git a/board/sipeed/lichee_rv_dock/linux.fragment b/board/sipeed/lichee_rv_dock/linux.fragment new file mode 100644 index 0000000000..10016889ab --- /dev/null +++ b/board/sipeed/lichee_rv_dock/linux.fragment @@ -0,0 +1,7 @@ +CONFIG_BT=y +CONFIG_BT_HCIUART=m +CONFIG_BT_HCIUART_SERDEV=y +CONFIG_BT_HCIUART_3WIRE=y +CONFIG_BT_HCIUART_RTL=y +CONFIG_SERIAL_DEV_BUS=y +CONFIG_SERIAL_DEV_CTRL_TTYPORT=y diff --git a/board/sipeed/lichee_rv_dock/overlay/etc/network/interfaces b/board/sipeed/lichee_rv_dock/overlay/etc/network/interfaces new file mode 100644 index 0000000000..89e7d74aff --- /dev/null +++ b/board/sipeed/lichee_rv_dock/overlay/etc/network/interfaces @@ -0,0 +1,6 @@ +auto lo +iface lo inet loopback + +auto wlan0 +iface wlan0 inet dhcp +wpa-conf /etc/wpa_supplicant.conf diff --git a/board/sipeed/lichee_rv_dock/overlay/etc/wpa_supplicant.conf b/board/sipeed/lichee_rv_dock/overlay/etc/wpa_supplicant.conf new file mode 100644 index 0000000000..b43292b0a7 --- /dev/null +++ b/board/sipeed/lichee_rv_dock/overlay/etc/wpa_supplicant.conf @@ -0,0 +1,8 @@ +ap_scan=1 + +network={ + ssid="YOURSSID" + scan_ssid=1 + key_mgmt=WPA-PSK + psk="YOURPASSWD" +} diff --git a/board/sipeed/lichee_rv_dock/readme.txt b/board/sipeed/lichee_rv_dock/readme.txt new file mode 100644 index 0000000000..048ba64d26 --- /dev/null +++ b/board/sipeed/lichee_rv_dock/readme.txt @@ -0,0 +1,45 @@ +Lichee RV dock +=============== + +Lichee RV Dock is a RISC-V Linux development kits with high integration, small +size and affordable price designed for opensource developer. It's equipped with +HDMI interface and it supports many screen by its screen convert board. It's +also equipped with many peripherals, including a UAB-A port, 2.4G Wifi-BT module, +an analog microphone and a speaker jack interface. + +How to build +============ + +$ make sipeed_lichee_rv_dock_defconfig +$ make + +Wifi +========== + +Edit board/sipeed/lichee_rv_dock/overlay/etc/wpa_supplicant.conf or +/etc/wpa_supplicant.conf once connected to the board: + +* Replace YOURSSID with your AP ssid +* Replace YOURPASSWD with your AP password + +Bluetooth +========== + +To make the device discoverable and pairable, once connected to the board: + +* bluetoothctl power on +* bluetoothctl discoverable yes +* bluetoothctl pairable yes + +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 + +Connect a TTL UART to the debug connector, insert the microSD card and +plug in a USB-C cable to the PWR connector to boot the system. diff --git a/configs/sipeed_lichee_rv_dock_defconfig b/configs/sipeed_lichee_rv_dock_defconfig new file mode 100644 index 0000000000..7c8c6788fa --- /dev/null +++ b/configs/sipeed_lichee_rv_dock_defconfig @@ -0,0 +1,41 @@ +BR2_riscv=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_0=y +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y +BR2_ROOTFS_OVERLAY="board/sipeed/lichee_rv/overlay board/sipeed/lichee_rv_dock/overlay" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/sipeed/lichee_rv_dock/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,smaeul,linux,ca67838d84af4c9f85d06311c9e98e1adf46308f)/linux-ca67838d84af4c9f85d06311c9e98e1adf46308f.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="nezha" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun20i-d1-lichee-rv-dock" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/sipeed/lichee_rv_dock/linux.fragment" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_PACKAGE_RTL8723DS=y +BR2_PACKAGE_RTL8723DS_BT=y +BR2_PACKAGE_BLUEZ5_UTILS=y +BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y +BR2_PACKAGE_WPA_SUPPLICANT=y +BR2_PACKAGE_WPA_SUPPLICANT_AUTOSCAN=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_OPENSBI=y +BR2_TARGET_OPENSBI_CUSTOM_VERSION=y +BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.1" +BR2_TARGET_OPENSBI_PLAT="generic" +# BR2_TARGET_OPENSBI_INSTALL_JUMP_IMG is not set +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,smaeul,u-boot,528ae9bc6c55edd3ffe642734b4132a8246ea777)/uboot-528ae9bc6c55edd3ffe642734b4132a8246ea777.tar.gz" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="lichee_rv_dock" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_OPENSBI=y +# BR2_TARGET_UBOOT_FORMAT_BIN is not set +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" +BR2_PACKAGE_HOST_GENIMAGE=y From 66c2d6d4b43776d4afb62b985a082bf2d75cb708 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 12 Dec 2022 18:35:42 +0100 Subject: [PATCH 0064/5754] package/vuejs-router: fix license hash Commit 2fce36d928082685d7f77c3587e15b7827ce0b42 forgot to update LICENSE hash (update in year: https://github.com/vuejs/router/commit/ed238db64b2a605f785ee4e2f847a6788c06a2ea) Fixes: - http://autobuild.buildroot.org/results/beac411246342a9445495bc7c8f6a7e7369b9c53 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/vuejs-router/vuejs-router.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/vuejs-router/vuejs-router.hash b/package/vuejs-router/vuejs-router.hash index 147e730f20..b48e59ef48 100644 --- a/package/vuejs-router/vuejs-router.hash +++ b/package/vuejs-router/vuejs-router.hash @@ -1,3 +1,3 @@ # Locally computed sha256 437558a84b99d0d89743d4897ec16a90a96a1d3a6786e697a8808a044bcb9b8f vue-router-4.1.6.tgz -sha256 9c0015250f592a09d7787efc07152afcf661fff6bda2554359f6d00987828c02 LICENSE +sha256 91a2845c4db44e7497b514b98634a674c737986ad0db81599307cf733bf850b2 LICENSE From 3d923d5f7e61b36f7deee32e1e09b279efd5dcd3 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 18 Dec 2022 23:08:06 +0100 Subject: [PATCH 0065/5754] package/ipcalc: bump to version 1.0.2 https://gitlab.com/ipcalc/ipcalc/-/blob/1.0.2/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/ipcalc/ipcalc.hash | 2 +- package/ipcalc/ipcalc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ipcalc/ipcalc.hash b/package/ipcalc/ipcalc.hash index bf9b34a610..50d08239fa 100644 --- a/package/ipcalc/ipcalc.hash +++ b/package/ipcalc/ipcalc.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 dac080c0773cc14c1d6f818899351d2286cace85751dd9dc704944e54c2c3565 ipcalc-1.0.1.tar.bz2 +sha256 47c866941916800270fca23496acc9976ca9488ce9053aeaedc5f47c5929b772 ipcalc-1.0.2.tar.bz2 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/ipcalc/ipcalc.mk b/package/ipcalc/ipcalc.mk index dfe35e2cdc..e63e174ce2 100644 --- a/package/ipcalc/ipcalc.mk +++ b/package/ipcalc/ipcalc.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPCALC_VERSION = 1.0.1 +IPCALC_VERSION = 1.0.2 IPCALC_SITE = $(call gitlab,ipcalc,ipcalc,$(IPCALC_VERSION)) IPCALC_SOURCE = ipcalc-$(IPCALC_VERSION).tar.bz2 IPCALC_LICENSE = GPL-2.0+ From 163f933692f616c1b73d060aa03bd8323956692f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 18 Dec 2022 23:22:47 +0100 Subject: [PATCH 0066/5754] package/libcoap: bump to version 4.3.1 Update hash of LICENSE file (update in year: https://github.com/obgm/libcoap/commit/43bfbea924e0f5220c4121487df980afe7159346) https://github.com/obgm/libcoap/blob/v4.3.1/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libcoap/libcoap.hash | 4 ++-- package/libcoap/libcoap.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libcoap/libcoap.hash b/package/libcoap/libcoap.hash index 4a5bcaa7ff..e0006b62af 100644 --- a/package/libcoap/libcoap.hash +++ b/package/libcoap/libcoap.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 1a195adacd6188d3b71c476e7b21706fef7f3663ab1fb138652e8da49a9ec556 libcoap-4.3.0.tar.gz +sha256 074a71deca01e06d3acb00a1416d0fbeb87d130f40a3c0f6fda3a5c711855dca libcoap-4.3.1.tar.gz sha256 09dd86a017bad210527085008cbf706609c58210897b69845af14099577e7eb7 COPYING -sha256 c5625e704d52deade1c9b2d7931ac8593be147ba63af62b53b8c7e309b7eaeb9 LICENSE +sha256 5711e8bf7e94b59fcf0681d0f73752111bc196563b60f8568f19dacd0213192b LICENSE diff --git a/package/libcoap/libcoap.mk b/package/libcoap/libcoap.mk index edcc1bbef8..c0a941a0c8 100644 --- a/package/libcoap/libcoap.mk +++ b/package/libcoap/libcoap.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCOAP_VERSION = 4.3.0 +LIBCOAP_VERSION = 4.3.1 LIBCOAP_SITE = $(call github,obgm,libcoap,v$(LIBCOAP_VERSION)) LIBCOAP_INSTALL_STAGING = YES LIBCOAP_LICENSE = BSD-2-Clause From d4386b912db9f9f9a3cf5cbc9165e1609a55309f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 18 Dec 2022 23:29:30 +0100 Subject: [PATCH 0067/5754] package/mpfr: bump to version 4.1.1 https://www.mpfr.org/mpfr-4.1.1 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/mpfr/mpfr.hash | 2 +- package/mpfr/mpfr.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mpfr/mpfr.hash b/package/mpfr/mpfr.hash index 35056f626a..4b0d14c9c2 100644 --- a/package/mpfr/mpfr.hash +++ b/package/mpfr/mpfr.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 0c98a3f1732ff6ca4ea690552079da9c597872d30e96ec28414ee23c95558a7f mpfr-4.1.0.tar.xz +sha256 ffd195bd567dbaffc3b98b23fd00aad0537680c9896171e44fe3ff79e28ac33d mpfr-4.1.1.tar.xz # Hash for license file sha256 e3a994d82e644b03a792a930f574002658412f62407f5fee083f2555c5f23118 COPYING.LESSER diff --git a/package/mpfr/mpfr.mk b/package/mpfr/mpfr.mk index cd558dae0e..8d12c7502b 100644 --- a/package/mpfr/mpfr.mk +++ b/package/mpfr/mpfr.mk @@ -4,7 +4,7 @@ # ################################################################################ -MPFR_VERSION = 4.1.0 +MPFR_VERSION = 4.1.1 MPFR_SITE = http://www.mpfr.org/mpfr-$(MPFR_VERSION) MPFR_SOURCE = mpfr-$(MPFR_VERSION).tar.xz MPFR_LICENSE = LGPL-3.0+ From 58bb71089e52323aea8696a5de2d7687422bde74 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 18 Dec 2022 23:02:11 +0100 Subject: [PATCH 0068/5754] package/gtest: bump to version 1.12.1 https://github.com/google/googletest/releases/tag/release-1.12.1 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/gtest/gtest.hash | 2 +- package/gtest/gtest.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gtest/gtest.hash b/package/gtest/gtest.hash index 1a93684aeb..a6dd15a8d2 100644 --- a/package/gtest/gtest.hash +++ b/package/gtest/gtest.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 2a4f11dce6188b256f3650061525d0fe352069e5c162452818efbbf8d0b5fe1c gtest-1.12.0.tar.gz +sha256 81964fe578e9bd7c94dfdb09c8e4d6e6759e19967e397dbea48d1c10e45d0df2 gtest-1.12.1.tar.gz sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 LICENSE diff --git a/package/gtest/gtest.mk b/package/gtest/gtest.mk index 236c8f3730..a53253228e 100644 --- a/package/gtest/gtest.mk +++ b/package/gtest/gtest.mk @@ -4,7 +4,7 @@ # ################################################################################ -GTEST_VERSION = 1.12.0 +GTEST_VERSION = 1.12.1 GTEST_SITE = $(call github,google,googletest,release-$(GTEST_VERSION)) GTEST_INSTALL_STAGING = YES GTEST_INSTALL_TARGET = NO From 704c62bbc5d30df80002fdd1f6a63bebc0e1842d Mon Sep 17 00:00:00 2001 From: Francois Dugast Date: Mon, 19 Dec 2022 09:57:10 +0100 Subject: [PATCH 0069/5754] configs/visionfive2_defconfig: new defconfig Add a defconfig for the Starfive VisionFive2 board, a board built around the Starfive JH7110 RISC-V 64bit SoC. This board comes with functional lowlevel and U-Boot bootloaders in SPI flash. The defconfig reuses these and only builds a (5.15 based) kernel and rootfs. The factory shipped U-Boot is hard coded to look at MMC partition 3. Signed-off-by: Francois Dugast [Peter: add to DEVELOPERS] Signed-off-by: Peter Korsgaard --- DEVELOPERS | 4 +++ board/visionfive2/genimage.cfg | 21 +++++++++++++ .../overlay/boot/extlinux/extlinux.conf | 4 +++ board/visionfive2/readme.txt | 30 +++++++++++++++++++ configs/visionfive2_defconfig | 18 +++++++++++ 5 files changed, 77 insertions(+) create mode 100644 board/visionfive2/genimage.cfg create mode 100644 board/visionfive2/overlay/boot/extlinux/extlinux.conf create mode 100644 board/visionfive2/readme.txt create mode 100644 configs/visionfive2_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index b0f10148b5..a200edb7f5 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1029,6 +1029,10 @@ F: package/tbb/ N: Francisco Gonzalez F: package/ser2net/ +N: Francois Dugast +F: board/visionfive2/ +F: configs/visionfive2_defconfig + N: Francois Perrad F: board/freescale/ls1028ardb/ F: board/olimex/a20_olinuxino diff --git a/board/visionfive2/genimage.cfg b/board/visionfive2/genimage.cfg new file mode 100644 index 0000000000..c221b49c7b --- /dev/null +++ b/board/visionfive2/genimage.cfg @@ -0,0 +1,21 @@ +# Minimal SD card image for the Starfive VisionFive2 board + +image sdcard.img { + hdimage { + } + + # u-boot is hard coded to look at 3rd partition + partition dummy1 { + size = 512 + } + + partition dummy2 { + size = 512 + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + bootable = "true" + } +} diff --git a/board/visionfive2/overlay/boot/extlinux/extlinux.conf b/board/visionfive2/overlay/boot/extlinux/extlinux.conf new file mode 100644 index 0000000000..6e2c5660d6 --- /dev/null +++ b/board/visionfive2/overlay/boot/extlinux/extlinux.conf @@ -0,0 +1,4 @@ +label linux + kernel /boot/Image + devicetree /boot/jh7110-visionfive-v2.dtb + append console=ttyS0,115200 root=/dev/mmcblk1p3 diff --git a/board/visionfive2/readme.txt b/board/visionfive2/readme.txt new file mode 100644 index 0000000000..2da98f3847 --- /dev/null +++ b/board/visionfive2/readme.txt @@ -0,0 +1,30 @@ +Starfive VisionFive2 +==================== + +The VisionFive2 is a low-cost RISC-V 64-bit based platform, powered by a +Starfive JH7110 processor. + +How to build +============ + +$ make visionfive2_defconfig +$ make + +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 + +Preparing the board +=================== + +Connect a TTL UART cable to pin 6 (GND), 8 (TX) and 10 (RX). + +Insert your SD card. + +Power-up the board using an USB-C cable. diff --git a/configs/visionfive2_defconfig b/configs/visionfive2_defconfig new file mode 100644 index 0000000000..5b07a8efbc --- /dev/null +++ b/configs/visionfive2_defconfig @@ -0,0 +1,18 @@ +BR2_riscv=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_SYSTEM_DHCP="eth0" +BR2_ROOTFS_OVERLAY="board/visionfive2/overlay" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/visionfive/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,starfive-tech,linux,7b7b4eddd8d5ae55f6e0ee09b93e16e23ab4f97b)/linux-7b7b4eddd8d5ae55f6e0ee09b93e16e23ab4f97b.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="starfive_visionfive2" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="starfive/jh7110-visionfive-v2" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +# BR2_TARGET_ROOTFS_TAR is not set +BR2_PACKAGE_HOST_GENIMAGE=y From bed9b6cd02cf26a8d9b26f876f3f46a7352e6542 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 19 Dec 2022 09:51:40 +0100 Subject: [PATCH 0070/5754] configs/nezha_defconfig: use 6.1 kernel headers The kernel used is based on 6.1-rc3, so use the recently introduced 6.1 kernel headers version to fix a build issue: Incorrect selection of kernel headers: expected 6.0.x, got 6.1.x Signed-off-by: Peter Korsgaard --- configs/nezha_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/nezha_defconfig b/configs/nezha_defconfig index 2936746c49..854392f929 100644 --- a/configs/nezha_defconfig +++ b/configs/nezha_defconfig @@ -1,5 +1,5 @@ BR2_riscv=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_0=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_OVERLAY="board/nezha/overlay" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" From dfbe4215cd19cfe95922ba8536b61f44a6ce8140 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 19 Dec 2022 09:51:42 +0100 Subject: [PATCH 0071/5754] configs/sipeed_lichee_rv_dock_defconfig: use 6.1 kernel headers The kernel used is based on 6.1-rc3, so use the recently introduced 6.1 kernel headers version to fix a build issue: Incorrect selection of kernel headers: expected 6.0.x, got 6.1.x Signed-off-by: Peter Korsgaard --- configs/sipeed_lichee_rv_dock_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/sipeed_lichee_rv_dock_defconfig b/configs/sipeed_lichee_rv_dock_defconfig index 7c8c6788fa..807209eeec 100644 --- a/configs/sipeed_lichee_rv_dock_defconfig +++ b/configs/sipeed_lichee_rv_dock_defconfig @@ -1,5 +1,5 @@ BR2_riscv=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_0=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y BR2_ROOTFS_OVERLAY="board/sipeed/lichee_rv/overlay board/sipeed/lichee_rv_dock/overlay" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" From 73125c7412d4c73eb69d237f059718a1d1ba0bd8 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 19 Dec 2022 09:51:41 +0100 Subject: [PATCH 0072/5754] configs/sipeed_licheee_rv_defconfig: use 6.1 kernel headers The kernel used is based on 6.1-rc3, so use the recently introduced 6.1 kernel headers version to fix a build issue: Incorrect selection of kernel headers: expected 6.0.x, got 6.1.x Signed-off-by: Peter Korsgaard --- configs/sipeed_lichee_rv_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/sipeed_lichee_rv_defconfig b/configs/sipeed_lichee_rv_defconfig index f9782f870b..f03a6b4f69 100644 --- a/configs/sipeed_lichee_rv_defconfig +++ b/configs/sipeed_lichee_rv_defconfig @@ -1,5 +1,5 @@ BR2_riscv=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_0=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_ROOTFS_OVERLAY="board/sipeed/lichee_rv/overlay" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/sipeed/lichee_rv/genimage.cfg" From 3ddf15854deb5f03a4c98afa6c86f9f3b4d6893c Mon Sep 17 00:00:00 2001 From: Kory Maincent Date: Mon, 19 Dec 2022 14:39:30 +0100 Subject: [PATCH 0073/5754] package/gcnano-binaries: bump version to 6.4.9 Update to the latest version of the gcnano-binaries blobs, which are compatible with the last v5.15-stm32mp-r2 kernel from the STMicroelectronics BSP. The management of libraries links have now changed. We moved on from a version with several links present but few of them missing to no links at all. Now, all the links are made by the build system. The loop mechanism to make them are imported from the ST Yocto layer. The packageconfig have also changed, no need to update prefix and version value anymore. Signed-off-by: Kory Maincent Signed-off-by: Peter Korsgaard --- package/gcnano-binaries/gcnano-binaries.hash | 2 +- package/gcnano-binaries/gcnano-binaries.mk | 30 ++++++++------------ 2 files changed, 13 insertions(+), 19 deletions(-) diff --git a/package/gcnano-binaries/gcnano-binaries.hash b/package/gcnano-binaries/gcnano-binaries.hash index 1ed66e3753..7bb942e6da 100644 --- a/package/gcnano-binaries/gcnano-binaries.hash +++ b/package/gcnano-binaries/gcnano-binaries.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d3aebbc87ca27e743fdd21d71025cdf0761af748907bbdd7b193262eb48ab3c7 gcnano-binaries-a20611434ef048d3d0c04f55b6cd7d75a2156d43.tar.gz +sha256 b122a0cd7a1bd2cee8c6117b259ef977a765d24e48655f639694cbef471da99b gcnano-binaries-0ac1a89d7a59d040a69745a85f0da7e98644cc4b.tar.gz sha256 7d209718473d18f69f75adb7caf9cb5d4b0a31da068756aa011bea617de3dc57 EULA diff --git a/package/gcnano-binaries/gcnano-binaries.mk b/package/gcnano-binaries/gcnano-binaries.mk index d9c47bf64e..83261f3b7c 100644 --- a/package/gcnano-binaries/gcnano-binaries.mk +++ b/package/gcnano-binaries/gcnano-binaries.mk @@ -4,10 +4,10 @@ # ################################################################################ -GCNANO_BINARIES_LIB_VERSION = 6.4.7 +GCNANO_BINARIES_LIB_VERSION = 6.4.9 GCNANO_BINARIES_DRIVER_VERSION = $(GCNANO_BINARIES_LIB_VERSION) -GCNANO_BINARIES_USERLAND_VERSION = $(GCNANO_BINARIES_LIB_VERSION)-20220524 -GCNANO_BINARIES_VERSION = a20611434ef048d3d0c04f55b6cd7d75a2156d43 +GCNANO_BINARIES_USERLAND_VERSION = $(GCNANO_BINARIES_LIB_VERSION)-20221206 +GCNANO_BINARIES_VERSION = 0ac1a89d7a59d040a69745a85f0da7e98644cc4b GCNANO_BINARIES_SITE = $(call github,STMicroelectronics,gcnano-binaries,$(GCNANO_BINARIES_VERSION)) GCNANO_BINARIES_LICENSE = MIT, Vivante End User Software License Terms @@ -38,31 +38,25 @@ GCNANO_BINARIES_POST_EXTRACT_HOOKS += GCNANO_BINARIES_EXTRACT_HELPER GCNANO_BINARIES_MODULE_MAKE_OPTS = \ KERNEL_DIR=$(LINUX_DIR) \ - SOC_PLATFORM=st-st \ + SOC_PLATFORM=st-mp1 \ AQROOT=$(@D) \ DEBUG=0 GCNANO_BINARIES_USERLAND_SUBDIR = gcnano-userland-multi-$(GCNANO_BINARIES_USERLAND_VERSION) -# This creates: -# libGLESv2.so.2 -> libGLESv2.so -# libGLESv1_CM.so.1 -> libGLESv1_CM.so -# symlinks, as most OpenGL implementations have them, and they are -# expected by some users such as libepoxy. define GCNANO_BINARIES_INSTALL cd $(@D)/$(GCNANO_BINARIES_USERLAND_SUBDIR)/release/drivers/ ; \ find . -type f -exec $(INSTALL) -D -m 0755 {} $(1)/usr/lib/{} \; ; \ - find . -type l -exec cp -a {} $(1)/usr/lib \; - ln -sf libGLESv2.so $(1)/usr/lib/libGLESv2.so.2 - ln -sf libGLESv1_CM.so $(1)/usr/lib/libGLESv1_CM.so.1 + for sharelib in *.so.*; do \ + dev_lib_name=`echo $${sharelib} | awk -F'.so' '{print $$1}'`.so ; \ + link_name=`$(TARGET_OBJDUMP) -x $${sharelib} 2>/dev/null | grep SONAME | sed 's/.* //'` ; \ + ln -sf $${sharelib} $(1)/usr/lib/$${dev_lib_name} ; \ + ln -sf $${sharelib} $(1)/usr/lib/$${link_name} ; \ + done mkdir -p $(1)/usr/include cp -a $(@D)/$(GCNANO_BINARIES_USERLAND_SUBDIR)/release/include/* $(1)/usr/include/ - ln -sf gbm/gbm.h $(1)/usr/include/gbm.h - cd $(@D)/$(GCNANO_BINARIES_USERLAND_SUBDIR)/pkgconfig/ ; \ - for file in *.pc ; do \ - sed -e "s|#PREFIX#|/usr|" -e "s|#VERSION#|21.1.1|" $$file > $$file.temp ; \ - $(INSTALL) -D -m 0644 $$file.temp $(1)/usr/lib/pkgconfig/$$file ; \ - done + mkdir -p $(1)/usr/lib/pkgconfig/ + cp -a $(@D)/$(GCNANO_BINARIES_USERLAND_SUBDIR)/pkgconfig/* $(1)/usr/lib/pkgconfig/ endef define GCNANO_BINARIES_INSTALL_TARGET_CMDS From 7dbe844bae38aba8e6080da3b650b89f702c0f1c Mon Sep 17 00:00:00 2001 From: Thomas Devoogdt Date: Mon, 12 Dec 2022 16:35:34 +0100 Subject: [PATCH 0074/5754] package/unifdef: add new package A small package that does "Selectively remove C preprocessor conditionals". The package will be needed for the upcoming webkitgtk 2.40.0 release. I personally added it to get started with 2.39.2. See: https://github.com/WebKit/WebKit/commit/f76a7e30e5749af897b83cc75b2534b1afa32552 Signed-off-by: Thomas Devoogdt [Peter: use prefix=] Signed-off-by: Peter Korsgaard --- .../0001-Makefile-fix-error-on-install.patch | 31 +++++++++++++++++++ package/unifdef/unifdef.hash | 3 ++ package/unifdef/unifdef.mk | 20 ++++++++++++ 3 files changed, 54 insertions(+) create mode 100644 package/unifdef/0001-Makefile-fix-error-on-install.patch create mode 100644 package/unifdef/unifdef.hash create mode 100644 package/unifdef/unifdef.mk diff --git a/package/unifdef/0001-Makefile-fix-error-on-install.patch b/package/unifdef/0001-Makefile-fix-error-on-install.patch new file mode 100644 index 0000000000..c959a41c5a --- /dev/null +++ b/package/unifdef/0001-Makefile-fix-error-on-install.patch @@ -0,0 +1,31 @@ +From b5e4229918c13bc0c11a523105cdb3a464337b37 Mon Sep 17 00:00:00 2001 +From: Thomas Devoogdt +Date: Mon, 12 Dec 2022 12:59:59 +0100 +Subject: [PATCH] Makefile: fix error on install + +ln: failed to create symbolic link '/home/thomas/Documents/buildroot/output/host/share/man/man1/unifdefall.1': File exists + +Seen while trying to add this package to buildroot.org. + +(upstream: https://github.com/fanf2/unifdef/pull/16) +Signed-off-by: Thomas Devoogdt +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 36c7028..485927a 100644 +--- a/Makefile ++++ b/Makefile +@@ -28,7 +28,7 @@ install: unifdef unifdefall.sh unifdef.1 + : manual + install -m 755 -d ${man1dest} + install -m 644 unifdef.1 ${man1dest}/ +- ln -s unifdef.1 ${man1dest}/unifdefall.1 ++ ln -f -s unifdef.1 ${man1dest}/unifdefall.1 + + clean: + rm -f unifdef version.h +-- +2.38.1 + diff --git a/package/unifdef/unifdef.hash b/package/unifdef/unifdef.hash new file mode 100644 index 0000000000..c3a6b7465c --- /dev/null +++ b/package/unifdef/unifdef.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 fba564a24db7b97ebe9329713ac970627b902e5e9e8b14e19e024eb6e278d10b unifdef-2.12.tar.gz +sha256 37ed46a39446b15b08af418fda23b75c27a769d5aad236d817ee7522cc9caeee COPYING diff --git a/package/unifdef/unifdef.mk b/package/unifdef/unifdef.mk new file mode 100644 index 0000000000..7d10595d1b --- /dev/null +++ b/package/unifdef/unifdef.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# unifdef +# +################################################################################ + +UNIFDEF_VERSION = 2.12 +UNIFDEF_SITE = https://dotat.at/prog/unifdef +UNIFDEF_LICENSE = BSD-2-Clause +UNIFDEF_LICENSE_FILES = COPYING + +define HOST_UNIFDEF_BUILD_CMDS + $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) +endef + +define HOST_UNIFDEF_INSTALL_CMDS + $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) prefix=$(HOST_DIR) install +endef + +$(eval $(host-generic-package)) From 1100ead7b3189761765988504609447c88e22da5 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 12 Dec 2022 22:14:28 +0100 Subject: [PATCH 0075/5754] package/x11r7/xdriver_xf86-input-keyboard: remove package According to the upstream release notes of version 2.0.0: https://lists.x.org/archives/xorg-announce/2022-July/003180.html "This keyboard driver is primarily used with BSD, GNU Hurd, illumos, & Solaris systems. Linux systems should instead use either xf86-input- libinput or xf86-input-evdev. While versions 1.9.0 and earlier had rudimentary support for Linux as well, that has been removed in this release." Signed-off-by: Bernd Kuhls [Peter: Reword help text] Signed-off-by: Peter Korsgaard --- Config.in.legacy | 5 +++++ package/x11r7/Config.in | 1 - .../x11r7/xdriver_xf86-input-keyboard/Config.in | 5 ----- .../xdriver_xf86-input-keyboard.hash | 4 ---- .../xdriver_xf86-input-keyboard.mk | 15 --------------- 5 files changed, 5 insertions(+), 25 deletions(-) delete mode 100644 package/x11r7/xdriver_xf86-input-keyboard/Config.in delete mode 100644 package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.hash delete mode 100644 package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk diff --git a/Config.in.legacy b/Config.in.legacy index 852189f0ff..ca25c18b16 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,11 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_XDRIVER_XF86_INPUT_KEYBOARD + bool "xf86-input-keyboard removed" + help + The X.org keyboard input driver no longer support Linux. + config BR2_TARGET_SUN20I_D1_SPL bool "sun20-d1-spl removed" select BR2_LEGACY diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in index da79c4e851..4d3613cf4d 100644 --- a/package/x11r7/Config.in +++ b/package/x11r7/Config.in @@ -149,7 +149,6 @@ if BR2_PACKAGE_XORG7 menu "X11R7 Drivers" source package/x11r7/xdriver_xf86-input-evdev/Config.in source package/x11r7/xdriver_xf86-input-joystick/Config.in - source package/x11r7/xdriver_xf86-input-keyboard/Config.in source package/x11r7/xdriver_xf86-input-libinput/Config.in source package/x11r7/xdriver_xf86-input-mouse/Config.in source package/x11r7/xdriver_xf86-input-synaptics/Config.in diff --git a/package/x11r7/xdriver_xf86-input-keyboard/Config.in b/package/x11r7/xdriver_xf86-input-keyboard/Config.in deleted file mode 100644 index ee23033b97..0000000000 --- a/package/x11r7/xdriver_xf86-input-keyboard/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XDRIVER_XF86_INPUT_KEYBOARD - bool "xf86-input-keyboard" - select BR2_PACKAGE_XORGPROTO - help - Keyboard input driver diff --git a/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.hash b/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.hash deleted file mode 100644 index 66e2c3ed95..0000000000 --- a/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From https://lists.x.org/archives/xorg-announce/2016-November/002739.html -sha256 f7c900f21752683402992b288d5a2826de7a6c0c0abac2aadd7e8a409e170388 xf86-input-keyboard-1.9.0.tar.bz2 -# Locally calculated -sha256 b91b17c53724c79685e3025a38028b7d48c966fdd239e0efe2d98874d3c139a0 COPYING diff --git a/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk b/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk deleted file mode 100644 index fb1e289643..0000000000 --- a/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# xdriver_xf86-input-keyboard -# -################################################################################ - -XDRIVER_XF86_INPUT_KEYBOARD_VERSION = 1.9.0 -XDRIVER_XF86_INPUT_KEYBOARD_SOURCE = xf86-input-keyboard-$(XDRIVER_XF86_INPUT_KEYBOARD_VERSION).tar.bz2 -XDRIVER_XF86_INPUT_KEYBOARD_SITE = http://xorg.freedesktop.org/releases/individual/driver -XDRIVER_XF86_INPUT_KEYBOARD_LICENSE = MIT -XDRIVER_XF86_INPUT_KEYBOARD_LICENSE_FILES = COPYING -XDRIVER_XF86_INPUT_KEYBOARD_DEPENDENCIES = xserver_xorg-server xorgproto -XDRIVER_XF86_INPUT_KEYBOARD_CONF_OPTS = --disable-selective-werror - -$(eval $(autotools-package)) From 447abe169af7e69a82a3e0218670006a42914053 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Tue, 13 Dec 2022 21:32:36 +0100 Subject: [PATCH 0076/5754] package/rtl8192eu: fix build failure on Big Endian architectures Let's disable the CONFIG_PLATFORM_I386_PC that is set to y by default involving the endianness to be set to little. This way we can set the CFLAGS according to architecture with some default define like: -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT -Wno-error Suggested-by: Arnout Vandecappelle Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- package/rtl8192eu/rtl8192eu.mk | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/package/rtl8192eu/rtl8192eu.mk b/package/rtl8192eu/rtl8192eu.mk index e1688eef1b..d967db90b8 100644 --- a/package/rtl8192eu/rtl8192eu.mk +++ b/package/rtl8192eu/rtl8192eu.mk @@ -7,9 +7,16 @@ RTL8192EU_VERSION = 94bce7798bbb18de6d8b1646dedb2511f24867d3 RTL8192EU_SITE = $(call github,clnhub,rtl8192eu-linux,$(RTL8192EU_VERSION)) RTL8192EU_LICENSE = GPL-2.0 + +RTL8192EU_USER_EXTRA_CFLAGS = -DCONFIG_$(call qstrip,$(BR2_ENDIAN))_ENDIAN \ + -DCONFIG_IOCTL_CFG80211 \ + -DRTW_USE_CFG80211_STA_EVENT \ + -Wno-error + RTL8192EU_MODULE_MAKE_OPTS = \ + CONFIG_PLATFORM_I386_PC=n \ CONFIG_RTL8192EU=m \ - USER_EXTRA_CFLAGS="-Wno-error" + USER_EXTRA_CFLAGS="$(RTL8192EU_USER_EXTRA_CFLAGS)" define RTL8192EU_LINUX_CONFIG_FIXUPS $(call KCONFIG_ENABLE_OPT,CONFIG_NET) From 9abb21ab314cb5d5000334fd9399521104d64043 Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Mon, 19 Dec 2022 12:23:08 -0800 Subject: [PATCH 0077/5754] package/libgpg-error: Disable support for non-C languages The only other language supported is CL (Common Lisp) which buildroot does not package yet. This saves 52KB in the final root filesystem. Signed-off-by: Florian Fainelli [yann.morin.1998@free.fr: reformat for one-option per-line] Signed-off-by: Yann E. MORIN --- package/libgpg-error/libgpg-error.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/libgpg-error/libgpg-error.mk b/package/libgpg-error/libgpg-error.mk index 86dea6ad2a..252d95ac7f 100644 --- a/package/libgpg-error/libgpg-error.mk +++ b/package/libgpg-error/libgpg-error.mk @@ -13,8 +13,10 @@ LIBGPG_ERROR_CPE_ID_VENDOR = gnupg LIBGPG_ERROR_INSTALL_STAGING = YES LIBGPG_ERROR_CONFIG_SCRIPTS = gpg-error-config LIBGPG_ERROR_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) -LIBGPG_ERROR_CONF_OPTS = --disable-tests \ - --host=$(BR2_PACKAGE_LIBGPG_ERROR_SYSCFG) +LIBGPG_ERROR_CONF_OPTS = \ + --host=$(BR2_PACKAGE_LIBGPG_ERROR_SYSCFG) \ + --disable-tests \ + --disable-languages ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) LIBGPG_ERROR_CONF_OPTS += --enable-threads From 072df09e2f62e6d797df743b0ebf42a6a5910ff9 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Mon, 19 Dec 2022 22:46:20 +0100 Subject: [PATCH 0078/5754] utils/scancpan: update cpan.org and spdx.org URLs from http to https Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- utils/scancpan | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/utils/scancpan b/utils/scancpan index 075f193563..168619164f 100755 --- a/utils/scancpan +++ b/utils/scancpan @@ -31,7 +31,7 @@ $fatpacked{"MetaCPAN/API/Tiny.pm"} = <<'METACPAN_API_TINY'; if $params{ua_args} && ref($params{ua_args}) ne 'ARRAY'; my $self = +{ - base_url => $params{base_url} || 'http://api.metacpan.org/v0', + base_url => $params{base_url} || 'https://api.metacpan.org/v0', ua => $params{ua} || HTTP::Tiny->new( $params{ua_args} ? @{$params{ua_args}} @@ -525,8 +525,8 @@ my %deps_build; # name -> list of host dependencies my %deps_runtime; # name -> list of target dependencies my %license_files; # name -> hash of license files my %checksum; # author -> list of checksum -my $mirror = 'http://cpan.metacpan.org'; # a CPAN mirror -my $mcpan = MetaCPAN::API::Tiny->new(base_url => 'http://fastapi.metacpan.org/v1'); +my $mirror = 'https://cpan.metacpan.org'; # a CPAN mirror +my $mcpan = MetaCPAN::API::Tiny->new(base_url => 'https://fastapi.metacpan.org/v1'); my $ua = HTTP::Tiny->new(); my $new_pkgs; @@ -698,7 +698,7 @@ sub brname { return uc $name; } -# Buildroot requires license name as in http://spdx.org/licenses/ +# Buildroot requires license name as in https://spdx.org/licenses/ sub brlicense { my $license = shift; $license =~ s|apache_1_1|Apache-1.1|; From 4cbef389f3e10d1cbdcd9961fb128dfd9b85debf Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 20 Dec 2022 17:20:03 +0100 Subject: [PATCH 0079/5754] utils/scancpan: bump required perl version As the comment in package/perl/perl.mk instructs, bumping the perl version must be propagated to utils/scancpan as well. However, commit 7c1ef8129f37 (package/perl: bump to version 5.34.0) forgot to do so. Fixes: 7c1ef8129f37 Signed-off-by: Yann E. MORIN --- utils/scancpan | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/scancpan b/utils/scancpan index 168619164f..48f8bd83b7 100755 --- a/utils/scancpan +++ b/utils/scancpan @@ -488,9 +488,9 @@ use Digest::SHA qw(sha256_hex); use Text::Wrap; $Text::Wrap::columns = 62; -# Below, 5.032 should be aligned with the version of perl actually +# Below, 5.034 should be aligned with the version of perl actually # bundled in Buildroot: -die <<"MSG" if $] < 5.032; +die <<"MSG" if $] < 5.034; This script needs a host perl with the same major version as Buildroot target perl. Your current host perl is: @@ -498,7 +498,7 @@ Your current host perl is: version $] You may install a local one by running: - perlbrew install perl-5.32.0 + perlbrew install perl-5.34.0 MSG my ($help, $man, $quiet, $force, $recommend, $test, $host); From af1f90cc07e1b74cbda92402926bbcb88a722a93 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 19 Dec 2022 23:58:20 +0100 Subject: [PATCH 0080/5754] package/lightning; fix build Fix the following build failure raised since bump to version 2.2.0 in commit af6f7aa76db5aed1eada0b27bd0375610a2fc728 and 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 Signed-off-by: Yann E. MORIN --- .../0001-lib-jit_disasm.c-fix-build.patch | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 package/lightning/0001-lib-jit_disasm.c-fix-build.patch diff --git a/package/lightning/0001-lib-jit_disasm.c-fix-build.patch b/package/lightning/0001-lib-jit_disasm.c-fix-build.patch new file mode 100644 index 0000000000..9e79be91a0 --- /dev/null +++ b/package/lightning/0001-lib-jit_disasm.c-fix-build.patch @@ -0,0 +1,42 @@ +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 + From add21fd600b2db4dbb930e2e62b9fbb1b72cceb9 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Tue, 20 Dec 2022 19:03:06 +0100 Subject: [PATCH 0081/5754] Config.in: update default CPAN mirror to https, update mirrors URL The http site automatically redirects to the https variant, so let's just use that as the default. The mirror list URL http://search.cpan.org/mirror seems outdated (re-directed to https://metacpan.org/mirrors aka 'Not Found - The resource you requested could not be found.'). The closest matching URLs we found were: https://www.cpan.org/SITES.html http://mirrors.cpan.org/map.html http://mirrors.cpan.org/ That last one has all the list, so we use that; the second is a world map, so we also include it. Sadly, neither of the mirrors list (table or map) are served as https; they are only available as http... Signed-off-by: Peter Seiderer [yann.morin.1998@free.fr: - add a little blurb to explain http->https redirect - update the mirror list URL, and... - extend commit message with original explanations from Peter, and.. - notice that they are not served via https... ] Signed-off-by: Yann E. MORIN --- Config.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Config.in b/Config.in index 3c57c591a8..64604a0aed 100644 --- a/Config.in +++ b/Config.in @@ -287,14 +287,15 @@ config BR2_LUAROCKS_MIRROR config BR2_CPAN_MIRROR string "CPAN mirror (Perl packages)" - default "http://cpan.metacpan.org" + default "https://cpan.metacpan.org" help CPAN (Comprehensive Perl Archive Network) is a repository of Perl packages. It has multiple software mirrors scattered around the world. This option allows you to select a mirror. The list of mirrors is available at: - http://search.cpan.org/mirror + http://mirrors.cpan.org/ (tabular) + http://mirrors.cpan.org/map.html (clickable world map) endif From ff0fd90c3e42dd00283a4eb192ce832f7c03ac30 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 18 Oct 2022 21:43:04 +0200 Subject: [PATCH 0082/5754] package/skeleton-systemd: move /var factory tmpfiles out of /etc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When the rootfs is not remounted read-write (thus assuming a read-only rootfs like squashfs), we create a tmpfiles.d factory for /var. However, we register those in /etc/tmpfiles.d/, but /etc could also be a tmpfs (for full state-less systems, or easy factory-reset, see [0]). So, we move our var factory to /usr/lib/tmpfiles.d/, which is also the location where systemd itself places its own tmpfiles, and where we already put all our other tmpfiles (see audit, avahi, cryptsetup, dhcp, lighttpd, nfs-utils, quagga, samba4, swupdate) and our handling of systemd's catalog files too. We also rename the file to a better name, so that it is obvious it is generated by us (systemd already installs a var.conf of its own, so we want to avoid name clashing). Last little detail: there is no need or reason to create .../tmpfiles.d/ at install time; it is only needed in the rootfs-pre-cmd hook, so we only create it just before we need it. [0] http://0pointer.de/blog/projects/stateless.html Signed-off-by: Yann E. MORIN Cc: Norbert Lange Cc: Romain Naour Cc: Jérémy Rosen [yann.morin.1998@free.fr: - split original patch in two - this one only moves out of /etc and into /usr/lib - adapt commit log accordingly ] Signed-off-by: Yann E. MORIN Acked-by: Norbert Lange [yann.morin.1998@free.fr: - rename to 00-buildroot-var.conf as suggested by Norbert ] Signed-off-by: Yann E. MORIN --- package/skeleton-init-systemd/skeleton-init-systemd.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/skeleton-init-systemd/skeleton-init-systemd.mk b/package/skeleton-init-systemd/skeleton-init-systemd.mk index 795a171809..ec908b4fac 100644 --- a/package/skeleton-init-systemd/skeleton-init-systemd.mk +++ b/package/skeleton-init-systemd/skeleton-init-systemd.mk @@ -29,7 +29,6 @@ else # a real (but empty) directory, and the "factory files" will be copied # back there by the tmpfiles.d mechanism. define SKELETON_INIT_SYSTEMD_ROOT_RO_OR_RW - mkdir -p $(TARGET_DIR)/etc/systemd/tmpfiles.d echo "/dev/root / auto ro 0 1" >$(TARGET_DIR)/etc/fstab echo "tmpfs /var tmpfs mode=1777 0 0" >>$(TARGET_DIR)/etc/fstab endef @@ -38,6 +37,7 @@ define SKELETON_INIT_SYSTEMD_PRE_ROOTFS_VAR rm -rf $(TARGET_DIR)/usr/share/factory/var mv $(TARGET_DIR)/var $(TARGET_DIR)/usr/share/factory/var mkdir -p $(TARGET_DIR)/var + mkdir -p $(TARGET_DIR)/usr/lib/tmpfiles.d for i in $(TARGET_DIR)/usr/share/factory/var/* \ $(TARGET_DIR)/usr/share/factory/var/lib/* \ $(TARGET_DIR)/usr/share/factory/var/lib/systemd/*; do \ @@ -51,7 +51,7 @@ define SKELETON_INIT_SYSTEMD_PRE_ROOTFS_VAR printf "C! %s - - - -\n" "$${j}" \ || exit 1; \ fi; \ - done >$(TARGET_DIR)/etc/tmpfiles.d/var-factory.conf + done >$(TARGET_DIR)/usr/lib/tmpfiles.d/00-buildroot-var.conf endef SKELETON_INIT_SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SKELETON_INIT_SYSTEMD_PRE_ROOTFS_VAR From 8cbfbe487ac6fb00c037475ed8aaca3d89899769 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 18 Oct 2022 21:43:05 +0200 Subject: [PATCH 0083/5754] package/skeleton-systemd: systemd-ify mounting /var tmpfs with ro rootfs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To mount our /var tmpfs when the rootfs is mounted read-only (really, not remounted read-write), we use an entry in fstab. However, /etc could also be a tmpfs (for full state-less systems, or easy factory-reset, see [0]). It also prevents easily ordering other systemd units until after /var is mounted (not impossible, but less easy). So, we register /var as a systemd mount unit, so that we can also have the /var factory populated and functional even when /etc is empty. The var.mount unit is heavily modelled after systemd's own tmp.mount one, so we carry the same license for that file (in case that may apply). This has two side effects: - as hinted previously, it simplifies writing other systemd units to order them after /var is mounted - user can easily replace it with their own, which mounts an actual filesystem [0] http://0pointer.de/blog/projects/stateless.html Signed-off-by: Yann E. MORIN Cc: Norbert Lange Cc: Romain Naour Cc: Jérémy Rosen [yann.morin.1998@free.fr: - split original patch in two - this one only handles converting /var mounting into a systemd unit - adapt commit log accordingly ] Signed-off-by: Yann E. MORIN Reviewed-by: Norbert Lange [yann.morin.1998@free.fr (as suggested by Norbert): - fix Before= dependencies - drop [Install] section ] Signed-off-by: Yann E. MORIN --- .../skeleton-init-systemd.mk | 3 ++- package/skeleton-init-systemd/var.mount | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 package/skeleton-init-systemd/var.mount diff --git a/package/skeleton-init-systemd/skeleton-init-systemd.mk b/package/skeleton-init-systemd/skeleton-init-systemd.mk index ec908b4fac..ff8bc528c0 100644 --- a/package/skeleton-init-systemd/skeleton-init-systemd.mk +++ b/package/skeleton-init-systemd/skeleton-init-systemd.mk @@ -30,7 +30,6 @@ else # back there by the tmpfiles.d mechanism. define SKELETON_INIT_SYSTEMD_ROOT_RO_OR_RW echo "/dev/root / auto ro 0 1" >$(TARGET_DIR)/etc/fstab - echo "tmpfs /var tmpfs mode=1777 0 0" >>$(TARGET_DIR)/etc/fstab endef define SKELETON_INIT_SYSTEMD_PRE_ROOTFS_VAR @@ -52,6 +51,8 @@ define SKELETON_INIT_SYSTEMD_PRE_ROOTFS_VAR || exit 1; \ fi; \ done >$(TARGET_DIR)/usr/lib/tmpfiles.d/00-buildroot-var.conf + $(INSTALL) -D -m 0644 $(SKELETON_INIT_SYSTEMD_PKGDIR)/var.mount \ + $(TARGET_DIR)/usr/lib/systemd/system/var.mount endef SKELETON_INIT_SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SKELETON_INIT_SYSTEMD_PRE_ROOTFS_VAR diff --git a/package/skeleton-init-systemd/var.mount b/package/skeleton-init-systemd/var.mount new file mode 100644 index 0000000000..e97accef93 --- /dev/null +++ b/package/skeleton-init-systemd/var.mount @@ -0,0 +1,15 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +# Modelled after systemd's tmp.mount + +[Unit] +Description=Buildroot /var tmpfs +DefaultDependencies=no +Conflicts=umount.target +Before=local-fs.target umount.target +After=swap.target + +[Mount] +What=tmpfs +Where=/var +Type=tmpfs +Options=mode=1777,strictatime,nosuid,nodev,size=50%%,nr_inodes=1m From d18176396a4b835615b71f254e1c00add265f4ce Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 18 Oct 2022 21:43:06 +0200 Subject: [PATCH 0084/5754] package/skeleton-systemd: host the tmpfiles preparation script MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit 0d9b84b7a83f (package/systemd: invoke systemd-tmpfilesd on final image) forcefully introduced a call to systemd-tmpfiles as a per-rootfs hook, on the premise that would help with read-only rootfs. However, that did not account for the then-pre-existing handling of /var as a factory when the user opted not to remount / read-write (by not setting BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW). This means that, for users who want to use a factory for /var, the generated filesystem contains the factory files twice: once as stored in the factory, and once as populated by systemd-tmpfilesd. In the hope to reconcile the two solutions, we move the handling of calling systemd-tmpfilesd to the skeleton-init-systemd package, where we already handle the /var factory. Having the two in the same package will make it easier, in the future, to provide the user with a choice whether to use one of the other. Note that it is very important to keep the order of the hooks as they are. Indeed, skeleton-init-systemd sorts before systemd, so its hooks were registered before systemd's hooks; now that we move the CREATE_TMPFILES hook, we must ensure it is called after the PRE_ROOTFS_VAR one, so that the behaviour of acting on the var factory remains. As a final note: we chose the move this way, rather than move the var factory into the systemd package, because it is more related to the system integration on the Buildroot side, rather than the integration of the systemd package in Buildroot. Similarly, the other four rootfs hooks, SYSTEMD_LOCALE_PURGE_CATALOGS, SYSTEMD_UPDATE_CATALOGS, SYSTEMD_RM_CATALOG_UPDATE_SERVICE, and specially SYSTEMD_PRESET_ALL, should also be moved out of the systemd package, because they too are more related to the Buildroot system, rather than to the systemd package itself; but the frontier is very porous in either way, for such a package as special as systemd. Signed-off-by: Yann E. MORIN Cc: Norbert Lange Cc: Arnout Vandecappelle (Essensium/Mind) Cc: Romain Naour Cc: Jérémy Rosen Cc: Yann E. MORIN Acked-by: Norbert Lange Signed-off-by: Yann E. MORIN --- .../{systemd => skeleton-init-systemd}/fakeroot_tmpfiles.sh | 0 package/skeleton-init-systemd/skeleton-init-systemd.mk | 6 ++++++ package/systemd/systemd.mk | 6 ------ 3 files changed, 6 insertions(+), 6 deletions(-) rename package/{systemd => skeleton-init-systemd}/fakeroot_tmpfiles.sh (100%) diff --git a/package/systemd/fakeroot_tmpfiles.sh b/package/skeleton-init-systemd/fakeroot_tmpfiles.sh similarity index 100% rename from package/systemd/fakeroot_tmpfiles.sh rename to package/skeleton-init-systemd/fakeroot_tmpfiles.sh diff --git a/package/skeleton-init-systemd/skeleton-init-systemd.mk b/package/skeleton-init-systemd/skeleton-init-systemd.mk index ff8bc528c0..559a169aee 100644 --- a/package/skeleton-init-systemd/skeleton-init-systemd.mk +++ b/package/skeleton-init-systemd/skeleton-init-systemd.mk @@ -58,6 +58,12 @@ SKELETON_INIT_SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SKELETON_INIT_SYSTEMD_PRE_ROOTFS_V endif +define SKELETON_INIT_SYSTEMD_CREATE_TMPFILES_HOOK + HOST_SYSTEMD_TMPFILES=$(HOST_DIR)/bin/systemd-tmpfiles \ + $(SKELETON_INIT_SYSTEMD_PKGDIR)/fakeroot_tmpfiles.sh $(TARGET_DIR) +endef +SKELETON_INIT_SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SKELETON_INIT_SYSTEMD_CREATE_TMPFILES_HOOK + define SKELETON_INIT_SYSTEMD_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)/home mkdir -p $(TARGET_DIR)/srv diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 30a75b7a40..b96873b73f 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -744,12 +744,6 @@ define SYSTEMD_RM_CATALOG_UPDATE_SERVICE endef SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_RM_CATALOG_UPDATE_SERVICE -define SYSTEMD_CREATE_TMPFILES_HOOK - HOST_SYSTEMD_TMPFILES=$(HOST_DIR)/bin/systemd-tmpfiles \ - $(SYSTEMD_PKGDIR)/fakeroot_tmpfiles.sh $(TARGET_DIR) -endef -SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_CREATE_TMPFILES_HOOK - define SYSTEMD_PRESET_ALL $(HOST_DIR)/bin/systemctl --root=$(TARGET_DIR) preset-all endef From 3b91fd750180dd4689cafc72b28696c239821f9a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 21 Dec 2022 22:07:04 +0100 Subject: [PATCH 0085/5754] package/libcurl: security bump version to 7.87.0 Fixes the following security issues: - CVE-2022-43551: Another HSTS bypass via IDN https://curl.se/docs/CVE-2022-43551.html - CVE-2022-43552: HTTP Proxy deny use-after-free https://curl.se/docs/CVE-2022-43552.html Changelog: https://curl.se/changes.html 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 c0e2378cac..230ec8d704 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.84.0.tar.xz.asc +# https://curl.se/download/curl-7.87.0.tar.xz.asc # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 -sha256 2d61116e5f485581f6d59865377df4463f2e788677ac43222b496d4e49fb627b curl-7.86.0.tar.xz +sha256 ee5f1a1955b0ed413435ef79db28b834ea5f0fb7c8cfb1ce47175cc3bee08fff curl-7.87.0.tar.xz sha256 321b1a09ebc30410f2e837c072e5521cf7095b757193af4a7dae1086e36ed31a COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 8de4358107..994b685d34 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 7.86.0 +LIBCURL_VERSION = 7.87.0 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ From 0245d30e569cc88875f7ed5b162029064128e89e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 21 Dec 2022 22:16:44 +0100 Subject: [PATCH 0086/5754] {linux, linux-headers}: 5.{4, 10, 15}.x / 6.{0, 1}.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 1bca082cbf..b5c65eded4 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.1" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.1.1" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.145-cip17" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.145-cip17-rt7" 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 c7bbb6be99..8d85dc4c6f 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 2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb linux-6.1.tar.xz -sha256 08d3118d6b755769f166de6babed54964393a7c0928029bef11bf55559a72da4 linux-6.0.13.tar.xz +sha256 a3e61377cf4435a9e2966b409a37a1056f6aaa59e561add9125a88e3c0971dfb linux-6.1.1.tar.xz +sha256 d484eb3d4f88be14b42507a85ad4b0932e92e7a742acbce74e8be007124a6820 linux-6.0.15.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 40590843c04c85789105157f69efbd71a4efe87ae2568e40d1b7258c3f747ff3 linux-5.15.83.tar.xz -sha256 1ba9bf57b6bf36d76447d5044b80b746cb5fd61d981c811603dc763b7789cea7 linux-5.10.159.tar.xz -sha256 5eefc5037415f31c942d3cfa430b96c2a273246cf7e51db1e51b1d89887f0593 linux-5.4.227.tar.xz +sha256 2c0bae29fac98e0a9408914a4551b2971365ac0000351cb255d6bd9aa0849808 linux-5.15.85.tar.xz +sha256 7aaaf6d0bcd8a2cfa14ad75f02ca62bb2de08aad3bee3eff198de49ea5254079 linux-5.10.161.tar.xz +sha256 80253b2cac54c256dfdfd1061800aef907f88432090f7aef74c0ddf50f6e6524 linux-5.4.228.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc sha256 1f6de11306cc9f82fe1d4dd03565cdf43906fa6f77302913d942fd63b77b500c linux-4.9.336.tar.xz sha256 e32a230d71072a4ee50bd4386aa23ca4e617b8ad07b6f9fb223b65bf004c4c80 linux-4.14.302.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index cd36c7c763..60bbe5b768 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -399,11 +399,11 @@ config BR2_DEFAULT_KERNEL_HEADERS default "4.9.336" if BR2_KERNEL_HEADERS_4_9 default "4.14.302" if BR2_KERNEL_HEADERS_4_14 default "4.19.269" if BR2_KERNEL_HEADERS_4_19 - default "5.4.227" if BR2_KERNEL_HEADERS_5_4 - default "5.10.159" if BR2_KERNEL_HEADERS_5_10 - default "5.15.83" if BR2_KERNEL_HEADERS_5_15 - default "6.0.13" if BR2_KERNEL_HEADERS_6_0 - default "6.1" if BR2_KERNEL_HEADERS_6_1 + default "5.4.228" if BR2_KERNEL_HEADERS_5_4 + default "5.10.161" if BR2_KERNEL_HEADERS_5_10 + default "5.15.85" if BR2_KERNEL_HEADERS_5_15 + default "6.0.15" if BR2_KERNEL_HEADERS_6_0 + default "6.1.1" 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 3f79611b3037cf505f00cc67011626deb4d8f5b8 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 18 Oct 2022 21:43:07 +0200 Subject: [PATCH 0087/5754] system: add options for /var factory and tmpfiles pre-seed MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently, when one does not enable remounting the rootfs read-write, i.e. keep it read-only, for example because the filesystem is actually read-only by design, like squashfs, then two things happen: - we create a factory from the content of /var at build time, register tmpfiles entries for it, and mount a tmpfs on /var at runtime, so that systemd-tmpfiles does populate /var from the factory; this is only done when the rootfs is not remounted r/w; - we trigger systemd-tmpfiles at build time, which uses the tmpfiles db, of which our /var entries, to pre-populate the filesystem; this is always done, whether the rootfs is remounted r/w or not. Note that Buildroot mounts a tmpfs on /var, and leaves to the integrator to care for providing an actual filesystem, as there are too many variants and is very specific to each use-case. These two mechanisms are conflicting, semantically, but also technically: the files from the factory will be duplicated, but that may help in some situations when the actual /var filesystem is not mountable. In some cases, it might be preferable to have none, either, or both mechanisms enabled; it highly depends on the ultimate integration scheme chosen for a device. For example, some people will be very happy with a /var that is actually on a tmpfs and that it gets reseeded form scratch at every boot, while others may want to ensure that their system continue to work even when they can't mount something that makes /var writable. YMMV, as they used to say back in the day... So, we introduce two new options, in the system sub-menu, each to drive each mechanism. We default those options to y, to keep the previous behaviour by default, except the var factory is only available when the rootfs is not remounted r/w, as it were so far. We still hint in the help text that there might be some conflict between the two mechanisms, but since it has been that way for some time, it does not look too broken for most people. Since that introduces more options related to systemd being chosen as an init system, we gather those two options and the existing one inside a if-endif block, rather than adding more 'depends on' on each options. Signed-off-by: Yann E. MORIN Cc: Norbert Lange Cc: Arnout Vandecappelle (Essensium/Mind) Cc: Romain Naour Cc: Jérémy Rosen Cc: Yann E. MORIN Signed-off-by: Yann E. MORIN --- .../skeleton-init-systemd.mk | 7 +++- system/Config.in | 42 ++++++++++++++++++- 2 files changed, 46 insertions(+), 3 deletions(-) diff --git a/package/skeleton-init-systemd/skeleton-init-systemd.mk b/package/skeleton-init-systemd/skeleton-init-systemd.mk index 559a169aee..30783dfd26 100644 --- a/package/skeleton-init-systemd/skeleton-init-systemd.mk +++ b/package/skeleton-init-systemd/skeleton-init-systemd.mk @@ -32,6 +32,7 @@ define SKELETON_INIT_SYSTEMD_ROOT_RO_OR_RW echo "/dev/root / auto ro 0 1" >$(TARGET_DIR)/etc/fstab endef +ifeq ($(BR2_INIT_SYSTEMD_VAR_FACTORY),y) define SKELETON_INIT_SYSTEMD_PRE_ROOTFS_VAR rm -rf $(TARGET_DIR)/usr/share/factory/var mv $(TARGET_DIR)/var $(TARGET_DIR)/usr/share/factory/var @@ -55,14 +56,16 @@ define SKELETON_INIT_SYSTEMD_PRE_ROOTFS_VAR $(TARGET_DIR)/usr/lib/systemd/system/var.mount endef SKELETON_INIT_SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SKELETON_INIT_SYSTEMD_PRE_ROOTFS_VAR +endif # BR2_INIT_SYSTEMD_VAR_FACTORY +endif # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW -endif - +ifeq ($(BR2_INIT_SYSTEMD_POPULATE_TMPFILES),y) define SKELETON_INIT_SYSTEMD_CREATE_TMPFILES_HOOK HOST_SYSTEMD_TMPFILES=$(HOST_DIR)/bin/systemd-tmpfiles \ $(SKELETON_INIT_SYSTEMD_PKGDIR)/fakeroot_tmpfiles.sh $(TARGET_DIR) endef SKELETON_INIT_SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SKELETON_INIT_SYSTEMD_CREATE_TMPFILES_HOOK +endif # BR2_INIT_SYSTEMD_POPULATE_TMPFILES define SKELETON_INIT_SYSTEMD_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)/home diff --git a/system/Config.in b/system/Config.in index 888c24ce81..806a747315 100644 --- a/system/Config.in +++ b/system/Config.in @@ -154,10 +154,48 @@ source "$BR2_BASE_DIR/.br2-external.in.init" endchoice +if BR2_INIT_SYSTEMD + +config BR2_INIT_SYSTEMD_VAR_FACTORY + bool "build a factory to populate a tmpfs on /var" + default y # legacy + depends on !BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW + help + Build a factory of the content of /var as installed by + packages, mount a tmpfs on /var at runtime, so that + systemd-tmpfiles can populate it from the factory. + + This may help on a read-only rootfs. + + It probably does not play very well with triggering a call + to systemd-tmpfiles at build time (below). + + Note: Buildroot mounts a tmpfs on /var to at least make the + system bootable out of the box; mounting a filesystem from + actual storage is left to the integration, as it is too + specific and may need preparatory work like partitionning a + device and/or formatting a filesystem first, so that falls + out of the scope of Buildroot. + + To use persistent storage, provide a systemd dropin for the + var.mount unit, that overrides the What and Type, and possibly + the Options and After, fields. + +config BR2_INIT_SYSTEMD_POPULATE_TMPFILES + bool "trigger systemd-tmpfiles during build" + default y # legacy + help + Act on the systemd-tmpfiles.d database at build time, when + assembling the root filesystems. + + This may help on a read-only filesystem. + + It probably does not play very well with the /var factory + (above). + config BR2_PACKAGE_SYSTEMD_DEFAULT_TARGET string "The default unit systemd starts at bootup" default "multi-user.target" - depends on BR2_INIT_SYSTEMD help Specify the name of the unit configuration file to be started at bootup by systemd. Should end in ".target". @@ -165,6 +203,8 @@ config BR2_PACKAGE_SYSTEMD_DEFAULT_TARGET https://www.freedesktop.org/software/systemd/man/systemd.special.html#default.target +endif # BR2_INIT_SYSTEMD + choice prompt "/dev management" if !BR2_INIT_SYSTEMD default BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS From 0627cb0e8a9e19d1ac19c1a72302b25ab7b938dc Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 22 Oct 2022 22:53:42 +0200 Subject: [PATCH 0088/5754] support/testing: remove leftover kernel config fragment Commit 86d32208b62a (support/testing/tests/init/test_systemd.py: use downloaded kernel) stopped building a custom kernel for the systemd tests, but forgot to drop the associated kernel config fragment. That fragment is now not used in any test case, so we can drop it. Signed-off-by: Yann E. MORIN --- support/testing/conf/binfmt-misc-kernel-fragment.config | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 support/testing/conf/binfmt-misc-kernel-fragment.config diff --git a/support/testing/conf/binfmt-misc-kernel-fragment.config b/support/testing/conf/binfmt-misc-kernel-fragment.config deleted file mode 100644 index 7c992ff71b..0000000000 --- a/support/testing/conf/binfmt-misc-kernel-fragment.config +++ /dev/null @@ -1,2 +0,0 @@ -# Needed for binfmt_misc service: "Arbitrary Executable File Formats File System" -CONFIG_BINFMT_MISC=y From d668cd0b2967346668423b564e4e149f14787def Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 22 Dec 2022 11:50:11 +0100 Subject: [PATCH 0089/5754] package/libraw: bump to version 0.21.0 - Drop patch (already in version) - Drop autoreconf - Update hash of README.md (year updated with https://github.com/LibRaw/LibRaw/commit/4c954948ba2de262b9cb23a1843fb8651aa3dcc1 and licensing terms slightly reworded with https://github.com/LibRaw/LibRaw/commit/2a9a4de21ea7f5d15314da8ee5f27feebf239655) https://www.libraw.org/news/libraw-0-21-release Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- .../0001-Add-Libs.private-to-libraw.pc.patch | 67 ------------------- package/libraw/libraw.hash | 4 +- package/libraw/libraw.mk | 4 +- 3 files changed, 3 insertions(+), 72 deletions(-) delete mode 100644 package/libraw/0001-Add-Libs.private-to-libraw.pc.patch diff --git a/package/libraw/0001-Add-Libs.private-to-libraw.pc.patch b/package/libraw/0001-Add-Libs.private-to-libraw.pc.patch deleted file mode 100644 index a90af23178..0000000000 --- a/package/libraw/0001-Add-Libs.private-to-libraw.pc.patch +++ /dev/null @@ -1,67 +0,0 @@ -From ad911cbc3c16397cf9d326c30571a4d1edaaa03f Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 2 Jun 2021 07:45:40 +0200 -Subject: [PATCH] Add Libs.private to libraw.pc - -Add Libs.private to libraw.pc to avoid the following static build -failure when enabling libraw with jasper support in imagemagick: - -/home/giuliobenetti/autobuild/run/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: /home/giuliobenetti/autobuild/run/instance-1/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libjasper.a(jpg_enc.c.o): in function `jpg_encode': -jpg_enc.c:(.text+0x1f4): undefined reference to `jpeg_stdio_dest' - --ljpeg must be added after -ljasper because jasper depends on jpeg - -Fixes: - - http://autobuild.buildroot.org/results/88e43a1ea2059a684e50b0f5f2af407e8c6df2e1 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/LibRaw/LibRaw/pull/406] ---- - configure.ac | 2 ++ - libraw.pc.in | 1 + - libraw_r.pc.in | 1 + - 3 files changed, 4 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 4ab2f313..7bf5fdfd 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -57,6 +57,7 @@ if test x$jpeg = xtrue; then - AC_CHECK_HEADERS([jpeglib.h], [ - CPPFLAGS="$CPPFLAGS -DUSE_JPEG -DUSE_JPEG8" - LIBS="$LIBS -ljpeg" -+ AC_SUBST([PACKAGE_LIBS_PRIVATE],"-ljpeg $PACKAGE_LIBS_PRIVATE") - ], AC_MSG_WARN([no jpeg headers found])) - ], - AC_MSG_WARN([libjpeg not found]) -@@ -78,6 +79,7 @@ if test x$jasper = xtrue; then - AC_CHECK_HEADERS([jasper/jasper.h], [ - CPPFLAGS="$CPPFLAGS -DUSE_JASPER" - LIBS="$LIBS -ljasper" -+ AC_SUBST([PACKAGE_LIBS_PRIVATE],"-ljasper $PACKAGE_LIBS_PRIVATE") - ], AC_MSG_WARN([no jasper headers found])) - ], - AC_MSG_WARN([libjasper not found]) -diff --git a/libraw.pc.in b/libraw.pc.in -index 1bab18b8..c95fbc48 100644 ---- a/libraw.pc.in -+++ b/libraw.pc.in -@@ -8,4 +8,5 @@ Description: Raw image decoder library (non-thread-safe) - Requires: @PACKAGE_REQUIRES@ - Version: @PACKAGE_VERSION@ - Libs: -L${libdir} -lraw -lstdc++@PC_OPENMP@ -+Libs.private: @PACKAGE_LIBS_PRIVATE@ - Cflags: -I${includedir}/libraw -I${includedir} -diff --git a/libraw_r.pc.in b/libraw_r.pc.in -index e8427271..92bbbffa 100644 ---- a/libraw_r.pc.in -+++ b/libraw_r.pc.in -@@ -8,4 +8,5 @@ Description: Raw image decoder library (thread-safe) - Requires: @PACKAGE_REQUIRES@ - Version: @PACKAGE_VERSION@ - Libs: -L${libdir} -lraw_r -lstdc++@PC_OPENMP@ -+Libs.private: @PACKAGE_LIBS_PRIVATE@ - Cflags: -I${includedir}/libraw -I${includedir} --- -2.30.2 - diff --git a/package/libraw/libraw.hash b/package/libraw/libraw.hash index f2a01c277b..3076810cca 100644 --- a/package/libraw/libraw.hash +++ b/package/libraw/libraw.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 dc1b486c2003435733043e4e05273477326e51c3ea554c6864a4eafaff1004a6 LibRaw-0.20.2.tar.gz +sha256 8747b34e8534cc2dd7ef8c92c436414b3578904fd4bf9b87ea60f17aa99fb0bd LibRaw-0.21.0.tar.gz sha256 eea173a556abac0370461e57e12aab266894ea6be3874c2be05fd87871f75449 LICENSE.LGPL sha256 0e3098d2d54a12434715f6679ea408d57da5e8d613c385c58ecc6fe5d30cc81f LICENSE.CDDL -sha256 313415f7f48f6cd3cc78856626aab4bbe97dbb1e9a11db9c25396ca8d0e76cd9 README.md +sha256 7d6650cef6cf892abe95e55a6bda1e1c42f221fd411b807deb2fc0b805b868d4 README.md diff --git a/package/libraw/libraw.mk b/package/libraw/libraw.mk index fc02c7915f..176acf6a44 100644 --- a/package/libraw/libraw.mk +++ b/package/libraw/libraw.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBRAW_VERSION = 0.20.2 +LIBRAW_VERSION = 0.21.0 LIBRAW_SOURCE = LibRaw-$(LIBRAW_VERSION).tar.gz LIBRAW_SITE = http://www.libraw.org/data LIBRAW_INSTALL_STAGING = YES @@ -15,8 +15,6 @@ LIBRAW_LICENSE = LGPL-2.1 or CDDL-1.0 LIBRAW_LICENSE_FILES = LICENSE.LGPL LICENSE.CDDL README.md LIBRAW_CPE_ID_VENDOR = libraw LIBRAW_DEPENDENCIES = host-pkgconf -# https://github.com/LibRaw/LibRaw/issues/353 -LIBRAW_AUTORECONF = YES LIBRAW_CXXFLAGS = $(TARGET_CXXFLAGS) LIBRAW_CONF_ENV = CXXFLAGS="$(LIBRAW_CXXFLAGS)" From 5b62ea01369b11f5a4320bb2c909168b21c2642c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 22 Dec 2022 14:32:47 +0100 Subject: [PATCH 0090/5754] package/tiff: security bump to version 4.5.0 Fix CVE-2022-2056, CVE-2022-2057, CVE-2022-2058, CVE-2022-2519, CVE-2022-2520, CVE-2022-2521, CVE-2022-2953, CVE-2022-34526, CVE-2022-3570, CVE-2022-3597, CVE-2022-3598, CVE-2022-3599, CVE-2022-3626, CVE-2022-3627 and CVE-2022-3970 - COPYRIGHT renamed to LICENSE.md and year updated with https://gitlab.com/libtiff/libtiff/-/commit/fa1d6d787fc67a1eeb3abccb790b5bee969d424b - Use new --{en,dis}able options added by https://gitlab.com/libtiff/libtiff/-/commit/1ab0e2696a368a556b793a0941b5365e4d9f56ef http://www.simplesystems.org/libtiff/releases/v4.5.0.html Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/tiff/tiff.hash | 4 ++-- package/tiff/tiff.mk | 16 +++++++++------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/package/tiff/tiff.hash b/package/tiff/tiff.hash index 6bd28a0f59..73732892a5 100644 --- a/package/tiff/tiff.hash +++ b/package/tiff/tiff.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 917223b37538959aca3b790d2d73aa6e626b688e02dcda272aec24c2f498abed tiff-4.4.0.tar.gz -sha256 fbd6fed7938541d2c809c0826225fc85e551fdbfa8732b10f0c87e0847acafd7 COPYRIGHT +sha256 c7a1d9296649233979fa3eacffef3fa024d73d05d589cb622727b5b08c423464 tiff-4.5.0.tar.gz +sha256 0780558a8bfba0af1160ec1ff11ade4f41c0d7deafd6ecfc796b492a788e380d LICENSE.md diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk index 525712c9e9..7981bdf2c9 100644 --- a/package/tiff/tiff.mk +++ b/package/tiff/tiff.mk @@ -4,16 +4,18 @@ # ################################################################################ -TIFF_VERSION = 4.4.0 +TIFF_VERSION = 4.5.0 TIFF_SITE = http://download.osgeo.org/libtiff TIFF_LICENSE = tiff license -TIFF_LICENSE_FILES = COPYRIGHT +TIFF_LICENSE_FILES = LICENSE.md TIFF_CPE_ID_VENDOR = libtiff TIFF_CPE_ID_PRODUCT = libtiff TIFF_INSTALL_STAGING = YES TIFF_CONF_OPTS = \ + --disable-contrib \ --disable-cxx \ + --disable-tests \ --without-x TIFF_DEPENDENCIES = host-pkgconf @@ -23,7 +25,8 @@ HOST_TIFF_CONF_OPTS = \ --without-x \ --disable-zlib \ --disable-lzma \ - --disable-jpeg + --disable-jpeg \ + --disable-tests HOST_TIFF_DEPENDENCIES = host-pkgconf ifneq ($(BR2_PACKAGE_TIFF_CCITT),y) @@ -84,12 +87,11 @@ ifneq ($(BR2_PACKAGE_TIFF_JBIG),y) TIFF_CONF_OPTS += --disable-jbig endif -TIFF_SUBDIRS = port libtiff ifeq ($(BR2_PACKAGE_TIFF_UTILITIES),y) -TIFF_SUBDIRS += tools +TIFF_CONF_OPTS += --enable-tools +else +TIFF_CONF_OPTS += --disable-tools endif -TIFF_MAKE = $(MAKE) SUBDIRS="$(TIFF_SUBDIRS)" - $(eval $(autotools-package)) $(eval $(host-autotools-package)) From 728518fa647f9fdac8bdc6935fe49cd8a5d99ce7 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 22 Dec 2022 14:46:33 +0100 Subject: [PATCH 0091/5754] package/nasm: bump to version 2.16.01 https://nasm.us/doc/nasmdocc.html Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/nasm/nasm.hash | 2 +- package/nasm/nasm.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/nasm/nasm.hash b/package/nasm/nasm.hash index 86c67d6ba5..e9771c1d7f 100644 --- a/package/nasm/nasm.hash +++ b/package/nasm/nasm.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3caf6729c1073bf96629b57cee31eeb54f4f8129b01902c73428836550b30a3f nasm-2.15.05.tar.xz +sha256 c77745f4802375efeee2ec5c0ad6b7f037ea9c87c92b149a9637ff099f162558 nasm-2.16.01.tar.xz sha256 1563996c52e220e15ef2418e67d39488255aa8c28c89e617074d3afe3ee329e0 LICENSE diff --git a/package/nasm/nasm.mk b/package/nasm/nasm.mk index ecb0889363..043a84cf07 100644 --- a/package/nasm/nasm.mk +++ b/package/nasm/nasm.mk @@ -4,7 +4,7 @@ # ################################################################################ -NASM_VERSION = 2.15.05 +NASM_VERSION = 2.16.01 NASM_SOURCE = nasm-$(NASM_VERSION).tar.xz NASM_SITE = https://www.nasm.us/pub/nasm/releasebuilds/$(NASM_VERSION) NASM_LICENSE = BSD-2-Clause From e02fdfe26b2ad36166379c444e017f832946f30d Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Thu, 22 Dec 2022 21:40:14 +0100 Subject: [PATCH 0092/5754] package/skeleton-systemd: move var factory comment closer to code Commit 8cbfbe487ac6 (package/skeleton-systemd: systemd-ify mounting /var tmpfs with ro rootfs) removed the fstab handling of /var, and left the macro deal solely about keeping / read-only. However, the code about how the var factory is handled was left above the macro, which is now misleading and confusing. Move the comment closer to the actual rootfs-pre-cmd hook which actually deals with handling the var factory. Signed-off-by: Yann E. MORIN --- package/skeleton-init-systemd/skeleton-init-systemd.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/skeleton-init-systemd/skeleton-init-systemd.mk b/package/skeleton-init-systemd/skeleton-init-systemd.mk index 30783dfd26..fb15552f99 100644 --- a/package/skeleton-init-systemd/skeleton-init-systemd.mk +++ b/package/skeleton-init-systemd/skeleton-init-systemd.mk @@ -23,15 +23,15 @@ endef else +define SKELETON_INIT_SYSTEMD_ROOT_RO_OR_RW + echo "/dev/root / auto ro 0 1" >$(TARGET_DIR)/etc/fstab +endef + # On a R/O rootfs, /var is a tmpfs filesystem. So, at build time, we # redirect /var to the "factory settings" location. Just before the # filesystem gets created, the /var symlink will be replaced with # a real (but empty) directory, and the "factory files" will be copied # back there by the tmpfiles.d mechanism. -define SKELETON_INIT_SYSTEMD_ROOT_RO_OR_RW - echo "/dev/root / auto ro 0 1" >$(TARGET_DIR)/etc/fstab -endef - ifeq ($(BR2_INIT_SYSTEMD_VAR_FACTORY),y) define SKELETON_INIT_SYSTEMD_PRE_ROOTFS_VAR rm -rf $(TARGET_DIR)/usr/share/factory/var From 31b7aecd7ef0b34095e72a1d4fbf41a05d5bd10b Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 19 Dec 2022 22:02:46 +0100 Subject: [PATCH 0093/5754] package/luaexpat: bump to version 1.5.1 Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/luaexpat/luaexpat.hash | 2 +- package/luaexpat/luaexpat.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/luaexpat/luaexpat.hash b/package/luaexpat/luaexpat.hash index be67e9be6f..621293a0b9 100644 --- a/package/luaexpat/luaexpat.hash +++ b/package/luaexpat/luaexpat.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 536a5eda09bb070d2de8ecdd15566d3a55e2afa5ded2ef183cd453bac8c41e98 luaexpat-1.5.0-1.src.rock +sha256 eb7abc4cc39dd50eecb30896686bac84e66fd3c0774d0749b391e7ac5d222f45 luaexpat-1.5.1-1.src.rock sha256 7e6a727e5b57cca713a2f2633f05d7e0cc1e261cc6a7613bbe266e625b2f14da luaexpat/LICENSE diff --git a/package/luaexpat/luaexpat.mk b/package/luaexpat/luaexpat.mk index f56bf604b3..73675a8ee6 100644 --- a/package/luaexpat/luaexpat.mk +++ b/package/luaexpat/luaexpat.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUAEXPAT_VERSION = 1.5.0-1 +LUAEXPAT_VERSION = 1.5.1-1 LUAEXPAT_SUBDIR = luaexpat LUAEXPAT_LICENSE = MIT LUAEXPAT_LICENSE_FILES = $(LUAEXPAT_SUBDIR)/LICENSE From 1381a4d2884cd7abdda45253b871cddd995a3e4b Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 19 Dec 2022 22:02:56 +0100 Subject: [PATCH 0094/5754] package/lualogging: bump to version 1.8.0 Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/lualogging/lualogging.hash | 2 +- package/lualogging/lualogging.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lualogging/lualogging.hash b/package/lualogging/lualogging.hash index a9eadab4d1..5ed012ea5c 100644 --- a/package/lualogging/lualogging.hash +++ b/package/lualogging/lualogging.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 d4a8791e9b24840c4a4c0366399f55b6deb060fc3947f3a9aae9ced0334160c1 lualogging-1.7.0-1.src.rock +sha256 285edf8abc9844cb37da94888ca01cb26a2ba08411ea13a3ee0f4d029ca512dd lualogging-1.8.0-1.src.rock sha256 d900082cb26f8cf4a491ca51c00241f2c2e9cd9ae3531c62234017a360706adb lualogging/COPYRIGHT diff --git a/package/lualogging/lualogging.mk b/package/lualogging/lualogging.mk index 78197f6be6..96c09c5a49 100644 --- a/package/lualogging/lualogging.mk +++ b/package/lualogging/lualogging.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUALOGGING_VERSION = 1.7.0-1 +LUALOGGING_VERSION = 1.8.0-1 LUALOGGING_SUBDIR = lualogging LUALOGGING_LICENSE = MIT LUALOGGING_LICENSE_FILES = $(LUALOGGING_SUBDIR)/COPYRIGHT From 183de9155b138497783717383418544da00e0da7 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Sat, 17 Dec 2022 16:55:46 -0800 Subject: [PATCH 0095/5754] package/rtl8821cu: new package Adds support for USB rtl8821cu wifi cards. Similar to rtl8821au and rtl8812au-aircrack-ng packages. https://github.com/morrownr/8821cu-20210118 Signed-off-by: Christian Stewart Reviewed-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + package/Config.in | 1 + package/rtl8821cu/Config.in | 10 ++++++++++ package/rtl8821cu/rtl8821cu.hash | 3 +++ package/rtl8821cu/rtl8821cu.mk | 25 +++++++++++++++++++++++++ 5 files changed, 40 insertions(+) create mode 100644 package/rtl8821cu/Config.in create mode 100644 package/rtl8821cu/rtl8821cu.hash create mode 100644 package/rtl8821cu/rtl8821cu.mk diff --git a/DEVELOPERS b/DEVELOPERS index a200edb7f5..5eed4a8455 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -564,6 +564,7 @@ F: package/mosh/ F: package/nerdctl/ F: package/pkg-golang.mk F: package/rtl8821au/ +F: package/rtl8821cu/ F: package/runc/ F: package/tini/ F: support/testing/tests/package/test_docker_compose.py diff --git a/package/Config.in b/package/Config.in index 999feae08a..0c77f7c022 100644 --- a/package/Config.in +++ b/package/Config.in @@ -588,6 +588,7 @@ endmenu source "package/rtl8723ds-bt/Config.in" source "package/rtl8812au-aircrack-ng/Config.in" source "package/rtl8821au/Config.in" + source "package/rtl8821cu/Config.in" source "package/sane-backends/Config.in" source "package/sdparm/Config.in" source "package/sedutil/Config.in" diff --git a/package/rtl8821cu/Config.in b/package/rtl8821cu/Config.in new file mode 100644 index 0000000000..a5a7b9d255 --- /dev/null +++ b/package/rtl8821cu/Config.in @@ -0,0 +1,10 @@ +comment "rtl8821cu needs a Linux kernel to be built" + depends on !BR2_LINUX_KERNEL + +config BR2_PACKAGE_RTL8821CU + bool "rtl8821cu" + depends on BR2_LINUX_KERNEL + help + rtl8821cu wifi driver + + https://github.com/brektrou/rtl8821CU diff --git a/package/rtl8821cu/rtl8821cu.hash b/package/rtl8821cu/rtl8821cu.hash new file mode 100644 index 0000000000..efb9871472 --- /dev/null +++ b/package/rtl8821cu/rtl8821cu.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 09b9fb4160003502d564d0d0d85d6f19b8b6d1627d1a339b3ddfca6a948d84fb rtl8821cu-86cc5ceb7c28b9b997838e1c796847f6c395c382.tar.gz +sha256 af54d00efc57cfce664171ac8be2a20c0f290b1b5c1a67bb2eba7b6380276c4e LICENSE diff --git a/package/rtl8821cu/rtl8821cu.mk b/package/rtl8821cu/rtl8821cu.mk new file mode 100644 index 0000000000..18222e0014 --- /dev/null +++ b/package/rtl8821cu/rtl8821cu.mk @@ -0,0 +1,25 @@ +################################################################################ +# +# rtl8821cu +# +################################################################################ + +RTL8821CU_VERSION = 86cc5ceb7c28b9b997838e1c796847f6c395c382 +RTL8821CU_SITE = $(call github,morrownr,8821cu-20210118,$(RTL8821CU_VERSION)) +RTL8821CU_LICENSE = GPL-2.0 +RTL8821CU_LICENSE_FILES = LICENSE + +RTL8821CU_USER_EXTRA_CFLAGS = \ + -DCONFIG_$(call qstrip,$(BR2_ENDIAN))_ENDIAN \ + -DCONFIG_IOCTL_CFG80211 \ + -DRTW_USE_CFG80211_STA_EVENT \ + -Wno-error + +RTL8821CU_MODULE_MAKE_OPTS = \ + CONFIG_PLATFORM_GENERIC=n \ + CONFIG_RTL8821CU=m \ + KVER=$(LINUX_VERSION_PROBED) \ + USER_EXTRA_CFLAGS="$(RTL8821CU_USER_EXTRA_CFLAGS)" + +$(eval $(kernel-module)) +$(eval $(generic-package)) From de584a78a37b99b99a4011020a17b3ae99f002c7 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 22 Dec 2022 20:55:34 +0100 Subject: [PATCH 0096/5754] package/dovecot: bump version to 2.3.20 Release notes: https://dovecot.org/pipermail/dovecot-news/2022-December/000479.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- 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 124f834dca..7036df57a8 100644 --- a/package/dovecot/dovecot.hash +++ b/package/dovecot/dovecot.hash @@ -1,5 +1,5 @@ # Locally computed after checking signature -sha256 db5abcd87d7309659ea6b45b2cb6ee9c5f97486b2b719a5dd05a759e1f6a5c51 dovecot-2.3.19.1.tar.gz +sha256 caa832eb968148abdf35ee9d0f534b779fa732c0ce4a913d9ab8c3469b218552 dovecot-2.3.20.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 e28f500b7b..4b17784f93 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).19.1 +DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).20 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 b30eb2f763ac98b4c44d38097bc6da8d9a9a550b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 22 Dec 2022 20:55:35 +0100 Subject: [PATCH 0097/5754] package/dovecot-pigeonhole: bump version to 0.5.20 Release notes: https://dovecot.org/pipermail/dovecot-news/2022-December/000480.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- 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 635e221481..5c7ba322b2 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 10b923efcc6f3c4d92ecdbb780e12a5c33e6d0fdbe3aba5fcd3ecde4179c730c dovecot-2.3-pigeonhole-0.5.19.tar.gz +sha256 ae32bd4870ea2c1328ae09ba206e9ec12128046d6afca52fbbc9ef7f75617c98 dovecot-2.3-pigeonhole-0.5.20.tar.gz sha256 fc9e9522216f2a9a28b31300e3c73c1df56acc27dfae951bf516e7995366b51a COPYING diff --git a/package/dovecot-pigeonhole/dovecot-pigeonhole.mk b/package/dovecot-pigeonhole/dovecot-pigeonhole.mk index c25cd60b21..0b64cb0d6f 100644 --- a/package/dovecot-pigeonhole/dovecot-pigeonhole.mk +++ b/package/dovecot-pigeonhole/dovecot-pigeonhole.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOVECOT_PIGEONHOLE_VERSION = 0.5.19 +DOVECOT_PIGEONHOLE_VERSION = 0.5.20 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 bd7e90779861bb603fc1cca03f6fad4d951f7bd9 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 22 Dec 2022 23:18:02 +0100 Subject: [PATCH 0098/5754] package/hiredis: bump to version 1.1.0 - Replace first patch - Drop second and third patches (already in version) https://github.com/redis/hiredis/blob/v1.1.0/CHANGELOG.md Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...1-CMakeLists.txt-do-not-force-SHARED.patch | 47 ----- ...eLists.txt-respect-BUILD_SHARED_LIBS.patch | 171 ++++++++++++++++++ ...-allow-building-without-a-C-compiler.patch | 57 ------ .../0003-Explicitly-set-c99-in-CMake.patch | 28 --- package/hiredis/hiredis.hash | 2 +- package/hiredis/hiredis.mk | 4 +- 6 files changed, 174 insertions(+), 135 deletions(-) delete mode 100644 package/hiredis/0001-CMakeLists.txt-do-not-force-SHARED.patch create mode 100644 package/hiredis/0001-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch delete mode 100644 package/hiredis/0002-CMakeLists.txt-allow-building-without-a-C-compiler.patch delete mode 100644 package/hiredis/0003-Explicitly-set-c99-in-CMake.patch diff --git a/package/hiredis/0001-CMakeLists.txt-do-not-force-SHARED.patch b/package/hiredis/0001-CMakeLists.txt-do-not-force-SHARED.patch deleted file mode 100644 index b7fdb87910..0000000000 --- a/package/hiredis/0001-CMakeLists.txt-do-not-force-SHARED.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 0ce382c275b087e866517c003e565f8cc4855bdd Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 29 Aug 2020 23:19:26 +0200 -Subject: [PATCH] CMakeLists.txt: do not force SHARED - -Allow the user to build static libraries by removing SHARED from -ADD_LIBRARY calls. - -Here is an extract of -https://cmake.org/cmake/help/latest/command/add_library.html: - -"If no type is given explicitly the type is STATIC or SHARED based on -whether the current value of the variable BUILD_SHARED_LIBS is ON." - -Signed-off-by: Fabrice Fontaine -[Upstream status: probably not upstreamable as is because it will -conflict with https://github.com/redis/hiredis/pull/851. So, this patch -will probably have to be reworked for 1.0.x] ---- - CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1beccc6..fed79fd 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -40,7 +40,7 @@ IF(WIN32) - ADD_COMPILE_DEFINITIONS(_CRT_SECURE_NO_WARNINGS WIN32_LEAN_AND_MEAN) - ENDIF() - --ADD_LIBRARY(hiredis SHARED ${hiredis_sources}) -+ADD_LIBRARY(hiredis ${hiredis_sources}) - - SET_TARGET_PROPERTIES(hiredis - PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE -@@ -97,7 +97,7 @@ IF(ENABLE_SSL) - FIND_PACKAGE(OpenSSL REQUIRED) - SET(hiredis_ssl_sources - ssl.c) -- ADD_LIBRARY(hiredis_ssl SHARED -+ ADD_LIBRARY(hiredis_ssl - ${hiredis_ssl_sources}) - - IF (APPLE) --- -2.28.0 - diff --git a/package/hiredis/0001-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch b/package/hiredis/0001-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch new file mode 100644 index 0000000000..38e9282041 --- /dev/null +++ b/package/hiredis/0001-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch @@ -0,0 +1,171 @@ +From 286ba29771611abfaf126527141cac1d406c7eaf Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 22 Dec 2022 23:00:56 +0100 +Subject: [PATCH] CMakeLists.txt: respect BUILD_SHARED_LIBS + +To allow building hiredis on toolchain without dynamic library support, +respect standard cmake BUILD_SHARED_LIBS: +https://cmake.org/cmake/help/latest/variable/BUILD_SHARED_LIBS.html + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/redis/hiredis/pull/1147] +--- + CMakeLists.txt | 70 ++++++++++++++++++++++++++++++++++---------------- + 1 file changed, 48 insertions(+), 22 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3d52d0c..66a1383 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,5 +1,6 @@ + CMAKE_MINIMUM_REQUIRED(VERSION 3.0.0) + ++OPTION(BUILD_SHARED_LIBS "Build shared libraries" ON) + OPTION(ENABLE_SSL "Build hiredis_ssl for SSL support" OFF) + OPTION(DISABLE_TESTS "If tests should be compiled or not" OFF) + OPTION(ENABLE_SSL_TESTS "Should we test SSL connections" OFF) +@@ -44,35 +45,49 @@ IF(WIN32) + ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS -DWIN32_LEAN_AND_MEAN) + ENDIF() + +-ADD_LIBRARY(hiredis SHARED ${hiredis_sources}) + ADD_LIBRARY(hiredis_static STATIC ${hiredis_sources}) +-ADD_LIBRARY(hiredis::hiredis ALIAS hiredis) + ADD_LIBRARY(hiredis::hiredis_static ALIAS hiredis_static) ++SET(HIREDIS_DEFAULT_LIBRARY hiredis_static) ++SET(HIREDIS_TARGETS hiredis_static) + + IF(NOT MSVC) + SET_TARGET_PROPERTIES(hiredis_static + PROPERTIES OUTPUT_NAME hiredis) + ENDIF() + +-SET_TARGET_PROPERTIES(hiredis +- PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE +- VERSION "${HIREDIS_SONAME}") ++IF(BUILD_SHARED_LIBS) ++ ADD_LIBRARY(hiredis SHARED ${hiredis_sources}) ++ ADD_LIBRARY(hiredis::hiredis ALIAS hiredis) ++ SET(HIREDIS_DEFAULT_LIBRARY hiredis) ++ SET(HIREDIS_TARGETS ${HIREDIS_TARGETS} hiredis) ++ SET_TARGET_PROPERTIES(hiredis ++ PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE ++ VERSION "${HIREDIS_SONAME}") ++ENDIF() + IF(MSVC) + SET_TARGET_PROPERTIES(hiredis_static + PROPERTIES COMPILE_FLAGS /Z7) + ENDIF() + IF(WIN32 OR MINGW) +- TARGET_LINK_LIBRARIES(hiredis PUBLIC ws2_32 crypt32) ++ IF(BUILD_SHARED_LIBS) ++ TARGET_LINK_LIBRARIES(hiredis PUBLIC ws2_32 crypt32) ++ ENDIF() + TARGET_LINK_LIBRARIES(hiredis_static PUBLIC ws2_32 crypt32) + ELSEIF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") +- TARGET_LINK_LIBRARIES(hiredis PUBLIC m) ++ IF(BUILD_SHARED_LIBS) ++ TARGET_LINK_LIBRARIES(hiredis PUBLIC m) ++ ENDIF() + TARGET_LINK_LIBRARIES(hiredis_static PUBLIC m) + ELSEIF(CMAKE_SYSTEM_NAME MATCHES "SunOS") +- TARGET_LINK_LIBRARIES(hiredis PUBLIC socket) ++ IF(BUILD_SHARED_LIBS) ++ TARGET_LINK_LIBRARIES(hiredis PUBLIC socket) ++ ENDIF() + TARGET_LINK_LIBRARIES(hiredis_static PUBLIC socket) + ENDIF() + +-TARGET_INCLUDE_DIRECTORIES(hiredis PUBLIC $ $) ++IF(BUILD_SHARED_LIBS) ++ TARGET_INCLUDE_DIRECTORIES(hiredis PUBLIC $ $) ++ENDIF() + TARGET_INCLUDE_DIRECTORIES(hiredis_static PUBLIC $ $) + + CONFIGURE_FILE(hiredis.pc.in hiredis.pc @ONLY) +@@ -103,7 +118,7 @@ set(CPACK_RPM_PACKAGE_AUTOREQPROV ON) + + include(CPack) + +-INSTALL(TARGETS hiredis hiredis_static ++INSTALL(TARGETS ${HIREDIS_TARGETS} + EXPORT hiredis-targets + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +@@ -161,39 +176,50 @@ IF(ENABLE_SSL) + FIND_PACKAGE(OpenSSL REQUIRED) + SET(hiredis_ssl_sources + ssl.c) +- ADD_LIBRARY(hiredis_ssl SHARED +- ${hiredis_ssl_sources}) ++ + ADD_LIBRARY(hiredis_ssl_static STATIC + ${hiredis_ssl_sources}) ++ SET(HIREDIS_SSL_DEFAULT_LIBRARY hiredis_ssl_static) ++ SET(HIREDIS_SSL_TARGETS hiredis_ssl_static) ++ IF(BUILD_SHARED_LIBS) ++ ADD_LIBRARY(hiredis_ssl SHARED ++ ${hiredis_ssl_sources}) ++ SET(HIREDIS_SSL_DEFAULT_LIBRARY hiredis_ssl) ++ SET(HIREDIS_SSL_TARGETS ${HIREDIS_SSL_TARGETS} hiredis_ssl) ++ ENDIF() + IF(NOT MSVC) + SET_TARGET_PROPERTIES(hiredis_ssl_static + PROPERTIES OUTPUT_NAME hiredis_ssl) + ENDIF() + +- IF (APPLE) ++ IF (APPLE AND BUILD_SHARED_LIBS) + SET_PROPERTY(TARGET hiredis_ssl PROPERTY LINK_FLAGS "-Wl,-undefined -Wl,dynamic_lookup") + ENDIF() + +- SET_TARGET_PROPERTIES(hiredis_ssl +- PROPERTIES +- WINDOWS_EXPORT_ALL_SYMBOLS TRUE +- VERSION "${HIREDIS_SONAME}") ++ IF(BUILD_SHARED_LIBS) ++ SET_TARGET_PROPERTIES(hiredis_ssl ++ PROPERTIES ++ WINDOWS_EXPORT_ALL_SYMBOLS TRUE ++ VERSION "${HIREDIS_SONAME}") ++ ENDIF() + IF(MSVC) + SET_TARGET_PROPERTIES(hiredis_ssl_static + PROPERTIES COMPILE_FLAGS /Z7) + ENDIF() + +- TARGET_INCLUDE_DIRECTORIES(hiredis_ssl PRIVATE "${OPENSSL_INCLUDE_DIR}") + TARGET_INCLUDE_DIRECTORIES(hiredis_ssl_static PRIVATE "${OPENSSL_INCLUDE_DIR}") ++ IF(BUILD_SHARED_LIBS) ++ TARGET_INCLUDE_DIRECTORIES(hiredis_ssl PRIVATE "${OPENSSL_INCLUDE_DIR}") ++ TARGET_LINK_LIBRARIES(hiredis_ssl PRIVATE ${OPENSSL_LIBRARIES}) ++ ENDIF() + +- TARGET_LINK_LIBRARIES(hiredis_ssl PRIVATE ${OPENSSL_LIBRARIES}) + IF (WIN32 OR MINGW) + TARGET_LINK_LIBRARIES(hiredis_ssl PRIVATE hiredis) + TARGET_LINK_LIBRARIES(hiredis_ssl_static PUBLIC hiredis_static) + ENDIF() + CONFIGURE_FILE(hiredis_ssl.pc.in hiredis_ssl.pc @ONLY) + +- INSTALL(TARGETS hiredis_ssl hiredis_ssl_static ++ INSTALL(TARGETS ${HIREDIS_SSL_TARGETS} + EXPORT hiredis_ssl-targets + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +@@ -236,10 +262,10 @@ ENDIF() + IF(NOT DISABLE_TESTS) + ENABLE_TESTING() + ADD_EXECUTABLE(hiredis-test test.c) +- TARGET_LINK_LIBRARIES(hiredis-test hiredis) ++ TARGET_LINK_LIBRARIES(hiredis-test ${HIREDIS_DEFAULT_LIBRARY}) + IF(ENABLE_SSL_TESTS) + ADD_DEFINITIONS(-DHIREDIS_TEST_SSL=1) +- TARGET_LINK_LIBRARIES(hiredis-test hiredis_ssl) ++ TARGET_LINK_LIBRARIES(hiredis-test ${HIREDIS_SSL_DEFAULT_LIBRARY}) + ENDIF() + IF(ENABLE_ASYNC_TESTS) + ADD_DEFINITIONS(-DHIREDIS_TEST_ASYNC=1) +-- +2.35.1 + diff --git a/package/hiredis/0002-CMakeLists.txt-allow-building-without-a-C-compiler.patch b/package/hiredis/0002-CMakeLists.txt-allow-building-without-a-C-compiler.patch deleted file mode 100644 index 08a9ef9854..0000000000 --- a/package/hiredis/0002-CMakeLists.txt-allow-building-without-a-C-compiler.patch +++ /dev/null @@ -1,57 +0,0 @@ -From bb4a8937411a9e6ac2e5c12c0e7eeaa7dab251ba Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 5 Sep 2020 12:54:21 +0200 -Subject: [PATCH] CMakeLists.txt: allow building without a C++ compiler - -Define hiredis as a C project (and use a single PROJECT statement) to -avoid the following build failure if a C++ compiler is not found: - -CMake Error at CMakeLists.txt:3 (PROJECT): - The CMAKE_CXX_COMPILER: - - /srv/storage/autobuild/run/instance-1/output-1/host/bin/arm-linux-g++ - - is not a full path to an existing compiler tool. - - Tell CMake where to find the compiler by setting either the environment - variable "CXX" or the CMake cache entry CMAKE_CXX_COMPILER to the full path - to the compiler, or to the compiler name if it is in the PATH. - -The only cpp source file is examples/example-qt.cpp which is never -compiled with cmake buildsystem. This file is compiled only with the -Makefile buildsystem so perhaps it should be removed. If it is added to -the cmake buildsystem, a call to enable_language(CXX) will have to be -added. - -Fixes: - - http://autobuild.buildroot.org/results/830ec3398cd29b9fc5cde06a225ef531d7a9d850 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/redis/hiredis/pull/872] ---- - CMakeLists.txt | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4cbd438..9d65b7f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,6 +1,5 @@ - CMAKE_MINIMUM_REQUIRED(VERSION 3.4.0) - INCLUDE(GNUInstallDirs) --PROJECT(hiredis) - - OPTION(ENABLE_SSL "Build hiredis_ssl for SSL support" OFF) - OPTION(DISABLE_TESTS "If tests should be compiled or not" OFF) -@@ -20,7 +19,7 @@ getVersionBit(HIREDIS_SONAME) - SET(VERSION "${HIREDIS_MAJOR}.${HIREDIS_MINOR}.${HIREDIS_PATCH}") - MESSAGE("Detected version: ${VERSION}") - --PROJECT(hiredis VERSION "${VERSION}") -+PROJECT(hiredis LANGUAGES "C" VERSION "${VERSION}") - - # Hiredis requires C99 - SET(CMAKE_C_STANDARD 99) --- -2.28.0 - diff --git a/package/hiredis/0003-Explicitly-set-c99-in-CMake.patch b/package/hiredis/0003-Explicitly-set-c99-in-CMake.patch deleted file mode 100644 index 7e6ef8bca4..0000000000 --- a/package/hiredis/0003-Explicitly-set-c99-in-CMake.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 13a35bdb64615e381c5e1151cdd4e78bba71a6db Mon Sep 17 00:00:00 2001 -From: michael-grunder -Date: Fri, 28 Aug 2020 12:35:01 -0700 -Subject: [PATCH] Explicitly set c99 in CMake - -See #869 - -[Retrieved from: -https://github.com/redis/hiredis/commit/13a35bdb64615e381c5e1151cdd4e78bba71a6db] -Signed-off-by: Fabrice Fontaine ---- - CMakeLists.txt | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1beccc69a..4cbd438d7 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -22,6 +22,9 @@ MESSAGE("Detected version: ${VERSION}") - - PROJECT(hiredis VERSION "${VERSION}") - -+# Hiredis requires C99 -+SET(CMAKE_C_STANDARD 99) -+ - SET(ENABLE_EXAMPLES OFF CACHE BOOL "Enable building hiredis examples") - - SET(hiredis_sources diff --git a/package/hiredis/hiredis.hash b/package/hiredis/hiredis.hash index a45cf68f99..cdcbef1525 100644 --- a/package/hiredis/hiredis.hash +++ b/package/hiredis/hiredis.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 e0ab696e2f07deb4252dda45b703d09854e53b9703c7d52182ce5a22616c3819 hiredis-1.0.2.tar.gz +sha256 fe6d21741ec7f3fc9df409d921f47dfc73a4d8ff64f4ac6f1d95f951bf7f53d6 hiredis-1.1.0.tar.gz sha256 dca05ce8fc87a8261783b4aed0deef8becc9350b6aa770bc714d0c1833b896eb COPYING diff --git a/package/hiredis/hiredis.mk b/package/hiredis/hiredis.mk index a571951fa3..d59933845c 100644 --- a/package/hiredis/hiredis.mk +++ b/package/hiredis/hiredis.mk @@ -4,8 +4,8 @@ # ################################################################################ -HIREDIS_VERSION_MAJOR = 1.0 -HIREDIS_VERSION = $(HIREDIS_VERSION_MAJOR).2 +HIREDIS_VERSION_MAJOR = 1.1 +HIREDIS_VERSION = $(HIREDIS_VERSION_MAJOR).0 HIREDIS_SITE = $(call github,redis,hiredis,v$(HIREDIS_VERSION)) HIREDIS_LICENSE = BSD-3-Clause HIREDIS_LICENSE_FILES = COPYING From 53f2999edfa5e67923d4d8a102c15fa3200e089c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 22 Dec 2022 23:28:40 +0100 Subject: [PATCH 0099/5754] package/xtables-addons: bump to version 3.22 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Support for up to Linux 6.1 by fixing the following build failure: /tmp/instance-5/output-1/build/xtables-addons-3.21/extensions/xt_CHAOS.c: In function ‘xt_chaos_total’: /tmp/instance-5/output-1/build/xtables-addons-3.21/extensions/xt_CHAOS.c:70:46: error: implicit declaration of function ‘prandom_u32’; did you mean ‘prandom_u32_max’? [-Werror=implicit-function-declaration] 70 | if (!ret || hotdrop || (unsigned int)prandom_u32() > delude_percentage) | ^~~~~~~~~~~ | prandom_u32_max https://fossies.org/linux/privat/xtables-addons-3.22.tar.xz/xtables-addons-3.22/doc/changelog.rst Fixes: - http://autobuild.buildroot.org/results/4564ba888156710819f6bd86117e0c0bdd513dba Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- 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 0d2434eeb1..840a31f947 100644 --- a/package/xtables-addons/xtables-addons.hash +++ b/package/xtables-addons/xtables-addons.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2e09ac129a14f5e9c23b115ebcdfff4aa84e2aeba1268dbdf39b2d752bd71e19 xtables-addons-3.21.tar.xz +sha256 faa16a27166275afbfe8df605f55c3a81ac693bf19da674d45ceded4137ae217 xtables-addons-3.22.tar.xz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE diff --git a/package/xtables-addons/xtables-addons.mk b/package/xtables-addons/xtables-addons.mk index 83cc3266c4..77dcfd741c 100644 --- a/package/xtables-addons/xtables-addons.mk +++ b/package/xtables-addons/xtables-addons.mk @@ -4,7 +4,7 @@ # ################################################################################ -XTABLES_ADDONS_VERSION = 3.21 +XTABLES_ADDONS_VERSION = 3.22 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 08049e9f522c0fee6ff05b7358b1f1689f4e53c0 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 22 Dec 2022 23:50:27 +0100 Subject: [PATCH 0100/5754] package/libdeflate: fix static build Fix the following static build failure raised since bump to version 1.15 in commit c31087182fa545784d9a0a01f0b32715d78c3955: [ 79%] Linking C shared library libdeflate.so /home/buildroot/autobuild/instance-2/output-1/host/lib/gcc/arc-buildroot-linux-uclibc/12.2.0/../../../../arc-buildroot-linux-uclibc/bin/ld: /home/buildroot/autobuild/instance-2/output-1/host/lib/gcc/arc-buildroot-linux-uclibc/12.2.0/crtbeginT.o: relocation R_ARC_32_ME against `__TMC_END__' can not be used when making a shared object; recompile with -fPIC Fixes: - http://autobuild.buildroot.org/results/25489e5c6f0da642136e099ab35b091624f53a2b Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libdeflate/libdeflate.mk | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/package/libdeflate/libdeflate.mk b/package/libdeflate/libdeflate.mk index 2305af4dc9..67e97c6e5e 100644 --- a/package/libdeflate/libdeflate.mk +++ b/package/libdeflate/libdeflate.mk @@ -12,4 +12,18 @@ LIBDEFLATE_INSTALL_STAGING = YES LIBDEFLATE_CONF_OPTS = \ -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -D_DEFAULT_SOURCE" +ifeq ($(BR2_SHARED_LIBS),y) +LIBDEFLATE_CONF_OPTS += \ + -DLIBDEFLATE_BUILD_SHARED_LIB=ON \ + -DLIBDEFLATE_BUILD_STATIC_LIB=OFF +else ifeq ($(BR2_STATIC_LIBS),y) +LIBDEFLATE_CONF_OPTS += \ + -DLIBDEFLATE_BUILD_SHARED_LIB=OFF \ + -DLIBDEFLATE_BUILD_STATIC_LIB=ON +else ifeq ($(BR2_SHARED_STATIC_LIBS),y) +LIBDEFLATE_CONF_OPTS += \ + -DLIBDEFLATE_BUILD_SHARED_LIB=ON \ + -DLIBDEFLATE_BUILD_STATIC_LIB=ON +endif + $(eval $(cmake-package)) From 8036b087489c96dfc4a0baf9fbe284a049a58298 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 22 Dec 2022 22:27:20 +0100 Subject: [PATCH 0101/5754] package/exfat-utils: add CPE variables cpe:2.3:a:exfat_project:exfat is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aexfat_project%3Aexfat Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/exfat-utils/exfat-utils.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/exfat-utils/exfat-utils.mk b/package/exfat-utils/exfat-utils.mk index d13ec6bab8..fa471952f2 100644 --- a/package/exfat-utils/exfat-utils.mk +++ b/package/exfat-utils/exfat-utils.mk @@ -8,6 +8,8 @@ EXFAT_UTILS_VERSION = 1.3.0 EXFAT_UTILS_SITE = https://github.com/relan/exfat/releases/download/v$(EXFAT_UTILS_VERSION) EXFAT_UTILS_LICENSE = GPL-2.0+ EXFAT_UTILS_LICENSE_FILES = COPYING +EXFAT_UTILS_CPE_ID_VENDOR = exfat_project +EXFAT_UTILS_CPE_ID_PRODUCT = exfat EXFAT_UTILS_CONF_OPTS += --exec-prefix=/ From 8024bae870b7ebd9707614343c5dfdc849ea8fdd Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 22 Dec 2022 16:57:43 +0100 Subject: [PATCH 0102/5754] package/bird: bump to version 2.0.11 https://bird.network.cz/pipermail/bird-users/2022-December/016431.html Signed-off-by: Fabrice Fontaine 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 6ccacd8d58..3e00a1993d 100644 --- a/package/bird/bird.hash +++ b/package/bird/bird.hash @@ -1,2 +1,2 @@ -sha256 7ed341ddd8dc87fa9736586b3515447a8436fec442d65f4022155ab9de1ffd5a bird-2.0.10.tar.gz +sha256 60a7b83b67b9d089d2a745a11fddd12461f631abc7b645b6c085adf90b3f55d6 bird-2.0.11.tar.gz sha256 94c53c84320078920ac1f0d49c81a4e9004512f534521a58bdf145acbcbc2cd2 README diff --git a/package/bird/bird.mk b/package/bird/bird.mk index e1e392168c..1295358fb9 100644 --- a/package/bird/bird.mk +++ b/package/bird/bird.mk @@ -4,7 +4,7 @@ # ################################################################################ -BIRD_VERSION = 2.0.10 +BIRD_VERSION = 2.0.11 BIRD_SITE = https://bird.network.cz/download BIRD_LICENSE = GPL-2.0+ BIRD_LICENSE_FILES = README From f81b1358fc115fc854a9c9699daaca4be713f873 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 23 Dec 2022 16:42:04 +0100 Subject: [PATCH 0103/5754] package/memcached: bump to version 1.6.17 - Refresh second patch - Drop fourth patch (already in version) https://github.com/memcached/memcached/wiki/ReleaseNotes1617 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- .../memcached/0002-check-for-sys-auxv.h.patch | 10 +- ...c-use-pkg-config-to-retrieve-openssl.patch | 181 ------------------ package/memcached/memcached.hash | 6 +- package/memcached/memcached.mk | 2 +- 4 files changed, 9 insertions(+), 190 deletions(-) delete mode 100644 package/memcached/0004-configure-ac-use-pkg-config-to-retrieve-openssl.patch diff --git a/package/memcached/0002-check-for-sys-auxv.h.patch b/package/memcached/0002-check-for-sys-auxv.h.patch index 8c41bb4f01..a7d0dfdd00 100644 --- a/package/memcached/0002-check-for-sys-auxv.h.patch +++ b/package/memcached/0002-check-for-sys-auxv.h.patch @@ -37,14 +37,14 @@ index 26df879..05e61ff 100644 --- a/crc32c.c +++ b/crc32c.c @@ -273,7 +273,7 @@ void crc32c_init(void) { - } } --#elif defined(__aarch64__) && defined(__linux__) -+#elif defined(__aarch64__) && defined(__linux__) && defined(HAVE_SYS_AUX_H) + #elif defined(__aarch64__) && (defined(__linux__) || defined(__APPLE__)) +-#if defined(__linux__) ++#if defined(__linux__) && defined(HAVE_SYS_AUX_H) #include - - #if defined(HWCAP_CRC32) + #elif defined(__APPLE__) + #include -- 2.35.1 diff --git a/package/memcached/0004-configure-ac-use-pkg-config-to-retrieve-openssl.patch b/package/memcached/0004-configure-ac-use-pkg-config-to-retrieve-openssl.patch deleted file mode 100644 index 402fa03b3b..0000000000 --- a/package/memcached/0004-configure-ac-use-pkg-config-to-retrieve-openssl.patch +++ /dev/null @@ -1,181 +0,0 @@ -From 656dedad48c81541060448d008b90290196263c5 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 6 Sep 2020 23:38:19 +0200 -Subject: [PATCH] configure.ac: use pkg-config to retrieve openssl - -Use pkg-config to retrieve openssl dependencies such as -latomic or -lz - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/memcached/memcached/commit/656dedad48c81541060448d008b90290196263c5] ---- - README.md | 2 +- - configure.ac | 133 ++++++++++++++++++++++++++------------------------- - 2 files changed, 69 insertions(+), 66 deletions(-) - -diff --git a/README.md b/README.md -index 3ce1bc2156..8fe067b767 100644 ---- a/README.md -+++ b/README.md -@@ -21,7 +21,7 @@ list to ask questions, github issues aren't seen by everyone! - * libseccomp (optional, experimental, linux) - enables process restrictions for - better security. Tested only on x86-64 architectures. - * openssl (optional) - enables TLS support. need relatively up to date -- version. -+ version. pkg-config is needed to find openssl dependencies (such as -lz). - - ## Environment - -diff --git a/configure.ac b/configure.ac -index a0851f2131..2959a86c89 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -437,80 +437,83 @@ AC_ARG_WITH(libssl, - dnl ---------------------------------------------------------------------------- - dnl libssl detection. swiped from libevent. modified for openssl detection. - -+PKG_PROG_PKG_CONFIG - OPENSSL_URL=https://www.openssl.org/ - if test "x$enable_tls" = "xyes"; then -- AC_CACHE_CHECK([for libssl directory], ac_cv_libssl_dir, [ -- saved_LIBS="$LIBS" -- saved_LDFLAGS="$LDFLAGS" -- saved_CPPFLAGS="$CPPFLAGS" -- le_found=no -- for ledir in $trylibssldir "" $prefix /usr/local ; do -+ PKG_CHECK_MODULES(OPENSSL, openssl, [LIBS="$LIBS $OPENSSL_LIBS" CFLAGS="$CFLAGS $OPENSSL_CFLAGS"], [ -+ AC_CACHE_CHECK([for libssl directory], ac_cv_libssl_dir, [ -+ saved_LIBS="$LIBS" -+ saved_LDFLAGS="$LDFLAGS" -+ saved_CPPFLAGS="$CPPFLAGS" -+ le_found=no -+ for ledir in $trylibssldir "" $prefix /usr/local ; do -+ LDFLAGS="$saved_LDFLAGS" -+ LIBS="-lssl -lcrypto $saved_LIBS" -+ -+ # Skip the directory if it isn't there. -+ if test ! -z "$ledir" -a ! -d "$ledir" ; then -+ continue; -+ fi -+ if test ! -z "$ledir" ; then -+ if test -d "$ledir/lib" ; then -+ LDFLAGS="-L$ledir/lib $LDFLAGS" -+ else -+ LDFLAGS="-L$ledir $LDFLAGS" -+ fi -+ if test -d "$ledir/include" ; then -+ CPPFLAGS="-I$ledir/include $CPPFLAGS" -+ else -+ CPPFLAGS="-I$ledir $CPPFLAGS" -+ fi -+ fi -+ # Can I compile and link it? -+ AC_TRY_LINK([#include -+ #include -+ #include -+ #include ], [ SSL_CTX* ssl_ctx = SSL_CTX_new(TLS_server_method()); -+ assert(OPENSSL_VERSION_NUMBER >= 0x10100000L);], -+ [ libssl_linked=yes ], [ libssl_linked=no ]) -+ if test $libssl_linked = yes; then -+ if test ! -z "$ledir" ; then -+ ac_cv_libssl_dir=$ledir -+ _myos=`echo $target_os | cut -f 1 -d .` -+ AS_IF(test "$SUNCC" = "yes" -o "x$_myos" = "xsolaris2", -+ [saved_LDFLAGS="$saved_LDFLAGS -Wl,-R$ledir/lib"], -+ [AS_IF(test "$GCC" = "yes", -+ [saved_LDFLAGS="$saved_LDFLAGS -Wl,-rpath,$ledir/lib"])]) -+ else -+ ac_cv_libssl_dir="(system)" -+ fi -+ le_found=yes -+ break -+ fi -+ done -+ LIBS="$saved_LIBS" - LDFLAGS="$saved_LDFLAGS" -- LIBS="-lssl -lcrypto $saved_LIBS" -+ CPPFLAGS="$saved_CPPFLAGS" -+ if test $le_found = no ; then -+ AC_MSG_ERROR([libssl (at least version 1.1.0) is required. You can get it from $OPENSSL_URL - -- # Skip the directory if it isn't there. -- if test ! -z "$ledir" -a ! -d "$ledir" ; then -- continue; -+ If it's already installed, specify its path using --with-libssl=/dir/ -+ ]) - fi -- if test ! -z "$ledir" ; then -- if test -d "$ledir/lib" ; then -- LDFLAGS="-L$ledir/lib $LDFLAGS" -- else -- LDFLAGS="-L$ledir $LDFLAGS" -- fi -- if test -d "$ledir/include" ; then -- CPPFLAGS="-I$ledir/include $CPPFLAGS" -- else -- CPPFLAGS="-I$ledir $CPPFLAGS" -- fi -+ ]) -+ LIBS="-lssl -lcrypto $LIBS" -+ if test $ac_cv_libssl_dir != "(system)"; then -+ if test -d "$ac_cv_libssl_dir/lib" ; then -+ LDFLAGS="-L$ac_cv_libssl_dir/lib $LDFLAGS" -+ le_libdir="$ac_cv_libssl_dir/lib" -+ else -+ LDFLAGS="-L$ac_cv_libssl_dir $LDFLAGS" -+ le_libdir="$ac_cv_libssl_dir" - fi -- # Can I compile and link it? -- AC_TRY_LINK([#include -- #include -- #include -- #include ], [ SSL_CTX* ssl_ctx = SSL_CTX_new(TLS_server_method()); -- assert(OPENSSL_VERSION_NUMBER >= 0x10100000L);], -- [ libssl_linked=yes ], [ libssl_linked=no ]) -- if test $libssl_linked = yes; then -- if test ! -z "$ledir" ; then -- ac_cv_libssl_dir=$ledir -- _myos=`echo $target_os | cut -f 1 -d .` -- AS_IF(test "$SUNCC" = "yes" -o "x$_myos" = "xsolaris2", -- [saved_LDFLAGS="$saved_LDFLAGS -Wl,-R$ledir/lib"], -- [AS_IF(test "$GCC" = "yes", -- [saved_LDFLAGS="$saved_LDFLAGS -Wl,-rpath,$ledir/lib"])]) -- else -- ac_cv_libssl_dir="(system)" -- fi -- le_found=yes -- break -+ if test -d "$ac_cv_libssl_dir/include" ; then -+ CPPFLAGS="-I$ac_cv_libssl_dir/include $CPPFLAGS" -+ else -+ CPPFLAGS="-I$ac_cv_libssl_dir $CPPFLAGS" - fi -- done -- LIBS="$saved_LIBS" -- LDFLAGS="$saved_LDFLAGS" -- CPPFLAGS="$saved_CPPFLAGS" -- if test $le_found = no ; then -- AC_MSG_ERROR([libssl (at least version 1.1.0) is required. You can get it from $OPENSSL_URL -- -- If it's already installed, specify its path using --with-libssl=/dir/ -- ]) - fi - ]) -- LIBS="-lssl -lcrypto $LIBS" -- if test $ac_cv_libssl_dir != "(system)"; then -- if test -d "$ac_cv_libssl_dir/lib" ; then -- LDFLAGS="-L$ac_cv_libssl_dir/lib $LDFLAGS" -- le_libdir="$ac_cv_libssl_dir/lib" -- else -- LDFLAGS="-L$ac_cv_libssl_dir $LDFLAGS" -- le_libdir="$ac_cv_libssl_dir" -- fi -- if test -d "$ac_cv_libssl_dir/include" ; then -- CPPFLAGS="-I$ac_cv_libssl_dir/include $CPPFLAGS" -- else -- CPPFLAGS="-I$ac_cv_libssl_dir $CPPFLAGS" -- fi -- fi - fi - - if test "x$enable_static" = "xyes"; then diff --git a/package/memcached/memcached.hash b/package/memcached/memcached.hash index 3bdd1e5e33..78875dde66 100644 --- a/package/memcached/memcached.hash +++ b/package/memcached/memcached.hash @@ -1,6 +1,6 @@ -# From http://www.memcached.org/files/memcached-1.6.16.tar.gz.sha1 -sha1 724f31c3462fb6b07264d72d0043fd65545fd84a memcached-1.6.16.tar.gz +# From http://www.memcached.org/files/memcached-1.6.17.tar.gz.sha1 +sha1 e25639473e15f1bd9516b915fb7e03ab8209030f memcached-1.6.17.tar.gz # Locally computed -sha256 3051a93bf1dd0c3af2d0e589ff6ef6511f876385a35b18e9ff8741e4a1ab34da memcached-1.6.16.tar.gz +sha256 2055e373613d8fc21529aff9f0adce3e23b9ce01ba0478d30e7941d9f2bd1224 memcached-1.6.17.tar.gz sha256 bc887c4ad8051fe690ace9528fe37a2e0bb362e6d963331d82e845ca9b585a0c COPYING diff --git a/package/memcached/memcached.mk b/package/memcached/memcached.mk index 7b4069e820..7183da6c14 100644 --- a/package/memcached/memcached.mk +++ b/package/memcached/memcached.mk @@ -4,7 +4,7 @@ # ################################################################################ -MEMCACHED_VERSION = 1.6.16 +MEMCACHED_VERSION = 1.6.17 MEMCACHED_SITE = http://www.memcached.org/files MEMCACHED_DEPENDENCIES = libevent MEMCACHED_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' From 7967755fbf25fe4d5860884bedb3e01fcd7e9855 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 23 Dec 2022 16:23:56 +0100 Subject: [PATCH 0104/5754] package/rtl_433: drop dynamic library dependency rtl_433 can be built statically since its addition in commit 4634e84978a3e64e9050021d209a41cd88a1ad16 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/rtl_433/Config.in | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package/rtl_433/Config.in b/package/rtl_433/Config.in index 5664227c82..a6db00f477 100644 --- a/package/rtl_433/Config.in +++ b/package/rtl_433/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_RTL_433 bool "rtl_433" depends on BR2_USE_MMU # fork() - depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_LIBOPENSSL_ENABLE_PSK if BR2_PACKAGE_LIBOPENSSL help @@ -11,6 +10,6 @@ config BR2_PACKAGE_RTL_433 https://github.com/merbanan/rtl_433 -comment "rtl_433 needs a toolchain w/ dynamic library, threads" +comment "rtl_433 needs a toolchain w/ threads" depends on BR2_USE_MMU - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_TOOLCHAIN_HAS_THREADS From 6f848c068f8ab0cc67fb48582e00221158ddc8cb Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 23 Dec 2022 16:23:57 +0100 Subject: [PATCH 0105/5754] package/rtl_433: bump to version 22.11 - Drop all patches (already in version) - Threads is not mandatory since https://github.com/merbanan/rtl_433/commit/4f5231bef29f42acc0ce5700584e8c4df5dc0aa2 https://github.com/merbanan/rtl_433/releases/tag/22.11 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...inor-Fix-a-compiler-flag-needs-GCC-7.patch | 27 --------- ....c-fix-build-without-__has_attribute.patch | 34 ----------- ...low-in-Clipsal-CMR113-and-Somfy-IOHC.patch | 58 ------------------- ...0004-Fix-overflow-in-Acurite-00275rm.patch | 35 ----------- package/rtl_433/Config.in | 5 -- package/rtl_433/rtl_433.hash | 2 +- package/rtl_433/rtl_433.mk | 14 ++--- 7 files changed, 8 insertions(+), 167 deletions(-) delete mode 100644 package/rtl_433/0001-minor-Fix-a-compiler-flag-needs-GCC-7.patch delete mode 100644 package/rtl_433/0002-src-optparse.c-fix-build-without-__has_attribute.patch delete mode 100644 package/rtl_433/0003-minor-Fix-overflow-in-Clipsal-CMR113-and-Somfy-IOHC.patch delete mode 100644 package/rtl_433/0004-Fix-overflow-in-Acurite-00275rm.patch diff --git a/package/rtl_433/0001-minor-Fix-a-compiler-flag-needs-GCC-7.patch b/package/rtl_433/0001-minor-Fix-a-compiler-flag-needs-GCC-7.patch deleted file mode 100644 index dd3debf7ee..0000000000 --- a/package/rtl_433/0001-minor-Fix-a-compiler-flag-needs-GCC-7.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 2010e8f949ab7b4555b99dbf184e149a3f33df46 Mon Sep 17 00:00:00 2001 -From: "Christian W. Zuckschwerdt" -Date: Fri, 24 Dec 2021 11:03:06 +0100 -Subject: [PATCH] minor: Fix a compiler flag needs GCC 7 - -[Retrieved from: -https://github.com/merbanan/rtl_433/commit/2010e8f949ab7b4555b99dbf184e149a3f33df46] -Signed-off-by: Fabrice Fontaine ---- - CMakeLists.txt | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a3f11ac99..bfa6595ca 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -74,7 +74,9 @@ if(("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_C_COMPILER_ID}" MATCHES - ADD_DEFINITIONS(-pedantic) - ADD_DEFINITIONS(-Wshadow) - ADD_DEFINITIONS(-Wmissing-prototypes) -- ADD_DEFINITIONS(-Wimplicit-fallthrough) -+ if("${CMAKE_C_COMPILER_ID}" MATCHES "Clang" OR NOT "7.0.0" VERSION_GREATER CMAKE_C_COMPILER_VERSION) -+ ADD_DEFINITIONS(-Wimplicit-fallthrough) -+ endif() - #ADD_DEFINITIONS(-Wfloat-equal) - #ADD_DEFINITIONS(-Wbad-function-cast) - #ADD_DEFINITIONS(-Wdocumentation) diff --git a/package/rtl_433/0002-src-optparse.c-fix-build-without-__has_attribute.patch b/package/rtl_433/0002-src-optparse.c-fix-build-without-__has_attribute.patch deleted file mode 100644 index 683754845f..0000000000 --- a/package/rtl_433/0002-src-optparse.c-fix-build-without-__has_attribute.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 1b74826f155406f86846d5c97b3534aab87cf6da Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 26 Dec 2021 15:21:39 +0100 -Subject: [PATCH] src/optparse.c: fix build without __has_attribute - -Fix build failure without __has_attribute (e.g. gcc 4.8) which is raised -since -https://github.com/merbanan/rtl_433/commit/6c8af75c757712bd58b169317795484a72e9a16c - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/merbanan/rtl_433/pull/1918] ---- - src/optparse.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/optparse.c b/src/optparse.c -index aa3d0b53..b5e2d37e 100644 ---- a/src/optparse.c -+++ b/src/optparse.c -@@ -232,9 +232,11 @@ int atoi_time(char const *str, char const *error_hint) - } - // intentional fallthrough - #if defined(__GNUC__) || defined(__clang__) -+#if defined __has_attribute - #if __has_attribute(fallthrough) - __attribute__((fallthrough)); - #endif -+#endif - #endif - case ':': - ++colons; --- -2.33.0 - diff --git a/package/rtl_433/0003-minor-Fix-overflow-in-Clipsal-CMR113-and-Somfy-IOHC.patch b/package/rtl_433/0003-minor-Fix-overflow-in-Clipsal-CMR113-and-Somfy-IOHC.patch deleted file mode 100644 index e2088b29e7..0000000000 --- a/package/rtl_433/0003-minor-Fix-overflow-in-Clipsal-CMR113-and-Somfy-IOHC.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 2dad7b9fc67a1d0bfbe520fbd821678b8f8cc7a8 Mon Sep 17 00:00:00 2001 -From: "Christian W. Zuckschwerdt" -Date: Mon, 24 Jan 2022 15:53:20 +0100 -Subject: [PATCH] minor: Fix overflow in Clipsal-CMR113 and Somfy-IOHC reported - by aug5t7 - -[Retrieved from: -https://github.com/merbanan/rtl_433/commit/2dad7b9fc67a1d0bfbe520fbd821678b8f8cc7a8] -Signed-off-by: Fabrice Fontaine ---- - src/devices/cmr113.c | 4 ++-- - src/devices/somfy_iohc.c | 9 +++++---- - 2 files changed, 7 insertions(+), 6 deletions(-) - -diff --git a/src/devices/cmr113.c b/src/devices/cmr113.c -index c85dfac56..19ec5d421 100644 ---- a/src/devices/cmr113.c -+++ b/src/devices/cmr113.c -@@ -42,8 +42,8 @@ Kudos to Jon Oxer for decoding this stream and putting it here: - - */ - --#define COMPARE_BITS 83 --#define COMPARE_BYTES (COMPARE_BITS/8) -+#define COMPARE_BITS 83 -+#define COMPARE_BYTES ((COMPARE_BITS + 7) / 8) - - static int cmr113_decode(r_device *decoder, bitbuffer_t *bitbuffer) - { -diff --git a/src/devices/somfy_iohc.c b/src/devices/somfy_iohc.c -index 906cae53e..2c88067b5 100644 ---- a/src/devices/somfy_iohc.c -+++ b/src/devices/somfy_iohc.c -@@ -100,11 +100,12 @@ static int somfy_iohc_decode(r_device *decoder, bitbuffer_t *bitbuffer) - if (bitbuffer->num_rows != 1) - return DECODE_ABORT_EARLY; - -- int offset = bitbuffer_search(bitbuffer, 0, 0, preamble_pattern, 24) + 24; -- if (offset >= bitbuffer->bits_per_row[0] - 19 * 10) -+ unsigned offset = bitbuffer_search(bitbuffer, 0, 0, preamble_pattern, 24) + 24; -+ if (offset + 19 * 10 >= bitbuffer->bits_per_row[0]) - return DECODE_ABORT_EARLY; - -- int num_bits = bitbuffer->bits_per_row[0] - offset; -+ unsigned num_bits = bitbuffer->bits_per_row[0] - offset; -+ num_bits = MIN(num_bits, sizeof (b) * 8); - - int len = extract_bytes_uart(bitbuffer->bb[0], offset, num_bits, b); - if (len < 19) -@@ -120,7 +121,7 @@ static int somfy_iohc_decode(r_device *decoder, bitbuffer_t *bitbuffer) - // calculate and verify checksum - if (crc16lsb(b, len, 0x8408, 0x0000) != 0) // unreflected poly 0x1021 - return DECODE_FAIL_MIC; -- bitrow_printf(b, len * 8, "%s: offset %d, num_bits %d, len %d, msg_len %d\n", __func__, offset, num_bits, len, msg_len); -+ bitrow_printf(b, len * 8, "%s: offset %u, num_bits %u, len %d, msg_len %d\n", __func__, offset, num_bits, len, msg_len); - - int msg_type = (b[0]); - int dst_id = ((unsigned)b[4] << 24) | (b[3] << 16) | (b[2] << 8) | (b[1]); // assume Little-Endian diff --git a/package/rtl_433/0004-Fix-overflow-in-Acurite-00275rm.patch b/package/rtl_433/0004-Fix-overflow-in-Acurite-00275rm.patch deleted file mode 100644 index 057bf9cf64..0000000000 --- a/package/rtl_433/0004-Fix-overflow-in-Acurite-00275rm.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 37455483889bd1c641bdaafc493d1cc236b74904 Mon Sep 17 00:00:00 2001 -From: "Christian W. Zuckschwerdt" -Date: Fri, 18 Mar 2022 08:09:15 +0100 -Subject: [PATCH] Fix overflow in Acurite-00275rm (closes #2012) - -[Retrieved from: -https://github.com/merbanan/rtl_433/commit/37455483889bd1c641bdaafc493d1cc236b74904] -Signed-off-by: Fabrice Fontaine ---- - src/devices/acurite.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/devices/acurite.c b/src/devices/acurite.c -index 6879e52da..4f3e83eb3 100644 ---- a/src/devices/acurite.c -+++ b/src/devices/acurite.c -@@ -1318,15 +1318,15 @@ static int acurite_00275rm_decode(r_device *decoder, bitbuffer_t *bitbuffer) - - // Combine signal if exactly three repeats were found - if (n_rows == 3) { -- uint8_t *b = bitbuffer->bb[bitbuffer->num_rows]; -+ bitbuffer_add_row(bitbuffer); -+ uint8_t *b = bitbuffer->bb[bitbuffer->num_rows - 1]; - for (int i = 0; i < 11; ++i) { - // The majority bit count wins - b[i] = (b_rows[0][i] & b_rows[1][i]) | - (b_rows[1][i] & b_rows[2][i]) | - (b_rows[2][i] & b_rows[0][i]); - } -- bitbuffer->bits_per_row[bitbuffer->num_rows] = 88; -- bitbuffer->num_rows += 1; -+ bitbuffer->bits_per_row[bitbuffer->num_rows - 1] = 88; - } - - // Output the first valid row diff --git a/package/rtl_433/Config.in b/package/rtl_433/Config.in index a6db00f477..01c1e2f5cd 100644 --- a/package/rtl_433/Config.in +++ b/package/rtl_433/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_RTL_433 bool "rtl_433" depends on BR2_USE_MMU # fork() - depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_LIBOPENSSL_ENABLE_PSK if BR2_PACKAGE_LIBOPENSSL help rtl_433 (despite the name) is a generic data receiver, mainly @@ -9,7 +8,3 @@ config BR2_PACKAGE_RTL_433 MHz ISM bands. https://github.com/merbanan/rtl_433 - -comment "rtl_433 needs a toolchain w/ threads" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/rtl_433/rtl_433.hash b/package/rtl_433/rtl_433.hash index fd479dfd21..51fb29c78e 100644 --- a/package/rtl_433/rtl_433.hash +++ b/package/rtl_433/rtl_433.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 b362ef3410adec64aee7ad8e6d4d74875f1b3d59ef6fb4856e96adc03876dc65 rtl_433-21.12.tar.gz +sha256 61a9163d69cc4b1da46aebbcaf969bd180a055a6b90f42ad281218cc4fbefb86 rtl_433-22.11.tar.gz # License file, locally calculated sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/rtl_433/rtl_433.mk b/package/rtl_433/rtl_433.mk index 74a0b54a3d..e3be0e5ecf 100644 --- a/package/rtl_433/rtl_433.mk +++ b/package/rtl_433/rtl_433.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL_433_VERSION = 21.12 +RTL_433_VERSION = 22.11 RTL_433_SITE = $(call github,merbanan,rtl_433,$(RTL_433_VERSION)) RTL_433_LICENSE = GPL-2.0+ RTL_433_LICENSE_FILES = COPYING @@ -18,12 +18,6 @@ RTL_433_CONF_OPTS = \ -DBUILD_TESTING_ANALYZER=OFF \ -DENABLE_SOAPYSDR=OFF -# 0003-minor-Fix-overflow-in-Clipsal-CMR113-and-Somfy-IOHC.patch -RTL_433_IGNORE_CVES += CVE-2022-25051 - -# 0004-Fix-overflow-in-Acurite-00275rm.patch -RTL_433_IGNORE_CVES += CVE-2022-27419 - ifeq ($(BR2_PACKAGE_LIBRTLSDR),y) RTL_433_DEPENDENCIES += librtlsdr RTL_433_CONF_OPTS += -DENABLE_RTLSDR=ON @@ -38,4 +32,10 @@ else RTL_433_CONF_OPTS += -DENABLE_OPENSSL=OFF endif +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) +RTL_433_CONF_OPTS += -DENABLE_THREADS=ON +else +RTL_433_CONF_OPTS += -DENABLE_THREADS=OFF +endif + $(eval $(cmake-package)) From 037226b33b42fb22234694fe1fcb0b6db624161f Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Fri, 23 Dec 2022 16:37:25 +0100 Subject: [PATCH 0106/5754] package/qemu: fix indentation for host-qemu sub-options in menuconfig Commit 255acdc14365 (package/qemu: needs gcc >= 8) added a comment that explains that host-qemu would not be available for gcc < 4.8. However, it interspersed that comment between the main symbol and the conditional block with the sub-options. This breaks the indentation of the sub-options in menuconfig, where they appear at the same level as the main symbol, rather than indented below it. Fix that by moving the comment before the main symbol. Signed-off-by: Yann E. MORIN --- package/qemu/Config.in.host | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package/qemu/Config.in.host b/package/qemu/Config.in.host index f9cdb9b703..8dd0c7d11b 100644 --- a/package/qemu/Config.in.host +++ b/package/qemu/Config.in.host @@ -34,6 +34,11 @@ config BR2_PACKAGE_HOST_QEMU_USER_ARCH_SUPPORTS bool default y if BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS +comment "host-qemu needs a host gcc >= 8" + depends on BR2_PACKAGE_HOST_QEMU_SYSTEM_ARCH_SUPPORTS || \ + BR2_PACKAGE_HOST_QEMU_USER_ARCH_SUPPORT + depends on !BR2_HOST_GCC_AT_LEAST_8 + config BR2_PACKAGE_HOST_QEMU bool "host qemu" depends on BR2_PACKAGE_HOST_QEMU_SYSTEM_ARCH_SUPPORTS || BR2_PACKAGE_HOST_QEMU_USER_ARCH_SUPPORTS @@ -50,11 +55,6 @@ config BR2_PACKAGE_HOST_QEMU http://www.qemu.org -comment "host-qemu needs a host gcc >= 8" - depends on BR2_PACKAGE_HOST_QEMU_SYSTEM_ARCH_SUPPORTS || \ - BR2_PACKAGE_HOST_QEMU_USER_ARCH_SUPPORT - depends on !BR2_HOST_GCC_AT_LEAST_8 - if BR2_PACKAGE_HOST_QEMU comment "Emulators selection" From a38a30eb3a46570705642dc37235ddcc1471b434 Mon Sep 17 00:00:00 2001 From: Dennis Van Hoorick Date: Thu, 15 Dec 2022 11:06:35 +0100 Subject: [PATCH 0107/5754] ncurses: bump to 6.3 remove 0001-gcc-5.x-MKlib_gen.patch as it has already been applied upstream. Signed-off-by: Dennis Van Hoorick Signed-off-by: Yann E. MORIN --- package/ncurses/0001-gcc-5.x-MKlib_gen.patch | 44 -------- package/ncurses/ncurses.hash | 98 ++++++++++------- package/ncurses/ncurses.mk | 106 +++++++++++-------- 3 files changed, 123 insertions(+), 125 deletions(-) delete mode 100644 package/ncurses/0001-gcc-5.x-MKlib_gen.patch diff --git a/package/ncurses/0001-gcc-5.x-MKlib_gen.patch b/package/ncurses/0001-gcc-5.x-MKlib_gen.patch deleted file mode 100644 index 0106e8077f..0000000000 --- a/package/ncurses/0001-gcc-5.x-MKlib_gen.patch +++ /dev/null @@ -1,44 +0,0 @@ -Fix gcc 5.x build failure - -Extracted from upstream commit -http://ncurses.scripts.mit.edu/?p=ncurses.git;a=commit;h=97bb4678dc03e753290b39bbff30ba2825df9517. - -+ modify MKlib_gen.sh to work around change in development version of - gcc introduced here: - https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html - https://gcc.gnu.org/ml/gcc-patches/2014-07/msg00236.html - (reports by Marcus Shawcroft, Maohui Lei). - -Original author: Thomas E. Dickey -Signed-off-by: Mikhail Peselnik -[Adam Duskett: Refresh for 6.1] -Signed-off-by: Adam Duskett ---- a/ncurses/base/MKlib_gen.sh 2015-08-06 20:48:24.000000000 -0400 -+++ b/ncurses/base/MKlib_gen.sh 2017-02-07 10:09:01.293962392 -0500 -@@ -505,11 +505,22 @@ - -e 's/gen_$//' \ - -e 's/ / /g' >>$TMP - -+cat >$ED1 < $ED2 -+cat $ED2 >$TMP -+ - $preprocessor $TMP 2>/dev/null \ --| sed \ -- -e 's/ / /g' \ -- -e 's/^ //' \ -- -e 's/_Bool/NCURSES_BOOL/g' \ -+| sed -f $ED1 \ - | $AWK -f $AW2 \ - | sed -f $ED3 \ - | sed \ diff --git a/package/ncurses/ncurses.hash b/package/ncurses/ncurses.hash index 69115f5caf..1029c1ddcb 100644 --- a/package/ncurses/ncurses.hash +++ b/package/ncurses/ncurses.hash @@ -1,39 +1,65 @@ # Locally calculated after checking pgp signature -sha256 aa057eeeb4a14d470101eff4597d5833dcef5965331be3528c08d99cebaa0d17 ncurses-6.1.tar.gz -sha256 cf9038be62c49a6b5fe93f33b32f983649b2f4c4c31cc99bd18e1e5871c31443 ncurses-6.1-20190609-patch.sh.bz2 -sha256 4b0a4c6abce4543ac4fd4c3389b14825e73b7cddcbb01a687c5dd837f21a3b04 ncurses-6.1-20190615.patch.gz -sha256 b2302625ec2fa6dce79622670452e56ff6130dc02e655b52177264cfeff84c51 ncurses-6.1-20190623.patch.gz -sha256 48b004a3e5409a02a5e751f996fe487f5ce45be1fff38572f7cc8167b22179bf ncurses-6.1-20190630.patch.gz -sha256 faf849eed92161ac09782badf84a19ad6beae472e87d460905865e08a6ed46e4 ncurses-6.1-20190706.patch.gz -sha256 62d4954bf818659105aa1c21cc27cb2c133e02bdc7d3f6aa548caae2d1db7440 ncurses-6.1-20190713.patch.gz -sha256 0c1a54bd5de9c890d1fabcfa92bf5bf46f7eccc54a48051367e82bdb29636450 ncurses-6.1-20190720.patch.gz -sha256 0bbd08d3bd12686d4427c242d6a8fde2e299698039cd597303af713c5f538f17 ncurses-6.1-20190727.patch.gz -sha256 40e5f350a921dbd03e3d9ff93bc477ec4f1f65878f307c534882fba3b0b40507 ncurses-6.1-20190728.patch.gz -sha256 9648104311e209d17db9556d6efc898d5c80ed5fc80e8aa3cd08769544c839b8 ncurses-6.1-20190803.patch.gz -sha256 fa1f583575717b2538d3a4ea59a67bc17dd07ed46cb99fe2beaf23d1b006e9df ncurses-6.1-20190810.patch.gz -sha256 5e9ae4f1b3e2e2d567a01a8fb2c9b7f3804cae97f28cd483d239afee781b8c2b ncurses-6.1-20190817.patch.gz -sha256 7592e5e610b3e9eeca78897da2330b7518f00e0a59d20df873c88a9b26bc4da9 ncurses-6.1-20190824.patch.gz -sha256 1a9800a5ccc4f2cb572b63cdc8f1431642e014a58a30151af73977614d5c4aac ncurses-6.1-20190831.patch.gz -sha256 87685a6b90225efcd03375eb11b124fd9e95ee4b0f36bcbc82e56a70cd466b33 ncurses-6.1-20190907.patch.gz -sha256 4ddebb6e0e5a67028eb3aca2352c9bd48cf122a512719f93e449e00a3c6634f8 ncurses-6.1-20190914.patch.gz -sha256 4c725fa729d754f4e75af78fda4cf67d60e71c1625b5f4f49b7930c95bb8dd36 ncurses-6.1-20190921.patch.gz -sha256 a830b879b57906b1e480e4785b32cec05081b7849c06c4b116459c4d343ba21b ncurses-6.1-20190928.patch.gz -sha256 d5eae35d920409613f565825e1e215fed89828040aab541328455da38e1a9b7c ncurses-6.1-20191005.patch.gz -sha256 136dbd07254810728c1fcb7614b566e7c3cb6af8c0783019bbb6b4b5e3c1e2c6 ncurses-6.1-20191012.patch.gz -sha256 1d5125b20792e9f534432c3ef2aa68984c713416addeb2c4364c5ae897a3b8b7 ncurses-6.1-20191015.patch.gz -sha256 a6475c05312ba0b12b72b83529c1d283a14c4470414c505fa45451e35f3ffcf5 ncurses-6.1-20191019.patch.gz -sha256 f6c7469f33065faf1d04ac9e9bea1a88142b00b82e3db3674cca9ec24920b4af ncurses-6.1-20191026.patch.gz -sha256 0d0443937b9c04663de25b405bb95e658e7c87e1dd7a726b3813aa7f9b55f69a ncurses-6.1-20191102.patch.gz -sha256 f3b75787918d2f02a2005877e81fdc054c45b8249b43aabb531e3b817bcf7576 ncurses-6.1-20191109.patch.gz -sha256 801d138b55986719aea7f42dc8c0cb618fa9a6edf92d1789a6ba5d61678f7761 ncurses-6.1-20191116.patch.gz -sha256 45f447cf2c7a24295c7b9210473e943a238c57ca80581d121c9a1a3aa05332a6 ncurses-6.1-20191123.patch.gz -sha256 ea758e3b0162348c4d5d6dac56f95809da3b7d0589205661a13430eb93f72f75 ncurses-6.1-20191130.patch.gz -sha256 16b5a588c56a53c468d2359b21d5d8a007c4ef7696de12c964a1b661ed185f72 ncurses-6.1-20191207.patch.gz -sha256 8725a2dc8f1cfdab41cb5fe56f930e070f8cdc81a77f303ef2658f65cd0b8edd ncurses-6.1-20191214.patch.gz -sha256 7e2a06fb0af6c84269d23ffe06c689bf1a8a57af39369690ee0698778d4b6cda ncurses-6.1-20191221.patch.gz -sha256 d052bcdb38f8b45a00c0a3190dec7ac1e72d5682f3a16d8accda239308aad62f ncurses-6.1-20191228.patch.gz -sha256 7b6253bae438154a88c7f3e301b872ed7ad71f943c873f4e6c82d8d36a5df72b ncurses-6.1-20200104.patch.gz -sha256 e438f28025c7d97c7f8fabf40eeab68bbf8ca871a0ba349e3fdec9165efe85cb ncurses-6.1-20200111.patch.gz -sha256 06d002c33f727c4a36a0b502c226ea3c3c5b80770703d2f783fffa6a0db04d92 ncurses-6.1-20200118.patch.gz +sha256 97fc51ac2b085d4cde31ef4d2c3122c21abc217e9090a43a30fc5ec21684e059 ncurses-6.3.tar.gz +sha256 51bad0e386d06d3a26d7f28087b2072658282452f209e7e5eb7722556b042570 ncurses-6.3-20211026.patch.gz +sha256 4e1b0694a2633cc681987c80091175cb2b17a6c882750a7c6afb0560f5447249 ncurses-6.3-20211030.patch.gz +sha256 de7e0b2c784342188da48147d3fa661be38d5b5d517bb224423f15893e27334f ncurses-6.3-20211106.patch.gz +sha256 df78f157336fce33d96ae1e3c2f7d7b48e9b728409d9a4ab59e77242255b03ab ncurses-6.3-20211113.patch.gz +sha256 b7bf59d9a8e243263b05b166c6fe321bfca8e67eb32ebc26a1c813df42d64fee ncurses-6.3-20211115.patch.gz +sha256 7cb46c897e2e54d5f085cd9edc8d523c13b8f4a13878dd01ce094ec52bd26aec ncurses-6.3-20211120.patch.gz +sha256 ee8cf6ab6db3a01f2533959d14a5e1cc8e1412fbce4b2ab4668c7d1101f71684 ncurses-6.3-20211127.patch.gz +sha256 9d9055badff9e15fc1fbe4f4b2cce7c76384d446ab857573cbb1d645430d8ac7 ncurses-6.3-20211204.patch.gz +sha256 6059625cac99819a3580955db377c0820b6be7ae5da4d8a82e9638948a7b0679 ncurses-6.3-20211211.patch.gz +sha256 acb77a09fe6ab37b96e9f70d9ebfde0aaf7bdee064761c605b47125bd31be2ae ncurses-6.3-20211219.patch.gz +sha256 f2786f19c85258da9e9255459480e5ac2efb61b6ea5d0866b9b8507fa8f5b036 ncurses-6.3-20211225.patch.gz +sha256 ca5736eda90cd7cb597be0fdb0ed10f04deb7304cc7ffb0b166dfa07c39ab1e7 ncurses-6.3-20220101.patch.gz +sha256 7e43911e6baa4a7cfeaad1880777bda352eb7b22493db5bc9f72a52aec8d6d78 ncurses-6.3-20220115.patch.gz +sha256 ecfdd8bed6ff3b1fae5050da555c77dd41035c35bebed30162862e343324443e ncurses-6.3-20220122.patch.gz +sha256 32ec2da0fe48c353489c4018b38f890a59eafeb37ab24b82e32ba553845438a4 ncurses-6.3-20220129.patch.gz +sha256 f74b0d1f7f96bf8609c6a62e268019289e4affec9e02f9182ab14817637180e7 ncurses-6.3-20220205.patch.gz +sha256 6506f709e745375f692d05f53c45b50f1e60d13a3e4346db46d14f69e19adbb1 ncurses-6.3-20220212.patch.gz +sha256 349433e684e96096cbacaa1014d3ccd285c441d1bd99a721ae0b705b02de4145 ncurses-6.3-20220219.patch.gz +sha256 2181cf581fcdabb5b534606ab81c4c625bf819f9d351c670972a7f3a85f36197 ncurses-6.3-20220226.patch.gz +sha256 1acd0f2d18ea7c783286658e550c4f61cbe750a907c9be5fc00e67f2ea8f7eb5 ncurses-6.3-20220305.patch.gz +sha256 ced13543cc19ee341d82eb7fd501e15a2f3d1bc08fbbeb9de7edbd6422ca4799 ncurses-6.3-20220312.patch.gz +sha256 450fce90a10b1ab0b20ba5efc222741fe96f8445d1e4528e2a7b7711c26a5254 ncurses-6.3-20220319.patch.gz +sha256 c97213841e41d33b50a8492ba252dc79a24b38721f7ac0966442b3176f5666c7 ncurses-6.3-20220326.patch.gz +sha256 4c6253ea2c3cf83fbac2fdb5af56914e6bdc5a7c6e6e7532a4f218b7af6d05eb ncurses-6.3-20220402.patch.gz +sha256 5b46bc2bec8f9192c2ed7d25f2080c57b7d7ecbe294d85ab8d3c7d4eb4a678fa ncurses-6.3-20220409.patch.gz +sha256 fddd3b7dea2db1dc70adfa46ccb52301c820854821ce35366056e8e8daba8360 ncurses-6.3-20220416.patch.gz +sha256 1dba62d927affe93face3d55710d8abce7b70a904a0dd0114894efff7ba8ac72 ncurses-6.3-20220423.patch.gz +sha256 f6289906a3be560da9240e0d4a7a1bbd213dd9316f0b395e6852524491ff6322 ncurses-6.3-20220430.patch.gz +sha256 a6f631b9b934d0012617c429834b370732084d6f3c1784d11d8f18f26ea9e0d4 ncurses-6.3-20220501.patch.gz +sha256 79e75286b2a3292058bbe0aa67d8ea49682f7942b108c3ffc725a34765d4fce7 ncurses-6.3-20220507.patch.gz +sha256 1dda27245cbd6634f89766624dc72c156312bf00635214ea7ac299c9330b18f2 ncurses-6.3-20220514.patch.gz +sha256 0a251674845e0669e92c8bee6b6e5bb317439f8707f3316424eae590322f87c6 ncurses-6.3-20220521.patch.gz +sha256 411c4fdfc2ea4f56fdb57ff758a13dffa4b2fff68e71b65cf3248c925f6c30ee ncurses-6.3-20220529.patch.gz +sha256 acc315edb22a04f6476d9cd2a43866d478e0f4b2a555f480c92a18983bec5ee7 ncurses-6.3-20220604.patch.gz +sha256 2dae4db33c73766cd63b2b700e09588750bae44622749ce007404e3e30420ada ncurses-6.3-20220612.patch.gz +sha256 1e4b5c3deaab601a9749da591952b66a53d96017967eeec033f3b4d30e12d2de ncurses-6.3-20220618.patch.gz +sha256 65379719532023cd77c80a495cf31ff773345173e919ec8eef8b3f9517969626 ncurses-6.3-20220625.patch.gz +sha256 028864b31ada91862f0d8f4aa016b62bc3fe7e3981d62e81110d5143e26d0e0d ncurses-6.3-20220703.patch.gz +sha256 06c2f6d967480d0bcf20f301db26c8e5c90caf6d3adf616bc277e21407e9c955 ncurses-6.3-20220709.patch.gz +sha256 66aa8564d09fcc7bbd85bbe79685772330633c14d70af2fef00d10491e6b22fb ncurses-6.3-20220716.patch.gz +sha256 fffcc8ec0eab3dcbb7b8d8a208d880a15fe128f6f2dbc63a87d5640d8ade95cf ncurses-6.3-20220724.patch.gz +sha256 1787619c0b5052121dc5816bdb4cbd9699e1b61ba6c98072a3733b17cc7009f9 ncurses-6.3-20220729.patch.gz +sha256 d7fb1f2e2246079527351c8b7c8847c28751c6a5bb46740681d4b6ba790b22cc ncurses-6.3-20220806.patch.gz +sha256 10a04d3189a34187e691e73435c210af3939025f07ff6c34c1bfc48fda6f5a5d ncurses-6.3-20220813.patch.gz +sha256 b9238267413c2fce5bfe4c029f28dbbbef7230cdf47792ecd4070b857fe1a869 ncurses-6.3-20220820.patch.gz +sha256 7d30766caaac9136ab0ff7164d33761b186b698ec237560cb8fce0eb937f90b8 ncurses-6.3-20220827.patch.gz +sha256 5f04fd2d954b3461671290c766f784a4151091eb4e9197a7745dcdbb9c030483 ncurses-6.3-20220903.patch.gz +sha256 b948a0efe45341ccc913cc67231ee1e6bc737f178bcd758ce9f2e856e575071f ncurses-6.3-20220910.patch.gz +sha256 f9ad5781a72d669bdd06fe075136cc79e6a570960f6f641a9c486fc102a45c3b ncurses-6.3-20220917.patch.gz +sha256 bbb9d5afaec836e66b9f919c97c81c0505fd111b479b59ab6e376822ff6df1d3 ncurses-6.3-20220924.patch.gz +sha256 7ffeae28a0f8416c6ab088a99807d0d1ee5be821828c288f0a572ea769a8e2e5 ncurses-6.3-20221001.patch.gz +sha256 204baff40926d29ec30b1def4d4cc5d7ce074918327d8e271a49c960032b5a49 ncurses-6.3-20221008.patch.gz +sha256 f578dbb3beb1976636c74b33ffe5d300fee5a7653bc4f64bb7870d1b9cf85e7b ncurses-6.3-20221015.patch.gz +sha256 b01fc81093a331d5d645dbcbacebf6e5d459430b38cbdae0db053c6e5dff7d7e ncurses-6.3-20221023.patch.gz +sha256 e6e819c78c78c3a0355e7da4360d084f5d69871fa556b51322980f22da4edcea ncurses-6.3-20221029.patch.gz +sha256 4da9b5bf14a1b7d6d8a4181e79a98b9e5782153bc7db93773ac43e0b758c4da2 ncurses-6.3-20221105.patch.gz +sha256 b3381da6071bbed04e6ddaabbd5375d280e50af429f94522e32e9d0f22766155 ncurses-6.3-20221112.patch.gz +sha256 bf30c435283a4483280e0433f6370d9eea1fb704323bd887e540592eb8203e2f ncurses-6.3-20221119.patch.gz +sha256 32dc21b671ead8b199d66111ebd3404e8cd5f8c4ca5587cfeb5c6a4913b2d103 ncurses-6.3-20221126.patch.gz +sha256 8fe3bcacaea784ac7971e102a8eb8ca58c4c2c4c13c1ec33f32334600b9e4f56 ncurses-6.3-20221203.patch.gz + # Locally computed sha256 4d1fde61868c73776a539366dccf5d5a4857e7fd7299efb1f02e07c2afe9ea87 COPYING diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk index 2881ca1308..79593d8084 100644 --- a/package/ncurses/ncurses.mk +++ b/package/ncurses/ncurses.mk @@ -4,62 +4,78 @@ # ################################################################################ -NCURSES_VERSION = 6.1 +NCURSES_VERSION = 6.3 NCURSES_SITE = $(BR2_GNU_MIRROR)/ncurses NCURSES_INSTALL_STAGING = YES NCURSES_DEPENDENCIES = host-ncurses NCURSES_LICENSE = MIT with advertising clause NCURSES_LICENSE_FILES = COPYING NCURSES_CPE_ID_VENDOR = gnu -# Commit 4b21273d71d09 added upstream (security) patches up to 20200118 -NCURSES_IGNORE_CVES += CVE-2018-10754 -NCURSES_IGNORE_CVES += CVE-2018-19211 -NCURSES_IGNORE_CVES += CVE-2018-19217 -NCURSES_IGNORE_CVES += CVE-2019-17594 -NCURSES_IGNORE_CVES += CVE-2019-17595 NCURSES_CONFIG_SCRIPTS = ncurses$(NCURSES_LIB_SUFFIX)6-config NCURSES_PATCH = \ $(addprefix https://invisible-mirror.net/archives/ncurses/$(NCURSES_VERSION)/, \ - ncurses-6.1-20190609-patch.sh.bz2 \ - ncurses-6.1-20190615.patch.gz \ - ncurses-6.1-20190623.patch.gz \ - ncurses-6.1-20190630.patch.gz \ - ncurses-6.1-20190706.patch.gz \ - ncurses-6.1-20190713.patch.gz \ - ncurses-6.1-20190720.patch.gz \ - ncurses-6.1-20190727.patch.gz \ - ncurses-6.1-20190728.patch.gz \ - ncurses-6.1-20190803.patch.gz \ - ncurses-6.1-20190810.patch.gz \ - ncurses-6.1-20190817.patch.gz \ - ncurses-6.1-20190824.patch.gz \ - ncurses-6.1-20190831.patch.gz \ - ncurses-6.1-20190907.patch.gz \ - ncurses-6.1-20190914.patch.gz \ - ncurses-6.1-20190921.patch.gz \ - ncurses-6.1-20190928.patch.gz \ - ncurses-6.1-20191005.patch.gz \ - ncurses-6.1-20191012.patch.gz \ - ncurses-6.1-20191015.patch.gz \ - ncurses-6.1-20191019.patch.gz \ - ncurses-6.1-20191026.patch.gz \ - ncurses-6.1-20191102.patch.gz \ - ncurses-6.1-20191109.patch.gz \ - ncurses-6.1-20191116.patch.gz \ - ncurses-6.1-20191123.patch.gz \ - ncurses-6.1-20191130.patch.gz \ - ncurses-6.1-20191207.patch.gz \ - ncurses-6.1-20191214.patch.gz \ - ncurses-6.1-20191221.patch.gz \ - ncurses-6.1-20191228.patch.gz \ - ncurses-6.1-20200104.patch.gz \ - ncurses-6.1-20200111.patch.gz \ - ncurses-6.1-20200118.patch.gz \ + ncurses-6.3-20211026.patch.gz \ + ncurses-6.3-20211030.patch.gz \ + ncurses-6.3-20211106.patch.gz \ + ncurses-6.3-20211113.patch.gz \ + ncurses-6.3-20211115.patch.gz \ + ncurses-6.3-20211120.patch.gz \ + ncurses-6.3-20211127.patch.gz \ + ncurses-6.3-20211204.patch.gz \ + ncurses-6.3-20211211.patch.gz \ + ncurses-6.3-20211219.patch.gz \ + ncurses-6.3-20211225.patch.gz \ + ncurses-6.3-20220101.patch.gz \ + ncurses-6.3-20220115.patch.gz \ + ncurses-6.3-20220122.patch.gz \ + ncurses-6.3-20220129.patch.gz \ + ncurses-6.3-20220205.patch.gz \ + ncurses-6.3-20220212.patch.gz \ + ncurses-6.3-20220219.patch.gz \ + ncurses-6.3-20220226.patch.gz \ + ncurses-6.3-20220305.patch.gz \ + ncurses-6.3-20220312.patch.gz \ + ncurses-6.3-20220319.patch.gz \ + ncurses-6.3-20220326.patch.gz \ + ncurses-6.3-20220402.patch.gz \ + ncurses-6.3-20220409.patch.gz \ + ncurses-6.3-20220416.patch.gz \ + ncurses-6.3-20220423.patch.gz \ + ncurses-6.3-20220430.patch.gz \ + ncurses-6.3-20220501.patch.gz \ + ncurses-6.3-20220507.patch.gz \ + ncurses-6.3-20220514.patch.gz \ + ncurses-6.3-20220521.patch.gz \ + ncurses-6.3-20220529.patch.gz \ + ncurses-6.3-20220604.patch.gz \ + ncurses-6.3-20220612.patch.gz \ + ncurses-6.3-20220618.patch.gz \ + ncurses-6.3-20220625.patch.gz \ + ncurses-6.3-20220703.patch.gz \ + ncurses-6.3-20220709.patch.gz \ + ncurses-6.3-20220716.patch.gz \ + ncurses-6.3-20220724.patch.gz \ + ncurses-6.3-20220729.patch.gz \ + ncurses-6.3-20220806.patch.gz \ + ncurses-6.3-20220813.patch.gz \ + ncurses-6.3-20220820.patch.gz \ + ncurses-6.3-20220827.patch.gz \ + ncurses-6.3-20220903.patch.gz \ + ncurses-6.3-20220910.patch.gz \ + ncurses-6.3-20220917.patch.gz \ + ncurses-6.3-20220924.patch.gz \ + ncurses-6.3-20221001.patch.gz \ + ncurses-6.3-20221008.patch.gz \ + ncurses-6.3-20221015.patch.gz \ + ncurses-6.3-20221023.patch.gz \ + ncurses-6.3-20221029.patch.gz \ + ncurses-6.3-20221105.patch.gz \ + ncurses-6.3-20221112.patch.gz \ + ncurses-6.3-20221119.patch.gz \ + ncurses-6.3-20221126.patch.gz \ + ncurses-6.3-20221203.patch.gz \ ) -# ncurses-6.1-20191012.patch.gz -NCURSES_IGNORE_CVES += CVE-2019-17594 CVE-2019-17595 - NCURSES_CONF_OPTS = \ --without-cxx \ --without-cxx-binding \ From 5a782cfd23109d9e78726bd820cb89c8146f98b5 Mon Sep 17 00:00:00 2001 From: Dennis Van Hoorick Date: Thu, 15 Dec 2022 11:06:36 +0100 Subject: [PATCH 0108/5754] package/ncurses: ignore CVE-2022-29458 Fixed in patch 20220416 Signed-off-by: Dennis Van Hoorick Signed-off-by: Yann E. MORIN --- package/ncurses/ncurses.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk index 79593d8084..4d93a992e4 100644 --- a/package/ncurses/ncurses.mk +++ b/package/ncurses/ncurses.mk @@ -12,6 +12,8 @@ NCURSES_LICENSE = MIT with advertising clause NCURSES_LICENSE_FILES = COPYING NCURSES_CPE_ID_VENDOR = gnu NCURSES_CONFIG_SCRIPTS = ncurses$(NCURSES_LIB_SUFFIX)6-config +# patch 20220416 +NCURSES_IGNORE_CVES += CVE-2022-29458 NCURSES_PATCH = \ $(addprefix https://invisible-mirror.net/archives/ncurses/$(NCURSES_VERSION)/, \ ncurses-6.3-20211026.patch.gz \ From 2b0ac1d62bb2b998cba17699216e9fed7caeb976 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 25 Dec 2022 23:48:24 +0100 Subject: [PATCH 0109/5754] package/ncurses: fix legal info Commit a38a30eb3a46570705642dc37235ddcc1471b434 forgot to update hash of COPYING (update in year) Fixes: - http://autobuild.buildroot.org/results/18ed032d1b7e0492ed90f09873cd260997c1deae Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/ncurses/ncurses.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/ncurses/ncurses.hash b/package/ncurses/ncurses.hash index 1029c1ddcb..c72a2abf46 100644 --- a/package/ncurses/ncurses.hash +++ b/package/ncurses/ncurses.hash @@ -62,4 +62,4 @@ sha256 32dc21b671ead8b199d66111ebd3404e8cd5f8c4ca5587cfeb5c6a4913b2d103 ncurse sha256 8fe3bcacaea784ac7971e102a8eb8ca58c4c2c4c13c1ec33f32334600b9e4f56 ncurses-6.3-20221203.patch.gz # Locally computed -sha256 4d1fde61868c73776a539366dccf5d5a4857e7fd7299efb1f02e07c2afe9ea87 COPYING +sha256 63de87399e9fc8860236082b6b0520e068e9eb1fad0ebd30202aa30bb6f690ac COPYING From b9b155e45faa9fb941c1a4fc51baea82b6496dff Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 26 Dec 2022 00:11:25 +0100 Subject: [PATCH 0110/5754] package/liboping: fix build with ncurses-6.3 https://git.busybox.net/buildroot/commit/?id=a38a30eb3a46570705642dc37235ddcc1471b434 bumped ncurses to version 6.3 which breaks build of liboping. Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- ...ys-use-s-style-format-for-printf-sty.patch | 59 +++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 package/liboping/0005-src-oping.c-always-use-s-style-format-for-printf-sty.patch diff --git a/package/liboping/0005-src-oping.c-always-use-s-style-format-for-printf-sty.patch b/package/liboping/0005-src-oping.c-always-use-s-style-format-for-printf-sty.patch new file mode 100644 index 0000000000..3b68feea3d --- /dev/null +++ b/package/liboping/0005-src-oping.c-always-use-s-style-format-for-printf-sty.patch @@ -0,0 +1,59 @@ +From 670834fd8fbd2533ea25ca83065800e924116579 Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Mon, 15 Nov 2021 08:05:43 +0000 +Subject: [PATCH] src/oping.c: always use "%s"-style format for + printf()-style functions + +`ncuses-6.3` added printf-style function attributes and now makes +it easier to catch cases when user input is used in palce of format +string when built with CFLAGS=-Werror=format-security: + + oping.c:1265:41: error: format not a string literal and no format arguments [-Werror=format-security] + 1265 | hist_symbols_utf8[index]); + | ^~~~~~~~~~~~~~~~~ + +Let's wrap all the missing places with "%s" format. + +Downloaded from upstream PR https://github.com/octo/liboping/pull/61 + +Signed-off-by: Bernd Kuhls +[Bernd: rebased for liboping version 1.10.0] +--- + src/oping.c | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +diff --git a/src/oping.c b/src/oping.c +index c087c80..af4a0cb 100644 +--- a/src/oping.c ++++ b/src/oping.c +@@ -1156,7 +1156,7 @@ static int update_graph_prettyping (ping_context_t *ctx, /* {{{ */ + wattron (ctx->window, COLOR_PAIR(color)); + + if (has_utf8()) +- mvwprintw (ctx->window, /* y = */ 3, /* x = */ x + 2, symbol); ++ mvwprintw (ctx->window, /* y = */ 3, /* x = */ x + 2, "%s", symbol); + else + mvwaddch (ctx->window, /* y = */ 3, /* x = */ x + 2, symbolc); + +@@ -1262,7 +1262,7 @@ static int update_graph_histogram (ping_context_t *ctx) /* {{{ */ + mvwaddch (ctx->window, /* y = */ 3, /* x = */ x + 2, ' '); + else if (has_utf8 ()) + mvwprintw (ctx->window, /* y = */ 3, /* x = */ x + 2, +- hist_symbols_utf8[index]); ++ "%s", hist_symbols_utf8[index]); + else + mvwaddch (ctx->window, /* y = */ 3, /* x = */ x + 2, + hist_symbols_acs[index] | A_ALTCHARSET); +@@ -1639,8 +1639,7 @@ static void update_host_hook (pingobj_iter_t *iter, /* {{{ */ + + HOST_PRINTF ("%zu bytes from %s (%s): icmp_seq=%u ttl=%i ", + data_len, context->host, context->addr, +- sequence, recv_ttl, +- format_qos (recv_qos, recv_qos_str, sizeof (recv_qos_str))); ++ sequence, recv_ttl); + if ((recv_qos != 0) || (opt_send_qos != 0)) + { + HOST_PRINTF ("qos=%s ", +-- +2.34.1 + From 54a8cb19331c8e75f6a48cb529c18619379414d7 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 26 Dec 2022 14:02:07 +0100 Subject: [PATCH 0111/5754] package/multipath-tools: drop patch Drop path and set SYSTEMD="" if needed following upstream feedback: https://github.com/opensvc/multipath-tools/pull/34 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...ble-systemd-if-ENABLE_SYSTEMD-is-def.patch | 35 ------------------- package/multipath-tools/multipath-tools.mk | 3 +- 2 files changed, 2 insertions(+), 36 deletions(-) delete mode 100644 package/multipath-tools/0001-Makefile.inc-Enable-systemd-if-ENABLE_SYSTEMD-is-def.patch diff --git a/package/multipath-tools/0001-Makefile.inc-Enable-systemd-if-ENABLE_SYSTEMD-is-def.patch b/package/multipath-tools/0001-Makefile.inc-Enable-systemd-if-ENABLE_SYSTEMD-is-def.patch deleted file mode 100644 index 133094a7f7..0000000000 --- a/package/multipath-tools/0001-Makefile.inc-Enable-systemd-if-ENABLE_SYSTEMD-is-def.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 8370da992c752e4238de7a8b02ce0e179353c959 Mon Sep 17 00:00:00 2001 -From: Alexander Egorenkov -Date: Sun, 6 Sep 2020 10:37:41 +0200 -Subject: [PATCH] Makefile.inc: Enable systemd if ENABLE_SYSTEMD is defined - -systemd is disabled by default, to activate it set ENABLE_SYSTEMD. - -Signed-off-by: Alexander Egorenkov ---- - Makefile.inc | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/Makefile.inc b/Makefile.inc -index d4d1e0dd..32bc1846 100644 ---- a/Makefile.inc -+++ b/Makefile.inc -@@ -35,6 +35,7 @@ ifndef RUN - endif - endif - -+ifdef ENABLE_SYSTEMD - ifndef SYSTEMD - ifeq ($(shell pkg-config --modversion libsystemd >/dev/null 2>&1 && echo 1), 1) - SYSTEMD = $(shell pkg-config --modversion libsystemd) -@@ -45,6 +46,7 @@ ifndef SYSTEMD - endif - endif - endif -+endif - - ifndef SYSTEMDPATH - SYSTEMDPATH=usr/lib --- -2.28.0 - diff --git a/package/multipath-tools/multipath-tools.mk b/package/multipath-tools/multipath-tools.mk index df3d5138e8..d6abf68ca0 100644 --- a/package/multipath-tools/multipath-tools.mk +++ b/package/multipath-tools/multipath-tools.mk @@ -31,7 +31,8 @@ MULTIPATH_TOOLS_MAKE_OPTS = \ ifeq ($(BR2_PACKAGE_SYSTEMD),y) MULTIPATH_TOOLS_DEPENDENCIES += systemd -MULTIPATH_TOOLS_MAKE_OPTS += ENABLE_SYSTEMD=1 +else +MULTIPATH_TOOLS_MAKE_OPTS += SYSTEMD="" endif define MULTIPATH_TOOLS_BUILD_CMDS From 5dc7e1fc363b217683f009f6470519b751675083 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 26 Dec 2022 11:23:05 +0100 Subject: [PATCH 0112/5754] package/libdeflate: fix aarch64 build Fix the following aarch64 build failure raised since the addition of the package in commit 4231e7b10b87de71e33bb9906eede3751bed5dfe: In file included from /home/autobuild/autobuild/instance-22/output-1/build/libdeflate-1.15/lib/arm/crc32_impl.h:256, from /home/autobuild/autobuild/instance-22/output-1/build/libdeflate-1.15/lib/crc32.c:227: /home/autobuild/autobuild/instance-22/output-1/build/libdeflate-1.15/lib/arm/crc32_impl.h: In function 'clmul_u32': /home/autobuild/autobuild/instance-22/output-1/host/lib/gcc/aarch64-buildroot-linux-gnu/10.4.0/include/arm_neon.h:26723:1: error: inlining failed in call to 'always_inline' 'vmull_p64': target specific option mismatch 26723 | vmull_p64 (poly64_t __a, poly64_t __b) | ^~~~~~~~~ In file included from /home/autobuild/autobuild/instance-22/output-1/build/libdeflate-1.15/lib/crc32.c:227: /home/autobuild/autobuild/instance-22/output-1/build/libdeflate-1.15/lib/arm/crc32_impl.h:262:19: note: called from here 262 | uint64x2_t res = vreinterpretq_u64_p128( | ^~~~~~~~~~~~~~~~~~~~~~~ 263 | compat_vmull_p64((poly64_t)a, (poly64_t)b)); | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/9aee8dafea614db77209818b913a571534466506 - http://autobuild.buildroot.org/results/951d5a1a2959a0cc65ca7e52967ec07bc1cc00f1 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...-target-when-required-due-to-gcc-bug.patch | 90 +++++++++++++++++++ 1 file changed, 90 insertions(+) create mode 100644 package/libdeflate/0001-lib-arm-crc32-use-crypto-target-when-required-due-to-gcc-bug.patch diff --git a/package/libdeflate/0001-lib-arm-crc32-use-crypto-target-when-required-due-to-gcc-bug.patch b/package/libdeflate/0001-lib-arm-crc32-use-crypto-target-when-required-due-to-gcc-bug.patch new file mode 100644 index 0000000000..8823ec4b39 --- /dev/null +++ b/package/libdeflate/0001-lib-arm-crc32-use-crypto-target-when-required-due-to-gcc-bug.patch @@ -0,0 +1,90 @@ +From f8f022e5bc574088ae80327ea5f88a8fe09b48c8 Mon Sep 17 00:00:00 2001 +From: Eric Biggers +Date: Sun, 25 Dec 2022 15:05:52 -0800 +Subject: [PATCH] lib/arm/crc32: use crypto target when required due to gcc bug + +Fixes https://github.com/ebiggers/libdeflate/issues/280 +Fixes: 6db64ab7afd2 ("lib/crc32: CRC-32 optimizations and other improvements") +[Retrieved from: +https://github.com/ebiggers/libdeflate/commit/f8f022e5bc574088ae80327ea5f88a8fe09b48c8] +Signed-off-by: Fabrice Fontaine +--- + lib/arm/cpu_features.h | 23 +++++++++++++++++++++++ + lib/arm/crc32_impl.h | 9 +++++---- + 2 files changed, 28 insertions(+), 4 deletions(-) + +diff --git a/lib/arm/cpu_features.h b/lib/arm/cpu_features.h +index 204c0cd5..4092eba8 100644 +--- a/lib/arm/cpu_features.h ++++ b/lib/arm/cpu_features.h +@@ -116,6 +116,29 @@ static inline u32 get_arm_cpu_features(void) { return 0; } + #else + # define HAVE_PMULL_INTRIN 0 + #endif ++/* ++ * Set USE_PMULL_TARGET_EVEN_IF_NATIVE if a workaround for a gcc bug that was ++ * fixed by commit 11a113d501ff ("aarch64: Simplify feature definitions") in gcc ++ * 13 is needed. A minimal program that fails to build due to this bug when ++ * compiled with -mcpu=emag, at least with gcc 10 through 12, is: ++ * ++ * static inline __attribute__((always_inline,target("+crypto"))) void f() {} ++ * void g() { f(); } ++ * ++ * The error is: ++ * ++ * error: inlining failed in call to ‘always_inline’ ‘f’: target specific option mismatch ++ * ++ * The workaround is to explicitly add the crypto target to the non-inline ++ * function g(), even though this should not be required due to -mcpu=emag ++ * enabling 'crypto' natively and causing __ARM_FEATURE_CRYPTO to be defined. ++ */ ++#if HAVE_PMULL_NATIVE && defined(ARCH_ARM64) && \ ++ GCC_PREREQ(6, 1) && !GCC_PREREQ(13, 1) ++# define USE_PMULL_TARGET_EVEN_IF_NATIVE 1 ++#else ++# define USE_PMULL_TARGET_EVEN_IF_NATIVE 0 ++#endif + + /* CRC32 */ + #ifdef __ARM_FEATURE_CRC32 +diff --git a/lib/arm/crc32_impl.h b/lib/arm/crc32_impl.h +index e426a63d..b9300e4b 100644 +--- a/lib/arm/crc32_impl.h ++++ b/lib/arm/crc32_impl.h +@@ -236,7 +236,7 @@ crc32_arm_crc(u32 crc, const u8 *p, size_t len) + * for implementations that use pmull for folding the data itself. + */ + #if HAVE_CRC32_INTRIN && HAVE_PMULL_INTRIN +-# if HAVE_CRC32_NATIVE && HAVE_PMULL_NATIVE ++# if HAVE_CRC32_NATIVE && HAVE_PMULL_NATIVE && !USE_PMULL_TARGET_EVEN_IF_NATIVE + # define ATTRIBUTES + # else + # ifdef ARCH_ARM32 +@@ -438,7 +438,7 @@ crc32_arm_crc_pmullcombine(u32 crc, const u8 *p, size_t len) + #if HAVE_PMULL_INTRIN + # define crc32_arm_pmullx4 crc32_arm_pmullx4 + # define SUFFIX _pmullx4 +-# if HAVE_PMULL_NATIVE ++# if HAVE_PMULL_NATIVE && !USE_PMULL_TARGET_EVEN_IF_NATIVE + # define ATTRIBUTES + # else + # ifdef ARCH_ARM32 +@@ -558,7 +558,7 @@ crc32_arm_pmullx4(u32 crc, const u8 *p, size_t len) + #if defined(ARCH_ARM64) && HAVE_PMULL_INTRIN && HAVE_CRC32_INTRIN + # define crc32_arm_pmullx12_crc crc32_arm_pmullx12_crc + # define SUFFIX _pmullx12_crc +-# if HAVE_PMULL_NATIVE && HAVE_CRC32_NATIVE ++# if HAVE_PMULL_NATIVE && HAVE_CRC32_NATIVE && !USE_PMULL_TARGET_EVEN_IF_NATIVE + # define ATTRIBUTES + # else + # ifdef __clang__ +@@ -584,7 +584,8 @@ crc32_arm_pmullx4(u32 crc, const u8 *p, size_t len) + (HAVE_SHA3_TARGET || HAVE_SHA3_NATIVE) + # define crc32_arm_pmullx12_crc_eor3 crc32_arm_pmullx12_crc_eor3 + # define SUFFIX _pmullx12_crc_eor3 +-# if HAVE_PMULL_NATIVE && HAVE_CRC32_NATIVE && HAVE_SHA3_NATIVE ++# if HAVE_PMULL_NATIVE && HAVE_CRC32_NATIVE && HAVE_SHA3_NATIVE && \ ++ !USE_PMULL_TARGET_EVEN_IF_NATIVE + # define ATTRIBUTES + # else + # ifdef __clang__ From eda08c6b88ca466c27cb02004e92ac5ae6e60998 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 26 Dec 2022 08:47:48 +0100 Subject: [PATCH 0113/5754] package/lua-cjson: bump to version 2.1.0.10 Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/lua-cjson/Config.in | 2 +- package/lua-cjson/lua-cjson.hash | 2 +- package/lua-cjson/lua-cjson.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/lua-cjson/Config.in b/package/lua-cjson/Config.in index 9474b3176c..1c153fa46a 100644 --- a/package/lua-cjson/Config.in +++ b/package/lua-cjson/Config.in @@ -12,4 +12,4 @@ config BR2_PACKAGE_LUA_CJSON (C-module) - http://www.kyne.com.au/~mark/software/lua-cjson.php + https://www.kyne.com.au/~mark/software/lua-cjson.php diff --git a/package/lua-cjson/lua-cjson.hash b/package/lua-cjson/lua-cjson.hash index b052c5199c..5ddc07bcc6 100644 --- a/package/lua-cjson/lua-cjson.hash +++ b/package/lua-cjson/lua-cjson.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 455fa7d07d8ac9d61f68f538958f8e28972256f38b0a1c2740873daf809d1837 lua-cjson-2.1.0.6-1.src.rock +sha256 02dea368d07753647c75bd9e6660dd4d06ff7d09956d90d5afc4c3f5b78ed187 lua-cjson-2.1.0.10-1.src.rock sha256 9576e82ef5013fbe80b3bd446a7d9ddd47328baa2186c31d3d885e2a9a8cd31e lua-cjson/LICENSE diff --git a/package/lua-cjson/lua-cjson.mk b/package/lua-cjson/lua-cjson.mk index e029dab5cb..e08d230060 100644 --- a/package/lua-cjson/lua-cjson.mk +++ b/package/lua-cjson/lua-cjson.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_CJSON_VERSION = 2.1.0.6-1 +LUA_CJSON_VERSION = 2.1.0.10-1 LUA_CJSON_SUBDIR = lua-cjson LUA_CJSON_LICENSE = MIT LUA_CJSON_LICENSE_FILES = $(LUA_CJSON_SUBDIR)/LICENSE From 7145d04349fbc92588984a01180fc35f044f879a Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 26 Dec 2022 08:48:01 +0100 Subject: [PATCH 0114/5754] package/lua-datafile: bump to version 0.7 Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- 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 07a13e7e8a..e3b415ad4d 100644 --- a/package/lua-datafile/lua-datafile.hash +++ b/package/lua-datafile/lua-datafile.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 4f7d58c50267b5ebd2145e52aaa5fb63fbf63a74ae765f08e2d0dddd570b6b6a datafile-0.6-1.src.rock +sha256 b511ce5a4f4072bb6c496bd42760fa92a0576d0c77828b6a2600d68fe9d7e998 datafile-0.7-1.src.rock sha256 0443ddabab14f69d4c5e2641860343784a0ccbe5ae7a3743f20de9a13991da66 datafile/LICENSE diff --git a/package/lua-datafile/lua-datafile.mk b/package/lua-datafile/lua-datafile.mk index 5d30fdcf97..3b4c65d3e3 100644 --- a/package/lua-datafile/lua-datafile.mk +++ b/package/lua-datafile/lua-datafile.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_DATAFILE_VERSION = 0.6-1 +LUA_DATAFILE_VERSION = 0.7-1 LUA_DATAFILE_NAME_UPSTREAM = datafile LUA_DATAFILE_SUBDIR = datafile LUA_DATAFILE_LICENSE = MIT From 327b72f32bcfc01d580fa47f3e06cd42a828cd99 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 26 Dec 2022 08:48:33 +0100 Subject: [PATCH 0115/5754] package/lua-ev: bump to version 1.5 Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/lua-ev/lua-ev.hash | 4 ++-- package/lua-ev/lua-ev.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/lua-ev/lua-ev.hash b/package/lua-ev/lua-ev.hash index eb4f4cf74c..278f5f8f7f 100644 --- a/package/lua-ev/lua-ev.hash +++ b/package/lua-ev/lua-ev.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4e26e05830955fdd882a1b48b535be94356582eea310327f839f830cd9250d3a lua-ev-339426fbe528f11cb3cd1af69a88f06bba367981.tar.gz -sha256 c224cc31feec52e33b621ccdbc245e21316a20a134a4cd8706438a3b3382e8ac README +sha256 26ac116722a241bf59daf5315ce0ffe751c1babea9a146ffc0a389f1af3facca lua-ev-1.5.tar.gz +sha256 3b6f8a25e3443c8be61fc7a91e1d27b5514d489bb3ea5986eace6fe1531aabcc README diff --git a/package/lua-ev/lua-ev.mk b/package/lua-ev/lua-ev.mk index 39394875b8..eec078944b 100644 --- a/package/lua-ev/lua-ev.mk +++ b/package/lua-ev/lua-ev.mk @@ -4,8 +4,8 @@ # ################################################################################ -LUA_EV_VERSION = 339426fbe528f11cb3cd1af69a88f06bba367981 -LUA_EV_SITE = $(call github,brimworks,lua-ev,$(LUA_EV_VERSION)) +LUA_EV_VERSION = 1.5 +LUA_EV_SITE = $(call github,brimworks,lua-ev,v$(LUA_EV_VERSION)) LUA_EV_DEPENDENCIES = luainterpreter libev LUA_EV_LICENSE = MIT LUA_EV_LICENSE_FILES = README From e3ce4fa930419e2968f844db4c7bc7a09ef473ba Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 26 Dec 2022 08:48:51 +0100 Subject: [PATCH 0116/5754] package/lua-utf8: bump to version 0.1.5 Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/lua-utf8/Config.in | 2 +- package/lua-utf8/lua-utf8.hash | 4 ++-- package/lua-utf8/lua-utf8.mk | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/lua-utf8/Config.in b/package/lua-utf8/Config.in index 313fa4e45d..5815936df5 100644 --- a/package/lua-utf8/Config.in +++ b/package/lua-utf8/Config.in @@ -4,4 +4,4 @@ config BR2_PACKAGE_LUA_UTF8 This module adds UTF-8 support to Lua. It's compatible with Lua "string" module. - http://github.com/starwing/luautf8 + https://github.com/starwing/luautf8 diff --git a/package/lua-utf8/lua-utf8.hash b/package/lua-utf8/lua-utf8.hash index b6720b3603..b4d455ceb7 100644 --- a/package/lua-utf8/lua-utf8.hash +++ b/package/lua-utf8/lua-utf8.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 88c456bc0f00d28201b33551d83fa6e5c3ae6025aebec790c37afb317290e4fa luautf8-0.1.3-1.src.rock -sha256 74506285923bcc3e58aaca1b774db26461021783d02b2dc26bafcaa02ef7a00b luautf8-0.1.3/LICENSE +sha256 68bd8e3c3e20f98fceb9e20d5a7a50168202c22eb45b87eff3247a0608f465ae luautf8-0.1.5-2.src.rock +sha256 74506285923bcc3e58aaca1b774db26461021783d02b2dc26bafcaa02ef7a00b luautf8-0.1.5/LICENSE diff --git a/package/lua-utf8/lua-utf8.mk b/package/lua-utf8/lua-utf8.mk index 52aaf5c71e..33c34a4eb2 100644 --- a/package/lua-utf8/lua-utf8.mk +++ b/package/lua-utf8/lua-utf8.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_UTF8_VERSION = 0.1.3-1 +LUA_UTF8_VERSION = 0.1.5-2 LUA_UTF8_NAME_UPSTREAM = luautf8 LUA_UTF8_LICENSE = MIT LUA_UTF8_LICENSE_FILES = $(LUA_UTF8_SUBDIR)/LICENSE From 83b2e53dcde56d478928d917604bf3af1f903d9f Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 26 Dec 2022 08:49:01 +0100 Subject: [PATCH 0117/5754] package/open62541: bump to version 1.3.4 Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- 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 22c13851bf..09002436e9 100644 --- a/package/open62541/open62541.hash +++ b/package/open62541/open62541.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 283545991c3eb36b18c75a64638c7c2ad8f193654c2403b76aee848abf454e14 open62541-v1.3.3-br1.tar.gz +sha256 9a7955ba01e12dbd327e534c25288f4918d275031394c804943a7e45ba903621 open62541-v1.3.4-br1.tar.gz sha256 fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85 LICENSE diff --git a/package/open62541/open62541.mk b/package/open62541/open62541.mk index edc95dcf15..2c0e3b17fe 100644 --- a/package/open62541/open62541.mk +++ b/package/open62541/open62541.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPEN62541_VERSION = v1.3.3 +OPEN62541_VERSION = v1.3.4 OPEN62541_SITE_METHOD = git OPEN62541_SITE = https://github.com/open62541/open62541.git OPEN62541_GIT_SUBMODULES = YES From c181878a84e9531f25d8dd1f5cb10b86f8bf9e51 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 26 Dec 2022 22:19:10 +0100 Subject: [PATCH 0118/5754] package/libdeflate: fix build with arm soft float Fix the following build failure with arm soft float raised since bump to version 1.15 in commit c31087182fa545784d9a0a01f0b32715d78c3955 and https://github.com/ebiggers/libdeflate/commit/84c76f6f2cf5e5ac4deca0b1c25faebb42469f58: In file included from /home/autobuild/autobuild/instance-3/output-1/build/libdeflate-1.15/lib/arm/crc32_impl.h:256, from /home/autobuild/autobuild/instance-3/output-1/build/libdeflate-1.15/lib/crc32.c:227: /home/autobuild/autobuild/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-gnueabi/11.3.0/include/arm_neon.h:31:2: error: #error "NEON intrinsics not available with the soft-float ABI. Please use -mfloat-abi=softfp or -mfloat-abi=hard" 31 | #error "NEON intrinsics not available with the soft-float ABI. Please use -mfloat-abi=softfp or -mfloat-abi=hard" | ^~~~~ In file included from /home/autobuild/autobuild/instance-3/output-1/build/libdeflate-1.15/lib/crc32.c:227: /home/autobuild/autobuild/instance-3/output-1/build/libdeflate-1.15/lib/arm/crc32_impl.h: In function 'clmul_u32': /home/autobuild/autobuild/instance-3/output-1/build/libdeflate-1.15/lib/arm/crc32_impl.h:262:9: error: unknown type name 'uint64x2_t'; did you mean 'uint16x2_t'? 262 | uint64x2_t res = vreinterpretq_u64_p128( | ^~~~~~~~~~ | uint16x2_t Fixes: - http://autobuild.buildroot.org/results/1445dcbf676893133f311a92ac21b29237fb75df Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...or-due-to-PMULL-enabled-without-NEON.patch | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 package/libdeflate/0002-lib-arm-cpu_features-fix-build-error-due-to-PMULL-enabled-without-NEON.patch diff --git a/package/libdeflate/0002-lib-arm-cpu_features-fix-build-error-due-to-PMULL-enabled-without-NEON.patch b/package/libdeflate/0002-lib-arm-cpu_features-fix-build-error-due-to-PMULL-enabled-without-NEON.patch new file mode 100644 index 0000000000..b13cbc48af --- /dev/null +++ b/package/libdeflate/0002-lib-arm-cpu_features-fix-build-error-due-to-PMULL-enabled-without-NEON.patch @@ -0,0 +1,35 @@ +From 079a6dd171583c1953017b703ec63c5367a284b4 Mon Sep 17 00:00:00 2001 +From: Eric Biggers +Date: Mon, 26 Dec 2022 11:32:47 -0800 +Subject: [PATCH] lib/arm/cpu_features: fix build error due to PMULL enabled + without NEON + +When building for soft float arm32, HAVE_PMULL_INTRIN is being set when +it shouldn't be, causing a build error: + + #error "NEON intrinsics not available with the soft-float ABI..." + +Fix this by making HAVE_PMULL_INTRIN depend on HAVE_NEON_INTRIN, as used +to be the case, in order to get the 'defined(__ARM_FP)' dependency, + +Fixes https://github.com/ebiggers/libdeflate/issues/282 +Fixes: 84c76f6f2cf5 ("lib/arm: make crc32 code work with MSVC") +[Retrieved from: +https://github.com/ebiggers/libdeflate/commit/079a6dd171583c1953017b703ec63c5367a284b4] +Signed-off-by: Fabrice Fontaine +--- + lib/arm/cpu_features.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lib/arm/cpu_features.h b/lib/arm/cpu_features.h +index 4092eba8..edcf7359 100644 +--- a/lib/arm/cpu_features.h ++++ b/lib/arm/cpu_features.h +@@ -97,6 +97,7 @@ static inline u32 get_arm_cpu_features(void) { return 0; } + #endif + #if HAVE_PMULL_NATIVE || \ + (HAVE_DYNAMIC_ARM_CPU_FEATURES && \ ++ HAVE_NEON_INTRIN /* needed to exclude soft float arm32 case */ && \ + (GCC_PREREQ(6, 1) || __has_builtin(__builtin_neon_vmull_p64) || \ + defined(_MSC_VER)) && \ + /* From 99127efe6ec2c8c056e252845326cc374859fa74 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 26 Dec 2022 23:50:35 +0100 Subject: [PATCH 0119/5754] package/dump1090: bump to version 8.2 https://github.com/flightaware/dump1090/compare/v7.2...v8.2 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/dump1090/dump1090.hash | 2 +- package/dump1090/dump1090.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dump1090/dump1090.hash b/package/dump1090/dump1090.hash index 23178567ac..8a4c3a4818 100644 --- a/package/dump1090/dump1090.hash +++ b/package/dump1090/dump1090.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 dfcf57b19f43e0262b1a03b0dc5069a9ddc48427d85378b7ef52fb4e74911eef dump1090-7.2.tar.gz +sha256 1ab8a5acd891bdbba586e2e9f2d9b056210940bd47b5c1a19d133eb091f31555 dump1090-8.2.tar.gz sha256 804f68c803eb5c127c53ad17c4f4e5033ef158e514bb76950dc7b1773f9ce4b0 LICENSE diff --git a/package/dump1090/dump1090.mk b/package/dump1090/dump1090.mk index 82eaaf2cb8..60ef4a9bcb 100644 --- a/package/dump1090/dump1090.mk +++ b/package/dump1090/dump1090.mk @@ -4,7 +4,7 @@ # ################################################################################ -DUMP1090_VERSION = 7.2 +DUMP1090_VERSION = 8.2 DUMP1090_SITE = $(call github,flightaware,dump1090,v$(DUMP1090_VERSION)) DUMP1090_LICENSE = GPL-2.0+ DUMP1090_LICENSE_FILES = LICENSE From 4b473917001fa1145bec2ab118fac97dab0fc26e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 27 Dec 2022 00:07:33 +0100 Subject: [PATCH 0120/5754] package/haveged: bump to version 1.9.18 https://github.com/jirka-h/haveged/blob/v1.9.18/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/haveged/haveged.hash | 2 +- package/haveged/haveged.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/haveged/haveged.hash b/package/haveged/haveged.hash index 8c62ead7c3..61bf6cc9a1 100644 --- a/package/haveged/haveged.hash +++ b/package/haveged/haveged.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f882919ccead07ad6687a4784c0c501e617321e96dd0118403464969359cf6ad haveged-1.9.15.tar.gz +sha256 b835fa02b52ee7d06276e028571cadcb14d08f5e5a4b5767adf81451f70561c7 haveged-1.9.18.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/haveged/haveged.mk b/package/haveged/haveged.mk index 7035142aee..fbf72a96ad 100644 --- a/package/haveged/haveged.mk +++ b/package/haveged/haveged.mk @@ -4,7 +4,7 @@ # ################################################################################ -HAVEGED_VERSION = 1.9.15 +HAVEGED_VERSION = 1.9.18 HAVEGED_SITE = $(call github,jirka-h,haveged,v$(HAVEGED_VERSION)) HAVEGED_LICENSE = GPL-3.0+ HAVEGED_LICENSE_FILES = COPYING From 9a58d1aa9eb3a83d07fd445875c79722b609a78b Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 27 Dec 2022 00:12:08 +0100 Subject: [PATCH 0121/5754] package/libpwquality: bump to version 1.4.5 https://github.com/libpwquality/libpwquality/blob/libpwquality-1.4.5/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libpwquality/libpwquality.hash | 2 +- package/libpwquality/libpwquality.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libpwquality/libpwquality.hash b/package/libpwquality/libpwquality.hash index 1469bc0b7a..e64fb4bf50 100644 --- a/package/libpwquality/libpwquality.hash +++ b/package/libpwquality/libpwquality.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d43baf23dc6887fe8f8e9b75cabaabc5f4bbbaa0f9eff44278d276141752a545 libpwquality-1.4.4.tar.bz2 +sha256 6fcf18b75d305d99d04d2e42982ed5b787a081af2842220ed63287a2d6a10988 libpwquality-1.4.5.tar.bz2 sha256 aa44d09f651bf99b56253187c7778a240740c767d28453ab7fdc9804c842baee COPYING diff --git a/package/libpwquality/libpwquality.mk b/package/libpwquality/libpwquality.mk index d4f7a47120..ae6babbcae 100644 --- a/package/libpwquality/libpwquality.mk +++ b/package/libpwquality/libpwquality.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBPWQUALITY_VERSION = 1.4.4 +LIBPWQUALITY_VERSION = 1.4.5 LIBPWQUALITY_SOURCE = libpwquality-$(LIBPWQUALITY_VERSION).tar.bz2 LIBPWQUALITY_SITE = https://github.com/libpwquality/libpwquality/releases/download/libpwquality-$(LIBPWQUALITY_VERSION) LIBPWQUALITY_LICENSE = BSD-3-Clause or GPL-2.0+ From 1df9d42bdd8cc2e594d6337ee62c3f31499baf80 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Tue, 27 Dec 2022 20:53:39 +0100 Subject: [PATCH 0122/5754] package/fmlib: fix build for ppc e500mc When BR2_powerpc_e500mc=y, fmlib package compilation fails with output: make[2]: *** No rule to make target 'libfm-e500mc.a'. Stop. The fmlib package "make help" command shows: The available make libfm-.a targets are: libfm-ppce500mc.a (P2, P3, P4) ... The package Config.in incorrectly sets BR2_PACKAGE_FMLIB_ARCHTYPE to "e500mc", which is then passed as the package make target. The correct value should be "ppce500mc". The commit fixes this build issue. Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/fmlib/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/fmlib/Config.in b/package/fmlib/Config.in index df4ae440ea..7bccfd7c83 100644 --- a/package/fmlib/Config.in +++ b/package/fmlib/Config.in @@ -37,7 +37,7 @@ endchoice config BR2_PACKAGE_FMLIB_ARCHTYPE string - default "e500mc" if BR2_powerpc_e500mc + default "ppce500mc" if BR2_powerpc_e500mc default "ppc64e6500" if BR2_powerpc_e6500 && BR2_powerpc64 default "ppc32e6500" if BR2_powerpc_e6500 && BR2_powerpc From 95a16926ed78c905d38f6eeb8bc46c9d3d3bb5a0 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 24 Dec 2022 13:57:19 +0100 Subject: [PATCH 0123/5754] package/kodi: bump version to 19.5-Matrix Removed two upstream patches included in this version. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../kodi-jsonschemabuilder.mk | 2 +- .../kodi-texturepacker/kodi-texturepacker.mk | 2 +- ...char-as-formatting-of-non-void-point.patch | 54 ------------------- ...t-as-char-as-formatting-of-non-void-.patch | 33 ------------ package/kodi/kodi.hash | 2 +- package/kodi/kodi.mk | 2 +- 6 files changed, 4 insertions(+), 91 deletions(-) delete mode 100644 package/kodi/0005-GLUtils-cast-as-char-as-formatting-of-non-void-point.patch delete mode 100644 package/kodi/0006-WinSystemX11-cast-as-char-as-formatting-of-non-void-.patch diff --git a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk index 8cc2297bdb..a13fb91afe 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.4-Matrix +KODI_JSONSCHEMABUILDER_VERSION = 19.5-Matrix 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 4733399edc..9432e4bbd6 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.4-Matrix +KODI_TEXTUREPACKER_VERSION = 19.5-Matrix 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/0005-GLUtils-cast-as-char-as-formatting-of-non-void-point.patch b/package/kodi/0005-GLUtils-cast-as-char-as-formatting-of-non-void-point.patch deleted file mode 100644 index af68de220c..0000000000 --- a/package/kodi/0005-GLUtils-cast-as-char-as-formatting-of-non-void-point.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 44b30c116682968bacf8aec566fc9c193026ecc9 Mon Sep 17 00:00:00 2001 -From: Rudi Heitbaum -Date: Wed, 6 Jul 2022 22:48:35 +1000 -Subject: [PATCH] GLUtils: cast as char as formatting of non-void pointers - is disallowed - -Downloaded from upstream commit: -https://github.com/xbmc/xbmc/commit/44b30c116682968bacf8aec566fc9c193026ecc9 - -Signed-off-by: Bernd Kuhls ---- - xbmc/utils/GLUtils.cpp | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/xbmc/utils/GLUtils.cpp b/xbmc/utils/GLUtils.cpp -index 1ef804709f..c36dcf6a20 100644 ---- a/xbmc/utils/GLUtils.cpp -+++ b/xbmc/utils/GLUtils.cpp -@@ -148,27 +148,27 @@ void _VerifyGLState(const char* szfile, const char* szfunction, int lineno) - void LogGraphicsInfo() - { - #if defined(HAS_GL) || defined(HAS_GLES) -- const GLubyte *s; -+ const char* s; - -- s = glGetString(GL_VENDOR); -+ s = reinterpret_cast(glGetString(GL_VENDOR)); - if (s) - CLog::Log(LOGINFO, "GL_VENDOR = %s", s); - else - CLog::Log(LOGINFO, "GL_VENDOR = NULL"); - -- s = glGetString(GL_RENDERER); -+ s = reinterpret_cast(glGetString(GL_RENDERER)); - if (s) - CLog::Log(LOGINFO, "GL_RENDERER = %s", s); - else - CLog::Log(LOGINFO, "GL_RENDERER = NULL"); - -- s = glGetString(GL_VERSION); -+ s = reinterpret_cast(glGetString(GL_VERSION)); - if (s) - CLog::Log(LOGINFO, "GL_VERSION = %s", s); - else - CLog::Log(LOGINFO, "GL_VERSION = NULL"); - -- s = glGetString(GL_SHADING_LANGUAGE_VERSION); -+ s = reinterpret_cast(glGetString(GL_SHADING_LANGUAGE_VERSION)); - if (s) - CLog::Log(LOGINFO, "GL_SHADING_LANGUAGE_VERSION = %s", s); - else --- -2.30.2 - diff --git a/package/kodi/0006-WinSystemX11-cast-as-char-as-formatting-of-non-void-.patch b/package/kodi/0006-WinSystemX11-cast-as-char-as-formatting-of-non-void-.patch deleted file mode 100644 index 41dc3356bd..0000000000 --- a/package/kodi/0006-WinSystemX11-cast-as-char-as-formatting-of-non-void-.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 651c82853fe69dc5aa3e6a50f2eb2f752caafba0 Mon Sep 17 00:00:00 2001 -From: Rudi Heitbaum -Date: Mon, 11 Jul 2022 09:39:02 +0000 -Subject: [PATCH] WinSystemX11: cast as char as formatting of non-void - pointers is disallowed - -Downloaded from upstream commit: -https://github.com/xbmc/xbmc/commit/651c82853fe69dc5aa3e6a50f2eb2f752caafba0 - -Signed-off-by: Bernd Kuhls ---- - xbmc/windowing/X11/WinSystemX11.cpp | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/xbmc/windowing/X11/WinSystemX11.cpp b/xbmc/windowing/X11/WinSystemX11.cpp -index 8a18288fd8..033c0f77bf 100644 ---- a/xbmc/windowing/X11/WinSystemX11.cpp -+++ b/xbmc/windowing/X11/WinSystemX11.cpp -@@ -1038,7 +1038,10 @@ bool CWinSystemX11::HasWindowManager() - - if(status == Success && items_read) - { -- CLog::Log(LOGDEBUG,"Window Manager Name: %s", data); -+ const char* s; -+ -+ s = reinterpret_cast(data); -+ CLog::Log(LOGDEBUG, "Window Manager Name: {}", s); - } - else - CLog::Log(LOGDEBUG,"Window Manager Name: "); --- -2.30.2 - diff --git a/package/kodi/kodi.hash b/package/kodi/kodi.hash index a17e0fb29f..e0f548879e 100644 --- a/package/kodi/kodi.hash +++ b/package/kodi/kodi.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 cc026f59fd6e37ae90f3449df50810f1cefa37da9444e1188302d910518710da kodi-19.4-Matrix.tar.gz +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 diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index c41c515d10..dbe6c1e8f6 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 = 19.4 +KODI_VERSION_MAJOR = 19.5 KODI_VERSION_NAME = Matrix KODI_VERSION = $(KODI_VERSION_MAJOR)-$(KODI_VERSION_NAME) KODI_SITE = $(call github,xbmc,xbmc,$(KODI_VERSION)) From 82edf126c98bbf652de917892f25ea6d37f99bb9 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 24 Dec 2022 13:57:20 +0100 Subject: [PATCH 0124/5754] package/kodi-pvr-nextpvr: bump version to 19.0.6-Matrix 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 79921da503..17d9817053 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 49df97d2e566dc044d3027e4ee6ed8e1ff122f4c38c82325e20ac91e148d5558 kodi-pvr-nextpvr-19.0.5-Matrix.tar.gz +sha256 45ad0def6bbdb50fc42dc0b8a997e0db758fda42421fa7eb7643466ea512134f kodi-pvr-nextpvr-19.0.6-Matrix.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 dc62040b02..6b3590a6d6 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.5-Matrix +KODI_PVR_NEXTPVR_VERSION = 19.0.6-Matrix 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 02cc05e757970a23da3c0818f275d465a4c1f280 Mon Sep 17 00:00:00 2001 From: Michael Nosthoff Date: Sun, 25 Dec 2022 22:13:54 +0100 Subject: [PATCH 0125/5754] DEVELOPERS: add myself to more packages Signed-off-by: Michael Nosthoff Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 5eed4a8455..48e7e08b3a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2105,12 +2105,16 @@ F: package/gnuplot/ F: package/sdl2/ N: Michael Nosthoff +F: package/boost/ +F: package/fmt/ F: package/grpc/ F: package/gtest/ +F: package/json-for-modern-cpp/ F: package/libabseil-cpp/ F: package/networkd-dispatcher/ F: package/protobuf/ F: package/re2/ +F: package/spdlog/ N: Michael Rommel F: package/knock/ From 319c56dfe3309dbf24be01fed3afff6259a2c5dd Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 25 Dec 2022 22:55:09 +0100 Subject: [PATCH 0126/5754] package/stellarium: bump version to 1.2 Add patch to fix build error. Removed sha1 hash. Add configure option to disable searching for qt6 as of now due to incomplete implementation of qt6 modules, like gui, in buildroot. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../stellarium/0001-add-missing-include.patch | 32 +++++++++++++++++++ package/stellarium/stellarium.hash | 3 +- package/stellarium/stellarium.mk | 4 ++- 3 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 package/stellarium/0001-add-missing-include.patch diff --git a/package/stellarium/0001-add-missing-include.patch b/package/stellarium/0001-add-missing-include.patch new file mode 100644 index 0000000000..822fc50367 --- /dev/null +++ b/package/stellarium/0001-add-missing-include.patch @@ -0,0 +1,32 @@ +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 f33dd385ca..2488b611a4 100644 --- a/package/stellarium/stellarium.hash +++ b/package/stellarium/stellarium.hash @@ -1,5 +1,4 @@ # From https://github.com/Stellarium/stellarium/releases -sha1 3661b4e8a94e7a520873fa22ddc79f39904eb1c4 stellarium-0.22.2.tar.gz -sha256 31e965d32cafc0fbad212c7ef4efbeac988f909206013554e1fe35123ebb9376 stellarium-0.22.2.tar.gz +sha256 802a0e8231cae41ec04f697f70105c291d9719aa6e7fd8cbe1f15068c3324e09 stellarium-1.2.tar.xz # Locally computed sha256 3aeeb5bb98bf7041ab82cffe15efa28ac58ee2bdf162b71301f5c192be631259 COPYING diff --git a/package/stellarium/stellarium.mk b/package/stellarium/stellarium.mk index 769e7049c1..a62488907f 100644 --- a/package/stellarium/stellarium.mk +++ b/package/stellarium/stellarium.mk @@ -4,7 +4,8 @@ # ################################################################################ -STELLARIUM_VERSION = 0.22.2 +STELLARIUM_VERSION = 1.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+ STELLARIUM_LICENSE_FILES = COPYING @@ -18,6 +19,7 @@ STELLARIUM_CONF_OPTS = \ -DENABLE_MEDIA=ON \ -DENABLE_NLS=OFF \ -DENABLE_QTWEBENGINE=OFF \ + -DENABLE_QT6=OFF \ -DUSE_SYSTEM_ZLIB=ON ifeq ($(BR2_PACKAGE_QT5SCRIPT),y) From 44161560dd52ebe9a41ee6e5ec8cacb2a9fe48ec Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 24 Dec 2022 10:18:11 +0100 Subject: [PATCH 0127/5754] support/tests: print failed command and output on assertRunOK error Currently, when asserting that a command succeeded, we just capture the return code of the command. If that is not zero, the assertion fails, but the error message is not very splicit: AssertionError: 1 != 0 Replace the error message with an explicit message that dumps the failed command, the error code, and the resulting output. Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- support/testing/infra/basetest.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/support/testing/infra/basetest.py b/support/testing/infra/basetest.py index 96c6848dfc..45bcd4c2e2 100644 --- a/support/testing/infra/basetest.py +++ b/support/testing/infra/basetest.py @@ -88,7 +88,12 @@ def tearDown(self): super(BRTest, self).tearDown() # Run the given 'cmd' with a 'timeout' on the target and - # assert that the command succeeded + # assert that the command succeeded; on error, print the + # faulty command and its output def assertRunOk(self, cmd, timeout=-1): - _, exit_code = self.emulator.run(cmd, timeout) - self.assertEqual(exit_code, 0) + out, exit_code = self.emulator.run(cmd, timeout) + self.assertEqual( + exit_code, + 0, + "\nFailed to run: {}\noutput was:\n{}".format(cmd, ' '+'\n '.join(out)) + ) From 216e201cd0f14aacac2e9727e8da8f64d734a064 Mon Sep 17 00:00:00 2001 From: Tan En De Date: Sat, 24 Dec 2022 12:46:16 +0800 Subject: [PATCH 0128/5754] package/libkcapi: 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. So, revert to using .symver in such case. Fixes: http://autobuild.buildroot.net/results/4470efb5a078c0e368f6bd4f5ec455eea5eeebb5/ Upstream status: commit f630ed1f807e26de04b3a5dfd7f1b39d1c5cb642 https://github.com/smuellerDD/libkcapi/pull/147 Signed-off-by: Tan En De Signed-off-by: Thomas Petazzoni --- ...ver-build-error-on-non-ELF-platforms.patch | 84 +++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100644 package/libkcapi/0003-Fix-symver-build-error-on-non-ELF-platforms.patch diff --git a/package/libkcapi/0003-Fix-symver-build-error-on-non-ELF-platforms.patch b/package/libkcapi/0003-Fix-symver-build-error-on-non-ELF-platforms.patch new file mode 100644 index 0000000000..206ac7ec4a --- /dev/null +++ b/package/libkcapi/0003-Fix-symver-build-error-on-non-ELF-platforms.patch @@ -0,0 +1,84 @@ +From f630ed1f807e26de04b3a5dfd7f1b39d1c5cb642 Mon Sep 17 00:00:00 2001 +From: Tan En De +Date: Sat, 26 Nov 2022 07:47:39 +0800 +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. +So, revert to using .symver in such case. + +[1]: http://autobuild.buildroot.net/results/447/4470efb5a078c0e368f6bd4f5ec455eea5eeebb5/build-end.log + +Signed-off-by: Tan En De +Signed-off-by: Stephan Mueller +--- +Upstream status: commit f630ed1f807e26de04b3a5dfd7f1b39d1c5cb642 + + configure.ac | 2 ++ + lib/internal.h | 2 +- + m4/ac_check_attribute_symver.m4 | 24 ++++++++++++++++++++++++ + 3 files changed, 27 insertions(+), 1 deletion(-) + create mode 100644 m4/ac_check_attribute_symver.m4 + +diff --git a/configure.ac b/configure.ac +index e230577..ba17404 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -76,6 +76,8 @@ AX_ADD_FORTIFY_SOURCE + + AC_CHECK_API_VERSION + ++AC_CHECK_ATTRIBUTE_SYMVER ++ + AC_ARG_ENABLE([werror], [AS_HELP_STRING([--disable-werror], [Disable -Werror])], [with_werror=$enableval], [with_werror=yes]) + AM_CONDITIONAL([ENABLE_WERROR], [test "x$with_werror" = "xyes"]) + +diff --git a/lib/internal.h b/lib/internal.h +index 14844a9..7977b04 100644 +--- a/lib/internal.h ++++ b/lib/internal.h +@@ -352,7 +352,7 @@ static inline int io_getevents(__attribute__((unused)) aio_context_t ctx, + * Auxiliary macros + ************************************************************/ + +-#if __GNUC__ >= 10 ++#if HAVE_ATTRIBUTE_SYMVER && __GNUC__ >= 10 + # define IMPL_SYMVER(name, version) \ + __attribute__((__symver__("kcapi_" #name "@@LIBKCAPI_" version))) + +diff --git a/m4/ac_check_attribute_symver.m4 b/m4/ac_check_attribute_symver.m4 +new file mode 100644 +index 0000000..b484c5e +--- /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.34.1 + From a41f246439c0387f7b028b3f7e40978a2e0f1a50 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 23 Dec 2022 20:34:52 -0700 Subject: [PATCH 0129/5754] package/meson: bump to version 1.0.0 Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- 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 1544bb3897..6993b756ae 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/0.64.1/meson-0.64.1.tar.gz.asc -sha256 3a8e030c2334f782085f81627062cc6d4a6771edf31e055ffe374f9e6b089ab9 meson-0.64.1.tar.gz +# 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 sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING diff --git a/package/meson/meson.mk b/package/meson/meson.mk index 5aae95973a..e417d8d627 100644 --- a/package/meson/meson.mk +++ b/package/meson/meson.mk @@ -4,7 +4,7 @@ # ################################################################################ -MESON_VERSION = 0.64.1 +MESON_VERSION = 1.0.0 MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) MESON_LICENSE = Apache-2.0 MESON_LICENSE_FILES = COPYING From de4cf253752d2225b7d258cbaee0ddebf64901fa Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 23 Dec 2022 18:35:07 -0700 Subject: [PATCH 0130/5754] package/{rust, rust-bin}: bump to version 1.66.0 Link to Rust 1.66.0 annoucement: https://blog.rust-lang.org/2022/12/15/Rust-1.66.0.html Newest version of the source archives have been retrieved with their hash values, and the signature of the .asc files have been verified as follows: $ curl -fsSL https://static.rust-lang.org/rust-key.gpg.ascii | gpg --import $ gpg --verify There is no typographical error in the packages according to the check-pakage utility: $ ./utils/check-package package/rust-bin/* $ ./utils/check-package package/rust/* The testsuite tool were successfully run for rust and rust-bin packages to test the Rust toolchain under 1.66.0: $ ./support/testing/run-tests -k -d dl/ -o testsuite tests.package.test_rust.TestRustBin $ ./support/testing/run-tests -k -d dl/ -o testsuite tests.package.test_rust.TestRust In order to verify the compatibility of packages depending on Rust 1.66.0, tests using `./utils/test-pkg` were run. You may want to execute the test-pkg command after creating a `.config` file enabling the corresponding BR2_PACKAGE, for example: Create a file `buildroot/ripgrep.config` containing "BR2_PACKAGE_RIPGREP=y" Then execute: $ ./utils/test-pkg -d test-pkg -c ripgrep.config -p ripgrep Results: librsvg OK ripgrep OK suricata OK bat OK 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 af9927a028..7cc1052dd9 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.65.0-aarch64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.65.0-aarch64-unknown-linux-gnu.tar.xz.asc -sha256 b3a83a9585b8c4ede4eab2a11b3f96895f676d8b46c9642140c4fefd5c309ed1 rust-1.65.0-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.65.0-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.65.0-i686-unknown-linux-gnu.tar.xz.asc -sha256 50595b96f98e0940bbfe00209d6c233e9158e140ecd6088ad3bd53f89b123e9d rust-1.65.0-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.65.0-mips-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.65.0-mips-unknown-linux-gnu.tar.xz.asc -sha256 afa3af620b3a0bf8a1da33413eace1db681db5f99b2572ac016027b3d71a50b7 rust-1.65.0-mips-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.65.0-mipsel-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.65.0-mipsel-unknown-linux-gnu.tar.xz.asc -sha256 c6b48026fb131a404bcdc7a691246c3de716e32805d58d1571e253b9a5b047b5 rust-1.65.0-mipsel-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.65.0-powerpc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.65.0-powerpc-unknown-linux-gnu.tar.xz.asc -sha256 5601b31290790a7077c342c8731bb1d5de1a89639476e14bc7840aeaa3ab6010 rust-1.65.0-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.65.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.65.0-powerpc64-unknown-linux-gnu.tar.xz.asc -sha256 8cf900ac125d6bebc97ebb777761923b2062e4fc36692c1f2d68faa0e70949b2 rust-1.65.0-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.65.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.65.0-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 e0654c20446aa5c66def122617f3ca4be9e9b86e75040327e3d35973b6b88980 rust-1.65.0-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.65.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.65.0-riscv64gc-unknown-linux-gnu.tar.xz.asc -sha256 f02e1bac01415e101fac58608b070b0f37c7df1a142c8001ddbc489cfb85c232 rust-1.65.0-riscv64gc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.65.0-s390x-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.65.0-s390x-unknown-linux-gnu.tar.xz.asc -sha256 e7dc9bb42c0e738f68f8ad4b05cf4b7bef8fa490c379e5730c7e282507b305ee rust-1.65.0-s390x-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.65.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.65.0-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 9455cab767f7b9f46259aac8d953f15f11b3d65513384e2b0a5e77d0432ae82f rust-1.65.0-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-aarch64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-aarch64-unknown-linux-gnu.tar.xz.asc -sha256 735b681c8a6e60925c76d6cc899e78b4cb4562ada24a1f265b2021c1faad78ad rust-std-1.65.0-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-aarch64-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-aarch64-unknown-linux-musl.tar.xz.asc -sha256 9ea488da40c347826cce7e238847c745ee566254bb1d077412673f8243fb1cd2 rust-std-1.65.0-aarch64-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-arm-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-arm-unknown-linux-gnueabi.tar.xz.asc -sha256 c8793e77ef43336bc372a7a5b4720d5449e92577c7875471c2bc40ddbfde4811 rust-std-1.65.0-arm-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-arm-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-arm-unknown-linux-gnueabihf.tar.xz.asc -sha256 f7d5eb17dbe46ee9d3c4f9fcffc07b8e3311c747545402c8d3b5c43043f27288 rust-std-1.65.0-arm-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-arm-unknown-linux-musleabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-arm-unknown-linux-musleabihf.tar.xz.asc -sha256 32d7f301196d73027fb9a5ae595dbadacdc234307c36b4a175a132e75318e38c rust-std-1.65.0-arm-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-arm-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-arm-unknown-linux-musleabi.tar.xz.asc -sha256 453a1443e4753611dc4e6969e50ad8d7984a31d1a457729a860599ed19b1de7a rust-std-1.65.0-arm-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-armv5te-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-armv5te-unknown-linux-gnueabi.tar.xz.asc -sha256 d079e841be640b4ce26aa821f29bc813243a7c0af7b8aca8ca4acf5c2e5b722f rust-std-1.65.0-armv5te-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-armv5te-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-armv5te-unknown-linux-musleabi.tar.xz.asc -sha256 1d11ab1d60070ae30ff87b55dca077f4d532d814a9ab7bc77055b5b429a78c6e rust-std-1.65.0-armv5te-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-armv7-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-armv7-unknown-linux-gnueabihf.tar.xz.asc -sha256 fec73401941bffce3b6913d31955f1291119dea119c0051d94f271ae7c959d4c rust-std-1.65.0-armv7-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-armv7-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-armv7-unknown-linux-gnueabi.tar.xz.asc -sha256 c14268337c69650a2618909d8e691489385d748374d73ab8d6a2f9d6b030d70d rust-std-1.65.0-armv7-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-armv7-unknown-linux-musleabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-armv7-unknown-linux-musleabihf.tar.xz.asc -sha256 9368527053c4bab0fd320209b45f0278d0a1e54a37006a56a6e565404ab73fef rust-std-1.65.0-armv7-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-armv7-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-armv7-unknown-linux-musleabi.tar.xz.asc -sha256 0b5bc219333e3e983fb1e7e86a0c268c4a52ccbd6326a16785be9d9017d97e9f rust-std-1.65.0-armv7-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-i586-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-i586-unknown-linux-gnu.tar.xz.asc -sha256 533eda439eb5ffec258b8219445742d6d60570040b3ff167291e3d0d985b9d70 rust-std-1.65.0-i586-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-i586-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-i586-unknown-linux-musl.tar.xz.asc -sha256 7f5d9ae65827aef1a51676927a4c9533f942021d2fd45fd93b23dfaa738ee205 rust-std-1.65.0-i586-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-i686-unknown-linux-gnu.tar.xz.asc -sha256 99bd62d593a6ab3205cab7f06b5793a075b9d05d868e927a6948e46269d61e82 rust-std-1.65.0-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-i686-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-i686-unknown-linux-musl.tar.xz.asc -sha256 644a4c57c1392f776c5ebb13f9832778b69464391b3766e6bbd18c3aa11787a6 rust-std-1.65.0-i686-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-mips-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-mips-unknown-linux-gnu.tar.xz.asc -sha256 50c65a8effc85aa89242ba0a2a2c89bfcc4d0a39dcb42396d10b0036b9a4e90c rust-std-1.65.0-mips-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-mips-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-mips-unknown-linux-musl.tar.xz.asc -sha256 3bc5043f4eb7bb6418708792ee8e777197e562d03843a9adf62ce245ba07289a rust-std-1.65.0-mips-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-mips64-unknown-linux-gnuabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-mips64-unknown-linux-gnuabi64.tar.xz.asc -sha256 338c702b79dac33e32dde097084dd38852487d2976c5eb66b44ba8fc8319342b rust-std-1.65.0-mips64-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-mips64-unknown-linux-muslabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-mips64-unknown-linux-muslabi64.tar.xz.asc -sha256 9450745a5e678c9b7e65ecc7d6a016f92d8d22d8091c4a77431b1e58b99a435f rust-std-1.65.0-mips64-unknown-linux-muslabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-mips64el-unknown-linux-gnuabi64.tar.xz.asc -sha256 a0a0e60a0e850140194250fbbfb962c322d4f474f4ec22d03b7f537034257c09 rust-std-1.65.0-mips64el-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-mips64el-unknown-linux-muslabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-mips64el-unknown-linux-muslabi64.tar.xz.asc -sha256 0862706d22dcfee39b0d2df874dd6065d8c3020c0b8974f6e7b694edd42413ae rust-std-1.65.0-mips64el-unknown-linux-muslabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-mipsel-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-mipsel-unknown-linux-gnu.tar.xz.asc -sha256 79e078420f7c45fd1cf38b70620ced50d35ddb1621736b65be987c20481fe5bc rust-std-1.65.0-mipsel-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-mipsel-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-mipsel-unknown-linux-musl.tar.xz.asc -sha256 482e9245873338a08f47ea2c29683134b8813deb3e3eafb78b786d34bbecce51 rust-std-1.65.0-mipsel-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-powerpc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-powerpc-unknown-linux-gnu.tar.xz.asc -sha256 672b9ea8018dcdf7d5f79f5298bacc34e7600a082727b4f1a20c14251752aaa2 rust-std-1.65.0-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-powerpc64-unknown-linux-gnu.tar.xz.asc -sha256 8a26e08908156ae5a05c64c2732435ef4efb994a2ac6d0b2e9c93c0dae19d089 rust-std-1.65.0-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 ce18b44300f7d5d94856cef5b270ba010061fafa411beb9782207e26cbab88a6 rust-std-1.65.0-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-riscv64gc-unknown-linux-gnu.tar.xz.asc -sha256 fa99f123ce14f1cda245857b50fd4709adee960e7d36ce663b87c13aee18b64b rust-std-1.65.0-riscv64gc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-s390x-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-s390x-unknown-linux-gnu.tar.xz.asc -sha256 a3f6740be345364f4599ae837d2401e0f31e5d33a4f958852d12a384ee581a83 rust-std-1.65.0-s390x-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-sparc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-sparc64-unknown-linux-gnu.tar.xz.asc -sha256 fc2a8816665f464d3085dcd379c44b9de0ee1f1084fae0a4c32c57754b27992b rust-std-1.65.0-sparc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 2b588cd2d49688c0c33b7466614123e8fe4c910f4d802fc0ff0662b1772816a9 rust-std-1.65.0-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.65.0-x86_64-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.65.0-x86_64-unknown-linux-musl.tar.xz.asc -sha256 55abeb1b55aeebc46a4af2f304271361397df58d12f7eb23fb262bc3132c6056 rust-std-1.65.0-x86_64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-1.66.0-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.66.0-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 e8d853383355aa17fd8d7efae740ac0f18b3a5f452c9ac62f5042fc96ebda3e9 rust-1.66.0-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.66.0-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.66.0-i686-unknown-linux-gnu.tar.xz.asc +sha256 c9551f9650fcaf74ea4fb6874b6853f9ffecb6925e7a087afb4f36840e5b7b8d rust-1.66.0-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.66.0-mips-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.66.0-mips-unknown-linux-gnu.tar.xz.asc +sha256 ec49ef94889c88f8fd107e9c263003aa6dcd9fb4d17ba057ffab4e4dc28fefd4 rust-1.66.0-mips-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.66.0-mipsel-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.66.0-mipsel-unknown-linux-gnu.tar.xz.asc +sha256 755bcca28ee9d4504b7bd87265dc492a8e39550211f8081740940ada9e48cc7e rust-1.66.0-mipsel-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.66.0-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.66.0-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 eaaca0295a75a180082456eb3606e6c3fbc16a4f2b54bd754caab5a69b192f88 rust-1.66.0-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.66.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.66.0-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 a194c1a8f1bd8c450872ad2220bfe74e590c5706d4ec939577c69a013a0bbcff rust-1.66.0-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.66.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.66.0-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 9fa197239eb374e071ef4486939c4713a2d662c5e7ebca0505626a3a53a7ed75 rust-1.66.0-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.66.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.66.0-riscv64gc-unknown-linux-gnu.tar.xz.asc +sha256 6331e676198af2e75734f6566ca62ae22bb61b1d55e749494c454e777a73f195 rust-1.66.0-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.66.0-s390x-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.66.0-s390x-unknown-linux-gnu.tar.xz.asc +sha256 8d7053db5ea68f4801c7a808a222473076b8a602af70379975e81eede8a7e0ea rust-1.66.0-s390x-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.66.0-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.66.0-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 a656328e1cd36b253bf39807b5a3eacdf0ce7d982fc9fb51a026f273386de84a rust-1.66.0-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 b5ac5985a8fefd2a0de67197f7c2549aacee502cc784a3c3c93921b005aa31fa rust-std-1.66.0-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-aarch64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-aarch64-unknown-linux-musl.tar.xz.asc +sha256 ca62347018d1ace5e13a4a2f898dd2b19d5cb96db41482119418538f6482e2db rust-std-1.66.0-aarch64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-arm-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-arm-unknown-linux-gnueabi.tar.xz.asc +sha256 c8d10c558605673fe975b3b1c8ec8d2a9887f18cb97690bf900c19668b6d05ba rust-std-1.66.0-arm-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-arm-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-arm-unknown-linux-gnueabihf.tar.xz.asc +sha256 70650b3a8c04c183a83a2a4ebee7047d6546e69a81e227c24afa6d34ad54fe9b rust-std-1.66.0-arm-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-arm-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-arm-unknown-linux-musleabihf.tar.xz.asc +sha256 262a2024250e4aa7865a33d52d9b6826b5f059f0562a73f6067a04020879d4f0 rust-std-1.66.0-arm-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-arm-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-arm-unknown-linux-musleabi.tar.xz.asc +sha256 e41c5f840d73ed1073ef3a8abb125e6f41a66008ad7817fb2a1e703cf93f0a8b rust-std-1.66.0-arm-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-armv5te-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-armv5te-unknown-linux-gnueabi.tar.xz.asc +sha256 8b8ab8fe4af3ce9604e264fada7ddaed610d8e517d8425d5d85184ea4f111b52 rust-std-1.66.0-armv5te-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-armv5te-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-armv5te-unknown-linux-musleabi.tar.xz.asc +sha256 ec0552562348852c487e401168a0ad5f9e90cfc4cf03f5200f80b6594aa47d6d rust-std-1.66.0-armv5te-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-armv7-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-armv7-unknown-linux-gnueabihf.tar.xz.asc +sha256 5d166402813621d8c426bdb7dc857f97c72c921c2f2b52a893639a4c73862838 rust-std-1.66.0-armv7-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-armv7-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-armv7-unknown-linux-gnueabi.tar.xz.asc +sha256 a7170034ddb9218f4f78d6a1d8f8d7ce8c17419015393a96a24aa13f9c89da2d rust-std-1.66.0-armv7-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-armv7-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-armv7-unknown-linux-musleabihf.tar.xz.asc +sha256 fbc7e7565196fb7ec18b9b2ef0c8a1267fb4825bf68ff0559c0956841d5ade14 rust-std-1.66.0-armv7-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-armv7-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-armv7-unknown-linux-musleabi.tar.xz.asc +sha256 7caecb4b926d78ec879e53eaaa4d8001ef575cd80e6340e0518545fd8500eb8f rust-std-1.66.0-armv7-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-i586-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-i586-unknown-linux-gnu.tar.xz.asc +sha256 b22aaa59dee87dfc504f7e37ec1f297bbbe3f9ca5a7e4177d40975f2b4b32570 rust-std-1.66.0-i586-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-i586-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-i586-unknown-linux-musl.tar.xz.asc +sha256 b538209ea82733f25d88e3a9dc7d7b00f23f61ede128142412404c37846bad69 rust-std-1.66.0-i586-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-i686-unknown-linux-gnu.tar.xz.asc +sha256 5c7da9cc8d71e72021bfcc8040a6d2c248127d1fbed12d81e2e4bdf61c70b8d6 rust-std-1.66.0-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-i686-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-i686-unknown-linux-musl.tar.xz.asc +sha256 3f14c6381c74b175e32ce0f2e6337811a5ea2cc048239fc55101b6319b0ce7f8 rust-std-1.66.0-i686-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-mips-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-mips-unknown-linux-gnu.tar.xz.asc +sha256 8909dff6e3fd2c0a2f7c747d8c31003cf6d4fd2ea877ddb933b3fd7861c1cf87 rust-std-1.66.0-mips-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-mips-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-mips-unknown-linux-musl.tar.xz.asc +sha256 e76c5fea6da85b42a6f313cc326d064067314532d6a057cfc95f733c2f019de1 rust-std-1.66.0-mips-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-mips64-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-mips64-unknown-linux-gnuabi64.tar.xz.asc +sha256 26e5304dc5d592b2a34933794c4636220ad86d78e9c639e36c18f46d3a8c0235 rust-std-1.66.0-mips64-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-mips64-unknown-linux-muslabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-mips64-unknown-linux-muslabi64.tar.xz.asc +sha256 a621c95eef9b548d59234beeea031cc369d5744312a5ebfe4ac2250cb1b900e8 rust-std-1.66.0-mips64-unknown-linux-muslabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-mips64el-unknown-linux-gnuabi64.tar.xz.asc +sha256 41b2e528e2b123220b2dbc8b6bf93986c22d86091f7cd653ac55d1b169720e1f rust-std-1.66.0-mips64el-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-mips64el-unknown-linux-muslabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-mips64el-unknown-linux-muslabi64.tar.xz.asc +sha256 28de7df8cead0a09a6c4dbb3be6898f7bb495c803e5d1f15945dd66a60ebb2c4 rust-std-1.66.0-mips64el-unknown-linux-muslabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-mipsel-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-mipsel-unknown-linux-gnu.tar.xz.asc +sha256 519403a99b0859f21d4cabd347bada629f24fff913dafc54af255e4776d18f1b rust-std-1.66.0-mipsel-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-mipsel-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-mipsel-unknown-linux-musl.tar.xz.asc +sha256 d1a8d76bd7549b3845dad92cdab45876c987e7ba6a27ea67f39414d498a66761 rust-std-1.66.0-mipsel-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 b68691f94417033b612f0fdb510d385499558ea19dcf2caf02a5c1d7141816fd rust-std-1.66.0-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 0be870ead23d432b83981a45b37bb173315965485ef9ad6dcee1418702a26a3a rust-std-1.66.0-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 ed05f169784776c94c4880281fbabab66b49ed05a221d8e06c6926e1161b8bbe rust-std-1.66.0-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-riscv64gc-unknown-linux-gnu.tar.xz.asc +sha256 93a8b0514106c8039a8767b961090e8a0f8e4b62d1488e70e93e2e553860f70c rust-std-1.66.0-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-s390x-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-s390x-unknown-linux-gnu.tar.xz.asc +sha256 304008a504385f91672ab6ddf86b50f05a588432f01537049f4fbe95f8d41402 rust-std-1.66.0-s390x-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-sparc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-sparc64-unknown-linux-gnu.tar.xz.asc +sha256 107045313c7b6678579eba1fb0b96519585a2e282570635c64c02ef4544aacaa rust-std-1.66.0-sparc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 c59ca7959a019f3f660c1f46bea3c13e7769b67732731469c0c42d02f28d08e7 rust-std-1.66.0-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.0-x86_64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-x86_64-unknown-linux-musl.tar.xz.asc +sha256 b4dbc07eb417f77d9b794546d647f014d1650e1e0c0e76ff3d878dc09479e320 rust-std-1.66.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 91ee5a5372..b341bc4b7c 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.65.0 +RUST_BIN_VERSION = 1.66.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 9776f3f84c..35028b304b 100644 --- a/package/rust/rust.hash +++ b/package/rust/rust.hash @@ -1,6 +1,6 @@ -# From https://static.rust-lang.org/dist/rustc-1.65.0-src.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rustc-1.65.0-src.tar.xz.asc -sha256 2d6aa2ea3fedd55acbbd65f78349385f9daa9c14e25db7a8df5d015588eee1cf rustc-1.65.0-src.tar.xz +# From https://static.rust-lang.org/dist/rustc-1.66.0-src.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rustc-1.66.0-src.tar.xz.asc +sha256 0dc176e34fae9871f855a6ba4cb30fa19d69c5b4428d29281a07419c4950715c rustc-1.66.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 d501391d77..55fa38df18 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.65.0 +RUST_VERSION = 1.66.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 92a4f080b2721cc84248ebc98d41229469787688 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 23 Dec 2022 23:01:00 +0100 Subject: [PATCH 0131/5754] package/orc: bump to version 0.4.33 Drop patch (already in version) https://gitlab.freedesktop.org/gstreamer/orc/-/blob/0.4.33/RELEASE Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...powerpc.c-fix-build-with-kernel-4.11.patch | 70 ------------------- package/orc/orc.hash | 4 +- package/orc/orc.mk | 2 +- 3 files changed, 3 insertions(+), 73 deletions(-) delete mode 100644 package/orc/0001-orc-orccpu-powerpc.c-fix-build-with-kernel-4.11.patch diff --git a/package/orc/0001-orc-orccpu-powerpc.c-fix-build-with-kernel-4.11.patch b/package/orc/0001-orc-orccpu-powerpc.c-fix-build-with-kernel-4.11.patch deleted file mode 100644 index 0a4e7010f2..0000000000 --- a/package/orc/0001-orc-orccpu-powerpc.c-fix-build-with-kernel-4.11.patch +++ /dev/null @@ -1,70 +0,0 @@ -From a45f6d49ec090ad94333c0865c378d2d96ab2af4 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 15 Feb 2021 20:17:43 +0100 -Subject: [PATCH] orc/orccpu-powerpc.c: fix build with kernel < 4.11 - -Build with powerpc and kernel < 4.11 is broken since version 0.4.30 and -https://gitlab.freedesktop.org/gstreamer/orc/-/commit/a999325abea6a5549d60d99ddeb0271d2aa00235: - -FAILED: orc/liborc-0.4.so.0.32.0.p/orccpu-powerpc.c.o -/home/giuliobenetti/autobuild/run/instance-3/output-1/host/bin/powerpc-linux-gcc -Iorc/liborc-0.4.so.0.32.0.p -Iorc -I../orc -I. -I.. -fdiagnostics-color=always -pipe -Wall -Winvalid-pch -std=gnu99 -O3 -DHAVE_CONFIG_H -fvisibility=hidden -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O2 -fPIC -pthread -DORC_ENABLE_UNSTABLE_API -D_GNU_SOURCE -DBUILDING_ORC -MD -MQ orc/liborc-0.4.so.0.32.0.p/orccpu-powerpc.c.o -MF orc/liborc-0.4.so.0.32.0.p/orccpu-powerpc.c.o.d -o orc/liborc-0.4.so.0.32.0.p/orccpu-powerpc.c.o -c ../orc/orccpu-powerpc.c -../orc/orccpu-powerpc.c: In function 'orc_check_powerpc_proc_auxv': -../orc/orccpu-powerpc.c:164:21: error: 'AT_L1D_CACHESIZE' undeclared (first use in this function); did you mean 'AT_DCACHEBSIZE'? - 164 | if (buf[i] == AT_L1D_CACHESIZE) { - | ^~~~~~~~~~~~~~~~ - | AT_DCACHEBSIZE -../orc/orccpu-powerpc.c:164:21: note: each undeclared identifier is reported only once for each function it appears in -../orc/orccpu-powerpc.c:168:21: error: 'AT_L2_CACHESIZE' undeclared (first use in this function); did you mean 'AT_ICACHEBSIZE'? - 168 | if (buf[i] == AT_L2_CACHESIZE) { - | ^~~~~~~~~~~~~~~ - | AT_ICACHEBSIZE -../orc/orccpu-powerpc.c:172:21: error: 'AT_L3_CACHESIZE' undeclared (first use in this function); did you mean 'AT_ICACHEBSIZE'? - 172 | if (buf[i] == AT_L3_CACHESIZE) { - | ^~~~~~~~~~~~~~~ - | AT_ICACHEBSIZE - -Indeed, AT_{L1D,L2,L3}_CACHESIZE is only defined since kernel 4.11 and -https://github.com/torvalds/linux/commit/98a5f361b8625c6f4841d6ba013bbf0e80d08147 - -Fixes: - - http://autobuild.buildroot.org/results/0821e96cba3e455edd47b87485501d892fc7ac6a - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.freedesktop.org/gstreamer/orc/-/merge_requests/56] ---- - orc/orccpu-powerpc.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/orc/orccpu-powerpc.c b/orc/orccpu-powerpc.c -index 6796f17..340cf05 100644 ---- a/orc/orccpu-powerpc.c -+++ b/orc/orccpu-powerpc.c -@@ -161,18 +161,24 @@ orc_check_powerpc_proc_auxv (void) - _orc_cpu_name = (char*)buf[i + 1]; - found++; - } -+#ifdef AT_L1D_CACHESIZE - if (buf[i] == AT_L1D_CACHESIZE) { - _orc_data_cache_size_level1 = buf[i + 1]; - found++; - } -+#endif -+#ifdef AT_L2_CACHESIZE - if (buf[i] == AT_L2_CACHESIZE) { - _orc_data_cache_size_level2 = buf[i + 1]; - found++; - } -+#endif -+#ifdef AT_L3_CACHESIZE - if (buf[i] == AT_L3_CACHESIZE) { - _orc_data_cache_size_level3 = buf[i + 1]; - found++; - } -+#endif - if (found == 6) - break; - } --- -2.30.0 - diff --git a/package/orc/orc.hash b/package/orc/orc.hash index f48c2932ab..136fc3ece4 100644 --- a/package/orc/orc.hash +++ b/package/orc/orc.hash @@ -1,5 +1,5 @@ -# From https://gstreamer.freedesktop.org/data/src/orc/orc-0.4.32.tar.xz.sha256sum -sha256 a66e3d8f2b7e65178d786a01ef61f2a0a0b4d0b8370de7ce134ba73da4af18f0 orc-0.4.32.tar.xz +# From https://gstreamer.freedesktop.org/data/src/orc/orc-0.4.33.tar.xz.sha256sum +sha256 844e6d7db8086f793f57618d3d4b68d29d99b16034e71430df3c21cfd3c3542a orc-0.4.33.tar.xz # Locally calculated sha256 4f5dabb1b44bb6fc5cd53820b1f103147ad61b395a57903991325bd1b85d97bf COPYING diff --git a/package/orc/orc.mk b/package/orc/orc.mk index a93a4f875a..be718e6f85 100644 --- a/package/orc/orc.mk +++ b/package/orc/orc.mk @@ -4,7 +4,7 @@ # ################################################################################ -ORC_VERSION = 0.4.32 +ORC_VERSION = 0.4.33 ORC_SOURCE = orc-$(ORC_VERSION).tar.xz ORC_SITE = http://gstreamer.freedesktop.org/data/src/orc ORC_LICENSE = BSD-2-Clause, BSD-3-Clause From a8807ddbe269ef9aeee7b72f6d0a64719f8e6782 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 23 Dec 2022 22:56:07 +0100 Subject: [PATCH 0132/5754] package/jitterentropy-library: bump to version 3.4.1 - Drop patch (already in version) - Update hash of LICENSE file (year updated with https://github.com/smuellerDD/jitterentropy-library/commit/2e5019cfe63038faaa405ce53715effe4ea580e4) https://github.com/smuellerDD/jitterentropy-library/blob/v3.4.1/CHANGES.md Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...-Makefile-add-ENABLE_STACK_PROTECTOR.patch | 52 ------------------- .../jitterentropy-library.hash | 4 +- .../jitterentropy-library.mk | 2 +- 3 files changed, 3 insertions(+), 55 deletions(-) delete mode 100644 package/jitterentropy-library/0001-Makefile-add-ENABLE_STACK_PROTECTOR.patch diff --git a/package/jitterentropy-library/0001-Makefile-add-ENABLE_STACK_PROTECTOR.patch b/package/jitterentropy-library/0001-Makefile-add-ENABLE_STACK_PROTECTOR.patch deleted file mode 100644 index c4388663b0..0000000000 --- a/package/jitterentropy-library/0001-Makefile-add-ENABLE_STACK_PROTECTOR.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 272ee47892563e849f6b1bf59b0173f8aa33b631 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 19 Dec 2021 11:36:13 +0100 -Subject: [PATCH] Makefile: add ENABLE_STACK_PROTECTOR - -Add ENABLE_STACK_PROTECTOR as build on embedded toolchains without -stack-protector is again broken since -https://github.com/smuellerDD/jitterentropy-library/commit/5b3cb7f35e41ba2f34a75d004cf095c965a1a0c4: - -/home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/i686-buildroot-linux-uclibc/9.3.0/../../../../i686-buildroot-linux-uclibc/bin/ld: src/jitterentropy-base.o: in function `jent_fips_enabled': -jitterentropy-base.c:(.text+0x131): undefined reference to `__stack_chk_fail_local' - -Fixes: - - http://autobuild.buildroot.org/results/8dee462d16d934dd173d58f17933c6911e4336bf - -Signed-off-by: Fabrice Fontaine -Signed-off-by: Stephan Mueller -[Retrieved from: -https://github.com/smuellerDD/jitterentropy-library/commit/272ee47892563e849f6b1bf59b0173f8aa33b631] ---- - Makefile | 11 +++++++---- - 1 file changed, 7 insertions(+), 4 deletions(-) - -diff --git a/Makefile b/Makefile -index dfb96a8..c999ef5 100644 ---- a/Makefile -+++ b/Makefile -@@ -2,6 +2,7 @@ - - CC ?= gcc - #Hardening -+ENABLE_STACK_PROTECTOR ?= 1 - CFLAGS ?= -fwrapv --param ssp-buffer-size=4 -fvisibility=hidden -fPIE -Wcast-align -Wmissing-field-initializers -Wshadow -Wswitch-enum - CFLAGS +=-Wextra -Wall -pedantic -fPIC -O0 -fwrapv -Wconversion - LDFLAGS +=-Wl,-z,relro,-z,now -lpthread -@@ -13,10 +14,12 @@ else - GCC_GTEQ_490 := $(shell expr `$(CC) -dumpfullversion | sed -e 's/\.\([0-9][0-9]\)/\1/g' -e 's/\.\([0-9]\)/0\1/g' -e 's/^[0-9]\{3,4\}$$/&00/'` \>= 40900) - endif - --ifeq "$(GCC_GTEQ_490)" "1" -- CFLAGS += -fstack-protector-strong --else -- CFLAGS += -fstack-protector-all -+ifeq "$(ENABLE_STACK_PROTECTOR)" "1" -+ ifeq "$(GCC_GTEQ_490)" "1" -+ CFLAGS += -fstack-protector-strong -+ else -+ CFLAGS += -fstack-protector-all -+ endif - endif - - # Change as necessary diff --git a/package/jitterentropy-library/jitterentropy-library.hash b/package/jitterentropy-library/jitterentropy-library.hash index 760befab53..c7833f1428 100644 --- a/package/jitterentropy-library/jitterentropy-library.hash +++ b/package/jitterentropy-library/jitterentropy-library.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 9fcc954763a1dd4afe614a1b360f53b600d3376bbcc4b19177f27abf191ebad5 jitterentropy-library-3.3.1.tar.xz -sha256 7e06574ff822594269083a796d06fa4e5e78c40efe5ca01a72d2a4662e8206df LICENSE +sha256 802f025f766c38abf663fd5a21482b8313b6d6e2c68c36a4ffd6bc105fe975ab jitterentropy-library-3.4.1.tar.xz +sha256 7a89069066f6c0b8767d3256e5ec5d765b2c7f3354a5a06fc8d5bd7b8103d8a3 LICENSE sha256 13aa749a5b0a454917a944ed8fffc530b784f5ead522b1aacaf4ec8aa55a6239 LICENSE.bsd sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 LICENSE.gplv2 diff --git a/package/jitterentropy-library/jitterentropy-library.mk b/package/jitterentropy-library/jitterentropy-library.mk index 4cdebf46a3..f405082d08 100644 --- a/package/jitterentropy-library/jitterentropy-library.mk +++ b/package/jitterentropy-library/jitterentropy-library.mk @@ -4,7 +4,7 @@ # ################################################################################ -JITTERENTROPY_LIBRARY_VERSION = 3.3.1 +JITTERENTROPY_LIBRARY_VERSION = 3.4.1 JITTERENTROPY_LIBRARY_SOURCE = \ jitterentropy-library-$(JITTERENTROPY_LIBRARY_VERSION).tar.xz JITTERENTROPY_LIBRARY_SITE = http://www.chronox.de/jent From 327fab5b9d45891233ff647d5b352cc94b3c27ac Mon Sep 17 00:00:00 2001 From: Gleb Mazovetskiy Date: Fri, 23 Dec 2022 17:49:21 +0000 Subject: [PATCH 0133/5754] package/gcc: fix gcc12 with uClibc GCC 12 produces broken binaries when used with uClibc. E.g. `gdb` crashes on startup. GCC HEAD fixes this in: https://gcc.gnu.org/git/gitweb.cgi?p=gcc.git;h=ee4af2ed0b7322884ec4ff537564683c3749b813 Adds the commit as patch for GCC 12. Signed-off-by: Gleb Mazovetskiy Signed-off-by: Thomas Petazzoni --- package/gcc/12.2.0/0002-fix-condvar.patch | 82 +++++++++++++++++++++++ 1 file changed, 82 insertions(+) create mode 100644 package/gcc/12.2.0/0002-fix-condvar.patch diff --git a/package/gcc/12.2.0/0002-fix-condvar.patch b/package/gcc/12.2.0/0002-fix-condvar.patch new file mode 100644 index 0000000000..5044942e9f --- /dev/null +++ b/package/gcc/12.2.0/0002-fix-condvar.patch @@ -0,0 +1,82 @@ +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 + From 1567516d8984a4bddfbee30ee69c771cf3f8e224 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 23 Dec 2022 18:38:17 +0100 Subject: [PATCH 0134/5754] package/upx: bump to version 4.0.1 - Drop patch (already in version) - cmake must be used since https://github.com/upx/upx/commit/c7d8b6fed1b551158540e1d2e884dc224fce474c - ucl and zlib are directly included in upx since https://github.com/upx/upx/commit/61e1366122f8d1b9e2434a8103e7af00a35ea902 https://github.com/upx/upx/blob/v4.0.1/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...ck-DT_REL-DT_RELA-DT_RELSZ-DT_RELASZ.patch | 80 ------------------- package/upx/upx.hash | 2 +- package/upx/upx.mk | 22 +---- 3 files changed, 4 insertions(+), 100 deletions(-) delete mode 100644 package/upx/0001-Check-DT_REL-DT_RELA-DT_RELSZ-DT_RELASZ.patch diff --git a/package/upx/0001-Check-DT_REL-DT_RELA-DT_RELSZ-DT_RELASZ.patch b/package/upx/0001-Check-DT_REL-DT_RELA-DT_RELSZ-DT_RELASZ.patch deleted file mode 100644 index 6fae9cac0e..0000000000 --- a/package/upx/0001-Check-DT_REL-DT_RELA-DT_RELSZ-DT_RELASZ.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 3781df9da23840e596d5e9e8493f22666802fe6c Mon Sep 17 00:00:00 2001 -From: John Reiser -Date: Fri, 11 Dec 2020 13:38:18 -0800 -Subject: [PATCH] Check DT_REL/DT_RELA, DT_RELSZ/DT_RELASZ - -https://github.com/upx/upx/issues/421 - modified: p_lx_elf.cpp - -[Retrieved from: -https://github.com/upx/upx/commit/3781df9da23840e596d5e9e8493f22666802fe6c] -Signed-off-by: Fabrice Fontaine ---- - src/p_lx_elf.cpp | 34 +++++++++++++++++++++++++++++----- - 1 file changed, 29 insertions(+), 5 deletions(-) - -diff --git a/src/p_lx_elf.cpp b/src/p_lx_elf.cpp -index 182db192f..3a4101cf7 100644 ---- a/src/p_lx_elf.cpp -+++ b/src/p_lx_elf.cpp -@@ -2222,8 +2222,20 @@ bool PackLinuxElf32::canPack() - int z_rsz = dt_table[Elf32_Dyn::DT_RELSZ]; - if (z_rel && z_rsz) { - unsigned rel_off = get_te32(&dynseg[-1+ z_rel].d_val); -+ if ((unsigned)file_size <= rel_off) { -+ char msg[70]; snprintf(msg, sizeof(msg), -+ "bad Elf32_Dynamic[DT_REL] %#x\n", -+ rel_off); -+ throwCantPack(msg); -+ } - Elf32_Rel *rp = (Elf32_Rel *)&file_image[rel_off]; - unsigned relsz = get_te32(&dynseg[-1+ z_rsz].d_val); -+ if ((unsigned)file_size <= relsz) { -+ char msg[70]; snprintf(msg, sizeof(msg), -+ "bad Elf32_Dynamic[DT_RELSZ] %#x\n", -+ relsz); -+ throwCantPack(msg); -+ } - Elf32_Rel *last = (Elf32_Rel *)(relsz + (char *)rp); - for (; rp < last; ++rp) { - unsigned r_va = get_te32(&rp->r_offset); -@@ -2562,14 +2574,26 @@ PackLinuxElf64::canPack() - int z_rel = dt_table[Elf64_Dyn::DT_RELA]; - int z_rsz = dt_table[Elf64_Dyn::DT_RELASZ]; - if (z_rel && z_rsz) { -- unsigned rel_off = get_te64(&dynseg[-1+ z_rel].d_val); -+ upx_uint64_t rel_off = get_te64(&dynseg[-1+ z_rel].d_val); -+ if ((u64_t)file_size <= rel_off) { -+ char msg[70]; snprintf(msg, sizeof(msg), -+ "bad Elf64_Dynamic[DT_RELA] %#llx\n", -+ rel_off); -+ throwCantPack(msg); -+ } - Elf64_Rela *rp = (Elf64_Rela *)&file_image[rel_off]; -- unsigned relsz = get_te64(&dynseg[-1+ z_rsz].d_val); -+ upx_uint64_t relsz = get_te64(&dynseg[-1+ z_rsz].d_val); -+ if ((u64_t)file_size <= relsz) { -+ char msg[70]; snprintf(msg, sizeof(msg), -+ "bad Elf64_Dynamic[DT_RELASZ] %#llx\n", -+ relsz); -+ throwCantPack(msg); -+ } - Elf64_Rela *last = (Elf64_Rela *)(relsz + (char *)rp); - for (; rp < last; ++rp) { -- unsigned r_va = get_te64(&rp->r_offset); -+ upx_uint64_t r_va = get_te64(&rp->r_offset); - if (r_va == user_init_ava) { // found the Elf64_Rela -- unsigned r_info = get_te64(&rp->r_info); -+ upx_uint64_t r_info = get_te64(&rp->r_info); - unsigned r_type = ELF64_R_TYPE(r_info); - if (Elf64_Ehdr::EM_AARCH64 == e_machine - && R_AARCH64_RELATIVE == r_type) { -@@ -2581,7 +2605,7 @@ PackLinuxElf64::canPack() - } - else { - char msg[50]; snprintf(msg, sizeof(msg), -- "bad relocation %#x DT_INIT_ARRAY[0]", -+ "bad relocation %#llx DT_INIT_ARRAY[0]", - r_info); - throwCantPack(msg); - } diff --git a/package/upx/upx.hash b/package/upx/upx.hash index 7f3698ca0d..9f7c40c819 100644 --- a/package/upx/upx.hash +++ b/package/upx/upx.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 47774df5c958f2868ef550fb258b97c73272cb1f44fe776b798e393465993714 upx-3.96-src.tar.xz +sha256 77003c8e2e29aa9804e2fbaeb30f055903420b3e01d95eafe01aed957fb7e190 upx-4.0.1-src.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/upx/upx.mk b/package/upx/upx.mk index e693a70db1..ef346b2310 100644 --- a/package/upx/upx.mk +++ b/package/upx/upx.mk @@ -4,28 +4,12 @@ # ################################################################################ -UPX_VERSION = 3.96 +UPX_VERSION = 4.0.1 UPX_SITE = https://github.com/upx/upx/releases/download/v$(UPX_VERSION) UPX_SOURCE = upx-$(UPX_VERSION)-src.tar.xz UPX_LICENSE = GPL-2.0+ UPX_LICENSE_FILES = COPYING UPX_CPE_ID_VENDOR = upx_project +UPX_SUPPORTS_IN_SOURCE_BUILD = NO -# 0001-Check-DT_REL-DT_RELA-DT_RELSZ-DT_RELASZ.patch -UPX_IGNORE_CVES += CVE-2021-20285 - -HOST_UPX_DEPENDENCIES = host-ucl host-zlib - -# We need to specify all, otherwise the default target only prints a message -# stating to "please choose a target for 'make'"... :-( -define HOST_UPX_BUILD_CMDS - $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) \ - UPX_UCLDIR=$(HOST_DIR) CXXFLAGS_WERROR= -C $(@D) all -endef - -# UPX has no install procedure, so install it manually. -define HOST_UPX_INSTALL_CMDS - $(INSTALL) -D -m 0755 $(@D)/src/upx.out $(HOST_DIR)/bin/upx -endef - -$(eval $(host-generic-package)) +$(eval $(host-cmake-package)) From 85c5af46ad6c18841576c0f7abe241a617a44cb7 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 23 Dec 2022 18:38:18 +0100 Subject: [PATCH 0135/5754] package/ucl: drop package ucl is directly vendored in upx since version 3.99 and https://github.com/upx/upx/commit/61e1366122f8d1b9e2434a8103e7af00a35ea902 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/ucl/ucl.hash | 3 --- package/ucl/ucl.mk | 15 --------------- 2 files changed, 18 deletions(-) delete mode 100644 package/ucl/ucl.hash delete mode 100644 package/ucl/ucl.mk diff --git a/package/ucl/ucl.hash b/package/ucl/ucl.hash deleted file mode 100644 index 0252f69297..0000000000 --- a/package/ucl/ucl.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 b865299ffd45d73412293369c9754b07637680e5c826915f097577cd27350348 ucl-1.03.tar.gz -sha256 70439f6e2b47057a408d2390ed6663b9875f5a08066a06a060a357ef1df89a8c COPYING diff --git a/package/ucl/ucl.mk b/package/ucl/ucl.mk deleted file mode 100644 index aac068ef60..0000000000 --- a/package/ucl/ucl.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# ucl -# -################################################################################ - -UCL_VERSION = 1.03 -UCL_SITE = http://www.oberhumer.com/opensource/ucl/download -UCL_LICENSE = GPL-2.0+ -UCL_LICENSE_FILES = COPYING - -# Fix ACC conformance test failure for host gcc 6.x -HOST_UCL_CONF_ENV += CPPFLAGS="$(HOST_CPPFLAGS) -std=iso9899:1990" - -$(eval $(host-autotools-package)) From 56763ca01229ead2dba2cfb27025b41c0a5e18ed Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 27 Dec 2022 21:08:14 +0100 Subject: [PATCH 0136/5754] package/rtl_433: fix static openssl build Fix the following static openssl build failure raised since commit 7967755fbf25fe4d5860884bedb3e01fcd7e9855: /home/autobuild/autobuild/instance-13/output-1/host/lib/gcc/sparc-buildroot-linux-uclibc/10.4.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: /home/autobuild/autobuild/instance-13/output-1/host/sparc-buildroot-linux-uclibc/sysroot/usr/lib/libssl.a(ssl_cert.o): in function `ssl_cert_free': ssl_cert.c:(.text+0x384): undefined reference to `__atomic_fetch_sub_4' Fixes: - http://autobuild.buildroot.org/results/417c86963ffe038aa052ea3cf19fd52c3e9b7396 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...se-pkg-config-to-detect-openssl-when.patch | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 package/rtl_433/0001-CMakeLists.txt-use-pkg-config-to-detect-openssl-when.patch diff --git a/package/rtl_433/0001-CMakeLists.txt-use-pkg-config-to-detect-openssl-when.patch b/package/rtl_433/0001-CMakeLists.txt-use-pkg-config-to-detect-openssl-when.patch new file mode 100644 index 0000000000..00858c8ff9 --- /dev/null +++ b/package/rtl_433/0001-CMakeLists.txt-use-pkg-config-to-detect-openssl-when.patch @@ -0,0 +1,42 @@ +From b860de9e207d8fe2ea37dad28fdd014493d87703 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 27 Dec 2022 16:29:16 +0100 +Subject: [PATCH] build: Fix CMake to use pkg-config openssl when possible + (#2290) + +In order to take into account the libraries used by openssl when +building statically, using pkg-config is recommended. This patch +therefore improves the CMakeLists.txt to use pkg-config to detect +openssl when pkg-config is available. This will avoid +static build failure when openssl needs to link with -latomic. + +Fixes: + - http://autobuild.buildroot.org/results/417c86963ffe038aa052ea3cf19fd52c3e9b7396 + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/merbanan/rtl_433/commit/b860de9e207d8fe2ea37dad28fdd014493d87703] +--- + CMakeLists.txt | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d47a3eda2..cf30d8be2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -175,7 +175,14 @@ set(ENABLE_OPENSSL AUTO CACHE STRING "Enable OpenSSL TLS support") + set_property(CACHE ENABLE_OPENSSL PROPERTY STRINGS AUTO ON OFF) + if(ENABLE_OPENSSL) # AUTO / ON + +-find_package(OpenSSL) ++find_package(PkgConfig) ++if(PKG_CONFIG_FOUND) ++ pkg_check_modules(OPENSSL openssl) ++ set(OPENSSL_LIBRARIES ${OPENSSL_LINK_LIBRARIES}) ++ set(OPENSSL_INCLUDE_DIR ${OPENSSL_INCLUDE_DIRS}) ++else() ++ find_package(OpenSSL) ++endif() + if(OPENSSL_FOUND) + message(STATUS "OpenSSL TLS support will be compiled. Found version ${OPENSSL_VERSION}") + include_directories(${OPENSSL_INCLUDE_DIR}) From 90a543de880010776b291193eb0d3bc8d27fe3e8 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 23 Dec 2022 18:13:51 +0100 Subject: [PATCH 0137/5754] package/libvncserver: bump to version 0.9.14 - Drop patches (already in version) - examples and tests can be disabled since https://github.com/LibVNC/libvncserver/commit/0b8990784a81823eecc9089263ac1966d17bf399 https://github.com/LibVNC/libvncserver/releases/tag/LibVNCServer-0.9.14 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...enssl.c-fix-build-with-libressl-3.5..patch | 66 ------------------- ...ee-vncRec-memory-in-rfbClientCleanup.patch | 28 -------- package/libvncserver/libvncserver.hash | 2 +- package/libvncserver/libvncserver.mk | 9 ++- 4 files changed, 5 insertions(+), 100 deletions(-) delete mode 100644 package/libvncserver/0001-common-crypto_openssl.c-fix-build-with-libressl-3.5..patch delete mode 100644 package/libvncserver/0002-libvncclient-free-vncRec-memory-in-rfbClientCleanup.patch diff --git a/package/libvncserver/0001-common-crypto_openssl.c-fix-build-with-libressl-3.5..patch b/package/libvncserver/0001-common-crypto_openssl.c-fix-build-with-libressl-3.5..patch deleted file mode 100644 index 110976c4bb..0000000000 --- a/package/libvncserver/0001-common-crypto_openssl.c-fix-build-with-libressl-3.5..patch +++ /dev/null @@ -1,66 +0,0 @@ -From 97fbbd678b2012e64acddd523677bc55a177bc58 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 12 May 2022 20:41:50 +0200 -Subject: [PATCH] common/crypto_openssl.c: fix build with libressl >= 3.5.0 - (#522) - -Fix the following build failure with libressl >= 3.5.0: - -/nvmedata/autobuild/instance-26/output-1/build/libvncserver-0.9.13/common/crypto_openssl.c: In function 'dh_generate_keypair': -/nvmedata/autobuild/instance-26/output-1/build/libvncserver-0.9.13/common/crypto_openssl.c:149:7: error: dereferencing pointer to incomplete type 'DH' {aka 'struct dh_st'} - 149 | dh->p = BN_bin2bn(prime, keylen, NULL); - | ^~ - -Fixes: - - http://autobuild.buildroot.org/results/49b3940b9d0432cb5fb0c5d22dfa017b18c6e233 - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/LibVNC/libvncserver/commit/97fbbd678b2012e64acddd523677bc55a177bc58] ---- - common/crypto_openssl.c | 12 ++++++++---- - 1 file changed, 8 insertions(+), 4 deletions(-) - -diff --git a/common/crypto_openssl.c b/common/crypto_openssl.c -index 60d4bd4df..51d7ec2d9 100644 ---- a/common/crypto_openssl.c -+++ b/common/crypto_openssl.c -@@ -138,14 +138,16 @@ int dh_generate_keypair(uint8_t *priv_out, uint8_t *pub_out, const uint8_t *gen, - { - int result = 0; - DH *dh; --#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L || \ -+ (defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x30500000) - const BIGNUM *pub_key = NULL; - const BIGNUM *priv_key = NULL; - #endif - - if(!(dh = DH_new())) - goto out; --#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ -+ (defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000) - dh->p = BN_bin2bn(prime, keylen, NULL); - dh->g = BN_bin2bn(gen, gen_len, NULL); - #else -@@ -154,7 +156,8 @@ int dh_generate_keypair(uint8_t *priv_out, uint8_t *pub_out, const uint8_t *gen, - #endif - if(!DH_generate_key(dh)) - goto out; --#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ -+ (defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000) - if(BN_bn2bin(dh->priv_key, priv_out) == 0) - goto out; - if(BN_bn2bin(dh->pub_key, pub_out) == 0) -@@ -181,7 +184,8 @@ int dh_compute_shared_key(uint8_t *shared_out, const uint8_t *priv, const uint8_ - - if(!(dh = DH_new())) - goto out; --#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ -+ (defined LIBRESSL_VERSION_NUMBER && LIBRESSL_VERSION_NUMBER < 0x30500000) - dh->p = BN_bin2bn(prime, keylen, NULL); - dh->priv_key = BN_bin2bn(priv, keylen, NULL); - #else diff --git a/package/libvncserver/0002-libvncclient-free-vncRec-memory-in-rfbClientCleanup.patch b/package/libvncserver/0002-libvncclient-free-vncRec-memory-in-rfbClientCleanup.patch deleted file mode 100644 index 7658c112f3..0000000000 --- a/package/libvncserver/0002-libvncclient-free-vncRec-memory-in-rfbClientCleanup.patch +++ /dev/null @@ -1,28 +0,0 @@ -From bef41f6ec4097a8ee094f90a1b34a708fbd757ec Mon Sep 17 00:00:00 2001 -From: Christian Beier -Date: Sat, 21 Nov 2020 12:52:31 +0100 -Subject: [PATCH] libvncclient: free vncRec memory in rfbClientCleanup() - -Otherwise we leak memory. Spotted by Ramin Farajpour Cami -, thanks! - -[Retrieved from: -https://github.com/LibVNC/libvncserver/commit/bef41f6ec4097a8ee094f90a1b34a708fbd757ec] -Signed-off-by: Fabrice Fontaine ---- - libvncclient/vncviewer.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/libvncclient/vncviewer.c b/libvncclient/vncviewer.c -index d6b91f02b..0a1bdcf6a 100644 ---- a/libvncclient/vncviewer.c -+++ b/libvncclient/vncviewer.c -@@ -534,6 +534,8 @@ void rfbClientCleanup(rfbClient* client) { - client->clientData = next; - } - -+ free(client->vncRec); -+ - if (client->sock != RFB_INVALID_SOCKET) - rfbCloseSocket(client->sock); - if (client->listenSock != RFB_INVALID_SOCKET) diff --git a/package/libvncserver/libvncserver.hash b/package/libvncserver/libvncserver.hash index 8e61a3d0ea..225c42e46a 100644 --- a/package/libvncserver/libvncserver.hash +++ b/package/libvncserver/libvncserver.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 0ae5bb9175dc0a602fe85c1cf591ac47ee5247b87f2bf164c16b05f87cbfa81a LibVNCServer-0.9.13.tar.gz +sha256 83104e4f7e28b02f8bf6b010d69b626fae591f887e949816305daebae527c9a5 LibVNCServer-0.9.14.tar.gz sha256 4d23c8c814e5baf007d854f01d8502e77dc56a41144934e003fb32c4e052d20f COPYING diff --git a/package/libvncserver/libvncserver.mk b/package/libvncserver/libvncserver.mk index 8f24e2d098..700e26a8d6 100644 --- a/package/libvncserver/libvncserver.mk +++ b/package/libvncserver/libvncserver.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVNCSERVER_VERSION = 0.9.13 +LIBVNCSERVER_VERSION = 0.9.14 LIBVNCSERVER_SOURCE = LibVNCServer-$(LIBVNCSERVER_VERSION).tar.gz LIBVNCSERVER_SITE = https://github.com/LibVNC/libvncserver/archive LIBVNCSERVER_LICENSE = GPL-2.0+ @@ -14,14 +14,13 @@ LIBVNCSERVER_INSTALL_STAGING = YES LIBVNCSERVER_DEPENDENCIES = host-pkgconf lzo LIBVNCSERVER_CONF_OPTS = -DWITH_LZO=ON -# 0002-libvncclient-free-vncRec-memory-in-rfbClientCleanup.patch -LIBVNCSERVER_IGNORE_CVES += CVE-2020-29260 - # only used for examples LIBVNCSERVER_CONF_OPTS += \ + -DWITH_EXAMPLES=OFF \ -DWITH_FFMPEG=OFF \ -DWITH_GTK=OFF \ - -DWITH_SDL=OFF + -DWITH_SDL=OFF \ + -DWITH_TESTS=OFF ifneq ($(BR2_TOOLCHAIN_HAS_THREADS),y) LIBVNCSERVER_CONF_OPTS += -DWITH_THREADS=ON From d77db2df74a3ccb430cbc326edef2c4a588878b0 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 27 Dec 2022 22:36:31 +0100 Subject: [PATCH 0138/5754] package/collectd: add rrdcached support The rrdcached plugin has status "supported": https://collectd.org/wiki/index.php/Plugin:RRDCacheD Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/collectd/Config.in | 9 +++++++++ package/collectd/collectd.mk | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/package/collectd/Config.in b/package/collectd/Config.in index fb76a105dc..a431da79f1 100644 --- a/package/collectd/Config.in +++ b/package/collectd/Config.in @@ -724,6 +724,15 @@ config BR2_PACKAGE_COLLECTD_RRDTOOL comment "rrdtool support needs a toolchain w/ wchar" depends on !BR2_USE_WCHAR +if BR2_PACKAGE_COLLECTD_RRDTOOL + +config BR2_PACKAGE_COLLECTD_RRDCACHED + bool "rrdcached" + help + Use the RRDtool caching daemon. + +endif + config BR2_PACKAGE_COLLECTD_RIEMANN bool "riemann" # riemann-c-client -> protobuf-c diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk index 5510c265e8..6c993827c4 100644 --- a/package/collectd/collectd.mk +++ b/package/collectd/collectd.mk @@ -21,7 +21,7 @@ COLLECTD_PLUGINS_DISABLE = \ gmond hddtemp intel_rdt java lpar \ madwifi mbmon mic multimeter netapp notify_desktop numa \ oracle perl pf pinba powerdns python routeros \ - rrdcached sigrok tape target_v5upgrade teamspeak2 ted \ + sigrok tape target_v5upgrade teamspeak2 ted \ tokyotyrant turbostat uuid varnish vserver write_kafka \ write_mongodb xencpu xmms zfs_arc zone @@ -134,6 +134,7 @@ COLLECTD_CONF_OPTS += \ $(if $(BR2_PACKAGE_COLLECTD_REGEX),--enable-match_regex,--disable-match-regex) \ $(if $(BR2_PACKAGE_COLLECTD_REPLACE),--enable-target_replace,--disable-target_replace) \ $(if $(BR2_PACKAGE_COLLECTD_RIEMANN),--enable-write_riemann,--disable-write_riemann) \ + $(if $(BR2_PACKAGE_COLLECTD_RRDCACHED),--enable-rrdcached,--disable-rrdcached) \ $(if $(BR2_PACKAGE_COLLECTD_RRDTOOL),--enable-rrdtool,--disable-rrdtool) \ $(if $(BR2_PACKAGE_COLLECTD_SCALE),--enable-target_scale,--disable-target_scale) \ $(if $(BR2_PACKAGE_COLLECTD_SENSORS),--enable-sensors,--disable-sensors) \ From 6264dfae49af69d7358f2d6fef21bd720e62440f Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 21 Dec 2022 11:51:53 +0100 Subject: [PATCH 0139/5754] package/aubio: switch to external waf script Since the python 3.11 version bump [1], the waf script bundled in aubio 0.4.9 can't be executed anymore due to a waf bug [2]. Use the waf script provided by the Buildroot waf package infrastructure after removing the old waf script and its libraries. Fixes: http://autobuild.buildroot.org/results/e2b/e2be18415ca794c68e708f2fdfd0a1a1ff5be714 [1] 738500c296c8b1206f20e94ca3e7c5932a6a0486 [2] https://gitlab.com/ita1024/waf/-/commit/68997828c850ce7fb30b73b4adfde35053e539d1 Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/aubio/aubio.mk | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/package/aubio/aubio.mk b/package/aubio/aubio.mk index b2eb2b5e6d..c995fdfac7 100644 --- a/package/aubio/aubio.mk +++ b/package/aubio/aubio.mk @@ -16,6 +16,17 @@ AUBIO_CONF_OPTS = \ --disable-docs \ --disable-atlas +# The waf script bundled in aubio 0.4.9 is too old for python3.11 +# Similar issue with Jack: +# https://github.com/jackaudio/jack2/issues/898 +AUBIO_NEEDS_EXTERNAL_WAF = YES + +# The old waf script bundled in aubio 0.4.9 need to be removed first. +define AUBIO_REMOVE_OLD_WAF + $(RM) -fr $(@D)/waf $(@D)/waflib +endef +AUBIO_POST_EXTRACT_HOOKS = AUBIO_REMOVE_OLD_WAF + # Add --notests for each build step to avoid running unit tests on the # build machine. AUBIO_WAF_OPTS = --notests From 620a77dc9d93365d87c7b18545f091c8e962509e Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 21 Dec 2022 11:46:07 +0100 Subject: [PATCH 0140/5754] package/lua-cqueues: force using libopenssl As building lua-cqueues fails to build with libressl, we force the use of libopenssl instead. Fixes: http://autobuild.buildroot.net/results/032d6c9bf84b0d4e50d3c27f37b71c0564c52312/ Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/lua-cqueues/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/lua-cqueues/Config.in b/package/lua-cqueues/Config.in index 60f022848b..a8c38950cf 100644 --- a/package/lua-cqueues/Config.in +++ b/package/lua-cqueues/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_LUA_CQUEUES bool "lua-cqueues" depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL help Continuation Queues: Embeddable asynchronous networking, threading, and notification framework for Lua on Unix. From e2468404c76e5d56d14f7e2afea8e2641f036e30 Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Tue, 20 Dec 2022 12:08:05 -0800 Subject: [PATCH 0141/5754] package/slang: add option to enable/disable slsh The S-lang shell is currently installed by default but most packages are typically interested in the shared libraries only. Add a configuration option to disable the slsh program and its supporting files. Signed-off-by: Florian Fainelli Signed-off-by: Thomas Petazzoni --- package/slang/Config.in | 9 +++++++++ package/slang/slang.mk | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/package/slang/Config.in b/package/slang/Config.in index a500ff5b7d..0b2c987f73 100644 --- a/package/slang/Config.in +++ b/package/slang/Config.in @@ -5,3 +5,12 @@ config BR2_PACKAGE_SLANG Multi-platform console display library. http://www.jedsoft.org/slang/index.html + +if BR2_PACKAGE_SLANG + +config BR2_PACKAGE_SLANG_SLSH + bool "enable slsh" + help + Enable the S-lang interpreter + +endif diff --git a/package/slang/slang.mk b/package/slang/slang.mk index e0f5968b46..2b3cbdf27a 100644 --- a/package/slang/slang.mk +++ b/package/slang/slang.mk @@ -60,4 +60,13 @@ SLANG_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) install-static SLANG_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install-static endif +ifeq ($(BR2_PACKAGE_SLANG_SLSH),) +define SLANG_REMOVE_SLSH + rm -rf $(TARGET_DIR)/etc/slsh.rc \ + $(TARGET_DIR)/usr/share/slsh \ + $(TARGET_DIR)/usr/bin/slsh +endef +SLANG_POST_INSTALL_TARGET_HOOKS += SLANG_REMOVE_SLSH +endif + $(eval $(autotools-package)) From f603aa8514279b56f7454726c95601b31e6064dd Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 17 Dec 2022 16:37:26 +0100 Subject: [PATCH 0142/5754] package/slirp: add host variant for host-qemu Qemu 7.2 removed the slirp submodule from their sources [1] so we have to provide slirp library as host package for host-qemu. [1] https://wiki.qemu.org/ChangeLog/7.2#GIT_submodules Signed-off-by: Romain Naour Signed-off-by: Yann E. MORIN --- package/slirp/slirp.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/slirp/slirp.mk b/package/slirp/slirp.mk index 10d367587d..2ad71f13d9 100644 --- a/package/slirp/slirp.mk +++ b/package/slirp/slirp.mk @@ -14,4 +14,7 @@ SLIRP_CPE_ID_PRODUCT = libslirp SLIRP_INSTALL_STAGING = YES SLIRP_DEPENDENCIES = libglib2 +HOST_SLIRP_DEPENDENCIES = host-libglib2 + $(eval $(meson-package)) +$(eval $(host-meson-package)) From a04be749374c99790ee7d185427b352db84fb07a Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 17 Dec 2022 16:37:27 +0100 Subject: [PATCH 0143/5754] package/qemu: split long lines Split the list of dependencies to ease further addition. Signed-off-by: Romain Naour [yann.morin.1998@free.fr: move first item also on its own line] Signed-off-by: Yann E. MORIN --- package/qemu/qemu.mk | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index a991d49993..cbcbbc2bc5 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -20,7 +20,13 @@ QEMU_CPE_ID_VENDOR = qemu # However, building is still done with configure and make as in previous versions of QEMU. # Target-qemu -QEMU_DEPENDENCIES = host-meson host-pkgconf libglib2 zlib pixman host-python3 +QEMU_DEPENDENCIES = \ + host-meson \ + host-pkgconf \ + libglib2 \ + zlib \ + pixman \ + host-python3 # Need the LIBS variable because librt and libm are # not automatically pulled. :-( @@ -246,7 +252,13 @@ $(eval $(generic-package)) #------------------------------------------------------------- # Host-qemu -HOST_QEMU_DEPENDENCIES = host-meson host-pkgconf host-zlib host-libglib2 host-pixman host-python3 +HOST_QEMU_DEPENDENCIES = \ + host-meson \ + host-pkgconf \ + host-zlib \ + host-libglib2 \ + host-pixman \ + host-python3 # BR ARCH qemu # ------- ---- From ad71850aa039e344a1c32cd07876c1a83bdf5d5d Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 17 Dec 2022 16:37:28 +0100 Subject: [PATCH 0144/5754] package/qemu: reorder dependencies alphabetically Signed-off-by: Romain Naour Signed-off-by: Yann E. MORIN --- package/qemu/qemu.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index cbcbbc2bc5..be84452862 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -23,10 +23,10 @@ QEMU_CPE_ID_VENDOR = qemu QEMU_DEPENDENCIES = \ host-meson \ host-pkgconf \ + host-python3 \ libglib2 \ - zlib \ pixman \ - host-python3 + zlib # Need the LIBS variable because librt and libm are # not automatically pulled. :-( @@ -253,12 +253,12 @@ $(eval $(generic-package)) # Host-qemu HOST_QEMU_DEPENDENCIES = \ - host-meson \ - host-pkgconf \ - host-zlib \ host-libglib2 \ + host-meson \ host-pixman \ - host-python3 + host-pkgconf \ + host-python3 \ + host-zlib # BR ARCH qemu # ------- ---- From 5a21d2f356fbcb76dd8f96c8c9476401be104e90 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 17 Dec 2022 16:37:29 +0100 Subject: [PATCH 0145/5754] package/qemu: bump to version 7.2.0 Changes log: https://wiki.qemu.org/ChangeLog/7.2 Add host-slirp dependency to provide the network backend 'user' that was included in previous Qemu release by a submodule in Qemu sources [1]. This network backend is currently used by several defconfig that would fail to boot with: "-net user: network backend 'user' is not compiled into this binary" board/mender/x86_64/readme.txt board/pc/readme.txt board/pc/readme.txt board/qemu/arm-versatile/readme.txt board/qemu/arm-vexpress/readme.txt board/qemu/mips32r2-malta/readme.txt board/qemu/mips32r2el-malta/readme.txt board/qemu/mips32r6el-malta/readme.txt board/qemu/ppc-bamboo/readme.txt board/qemu/ppc-e500mc/readme.txt board/qemu/ppc-g3beige/readme.txt board/qemu/ppc-mac99/readme.txt board/qemu/ppc-mpc8544ds/readme.txt board/qemu/ppc64-e5500/readme.txt board/qemu/s390x/readme.txt board/qemu/sh4-r2d/readme.txt board/qemu/sh4eb-r2d/readme.txt board/qemu/sparc-ss10/readme.txt board/qemu/sparc64-sun4u/readme.txt board/qemu/x86/readme.txt board/qemu/x86_64/readme.txt Update the slirp configure option following the slirp submodule removal [2]. Runtime tested in gitlab: https://gitlab.com/kubu93/buildroot/-/pipelines/725509959 Add a backport from upstream, to fix sh4 stability [3]. [1] https://wiki.qemu.org/ChangeLog/7.2#Removal_of_the_.22slirp.22_submodule_.28affects_.22-netdev_user.22.29 [2] https://gitlab.com/qemu-project/qemu/-/commit/5890258aeeba303704ec1adca415e46067800777 [3] https://gitlab.com/kubu93/buildroot/-/jobs/3490258272 Signed-off-by: Romain Naour [yann.morin.1998@free.fr: backport fix rather than revert faulty commit] Signed-off-by: Yann E. MORIN --- ...k-restore-of-env-flags-from-tb-flags.patch | 36 +++++++++++++++++++ package/qemu/qemu.hash | 2 +- package/qemu/qemu.mk | 6 ++-- 3 files changed, 41 insertions(+), 3 deletions(-) create mode 100644 package/qemu/0003-target-sh4-Mask-restore-of-env-flags-from-tb-flags.patch diff --git a/package/qemu/0003-target-sh4-Mask-restore-of-env-flags-from-tb-flags.patch b/package/qemu/0003-target-sh4-Mask-restore-of-env-flags-from-tb-flags.patch new file mode 100644 index 0000000000..8dc2dd8823 --- /dev/null +++ b/package/qemu/0003-target-sh4-Mask-restore-of-env-flags-from-tb-flags.patch @@ -0,0 +1,36 @@ +From bc2331635ce18ff068d2bb1e493bc546e1f786e1 Mon Sep 17 00:00:00 2001 +From: Guenter Roeck +Date: Mon, 12 Dec 2022 09:03:17 -0600 +Subject: [PATCH] target/sh4: Mask restore of env->flags from tb->flags + +The values in env->flags are a subset of tb->flags. +Restore only the bits that belong. + +Cc: qemu-stable@nongnu.org +Fixes: ab419fd8a035 ("target/sh4: Fix TB_FLAG_UNALIGN") +Signed-off-by: Guenter Roeck +Message-ID: <20221212011345.GA2235238@roeck-us.net> +[rth: Reduce to only the the superh_cpu_synchronize_from_tb change] +Signed-off-by: Richard Henderson +[yann.morin.1998@free.fr: backport from upstream] +Signed-off-by: Yann E. MORIN +--- + target/sh4/cpu.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/target/sh4/cpu.c b/target/sh4/cpu.c +index 951eb6b9c8..f0934b20fa 100644 +--- a/target/sh4/cpu.c ++++ b/target/sh4/cpu.c +@@ -47,7 +47,7 @@ static void superh_cpu_synchronize_from_tb(CPUState *cs, + SuperHCPU *cpu = SUPERH_CPU(cs); + + cpu->env.pc = tb_pc(tb); +- cpu->env.flags = tb->flags; ++ cpu->env.flags = tb->flags & TB_FLAG_ENVFLAGS_MASK; + } + + static void superh_restore_state_to_opc(CPUState *cs, +-- +2.25.1 + diff --git a/package/qemu/qemu.hash b/package/qemu/qemu.hash index 06d090bd1d..e671e1d184 100644 --- a/package/qemu/qemu.hash +++ b/package/qemu/qemu.hash @@ -1,4 +1,4 @@ # Locally computed, tarball verified with GPG signature -sha256 a0634e536bded57cf38ec8a751adb124b89c776fe0846f21ab6c6728f1cbbbe6 qemu-7.1.0.tar.xz +sha256 5b49ce2687744dad494ae90a898c52204a3406e84d072482a1e1be854eeb2157 qemu-7.2.0.tar.xz sha256 6f04ae8364d0079a192b14635f4b1da294ce18724c034c39a6a41d1b09df6100 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index be84452862..8725e7c8c4 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -4,7 +4,7 @@ # ################################################################################ -QEMU_VERSION = 7.1.0 +QEMU_VERSION = 7.2.0 QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz QEMU_SITE = http://download.qemu.org QEMU_LICENSE = GPL-2.0, LGPL-2.1, MIT, BSD-3-Clause, BSD-2-Clause, Others/BSD-1c @@ -69,7 +69,7 @@ QEMU_OPTS += --enable-vhost-user endif ifeq ($(BR2_PACKAGE_QEMU_SLIRP),y) -QEMU_OPTS += --enable-slirp=system +QEMU_OPTS += --enable-slirp QEMU_DEPENDENCIES += slirp else QEMU_OPTS += --disable-slirp @@ -258,6 +258,7 @@ HOST_QEMU_DEPENDENCIES = \ host-pixman \ host-pkgconf \ host-python3 \ + host-slirp \ host-zlib # BR ARCH qemu @@ -402,6 +403,7 @@ define HOST_QEMU_CONFIGURE_CMDS --disable-vnc-jpeg \ --disable-png \ --disable-vnc-sasl \ + --enable-slirp \ --enable-tools \ $(HOST_QEMU_OPTS) endef From 030cbe37033a3c179c5c51dbd0427cc443efb330 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Wed, 28 Dec 2022 19:42:48 +0100 Subject: [PATCH 0146/5754] package/rtl8723bu: bump to 2022-12-28 version to fix build failure with Linux 6.1 Let's also drop local patch[0] that has been upstreamed. [0]: https://github.com/lwfinger/rtl8723bu/commit/dde7bddfddddb7212f2d9671391e2096d770c449 Fixes: http://autobuild.buildroot.net/results/cc8/cc84b5f62ca59572f0f52086f157acc0409c03f5/ Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- ...uild-failure-on-PowerPc-architecture.patch | 47 ------------------- package/rtl8723bu/rtl8723bu.hash | 2 +- package/rtl8723bu/rtl8723bu.mk | 2 +- 3 files changed, 2 insertions(+), 49 deletions(-) delete mode 100644 package/rtl8723bu/0001-Fix-build-failure-on-PowerPc-architecture.patch diff --git a/package/rtl8723bu/0001-Fix-build-failure-on-PowerPc-architecture.patch b/package/rtl8723bu/0001-Fix-build-failure-on-PowerPc-architecture.patch deleted file mode 100644 index 06cf2d64c1..0000000000 --- a/package/rtl8723bu/0001-Fix-build-failure-on-PowerPc-architecture.patch +++ /dev/null @@ -1,47 +0,0 @@ -From dde7bddfddddb7212f2d9671391e2096d770c449 Mon Sep 17 00:00:00 2001 -From: Giulio Benetti -Date: Sun, 23 Oct 2022 22:57:41 +0200 -Subject: [PATCH] Fix build failure on PowerPc architecture - -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 wifi_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#n49 - -Upstream: https://github.com/lwfinger/rtl8723bu/pull/192 -Signed-off-by: Giulio Benetti ---- - hal/rtl8723bu_recv.c | 2 +- - include/wifi.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/hal/rtl8723bu_recv.c b/hal/rtl8723bu_recv.c -index a2fc82b..39e5044 100644 ---- a/hal/rtl8723bu_recv.c -+++ b/hal/rtl8723bu_recv.c -@@ -288,7 +288,7 @@ void update_recvframe_phyinfo( - !pattrib->icv_err && !pattrib->crc_err && - _rtw_memcmp(get_hdr_bssid(wlanhdr), get_bssid(&padapter->mlmepriv), ETH_ALEN)); - -- pkt_info.bPacketToSelf = pkt_info.bPacketMatchBSSID && (_rtw_memcmp(get_ra(wlanhdr), myid(&padapter->eeprompriv), ETH_ALEN)); -+ pkt_info.bPacketToSelf = pkt_info.bPacketMatchBSSID && (_rtw_memcmp(wifi_get_ra(wlanhdr), myid(&padapter->eeprompriv), ETH_ALEN)); - - pkt_info.bPacketBeacon = pkt_info.bPacketMatchBSSID && (GetFrameSubType(wlanhdr) == WIFI_BEACON); - sa = get_ta(wlanhdr); -diff --git a/include/wifi.h b/include/wifi.h -index 5dc32eb..23578cc 100644 ---- a/include/wifi.h -+++ b/include/wifi.h -@@ -373,7 +373,7 @@ __inline static int IS_MCAST(unsigned char *da) - return _FALSE; - } - --__inline static unsigned char * get_ra(unsigned char *pframe) -+__inline static unsigned char * wifi_get_ra(unsigned char *pframe) - { - unsigned char *ra; - ra = GetAddr1Ptr(pframe); --- -2.34.1 - diff --git a/package/rtl8723bu/rtl8723bu.hash b/package/rtl8723bu/rtl8723bu.hash index 9119abad76..6a28c34773 100644 --- a/package/rtl8723bu/rtl8723bu.hash +++ b/package/rtl8723bu/rtl8723bu.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 07fece152704f4b5dbd0fd3af842816f95824317f3158fea774f15a6eddac009 rtl8723bu-d79a676a8d3f0bb6ac8af126689c6ac6869cb6f2.tar.gz +sha256 21372b654886c6d100f46636d7807428698bd618e00db1b8b49cfc3037e46d10 rtl8723bu-f1dbe1c8ccc2c5b2cbeb84da6b9f0e547a84a255.tar.gz diff --git a/package/rtl8723bu/rtl8723bu.mk b/package/rtl8723bu/rtl8723bu.mk index 82c487b4e1..af1ac9454e 100644 --- a/package/rtl8723bu/rtl8723bu.mk +++ b/package/rtl8723bu/rtl8723bu.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8723BU_VERSION = d79a676a8d3f0bb6ac8af126689c6ac6869cb6f2 +RTL8723BU_VERSION = f1dbe1c8ccc2c5b2cbeb84da6b9f0e547a84a255 RTL8723BU_SITE = $(call github,lwfinger,rtl8723bu,$(RTL8723BU_VERSION)) RTL8723BU_LICENSE = GPL-2.0, proprietary (*.bin firmware blobs) From ef3052674a7104990037b7da60cbbcb9d316e764 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Wed, 28 Dec 2022 19:00:53 +0100 Subject: [PATCH 0147/5754] package/rtl8192eu: fix build failure due to function and data types name conflict with Linux Add local patch to rename local sha256 data types and functions that conflict with Linux ones. Fixes: http://autobuild.buildroot.net/results/7a85a1e6df55bbb4dc6741821c849ad7ee5059af Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- ...e-due-to-redefition-of-local-sha256-.patch | 108 ++++++++++++++++++ 1 file changed, 108 insertions(+) create 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 new file mode 100644 index 0000000000..52ef8c9005 --- /dev/null +++ b/package/rtl8192eu/0001-Fix-build-failure-due-to-redefition-of-local-sha256-.patch @@ -0,0 +1,108 @@ +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 + From be69066d8fee8b30dad8317bb4aad425bc005623 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 28 Dec 2022 09:39:18 +0100 Subject: [PATCH 0148/5754] DEVELOPERS: drop ucl Commit 85c5af46ad6c18841576c0f7abe241a617a44cb7 forgot to drop ucl from DEVELOPERS file Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 - 1 file changed, 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index 48e7e08b3a..0eea9c33d9 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1091,7 +1091,6 @@ F: package/libsodium/ F: package/php-amqp/ F: package/python-cherrypy/ F: package/sane-backends/ -F: package/ucl/ F: package/upx/ F: package/zxing-cpp/ From 16b27f7cdbc8c203b3b957a33ade03739149021f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 27 Dec 2022 23:00:17 +0100 Subject: [PATCH 0149/5754] package/dieharder: bump to version 3.31.1.4 - Switch to the maintenance "upstream" repo which regroup updates made for the Debian package - Drop all patches (already in version) - Drop DIEHARDER_M4_CLEAN which is not needed since https://github.com/eddelbuettel/dieharder/commit/c875e5d8196c4a79547281ff5f9fb04af734db97 - -fcommon is not needed since https://github.com/eddelbuettel/dieharder/commit/8feba3cc2bf92627f32ac637827ac760d3a17e63 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...dedir-as-include-search-path-for-bui.patch | 62 -- .../0002-Fix-missing-type-intptr_t.patch | 27 - ...RCE-for-uint-and-M_PI-with-musl-libc.patch | 28 - .../0004-Add-static-to-inline-functions.patch | 65 -- .../0005-Remove-defunct-rgb_operm.patch | 732 ------------------ package/dieharder/dieharder.hash | 2 +- package/dieharder/dieharder.mk | 25 +- 7 files changed, 4 insertions(+), 937 deletions(-) delete mode 100644 package/dieharder/0001-Do-not-use-includedir-as-include-search-path-for-bui.patch delete mode 100644 package/dieharder/0002-Fix-missing-type-intptr_t.patch delete mode 100644 package/dieharder/0003-Add-_GNU_SOURCE-for-uint-and-M_PI-with-musl-libc.patch delete mode 100644 package/dieharder/0004-Add-static-to-inline-functions.patch delete mode 100644 package/dieharder/0005-Remove-defunct-rgb_operm.patch diff --git a/package/dieharder/0001-Do-not-use-includedir-as-include-search-path-for-bui.patch b/package/dieharder/0001-Do-not-use-includedir-as-include-search-path-for-bui.patch deleted file mode 100644 index b475e5c470..0000000000 --- a/package/dieharder/0001-Do-not-use-includedir-as-include-search-path-for-bui.patch +++ /dev/null @@ -1,62 +0,0 @@ -From fbc9b7c3b83a99ac996c0a268487d1f800630328 Mon Sep 17 00:00:00 2001 -From: Julien Viard de Galbert -Date: Wed, 8 Feb 2017 21:26:58 +0100 -Subject: [PATCH] Do not use includedir as include search path for build - ---includedir is not used to specify where a program should -look for headers of libraries, but to tell where it should -install its own headers. - -Signed-off-by: Julien Viard de Galbert ---- - configure.ac | 6 +++--- - dieharder/Makefile.am | 2 +- - libdieharder/Makefile.am | 2 +- - 3 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/configure.ac b/configure.ac -index b336115..91f7c64 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -96,9 +96,9 @@ AC_TYPE_SIZE_T - AC_C_VOLATILE - AC_C_INLINE - --DIEHARDER_CFLAGS="-I$includedir" --dieharder_CFLAGS="-std=c99 -Wall -pedantic -I$includedir" --libdieharder_lo_CFLAGS="-Wall -pedantic -I$includedir" -+DIEHARDER_CFLAGS="" -+dieharder_CFLAGS="-std=c99 -Wall -pedantic" -+libdieharder_lo_CFLAGS="-Wall -pedantic" - DIEHARDER_LIBS="-L$libdir -ldieharder" - ACLOCAL_AMFLAGS="-I m4" - -diff --git a/dieharder/Makefile.am b/dieharder/Makefile.am -index e6fbff2..7bdac5c 100644 ---- a/dieharder/Makefile.am -+++ b/dieharder/Makefile.am -@@ -64,7 +64,7 @@ DEFINES = -DVERSION=$(VERSION) - # CC = gcc - - # Compile flags (use fairly standard -O3 as default) --AM_CPPFLAGS = -I ${top_srcdir}/include $(DEFINES) -I ${includedir} -+AM_CPPFLAGS = -I ${top_srcdir}/include $(DEFINES) - AM_CFLAGS = -O3 - - # Load flags (optional) -diff --git a/libdieharder/Makefile.am b/libdieharder/Makefile.am -index 5fd3396..0873f9c 100644 ---- a/libdieharder/Makefile.am -+++ b/libdieharder/Makefile.am -@@ -114,7 +114,7 @@ DEFINES = -DVERSION=$(VERSION) -DLITTLE_ENDIAN=$(LITTLE_ENDIAN) - # CC = gcc - - # Compile flags (use fairly standard -O3 as default) --AM_CPPFLAGS = $(DEFINES) -I ${top_srcdir}/include -I ${includedir} -+AM_CPPFLAGS = $(DEFINES) -I ${top_srcdir}/include - AM_CFLAGS = -O3 -Wall -pedantic -Wno-unused-variable - - #======================================================================== --- -2.1.4 - diff --git a/package/dieharder/0002-Fix-missing-type-intptr_t.patch b/package/dieharder/0002-Fix-missing-type-intptr_t.patch deleted file mode 100644 index 12ea5e7fa0..0000000000 --- a/package/dieharder/0002-Fix-missing-type-intptr_t.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 6f550841943f19612af064b3d3a1db134078e03c Mon Sep 17 00:00:00 2001 -From: Julien Viard de Galbert -Date: Sat, 14 Jan 2017 14:18:10 +0100 -Subject: [PATCH] Fix missing type intptr_t - -With glibc-2.23 unistd.h need intptr_t when __USE_MISC is defined. - -Signed-off-by: Julien Viard de Galbert ---- - include/dieharder/libdieharder.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/include/dieharder/libdieharder.h b/include/dieharder/libdieharder.h -index 2138ebf..d98b758 100644 ---- a/include/dieharder/libdieharder.h -+++ b/include/dieharder/libdieharder.h -@@ -17,6 +17,7 @@ - - /* This turns on uint macro in c99 */ - #define __USE_MISC 1 -+#include - #include - #include - #include --- -2.1.4 - diff --git a/package/dieharder/0003-Add-_GNU_SOURCE-for-uint-and-M_PI-with-musl-libc.patch b/package/dieharder/0003-Add-_GNU_SOURCE-for-uint-and-M_PI-with-musl-libc.patch deleted file mode 100644 index d71cd57445..0000000000 --- a/package/dieharder/0003-Add-_GNU_SOURCE-for-uint-and-M_PI-with-musl-libc.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 526510a27ef47a16699dd34a2373ad9b6bb5e8f3 Mon Sep 17 00:00:00 2001 -From: Julien Viard de Galbert -Date: Sat, 14 Jan 2017 14:19:47 +0100 -Subject: [PATCH] Add _GNU_SOURCE for uint and M_PI with musl libc - -When building with musl libc _GNU_SOURCE need to be defined -to provide uint type and M_PI macro - -Signed-off-by: Julien Viard de Galbert ---- - include/dieharder/libdieharder.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/include/dieharder/libdieharder.h b/include/dieharder/libdieharder.h -index d98b758..c1a5023 100644 ---- a/include/dieharder/libdieharder.h -+++ b/include/dieharder/libdieharder.h -@@ -17,6 +17,7 @@ - - /* This turns on uint macro in c99 */ - #define __USE_MISC 1 -+#define _GNU_SOURCE 1 - #include - #include - #include --- -2.1.4 - diff --git a/package/dieharder/0004-Add-static-to-inline-functions.patch b/package/dieharder/0004-Add-static-to-inline-functions.patch deleted file mode 100644 index 64cde1d21d..0000000000 --- a/package/dieharder/0004-Add-static-to-inline-functions.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 9c71a211dcf20f53f747326f5bc3fee9fabe3f52 Mon Sep 17 00:00:00 2001 -From: Julien Viard de Galbert -Date: Tue, 27 Jun 2017 00:16:11 +0200 -Subject: [PATCH] Add static to inline functions - -This is needed to avoid a link error where the inline functions appear -missing at link time. -From c99 standard inline function should either be declared static or -have an extern instance in a c file for linking. -This fix is necessary to build with gcc 7; for some reason it was not -trigerred before. - -Signed-off-by: Julien Viard de Galbert ---- - libdieharder/dab_filltree.c | 4 ++-- - libdieharder/dab_filltree2.c | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/libdieharder/dab_filltree.c b/libdieharder/dab_filltree.c -index 9cc5ce7..a377c3d 100644 ---- a/libdieharder/dab_filltree.c -+++ b/libdieharder/dab_filltree.c -@@ -34,7 +34,7 @@ static double targetData[] = { - 0.0, 0.0, 0.0, 0.0, 0.13333333, 0.20000000, 0.20634921, 0.17857143, 0.13007085, 0.08183633, 0.04338395, 0.01851828, 0.00617270, 0.00151193, 0.00023520, 0.00001680, 0.00000000, 0.00000000, 0.00000000, 0.00000000 - }; - --inline int insert(double x, double *array, unsigned int startVal); -+static inline int insert(double x, double *array, unsigned int startVal); - - int dab_filltree(Test **test,int irun) { - int size = (ntuple == 0) ? 32 : ntuple; -@@ -105,7 +105,7 @@ int dab_filltree(Test **test,int irun) { - } - - --inline int insert(double x, double *array, unsigned int startVal) { -+static inline int insert(double x, double *array, unsigned int startVal) { - uint d = (startVal + 1) / 2; - uint i = startVal; - while (d > 0) { -diff --git a/libdieharder/dab_filltree2.c b/libdieharder/dab_filltree2.c -index 1e33af2..59cbd52 100644 ---- a/libdieharder/dab_filltree2.c -+++ b/libdieharder/dab_filltree2.c -@@ -92,7 +92,7 @@ static double targetData[128] = { // size=128, generated from 6e9 samples - 0.00000000000e+00,0.00000000000e+00,0.00000000000e+00,0.00000000000e+00, - }; - --inline int insertBit(uint x, uchar *array, uint *i, uint *d); -+static inline int insertBit(uint x, uchar *array, uint *i, uint *d); - - int dab_filltree2(Test **test, int irun) { - int size = (ntuple == 0) ? 128 : ntuple; -@@ -181,7 +181,7 @@ int dab_filltree2(Test **test, int irun) { - * The function returns >= 0 if the path went too deep; the - * returned value is the last position of the path. - */ --inline int insertBit(uint x, uchar *array, uint *i, uint *d) { -+static inline int insertBit(uint x, uchar *array, uint *i, uint *d) { - if (x != 0) { - *i += *d; - } else { --- -2.13.2 - diff --git a/package/dieharder/0005-Remove-defunct-rgb_operm.patch b/package/dieharder/0005-Remove-defunct-rgb_operm.patch deleted file mode 100644 index efc311dbaa..0000000000 --- a/package/dieharder/0005-Remove-defunct-rgb_operm.patch +++ /dev/null @@ -1,732 +0,0 @@ -From 40d377b86c856f5a4510a6f5cd56be004873ad77 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marcus=20M=C3=BCller?= -Date: Mon, 12 Oct 2020 21:30:12 +0200 -Subject: [PATCH] Remove defunct rgb_operm - -[Retrieved from: -https://github.com/eddelbuettel/dieharder/pull/2/commits/40d377b86c856f5a4510a6f5cd56be004873ad77] -Signed-off-by: Fabrice Fontaine ---- - include/Makefile.am | 1 - - include/dieharder/rgb_operm.h | 38 -- - include/dieharder/tests.h | 2 - - libdieharder/rgb_operm.c | 633 ---------------------------------- - 4 files changed, 674 deletions(-) - delete mode 100644 include/dieharder/rgb_operm.h - delete mode 100644 libdieharder/rgb_operm.c - -diff --git a/include/Makefile.am b/include/Makefile.am -index f80b4ff..e4659cd 100644 ---- a/include/Makefile.am -+++ b/include/Makefile.am -@@ -33,7 +33,6 @@ nobase_include_HEADERS = dieharder/copyright.h \ - dieharder/rgb_lagged_sums.h \ - dieharder/rgb_lmn.h \ - dieharder/rgb_minimum_distance.h \ -- dieharder/rgb_operm.h \ - dieharder/rgb_persist.h \ - dieharder/rgb_permutations.h \ - dieharder/rgb_timing.h \ -diff --git a/include/dieharder/rgb_operm.h b/include/dieharder/rgb_operm.h -deleted file mode 100644 -index c48fa37..0000000 ---- a/include/dieharder/rgb_operm.h -+++ /dev/null -@@ -1,38 +0,0 @@ --/* -- * rgb_operm test header. -- */ -- --/* -- * function prototype -- */ --int rgb_operm(Test **test,int irun); -- --static Dtest rgb_operm_dtest __attribute__((unused)) = { -- "RGB Overlapping Permuations Test", -- "rgb_operm", -- "\n\ --#========================================================================\n\ --# RGB Overlapping Permutations Test\n\ --# Forms both the exact (expected) covariance matrix for overlapping\n\ --# permutations of random integer and an empirical covariance matrix\n\ --# formed from a long string of samples. The difference is expected\n\ --# to have a chisq distribution and hence can be transformed into a\n\ --# sample p-value. Note that this is one possible functional replacement\n\ --# for the broken/defunct diehard operm5 test, but one that permits k (the\n\ --# number of numbers in the overlapping permutation window) to be varied\n\ --# from 2 to perhaps 8.\n\ --#\n", -- 100, /* Default psamples */ -- 100000, /* Default tsamples */ -- 1, /* We magically make all the bit tests return a single histogram */ -- rgb_operm, -- 0 --}; -- --/* -- * Global variables. -- * -- * rgb_operm_k is the size of the overlapping window that is slid along -- * a data stream of rands from x_i to x_{i+k} to compute c[][]. -- */ --unsigned int rgb_operm_k; -diff --git a/include/dieharder/tests.h b/include/dieharder/tests.h -index 1674aed..b50dbe3 100644 ---- a/include/dieharder/tests.h -+++ b/include/dieharder/tests.h -@@ -11,7 +11,6 @@ - #include - #include - #include --#include - #include - #include - #include -@@ -80,7 +79,6 @@ - RGB_PERMUTATIONS, - RGB_LAGGED_SUMS, - RGB_LMN, -- RGB_OPERM, - DAB_BYTEDISTRIB, - DAB_DCT, - DAB_FILLTREE, -diff --git a/libdieharder/rgb_operm.c b/libdieharder/rgb_operm.c -deleted file mode 100644 -index 15f8e9a..0000000 ---- a/libdieharder/rgb_operm.c -+++ /dev/null -@@ -1,633 +0,0 @@ --/* -- * ======================================================================== -- * $Id: rgb_operm.c 252 2006-10-10 13:17:36Z rgb $ -- * -- * See copyright in copyright.h and the accompanying file COPYING -- * ======================================================================== -- */ -- --/* -- * ======================================================================== -- * This is the revised Overlapping Permutations test. It directly -- * simulates the covariance matrix of overlapping permutations. The way -- * this works below (tentatively) is: -- * -- * For a bit ntuple of length N, slide a window of length N to the -- * right one bit at a time. Compute the permutation index of the -- * original ntuple, the permutation index of the window ntuple, and -- * accumulate the covariance matrix of the two positions. This -- * can be directly and precisely computed as well. The simulated -- * result should be distributed according to the chisq distribution, -- * so we subtract the two and feed it into the chisq program as a -- * vector to compute p. -- * -- * This MAY NOT BE RIGHT. I'm working from both Marsaglia's limited -- * documentation (in a program that doesn't do ANYTHING like what the -- * documentation says it does) and from Nilpotent Markov Processes. -- * But I confess to not quite understand how to actually perform the -- * test in the latter -- it is very good at describing the construction -- * of the target matrix, not so good at describing how to transform -- * this into a chisq and p. -- * -- * FWIW, as I get something that actually works here, I'm going to -- * THOROUGHLY document it in the book that will accompany the test. -- *======================================================================== -- */ -- --#include --#define RGB_OPERM_KMAX 10 -- --/* -- * Some globals that will eventually go in the test include where they -- * arguably belong. -- */ --double fpipi(int pi1,int pi2,int nkp); --uint piperm(size_t *data,int len); --void make_cexact(); --void make_cexpt(); --int nperms,noperms; --double **cexact,**ceinv,**cexpt,**idty; --double *cvexact,*cvein,*cvexpt,*vidty; -- --int rgb_operm(Test **test,int irun) --{ -- -- int i,j,n,nb,iv,s; -- uint csamples; /* rgb_operm_k^2 is vector size of cov matrix */ -- uint *count,ctotal; /* counters */ -- uint size; -- double pvalue,ntuple_prob,pbin; /* probabilities */ -- Vtest *vtest; /* Chisq entry vector */ -- -- gsl_matrix_view CEXACT,CEINV,CEXPT,IDTY; -- -- /* -- * For a given n = ntuple size in bits, there are n! bit orderings -- */ -- MYDEBUG(D_RGB_OPERM){ -- printf("#==================================================================\n"); -- printf("# rgb_operm: Running rgb_operm verbosely for k = %d.\n",rgb_operm_k); -- printf("# rgb_operm: Use -v = %d to focus.\n",D_RGB_OPERM); -- printf("# rgb_operm: ======================================================\n"); -- } -- -- /* -- * Sanity check first -- */ -- if((rgb_operm_k < 0) || (rgb_operm_k > RGB_OPERM_KMAX)){ -- printf("\nError: rgb_operm_k must be a positive integer <= %u. Exiting.\n",RGB_OPERM_KMAX); -- exit(0); -- } -- -- nperms = gsl_sf_fact(rgb_operm_k); -- noperms = gsl_sf_fact(3*rgb_operm_k-2); -- csamples = rgb_operm_k*rgb_operm_k; -- gsl_permutation * p = gsl_permutation_alloc(nperms); -- -- /* -- * Allocate memory for value_max vector of Vtest structs and counts, -- * PER TEST. Note that we must free both of these when we are done -- * or leak. -- */ -- vtest = (Vtest *)malloc(csamples*sizeof(Vtest)); -- count = (uint *)malloc(csamples*sizeof(uint)); -- Vtest_create(vtest,csamples+1); -- -- /* -- * We have to allocate and free the cexact and cexpt matrices here -- * or they'll be forgotten when these routines return. -- */ -- MYDEBUG(D_RGB_OPERM){ -- printf("# rgb_operm: Creating and zeroing cexact[][] and cexpt[][].\n"); -- } -- cexact = (double **)malloc(nperms*sizeof(double*)); -- ceinv = (double **)malloc(nperms*sizeof(double*)); -- cexpt = (double **)malloc(nperms*sizeof(double*)); -- idty = (double **)malloc(nperms*sizeof(double*)); -- cvexact = (double *)malloc(nperms*nperms*sizeof(double)); -- cvein = (double *)malloc(nperms*nperms*sizeof(double)); -- cvexpt = (double *)malloc(nperms*nperms*sizeof(double)); -- vidty = (double *)malloc(nperms*nperms*sizeof(double)); -- for(i=0;idata[k]; -- -- /* Not cruft, but quiet... -- MYDEBUG(D_RGB_OPERM){ -- printf("#------------------------------------------------------------------\n"); -- printf("# Generating offset sample permutation pi's\n"); -- } -- */ -- for(k=0;k<2*rgb_operm_k - 1;k++){ -- gsl_sort_index((size_t *) ps,&testv[k],1,rgb_operm_k); -- pi[k] = piperm((size_t *) ps,rgb_operm_k); -- -- /* Not cruft, but quiet... -- MYDEBUG(D_RGB_OPERM){ -- printf("# %u: ",k); -- for(ip=k;ipdata[ip]); -- } -- printf(" = %u\n",pi[k]); -- } -- */ -- } -- -- /* -- * This is the business end of things. The covariance matrix is the -- * the sum of a central function of the permutation indices that yields -- * nperms-1/nperms on diagonal, -1/nperms off diagonal, for all the -- * possible permutations, for the FIRST permutation in a sample (fi) -- * times the sum of the same function over all the overlapping permutations -- * drawn from the same sample. Quite simple, really. -- */ -- for(i=0;idata[rgb_operm_k-j-1] = lookup[i]->data[j]; -- } -- } else { -- gsl_permutation_memcpy(lookup[i],lookup[i-1]); -- gsl_permutation_next(lookup[i]); -- for(j=0;jdata[rgb_operm_k-j-1] = lookup[i]->data[j]; -- } -- } -- } -- */ -- MYDEBUG(D_RGB_OPERM){ -- for(i=0;i ",i); -- gsl_permutation_fprintf(stdout,lookup[i]," %u"); -- printf("\n"); -- } -- } -- -- } -- -- for(i=0;idata,len*sizeof(uint))==0){ -- /* Not cruft, but off: -- MYDEBUG(D_RGB_OPERM){ -- printf("# piperm(): "); -- gsl_permutation_fprintf(stdout,lookup[i]," %u"); -- printf(" = %u\n",i); -- } -- */ -- return(i); -- } -- } -- printf("We'd better not get here...\n"); -- -- return(0); -- --} -- --double fpipi(int pi1,int pi2,int nkp) --{ -- -- int i; -- double fret; -- -- /* -- * compute the k-permutation index from iperm for the window -- * at data[offset] of length len. If it matches pind, return -- * the first quantity, otherwise return the second. -- */ -- if(pi1 == pi2){ -- -- fret = (double) (nkp - 1.0)/nkp; -- if(verbose < 0){ -- printf(" f(%d,%d) = %10.6f\n",pi1,pi2,fret); -- } -- return(fret); -- -- } else { -- -- fret = (double) (-1.0/nkp); -- if(verbose < 0){ -- printf(" f(%d,%d) = %10.6f\n",pi1,pi2,fret); -- } -- return(fret); -- -- } -- -- --} -- -- -- -- diff --git a/package/dieharder/dieharder.hash b/package/dieharder/dieharder.hash index 65b60e7aa7..3d285d03cc 100644 --- a/package/dieharder/dieharder.hash +++ b/package/dieharder/dieharder.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 6cff0ff8394c553549ac7433359ccfc955fb26794260314620dfa5e4cd4b727f dieharder-3.31.1.tgz +sha256 0fdd8a66a077e86652a47641589aa4667ae13d322a7214bb555ab37f082002dd dieharder-3.31.1.4.tar.gz sha256 c475bcd1afa6fc15a65174e31c599c0d23706a34e4b9f2fcb03a4dad5438d53f COPYING diff --git a/package/dieharder/dieharder.mk b/package/dieharder/dieharder.mk index cbf28922fd..6fe5b1f743 100644 --- a/package/dieharder/dieharder.mk +++ b/package/dieharder/dieharder.mk @@ -4,28 +4,14 @@ # ################################################################################ -DIEHARDER_VERSION = 3.31.1 -DIEHARDER_SITE = http://www.phy.duke.edu/~rgb/General/dieharder -DIEHARDER_SOURCE = dieharder-$(DIEHARDER_VERSION).tgz -DIEHARDER_STRIP_COMPONENTS = 2 +DIEHARDER_VERSION = 3.31.1.4 +DIEHARDER_SITE = $(call github,eddelbuettel,dieharder,$(DIEHARDER_VERSION)) DIEHARDER_LICENSE = GPL-2.0 with beverage clause DIEHARDER_LICENSE_FILES = COPYING DIEHARDER_DEPENDENCIES = gsl - -# The original configure does not use variables provided in the -# environment so _CONF_ENV does not work. (_CONF_OPTS does). -# -# Finally, we patch configure.ac and some Makefile.am so we need to -# autoreconf anyway +# configure retrieved from git is outdated DIEHARDER_AUTORECONF = YES -# The m4/*.m4 files are symlinks to /usr/share, which clearly doesn't -# work, and doing an autoreconf does not replace them. -define DIEHARDER_M4_CLEAN - rm -f $(@D)/m4/*.m4 -endef -DIEHARDER_POST_PATCH_HOOKS += DIEHARDER_M4_CLEAN - # fix endianness detection ifeq ($(BR2_ENDIAN),"BIG") DIEHARDER_CONF_ENV = ac_cv_c_endian=big @@ -36,9 +22,4 @@ endif # parallel build fail, disable it DIEHARDER_MAKE = $(MAKE1) -# Too many fixes needed to build with -fno-common which is default since gcc 10 -ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_10),y) -DIEHARDER_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -fcommon" -endif - $(eval $(autotools-package)) From d47f7279f516ba2bbc6d1fd9dd37636902b9bad3 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 28 Dec 2022 19:11:49 +0100 Subject: [PATCH 0150/5754] package/rng-tools: fix build with updated jitterentropy-library Commit a8807ddbe2 bumped package jitterentropy-library to version 3.4.1 which broke building rng-tools. Add two upstream patches which improve jitterentropy-library detection. Fixes: http://autobuild.buildroot.net/results/a6f/a6f1381b3d1aa2a27412286167f5c8be5f6fdaf8/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- ...ropy-detection-to-look-for-the-setti.patch | 30 ++++++++++++++ ...ropy-library-to-timeout-fail-on-long.patch | 39 +++++++++++++++++++ 2 files changed, 69 insertions(+) create mode 100644 package/rng-tools/0002-Adjust-jitterentropy-detection-to-look-for-the-setti.patch create mode 100644 package/rng-tools/0003-Adjust-jitterentropy-library-to-timeout-fail-on-long.patch diff --git a/package/rng-tools/0002-Adjust-jitterentropy-detection-to-look-for-the-setti.patch b/package/rng-tools/0002-Adjust-jitterentropy-detection-to-look-for-the-setti.patch new file mode 100644 index 0000000000..553842640d --- /dev/null +++ b/package/rng-tools/0002-Adjust-jitterentropy-detection-to-look-for-the-setti.patch @@ -0,0 +1,30 @@ +From e2698477e8abf623c18ab28d33cc894ec882a706 Mon Sep 17 00:00:00 2001 +From: Neil Horman +Date: Fri, 18 Mar 2022 18:59:52 -0400 +Subject: [PATCH] Adjust jitterentropy detection to look for the settick + function + +Theres no great way to detect if jitterentropy has the internal timer +feature enabled so we have to look for a function that is only defined +when it is enabled + +Signed-off-by: Bernd Kuhls +[downloaded from upstream commit + https://github.com/nhorman/rng-tools/commit/e2698477e8abf623c18ab28d33cc894ec882a706] +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index e16e1a0..0f5a38e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -94,7 +94,7 @@ AS_IF( + AC_SEARCH_LIBS(jent_version,jitterentropy, + [AM_CONDITIONAL([JITTER], [true]) + AC_DEFINE([HAVE_JITTER],1,[Enable JITTER]) +- AC_CHECK_LIB(jitterentropy, jent_entropy_switch_notime_impl, ++ AC_CHECK_LIB(jitterentropy, jent_notime_settick, + [AC_DEFINE([HAVE_JITTER_NOTIME],1,[Enable JITTER_NOTIME])], + [],-lpthread)], + AC_MSG_NOTICE([No Jitterentropy library found]),-lpthread) diff --git a/package/rng-tools/0003-Adjust-jitterentropy-library-to-timeout-fail-on-long.patch b/package/rng-tools/0003-Adjust-jitterentropy-library-to-timeout-fail-on-long.patch new file mode 100644 index 0000000000..9d8dbe2d0b --- /dev/null +++ b/package/rng-tools/0003-Adjust-jitterentropy-library-to-timeout-fail-on-long.patch @@ -0,0 +1,39 @@ +From c29424f10a0dcbd18ac25607fa1c81c18a960e81 Mon Sep 17 00:00:00 2001 +From: Neil Horman +Date: Mon, 16 May 2022 13:38:54 -0400 +Subject: [PATCH] Adjust jitterentropy library to timeout/fail on long delay + +[Bernd: removed description of unrelated part of the patch] + +Also while we're at it, I might have a build solution for the presence +of internal timers. When jitterentropy is built without internal +timers, jent_notime_init is defined publically, but when it is built +with timers, its declared as a static symbol, preenting resolution, so +we can test to see if the function exists. If it does we _don't_ have +notime support. The logic is a bit backwards, but i think it works + +Signed-off-by: Bernd Kuhls +[downloaded configure.ac patch from upstream commit + https://github.com/nhorman/rng-tools/commit/57be6d4c90e78ea9ad036a3a6e9b09822ed4d219] +--- + configure.ac | 6 ++--- + rngd_jitter.c | 62 ++++++++++++++++++++++++++++++++++++++------------- + 2 files changed, 49 insertions(+), 19 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 52f2bb5..0af64e7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -101,9 +101,9 @@ AS_IF( + AC_SEARCH_LIBS(jent_version,jitterentropy, + [AM_CONDITIONAL([JITTER], [true]) + AC_DEFINE([HAVE_JITTER],1,[Enable JITTER]) +- AC_CHECK_LIB(jitterentropy, jent_notime_settick, +- [AC_DEFINE([HAVE_JITTER_NOTIME],1,[Enable JITTER_NOTIME])], +- [],-lpthread)], ++ AC_CHECK_LIB(jitterentropy, jent_notime_init, ++ [], ++ [AC_DEFINE([HAVE_JITTER_NOTIME],1, [Enable JITTER_NOTIME])],-lpthread)], + AC_MSG_NOTICE([No Jitterentropy library found]),-lpthread) + ], [AC_MSG_NOTICE([Disabling JITTER entropy source])] + ) From 4ab2946dba9d71dcce9297efc05348c87f304a22 Mon Sep 17 00:00:00 2001 From: Robert Marko Date: Mon, 19 Dec 2022 13:18:38 +0100 Subject: [PATCH 0151/5754] package/hostapd: enable 802.11ax support Hostapd has 802.11ax support, however it is currently disabled by default, so let's enable it as it adds only 2 KB to the overall size of the hostapd package. Signed-off-by: Robert Marko Signed-off-by: Thomas Petazzoni --- package/hostapd/hostapd.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/hostapd/hostapd.mk b/package/hostapd/hostapd.mk index 4420142fbd..8981d9247e 100644 --- a/package/hostapd/hostapd.mk +++ b/package/hostapd/hostapd.mk @@ -53,6 +53,7 @@ endif ifeq ($(BR2_PACKAGE_HOSTAPD_HAS_WIFI_DRIVERS),y) HOSTAPD_CONFIG_ENABLE += \ CONFIG_HS20 \ + CONFIG_IEEE80211AX \ CONFIG_IEEE80211AC \ CONFIG_IEEE80211N \ CONFIG_IEEE80211R \ From e1ecfe135747c28bcb3492e60f0d7aea630ead55 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 12 Dec 2022 11:05:45 -0700 Subject: [PATCH 0152/5754] package/bearssl: fix build with make shuffle mode The make targets in bearssl are missing the $(OBJDIR) target which causes build failures when using make with shuffle mode. Add a patch which adds the missing $(OBJDIR) targets. Fixes: Assembler messages: Fatal error: can't create build/obj/x509_minimal_full.o: No such file or directory make[2]: *** [mk/Rules.mk:1190: build/obj/x509_minimal_full.o] Error 1 shuffle=reverse Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- .../0001-Fix-missing-objdir-dependency.patch | 1252 +++++++++++++++++ 1 file changed, 1252 insertions(+) create mode 100644 package/bearssl/0001-Fix-missing-objdir-dependency.patch diff --git a/package/bearssl/0001-Fix-missing-objdir-dependency.patch b/package/bearssl/0001-Fix-missing-objdir-dependency.patch new file mode 100644 index 0000000000..4d4d9ee705 --- /dev/null +++ b/package/bearssl/0001-Fix-missing-objdir-dependency.patch @@ -0,0 +1,1252 @@ +From 6fddb4056e0b8f72c2602ef82dcd973704354962 Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Mon, 12 Dec 2022 10:12:58 -0700 +Subject: [PATCH] Fix missing objdir dependency. + +Make targets within $(OBJDIR) must depend on the $(OBJDIR) +target. + +Fixes: +Assembler messages: +Fatal error: can't create build/obj/x509_minimal_full.o: No such file or directory +make[2]: *** [mk/Rules.mk:1190: build/obj/x509_minimal_full.o] Error 1 shuffle=reverse + +Signed-off-by: James Hilliard +Cc: Thomas Pornin +Cc: Thomas Pornin +[Upstream status: emailed patch to maintainer] +--- + mk/Rules.mk | 594 +++++++++++++++++++++++++------------------------- + mk/mkrules.sh | 8 +- + 2 files changed, 301 insertions(+), 301 deletions(-) + +diff --git a/mk/Rules.mk b/mk/Rules.mk +index b480bd6..a868977 100644 +--- a/mk/Rules.mk ++++ b/mk/Rules.mk +@@ -358,893 +358,893 @@ $(TESTSPEED): $(BEARSSLLIB) $(OBJTESTSPEED) + $(TESTX509): $(BEARSSLLIB) $(OBJTESTX509) + $(LD) $(LDFLAGS) $(LDOUT)$(TESTX509) $(OBJTESTX509) $(BEARSSLLIB) + +-$(OBJDIR)$Psettings$O: src$Psettings.c $(HEADERSPRIV) ++$(OBJDIR)$Psettings$O: $(OBJDIR) src$Psettings.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Psettings$O src$Psettings.c + +-$(OBJDIR)$Pccm$O: src$Paead$Pccm.c $(HEADERSPRIV) ++$(OBJDIR)$Pccm$O: $(OBJDIR) src$Paead$Pccm.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pccm$O src$Paead$Pccm.c + +-$(OBJDIR)$Peax$O: src$Paead$Peax.c $(HEADERSPRIV) ++$(OBJDIR)$Peax$O: $(OBJDIR) src$Paead$Peax.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Peax$O src$Paead$Peax.c + +-$(OBJDIR)$Pgcm$O: src$Paead$Pgcm.c $(HEADERSPRIV) ++$(OBJDIR)$Pgcm$O: $(OBJDIR) src$Paead$Pgcm.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pgcm$O src$Paead$Pgcm.c + +-$(OBJDIR)$Pccopy$O: src$Pcodec$Pccopy.c $(HEADERSPRIV) ++$(OBJDIR)$Pccopy$O: $(OBJDIR) src$Pcodec$Pccopy.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pccopy$O src$Pcodec$Pccopy.c + +-$(OBJDIR)$Pdec16be$O: src$Pcodec$Pdec16be.c $(HEADERSPRIV) ++$(OBJDIR)$Pdec16be$O: $(OBJDIR) src$Pcodec$Pdec16be.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pdec16be$O src$Pcodec$Pdec16be.c + +-$(OBJDIR)$Pdec16le$O: src$Pcodec$Pdec16le.c $(HEADERSPRIV) ++$(OBJDIR)$Pdec16le$O: $(OBJDIR) src$Pcodec$Pdec16le.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pdec16le$O src$Pcodec$Pdec16le.c + +-$(OBJDIR)$Pdec32be$O: src$Pcodec$Pdec32be.c $(HEADERSPRIV) ++$(OBJDIR)$Pdec32be$O: $(OBJDIR) src$Pcodec$Pdec32be.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pdec32be$O src$Pcodec$Pdec32be.c + +-$(OBJDIR)$Pdec32le$O: src$Pcodec$Pdec32le.c $(HEADERSPRIV) ++$(OBJDIR)$Pdec32le$O: $(OBJDIR) src$Pcodec$Pdec32le.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pdec32le$O src$Pcodec$Pdec32le.c + +-$(OBJDIR)$Pdec64be$O: src$Pcodec$Pdec64be.c $(HEADERSPRIV) ++$(OBJDIR)$Pdec64be$O: $(OBJDIR) src$Pcodec$Pdec64be.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pdec64be$O src$Pcodec$Pdec64be.c + +-$(OBJDIR)$Pdec64le$O: src$Pcodec$Pdec64le.c $(HEADERSPRIV) ++$(OBJDIR)$Pdec64le$O: $(OBJDIR) src$Pcodec$Pdec64le.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pdec64le$O src$Pcodec$Pdec64le.c + +-$(OBJDIR)$Penc16be$O: src$Pcodec$Penc16be.c $(HEADERSPRIV) ++$(OBJDIR)$Penc16be$O: $(OBJDIR) src$Pcodec$Penc16be.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Penc16be$O src$Pcodec$Penc16be.c + +-$(OBJDIR)$Penc16le$O: src$Pcodec$Penc16le.c $(HEADERSPRIV) ++$(OBJDIR)$Penc16le$O: $(OBJDIR) src$Pcodec$Penc16le.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Penc16le$O src$Pcodec$Penc16le.c + +-$(OBJDIR)$Penc32be$O: src$Pcodec$Penc32be.c $(HEADERSPRIV) ++$(OBJDIR)$Penc32be$O: $(OBJDIR) src$Pcodec$Penc32be.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Penc32be$O src$Pcodec$Penc32be.c + +-$(OBJDIR)$Penc32le$O: src$Pcodec$Penc32le.c $(HEADERSPRIV) ++$(OBJDIR)$Penc32le$O: $(OBJDIR) src$Pcodec$Penc32le.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Penc32le$O src$Pcodec$Penc32le.c + +-$(OBJDIR)$Penc64be$O: src$Pcodec$Penc64be.c $(HEADERSPRIV) ++$(OBJDIR)$Penc64be$O: $(OBJDIR) src$Pcodec$Penc64be.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Penc64be$O src$Pcodec$Penc64be.c + +-$(OBJDIR)$Penc64le$O: src$Pcodec$Penc64le.c $(HEADERSPRIV) ++$(OBJDIR)$Penc64le$O: $(OBJDIR) src$Pcodec$Penc64le.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Penc64le$O src$Pcodec$Penc64le.c + +-$(OBJDIR)$Ppemdec$O: src$Pcodec$Ppemdec.c $(HEADERSPRIV) ++$(OBJDIR)$Ppemdec$O: $(OBJDIR) src$Pcodec$Ppemdec.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Ppemdec$O src$Pcodec$Ppemdec.c + +-$(OBJDIR)$Ppemenc$O: src$Pcodec$Ppemenc.c $(HEADERSPRIV) ++$(OBJDIR)$Ppemenc$O: $(OBJDIR) src$Pcodec$Ppemenc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Ppemenc$O src$Pcodec$Ppemenc.c + +-$(OBJDIR)$Pec_all_m15$O: src$Pec$Pec_all_m15.c $(HEADERSPRIV) ++$(OBJDIR)$Pec_all_m15$O: $(OBJDIR) src$Pec$Pec_all_m15.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pec_all_m15$O src$Pec$Pec_all_m15.c + +-$(OBJDIR)$Pec_all_m31$O: src$Pec$Pec_all_m31.c $(HEADERSPRIV) ++$(OBJDIR)$Pec_all_m31$O: $(OBJDIR) src$Pec$Pec_all_m31.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pec_all_m31$O src$Pec$Pec_all_m31.c + +-$(OBJDIR)$Pec_c25519_i15$O: src$Pec$Pec_c25519_i15.c $(HEADERSPRIV) ++$(OBJDIR)$Pec_c25519_i15$O: $(OBJDIR) src$Pec$Pec_c25519_i15.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pec_c25519_i15$O src$Pec$Pec_c25519_i15.c + +-$(OBJDIR)$Pec_c25519_i31$O: src$Pec$Pec_c25519_i31.c $(HEADERSPRIV) ++$(OBJDIR)$Pec_c25519_i31$O: $(OBJDIR) src$Pec$Pec_c25519_i31.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pec_c25519_i31$O src$Pec$Pec_c25519_i31.c + +-$(OBJDIR)$Pec_c25519_m15$O: src$Pec$Pec_c25519_m15.c $(HEADERSPRIV) ++$(OBJDIR)$Pec_c25519_m15$O: $(OBJDIR) src$Pec$Pec_c25519_m15.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pec_c25519_m15$O src$Pec$Pec_c25519_m15.c + +-$(OBJDIR)$Pec_c25519_m31$O: src$Pec$Pec_c25519_m31.c $(HEADERSPRIV) ++$(OBJDIR)$Pec_c25519_m31$O: $(OBJDIR) src$Pec$Pec_c25519_m31.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pec_c25519_m31$O src$Pec$Pec_c25519_m31.c + +-$(OBJDIR)$Pec_curve25519$O: src$Pec$Pec_curve25519.c $(HEADERSPRIV) ++$(OBJDIR)$Pec_curve25519$O: $(OBJDIR) src$Pec$Pec_curve25519.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pec_curve25519$O src$Pec$Pec_curve25519.c + +-$(OBJDIR)$Pec_default$O: src$Pec$Pec_default.c $(HEADERSPRIV) ++$(OBJDIR)$Pec_default$O: $(OBJDIR) src$Pec$Pec_default.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pec_default$O src$Pec$Pec_default.c + +-$(OBJDIR)$Pec_keygen$O: src$Pec$Pec_keygen.c $(HEADERSPRIV) ++$(OBJDIR)$Pec_keygen$O: $(OBJDIR) src$Pec$Pec_keygen.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pec_keygen$O src$Pec$Pec_keygen.c + +-$(OBJDIR)$Pec_p256_m15$O: src$Pec$Pec_p256_m15.c $(HEADERSPRIV) ++$(OBJDIR)$Pec_p256_m15$O: $(OBJDIR) src$Pec$Pec_p256_m15.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pec_p256_m15$O src$Pec$Pec_p256_m15.c + +-$(OBJDIR)$Pec_p256_m31$O: src$Pec$Pec_p256_m31.c $(HEADERSPRIV) ++$(OBJDIR)$Pec_p256_m31$O: $(OBJDIR) src$Pec$Pec_p256_m31.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pec_p256_m31$O src$Pec$Pec_p256_m31.c + +-$(OBJDIR)$Pec_prime_i15$O: src$Pec$Pec_prime_i15.c $(HEADERSPRIV) ++$(OBJDIR)$Pec_prime_i15$O: $(OBJDIR) src$Pec$Pec_prime_i15.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pec_prime_i15$O src$Pec$Pec_prime_i15.c + +-$(OBJDIR)$Pec_prime_i31$O: src$Pec$Pec_prime_i31.c $(HEADERSPRIV) ++$(OBJDIR)$Pec_prime_i31$O: $(OBJDIR) src$Pec$Pec_prime_i31.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pec_prime_i31$O src$Pec$Pec_prime_i31.c + +-$(OBJDIR)$Pec_pubkey$O: src$Pec$Pec_pubkey.c $(HEADERSPRIV) ++$(OBJDIR)$Pec_pubkey$O: $(OBJDIR) src$Pec$Pec_pubkey.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pec_pubkey$O src$Pec$Pec_pubkey.c + +-$(OBJDIR)$Pec_secp256r1$O: src$Pec$Pec_secp256r1.c $(HEADERSPRIV) ++$(OBJDIR)$Pec_secp256r1$O: $(OBJDIR) src$Pec$Pec_secp256r1.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pec_secp256r1$O src$Pec$Pec_secp256r1.c + +-$(OBJDIR)$Pec_secp384r1$O: src$Pec$Pec_secp384r1.c $(HEADERSPRIV) ++$(OBJDIR)$Pec_secp384r1$O: $(OBJDIR) src$Pec$Pec_secp384r1.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pec_secp384r1$O src$Pec$Pec_secp384r1.c + +-$(OBJDIR)$Pec_secp521r1$O: src$Pec$Pec_secp521r1.c $(HEADERSPRIV) ++$(OBJDIR)$Pec_secp521r1$O: $(OBJDIR) src$Pec$Pec_secp521r1.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pec_secp521r1$O src$Pec$Pec_secp521r1.c + +-$(OBJDIR)$Pecdsa_atr$O: src$Pec$Pecdsa_atr.c $(HEADERSPRIV) ++$(OBJDIR)$Pecdsa_atr$O: $(OBJDIR) src$Pec$Pecdsa_atr.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pecdsa_atr$O src$Pec$Pecdsa_atr.c + +-$(OBJDIR)$Pecdsa_default_sign_asn1$O: src$Pec$Pecdsa_default_sign_asn1.c $(HEADERSPRIV) ++$(OBJDIR)$Pecdsa_default_sign_asn1$O: $(OBJDIR) src$Pec$Pecdsa_default_sign_asn1.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pecdsa_default_sign_asn1$O src$Pec$Pecdsa_default_sign_asn1.c + +-$(OBJDIR)$Pecdsa_default_sign_raw$O: src$Pec$Pecdsa_default_sign_raw.c $(HEADERSPRIV) ++$(OBJDIR)$Pecdsa_default_sign_raw$O: $(OBJDIR) src$Pec$Pecdsa_default_sign_raw.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pecdsa_default_sign_raw$O src$Pec$Pecdsa_default_sign_raw.c + +-$(OBJDIR)$Pecdsa_default_vrfy_asn1$O: src$Pec$Pecdsa_default_vrfy_asn1.c $(HEADERSPRIV) ++$(OBJDIR)$Pecdsa_default_vrfy_asn1$O: $(OBJDIR) src$Pec$Pecdsa_default_vrfy_asn1.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pecdsa_default_vrfy_asn1$O src$Pec$Pecdsa_default_vrfy_asn1.c + +-$(OBJDIR)$Pecdsa_default_vrfy_raw$O: src$Pec$Pecdsa_default_vrfy_raw.c $(HEADERSPRIV) ++$(OBJDIR)$Pecdsa_default_vrfy_raw$O: $(OBJDIR) src$Pec$Pecdsa_default_vrfy_raw.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pecdsa_default_vrfy_raw$O src$Pec$Pecdsa_default_vrfy_raw.c + +-$(OBJDIR)$Pecdsa_i15_bits$O: src$Pec$Pecdsa_i15_bits.c $(HEADERSPRIV) ++$(OBJDIR)$Pecdsa_i15_bits$O: $(OBJDIR) src$Pec$Pecdsa_i15_bits.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pecdsa_i15_bits$O src$Pec$Pecdsa_i15_bits.c + +-$(OBJDIR)$Pecdsa_i15_sign_asn1$O: src$Pec$Pecdsa_i15_sign_asn1.c $(HEADERSPRIV) ++$(OBJDIR)$Pecdsa_i15_sign_asn1$O: $(OBJDIR) src$Pec$Pecdsa_i15_sign_asn1.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pecdsa_i15_sign_asn1$O src$Pec$Pecdsa_i15_sign_asn1.c + +-$(OBJDIR)$Pecdsa_i15_sign_raw$O: src$Pec$Pecdsa_i15_sign_raw.c $(HEADERSPRIV) ++$(OBJDIR)$Pecdsa_i15_sign_raw$O: $(OBJDIR) src$Pec$Pecdsa_i15_sign_raw.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pecdsa_i15_sign_raw$O src$Pec$Pecdsa_i15_sign_raw.c + +-$(OBJDIR)$Pecdsa_i15_vrfy_asn1$O: src$Pec$Pecdsa_i15_vrfy_asn1.c $(HEADERSPRIV) ++$(OBJDIR)$Pecdsa_i15_vrfy_asn1$O: $(OBJDIR) src$Pec$Pecdsa_i15_vrfy_asn1.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pecdsa_i15_vrfy_asn1$O src$Pec$Pecdsa_i15_vrfy_asn1.c + +-$(OBJDIR)$Pecdsa_i15_vrfy_raw$O: src$Pec$Pecdsa_i15_vrfy_raw.c $(HEADERSPRIV) ++$(OBJDIR)$Pecdsa_i15_vrfy_raw$O: $(OBJDIR) src$Pec$Pecdsa_i15_vrfy_raw.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pecdsa_i15_vrfy_raw$O src$Pec$Pecdsa_i15_vrfy_raw.c + +-$(OBJDIR)$Pecdsa_i31_bits$O: src$Pec$Pecdsa_i31_bits.c $(HEADERSPRIV) ++$(OBJDIR)$Pecdsa_i31_bits$O: $(OBJDIR) src$Pec$Pecdsa_i31_bits.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pecdsa_i31_bits$O src$Pec$Pecdsa_i31_bits.c + +-$(OBJDIR)$Pecdsa_i31_sign_asn1$O: src$Pec$Pecdsa_i31_sign_asn1.c $(HEADERSPRIV) ++$(OBJDIR)$Pecdsa_i31_sign_asn1$O: $(OBJDIR) src$Pec$Pecdsa_i31_sign_asn1.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pecdsa_i31_sign_asn1$O src$Pec$Pecdsa_i31_sign_asn1.c + +-$(OBJDIR)$Pecdsa_i31_sign_raw$O: src$Pec$Pecdsa_i31_sign_raw.c $(HEADERSPRIV) ++$(OBJDIR)$Pecdsa_i31_sign_raw$O: $(OBJDIR) src$Pec$Pecdsa_i31_sign_raw.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pecdsa_i31_sign_raw$O src$Pec$Pecdsa_i31_sign_raw.c + +-$(OBJDIR)$Pecdsa_i31_vrfy_asn1$O: src$Pec$Pecdsa_i31_vrfy_asn1.c $(HEADERSPRIV) ++$(OBJDIR)$Pecdsa_i31_vrfy_asn1$O: $(OBJDIR) src$Pec$Pecdsa_i31_vrfy_asn1.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pecdsa_i31_vrfy_asn1$O src$Pec$Pecdsa_i31_vrfy_asn1.c + +-$(OBJDIR)$Pecdsa_i31_vrfy_raw$O: src$Pec$Pecdsa_i31_vrfy_raw.c $(HEADERSPRIV) ++$(OBJDIR)$Pecdsa_i31_vrfy_raw$O: $(OBJDIR) src$Pec$Pecdsa_i31_vrfy_raw.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pecdsa_i31_vrfy_raw$O src$Pec$Pecdsa_i31_vrfy_raw.c + +-$(OBJDIR)$Pecdsa_rta$O: src$Pec$Pecdsa_rta.c $(HEADERSPRIV) ++$(OBJDIR)$Pecdsa_rta$O: $(OBJDIR) src$Pec$Pecdsa_rta.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pecdsa_rta$O src$Pec$Pecdsa_rta.c + +-$(OBJDIR)$Pdig_oid$O: src$Phash$Pdig_oid.c $(HEADERSPRIV) ++$(OBJDIR)$Pdig_oid$O: $(OBJDIR) src$Phash$Pdig_oid.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pdig_oid$O src$Phash$Pdig_oid.c + +-$(OBJDIR)$Pdig_size$O: src$Phash$Pdig_size.c $(HEADERSPRIV) ++$(OBJDIR)$Pdig_size$O: $(OBJDIR) src$Phash$Pdig_size.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pdig_size$O src$Phash$Pdig_size.c + +-$(OBJDIR)$Pghash_ctmul$O: src$Phash$Pghash_ctmul.c $(HEADERSPRIV) ++$(OBJDIR)$Pghash_ctmul$O: $(OBJDIR) src$Phash$Pghash_ctmul.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pghash_ctmul$O src$Phash$Pghash_ctmul.c + +-$(OBJDIR)$Pghash_ctmul32$O: src$Phash$Pghash_ctmul32.c $(HEADERSPRIV) ++$(OBJDIR)$Pghash_ctmul32$O: $(OBJDIR) src$Phash$Pghash_ctmul32.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pghash_ctmul32$O src$Phash$Pghash_ctmul32.c + +-$(OBJDIR)$Pghash_ctmul64$O: src$Phash$Pghash_ctmul64.c $(HEADERSPRIV) ++$(OBJDIR)$Pghash_ctmul64$O: $(OBJDIR) src$Phash$Pghash_ctmul64.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pghash_ctmul64$O src$Phash$Pghash_ctmul64.c + +-$(OBJDIR)$Pghash_pclmul$O: src$Phash$Pghash_pclmul.c $(HEADERSPRIV) ++$(OBJDIR)$Pghash_pclmul$O: $(OBJDIR) src$Phash$Pghash_pclmul.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pghash_pclmul$O src$Phash$Pghash_pclmul.c + +-$(OBJDIR)$Pghash_pwr8$O: src$Phash$Pghash_pwr8.c $(HEADERSPRIV) ++$(OBJDIR)$Pghash_pwr8$O: $(OBJDIR) src$Phash$Pghash_pwr8.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pghash_pwr8$O src$Phash$Pghash_pwr8.c + +-$(OBJDIR)$Pmd5$O: src$Phash$Pmd5.c $(HEADERSPRIV) ++$(OBJDIR)$Pmd5$O: $(OBJDIR) src$Phash$Pmd5.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pmd5$O src$Phash$Pmd5.c + +-$(OBJDIR)$Pmd5sha1$O: src$Phash$Pmd5sha1.c $(HEADERSPRIV) ++$(OBJDIR)$Pmd5sha1$O: $(OBJDIR) src$Phash$Pmd5sha1.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pmd5sha1$O src$Phash$Pmd5sha1.c + +-$(OBJDIR)$Pmgf1$O: src$Phash$Pmgf1.c $(HEADERSPRIV) ++$(OBJDIR)$Pmgf1$O: $(OBJDIR) src$Phash$Pmgf1.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pmgf1$O src$Phash$Pmgf1.c + +-$(OBJDIR)$Pmultihash$O: src$Phash$Pmultihash.c $(HEADERSPRIV) ++$(OBJDIR)$Pmultihash$O: $(OBJDIR) src$Phash$Pmultihash.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pmultihash$O src$Phash$Pmultihash.c + +-$(OBJDIR)$Psha1$O: src$Phash$Psha1.c $(HEADERSPRIV) ++$(OBJDIR)$Psha1$O: $(OBJDIR) src$Phash$Psha1.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Psha1$O src$Phash$Psha1.c + +-$(OBJDIR)$Psha2big$O: src$Phash$Psha2big.c $(HEADERSPRIV) ++$(OBJDIR)$Psha2big$O: $(OBJDIR) src$Phash$Psha2big.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Psha2big$O src$Phash$Psha2big.c + +-$(OBJDIR)$Psha2small$O: src$Phash$Psha2small.c $(HEADERSPRIV) ++$(OBJDIR)$Psha2small$O: $(OBJDIR) src$Phash$Psha2small.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Psha2small$O src$Phash$Psha2small.c + +-$(OBJDIR)$Pi15_add$O: src$Pint$Pi15_add.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_add$O: $(OBJDIR) src$Pint$Pi15_add.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_add$O src$Pint$Pi15_add.c + +-$(OBJDIR)$Pi15_bitlen$O: src$Pint$Pi15_bitlen.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_bitlen$O: $(OBJDIR) src$Pint$Pi15_bitlen.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_bitlen$O src$Pint$Pi15_bitlen.c + +-$(OBJDIR)$Pi15_decmod$O: src$Pint$Pi15_decmod.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_decmod$O: $(OBJDIR) src$Pint$Pi15_decmod.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_decmod$O src$Pint$Pi15_decmod.c + +-$(OBJDIR)$Pi15_decode$O: src$Pint$Pi15_decode.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_decode$O: $(OBJDIR) src$Pint$Pi15_decode.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_decode$O src$Pint$Pi15_decode.c + +-$(OBJDIR)$Pi15_decred$O: src$Pint$Pi15_decred.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_decred$O: $(OBJDIR) src$Pint$Pi15_decred.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_decred$O src$Pint$Pi15_decred.c + +-$(OBJDIR)$Pi15_encode$O: src$Pint$Pi15_encode.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_encode$O: $(OBJDIR) src$Pint$Pi15_encode.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_encode$O src$Pint$Pi15_encode.c + +-$(OBJDIR)$Pi15_fmont$O: src$Pint$Pi15_fmont.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_fmont$O: $(OBJDIR) src$Pint$Pi15_fmont.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_fmont$O src$Pint$Pi15_fmont.c + +-$(OBJDIR)$Pi15_iszero$O: src$Pint$Pi15_iszero.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_iszero$O: $(OBJDIR) src$Pint$Pi15_iszero.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_iszero$O src$Pint$Pi15_iszero.c + +-$(OBJDIR)$Pi15_moddiv$O: src$Pint$Pi15_moddiv.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_moddiv$O: $(OBJDIR) src$Pint$Pi15_moddiv.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_moddiv$O src$Pint$Pi15_moddiv.c + +-$(OBJDIR)$Pi15_modpow$O: src$Pint$Pi15_modpow.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_modpow$O: $(OBJDIR) src$Pint$Pi15_modpow.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_modpow$O src$Pint$Pi15_modpow.c + +-$(OBJDIR)$Pi15_modpow2$O: src$Pint$Pi15_modpow2.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_modpow2$O: $(OBJDIR) src$Pint$Pi15_modpow2.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_modpow2$O src$Pint$Pi15_modpow2.c + +-$(OBJDIR)$Pi15_montmul$O: src$Pint$Pi15_montmul.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_montmul$O: $(OBJDIR) src$Pint$Pi15_montmul.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_montmul$O src$Pint$Pi15_montmul.c + +-$(OBJDIR)$Pi15_mulacc$O: src$Pint$Pi15_mulacc.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_mulacc$O: $(OBJDIR) src$Pint$Pi15_mulacc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_mulacc$O src$Pint$Pi15_mulacc.c + +-$(OBJDIR)$Pi15_muladd$O: src$Pint$Pi15_muladd.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_muladd$O: $(OBJDIR) src$Pint$Pi15_muladd.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_muladd$O src$Pint$Pi15_muladd.c + +-$(OBJDIR)$Pi15_ninv15$O: src$Pint$Pi15_ninv15.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_ninv15$O: $(OBJDIR) src$Pint$Pi15_ninv15.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_ninv15$O src$Pint$Pi15_ninv15.c + +-$(OBJDIR)$Pi15_reduce$O: src$Pint$Pi15_reduce.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_reduce$O: $(OBJDIR) src$Pint$Pi15_reduce.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_reduce$O src$Pint$Pi15_reduce.c + +-$(OBJDIR)$Pi15_rshift$O: src$Pint$Pi15_rshift.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_rshift$O: $(OBJDIR) src$Pint$Pi15_rshift.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_rshift$O src$Pint$Pi15_rshift.c + +-$(OBJDIR)$Pi15_sub$O: src$Pint$Pi15_sub.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_sub$O: $(OBJDIR) src$Pint$Pi15_sub.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_sub$O src$Pint$Pi15_sub.c + +-$(OBJDIR)$Pi15_tmont$O: src$Pint$Pi15_tmont.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_tmont$O: $(OBJDIR) src$Pint$Pi15_tmont.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_tmont$O src$Pint$Pi15_tmont.c + +-$(OBJDIR)$Pi31_add$O: src$Pint$Pi31_add.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_add$O: $(OBJDIR) src$Pint$Pi31_add.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_add$O src$Pint$Pi31_add.c + +-$(OBJDIR)$Pi31_bitlen$O: src$Pint$Pi31_bitlen.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_bitlen$O: $(OBJDIR) src$Pint$Pi31_bitlen.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_bitlen$O src$Pint$Pi31_bitlen.c + +-$(OBJDIR)$Pi31_decmod$O: src$Pint$Pi31_decmod.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_decmod$O: $(OBJDIR) src$Pint$Pi31_decmod.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_decmod$O src$Pint$Pi31_decmod.c + +-$(OBJDIR)$Pi31_decode$O: src$Pint$Pi31_decode.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_decode$O: $(OBJDIR) src$Pint$Pi31_decode.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_decode$O src$Pint$Pi31_decode.c + +-$(OBJDIR)$Pi31_decred$O: src$Pint$Pi31_decred.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_decred$O: $(OBJDIR) src$Pint$Pi31_decred.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_decred$O src$Pint$Pi31_decred.c + +-$(OBJDIR)$Pi31_encode$O: src$Pint$Pi31_encode.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_encode$O: $(OBJDIR) src$Pint$Pi31_encode.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_encode$O src$Pint$Pi31_encode.c + +-$(OBJDIR)$Pi31_fmont$O: src$Pint$Pi31_fmont.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_fmont$O: $(OBJDIR) src$Pint$Pi31_fmont.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_fmont$O src$Pint$Pi31_fmont.c + +-$(OBJDIR)$Pi31_iszero$O: src$Pint$Pi31_iszero.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_iszero$O: $(OBJDIR) src$Pint$Pi31_iszero.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_iszero$O src$Pint$Pi31_iszero.c + +-$(OBJDIR)$Pi31_moddiv$O: src$Pint$Pi31_moddiv.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_moddiv$O: $(OBJDIR) src$Pint$Pi31_moddiv.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_moddiv$O src$Pint$Pi31_moddiv.c + +-$(OBJDIR)$Pi31_modpow$O: src$Pint$Pi31_modpow.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_modpow$O: $(OBJDIR) src$Pint$Pi31_modpow.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_modpow$O src$Pint$Pi31_modpow.c + +-$(OBJDIR)$Pi31_modpow2$O: src$Pint$Pi31_modpow2.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_modpow2$O: $(OBJDIR) src$Pint$Pi31_modpow2.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_modpow2$O src$Pint$Pi31_modpow2.c + +-$(OBJDIR)$Pi31_montmul$O: src$Pint$Pi31_montmul.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_montmul$O: $(OBJDIR) src$Pint$Pi31_montmul.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_montmul$O src$Pint$Pi31_montmul.c + +-$(OBJDIR)$Pi31_mulacc$O: src$Pint$Pi31_mulacc.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_mulacc$O: $(OBJDIR) src$Pint$Pi31_mulacc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_mulacc$O src$Pint$Pi31_mulacc.c + +-$(OBJDIR)$Pi31_muladd$O: src$Pint$Pi31_muladd.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_muladd$O: $(OBJDIR) src$Pint$Pi31_muladd.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_muladd$O src$Pint$Pi31_muladd.c + +-$(OBJDIR)$Pi31_ninv31$O: src$Pint$Pi31_ninv31.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_ninv31$O: $(OBJDIR) src$Pint$Pi31_ninv31.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_ninv31$O src$Pint$Pi31_ninv31.c + +-$(OBJDIR)$Pi31_reduce$O: src$Pint$Pi31_reduce.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_reduce$O: $(OBJDIR) src$Pint$Pi31_reduce.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_reduce$O src$Pint$Pi31_reduce.c + +-$(OBJDIR)$Pi31_rshift$O: src$Pint$Pi31_rshift.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_rshift$O: $(OBJDIR) src$Pint$Pi31_rshift.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_rshift$O src$Pint$Pi31_rshift.c + +-$(OBJDIR)$Pi31_sub$O: src$Pint$Pi31_sub.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_sub$O: $(OBJDIR) src$Pint$Pi31_sub.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_sub$O src$Pint$Pi31_sub.c + +-$(OBJDIR)$Pi31_tmont$O: src$Pint$Pi31_tmont.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_tmont$O: $(OBJDIR) src$Pint$Pi31_tmont.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_tmont$O src$Pint$Pi31_tmont.c + +-$(OBJDIR)$Pi32_add$O: src$Pint$Pi32_add.c $(HEADERSPRIV) ++$(OBJDIR)$Pi32_add$O: $(OBJDIR) src$Pint$Pi32_add.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi32_add$O src$Pint$Pi32_add.c + +-$(OBJDIR)$Pi32_bitlen$O: src$Pint$Pi32_bitlen.c $(HEADERSPRIV) ++$(OBJDIR)$Pi32_bitlen$O: $(OBJDIR) src$Pint$Pi32_bitlen.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi32_bitlen$O src$Pint$Pi32_bitlen.c + +-$(OBJDIR)$Pi32_decmod$O: src$Pint$Pi32_decmod.c $(HEADERSPRIV) ++$(OBJDIR)$Pi32_decmod$O: $(OBJDIR) src$Pint$Pi32_decmod.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi32_decmod$O src$Pint$Pi32_decmod.c + +-$(OBJDIR)$Pi32_decode$O: src$Pint$Pi32_decode.c $(HEADERSPRIV) ++$(OBJDIR)$Pi32_decode$O: $(OBJDIR) src$Pint$Pi32_decode.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi32_decode$O src$Pint$Pi32_decode.c + +-$(OBJDIR)$Pi32_decred$O: src$Pint$Pi32_decred.c $(HEADERSPRIV) ++$(OBJDIR)$Pi32_decred$O: $(OBJDIR) src$Pint$Pi32_decred.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi32_decred$O src$Pint$Pi32_decred.c + +-$(OBJDIR)$Pi32_div32$O: src$Pint$Pi32_div32.c $(HEADERSPRIV) ++$(OBJDIR)$Pi32_div32$O: $(OBJDIR) src$Pint$Pi32_div32.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi32_div32$O src$Pint$Pi32_div32.c + +-$(OBJDIR)$Pi32_encode$O: src$Pint$Pi32_encode.c $(HEADERSPRIV) ++$(OBJDIR)$Pi32_encode$O: $(OBJDIR) src$Pint$Pi32_encode.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi32_encode$O src$Pint$Pi32_encode.c + +-$(OBJDIR)$Pi32_fmont$O: src$Pint$Pi32_fmont.c $(HEADERSPRIV) ++$(OBJDIR)$Pi32_fmont$O: $(OBJDIR) src$Pint$Pi32_fmont.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi32_fmont$O src$Pint$Pi32_fmont.c + +-$(OBJDIR)$Pi32_iszero$O: src$Pint$Pi32_iszero.c $(HEADERSPRIV) ++$(OBJDIR)$Pi32_iszero$O: $(OBJDIR) src$Pint$Pi32_iszero.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi32_iszero$O src$Pint$Pi32_iszero.c + +-$(OBJDIR)$Pi32_modpow$O: src$Pint$Pi32_modpow.c $(HEADERSPRIV) ++$(OBJDIR)$Pi32_modpow$O: $(OBJDIR) src$Pint$Pi32_modpow.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi32_modpow$O src$Pint$Pi32_modpow.c + +-$(OBJDIR)$Pi32_montmul$O: src$Pint$Pi32_montmul.c $(HEADERSPRIV) ++$(OBJDIR)$Pi32_montmul$O: $(OBJDIR) src$Pint$Pi32_montmul.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi32_montmul$O src$Pint$Pi32_montmul.c + +-$(OBJDIR)$Pi32_mulacc$O: src$Pint$Pi32_mulacc.c $(HEADERSPRIV) ++$(OBJDIR)$Pi32_mulacc$O: $(OBJDIR) src$Pint$Pi32_mulacc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi32_mulacc$O src$Pint$Pi32_mulacc.c + +-$(OBJDIR)$Pi32_muladd$O: src$Pint$Pi32_muladd.c $(HEADERSPRIV) ++$(OBJDIR)$Pi32_muladd$O: $(OBJDIR) src$Pint$Pi32_muladd.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi32_muladd$O src$Pint$Pi32_muladd.c + +-$(OBJDIR)$Pi32_ninv32$O: src$Pint$Pi32_ninv32.c $(HEADERSPRIV) ++$(OBJDIR)$Pi32_ninv32$O: $(OBJDIR) src$Pint$Pi32_ninv32.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi32_ninv32$O src$Pint$Pi32_ninv32.c + +-$(OBJDIR)$Pi32_reduce$O: src$Pint$Pi32_reduce.c $(HEADERSPRIV) ++$(OBJDIR)$Pi32_reduce$O: $(OBJDIR) src$Pint$Pi32_reduce.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi32_reduce$O src$Pint$Pi32_reduce.c + +-$(OBJDIR)$Pi32_sub$O: src$Pint$Pi32_sub.c $(HEADERSPRIV) ++$(OBJDIR)$Pi32_sub$O: $(OBJDIR) src$Pint$Pi32_sub.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi32_sub$O src$Pint$Pi32_sub.c + +-$(OBJDIR)$Pi32_tmont$O: src$Pint$Pi32_tmont.c $(HEADERSPRIV) ++$(OBJDIR)$Pi32_tmont$O: $(OBJDIR) src$Pint$Pi32_tmont.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi32_tmont$O src$Pint$Pi32_tmont.c + +-$(OBJDIR)$Pi62_modpow2$O: src$Pint$Pi62_modpow2.c $(HEADERSPRIV) ++$(OBJDIR)$Pi62_modpow2$O: $(OBJDIR) src$Pint$Pi62_modpow2.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi62_modpow2$O src$Pint$Pi62_modpow2.c + +-$(OBJDIR)$Phkdf$O: src$Pkdf$Phkdf.c $(HEADERSPRIV) ++$(OBJDIR)$Phkdf$O: $(OBJDIR) src$Pkdf$Phkdf.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Phkdf$O src$Pkdf$Phkdf.c + +-$(OBJDIR)$Phmac$O: src$Pmac$Phmac.c $(HEADERSPRIV) ++$(OBJDIR)$Phmac$O: $(OBJDIR) src$Pmac$Phmac.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Phmac$O src$Pmac$Phmac.c + +-$(OBJDIR)$Phmac_ct$O: src$Pmac$Phmac_ct.c $(HEADERSPRIV) ++$(OBJDIR)$Phmac_ct$O: $(OBJDIR) src$Pmac$Phmac_ct.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Phmac_ct$O src$Pmac$Phmac_ct.c + +-$(OBJDIR)$Paesctr_drbg$O: src$Prand$Paesctr_drbg.c $(HEADERSPRIV) ++$(OBJDIR)$Paesctr_drbg$O: $(OBJDIR) src$Prand$Paesctr_drbg.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paesctr_drbg$O src$Prand$Paesctr_drbg.c + +-$(OBJDIR)$Phmac_drbg$O: src$Prand$Phmac_drbg.c $(HEADERSPRIV) ++$(OBJDIR)$Phmac_drbg$O: $(OBJDIR) src$Prand$Phmac_drbg.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Phmac_drbg$O src$Prand$Phmac_drbg.c + +-$(OBJDIR)$Psysrng$O: src$Prand$Psysrng.c $(HEADERSPRIV) ++$(OBJDIR)$Psysrng$O: $(OBJDIR) src$Prand$Psysrng.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Psysrng$O src$Prand$Psysrng.c + +-$(OBJDIR)$Prsa_default_keygen$O: src$Prsa$Prsa_default_keygen.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_default_keygen$O: $(OBJDIR) src$Prsa$Prsa_default_keygen.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_default_keygen$O src$Prsa$Prsa_default_keygen.c + +-$(OBJDIR)$Prsa_default_modulus$O: src$Prsa$Prsa_default_modulus.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_default_modulus$O: $(OBJDIR) src$Prsa$Prsa_default_modulus.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_default_modulus$O src$Prsa$Prsa_default_modulus.c + +-$(OBJDIR)$Prsa_default_oaep_decrypt$O: src$Prsa$Prsa_default_oaep_decrypt.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_default_oaep_decrypt$O: $(OBJDIR) src$Prsa$Prsa_default_oaep_decrypt.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_default_oaep_decrypt$O src$Prsa$Prsa_default_oaep_decrypt.c + +-$(OBJDIR)$Prsa_default_oaep_encrypt$O: src$Prsa$Prsa_default_oaep_encrypt.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_default_oaep_encrypt$O: $(OBJDIR) src$Prsa$Prsa_default_oaep_encrypt.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_default_oaep_encrypt$O src$Prsa$Prsa_default_oaep_encrypt.c + +-$(OBJDIR)$Prsa_default_pkcs1_sign$O: src$Prsa$Prsa_default_pkcs1_sign.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_default_pkcs1_sign$O: $(OBJDIR) src$Prsa$Prsa_default_pkcs1_sign.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_default_pkcs1_sign$O src$Prsa$Prsa_default_pkcs1_sign.c + +-$(OBJDIR)$Prsa_default_pkcs1_vrfy$O: src$Prsa$Prsa_default_pkcs1_vrfy.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_default_pkcs1_vrfy$O: $(OBJDIR) src$Prsa$Prsa_default_pkcs1_vrfy.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_default_pkcs1_vrfy$O src$Prsa$Prsa_default_pkcs1_vrfy.c + +-$(OBJDIR)$Prsa_default_priv$O: src$Prsa$Prsa_default_priv.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_default_priv$O: $(OBJDIR) src$Prsa$Prsa_default_priv.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_default_priv$O src$Prsa$Prsa_default_priv.c + +-$(OBJDIR)$Prsa_default_privexp$O: src$Prsa$Prsa_default_privexp.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_default_privexp$O: $(OBJDIR) src$Prsa$Prsa_default_privexp.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_default_privexp$O src$Prsa$Prsa_default_privexp.c + +-$(OBJDIR)$Prsa_default_pub$O: src$Prsa$Prsa_default_pub.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_default_pub$O: $(OBJDIR) src$Prsa$Prsa_default_pub.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_default_pub$O src$Prsa$Prsa_default_pub.c + +-$(OBJDIR)$Prsa_default_pubexp$O: src$Prsa$Prsa_default_pubexp.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_default_pubexp$O: $(OBJDIR) src$Prsa$Prsa_default_pubexp.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_default_pubexp$O src$Prsa$Prsa_default_pubexp.c + +-$(OBJDIR)$Prsa_i15_keygen$O: src$Prsa$Prsa_i15_keygen.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i15_keygen$O: $(OBJDIR) src$Prsa$Prsa_i15_keygen.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i15_keygen$O src$Prsa$Prsa_i15_keygen.c + +-$(OBJDIR)$Prsa_i15_modulus$O: src$Prsa$Prsa_i15_modulus.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i15_modulus$O: $(OBJDIR) src$Prsa$Prsa_i15_modulus.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i15_modulus$O src$Prsa$Prsa_i15_modulus.c + +-$(OBJDIR)$Prsa_i15_oaep_decrypt$O: src$Prsa$Prsa_i15_oaep_decrypt.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i15_oaep_decrypt$O: $(OBJDIR) src$Prsa$Prsa_i15_oaep_decrypt.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i15_oaep_decrypt$O src$Prsa$Prsa_i15_oaep_decrypt.c + +-$(OBJDIR)$Prsa_i15_oaep_encrypt$O: src$Prsa$Prsa_i15_oaep_encrypt.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i15_oaep_encrypt$O: $(OBJDIR) src$Prsa$Prsa_i15_oaep_encrypt.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i15_oaep_encrypt$O src$Prsa$Prsa_i15_oaep_encrypt.c + +-$(OBJDIR)$Prsa_i15_pkcs1_sign$O: src$Prsa$Prsa_i15_pkcs1_sign.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i15_pkcs1_sign$O: $(OBJDIR) src$Prsa$Prsa_i15_pkcs1_sign.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i15_pkcs1_sign$O src$Prsa$Prsa_i15_pkcs1_sign.c + +-$(OBJDIR)$Prsa_i15_pkcs1_vrfy$O: src$Prsa$Prsa_i15_pkcs1_vrfy.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i15_pkcs1_vrfy$O: $(OBJDIR) src$Prsa$Prsa_i15_pkcs1_vrfy.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i15_pkcs1_vrfy$O src$Prsa$Prsa_i15_pkcs1_vrfy.c + +-$(OBJDIR)$Prsa_i15_priv$O: src$Prsa$Prsa_i15_priv.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i15_priv$O: $(OBJDIR) src$Prsa$Prsa_i15_priv.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i15_priv$O src$Prsa$Prsa_i15_priv.c + +-$(OBJDIR)$Prsa_i15_privexp$O: src$Prsa$Prsa_i15_privexp.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i15_privexp$O: $(OBJDIR) src$Prsa$Prsa_i15_privexp.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i15_privexp$O src$Prsa$Prsa_i15_privexp.c + +-$(OBJDIR)$Prsa_i15_pub$O: src$Prsa$Prsa_i15_pub.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i15_pub$O: $(OBJDIR) src$Prsa$Prsa_i15_pub.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i15_pub$O src$Prsa$Prsa_i15_pub.c + +-$(OBJDIR)$Prsa_i15_pubexp$O: src$Prsa$Prsa_i15_pubexp.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i15_pubexp$O: $(OBJDIR) src$Prsa$Prsa_i15_pubexp.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i15_pubexp$O src$Prsa$Prsa_i15_pubexp.c + +-$(OBJDIR)$Prsa_i31_keygen$O: src$Prsa$Prsa_i31_keygen.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i31_keygen$O: $(OBJDIR) src$Prsa$Prsa_i31_keygen.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i31_keygen$O src$Prsa$Prsa_i31_keygen.c + +-$(OBJDIR)$Prsa_i31_keygen_inner$O: src$Prsa$Prsa_i31_keygen_inner.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i31_keygen_inner$O: $(OBJDIR) src$Prsa$Prsa_i31_keygen_inner.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i31_keygen_inner$O src$Prsa$Prsa_i31_keygen_inner.c + +-$(OBJDIR)$Prsa_i31_modulus$O: src$Prsa$Prsa_i31_modulus.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i31_modulus$O: $(OBJDIR) src$Prsa$Prsa_i31_modulus.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i31_modulus$O src$Prsa$Prsa_i31_modulus.c + +-$(OBJDIR)$Prsa_i31_oaep_decrypt$O: src$Prsa$Prsa_i31_oaep_decrypt.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i31_oaep_decrypt$O: $(OBJDIR) src$Prsa$Prsa_i31_oaep_decrypt.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i31_oaep_decrypt$O src$Prsa$Prsa_i31_oaep_decrypt.c + +-$(OBJDIR)$Prsa_i31_oaep_encrypt$O: src$Prsa$Prsa_i31_oaep_encrypt.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i31_oaep_encrypt$O: $(OBJDIR) src$Prsa$Prsa_i31_oaep_encrypt.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i31_oaep_encrypt$O src$Prsa$Prsa_i31_oaep_encrypt.c + +-$(OBJDIR)$Prsa_i31_pkcs1_sign$O: src$Prsa$Prsa_i31_pkcs1_sign.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i31_pkcs1_sign$O: $(OBJDIR) src$Prsa$Prsa_i31_pkcs1_sign.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i31_pkcs1_sign$O src$Prsa$Prsa_i31_pkcs1_sign.c + +-$(OBJDIR)$Prsa_i31_pkcs1_vrfy$O: src$Prsa$Prsa_i31_pkcs1_vrfy.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i31_pkcs1_vrfy$O: $(OBJDIR) src$Prsa$Prsa_i31_pkcs1_vrfy.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i31_pkcs1_vrfy$O src$Prsa$Prsa_i31_pkcs1_vrfy.c + +-$(OBJDIR)$Prsa_i31_priv$O: src$Prsa$Prsa_i31_priv.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i31_priv$O: $(OBJDIR) src$Prsa$Prsa_i31_priv.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i31_priv$O src$Prsa$Prsa_i31_priv.c + +-$(OBJDIR)$Prsa_i31_privexp$O: src$Prsa$Prsa_i31_privexp.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i31_privexp$O: $(OBJDIR) src$Prsa$Prsa_i31_privexp.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i31_privexp$O src$Prsa$Prsa_i31_privexp.c + +-$(OBJDIR)$Prsa_i31_pub$O: src$Prsa$Prsa_i31_pub.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i31_pub$O: $(OBJDIR) src$Prsa$Prsa_i31_pub.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i31_pub$O src$Prsa$Prsa_i31_pub.c + +-$(OBJDIR)$Prsa_i31_pubexp$O: src$Prsa$Prsa_i31_pubexp.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i31_pubexp$O: $(OBJDIR) src$Prsa$Prsa_i31_pubexp.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i31_pubexp$O src$Prsa$Prsa_i31_pubexp.c + +-$(OBJDIR)$Prsa_i32_oaep_decrypt$O: src$Prsa$Prsa_i32_oaep_decrypt.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i32_oaep_decrypt$O: $(OBJDIR) src$Prsa$Prsa_i32_oaep_decrypt.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i32_oaep_decrypt$O src$Prsa$Prsa_i32_oaep_decrypt.c + +-$(OBJDIR)$Prsa_i32_oaep_encrypt$O: src$Prsa$Prsa_i32_oaep_encrypt.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i32_oaep_encrypt$O: $(OBJDIR) src$Prsa$Prsa_i32_oaep_encrypt.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i32_oaep_encrypt$O src$Prsa$Prsa_i32_oaep_encrypt.c + +-$(OBJDIR)$Prsa_i32_pkcs1_sign$O: src$Prsa$Prsa_i32_pkcs1_sign.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i32_pkcs1_sign$O: $(OBJDIR) src$Prsa$Prsa_i32_pkcs1_sign.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i32_pkcs1_sign$O src$Prsa$Prsa_i32_pkcs1_sign.c + +-$(OBJDIR)$Prsa_i32_pkcs1_vrfy$O: src$Prsa$Prsa_i32_pkcs1_vrfy.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i32_pkcs1_vrfy$O: $(OBJDIR) src$Prsa$Prsa_i32_pkcs1_vrfy.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i32_pkcs1_vrfy$O src$Prsa$Prsa_i32_pkcs1_vrfy.c + +-$(OBJDIR)$Prsa_i32_priv$O: src$Prsa$Prsa_i32_priv.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i32_priv$O: $(OBJDIR) src$Prsa$Prsa_i32_priv.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i32_priv$O src$Prsa$Prsa_i32_priv.c + +-$(OBJDIR)$Prsa_i32_pub$O: src$Prsa$Prsa_i32_pub.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i32_pub$O: $(OBJDIR) src$Prsa$Prsa_i32_pub.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i32_pub$O src$Prsa$Prsa_i32_pub.c + +-$(OBJDIR)$Prsa_i62_keygen$O: src$Prsa$Prsa_i62_keygen.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i62_keygen$O: $(OBJDIR) src$Prsa$Prsa_i62_keygen.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i62_keygen$O src$Prsa$Prsa_i62_keygen.c + +-$(OBJDIR)$Prsa_i62_oaep_decrypt$O: src$Prsa$Prsa_i62_oaep_decrypt.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i62_oaep_decrypt$O: $(OBJDIR) src$Prsa$Prsa_i62_oaep_decrypt.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i62_oaep_decrypt$O src$Prsa$Prsa_i62_oaep_decrypt.c + +-$(OBJDIR)$Prsa_i62_oaep_encrypt$O: src$Prsa$Prsa_i62_oaep_encrypt.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i62_oaep_encrypt$O: $(OBJDIR) src$Prsa$Prsa_i62_oaep_encrypt.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i62_oaep_encrypt$O src$Prsa$Prsa_i62_oaep_encrypt.c + +-$(OBJDIR)$Prsa_i62_pkcs1_sign$O: src$Prsa$Prsa_i62_pkcs1_sign.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i62_pkcs1_sign$O: $(OBJDIR) src$Prsa$Prsa_i62_pkcs1_sign.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i62_pkcs1_sign$O src$Prsa$Prsa_i62_pkcs1_sign.c + +-$(OBJDIR)$Prsa_i62_pkcs1_vrfy$O: src$Prsa$Prsa_i62_pkcs1_vrfy.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i62_pkcs1_vrfy$O: $(OBJDIR) src$Prsa$Prsa_i62_pkcs1_vrfy.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i62_pkcs1_vrfy$O src$Prsa$Prsa_i62_pkcs1_vrfy.c + +-$(OBJDIR)$Prsa_i62_priv$O: src$Prsa$Prsa_i62_priv.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i62_priv$O: $(OBJDIR) src$Prsa$Prsa_i62_priv.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i62_priv$O src$Prsa$Prsa_i62_priv.c + +-$(OBJDIR)$Prsa_i62_pub$O: src$Prsa$Prsa_i62_pub.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i62_pub$O: $(OBJDIR) src$Prsa$Prsa_i62_pub.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i62_pub$O src$Prsa$Prsa_i62_pub.c + +-$(OBJDIR)$Prsa_oaep_pad$O: src$Prsa$Prsa_oaep_pad.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_oaep_pad$O: $(OBJDIR) src$Prsa$Prsa_oaep_pad.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_oaep_pad$O src$Prsa$Prsa_oaep_pad.c + +-$(OBJDIR)$Prsa_oaep_unpad$O: src$Prsa$Prsa_oaep_unpad.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_oaep_unpad$O: $(OBJDIR) src$Prsa$Prsa_oaep_unpad.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_oaep_unpad$O src$Prsa$Prsa_oaep_unpad.c + +-$(OBJDIR)$Prsa_pkcs1_sig_pad$O: src$Prsa$Prsa_pkcs1_sig_pad.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_pkcs1_sig_pad$O: $(OBJDIR) src$Prsa$Prsa_pkcs1_sig_pad.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_pkcs1_sig_pad$O src$Prsa$Prsa_pkcs1_sig_pad.c + +-$(OBJDIR)$Prsa_pkcs1_sig_unpad$O: src$Prsa$Prsa_pkcs1_sig_unpad.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_pkcs1_sig_unpad$O: $(OBJDIR) src$Prsa$Prsa_pkcs1_sig_unpad.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_pkcs1_sig_unpad$O src$Prsa$Prsa_pkcs1_sig_unpad.c + +-$(OBJDIR)$Prsa_ssl_decrypt$O: src$Prsa$Prsa_ssl_decrypt.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_ssl_decrypt$O: $(OBJDIR) src$Prsa$Prsa_ssl_decrypt.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_ssl_decrypt$O src$Prsa$Prsa_ssl_decrypt.c + +-$(OBJDIR)$Pprf$O: src$Pssl$Pprf.c $(HEADERSPRIV) ++$(OBJDIR)$Pprf$O: $(OBJDIR) src$Pssl$Pprf.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pprf$O src$Pssl$Pprf.c + +-$(OBJDIR)$Pprf_md5sha1$O: src$Pssl$Pprf_md5sha1.c $(HEADERSPRIV) ++$(OBJDIR)$Pprf_md5sha1$O: $(OBJDIR) src$Pssl$Pprf_md5sha1.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pprf_md5sha1$O src$Pssl$Pprf_md5sha1.c + +-$(OBJDIR)$Pprf_sha256$O: src$Pssl$Pprf_sha256.c $(HEADERSPRIV) ++$(OBJDIR)$Pprf_sha256$O: $(OBJDIR) src$Pssl$Pprf_sha256.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pprf_sha256$O src$Pssl$Pprf_sha256.c + +-$(OBJDIR)$Pprf_sha384$O: src$Pssl$Pprf_sha384.c $(HEADERSPRIV) ++$(OBJDIR)$Pprf_sha384$O: $(OBJDIR) src$Pssl$Pprf_sha384.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pprf_sha384$O src$Pssl$Pprf_sha384.c + +-$(OBJDIR)$Pssl_ccert_single_ec$O: src$Pssl$Pssl_ccert_single_ec.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_ccert_single_ec$O: $(OBJDIR) src$Pssl$Pssl_ccert_single_ec.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_ccert_single_ec$O src$Pssl$Pssl_ccert_single_ec.c + +-$(OBJDIR)$Pssl_ccert_single_rsa$O: src$Pssl$Pssl_ccert_single_rsa.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_ccert_single_rsa$O: $(OBJDIR) src$Pssl$Pssl_ccert_single_rsa.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_ccert_single_rsa$O src$Pssl$Pssl_ccert_single_rsa.c + +-$(OBJDIR)$Pssl_client$O: src$Pssl$Pssl_client.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_client$O: $(OBJDIR) src$Pssl$Pssl_client.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_client$O src$Pssl$Pssl_client.c + +-$(OBJDIR)$Pssl_client_default_rsapub$O: src$Pssl$Pssl_client_default_rsapub.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_client_default_rsapub$O: $(OBJDIR) src$Pssl$Pssl_client_default_rsapub.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_client_default_rsapub$O src$Pssl$Pssl_client_default_rsapub.c + +-$(OBJDIR)$Pssl_client_full$O: src$Pssl$Pssl_client_full.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_client_full$O: $(OBJDIR) src$Pssl$Pssl_client_full.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_client_full$O src$Pssl$Pssl_client_full.c + +-$(OBJDIR)$Pssl_engine$O: src$Pssl$Pssl_engine.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_engine$O: $(OBJDIR) src$Pssl$Pssl_engine.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_engine$O src$Pssl$Pssl_engine.c + +-$(OBJDIR)$Pssl_engine_default_aescbc$O: src$Pssl$Pssl_engine_default_aescbc.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_engine_default_aescbc$O: $(OBJDIR) src$Pssl$Pssl_engine_default_aescbc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_engine_default_aescbc$O src$Pssl$Pssl_engine_default_aescbc.c + +-$(OBJDIR)$Pssl_engine_default_aesccm$O: src$Pssl$Pssl_engine_default_aesccm.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_engine_default_aesccm$O: $(OBJDIR) src$Pssl$Pssl_engine_default_aesccm.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_engine_default_aesccm$O src$Pssl$Pssl_engine_default_aesccm.c + +-$(OBJDIR)$Pssl_engine_default_aesgcm$O: src$Pssl$Pssl_engine_default_aesgcm.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_engine_default_aesgcm$O: $(OBJDIR) src$Pssl$Pssl_engine_default_aesgcm.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_engine_default_aesgcm$O src$Pssl$Pssl_engine_default_aesgcm.c + +-$(OBJDIR)$Pssl_engine_default_chapol$O: src$Pssl$Pssl_engine_default_chapol.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_engine_default_chapol$O: $(OBJDIR) src$Pssl$Pssl_engine_default_chapol.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_engine_default_chapol$O src$Pssl$Pssl_engine_default_chapol.c + +-$(OBJDIR)$Pssl_engine_default_descbc$O: src$Pssl$Pssl_engine_default_descbc.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_engine_default_descbc$O: $(OBJDIR) src$Pssl$Pssl_engine_default_descbc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_engine_default_descbc$O src$Pssl$Pssl_engine_default_descbc.c + +-$(OBJDIR)$Pssl_engine_default_ec$O: src$Pssl$Pssl_engine_default_ec.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_engine_default_ec$O: $(OBJDIR) src$Pssl$Pssl_engine_default_ec.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_engine_default_ec$O src$Pssl$Pssl_engine_default_ec.c + +-$(OBJDIR)$Pssl_engine_default_ecdsa$O: src$Pssl$Pssl_engine_default_ecdsa.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_engine_default_ecdsa$O: $(OBJDIR) src$Pssl$Pssl_engine_default_ecdsa.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_engine_default_ecdsa$O src$Pssl$Pssl_engine_default_ecdsa.c + +-$(OBJDIR)$Pssl_engine_default_rsavrfy$O: src$Pssl$Pssl_engine_default_rsavrfy.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_engine_default_rsavrfy$O: $(OBJDIR) src$Pssl$Pssl_engine_default_rsavrfy.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_engine_default_rsavrfy$O src$Pssl$Pssl_engine_default_rsavrfy.c + +-$(OBJDIR)$Pssl_hashes$O: src$Pssl$Pssl_hashes.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_hashes$O: $(OBJDIR) src$Pssl$Pssl_hashes.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_hashes$O src$Pssl$Pssl_hashes.c + +-$(OBJDIR)$Pssl_hs_client$O: src$Pssl$Pssl_hs_client.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_hs_client$O: $(OBJDIR) src$Pssl$Pssl_hs_client.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_hs_client$O src$Pssl$Pssl_hs_client.c + +-$(OBJDIR)$Pssl_hs_server$O: src$Pssl$Pssl_hs_server.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_hs_server$O: $(OBJDIR) src$Pssl$Pssl_hs_server.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_hs_server$O src$Pssl$Pssl_hs_server.c + +-$(OBJDIR)$Pssl_io$O: src$Pssl$Pssl_io.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_io$O: $(OBJDIR) src$Pssl$Pssl_io.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_io$O src$Pssl$Pssl_io.c + +-$(OBJDIR)$Pssl_keyexport$O: src$Pssl$Pssl_keyexport.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_keyexport$O: $(OBJDIR) src$Pssl$Pssl_keyexport.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_keyexport$O src$Pssl$Pssl_keyexport.c + +-$(OBJDIR)$Pssl_lru$O: src$Pssl$Pssl_lru.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_lru$O: $(OBJDIR) src$Pssl$Pssl_lru.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_lru$O src$Pssl$Pssl_lru.c + +-$(OBJDIR)$Pssl_rec_cbc$O: src$Pssl$Pssl_rec_cbc.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_rec_cbc$O: $(OBJDIR) src$Pssl$Pssl_rec_cbc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_rec_cbc$O src$Pssl$Pssl_rec_cbc.c + +-$(OBJDIR)$Pssl_rec_ccm$O: src$Pssl$Pssl_rec_ccm.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_rec_ccm$O: $(OBJDIR) src$Pssl$Pssl_rec_ccm.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_rec_ccm$O src$Pssl$Pssl_rec_ccm.c + +-$(OBJDIR)$Pssl_rec_chapol$O: src$Pssl$Pssl_rec_chapol.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_rec_chapol$O: $(OBJDIR) src$Pssl$Pssl_rec_chapol.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_rec_chapol$O src$Pssl$Pssl_rec_chapol.c + +-$(OBJDIR)$Pssl_rec_gcm$O: src$Pssl$Pssl_rec_gcm.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_rec_gcm$O: $(OBJDIR) src$Pssl$Pssl_rec_gcm.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_rec_gcm$O src$Pssl$Pssl_rec_gcm.c + +-$(OBJDIR)$Pssl_scert_single_ec$O: src$Pssl$Pssl_scert_single_ec.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_scert_single_ec$O: $(OBJDIR) src$Pssl$Pssl_scert_single_ec.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_scert_single_ec$O src$Pssl$Pssl_scert_single_ec.c + +-$(OBJDIR)$Pssl_scert_single_rsa$O: src$Pssl$Pssl_scert_single_rsa.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_scert_single_rsa$O: $(OBJDIR) src$Pssl$Pssl_scert_single_rsa.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_scert_single_rsa$O src$Pssl$Pssl_scert_single_rsa.c + +-$(OBJDIR)$Pssl_server$O: src$Pssl$Pssl_server.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_server$O: $(OBJDIR) src$Pssl$Pssl_server.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_server$O src$Pssl$Pssl_server.c + +-$(OBJDIR)$Pssl_server_full_ec$O: src$Pssl$Pssl_server_full_ec.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_server_full_ec$O: $(OBJDIR) src$Pssl$Pssl_server_full_ec.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_server_full_ec$O src$Pssl$Pssl_server_full_ec.c + +-$(OBJDIR)$Pssl_server_full_rsa$O: src$Pssl$Pssl_server_full_rsa.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_server_full_rsa$O: $(OBJDIR) src$Pssl$Pssl_server_full_rsa.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_server_full_rsa$O src$Pssl$Pssl_server_full_rsa.c + +-$(OBJDIR)$Pssl_server_mine2c$O: src$Pssl$Pssl_server_mine2c.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_server_mine2c$O: $(OBJDIR) src$Pssl$Pssl_server_mine2c.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_server_mine2c$O src$Pssl$Pssl_server_mine2c.c + +-$(OBJDIR)$Pssl_server_mine2g$O: src$Pssl$Pssl_server_mine2g.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_server_mine2g$O: $(OBJDIR) src$Pssl$Pssl_server_mine2g.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_server_mine2g$O src$Pssl$Pssl_server_mine2g.c + +-$(OBJDIR)$Pssl_server_minf2c$O: src$Pssl$Pssl_server_minf2c.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_server_minf2c$O: $(OBJDIR) src$Pssl$Pssl_server_minf2c.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_server_minf2c$O src$Pssl$Pssl_server_minf2c.c + +-$(OBJDIR)$Pssl_server_minf2g$O: src$Pssl$Pssl_server_minf2g.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_server_minf2g$O: $(OBJDIR) src$Pssl$Pssl_server_minf2g.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_server_minf2g$O src$Pssl$Pssl_server_minf2g.c + +-$(OBJDIR)$Pssl_server_minr2g$O: src$Pssl$Pssl_server_minr2g.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_server_minr2g$O: $(OBJDIR) src$Pssl$Pssl_server_minr2g.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_server_minr2g$O src$Pssl$Pssl_server_minr2g.c + +-$(OBJDIR)$Pssl_server_minu2g$O: src$Pssl$Pssl_server_minu2g.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_server_minu2g$O: $(OBJDIR) src$Pssl$Pssl_server_minu2g.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_server_minu2g$O src$Pssl$Pssl_server_minu2g.c + +-$(OBJDIR)$Pssl_server_minv2g$O: src$Pssl$Pssl_server_minv2g.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_server_minv2g$O: $(OBJDIR) src$Pssl$Pssl_server_minv2g.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_server_minv2g$O src$Pssl$Pssl_server_minv2g.c + +-$(OBJDIR)$Paes_big_cbcdec$O: src$Psymcipher$Paes_big_cbcdec.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_big_cbcdec$O: $(OBJDIR) src$Psymcipher$Paes_big_cbcdec.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_big_cbcdec$O src$Psymcipher$Paes_big_cbcdec.c + +-$(OBJDIR)$Paes_big_cbcenc$O: src$Psymcipher$Paes_big_cbcenc.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_big_cbcenc$O: $(OBJDIR) src$Psymcipher$Paes_big_cbcenc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_big_cbcenc$O src$Psymcipher$Paes_big_cbcenc.c + +-$(OBJDIR)$Paes_big_ctr$O: src$Psymcipher$Paes_big_ctr.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_big_ctr$O: $(OBJDIR) src$Psymcipher$Paes_big_ctr.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_big_ctr$O src$Psymcipher$Paes_big_ctr.c + +-$(OBJDIR)$Paes_big_ctrcbc$O: src$Psymcipher$Paes_big_ctrcbc.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_big_ctrcbc$O: $(OBJDIR) src$Psymcipher$Paes_big_ctrcbc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_big_ctrcbc$O src$Psymcipher$Paes_big_ctrcbc.c + +-$(OBJDIR)$Paes_big_dec$O: src$Psymcipher$Paes_big_dec.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_big_dec$O: $(OBJDIR) src$Psymcipher$Paes_big_dec.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_big_dec$O src$Psymcipher$Paes_big_dec.c + +-$(OBJDIR)$Paes_big_enc$O: src$Psymcipher$Paes_big_enc.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_big_enc$O: $(OBJDIR) src$Psymcipher$Paes_big_enc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_big_enc$O src$Psymcipher$Paes_big_enc.c + +-$(OBJDIR)$Paes_common$O: src$Psymcipher$Paes_common.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_common$O: $(OBJDIR) src$Psymcipher$Paes_common.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_common$O src$Psymcipher$Paes_common.c + +-$(OBJDIR)$Paes_ct$O: src$Psymcipher$Paes_ct.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_ct$O: $(OBJDIR) src$Psymcipher$Paes_ct.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_ct$O src$Psymcipher$Paes_ct.c + +-$(OBJDIR)$Paes_ct64$O: src$Psymcipher$Paes_ct64.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_ct64$O: $(OBJDIR) src$Psymcipher$Paes_ct64.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_ct64$O src$Psymcipher$Paes_ct64.c + +-$(OBJDIR)$Paes_ct64_cbcdec$O: src$Psymcipher$Paes_ct64_cbcdec.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_ct64_cbcdec$O: $(OBJDIR) src$Psymcipher$Paes_ct64_cbcdec.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_ct64_cbcdec$O src$Psymcipher$Paes_ct64_cbcdec.c + +-$(OBJDIR)$Paes_ct64_cbcenc$O: src$Psymcipher$Paes_ct64_cbcenc.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_ct64_cbcenc$O: $(OBJDIR) src$Psymcipher$Paes_ct64_cbcenc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_ct64_cbcenc$O src$Psymcipher$Paes_ct64_cbcenc.c + +-$(OBJDIR)$Paes_ct64_ctr$O: src$Psymcipher$Paes_ct64_ctr.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_ct64_ctr$O: $(OBJDIR) src$Psymcipher$Paes_ct64_ctr.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_ct64_ctr$O src$Psymcipher$Paes_ct64_ctr.c + +-$(OBJDIR)$Paes_ct64_ctrcbc$O: src$Psymcipher$Paes_ct64_ctrcbc.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_ct64_ctrcbc$O: $(OBJDIR) src$Psymcipher$Paes_ct64_ctrcbc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_ct64_ctrcbc$O src$Psymcipher$Paes_ct64_ctrcbc.c + +-$(OBJDIR)$Paes_ct64_dec$O: src$Psymcipher$Paes_ct64_dec.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_ct64_dec$O: $(OBJDIR) src$Psymcipher$Paes_ct64_dec.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_ct64_dec$O src$Psymcipher$Paes_ct64_dec.c + +-$(OBJDIR)$Paes_ct64_enc$O: src$Psymcipher$Paes_ct64_enc.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_ct64_enc$O: $(OBJDIR) src$Psymcipher$Paes_ct64_enc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_ct64_enc$O src$Psymcipher$Paes_ct64_enc.c + +-$(OBJDIR)$Paes_ct_cbcdec$O: src$Psymcipher$Paes_ct_cbcdec.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_ct_cbcdec$O: $(OBJDIR) src$Psymcipher$Paes_ct_cbcdec.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_ct_cbcdec$O src$Psymcipher$Paes_ct_cbcdec.c + +-$(OBJDIR)$Paes_ct_cbcenc$O: src$Psymcipher$Paes_ct_cbcenc.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_ct_cbcenc$O: $(OBJDIR) src$Psymcipher$Paes_ct_cbcenc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_ct_cbcenc$O src$Psymcipher$Paes_ct_cbcenc.c + +-$(OBJDIR)$Paes_ct_ctr$O: src$Psymcipher$Paes_ct_ctr.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_ct_ctr$O: $(OBJDIR) src$Psymcipher$Paes_ct_ctr.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_ct_ctr$O src$Psymcipher$Paes_ct_ctr.c + +-$(OBJDIR)$Paes_ct_ctrcbc$O: src$Psymcipher$Paes_ct_ctrcbc.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_ct_ctrcbc$O: $(OBJDIR) src$Psymcipher$Paes_ct_ctrcbc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_ct_ctrcbc$O src$Psymcipher$Paes_ct_ctrcbc.c + +-$(OBJDIR)$Paes_ct_dec$O: src$Psymcipher$Paes_ct_dec.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_ct_dec$O: $(OBJDIR) src$Psymcipher$Paes_ct_dec.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_ct_dec$O src$Psymcipher$Paes_ct_dec.c + +-$(OBJDIR)$Paes_ct_enc$O: src$Psymcipher$Paes_ct_enc.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_ct_enc$O: $(OBJDIR) src$Psymcipher$Paes_ct_enc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_ct_enc$O src$Psymcipher$Paes_ct_enc.c + +-$(OBJDIR)$Paes_pwr8$O: src$Psymcipher$Paes_pwr8.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_pwr8$O: $(OBJDIR) src$Psymcipher$Paes_pwr8.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_pwr8$O src$Psymcipher$Paes_pwr8.c + +-$(OBJDIR)$Paes_pwr8_cbcdec$O: src$Psymcipher$Paes_pwr8_cbcdec.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_pwr8_cbcdec$O: $(OBJDIR) src$Psymcipher$Paes_pwr8_cbcdec.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_pwr8_cbcdec$O src$Psymcipher$Paes_pwr8_cbcdec.c + +-$(OBJDIR)$Paes_pwr8_cbcenc$O: src$Psymcipher$Paes_pwr8_cbcenc.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_pwr8_cbcenc$O: $(OBJDIR) src$Psymcipher$Paes_pwr8_cbcenc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_pwr8_cbcenc$O src$Psymcipher$Paes_pwr8_cbcenc.c + +-$(OBJDIR)$Paes_pwr8_ctr$O: src$Psymcipher$Paes_pwr8_ctr.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_pwr8_ctr$O: $(OBJDIR) src$Psymcipher$Paes_pwr8_ctr.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_pwr8_ctr$O src$Psymcipher$Paes_pwr8_ctr.c + +-$(OBJDIR)$Paes_pwr8_ctrcbc$O: src$Psymcipher$Paes_pwr8_ctrcbc.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_pwr8_ctrcbc$O: $(OBJDIR) src$Psymcipher$Paes_pwr8_ctrcbc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_pwr8_ctrcbc$O src$Psymcipher$Paes_pwr8_ctrcbc.c + +-$(OBJDIR)$Paes_small_cbcdec$O: src$Psymcipher$Paes_small_cbcdec.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_small_cbcdec$O: $(OBJDIR) src$Psymcipher$Paes_small_cbcdec.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_small_cbcdec$O src$Psymcipher$Paes_small_cbcdec.c + +-$(OBJDIR)$Paes_small_cbcenc$O: src$Psymcipher$Paes_small_cbcenc.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_small_cbcenc$O: $(OBJDIR) src$Psymcipher$Paes_small_cbcenc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_small_cbcenc$O src$Psymcipher$Paes_small_cbcenc.c + +-$(OBJDIR)$Paes_small_ctr$O: src$Psymcipher$Paes_small_ctr.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_small_ctr$O: $(OBJDIR) src$Psymcipher$Paes_small_ctr.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_small_ctr$O src$Psymcipher$Paes_small_ctr.c + +-$(OBJDIR)$Paes_small_ctrcbc$O: src$Psymcipher$Paes_small_ctrcbc.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_small_ctrcbc$O: $(OBJDIR) src$Psymcipher$Paes_small_ctrcbc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_small_ctrcbc$O src$Psymcipher$Paes_small_ctrcbc.c + +-$(OBJDIR)$Paes_small_dec$O: src$Psymcipher$Paes_small_dec.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_small_dec$O: $(OBJDIR) src$Psymcipher$Paes_small_dec.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_small_dec$O src$Psymcipher$Paes_small_dec.c + +-$(OBJDIR)$Paes_small_enc$O: src$Psymcipher$Paes_small_enc.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_small_enc$O: $(OBJDIR) src$Psymcipher$Paes_small_enc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_small_enc$O src$Psymcipher$Paes_small_enc.c + +-$(OBJDIR)$Paes_x86ni$O: src$Psymcipher$Paes_x86ni.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_x86ni$O: $(OBJDIR) src$Psymcipher$Paes_x86ni.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_x86ni$O src$Psymcipher$Paes_x86ni.c + +-$(OBJDIR)$Paes_x86ni_cbcdec$O: src$Psymcipher$Paes_x86ni_cbcdec.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_x86ni_cbcdec$O: $(OBJDIR) src$Psymcipher$Paes_x86ni_cbcdec.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_x86ni_cbcdec$O src$Psymcipher$Paes_x86ni_cbcdec.c + +-$(OBJDIR)$Paes_x86ni_cbcenc$O: src$Psymcipher$Paes_x86ni_cbcenc.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_x86ni_cbcenc$O: $(OBJDIR) src$Psymcipher$Paes_x86ni_cbcenc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_x86ni_cbcenc$O src$Psymcipher$Paes_x86ni_cbcenc.c + +-$(OBJDIR)$Paes_x86ni_ctr$O: src$Psymcipher$Paes_x86ni_ctr.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_x86ni_ctr$O: $(OBJDIR) src$Psymcipher$Paes_x86ni_ctr.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_x86ni_ctr$O src$Psymcipher$Paes_x86ni_ctr.c + +-$(OBJDIR)$Paes_x86ni_ctrcbc$O: src$Psymcipher$Paes_x86ni_ctrcbc.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_x86ni_ctrcbc$O: $(OBJDIR) src$Psymcipher$Paes_x86ni_ctrcbc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_x86ni_ctrcbc$O src$Psymcipher$Paes_x86ni_ctrcbc.c + +-$(OBJDIR)$Pchacha20_ct$O: src$Psymcipher$Pchacha20_ct.c $(HEADERSPRIV) ++$(OBJDIR)$Pchacha20_ct$O: $(OBJDIR) src$Psymcipher$Pchacha20_ct.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pchacha20_ct$O src$Psymcipher$Pchacha20_ct.c + +-$(OBJDIR)$Pchacha20_sse2$O: src$Psymcipher$Pchacha20_sse2.c $(HEADERSPRIV) ++$(OBJDIR)$Pchacha20_sse2$O: $(OBJDIR) src$Psymcipher$Pchacha20_sse2.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pchacha20_sse2$O src$Psymcipher$Pchacha20_sse2.c + +-$(OBJDIR)$Pdes_ct$O: src$Psymcipher$Pdes_ct.c $(HEADERSPRIV) ++$(OBJDIR)$Pdes_ct$O: $(OBJDIR) src$Psymcipher$Pdes_ct.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pdes_ct$O src$Psymcipher$Pdes_ct.c + +-$(OBJDIR)$Pdes_ct_cbcdec$O: src$Psymcipher$Pdes_ct_cbcdec.c $(HEADERSPRIV) ++$(OBJDIR)$Pdes_ct_cbcdec$O: $(OBJDIR) src$Psymcipher$Pdes_ct_cbcdec.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pdes_ct_cbcdec$O src$Psymcipher$Pdes_ct_cbcdec.c + +-$(OBJDIR)$Pdes_ct_cbcenc$O: src$Psymcipher$Pdes_ct_cbcenc.c $(HEADERSPRIV) ++$(OBJDIR)$Pdes_ct_cbcenc$O: $(OBJDIR) src$Psymcipher$Pdes_ct_cbcenc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pdes_ct_cbcenc$O src$Psymcipher$Pdes_ct_cbcenc.c + +-$(OBJDIR)$Pdes_support$O: src$Psymcipher$Pdes_support.c $(HEADERSPRIV) ++$(OBJDIR)$Pdes_support$O: $(OBJDIR) src$Psymcipher$Pdes_support.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pdes_support$O src$Psymcipher$Pdes_support.c + +-$(OBJDIR)$Pdes_tab$O: src$Psymcipher$Pdes_tab.c $(HEADERSPRIV) ++$(OBJDIR)$Pdes_tab$O: $(OBJDIR) src$Psymcipher$Pdes_tab.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pdes_tab$O src$Psymcipher$Pdes_tab.c + +-$(OBJDIR)$Pdes_tab_cbcdec$O: src$Psymcipher$Pdes_tab_cbcdec.c $(HEADERSPRIV) ++$(OBJDIR)$Pdes_tab_cbcdec$O: $(OBJDIR) src$Psymcipher$Pdes_tab_cbcdec.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pdes_tab_cbcdec$O src$Psymcipher$Pdes_tab_cbcdec.c + +-$(OBJDIR)$Pdes_tab_cbcenc$O: src$Psymcipher$Pdes_tab_cbcenc.c $(HEADERSPRIV) ++$(OBJDIR)$Pdes_tab_cbcenc$O: $(OBJDIR) src$Psymcipher$Pdes_tab_cbcenc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pdes_tab_cbcenc$O src$Psymcipher$Pdes_tab_cbcenc.c + +-$(OBJDIR)$Ppoly1305_ctmul$O: src$Psymcipher$Ppoly1305_ctmul.c $(HEADERSPRIV) ++$(OBJDIR)$Ppoly1305_ctmul$O: $(OBJDIR) src$Psymcipher$Ppoly1305_ctmul.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Ppoly1305_ctmul$O src$Psymcipher$Ppoly1305_ctmul.c + +-$(OBJDIR)$Ppoly1305_ctmul32$O: src$Psymcipher$Ppoly1305_ctmul32.c $(HEADERSPRIV) ++$(OBJDIR)$Ppoly1305_ctmul32$O: $(OBJDIR) src$Psymcipher$Ppoly1305_ctmul32.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Ppoly1305_ctmul32$O src$Psymcipher$Ppoly1305_ctmul32.c + +-$(OBJDIR)$Ppoly1305_ctmulq$O: src$Psymcipher$Ppoly1305_ctmulq.c $(HEADERSPRIV) ++$(OBJDIR)$Ppoly1305_ctmulq$O: $(OBJDIR) src$Psymcipher$Ppoly1305_ctmulq.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Ppoly1305_ctmulq$O src$Psymcipher$Ppoly1305_ctmulq.c + +-$(OBJDIR)$Ppoly1305_i15$O: src$Psymcipher$Ppoly1305_i15.c $(HEADERSPRIV) ++$(OBJDIR)$Ppoly1305_i15$O: $(OBJDIR) src$Psymcipher$Ppoly1305_i15.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Ppoly1305_i15$O src$Psymcipher$Ppoly1305_i15.c + +-$(OBJDIR)$Pasn1enc$O: src$Px509$Pasn1enc.c $(HEADERSPRIV) ++$(OBJDIR)$Pasn1enc$O: $(OBJDIR) src$Px509$Pasn1enc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pasn1enc$O src$Px509$Pasn1enc.c + +-$(OBJDIR)$Pencode_ec_pk8der$O: src$Px509$Pencode_ec_pk8der.c $(HEADERSPRIV) ++$(OBJDIR)$Pencode_ec_pk8der$O: $(OBJDIR) src$Px509$Pencode_ec_pk8der.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pencode_ec_pk8der$O src$Px509$Pencode_ec_pk8der.c + +-$(OBJDIR)$Pencode_ec_rawder$O: src$Px509$Pencode_ec_rawder.c $(HEADERSPRIV) ++$(OBJDIR)$Pencode_ec_rawder$O: $(OBJDIR) src$Px509$Pencode_ec_rawder.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pencode_ec_rawder$O src$Px509$Pencode_ec_rawder.c + +-$(OBJDIR)$Pencode_rsa_pk8der$O: src$Px509$Pencode_rsa_pk8der.c $(HEADERSPRIV) ++$(OBJDIR)$Pencode_rsa_pk8der$O: $(OBJDIR) src$Px509$Pencode_rsa_pk8der.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pencode_rsa_pk8der$O src$Px509$Pencode_rsa_pk8der.c + +-$(OBJDIR)$Pencode_rsa_rawder$O: src$Px509$Pencode_rsa_rawder.c $(HEADERSPRIV) ++$(OBJDIR)$Pencode_rsa_rawder$O: $(OBJDIR) src$Px509$Pencode_rsa_rawder.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pencode_rsa_rawder$O src$Px509$Pencode_rsa_rawder.c + +-$(OBJDIR)$Pskey_decoder$O: src$Px509$Pskey_decoder.c $(HEADERSPRIV) ++$(OBJDIR)$Pskey_decoder$O: $(OBJDIR) src$Px509$Pskey_decoder.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pskey_decoder$O src$Px509$Pskey_decoder.c + +-$(OBJDIR)$Px509_decoder$O: src$Px509$Px509_decoder.c $(HEADERSPRIV) ++$(OBJDIR)$Px509_decoder$O: $(OBJDIR) src$Px509$Px509_decoder.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Px509_decoder$O src$Px509$Px509_decoder.c + +-$(OBJDIR)$Px509_knownkey$O: src$Px509$Px509_knownkey.c $(HEADERSPRIV) ++$(OBJDIR)$Px509_knownkey$O: $(OBJDIR) src$Px509$Px509_knownkey.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Px509_knownkey$O src$Px509$Px509_knownkey.c + +-$(OBJDIR)$Px509_minimal$O: src$Px509$Px509_minimal.c $(HEADERSPRIV) ++$(OBJDIR)$Px509_minimal$O: $(OBJDIR) src$Px509$Px509_minimal.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Px509_minimal$O src$Px509$Px509_minimal.c + +-$(OBJDIR)$Px509_minimal_full$O: src$Px509$Px509_minimal_full.c $(HEADERSPRIV) ++$(OBJDIR)$Px509_minimal_full$O: $(OBJDIR) src$Px509$Px509_minimal_full.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Px509_minimal_full$O src$Px509$Px509_minimal_full.c + +-$(OBJDIR)$Pbrssl$O: tools$Pbrssl.c $(HEADERSTOOLS) ++$(OBJDIR)$Pbrssl$O: $(OBJDIR) tools$Pbrssl.c $(HEADERSTOOLS) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pbrssl$O tools$Pbrssl.c + +-$(OBJDIR)$Pcerts$O: tools$Pcerts.c $(HEADERSTOOLS) ++$(OBJDIR)$Pcerts$O: $(OBJDIR) tools$Pcerts.c $(HEADERSTOOLS) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pcerts$O tools$Pcerts.c + +-$(OBJDIR)$Pchain$O: tools$Pchain.c $(HEADERSTOOLS) ++$(OBJDIR)$Pchain$O: $(OBJDIR) tools$Pchain.c $(HEADERSTOOLS) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pchain$O tools$Pchain.c + +-$(OBJDIR)$Pclient$O: tools$Pclient.c $(HEADERSTOOLS) ++$(OBJDIR)$Pclient$O: $(OBJDIR) tools$Pclient.c $(HEADERSTOOLS) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pclient$O tools$Pclient.c + +-$(OBJDIR)$Perrors$O: tools$Perrors.c $(HEADERSTOOLS) ++$(OBJDIR)$Perrors$O: $(OBJDIR) tools$Perrors.c $(HEADERSTOOLS) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Perrors$O tools$Perrors.c + +-$(OBJDIR)$Pfiles$O: tools$Pfiles.c $(HEADERSTOOLS) ++$(OBJDIR)$Pfiles$O: $(OBJDIR) tools$Pfiles.c $(HEADERSTOOLS) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pfiles$O tools$Pfiles.c + +-$(OBJDIR)$Pimpl$O: tools$Pimpl.c $(HEADERSTOOLS) ++$(OBJDIR)$Pimpl$O: $(OBJDIR) tools$Pimpl.c $(HEADERSTOOLS) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pimpl$O tools$Pimpl.c + +-$(OBJDIR)$Pkeys$O: tools$Pkeys.c $(HEADERSTOOLS) ++$(OBJDIR)$Pkeys$O: $(OBJDIR) tools$Pkeys.c $(HEADERSTOOLS) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pkeys$O tools$Pkeys.c + +-$(OBJDIR)$Pnames$O: tools$Pnames.c $(HEADERSTOOLS) ++$(OBJDIR)$Pnames$O: $(OBJDIR) tools$Pnames.c $(HEADERSTOOLS) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pnames$O tools$Pnames.c + +-$(OBJDIR)$Pserver$O: tools$Pserver.c $(HEADERSTOOLS) ++$(OBJDIR)$Pserver$O: $(OBJDIR) tools$Pserver.c $(HEADERSTOOLS) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pserver$O tools$Pserver.c + +-$(OBJDIR)$Pskey$O: tools$Pskey.c $(HEADERSTOOLS) ++$(OBJDIR)$Pskey$O: $(OBJDIR) tools$Pskey.c $(HEADERSTOOLS) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pskey$O tools$Pskey.c + +-$(OBJDIR)$Psslio$O: tools$Psslio.c $(HEADERSTOOLS) ++$(OBJDIR)$Psslio$O: $(OBJDIR) tools$Psslio.c $(HEADERSTOOLS) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Psslio$O tools$Psslio.c + +-$(OBJDIR)$Pta$O: tools$Pta.c $(HEADERSTOOLS) ++$(OBJDIR)$Pta$O: $(OBJDIR) tools$Pta.c $(HEADERSTOOLS) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pta$O tools$Pta.c + +-$(OBJDIR)$Ptwrch$O: tools$Ptwrch.c $(HEADERSTOOLS) ++$(OBJDIR)$Ptwrch$O: $(OBJDIR) tools$Ptwrch.c $(HEADERSTOOLS) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Ptwrch$O tools$Ptwrch.c + +-$(OBJDIR)$Pvector$O: tools$Pvector.c $(HEADERSTOOLS) ++$(OBJDIR)$Pvector$O: $(OBJDIR) tools$Pvector.c $(HEADERSTOOLS) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pvector$O tools$Pvector.c + +-$(OBJDIR)$Pverify$O: tools$Pverify.c $(HEADERSTOOLS) ++$(OBJDIR)$Pverify$O: $(OBJDIR) tools$Pverify.c $(HEADERSTOOLS) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pverify$O tools$Pverify.c + +-$(OBJDIR)$Pxmem$O: tools$Pxmem.c $(HEADERSTOOLS) ++$(OBJDIR)$Pxmem$O: $(OBJDIR) tools$Pxmem.c $(HEADERSTOOLS) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pxmem$O tools$Pxmem.c + +-$(OBJDIR)$Ptest_crypto$O: test$Ptest_crypto.c $(HEADERSPRIV) ++$(OBJDIR)$Ptest_crypto$O: $(OBJDIR) test$Ptest_crypto.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Ptest_crypto$O test$Ptest_crypto.c + +-$(OBJDIR)$Ptest_speed$O: test$Ptest_speed.c $(HEADERSPRIV) ++$(OBJDIR)$Ptest_speed$O: $(OBJDIR) test$Ptest_speed.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Ptest_speed$O test$Ptest_speed.c + +-$(OBJDIR)$Ptest_x509$O: test$Ptest_x509.c $(HEADERSPRIV) ++$(OBJDIR)$Ptest_x509$O: $(OBJDIR) test$Ptest_x509.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) -DSRCDIRNAME=".." $(CCOUT)$(OBJDIR)$Ptest_x509$O test$Ptest_x509.c +diff --git a/mk/mkrules.sh b/mk/mkrules.sh +index eea159b..cce7564 100755 +--- a/mk/mkrules.sh ++++ b/mk/mkrules.sh +@@ -531,23 +531,23 @@ EOF + (for f in $coresrc ; do + b="$(basename "$f" .c)\$O" + g="$(escsep "$f")" +- printf '\n$(OBJDIR)$P%s: %s $(HEADERSPRIV)\n\t$(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$P%s %s\n' "$b" "$g" "$b" "$g" ++ printf '\n$(OBJDIR)$P%s: $(OBJDIR) %s $(HEADERSPRIV)\n\t$(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$P%s %s\n' "$b" "$g" "$b" "$g" + done + + for f in $toolssrc ; do + b="$(basename "$f" .c)\$O" + g="$(escsep "$f")" +- printf '\n$(OBJDIR)$P%s: %s $(HEADERSTOOLS)\n\t$(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$P%s %s\n' "$b" "$g" "$b" "$g" ++ printf '\n$(OBJDIR)$P%s: $(OBJDIR) %s $(HEADERSTOOLS)\n\t$(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$P%s %s\n' "$b" "$g" "$b" "$g" + done + + for f in $testcryptosrc $testspeedsrc ; do + b="$(basename "$f" .c)\$O" + g="$(escsep "$f")" +- printf '\n$(OBJDIR)$P%s: %s $(HEADERSPRIV)\n\t$(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$P%s %s\n' "$b" "$g" "$b" "$g" ++ printf '\n$(OBJDIR)$P%s: $(OBJDIR) %s $(HEADERSPRIV)\n\t$(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$P%s %s\n' "$b" "$g" "$b" "$g" + done + + for f in $testx509src ; do + b="$(basename "$f" .c)\$O" + g="$(escsep "$f")" +- printf '\n$(OBJDIR)$P%s: %s $(HEADERSPRIV)\n\t$(CC) $(CFLAGS) $(INCFLAGS) -DSRCDIRNAME=".." $(CCOUT)$(OBJDIR)$P%s %s\n' "$b" "$g" "$b" "$g" ++ printf '\n$(OBJDIR)$P%s: $(OBJDIR) %s $(HEADERSPRIV)\n\t$(CC) $(CFLAGS) $(INCFLAGS) -DSRCDIRNAME=".." $(CCOUT)$(OBJDIR)$P%s %s\n' "$b" "$g" "$b" "$g" + done) >> Rules.mk +-- +2.34.1 + From b95334b71fbdde0f7621b58ed35fa98df9e0966d Mon Sep 17 00:00:00 2001 From: Heiko Thiery Date: Mon, 12 Dec 2022 20:35:28 +0100 Subject: [PATCH 0153/5754] package/modem-manager: bump version to 1.20.2 Switch package type to meson as the primary supported build system from now on is meson and the autotools support as deprecated. The package tarball is no longer supported, thus the MODEM_MANAGER_SOURCE is changed to the gitlab archive URL. All previously supported options are converted to the meson configuraiton options and support for new ones is added. The new options are: bash_completion, polkit, systemd, qrtr. The dbus build dependency is needed since the meson build system uses dbus pkg-config to determine install locations. The 'udevdir' has to be specified also in case dbus is not installed. Modem-manager will use its own built-in udev rule parser to determine modem specific values. For building with libqmi support version 1.32.2 is required and for libmbim version 1.28.2 is required. Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- package/modem-manager/Config.in | 2 +- package/modem-manager/modem-manager.hash | 2 +- package/modem-manager/modem-manager.mk | 72 ++++++++++++++++++------ 3 files changed, 56 insertions(+), 20 deletions(-) diff --git a/package/modem-manager/Config.in b/package/modem-manager/Config.in index c4c723776d..d211d68ee1 100644 --- a/package/modem-manager/Config.in +++ b/package/modem-manager/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_MODEM_MANAGER depends on BR2_USE_WCHAR # libglib2 and gnutls depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2 depends on BR2_USE_MMU # dbus - select BR2_PACKAGE_DBUS # runtime dependency + select BR2_PACKAGE_DBUS select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBGUDEV if BR2_PACKAGE_HAS_UDEV help diff --git a/package/modem-manager/modem-manager.hash b/package/modem-manager/modem-manager.hash index 40c8ad703f..e6967f8d62 100644 --- a/package/modem-manager/modem-manager.hash +++ b/package/modem-manager/modem-manager.hash @@ -1,4 +1,4 @@ #Locally calculated after checking https://www.freedesktop.org/software/ModemManager/ModemManager-1.18.12.tar.xz.asc -sha256 b464e4925d955a6ca86dd08616e763b26ae46d7fd37dbe281678e34065b1e430 ModemManager-1.18.12.tar.xz +sha256 ba56aa764edc148f58348a589743cf1c1e27c55dcd7ebd820dcedd52fb8d7179 ModemManager-1.20.2.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/modem-manager/modem-manager.mk b/package/modem-manager/modem-manager.mk index d0c9b7377b..8a0dbba3a4 100644 --- a/package/modem-manager/modem-manager.mk +++ b/package/modem-manager/modem-manager.mk @@ -4,42 +4,78 @@ # ################################################################################ -MODEM_MANAGER_VERSION = 1.18.12 -MODEM_MANAGER_SOURCE = ModemManager-$(MODEM_MANAGER_VERSION).tar.xz -MODEM_MANAGER_SITE = http://www.freedesktop.org/software/ModemManager +MODEM_MANAGER_VERSION = 1.20.2 +MODEM_MANAGER_SOURCE = ModemManager-$(MODEM_MANAGER_VERSION).tar.gz +MODEM_MANAGER_SITE = https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/archive/$(MODEM_MANAGER_VERSION) MODEM_MANAGER_LICENSE = GPL-2.0+ (programs, plugins), LGPL-2.0+ (libmm-glib) MODEM_MANAGER_LICENSE_FILES = COPYING COPYING.LIB MODEM_MANAGER_SELINUX_MODULES = modemmanager -MODEM_MANAGER_DEPENDENCIES = host-pkgconf libglib2 $(TARGET_NLS_DEPENDENCIES) +MODEM_MANAGER_DEPENDENCIES = host-pkgconf dbus libglib2 $(TARGET_NLS_DEPENDENCIES) host-libxslt MODEM_MANAGER_INSTALL_STAGING = YES -MODEM_MANAGER_CONF_OPTS = --disable-more-warnings +MODEM_MANAGER_CONF_OPTS = \ + -Dpowerd_suspend_resume=false \ + -Dudevdir=/usr/lib/udev -ifeq ($(BR2_PACKAGE_MODEM_MANAGER_LIBQMI),y) -MODEM_MANAGER_DEPENDENCIES += libqmi -MODEM_MANAGER_CONF_OPTS += --with-qmi +ifeq ($(BR2_PACKAGE_LIBGUDEV),y) +MODEM_MANAGER_DEPENDENCIES += libgudev +MODEM_MANAGER_CONF_OPTS += -Dudev=true else -MODEM_MANAGER_CONF_OPTS += --without-qmi +MODEM_MANAGER_CONF_OPTS += -Dudev=false endif -ifeq ($(BR2_PACKAGE_LIBGUDEV),y) -MODEM_MANAGER_DEPENDENCIES += libgudev -MODEM_MANAGER_CONF_OPTS += --with-udev +ifeq ($(BR2_PACKAGE_MODEM_MANAGER_LIBQMI),y) +MODEM_MANAGER_DEPENDENCIES += libqmi +MODEM_MANAGER_CONF_OPTS += -Dqmi=true else -MODEM_MANAGER_CONF_OPTS += --without-udev +MODEM_MANAGER_CONF_OPTS += -Dqmi=false endif ifeq ($(BR2_PACKAGE_MODEM_MANAGER_LIBMBIM),y) MODEM_MANAGER_DEPENDENCIES += libmbim -MODEM_MANAGER_CONF_OPTS += --with-mbim +MODEM_MANAGER_CONF_OPTS += -Dmbim=true +else +MODEM_MANAGER_CONF_OPTS += -Dmbim=false +endif + +ifeq ($(BR2_PACKAGE_LIBQRTR_GLIB),y) +MODEM_MANAGER_DEPENDENCIES += libqrtr-glib +MODEM_MANAGER_CONF_OPTS += -Dqrtr=true +else +MODEM_MANAGER_CONF_OPTS += -Dqrtr=false +endif + +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +MODEM_MANAGER_DEPENDENCIES += systemd +MODEM_MANAGER_CONF_OPTS += \ + -Dsystemd_journal=true \ + -Dsystemd_suspend_resume=true \ + -Dsystemdsystemunitdir=/usr/lib/systemd/system +else +MODEM_MANAGER_CONF_OPTS += \ + -Dsystemd_journal=false \ + -Dsystemd_suspend_resume=false \ + -Dsystemdsystemunitdir=no +endif + +ifeq ($(BR2_PACKAGE_POLKIT),y) +MODEM_MANAGER_DEPENDENCIES += polkit +MODEM_MANAGER_CONF_OPTS += -Dpolkit=strict else -MODEM_MANAGER_CONF_OPTS += --without-mbim +MODEM_MANAGER_CONF_OPTS += -Dpolkit=no endif ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) MODEM_MANAGER_DEPENDENCIES += gobject-introspection -MODEM_MANAGER_CONF_OPTS += --enable-introspection +MODEM_MANAGER_CONF_OPTS += -Dintrospection=true +else +MODEM_MANAGER_CONF_OPTS += -Dintrospection=false +endif + +ifeq ($(BR2_PACKAGE_BASH_COMPLETION),y) +MODEM_MANAGER_DEPENDENCIES += bash-completion +MODEM_MANAGER_CONF_OPTS += -Dbash_completion=true else -MODEM_MANAGER_CONF_OPTS += --disable-introspection +MODEM_MANAGER_CONF_OPTS += -Dbash_completion=false endif define MODEM_MANAGER_INSTALL_INIT_SYSV @@ -47,4 +83,4 @@ define MODEM_MANAGER_INSTALL_INIT_SYSV $(TARGET_DIR)/etc/init.d/S44modem-manager endef -$(eval $(autotools-package)) +$(eval $(meson-package)) From 482d18a40d98dcc156437c9a01b869b510e93fc4 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Wed, 28 Dec 2022 21:53:23 +0100 Subject: [PATCH 0154/5754] package/wilc-driver: fix build failure up to Linux 6.1 Add patches pending upstream[0] to handle various data types and api changes up to Linux 6.1. [0]: https://github.com/embeddedTS/wilc3000-external-module/pull/2 Fixes: http://autobuild.buildroot.net/results/6aa7475a21a6060e9fce3552f73e6e7100a8b2aa Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- ...missing-prandom_u32-with-Linux-6.1.0.patch | 34 +++ ...fix-build-failure-on-remove-callback.patch | 44 ++++ ...uild-failure-with-Linux-5.19-and-6.1.patch | 98 ++++++++ ...on_parameters-Linux-6.1-build-failur.patch | 216 ++++++++++++++++++ 4 files changed, 392 insertions(+) create mode 100644 package/wilc-driver/0001-cfg80211.c-fix-missing-prandom_u32-with-Linux-6.1.0.patch create mode 100644 package/wilc-driver/0002-spi.c-fix-build-failure-on-remove-callback.patch create mode 100644 package/wilc-driver/0003-cfg80211.c-fix-build-failure-with-Linux-5.19-and-6.1.patch create mode 100644 package/wilc-driver/0004-Fix-struct-station_parameters-Linux-6.1-build-failur.patch diff --git a/package/wilc-driver/0001-cfg80211.c-fix-missing-prandom_u32-with-Linux-6.1.0.patch b/package/wilc-driver/0001-cfg80211.c-fix-missing-prandom_u32-with-Linux-6.1.0.patch new file mode 100644 index 0000000000..2f10627301 --- /dev/null +++ b/package/wilc-driver/0001-cfg80211.c-fix-missing-prandom_u32-with-Linux-6.1.0.patch @@ -0,0 +1,34 @@ +From f80e4343fa0a4d8b22933d1704c85a771fe234a4 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Wed, 28 Dec 2022 19:56:46 +0100 +Subject: [PATCH] cfg80211.c: fix missing prandom_u32() with Linux >= 6.1.0 + +prandom_u32() previously was only calling get_random_u32() so it's been +dropped with Linux 6.1.0. So let's directly call get_random_u32() if Linux +version >= 6.1.0. + +[Upstream status: https://github.com/embeddedTS/wilc3000-external-module/pull/2] +Signed-off-by: Giulio Benetti +--- + cfg80211.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/cfg80211.c b/cfg80211.c +index 016aa06..41edd02 100644 +--- a/cfg80211.c ++++ b/cfg80211.c +@@ -1422,7 +1422,11 @@ static int mgmt_tx(struct wiphy *wiphy, + const u8 *vendor_ie; + int ret = 0; + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) ++ *cookie = get_random_u32(); ++#else + *cookie = prandom_u32(); ++#endif + priv->tx_cookie = *cookie; + mgmt = (const struct ieee80211_mgmt *)buf; + +-- +2.34.1 + diff --git a/package/wilc-driver/0002-spi.c-fix-build-failure-on-remove-callback.patch b/package/wilc-driver/0002-spi.c-fix-build-failure-on-remove-callback.patch new file mode 100644 index 0000000000..87306dfa12 --- /dev/null +++ b/package/wilc-driver/0002-spi.c-fix-build-failure-on-remove-callback.patch @@ -0,0 +1,44 @@ +From a88819bd63f977b5a33d72a2b9e264ce104726bd Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Wed, 28 Dec 2022 21:02:12 +0100 +Subject: [PATCH] spi.c: fix build failure on remove callback + +Starting from Linux 5.18 remove callback returns void, so let's deal with +it depending on Linux version >= 5.18. + +[Upstream status: https://github.com/embeddedTS/wilc3000-external-module/pull/2] +Signed-off-by: Giulio Benetti +--- + spi.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/spi.c b/spi.c +index 96c51fe..f7b43e2 100644 +--- a/spi.c ++++ b/spi.c +@@ -211,7 +211,11 @@ free: + return ret; + } + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,18,0)) ++static void wilc_bus_remove(struct spi_device *spi) ++#else + static int wilc_bus_remove(struct spi_device *spi) ++#endif + { + struct wilc *wilc = spi_get_drvdata(spi); + +@@ -220,7 +224,10 @@ static int wilc_bus_remove(struct spi_device *spi) + + wilc_netdev_cleanup(wilc); + wilc_bt_deinit(); ++ ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(5,18,0)) + return 0; ++#endif + } + + static int wilc_spi_suspend(struct device *dev) +-- +2.34.1 + diff --git a/package/wilc-driver/0003-cfg80211.c-fix-build-failure-with-Linux-5.19-and-6.1.patch b/package/wilc-driver/0003-cfg80211.c-fix-build-failure-with-Linux-5.19-and-6.1.patch new file mode 100644 index 0000000000..785b8904b2 --- /dev/null +++ b/package/wilc-driver/0003-cfg80211.c-fix-build-failure-with-Linux-5.19-and-6.1.patch @@ -0,0 +1,98 @@ +From a608cdd7903505217529317c04b5b58cb7e25081 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Wed, 28 Dec 2022 21:06:43 +0100 +Subject: [PATCH] cfg80211.c: fix build failure with Linux 5.19 and 6.1 + +Starting from Linux 5.19 stop_ap() requires unsigned int link_id as +parameter. Then from Linux 6.1 on lot of other cfg80211 APIs require +int link_id to deal with MLO, so let's add that parameter too. + +[Upstream status: https://github.com/embeddedTS/wilc3000-external-module/pull/2] +Signed-off-by: Giulio Benetti +--- + cfg80211.c | 35 +++++++++++++++++++++++++++++------ + 1 file changed, 29 insertions(+), 6 deletions(-) + +diff --git a/cfg80211.c b/cfg80211.c +index 41edd02..57c777d 100644 +--- a/cfg80211.c ++++ b/cfg80211.c +@@ -674,8 +674,12 @@ static int wilc_wfi_cfg_copy_wpa_info(struct wilc_wfi_key *key_info, + return 0; + } + +-static int add_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index, +- bool pairwise, const u8 *mac_addr, struct key_params *params) ++static int add_key(struct wiphy *wiphy, struct net_device *netdev, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6,1,0)) ++ int link_id, ++#endif ++ u8 key_index, bool pairwise, const u8 *mac_addr, ++ struct key_params *params) + + { + int ret = 0, keylen = params->key_len, seqlen = params->seq_len; +@@ -792,6 +796,9 @@ static int add_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index, + } + + static int del_key(struct wiphy *wiphy, struct net_device *netdev, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6,1,0)) ++ int link_id, ++#endif + u8 key_index, + bool pairwise, + const u8 *mac_addr) +@@ -833,9 +840,13 @@ static int del_key(struct wiphy *wiphy, struct net_device *netdev, + return ret; + } + +-static int get_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index, +- bool pairwise, const u8 *mac_addr, void *cookie, +- void (*callback)(void *cookie, struct key_params *)) ++static int get_key(struct wiphy *wiphy, struct net_device *netdev, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6,1,0)) ++ int link_id, ++#endif ++ u8 key_index, bool pairwise, const u8 *mac_addr, ++ void *cookie, void (*callback)(void *cookie, ++ struct key_params *)) + { + struct wilc_vif *vif = netdev_priv(netdev); + struct wilc_priv *priv = &vif->priv; +@@ -877,12 +888,18 @@ static int get_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index, + + /* wiphy_new() will WARN if not present*/ + static int set_default_key(struct wiphy *wiphy, struct net_device *netdev, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6,1,0)) ++ int link_id, ++#endif + u8 key_index, bool unicast, bool multicast) + { + return 0; + } + + static int set_default_mgmt_key (struct wiphy *wiphy,struct net_device *netdev, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6,1,0)) ++ int link_id, ++#endif + u8 key_index) + { + return 0; +@@ -1814,7 +1831,13 @@ static int change_beacon(struct wiphy *wiphy, struct net_device *dev, + return wilc_add_beacon(vif, 0, 0, beacon); + } + +-static int stop_ap(struct wiphy *wiphy, struct net_device *dev) ++static int stop_ap(struct wiphy *wiphy, struct net_device *dev ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,19,0)) ++ , unsigned int link_id ++#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(6,1,0)) ++ , int link_id ++#endif ++ ) + { + int ret; + struct wilc_vif *vif = netdev_priv(dev); +-- +2.34.1 + diff --git a/package/wilc-driver/0004-Fix-struct-station_parameters-Linux-6.1-build-failur.patch b/package/wilc-driver/0004-Fix-struct-station_parameters-Linux-6.1-build-failur.patch new file mode 100644 index 0000000000..faee805b5a --- /dev/null +++ b/package/wilc-driver/0004-Fix-struct-station_parameters-Linux-6.1-build-failur.patch @@ -0,0 +1,216 @@ +From 5f022c4d3be32493d500be82f51032ef4fb3cdc0 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Wed, 28 Dec 2022 21:08:45 +0100 +Subject: [PATCH] Fix struct station_parameters Linux 6.1 build failure + +Starting from Linux 6.1 struct station_parameters has changed by moving +some member to its child struct link_station_parameters. Let's extract the +values of the needed members into local values at the beginning of +functions and substitute the member access with the local variables. + +[Upstream status: https://github.com/embeddedTS/wilc3000-external-module/pull/2] +Signed-off-by: Giulio Benetti +--- + cfg80211.c | 48 ++++++++++++++++++++++++++++++++---------------- + hif.c | 44 ++++++++++++++++++++++++++++++++------------ + 2 files changed, 64 insertions(+), 28 deletions(-) + +diff --git a/cfg80211.c b/cfg80211.c +index 57c777d..bdd480c 100644 +--- a/cfg80211.c ++++ b/cfg80211.c +@@ -1866,6 +1866,14 @@ static int add_station(struct wiphy *wiphy, struct net_device *dev, + struct wilc_vif *vif = netdev_priv(dev); + struct wilc_priv *priv = &vif->priv; + u8 *assoc_bss = priv->assoc_stainfo.sta_associated_bss[params->aid]; ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) ++ struct link_station_parameters *link_sta_params = ¶ms->link_sta_params; ++ const struct ieee80211_ht_cap *ht_capa = link_sta_params->ht_capa; ++ u8 supported_rates_len = link_sta_params->supported_rates_len; ++#else ++ const struct ieee80211_ht_cap *ht_capa = params->ht_capa; ++ u8 supported_rates_len = params->supported_rates_len; ++#endif + + if (vif->iftype == WILC_AP_MODE || vif->iftype == WILC_GO_MODE) { + memcpy(assoc_bss, mac, ETH_ALEN); +@@ -1879,27 +1887,27 @@ static int add_station(struct wiphy *wiphy, struct net_device *dev, + params->aid); + PRINT_INFO(vif->ndev, HOSTAPD_DBG, + "Number of supported rates = %d\n", +- params->supported_rates_len); ++ supported_rates_len); + + PRINT_INFO(vif->ndev, CFG80211_DBG, "IS HT supported = %d\n", +- (!params->ht_capa) ? false : true); ++ (!ht_capa) ? false : true); + +- if (params->ht_capa) { ++ if (ht_capa) { + PRINT_INFO(vif->ndev, CFG80211_DBG, + "Capability Info = %d\n", +- params->ht_capa->cap_info); ++ ht_capa->cap_info); + PRINT_INFO(vif->ndev, CFG80211_DBG, + "AMPDU Params = %d\n", +- params->ht_capa->ampdu_params_info); ++ ht_capa->ampdu_params_info); + PRINT_INFO(vif->ndev, CFG80211_DBG, + "HT Extended params= %d\n", +- params->ht_capa->extended_ht_cap_info); ++ ht_capa->extended_ht_cap_info); + PRINT_INFO(vif->ndev, CFG80211_DBG, + "Tx Beamforming Cap= %d\n", +- params->ht_capa->tx_BF_cap_info); ++ ht_capa->tx_BF_cap_info); + PRINT_INFO(vif->ndev, CFG80211_DBG, + "Antenna selection info = %d\n", +- params->ht_capa->antenna_selection_info); ++ ht_capa->antenna_selection_info); + } + + PRINT_INFO(vif->ndev, CFG80211_DBG, "Flag Mask = %d\n", +@@ -1966,6 +1974,14 @@ static int change_station(struct wiphy *wiphy, struct net_device *dev, + { + int ret = 0; + struct wilc_vif *vif = netdev_priv(dev); ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) ++ struct link_station_parameters *link_sta_params = ¶ms->link_sta_params; ++ const struct ieee80211_ht_cap *ht_capa = link_sta_params->ht_capa; ++ u8 supported_rates_len = link_sta_params->supported_rates_len; ++#else ++ const struct ieee80211_ht_cap *ht_capa = params->ht_capa; ++ u8 supported_rates_len = params->supported_rates_len; ++#endif + + PRINT_D(vif->ndev, CFG80211_DBG, "Change station parameters\n"); + +@@ -1976,25 +1992,25 @@ static int change_station(struct wiphy *wiphy, struct net_device *dev, + params->aid); + PRINT_INFO(vif->ndev, CFG80211_DBG, + "Number of supported rates = %d\n", +- params->supported_rates_len); ++ supported_rates_len); + PRINT_INFO(vif->ndev, CFG80211_DBG, "IS HT supported = %d\n", +- (!params->ht_capa) ? false : true); +- if (params->ht_capa) { ++ (!ht_capa) ? false : true); ++ if (ht_capa) { + PRINT_INFO(vif->ndev, CFG80211_DBG, + "Capability Info = %d\n", +- params->ht_capa->cap_info); ++ ht_capa->cap_info); + PRINT_INFO(vif->ndev, CFG80211_DBG, + "AMPDU Params = %d\n", +- params->ht_capa->ampdu_params_info); ++ ht_capa->ampdu_params_info); + PRINT_INFO(vif->ndev, CFG80211_DBG, + "HT Extended params= %d\n", +- params->ht_capa->extended_ht_cap_info); ++ ht_capa->extended_ht_cap_info); + PRINT_INFO(vif->ndev, CFG80211_DBG, + "Tx Beamforming Cap= %d\n", +- params->ht_capa->tx_BF_cap_info); ++ ht_capa->tx_BF_cap_info); + PRINT_INFO(vif->ndev, CFG80211_DBG, + "Antenna selection info = %d\n", +- params->ht_capa->antenna_selection_info); ++ ht_capa->antenna_selection_info); + } + PRINT_INFO(vif->ndev, CFG80211_DBG, "Flag Mask = %d\n", + params->sta_flags_mask); +diff --git a/hif.c b/hif.c +index 3f672a0..1a7365b 100644 +--- a/hif.c ++++ b/hif.c +@@ -2249,6 +2249,16 @@ int wilc_add_station(struct wilc_vif *vif, const u8 *mac, + int result; + struct host_if_msg *msg; + struct add_sta_param *sta_params; ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) ++ struct link_station_parameters *link_sta_params = ¶ms->link_sta_params; ++ const struct ieee80211_ht_cap *ht_capa = link_sta_params->ht_capa; ++ u8 supported_rates_len = link_sta_params->supported_rates_len; ++ const u8 *supported_rates = link_sta_params->supported_rates; ++#else ++ const struct ieee80211_ht_cap *ht_capa = params->ht_capa; ++ u8 supported_rates_len = params->supported_rates_len; ++ const u8 *supported_rates = params->supported_rates; ++#endif + + PRINT_INFO(vif->ndev, HOSTINF_DBG, + "Setting adding station message queue params\n"); +@@ -2260,20 +2270,20 @@ int wilc_add_station(struct wilc_vif *vif, const u8 *mac, + sta_params = &msg->body.add_sta_info; + memcpy(sta_params->bssid, mac, ETH_ALEN); + sta_params->aid = params->aid; +- if (!params->ht_capa) { ++ if (!ht_capa) { + sta_params->ht_supported = false; + } else { + sta_params->ht_supported = true; +- memcpy(&sta_params->ht_capa, params->ht_capa, ++ memcpy(&sta_params->ht_capa, ht_capa, + sizeof(struct ieee80211_ht_cap)); + } + sta_params->flags_mask = params->sta_flags_mask; + sta_params->flags_set = params->sta_flags_set; + +- sta_params->supported_rates_len = params->supported_rates_len; +- if (params->supported_rates_len > 0) { +- sta_params->supported_rates = kmemdup(params->supported_rates, +- params->supported_rates_len, ++ sta_params->supported_rates_len = supported_rates_len; ++ if (supported_rates_len > 0) { ++ sta_params->supported_rates = kmemdup(supported_rates, ++ supported_rates_len, + GFP_KERNEL); + if (!sta_params->supported_rates) { + kfree(msg); +@@ -2397,6 +2407,16 @@ int wilc_edit_station(struct wilc_vif *vif, const u8 *mac, + int result; + struct host_if_msg *msg; + struct add_sta_param *sta_params; ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) ++ struct link_station_parameters *link_sta_params = ¶ms->link_sta_params; ++ const struct ieee80211_ht_cap *ht_capa = link_sta_params->ht_capa; ++ u8 supported_rates_len = link_sta_params->supported_rates_len; ++ const u8 *supported_rates = link_sta_params->supported_rates; ++#else ++ const struct ieee80211_ht_cap *ht_capa = params->ht_capa; ++ u8 supported_rates_len = params->supported_rates_len; ++ const u8 *supported_rates = params->supported_rates; ++#endif + + PRINT_INFO(vif->ndev, HOSTINF_DBG, + "Setting editing station message queue params\n"); +@@ -2408,20 +2428,20 @@ int wilc_edit_station(struct wilc_vif *vif, const u8 *mac, + sta_params = &msg->body.edit_sta_info; + memcpy(sta_params->bssid, mac, ETH_ALEN); + sta_params->aid = params->aid; +- if (!params->ht_capa) { ++ if (!ht_capa) { + sta_params->ht_supported = false; + } else { + sta_params->ht_supported = true; +- memcpy(&sta_params->ht_capa, params->ht_capa, ++ memcpy(&sta_params->ht_capa, ht_capa, + sizeof(struct ieee80211_ht_cap)); + } + sta_params->flags_mask = params->sta_flags_mask; + sta_params->flags_set = params->sta_flags_set; + +- sta_params->supported_rates_len = params->supported_rates_len; +- if (params->supported_rates_len > 0) { +- sta_params->supported_rates = kmemdup(params->supported_rates, +- params->supported_rates_len, ++ sta_params->supported_rates_len = supported_rates_len; ++ if (supported_rates_len > 0) { ++ sta_params->supported_rates = kmemdup(supported_rates, ++ supported_rates_len, + GFP_KERNEL); + if (!sta_params->supported_rates) { + kfree(msg); +-- +2.34.1 + From 14bb74b4617df6fe511e638147cbde01fd7637a1 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 28 Dec 2022 23:00:44 +0100 Subject: [PATCH 0155/5754] package/libdnet: fix python build Fix the following build failure raised with python >= 3.11 by backporting a patch and adding libbsd dependency as suggested by upstream in https://github.com/ofalk/libdnet/issues/74: ./dnet.c: In function '__Pyx_AddTraceback': ./dnet.c:456:62: error: invalid use of incomplete typedef 'PyFrameObject' {aka 'struct _frame'} 456 | #define __Pyx_PyFrame_SetLineNumber(frame, lineno) (frame)->f_lineno = (lineno) | ^~ ./dnet.c:25190:5: note: in expansion of macro '__Pyx_PyFrame_SetLineNumber' 25190 | __Pyx_PyFrame_SetLineNumber(py_frame, py_line); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/78dff4b514fb7c510f5a745ee6cbbc049ceb2794 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...02-Correct-path-to-string-h-from-bsd.patch | 26 +++++++++++++++++++ package/libdnet/Config.in | 11 ++++++++ package/libdnet/libdnet.mk | 2 +- 3 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 package/libdnet/0002-Correct-path-to-string-h-from-bsd.patch 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 new file mode 100644 index 0000000000..2aa4f4516b --- /dev/null +++ b/package/libdnet/0002-Correct-path-to-string-h-from-bsd.patch @@ -0,0 +1,26 @@ +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/Config.in b/package/libdnet/Config.in index f853e4e12d..473e8aea22 100644 --- a/package/libdnet/Config.in +++ b/package/libdnet/Config.in @@ -10,11 +10,22 @@ if BR2_PACKAGE_LIBDNET config BR2_PACKAGE_LIBDNET_PYTHON bool "libdnet python module" + depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS depends on BR2_PACKAGE_PYTHON3 + depends on !BR2_STATIC_LIBS # libbsd + depends on BR2_TOOLCHAIN_HAS_THREADS # libbsd + depends on BR2_USE_WCHAR # libbsd + select BR2_PACKAGE_LIBBSD help dnet module for python comment "dnet module for python requires python3 package" + depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS depends on !BR2_PACKAGE_PYTHON3 +comment "dnet module for python needs a toolchain w/ dynamic library, threads, wchar" + depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_USE_WCHAR + endif diff --git a/package/libdnet/libdnet.mk b/package/libdnet/libdnet.mk index dc56b892b4..14af07e6d5 100644 --- a/package/libdnet/libdnet.mk +++ b/package/libdnet/libdnet.mk @@ -17,7 +17,7 @@ LIBDNET_CONFIG_SCRIPTS = dnet-config LIBDNET_DEPENDENCIES = host-pkgconf ifeq ($(BR2_PACKAGE_LIBDNET_PYTHON),y) -LIBDNET_DEPENDENCIES += host-python-cython python3 +LIBDNET_DEPENDENCIES += libbsd host-python-cython python3 LIBDNET_CONF_OPTS += --with-python=$(HOST_DIR)/bin LIBDNET_MAKE_ENV += $(PKG_PYTHON_DISTUTILS_ENV) LIBDNET_INSTALL_TARGET_OPTS = $(LIBDNET_MAKE_OPTS) DESTDIR=$(TARGET_DIR) INSTALL_STRIP_FLAG=-s install-exec From 0945e4913fba932217278f484de04cc366415bd6 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 28 Dec 2022 23:15:21 +0100 Subject: [PATCH 0156/5754] package/xxhash: fix static library install Install headers when building statically Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...dd-install_libxxhash.includes-target.patch | 39 +++++++++++++++++++ package/xxhash/xxhash.mk | 15 +++++-- 2 files changed, 51 insertions(+), 3 deletions(-) create mode 100644 package/xxhash/0004-Makefile-add-install_libxxhash.includes-target.patch diff --git a/package/xxhash/0004-Makefile-add-install_libxxhash.includes-target.patch b/package/xxhash/0004-Makefile-add-install_libxxhash.includes-target.patch new file mode 100644 index 0000000000..22c8cdaadf --- /dev/null +++ b/package/xxhash/0004-Makefile-add-install_libxxhash.includes-target.patch @@ -0,0 +1,39 @@ +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.mk b/package/xxhash/xxhash.mk index a8f8d1d179..6932113f14 100644 --- a/package/xxhash/xxhash.mk +++ b/package/xxhash/xxhash.mk @@ -15,14 +15,23 @@ XXHASH_INSTALL_TARGETS = install_xxhsum ifeq ($(BR2_STATIC_LIBS),y) XXHASH_TARGETS += libxxhash.a libxxhash.pc -XXHASH_INSTALL_TARGETS += install_libxxhash.a install_libxxhash.pc +XXHASH_INSTALL_TARGETS += \ + install_libxxhash.a \ + install_libxxhash.includes \ + install_libxxhash.pc else ifeq ($(BR2_SHARED_LIBS),y) XXHASH_TARGETS += libxxhash libxxhash.pc -XXHASH_INSTALL_TARGETS += install_libxxhash install_libxxhash.pc +XXHASH_INSTALL_TARGETS += \ + install_libxxhash \ + install_libxxhash.includes \ + install_libxxhash.pc else ifeq ($(BR2_SHARED_STATIC_LIBS),y) XXHASH_TARGETS += libxxhash.a libxxhash libxxhash.pc XXHASH_INSTALL_TARGETS += \ - install_libxxhash.a install_libxxhash install_libxxhash.pc + install_libxxhash.a \ + install_libxxhash \ + install_libxxhash.includes \ + install_libxxhash.pc endif define XXHASH_BUILD_CMDS From 6a11ca5b218e42c970858ba1ef83ec8572c326c1 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 28 Dec 2022 23:15:22 +0100 Subject: [PATCH 0157/5754] package/rsync: add xxhash support Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/rsync/rsync.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/rsync/rsync.mk b/package/rsync/rsync.mk index 8c7ad462ac..3cdd820fc0 100644 --- a/package/rsync/rsync.mk +++ b/package/rsync/rsync.mk @@ -19,7 +19,6 @@ RSYNC_CONF_OPTS = \ --with-included-popt=no \ --disable-roll-simd \ --disable-openssl \ - --disable-xxhash \ --disable-zstd \ --disable-lz4 \ --disable-md5-asm @@ -30,4 +29,11 @@ else RSYNC_CONF_OPTS += --disable-acl-support endif +ifeq ($(BR2_PACKAGE_XXHASH),y) +RSYNC_DEPENDENCIES += xxhash +RSYNC_CONF_OPTS += --enable-xxhash +else +RSYNC_CONF_OPTS += --disable-xxhash +endif + $(eval $(autotools-package)) From 7589bafecd9153d2d7d31978b245e184098753d2 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 28 Dec 2022 23:17:10 +0100 Subject: [PATCH 0158/5754] package/lcms2: bump to version 2.14 https://littlecms.com/blog/2022/11/02/lcms2-2.14 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/lcms2/lcms2.hash | 6 +++--- package/lcms2/lcms2.mk | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/lcms2/lcms2.hash b/package/lcms2/lcms2.hash index d20cf601fb..700b9746f1 100644 --- a/package/lcms2/lcms2.hash +++ b/package/lcms2/lcms2.hash @@ -1,5 +1,5 @@ -# From https://sourceforge.net/projects/lcms/files/lcms/2.13 -sha1 72d0a0b7fbaeca12eb0186ab5728eb0f26806b22 lcms2-2.13.1.tar.gz +# From https://sourceforge.net/projects/lcms/files/lcms/2.14 +sha1 94350a2638fe58da736e8726048c859b46a69e6f lcms2-2.14.tar.gz # Locally computed: -sha256 d473e796e7b27c5af01bd6d1552d42b45b43457e7182ce9903f38bb748203b88 lcms2-2.13.1.tar.gz +sha256 28474ea6f6591c4d4cee972123587001a4e6e353412a41b3e9e82219818d5740 lcms2-2.14.tar.gz sha256 46d4e05af3bce75332a12d01f19bcce7e32b6bac544be28a64043d0231291e31 COPYING diff --git a/package/lcms2/lcms2.mk b/package/lcms2/lcms2.mk index 63750c43f2..743b0ec858 100644 --- a/package/lcms2/lcms2.mk +++ b/package/lcms2/lcms2.mk @@ -4,9 +4,8 @@ # ################################################################################ -LCMS2_VERSION_MAJOR = 2.13 -LCMS2_VERSION = $(LCMS2_VERSION_MAJOR).1 -LCMS2_SITE = http://downloads.sourceforge.net/project/lcms/lcms/$(LCMS2_VERSION_MAJOR) +LCMS2_VERSION = 2.14 +LCMS2_SITE = http://downloads.sourceforge.net/project/lcms/lcms/$(LCMS2_VERSION) LCMS2_LICENSE = MIT LCMS2_LICENSE_FILES = COPYING LCMS2_CPE_ID_VENDOR = littlecms From cdb77d0b86ca7e62b61d7f7e7947af591fe47e71 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 28 Dec 2022 23:40:43 +0100 Subject: [PATCH 0159/5754] package/gr-osmosdr: bump to version 0.2.4 This bump will fix the following build failure raised since bump of gnuradio to version 3.10.4.0 in commit e37c110bead8b7b35cd97915673fa785ccb39f2d thanks to https://github.com/osmocom/gr-osmosdr/commit/159885f9e67101834c100ceb7affc122e3f98bac: /home/autobuild/autobuild/instance-20/output-1/build/gr-osmosdr-0.2.3/lib/source_impl.cc: In static member function 'static osmosdr::source::sptr osmosdr::source::make(const string&)': /home/autobuild/autobuild/instance-20/output-1/build/gr-osmosdr-0.2.3/lib/source_impl.cc:105:36: error: could not convert 'gnuradio::get_initial_sptr(T*) [with T = source_impl]()' from 'std::shared_ptr' to 'osmosdr::source::sptr' {aka 'boost::shared_ptr'} 105 | return gnuradio::get_initial_sptr( new source_impl(args) ); | ~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~ | | | std::shared_ptr https://github.com/osmocom/gr-osmosdr/releases/tag/v0.2.4 Fixes: - http://autobuild.buildroot.org/results/5af61d6fb8f8c5d5f91c74a6ef66800236d7bf12 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/gr-osmosdr/gr-osmosdr.hash | 2 +- package/gr-osmosdr/gr-osmosdr.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gr-osmosdr/gr-osmosdr.hash b/package/gr-osmosdr/gr-osmosdr.hash index 95f1137e38..b5ac50c4ed 100644 --- a/package/gr-osmosdr/gr-osmosdr.hash +++ b/package/gr-osmosdr/gr-osmosdr.hash @@ -1,3 +1,3 @@ # Locally calculated: -sha256 11b1eb13725ced5ded9121a10aaf7bccf2430c5c69d020791408219968665b71 gr-osmosdr-0.2.3.tar.gz +sha256 28b6f2768aee7b397b227e9e70822e28de3b4c5362a5d14646a0948a48094a63 gr-osmosdr-0.2.4.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/gr-osmosdr/gr-osmosdr.mk b/package/gr-osmosdr/gr-osmosdr.mk index 870db60c55..89907c1baa 100644 --- a/package/gr-osmosdr/gr-osmosdr.mk +++ b/package/gr-osmosdr/gr-osmosdr.mk @@ -4,7 +4,7 @@ # ################################################################################ -GR_OSMOSDR_VERSION = 0.2.3 +GR_OSMOSDR_VERSION = 0.2.4 GR_OSMOSDR_SITE = $(call github,osmocom,gr-osmosdr,v$(GR_OSMOSDR_VERSION)) GR_OSMOSDR_LICENSE = GPL-3.0+ GR_OSMOSDR_LICENSE_FILES = COPYING From 7a2afdb7b1180bed3b6ad92c22c908805467ead3 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 28 Dec 2022 23:50:21 +0100 Subject: [PATCH 0160/5754] package/mutt: bump to version 2.2.9 Mutt 2.2.9 was released on November 12, 2022. This is a bug-fix release, fixing a build issue with recent GPGME releases. Mutt 2.2.8 was released on November 5, 2022. This is a bug-fix release, fixing a possible crash when using GPGME to view an application/pgp key block. It also makes some changes to resizing and window size logic, and enables batch-mode IMAP Fcc'ing. https://gitlab.com/muttmua/mutt/-/blob/mutt-2-2-9-rel/ChangeLog Signed-off-by: Fabrice Fontaine 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 27e439183a..c475641ab5 100644 --- a/package/mutt/mutt.hash +++ b/package/mutt/mutt.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 eb13858f58bb369f477bf652d90e9b6aaddd0d610acbea3455049e5efad36df1 mutt-2.2.7.tar.gz +sha256 fa531b231d58fe1f30ceda0ed626683ea9ebdfb76ce47ef8bb27c2f77422cffb mutt-2.2.9.tar.gz sha256 732f24b69a6c71cd8e01e4672bb8e12cc1cbb88a50a4665e6ca4fd95000a57ee GPL diff --git a/package/mutt/mutt.mk b/package/mutt/mutt.mk index 7a4bc1b10c..0a98396d88 100644 --- a/package/mutt/mutt.mk +++ b/package/mutt/mutt.mk @@ -4,7 +4,7 @@ # ################################################################################ -MUTT_VERSION = 2.2.7 +MUTT_VERSION = 2.2.9 MUTT_SITE = https://bitbucket.org/mutt/mutt/downloads MUTT_LICENSE = GPL-2.0+ MUTT_LICENSE_FILES = GPL From 96d3e5fd2f5310e9f626084669a9ddaa55c92eda Mon Sep 17 00:00:00 2001 From: Joel Carlson Date: Wed, 28 Dec 2022 16:03:26 -0700 Subject: [PATCH 0161/5754] package/capnproto: bump version to 0.10.3 The 0.10 line offers minor improvements and bug fixes. The previous security bump from 0.9.1 to 0.9.2 fixed CVE-2022-46149, which was also present in 0.10.2, but is fixed within 0.10.3. Signed-off-by: Joel Carlson Signed-off-by: Thomas Petazzoni --- package/capnproto/capnproto.hash | 2 +- package/capnproto/capnproto.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/capnproto/capnproto.hash b/package/capnproto/capnproto.hash index c3233e7c8b..0faf69d069 100644 --- a/package/capnproto/capnproto.hash +++ b/package/capnproto/capnproto.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4fe1ca8ab90859f33f08d2c4fcd7099e2983b0b946beecebd2fe051e3a64c67e capnproto-0.9.2.tar.gz +sha256 e07446f56043c983e009038e69d18ff86a2924909f0b518ccf47eccf5ac03919 capnproto-0.10.3.tar.gz sha256 9564998c8d7f270a61a8b89869a8d17a9d5e3783b64027788b5e339ec8479e10 LICENSE diff --git a/package/capnproto/capnproto.mk b/package/capnproto/capnproto.mk index 23f128455a..84acf5fc65 100644 --- a/package/capnproto/capnproto.mk +++ b/package/capnproto/capnproto.mk @@ -4,7 +4,7 @@ # ################################################################################ -CAPNPROTO_VERSION = 0.9.2 +CAPNPROTO_VERSION = 0.10.3 CAPNPROTO_SITE = $(call github,capnproto,capnproto,v$(CAPNPROTO_VERSION)) CAPNPROTO_LICENSE = MIT CAPNPROTO_LICENSE_FILES = LICENSE From 08ca8ff727c87fce2c6edcb9fc2df0885c22543b Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 29 Dec 2022 09:48:14 +0100 Subject: [PATCH 0162/5754] package/tiff: add libdeflate optional dependency libdeflate is an optional dependency which is enabled by default since version 4.2.0 and https://gitlab.com/libtiff/libtiff/-/commit/3a2de853a932bd0ea79d1677d319841edb736c38 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/tiff/Config.in | 5 +++++ package/tiff/tiff.mk | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/package/tiff/Config.in b/package/tiff/Config.in index f842c2ead8..cc9aa5cfd0 100644 --- a/package/tiff/Config.in +++ b/package/tiff/Config.in @@ -11,6 +11,11 @@ config BR2_PACKAGE_TIFF_CCITT bool "CCITT Group 3 & 4 support" default y +config BR2_PACKAGE_TIFF_LIBDEFLATE + bool "Libdeflate usage (still requires Zlib)" + select BR2_PACKAGE_LIBDEFLATE + select BR2_PACKAGE_TIFF_ZLIB + config BR2_PACKAGE_TIFF_PACKBITS bool "Macintosh PackBits algorithm" default y diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk index 7981bdf2c9..a753065fde 100644 --- a/package/tiff/tiff.mk +++ b/package/tiff/tiff.mk @@ -33,6 +33,13 @@ ifneq ($(BR2_PACKAGE_TIFF_CCITT),y) TIFF_CONF_OPTS += --disable-ccitt endif +ifeq ($(BR2_PACKAGE_TIFF_LIBDEFLATE),y) +TIFF_CONF_OPTS += --enable-libdeflate +TIFF_DEPENDENCIES += libdeflate +else +TIFF_CONF_OPTS += --disable-libdeflate +endif + ifneq ($(BR2_PACKAGE_TIFF_PACKBITS),y) TIFF_CONF_OPTS += --disable-packbits endif From 909e10a422df33cd67e6f0fc6ad628ee2c1fb933 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 18 Dec 2022 23:03:17 +0100 Subject: [PATCH 0163/5754] package/linux-firmware: add RTL8125B NIC firmware Needed due to kernel commit: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=0439297be95111cf9ef5ece2091af16d140ce2ef Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/linux-firmware/linux-firmware.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index 200b4ca564..526e8c1c44 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -584,6 +584,7 @@ LINUX_FIRMWARE_FILES += \ rtl_nic/rtl8107e-1.fw \ rtl_nic/rtl8107e-2.fw \ rtl_nic/rtl8125a-3.fw \ + rtl_nic/rtl8125b-2.fw \ rtl_nic/rtl8168d-1.fw \ rtl_nic/rtl8168d-2.fw \ rtl_nic/rtl8168e-1.fw \ From 7854488512a96cbcb2d48313b89c7d085a1c2cfb Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 18 Dec 2022 23:03:18 +0100 Subject: [PATCH 0164/5754] package/linux-firmware: bump to version 20221214 Update WHENCE file hash due to date/firmware file updates: https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/commit/?id=32d8681d21f2eef052cadfdfafc47e02eed6c2b2 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 321436fb61..6bbc2f9c77 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 c0ddffbbcf30f2e015bddd5c6d3ce1f13976b906aceabda4a57e3c41a3190701 linux-firmware-20221109.tar.xz +sha256 e793783e92acbde549965521462d1d1327827360664cf242dbda08f075654331 linux-firmware-20221214.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 3461a8c8bddaa7b77f489f339abf90e4930fc0cde27915324781d12bd0828f1c WHENCE +sha256 744babd4eae138ccfb5bd343b1589912b9839274f8a794af0b6c9b451df73579 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 526e8c1c44..6990ef38ad 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -LINUX_FIRMWARE_VERSION = 20221109 +LINUX_FIRMWARE_VERSION = 20221214 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 f99714d90e08994c697576ca2030cb9392d7b63e Mon Sep 17 00:00:00 2001 From: Lang Daniel Date: Mon, 19 Dec 2022 12:11:30 +0000 Subject: [PATCH 0165/5754] package/dbus-cxx: bump to version 2.3.1 Signed-off-by: Daniel Lang Signed-off-by: Thomas Petazzoni --- 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 acb059b91d..6a7a634ced 100644 --- a/package/dbus-cxx/dbus-cxx.hash +++ b/package/dbus-cxx/dbus-cxx.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 45663b6dbc289f133dfdcd8b8de771de3a2d54588954c2eec3f97888b03bd8ad dbus-cxx-2.3.0.tar.gz +sha256 88d4bd1d9af8563bda03f24b26ffe4efbc555ca82ac664ced572b053928f739a dbus-cxx-2.3.1.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 43556195c7..554acaa67d 100644 --- a/package/dbus-cxx/dbus-cxx.mk +++ b/package/dbus-cxx/dbus-cxx.mk @@ -4,7 +4,7 @@ # ################################################################################ -DBUS_CXX_VERSION = 2.3.0 +DBUS_CXX_VERSION = 2.3.1 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 369ff9a88ff8e88b78287e37fbaf191e57598be2 Mon Sep 17 00:00:00 2001 From: Gleb Mazovetskiy Date: Mon, 19 Dec 2022 17:39:34 +0000 Subject: [PATCH 0166/5754] package/libmodplug: update to git version The libmodplug release has not been updated for over 5 years. The git version contains many bug fixes, including for OOB accesses, unaligned reads and writes, etc. This git repository is the official home of libmodplug (by the original author), however a new release does not seem likely anytime soon: there are multiple open issues in the repository asking the author to tag a release, all without a response. Update buildroot to the current version of libmodplug from the official git repository. The build system changed from autotools to cmake since the last version. We add a _CPE_ID_VERSION variable pointing to the latest stable version, so that we don't get notified about all older CVEs that we are not affected by. Signed-off-by: Gleb Mazovetskiy Signed-off-by: Thomas Petazzoni --- package/libmodplug/libmodplug.hash | 2 +- package/libmodplug/libmodplug.mk | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/package/libmodplug/libmodplug.hash b/package/libmodplug/libmodplug.hash index e75152e27f..01ff71014c 100644 --- a/package/libmodplug/libmodplug.hash +++ b/package/libmodplug/libmodplug.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 457ca5a6c179656d66c01505c0d95fafaead4329b9dbaa0f997d00a3508ad9de libmodplug-0.8.9.0.tar.gz +sha256 d145910ca10c3ecab0019d45be7e31ea6be1d1ee951ef0e1f747c9752d20f043 libmodplug-d1b97ed.tar.gz sha256 49942e7b3b175f549e751feb08b5270ca6f6c5fb7a1be9f9517db275ec32c92e COPYING diff --git a/package/libmodplug/libmodplug.mk b/package/libmodplug/libmodplug.mk index 98c38a3b00..735d0e704d 100644 --- a/package/libmodplug/libmodplug.mk +++ b/package/libmodplug/libmodplug.mk @@ -4,11 +4,14 @@ # ################################################################################ -LIBMODPLUG_VERSION = 0.8.9.0 -LIBMODPLUG_SITE = http://downloads.sourceforge.net/project/modplug-xmms/libmodplug/$(LIBMODPLUG_VERSION) +LIBMODPLUG_VERSION = d1b97ed +LIBMODPLUG_SITE = $(call github,Konstanty,libmodplug,$(LIBMODPLUG_VERSION)) LIBMODPLUG_INSTALL_STAGING = YES LIBMODPLUG_LICENSE = Public Domain LIBMODPLUG_LICENSE_FILES = COPYING LIBMODPLUG_CPE_ID_VENDOR = konstanty_bialkowski +# Our version is actually newer than this, but having this allows to +# not have reports about CVEs for versions older than 0.8.9.0. +LIBMODPLUG_CPE_ID_VERSION = 0.8.9.0 -$(eval $(autotools-package)) +$(eval $(cmake-package)) From 7e4b0d8be54ce6dd9c54f1c04eeb752db2f0dcf3 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Mon, 19 Dec 2022 22:33:43 +0100 Subject: [PATCH 0167/5754] package/perl-image-exiftool: new package Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/perl-image-exiftool/Config.in | 8 ++++++++ .../perl-image-exiftool/perl-image-exiftool.hash | 6 ++++++ package/perl-image-exiftool/perl-image-exiftool.mk | 14 ++++++++++++++ 4 files changed, 29 insertions(+) create mode 100644 package/perl-image-exiftool/Config.in create mode 100644 package/perl-image-exiftool/perl-image-exiftool.hash create mode 100644 package/perl-image-exiftool/perl-image-exiftool.mk diff --git a/package/Config.in b/package/Config.in index 0c77f7c022..41e15ca77f 100644 --- a/package/Config.in +++ b/package/Config.in @@ -839,6 +839,7 @@ menu "Perl libraries/modules" source "package/perl-http-multipartparser/Config.in" source "package/perl-http-negotiate/Config.in" source "package/perl-i18n/Config.in" + source "package/perl-image-exiftool/Config.in" source "package/perl-io-html/Config.in" source "package/perl-io-interface/Config.in" source "package/perl-io-socket-multicast/Config.in" diff --git a/package/perl-image-exiftool/Config.in b/package/perl-image-exiftool/Config.in new file mode 100644 index 0000000000..3bc72ba634 --- /dev/null +++ b/package/perl-image-exiftool/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PERL_IMAGE_EXIFTOOL + bool "perl-image-exiftool" + help + ExifTool is a customizable set of Perl modules plus a + full-featured command-line application for reading and writing + meta information in a wide variety of image files. + + https://metacpan.org/release/Image-ExifTool diff --git a/package/perl-image-exiftool/perl-image-exiftool.hash b/package/perl-image-exiftool/perl-image-exiftool.hash new file mode 100644 index 0000000000..ac148aa89b --- /dev/null +++ b/package/perl-image-exiftool/perl-image-exiftool.hash @@ -0,0 +1,6 @@ +# retrieved by scancpan from http://cpan.metacpan.org/ +md5 75dd9d375c1c4798a082dda79eaf6ba7 Image-ExifTool-12.50.tar.gz +sha256 bce841fc5c10302f0f3ef7678c3bf146953a8c065c0ba18c41f734007e2ec0a8 Image-ExifTool-12.50.tar.gz + +# computed by scancpan +sha256 63502bb7fd68b3b8265304d88932f70f1be82751cbc37936d1d62956582310fe README diff --git a/package/perl-image-exiftool/perl-image-exiftool.mk b/package/perl-image-exiftool/perl-image-exiftool.mk new file mode 100644 index 0000000000..42adb04d3a --- /dev/null +++ b/package/perl-image-exiftool/perl-image-exiftool.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# perl-image-exiftool +# +################################################################################ + +PERL_IMAGE_EXIFTOOL_VERSION = 12.50 +PERL_IMAGE_EXIFTOOL_SOURCE = Image-ExifTool-$(PERL_IMAGE_EXIFTOOL_VERSION).tar.gz +PERL_IMAGE_EXIFTOOL_SITE = $(BR2_CPAN_MIRROR)/authors/id/E/EX/EXIFTOOL +PERL_IMAGE_EXIFTOOL_LICENSE = Artistic or GPL-1.0+ +PERL_IMAGE_EXIFTOOL_LICENSE_FILES = README +PERL_IMAGE_EXIFTOOL_DISTNAME = Image-ExifTool + +$(eval $(perl-package)) From 65d14c82db6e6c4555cc83b65ff22578e4525601 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 12 Dec 2022 08:06:10 -0700 Subject: [PATCH 0168/5754] package/python-aiohttp-remotes: bump to version 1.2.0 Migrate from distutils to flit package infrastructure. Add a patch fixing incorrect flit requires/build-backend in pyproject.toml. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- ...Fix-flit_core-build-requires-backend.patch | 32 +++++++++++++++++++ .../python-aiohttp-remotes.hash | 4 +-- .../python-aiohttp-remotes.mk | 6 ++-- 3 files changed, 37 insertions(+), 5 deletions(-) create mode 100644 package/python-aiohttp-remotes/0001-Fix-flit_core-build-requires-backend.patch diff --git a/package/python-aiohttp-remotes/0001-Fix-flit_core-build-requires-backend.patch b/package/python-aiohttp-remotes/0001-Fix-flit_core-build-requires-backend.patch new file mode 100644 index 0000000000..cf940eaf87 --- /dev/null +++ b/package/python-aiohttp-remotes/0001-Fix-flit_core-build-requires-backend.patch @@ -0,0 +1,32 @@ +From 3d39ee9a03a1c96b8e798dc6acf98165da31da1f Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Fri, 11 Mar 2022 12:59:53 -0700 +Subject: [PATCH] Fix flit_core build requires/backend. + +Only flit_core should be required by pyproject.toml, the regular flit +package is the pep517 frontend which is not what should be set for the +build system. + +Signed-off-by: James Hilliard +[Upstream status: +https://github.com/aio-libs/aiohttp-remotes/pull/355] +--- + pyproject.toml | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pyproject.toml b/pyproject.toml +index 214d64d..8c6b882 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -1,6 +1,6 @@ + [build-system] +-requires=["flit"] +-build-backend="flit.buildapi" ++requires=["flit_core"] ++build-backend="flit_core.buildapi" + + [tool.flit.metadata] + module="aiohttp_remotes" +-- +2.38.1 + diff --git a/package/python-aiohttp-remotes/python-aiohttp-remotes.hash b/package/python-aiohttp-remotes/python-aiohttp-remotes.hash index 595340d5d8..51c5cf08b4 100644 --- a/package/python-aiohttp-remotes/python-aiohttp-remotes.hash +++ b/package/python-aiohttp-remotes/python-aiohttp-remotes.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiohttp-remotes/json -md5 da13880f25ec3b9cf98c7baff92835a2 aiohttp_remotes-1.1.0.tar.gz -sha256 e44f2c5fd5fc3305477c89bb25f14570589100cc58c48b36745d4239839d3174 aiohttp_remotes-1.1.0.tar.gz +md5 c46a71df656e7f1e111684ced68a85d0 aiohttp_remotes-1.2.0.tar.gz +sha256 f95c3a6be5e2de746a85ce9af49ec548da6db8378d7e81bb171ec77b13562a6c aiohttp_remotes-1.2.0.tar.gz # Locally computed sha256 checksums sha256 4e7d0edf250abe2a28027788b8c55a53d1b5c9ff961b8a00643c76aed637ba13 LICENSE diff --git a/package/python-aiohttp-remotes/python-aiohttp-remotes.mk b/package/python-aiohttp-remotes/python-aiohttp-remotes.mk index e2bc3e1c18..e0ec789f41 100644 --- a/package/python-aiohttp-remotes/python-aiohttp-remotes.mk +++ b/package/python-aiohttp-remotes/python-aiohttp-remotes.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_AIOHTTP_REMOTES_VERSION = 1.1.0 +PYTHON_AIOHTTP_REMOTES_VERSION = 1.2.0 PYTHON_AIOHTTP_REMOTES_SOURCE = aiohttp_remotes-$(PYTHON_AIOHTTP_REMOTES_VERSION).tar.gz -PYTHON_AIOHTTP_REMOTES_SITE = https://files.pythonhosted.org/packages/e3/fc/5523010172e2d8685a8934fbb49d564118c9ebc1e4233a62b77310f979db -PYTHON_AIOHTTP_REMOTES_SETUP_TYPE = distutils +PYTHON_AIOHTTP_REMOTES_SITE = https://files.pythonhosted.org/packages/54/05/7c4be6171cc78a13171a4f89e5d308c4a636bdd8ee36101367e99e410ed8 +PYTHON_AIOHTTP_REMOTES_SETUP_TYPE = flit PYTHON_AIOHTTP_REMOTES_LICENSE = MIT PYTHON_AIOHTTP_REMOTES_LICENSE_FILES = LICENSE From 5b86de52da2141ed289ad2892c34d3110d02f7b5 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 29 Dec 2022 10:17:35 +0100 Subject: [PATCH 0169/5754] package/wireshark: security bump to version 3.4.16 Fix CVE-2022-3190: Infinite loop in the F5 Ethernet Trailer protocol dissector in Wireshark 3.6.0 to 3.6.7 and 3.4.0 to 3.4.15 allows denial of service via packet injection or crafted capture file https://www.wireshark.org/security/wnpa-sec-2022-06.html Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- 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 db1f71e9ef..56363e717f 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-3.4.12.txt -sha1 91ca69b0029e58b9c824266237ab392a62f0a248 wireshark-3.4.12.tar.xz -sha256 881a13303e263b7dc7fe337534c8a541d4914552287879bed30bbe76c5bf68ca wireshark-3.4.12.tar.xz +# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-3.4.16.txt +sha1 b0e64d5fdd6701106d94bdc8f59dd40a34c7c807 wireshark-3.4.16.tar.xz +sha256 6acb3155b89b65bcdbcdac7a9e6a59013a6e21d8ae6a8249a9af4fe9ce3d91ba wireshark-3.4.16.tar.xz # Locally calculated sha256 7cdbed2b697efaa45576a033f1ac0e73cd045644a91c79bbf41d4a7d81dac7bf COPYING diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index e5d5e6f677..5da344fc55 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRESHARK_VERSION = 3.4.12 +WIRESHARK_VERSION = 3.4.16 WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.xz WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions WIRESHARK_LICENSE = wireshark license From 3de4ae012141803bdf8abda12e27d10e55f6953f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 29 Dec 2022 10:20:33 +0100 Subject: [PATCH 0170/5754] package/xxhash: optimize XXHASH_{TARGETS, INSTALL_TARGETS} Optimize XXHASH_{TARGETS,INSTALL_TARGETS} as suggested by Thomas Petazzoni in https://patchwork.ozlabs.org/project/buildroot/patch/20221228221522.280696-1-fontaine.fabrice@gmail.com/ Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/xxhash/xxhash.mk | 34 +++++++++++++--------------------- 1 file changed, 13 insertions(+), 21 deletions(-) diff --git a/package/xxhash/xxhash.mk b/package/xxhash/xxhash.mk index 6932113f14..04bc98690f 100644 --- a/package/xxhash/xxhash.mk +++ b/package/xxhash/xxhash.mk @@ -10,28 +10,20 @@ XXHASH_LICENSE = BSD-2-Clause (library), GPL-2.0+ (xxhsum) XXHASH_LICENSE_FILES = LICENSE cli/COPYING XXHASH_INSTALL_STAGING = YES -XXHASH_TARGETS = xxhsum -XXHASH_INSTALL_TARGETS = install_xxhsum - -ifeq ($(BR2_STATIC_LIBS),y) -XXHASH_TARGETS += libxxhash.a libxxhash.pc -XXHASH_INSTALL_TARGETS += \ - install_libxxhash.a \ - install_libxxhash.includes \ - install_libxxhash.pc -else ifeq ($(BR2_SHARED_LIBS),y) -XXHASH_TARGETS += libxxhash libxxhash.pc -XXHASH_INSTALL_TARGETS += \ - install_libxxhash \ - install_libxxhash.includes \ - install_libxxhash.pc -else ifeq ($(BR2_SHARED_STATIC_LIBS),y) -XXHASH_TARGETS += libxxhash.a libxxhash libxxhash.pc -XXHASH_INSTALL_TARGETS += \ - install_libxxhash.a \ - install_libxxhash \ +XXHASH_TARGETS = xxhsum libxxhash.pc +XXHASH_INSTALL_TARGETS = \ install_libxxhash.includes \ - install_libxxhash.pc + install_libxxhash.pc \ + install_xxhsum + +ifeq ($(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS),y) +XXHASH_TARGETS += libxxhash.a +XXHASH_INSTALL_TARGETS += install_libxxhash.a +endif + +ifeq ($(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),y) +XXHASH_TARGETS += libxxhash +XXHASH_INSTALL_TARGETS += install_libxxhash endif define XXHASH_BUILD_CMDS From 83a3744c73d5630ded3f85dc801fe3827ab82889 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 29 Dec 2022 10:25:39 +0100 Subject: [PATCH 0171/5754] package/rsync: add zstd support Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/rsync/rsync.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/rsync/rsync.mk b/package/rsync/rsync.mk index 3cdd820fc0..7a32c4f8b1 100644 --- a/package/rsync/rsync.mk +++ b/package/rsync/rsync.mk @@ -19,7 +19,6 @@ RSYNC_CONF_OPTS = \ --with-included-popt=no \ --disable-roll-simd \ --disable-openssl \ - --disable-zstd \ --disable-lz4 \ --disable-md5-asm @@ -36,4 +35,11 @@ else RSYNC_CONF_OPTS += --disable-xxhash endif +ifeq ($(BR2_PACKAGE_ZSTD),y) +RSYNC_DEPENDENCIES += zstd +RSYNC_CONF_OPTS += --enable-zstd +else +RSYNC_CONF_OPTS += --disable-zstd +endif + $(eval $(autotools-package)) From 9511fe9b1c8fbb797f50dde708f7aae50e6d6a46 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 29 Dec 2022 10:25:40 +0100 Subject: [PATCH 0172/5754] package/rsync: add lz4 support Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/rsync/rsync.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/rsync/rsync.mk b/package/rsync/rsync.mk index 7a32c4f8b1..9c7824f575 100644 --- a/package/rsync/rsync.mk +++ b/package/rsync/rsync.mk @@ -19,7 +19,6 @@ RSYNC_CONF_OPTS = \ --with-included-popt=no \ --disable-roll-simd \ --disable-openssl \ - --disable-lz4 \ --disable-md5-asm ifeq ($(BR2_PACKAGE_ACL),y) @@ -28,6 +27,13 @@ else RSYNC_CONF_OPTS += --disable-acl-support endif +ifeq ($(BR2_PACKAGE_LZ4),y) +RSYNC_DEPENDENCIES += lz4 +RSYNC_CONF_OPTS += --enable-lz4 +else +RSYNC_CONF_OPTS += --disable-lz4 +endif + ifeq ($(BR2_PACKAGE_XXHASH),y) RSYNC_DEPENDENCIES += xxhash RSYNC_CONF_OPTS += --enable-xxhash From 80fa5672da85a110e60be0d2143e85f9e08a0f4a Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 29 Dec 2022 10:25:41 +0100 Subject: [PATCH 0173/5754] package/rsync: add openssl support Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/rsync/rsync.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/rsync/rsync.mk b/package/rsync/rsync.mk index 9c7824f575..d2fa47d39a 100644 --- a/package/rsync/rsync.mk +++ b/package/rsync/rsync.mk @@ -18,7 +18,6 @@ RSYNC_CONF_OPTS = \ --with-included-zlib=no \ --with-included-popt=no \ --disable-roll-simd \ - --disable-openssl \ --disable-md5-asm ifeq ($(BR2_PACKAGE_ACL),y) @@ -34,6 +33,13 @@ else RSYNC_CONF_OPTS += --disable-lz4 endif +ifeq ($(BR2_PACKAGE_OPENSSL),y) +RSYNC_DEPENDENCIES += openssl +RSYNC_CONF_OPTS += --enable-openssl +else +RSYNC_CONF_OPTS += --disable-openssl +endif + ifeq ($(BR2_PACKAGE_XXHASH),y) RSYNC_DEPENDENCIES += xxhash RSYNC_CONF_OPTS += --enable-xxhash From f934a00928b413fb3c190749a5bda578c6c02255 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 29 Dec 2022 10:30:27 +0100 Subject: [PATCH 0174/5754] package/tiff: add zstd optional dependency zstd is an optional dependency which is enabled by default since version 4.0.10 and https://gitlab.com/libtiff/libtiff/-/commit/62b9df5d2af68262fa6fcfb66086bf128f7d67c3 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/tiff/Config.in | 4 ++++ package/tiff/tiff.mk | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/package/tiff/Config.in b/package/tiff/Config.in index cc9aa5cfd0..d1004d6668 100644 --- a/package/tiff/Config.in +++ b/package/tiff/Config.in @@ -72,4 +72,8 @@ config BR2_PACKAGE_TIFF_UTILITIES help Install all tiff utilities. +config BR2_PACKAGE_TIFF_ZSTD + bool "ZSTD compression" + select BR2_PACKAGE_ZSTD + endif diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk index a753065fde..90b28ff37a 100644 --- a/package/tiff/tiff.mk +++ b/package/tiff/tiff.mk @@ -100,5 +100,12 @@ else TIFF_CONF_OPTS += --disable-tools endif +ifeq ($(BR2_PACKAGE_TIFF_ZSTD),y) +TIFF_CONF_OPTS += --enable-zstd +TIFF_DEPENDENCIES += zstd +else +TIFF_CONF_OPTS += --disable-zstd +endif + $(eval $(autotools-package)) $(eval $(host-autotools-package)) From 3fd6ada8dbca3370b9bb67feb2971e637cb4b11f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 29 Dec 2022 10:30:28 +0100 Subject: [PATCH 0175/5754] package/tiff: add webp optional dependency webp is an optional dependency which is enabled by default since version 4.0.10 and https://gitlab.com/libtiff/libtiff/-/commit/9eacd59fecc4ef593ac17689bc530ab451c8ec14 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/tiff/Config.in | 4 ++++ package/tiff/tiff.mk | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/package/tiff/Config.in b/package/tiff/Config.in index d1004d6668..b9e3656e6f 100644 --- a/package/tiff/Config.in +++ b/package/tiff/Config.in @@ -72,6 +72,10 @@ config BR2_PACKAGE_TIFF_UTILITIES help Install all tiff utilities. +config BR2_PACKAGE_TIFF_WEBP + bool "WEBP compression" + select BR2_PACKAGE_WEBP + config BR2_PACKAGE_TIFF_ZSTD bool "ZSTD compression" select BR2_PACKAGE_ZSTD diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk index 90b28ff37a..6d761ad678 100644 --- a/package/tiff/tiff.mk +++ b/package/tiff/tiff.mk @@ -100,6 +100,13 @@ else TIFF_CONF_OPTS += --disable-tools endif +ifeq ($(BR2_PACKAGE_TIFF_WEBP),y) +TIFF_CONF_OPTS += --enable-webp +TIFF_DEPENDENCIES += webp +else +TIFF_CONF_OPTS += --disable-webp +endif + ifeq ($(BR2_PACKAGE_TIFF_ZSTD),y) TIFF_CONF_OPTS += --enable-zstd TIFF_DEPENDENCIES += zstd From db853e24b534d54f281cecbed0eb17412cdfc710 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 29 Dec 2022 10:30:29 +0100 Subject: [PATCH 0176/5754] package/tiff: add C++ support Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/tiff/tiff.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk index 6d761ad678..c2a4108f35 100644 --- a/package/tiff/tiff.mk +++ b/package/tiff/tiff.mk @@ -14,7 +14,6 @@ TIFF_INSTALL_STAGING = YES TIFF_CONF_OPTS = \ --disable-contrib \ - --disable-cxx \ --disable-tests \ --without-x @@ -29,6 +28,12 @@ HOST_TIFF_CONF_OPTS = \ --disable-tests HOST_TIFF_DEPENDENCIES = host-pkgconf +ifeq ($(BR2_INSTALL_LIBSTDCPP),y) +TIFF_CONF_OPTS += --enable-cxx +else +TIFF_CONF_OPTS += --disable-cxx +endif + ifneq ($(BR2_PACKAGE_TIFF_CCITT),y) TIFF_CONF_OPTS += --disable-ccitt endif From 72576a661faf8e9d8021a8b110ce9318a9bc8f38 Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Mon, 12 Dec 2022 10:50:49 +0100 Subject: [PATCH 0177/5754] package/python-munch: select missing runtime dependencies munch requires python-setuptools and python-six packages at runtime. Signed-off-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- package/python-munch/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-munch/Config.in b/package/python-munch/Config.in index 9db2623674..ceb9fbaf32 100644 --- a/package/python-munch/Config.in +++ b/package/python-munch/Config.in @@ -1,5 +1,7 @@ config BR2_PACKAGE_PYTHON_MUNCH bool "python-munch" + select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime + select BR2_PACKAGE_PYTHON_SIX # runtime help Munch is a dictionary that supports attribute-style access, a la JavaScript. From 2f0a2a43bbfcb2aef1569b48277933264ec25feb Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Mon, 12 Dec 2022 10:50:50 +0100 Subject: [PATCH 0178/5754] support/testing: add test for python-munch Signed-off-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 ++ .../tests/package/sample_python_munch.py | 20 +++++++++++++++++++ .../tests/package/test_python_munch.py | 12 +++++++++++ 3 files changed, 34 insertions(+) create mode 100644 support/testing/tests/package/sample_python_munch.py create mode 100644 support/testing/tests/package/test_python_munch.py diff --git a/DEVELOPERS b/DEVELOPERS index 0eea9c33d9..3217823b6f 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -3133,10 +3133,12 @@ F: package/x11r7/xapp_xinput-calibrator/ F: package/zlog/ F: support/testing/tests/package/sample_python_dicttoxml2.py F: support/testing/tests/package/sample_python_dtschema.py +F: support/testing/tests/package/sample_python_munch.py F: support/testing/tests/package/test_libftdi1.py F: support/testing/tests/package/test_python_can.py F: support/testing/tests/package/test_python_dicttoxml2.py F: support/testing/tests/package/test_python_dtschema.py +F: support/testing/tests/package/test_python_munch.py F: utils/scanpypi N: Yunhao Tian diff --git a/support/testing/tests/package/sample_python_munch.py b/support/testing/tests/package/sample_python_munch.py new file mode 100644 index 0000000000..b45bec7b7e --- /dev/null +++ b/support/testing/tests/package/sample_python_munch.py @@ -0,0 +1,20 @@ +from munch import Munch + +b = Munch() +b.hello = 'world' +assert b.hello == 'world' +b['hello'] += "!" +assert b.hello == 'world!' +b.foo = Munch(lol=True) +assert b.foo.lol is True +assert b.foo is b['foo'] + +assert sorted(b.keys()) == ['foo', 'hello'] + +b.update({'ponies': 'are pretty!'}, hello=42) +assert b == Munch({'ponies': 'are pretty!', 'foo': Munch({'lol': True}), 'hello': 42}) + +assert sorted([(k, b[k]) for k in b]) == [('foo', Munch({'lol': True})), ('hello', 42), ('ponies', 'are pretty!')] + +format_munch = Munch(knights='lolcats', ni='can haz') +assert "The {knights} who say {ni}!".format(**format_munch) == 'The lolcats who say can haz!' diff --git a/support/testing/tests/package/test_python_munch.py b/support/testing/tests/package/test_python_munch.py new file mode 100644 index 0000000000..6853bbaac7 --- /dev/null +++ b/support/testing/tests/package/test_python_munch.py @@ -0,0 +1,12 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3Munch(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_MUNCH=y + """ + sample_scripts = ["tests/package/sample_python_munch.py"] + timeout = 40 From 44be514b21fd94096702b80c62d46c31d72f15a5 Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Tue, 27 Dec 2022 08:48:42 -0300 Subject: [PATCH 0179/5754] package/qemu: refactor target emulator selection The current mechanism to select emulation targets works this way: - BR2_PACKAGE_QEMU_SYSTEM selects the "system" (softmmu) targets. It selects FDT and creates a dependency on the "dtc" package but this is not always necessary. Only 14 system targets, out of 31, actually require FDT. - BR2_PACKAGE_QEMU_LINUX_USER selects the "linux-user" targets. It does not select FDT, which is not required by linux-user emulators. - Alternatively, we fill BR2_PACKAGE_QEMU_CUSTOM_TARGETS with a list of emulators (e.g. "x86_64-softmmu x86_64-linux-user"). Then we pass "--enable-system --enable-linux-user --target-list="..." to the configure script, so QEMU builds its list of default targets, from which it checks if the specified subset is valid. Since CUSTOM_TARGETS does not select FDT, we can get build errors like this: ../meson.build:2778:2: ERROR: Problem encountered: fdt not available but required by targets x86_64-softmmu We could select FDT when CUSTOM_TARGETS is set, but this would force an unnecessary dependency on dtc, as BR2_PACKAGE_QEMU_SYSTEM does. In order to fix these problems, refactor the package configuration: - Keep BR2_PACKAGE_QEMU_SYSTEM and BR2_PACKAGE_QEMU_LINUX_USER, which by default build all corresponding target emulators. - Add a BR2_PACKAGE_QEMU_CHOOSE_TARGETS config, to permit choosing the desired emulators. - Add configs for each supported target. They select FDT, when needed. - Move QEMU to a separate menu, since the number of configuration itens became too large. - Select BR2_LEGACY if BR2_PACKAGE_QEMU_CUSTOM_TARGETS is set, because this situation requires user intervention to reconfigure the package. - Reorganize the make file accordingly. Selecting CHOOSE_TARGETS without choosing at least one emulator is considered an error. Notes about the list of enabled targets: - when the user enables both system and user emulation, we provide no way to be able to build all system bt only parts of user (or the other way around), because the qemu build system does not allow that: when a list of target is passed, it applies to both system and user emulation; - as a consequence and in the same spirit, we also do not sanity-check that at least one system, resp. user, target is enabled when system, resp. user, emulation is enabled; we only require that one target is enabled, so that the list is not empty. Signed-off-by: Carlos Santos [yann.morin.1998@free.fr: - always build at least user or system - add help text to BR2_PACKAGE_QEMU_CHOOSE_TARGETS - simplify prompt for BR2_PACKAGE_QEMU_CHOOSE_TARGETS - simplify list of targets with unique QEMU_TARGET_LIST_y - extend the commit log with "Notes about the list of enabled targets" ] Signed-off-by: Yann E. MORIN --- Config.in.legacy | 11 ++ package/qemu/Config.in | 287 ++++++++++++++++++++++++++++++++++------- package/qemu/qemu.mk | 91 +++++++++++-- 3 files changed, 329 insertions(+), 60 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index ca25c18b16..6d66f1b958 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,17 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_QEMU_CUSTOM_TARGETS + string "the QEMU specific targets option has been removed" + help + This option has been replaced by a list of individual targets + for the many architectures supported by QEMU. + +config BR2_PACKAGE_QEMU_CUSTOM_TARGETS_WRAP + bool + default y if BR2_PACKAGE_QEMU_CUSTOM_TARGETS != "" + select BR2_LEGACY + config BR2_PACKAGE_XDRIVER_XF86_INPUT_KEYBOARD bool "xf86-input-keyboard removed" help diff --git a/package/qemu/Config.in b/package/qemu/Config.in index 15d6c7d6b5..0f9e353510 100644 --- a/package/qemu/Config.in +++ b/package/qemu/Config.in @@ -17,7 +17,7 @@ comment "QEMU requires a toolchain with wchar, threads, gcc >= 8" depends on !(BR2_TOOLCHAIN_HAS_THREADS && BR2_USE_WCHAR) || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_8 -config BR2_PACKAGE_QEMU +menuconfig BR2_PACKAGE_QEMU bool "QEMU" depends on BR2_PACKAGE_QEMU_ARCH_SUPPORTS_TARGET depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 @@ -27,6 +27,7 @@ config BR2_PACKAGE_QEMU select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_PIXMAN select BR2_PACKAGE_ZLIB + select BR2_PACKAGE_QEMU_SYSTEM if !BR2_PACKAGE_QEMU_LINUX_USER help QEMU is a generic and open source machine emulator and virtualizer. @@ -49,20 +50,13 @@ if BR2_PACKAGE_QEMU comment "Emulators selection" -config BR2_PACKAGE_QEMU_CUSTOM_TARGETS - string "Enable specific targets" +config BR2_PACKAGE_QEMU_SYSTEM + bool "Enable systems emulation" + depends on !BR2_STATIC_LIBS # dtc help - Enter here the list of QEMU targets you want to build. For - example: + Say 'y' to build system emulators/virtualisers. - System emulation | User-land emulation - ----------------------+----------------------- - i386-softmmu | i386-linux-user - arm-softmmu | ppc-linux-user - x86_64-softmmu | sparc-bsd-user - ... | ... - -comment "Networking options" +if BR2_PACKAGE_QEMU_SYSTEM config BR2_PACKAGE_QEMU_SLIRP bool "Enable user mode networking (SLIRP)" @@ -87,69 +81,264 @@ config BR2_PACKAGE_QEMU_SLIRP Notice that this option does not disable other networking modes. -if BR2_PACKAGE_QEMU_CUSTOM_TARGETS = "" - -comment "... or you can select emulator families to enable, below:" +config BR2_PACKAGE_QEMU_SDL + bool "Enable SDL frontend" + select BR2_PACKAGE_SDL2 + help + Say 'y' to enable the SDL frontend, that is, a graphical + window presenting the VM's display. -config BR2_PACKAGE_QEMU_SYSTEM - bool "Enable all systems emulation" - depends on !BR2_STATIC_LIBS # dtc - select BR2_PACKAGE_QEMU_FDT +config BR2_PACKAGE_QEMU_FDT + bool "Enable FDT" + select BR2_PACKAGE_DTC help - Say 'y' to build all system emulators/virtualisers that QEMU - supports. + Say 'y' here to have QEMU capable of constructing Device + Trees, and passing them to the VMs. + +endif # BR2_PACKAGE_QEMU_SYSTEM comment "systems emulation needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS config BR2_PACKAGE_QEMU_LINUX_USER - bool "Enable all Linux user-land emulation" + bool "Enable Linux user-land emulation" # Incompatible "struct sigevent" definition on musl depends on !BR2_TOOLCHAIN_USES_MUSL help - Say 'y' to build all Linux user-land emulators that QEMU - supports. + Say 'y' to build Linux user-land emulators. # Note: bsd-user can not be build on Linux comment "Linux user-land emulation needs a glibc or uClibc toolchain" depends on BR2_TOOLCHAIN_USES_MUSL -endif # BR2_PACKAGE_QEMU_CUSTOM_TARGETS == "" +config BR2_PACKAGE_QEMU_CHOOSE_TARGETS + bool "Select individual emulator targets" + help + By default, all targets (system and/or user, subject to the + corresponding options, above) are built. If you only need a + subset of the emulated targets, say 'y' here and enable at + least one target, below. -config BR2_PACKAGE_QEMU_HAS_EMULS - def_bool y - depends on BR2_PACKAGE_QEMU_SYSTEM || BR2_PACKAGE_QEMU_LINUX_USER || BR2_PACKAGE_QEMU_CUSTOM_TARGETS != "" +if BR2_PACKAGE_QEMU_CHOOSE_TARGETS -if BR2_PACKAGE_QEMU_HAS_EMULS +config BR2_PACKAGE_QEMU_TARGET_AARCH64 + bool "aarch64" + select BR2_PACKAGE_QEMU_FDT if BR2_PACKAGE_QEMU_SYSTEM + help + ARM 64-bit architecture. -comment "Frontends" +config BR2_PACKAGE_QEMU_TARGET_AARCH64_BE + bool "aarch64_be (linux-user, only)" + depends on BR2_PACKAGE_QEMU_LINUX_USER + help + ARM 64-bit architecture, big-endian. -config BR2_PACKAGE_QEMU_SDL - bool "Enable SDL frontend" - depends on !BR2_STATIC_LIBS # sdl2 - select BR2_PACKAGE_SDL2 +config BR2_PACKAGE_QEMU_TARGET_ALPHA + bool "alpha" help - Say 'y' to enable the SDL frontend, that is, a graphical - window presenting the VM's display. + DEC Alpha 64-bit RISC architecture. -comment "SDL frontend needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS +config BR2_PACKAGE_QEMU_TARGET_ARM + bool "arm" + select BR2_PACKAGE_QEMU_FDT if BR2_PACKAGE_QEMU_SYSTEM + help + ARM EABI architecture, little-endian. -comment "Misc. features" +config BR2_PACKAGE_QEMU_TARGET_ARMEB + bool "armeb (linux-user, only)" + depends on BR2_PACKAGE_QEMU_LINUX_USER + help + ARM EABI architecture, big-endian. -config BR2_PACKAGE_QEMU_FDT - bool "Enable FDT" - depends on !BR2_STATIC_LIBS # dtc - select BR2_PACKAGE_DTC +config BR2_PACKAGE_QEMU_TARGET_AVR + bool "avr (system, only)" + depends on BR2_PACKAGE_QEMU_SYSTEM help - Say 'y' here to have QEMU capable of constructing Device - Trees, and passing them to the VMs. + AVR 8-bit microcontroller architecture. -comment "FDT support needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS +config BR2_PACKAGE_QEMU_TARGET_CRIS + bool "cris" + help + ETRAX CRIS microcontroller architecture. + +config BR2_PACKAGE_QEMU_TARGET_HEXAGON + bool "hexagon (linux-user, only)" + depends on BR2_PACKAGE_QEMU_LINUX_USER + help + Qualcomm's Hexagon VLSI DSP architecture. + +config BR2_PACKAGE_QEMU_TARGET_HPPA + bool "hppa" + help + HP PA-RISC architecture. + +config BR2_PACKAGE_QEMU_TARGET_I386 + bool "i386" + select BR2_PACKAGE_QEMU_FDT if BR2_PACKAGE_QEMU_SYSTEM + help + Intel i386 32-bit architecture. + +config BR2_PACKAGE_QEMU_TARGET_LOONGARCH64 + bool "loongarch64" + select BR2_PACKAGE_QEMU_FDT if BR2_PACKAGE_QEMU_SYSTEM + help + Loongson 64-bit RISC architecture. + +config BR2_PACKAGE_QEMU_TARGET_M68K + bool "m68k" + help + Motorola 68000 architecture. + +config BR2_PACKAGE_QEMU_TARGET_MICROBLAZE + bool "microblaze" + select BR2_PACKAGE_QEMU_FDT if BR2_PACKAGE_QEMU_SYSTEM + help + Xilinix MicroBlaze soft processor. + +config BR2_PACKAGE_QEMU_TARGET_MICROBLAZEEL + bool "microblazeel" + select BR2_PACKAGE_QEMU_FDT if BR2_PACKAGE_QEMU_SYSTEM + help + Xilinix MicroBlaze EL soft processor. + +config BR2_PACKAGE_QEMU_TARGET_MIPS + bool "mips" + help + MIPS 32-bit architecture. + +config BR2_PACKAGE_QEMU_TARGET_MIPSEL + bool "mipsel" + help + MIPS 32-bit architecture, little-endian. + +config BR2_PACKAGE_QEMU_TARGET_MIPS64 + bool "mips64" + help + MIPS 64-bit architecture. + +config BR2_PACKAGE_QEMU_TARGET_MIPS64EL + bool "mips64el" + select BR2_PACKAGE_QEMU_FDT if BR2_PACKAGE_QEMU_SYSTEM + help + MIPS 64-bit architecture, little-endian. + +config BR2_PACKAGE_QEMU_TARGET_MIPSN32 + bool "mipsn32 (linux-user, only)" + depends on BR2_PACKAGE_QEMU_LINUX_USER + help + MIPS N32 architecture. + +config BR2_PACKAGE_QEMU_TARGET_MIPSN32EL + bool "mipsn32el (linux-user, only)" + depends on BR2_PACKAGE_QEMU_LINUX_USER + help + MIPS N32 architecture, little-endian. + +config BR2_PACKAGE_QEMU_TARGET_NIOS2 + bool "nios2" + help + Nios II architecture. + +config BR2_PACKAGE_QEMU_TARGET_OR1K + bool "or1k" + select BR2_PACKAGE_QEMU_FDT if BR2_PACKAGE_QEMU_SYSTEM + help + OpenRISC 1000 architecture. + +config BR2_PACKAGE_QEMU_TARGET_PPC + bool "ppc" + select BR2_PACKAGE_QEMU_FDT if BR2_PACKAGE_QEMU_SYSTEM + help + PoewerPC 32-bit architecture. + +config BR2_PACKAGE_QEMU_TARGET_PPC64 + bool "ppc64" + select BR2_PACKAGE_QEMU_FDT if BR2_PACKAGE_QEMU_SYSTEM + help + PoewerPC 64-bit architecture. + +config BR2_PACKAGE_QEMU_TARGET_PPC64LE + bool "ppc64le (linux-user, only)" + depends on BR2_PACKAGE_QEMU_LINUX_USER + help + PoewerPC 64-bit architecture, little-endian. + +config BR2_PACKAGE_QEMU_TARGET_RISCV32 + bool "riscv32" + select BR2_PACKAGE_QEMU_FDT if BR2_PACKAGE_QEMU_SYSTEM + help + RISC-V 33-bit architecture. + +config BR2_PACKAGE_QEMU_TARGET_RISCV64 + bool "riscv64" + select BR2_PACKAGE_QEMU_FDT if BR2_PACKAGE_QEMU_SYSTEM + help + RISC-V 64-bit architecture. + +config BR2_PACKAGE_QEMU_TARGET_RX + bool "rx (system-only)" + depends on BR2_PACKAGE_QEMU_SYSTEM + select BR2_PACKAGE_QEMU_FDT if BR2_PACKAGE_QEMU_SYSTEM + help + Renesas Electronics RX 32-bit architecture. + +config BR2_PACKAGE_QEMU_TARGET_S390X + bool "s390x" + help + IBM z/Architecture 64-bit mainframe (s390x) + +config BR2_PACKAGE_QEMU_TARGET_SH4 + bool "sh4" + help + Super-H 32-bit RISC architecture. + +config BR2_PACKAGE_QEMU_TARGET_SH4EB + bool "sh4eb" + help + Super-H EB 32-bit RISC architecture. + +config BR2_PACKAGE_QEMU_TARGET_SPARC + bool "sparc" + help + SPARC 32-bit RISC architecture. + +config BR2_PACKAGE_QEMU_TARGET_SPARC32PLUS + bool "sparc32plus (linux-user, only)" + depends on BR2_PACKAGE_QEMU_LINUX_USER + help + SPARC 32-bit RISC architecture (Sun's v8plus). + +config BR2_PACKAGE_QEMU_TARGET_SPARC64 + bool "sparc64" + help + SPARC 64-bit RISC architecture. + +config BR2_PACKAGE_QEMU_TARGET_TRICORE + bool "tricore (system, only)" + depends on BR2_PACKAGE_QEMU_SYSTEM + help + Infineon TriCore 32-bit RISC architecture. + +config BR2_PACKAGE_QEMU_TARGET_X86_64 + bool "x86_64" + select BR2_PACKAGE_QEMU_FDT if BR2_PACKAGE_QEMU_SYSTEM + help + Intel x86 64-bit architecture. + +config BR2_PACKAGE_QEMU_TARGET_XTENSA + bool "xtensa" + help + Xtensa 32-bit RISC architecture. + +config BR2_PACKAGE_QEMU_TARGET_XTENSAEB + bool "xtensaeb" + help + Xtensa 32-bit RISC architecture, big-endian. + +endif # BR2_PACKAGE_QEMU_CHOOSE_TARGETS -endif # BR2_PACKAGE_QEMU_HAS_EMULS +comment "Tools selection" config BR2_PACKAGE_QEMU_TOOLS bool "Enable tools" diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index 8725e7c8c4..5c7a8d504c 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -4,6 +4,8 @@ # ################################################################################ +# When updating the version, check whether the list of supported targets +# needs to be updated. QEMU_VERSION = 7.2.0 QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz QEMU_SITE = http://download.qemu.org @@ -36,30 +38,97 @@ QEMU_OPTS = QEMU_VARS = LIBTOOL=$(HOST_DIR)/bin/libtool -# If we want to specify only a subset of targets, we must still enable all -# of them, so that QEMU properly builds its list of default targets, from -# which it then checks if the specified sub-set is valid. That's what we -# do in the first part of the if-clause. -# Otherwise, if we do not want to pass a sub-set of targets, we then need -# to either enable or disable -user and/or -system emulation appropriately. -# That's what we do in the else-clause. -ifneq ($(call qstrip,$(BR2_PACKAGE_QEMU_CUSTOM_TARGETS)),) -QEMU_OPTS += --enable-system --enable-linux-user -QEMU_OPTS += --target-list="$(call qstrip,$(BR2_PACKAGE_QEMU_CUSTOM_TARGETS))" -else +# If we want to build all emulation targets, we just need to either enable -user +# and/or -system emulation appropriately. +# Otherwise, if we want only a subset of targets, we must still enable all of +# them, so that QEMU properly builds a list of default targets from which it +# checks if the specified sub-set is valid. ifeq ($(BR2_PACKAGE_QEMU_SYSTEM),y) QEMU_OPTS += --enable-system +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_AARCH64) += aarch64-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_ALPHA) += alpha-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_ARM) += arm-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_AVR) += avr-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_CRIS) += cris-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_HPPA) += hppa-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_I386) += i386-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_LOONGARCH64) += loongarch64-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_M68K) += m68k-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_MICROBLAZE) += microblaze-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_MICROBLAZEEL) += microblazeel-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_MIPS) += mips-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_MIPS64) += mips64-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_MIPS64EL) += mips64el-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_MIPSEL) += mipsel-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_NIOS2) += nios2-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_OR1K) += or1k-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_PPC) += ppc-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_PPC64) += ppc64-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_RISCV32) += riscv32-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_RISCV64) += riscv64-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_RX) += rx-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_S390X) += s390x-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_SH4) += sh4-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_SH4EB) += sh4eb-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_SPARC) += sparc-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_SPARC64) += sparc64-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_TRICORE) += tricore-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_X86_64) += x86_64-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_XTENSA) += xtensa-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_XTENSAEB) += xtensaeb-softmmu else QEMU_OPTS += --disable-system endif ifeq ($(BR2_PACKAGE_QEMU_LINUX_USER),y) QEMU_OPTS += --enable-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_AARCH64) += aarch64-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_AARCH64_BE) += aarch64_be-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_ALPHA) += alpha-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_ARM) += arm-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_ARMEB) += armeb-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_CRIS) += cris-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_HEXAGON) += hexagon-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_HPPA) += hppa-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_I386) += i386-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_LOONGARCH64) += loongarch64-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_M68K) += m68k-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_MICROBLAZE) += microblaze-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_MICROBLAZEEL) += microblazeel-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_MIPS) += mips-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_MIPS64) += mips64-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_MIPS64EL) += mips64el-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_MIPSEL) += mipsel-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_MIPSN32) += mipsn32-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_MIPSN32EL) += mipsn32el-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_NIOS2) += nios2-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_OR1K) += or1k-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_PPC) += ppc-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_PPC64) += ppc64-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_PPC64LE) += ppc64le-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_RISCV32) += riscv32-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_RISCV64) += riscv64-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_S390X) += s390x-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_SH4) += sh4-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_SH4EB) += sh4eb-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_SPARC) += sparc-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_SPARC32PLUS) += sparc32plus-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_SPARC64) += sparc64-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_X86_64) += x86_64-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_XTENSA) += xtensa-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_XTENSAEB) += xtensaeb-linux-user else QEMU_OPTS += --disable-linux-user endif +# Build the list of desired targets, if any. +ifeq ($(BR2_PACKAGE_QEMU_CHOOSE_TARGETS),y) +QEMU_TARGET_LIST = $(strip $(QEMU_TARGET_LIST_y)) +ifeq ($(BR_BUILDING).$(QEMU_TARGET_LIST),y.) +$(error "No emulator target has ben chosen") +endif +QEMU_OPTS += --target-list="$(QEMU_TARGET_LIST)" endif ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) From 4bb4288dd08c688072a25bf60c3a60e0047c1668 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 31 Dec 2022 10:49:35 +0100 Subject: [PATCH 0180/5754] package/modem-manager: qrtr needs qmi Fix the following build failure raised since bump to version 1.20.2 in commit b95334b71fbdde0f7621b58ed35fa98df9e0966d: ../output-1/build/modem-manager-1.20.2/meson.build:262:2: ERROR: Assert failed: QRTR support requires QMI enabled Fixes: - http://autobuild.buildroot.org/results/04b9a41c5edbc492ef640b27d4d3d896d230cf34 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/modem-manager/Config.in | 12 ++++++++++++ package/modem-manager/modem-manager.mk | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/package/modem-manager/Config.in b/package/modem-manager/Config.in index d211d68ee1..8489e6fc86 100644 --- a/package/modem-manager/Config.in +++ b/package/modem-manager/Config.in @@ -25,6 +25,18 @@ config BR2_PACKAGE_MODEM_MANAGER_LIBQMI select BR2_PACKAGE_LIBQMI help This option enables support for QMI protocol + +config BR2_PACKAGE_MODEM_MANAGER_LIBQRTR + bool "QRTR support" + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15 # libqrtr-glib + select BR2_PACKAGE_LIBQRTR_GLIB + select BR2_PACKAGE_MODEM_MANAGER_LIBQMI + help + This option enables support for QRTR protocol + +comment "QRTR support needs a toolchain w/ headers >= 4.15" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15 + endif comment "modemmanager needs a toolchain w/ wchar, threads" diff --git a/package/modem-manager/modem-manager.mk b/package/modem-manager/modem-manager.mk index 8a0dbba3a4..8ef85b9b1d 100644 --- a/package/modem-manager/modem-manager.mk +++ b/package/modem-manager/modem-manager.mk @@ -37,7 +37,7 @@ else MODEM_MANAGER_CONF_OPTS += -Dmbim=false endif -ifeq ($(BR2_PACKAGE_LIBQRTR_GLIB),y) +ifeq ($(BR2_PACKAGE_MODEM_MANAGER_LIBQRTR),y) MODEM_MANAGER_DEPENDENCIES += libqrtr-glib MODEM_MANAGER_CONF_OPTS += -Dqrtr=true else From ed631bc7525356c2e086a307e93df7d71d2fdde7 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 31 Dec 2022 10:33:46 +0100 Subject: [PATCH 0181/5754] package/modem-manager: disable tests tests can be disabled since version 1.20.0 and https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/commit/ba96ccc61587b7b6c31b94826ee7a3c44d795364 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/modem-manager/modem-manager.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/modem-manager/modem-manager.mk b/package/modem-manager/modem-manager.mk index 8ef85b9b1d..5b8b9c5576 100644 --- a/package/modem-manager/modem-manager.mk +++ b/package/modem-manager/modem-manager.mk @@ -14,6 +14,7 @@ MODEM_MANAGER_DEPENDENCIES = host-pkgconf dbus libglib2 $(TARGET_NLS_DEPENDENCIE MODEM_MANAGER_INSTALL_STAGING = YES MODEM_MANAGER_CONF_OPTS = \ -Dpowerd_suspend_resume=false \ + -Dtests=false \ -Dudevdir=/usr/lib/udev ifeq ($(BR2_PACKAGE_LIBGUDEV),y) From d769cfc13f6c2544f8bc5b6339d23763319a2383 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 31 Dec 2022 10:34:25 +0100 Subject: [PATCH 0182/5754] package/modem-manager: fix static build Fix the following static build failure raised since bump to version 1.20.2 in commit b95334b71fbdde0f7621b58ed35fa98df9e0966d: FAILED: src/ModemManager /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/bin/m68k-linux-gcc -o src/ModemManager src/ModemManager.p/meson-generated_.._mm-daemon-enums-types.c.o src/ModemManager.p/main.c.o src/ModemManager.p/mm-auth-provider.c.o src/ModemManager.p/mm-base-bearer.c.o src/ModemManager.p/mm-base-call.c.o src/ModemManager.p/mm-base-manager.c.o src/ModemManager.p/mm-base-modem-at.c.o src/ModemManager.p/mm-base-modem.c.o src/ModemManager.p/mm-base-sim.c.o src/ModemManager.p/mm-base-sms.c.o src/ModemManager.p/mm-bearer-list.c.o src/ModemManager.p/mm-broadband-bearer.c.o src/ModemManager.p/mm-broadband-modem.c.o src/ModemManager.p/mm-call-list.c.o src/ModemManager.p/mm-context.c.o src/ModemManager.p/mm-device.c.o src/ModemManager.p/mm-dispatcher.c.o src/ModemManager.p/mm-dispatcher-connection.c.o src/ModemManager.p/mm-dispatcher-fcc-unlock.c.o src/ModemManager.p/mm-filter.c.o src/ModemManager.p/mm-iface-modem-3gpp.c.o src/ModemManager.p/mm-iface-modem-3gpp-profile-manage r.c.o src/ModemManager.p/mm-iface-modem-3gpp-ussd.c.o src/ModemManager.p/mm-iface-modem.c.o src/ModemManager.p/mm-iface-modem-cdma.c.o src/ModemManager.p/mm-iface-modem-firmware.c.o src/ModemManager.p/mm-iface-modem-location.c.o src/ModemManager.p/mm-iface-modem-messaging.c.o src/ModemManager.p/mm-iface-modem-oma.c.o src/ModemManager.p/mm-iface-modem-sar.c.o src/ModemManager.p/mm-iface-modem-signal.c.o src/ModemManager.p/mm-iface-modem-simple.c.o src/ModemManager.p/mm-iface-modem-time.c.o src/ModemManager.p/mm-iface-modem-voice.c.o src/ModemManager.p/mm-plugin.c.o src/ModemManager.p/mm-plugin-manager.c.o src/ModemManager.p/mm-port-probe.c.o src/ModemManager.p/mm-port-probe-at.c.o src/ModemManager.p/mm-private-boxed-types.c.o src/ModemManager.p/mm-sms-list.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,-O1 -static '-Wl,-rpath,$ORIGIN/../libmm-glib' -Wl,-rpath-link,/home/autobuild/autobuild/instance-11/output-1/build/modem-manager-1.20.2/build/libmm-glib -Wl,--start-group src/libport.a sr c/libkerneldevice.a src/libhelpers.a libmm-glib/libmm-glib.so.0.9.0 libqcdm/src/libqcdm.a libmm-glib/generated/tests/libmm-test-generated.a -Wl,--export-dynamic /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libgmodule-2.0.a /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libglib-2.0.a -pthread -lm /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libpcre.a /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libgio-2.0.a /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libgobject-2.0.a /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libffi.a /home/autob uild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libz.a /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libmount.a /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libblkid.a -Wl,--end-group /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/opt/ext-toolchain/bin/../lib/gcc/m68k-buildroot-linux-uclibc/11.2.0/../../../../m68k-buildroot-linux-uclibc/bin/ld: attempted static link of dynamic object `libmm-glib/libmm-glib.so.0.9.0' Fixes: - http://autobuild.buildroot.org/results/9803d593305df36c4a8d67aac2fb4c9a3120a072 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...n-hardcode-building-a-shared-library.patch | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 package/modem-manager/0001-meson-Un-hardcode-building-a-shared-library.patch diff --git a/package/modem-manager/0001-meson-Un-hardcode-building-a-shared-library.patch b/package/modem-manager/0001-meson-Un-hardcode-building-a-shared-library.patch new file mode 100644 index 0000000000..e99396d0d1 --- /dev/null +++ b/package/modem-manager/0001-meson-Un-hardcode-building-a-shared-library.patch @@ -0,0 +1,54 @@ +From a9651f2390d3691dc74bcdb24b69a043fb0aacae Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 31 Dec 2022 10:18:32 +0100 +Subject: [PATCH] meson: Un-hardcode building a shared library + +Use library() instead of shared_library() to allow specifying which kind +of library to build with "meson setup --default-library ..." + +This will avoid the following static build failure: + +FAILED: src/ModemManager +/home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/bin/m68k-linux-gcc -o src/ModemManager src/ModemManager.p/meson-generated_.._mm-daemon-enums-types.c.o src/ModemManager.p/main.c.o src/ModemManager.p/mm-auth-provider.c.o src/ModemManager.p/mm-base-bearer.c.o src/ModemManager.p/mm-base-call.c.o src/ModemManager.p/mm-base-manager.c.o src/ModemManager.p/mm-base-modem-at.c.o src/ModemManager.p/mm-base-modem.c.o src/ModemManager.p/mm-base-sim.c.o src/ModemManager.p/mm-base-sms.c.o src/ModemManager.p/mm-bearer-list.c.o src/ModemManager.p/mm-broadband-bearer.c.o src/ModemManager.p/mm-broadband-modem.c.o src/ModemManager.p/mm-call-list.c.o src/ModemManager.p/mm-context.c.o src/ModemManager.p/mm-device.c.o src/ModemManager.p/mm-dispatcher.c.o src/ModemManager.p/mm-dispatcher-connection.c.o src/ModemManager.p/mm-dispatcher-fcc-unlock.c.o src/ModemManager.p/mm-filter.c.o src/ModemManager.p/mm-iface-modem-3gpp.c.o src/ModemManager.p/mm-iface-modem-3gpp-profile-manager.c.o src/ModemManager.p/mm-iface-modem-3gpp-ussd.c.o src/ModemManager.p/mm-iface-modem.c.o src/ModemManager.p/mm-iface-modem-cdma.c.o src/ModemManager.p/mm-iface-modem-firmware.c.o src/ModemManager.p/mm-iface-modem-location.c.o src/ModemManager.p/mm-iface-modem-messaging.c.o src/ModemManager.p/mm-iface-modem-oma.c.o src/ModemManager.p/mm-iface-modem-sar.c.o src/ModemManager.p/mm-iface-modem-signal.c.o src/ModemManager.p/mm-iface-modem-simple.c.o src/ModemManager.p/mm-iface-modem-time.c.o src/ModemManager.p/mm-iface-modem-voice.c.o src/ModemManager.p/mm-plugin.c.o src/ModemManager.p/mm-plugin-manager.c.o src/ModemManager.p/mm-port-probe.c.o src/ModemManager.p/mm-port-probe-at.c.o src/ModemManager.p/mm-private-boxed-types.c.o src/ModemManager.p/mm-sms-list.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,-O1 -static '-Wl,-rpath,$ORIGIN/../libmm-glib' -Wl,-rpath-link,/home/autobuild/autobuild/instance-11/output-1/build/modem-manager-1.20.2/build/libmm-glib -Wl,--start-group src/libport.a src/libkerneldevice.a src/libhelpers.a libmm-glib/libmm-glib.so.0.9.0 libqcdm/src/libqcdm.a libmm-glib/generated/tests/libmm-test-generated.a -Wl,--export-dynamic /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libgmodule-2.0.a /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libglib-2.0.a -pthread -lm /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libpcre.a /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libgio-2.0.a /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libgobject-2.0.a /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libffi.a /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libz.a /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libmount.a /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libblkid.a -Wl,--end-group +/home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/opt/ext-toolchain/bin/../lib/gcc/m68k-buildroot-linux-uclibc/11.2.0/../../../../m68k-buildroot-linux-uclibc/bin/ld: attempted static link of dynamic object `libmm-glib/libmm-glib.so.0.9.0' + +Fixes: + - http://autobuild.buildroot.org/results/9803d593305df36c4a8d67aac2fb4c9a3120a072 + +Signed-off-by: Fabrice Fontaine +[yann.morin.1998@free.fr: actual backport of upstreeam commit] +Signed-off-by: Yann E. MORIN +--- + libmm-glib/meson.build | 2 +- + plugins/meson.build | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libmm-glib/meson.build b/libmm-glib/meson.build +index 42f8ac61..de668dab 100644 +--- a/libmm-glib/meson.build ++++ b/libmm-glib/meson.build +@@ -129,7 +129,7 @@ deps = [include_dep] + + libname = 'mm-glib' + +-libmm_glib = shared_library( ++libmm_glib = library( + libname, + version: mm_glib_version, + sources: sources, +diff --git a/plugins/meson.build b/plugins/meson.build +index f849bb53..9e081beb 100644 +--- a/plugins/meson.build ++++ b/plugins/meson.build +@@ -18,7 +18,7 @@ if enable_tests + libmm_test_generated_dep + ] + +- libmm_test_common = shared_library( ++ libmm_test_common = library( + 'mm-test-common', + sources: sources, + include_directories: top_inc, +-- +2.25.1 + From dc23c61e4d3fa9557db4977b8d30905a3f55e83d Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 31 Dec 2022 14:55:56 +0100 Subject: [PATCH 0183/5754] package/freescale-imx: update SITE to directly use https http://www.nxp.com/ has a redirect to https://www.nxp.com/ for quite some time now. It is also quite common to directly hit https:// urls now. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/freescale-imx/freescale-imx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/freescale-imx/freescale-imx.mk b/package/freescale-imx/freescale-imx.mk index 5f32a098a2..b119d90ec3 100644 --- a/package/freescale-imx/freescale-imx.mk +++ b/package/freescale-imx/freescale-imx.mk @@ -4,6 +4,6 @@ # ################################################################################ -FREESCALE_IMX_SITE = http://www.nxp.com/lgfiles/NMG/MAD/YOCTO +FREESCALE_IMX_SITE = https://www.nxp.com/lgfiles/NMG/MAD/YOCTO include $(sort $(wildcard package/freescale-imx/*/*.mk)) From 4e54522caeeaec2e14065752cb3905d292f374e6 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 31 Dec 2022 14:55:57 +0100 Subject: [PATCH 0184/5754] board/freescale/imx28evk/readme.txt: update broken url http://freescale.com/ urls are all redirected to the NXP homepage https://www.nxp.com/ Even if the link is not broken in the sense of a 404 http error, the pointed resource is not found. This commit updates the old Freescale link to the correct nxp.com location. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- board/freescale/imx28evk/readme.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/freescale/imx28evk/readme.txt b/board/freescale/imx28evk/readme.txt index 2920cb04cd..3b77634fe1 100644 --- a/board/freescale/imx28evk/readme.txt +++ b/board/freescale/imx28evk/readme.txt @@ -54,4 +54,4 @@ Enjoy! References ========== -[1] http://cache.freescale.com/files/32bit/doc/user_guide/EVK_imx28_QuickStart.pdf +[1] https://www.nxp.com/docs/en/user-guide/EVK_imx28_QuickStart.pdf From bfbbfd8fecf8623da4772f97ce208b3e4b69de80 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 31 Dec 2022 14:55:58 +0100 Subject: [PATCH 0185/5754] board/freescale/imx6sabre/readme.txt: update broken urls http://freescale.com/ urls are all redirected to the NXP homepage https://www.nxp.com/ Even if the links are not broken in the sense of a 404 http error, the pointed resources are not found. This commit updates the old freescale links to the correct nxp.com locations. Note: the link to the SABRE for Automotive Infotainment Quick Start Guide now requires a free registration to be accessed. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- board/freescale/imx6sabre/readme.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/board/freescale/imx6sabre/readme.txt b/board/freescale/imx6sabre/readme.txt index 4b8db5233a..320ee463e2 100644 --- a/board/freescale/imx6sabre/readme.txt +++ b/board/freescale/imx6sabre/readme.txt @@ -8,15 +8,15 @@ as well as the Freescale SABRE Board for Automotive Infotainment. Read the i.MX 6 SABRESD Quick Start Guide for an introduction to the board: -http://cache.freescale.com/files/32bit/doc/quick_start_guide/SABRESDB_IMX6_QSG.pdf +https://www.nxp.com/files-static/32bit/doc/quick_start_guide/SABRESDB_IMX6_QSG.pdf Read the i.MX 6 SoloX SABRESD Quick Start Guide for an introduction to the board: -http://cache.freescale.com/files/32bit/doc/user_guide/IMX6SOLOXQSG.pdf +https://www.nxp.com/files-static/32bit/doc/quick_start_guide/IMX6SOLOXQSG.pdf Read the SABRE for Automotive Infotainment Quick Start Guide for an introduction to the board: -http://cache.freescale.com/files/32bit/doc/user_guide/IMX6SABREINFOQSG.pdf +https://www.nxp.com/webapp/Download?colCode=IMX6SABREINFOQSG Building with NXP kernel and NXP U-Boot ======================================= @@ -166,6 +166,6 @@ Enjoy! References ========== -https://community.freescale.com/docs/DOC-95015 -https://community.freescale.com/docs/DOC-95017 -https://community.freescale.com/docs/DOC-99218 +https://community.nxp.com/docs/DOC-95015 +https://community.nxp.com/docs/DOC-95017 +https://community.nxp.com/docs/DOC-99218 From 01a3cb0f6eac48150c4bd246402025c0790e2625 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 31 Dec 2022 14:55:59 +0100 Subject: [PATCH 0186/5754] board/freescale/imx6ulevk/readme.txt: update broken url http://freescale.com/ urls are all redirected to the NXP homepage https://www.nxp.com/ Even if the link is not broken in the sense of a 404 http error, the pointed resource is not found. This commit updates the old freescale link to the correct nxp.com location. Note: the link now requires a free registration to be accessed. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- board/freescale/imx6ulevk/readme.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/freescale/imx6ulevk/readme.txt b/board/freescale/imx6ulevk/readme.txt index 5bc03771f2..5a5b4ae5a3 100644 --- a/board/freescale/imx6ulevk/readme.txt +++ b/board/freescale/imx6ulevk/readme.txt @@ -71,4 +71,4 @@ Enjoy! References ========== -[1] http://cache.freescale.com/files/32bit/doc/quick_start_guide/IMX6ULTRALITEQSG.pdf +[1] https://www.nxp.com/webapp/Download?colCode=IMX6ULTRALITEQSG From faa8c35d117348f35c129c62a3d02447f47bde88 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Fri, 30 Dec 2022 21:03:32 +0100 Subject: [PATCH 0187/5754] package/fluidsynth: bump to version 2.3.1 For change log since v2.3.0, see: - https://github.com/FluidSynth/fluidsynth/releases/tag/v2.3.1 Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- 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 fdb0cf4117..3de41b1682 100644 --- a/package/fluidsynth/fluidsynth.hash +++ b/package/fluidsynth/fluidsynth.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 1df5a1afb91acf3b945b7fdb89ac0d99877622161d9b5155533da59113eaaa20 fluidsynth-2.3.0.tar.gz +sha256 d734e4cf488be763cf123e5976f3154f0094815093eecdf71e0e9ae148431883 fluidsynth-2.3.1.tar.gz sha256 9b872a8a070b8ad329c4bd380fb1bf0000f564c75023ec8e1e6803f15364b9e9 LICENSE diff --git a/package/fluidsynth/fluidsynth.mk b/package/fluidsynth/fluidsynth.mk index 20fbb644f5..ad1ed7df11 100644 --- a/package/fluidsynth/fluidsynth.mk +++ b/package/fluidsynth/fluidsynth.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLUIDSYNTH_VERSION = 2.3.0 +FLUIDSYNTH_VERSION = 2.3.1 FLUIDSYNTH_SITE = $(call github,FluidSynth,fluidsynth,v$(FLUIDSYNTH_VERSION)) FLUIDSYNTH_LICENSE = LGPL-2.1+ FLUIDSYNTH_LICENSE_FILES = LICENSE From 153b91ed13174a9013393a8b8eb907a5ff511e58 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Thu, 29 Dec 2022 20:47:03 +0100 Subject: [PATCH 0188/5754] package/imx-mkimage: update codeaurora URLs to github NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. Note 2: the _SITE_METHOD is also changed from "git" to the default "wget", for faster downloads. This is why the package hash has changed. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/imx-mkimage/Config.in.host | 2 +- package/imx-mkimage/imx-mkimage.hash | 2 +- package/imx-mkimage/imx-mkimage.mk | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package/imx-mkimage/Config.in.host b/package/imx-mkimage/Config.in.host index 8d273557a1..09df2a3c29 100644 --- a/package/imx-mkimage/Config.in.host +++ b/package/imx-mkimage/Config.in.host @@ -4,4 +4,4 @@ config BR2_PACKAGE_HOST_IMX_MKIMAGE imx-mkimage is used to combine input images and generate final boot image with appropriate IVT set. - https://source.codeaurora.org/external/imx/imx-mkimage + https://github.com/nxp-imx/imx-mkimage diff --git a/package/imx-mkimage/imx-mkimage.hash b/package/imx-mkimage/imx-mkimage.hash index 81d99a5d1c..8346fd64b1 100644 --- a/package/imx-mkimage/imx-mkimage.hash +++ b/package/imx-mkimage/imx-mkimage.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 769b3d7376a1f7107ce2958a1babe361bfd29e2cbfbe47eeb2911acc460058e5 imx-mkimage-lf-5.10.72_2.2.0-br1.tar.gz +sha256 593bd94aac027844bc58c62aae55557c14e1f8a99e68ba235a46f083759df3d4 imx-mkimage-lf-5.10.72_2.2.0.tar.gz sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING diff --git a/package/imx-mkimage/imx-mkimage.mk b/package/imx-mkimage/imx-mkimage.mk index 0bfca72504..54c948e0d3 100644 --- a/package/imx-mkimage/imx-mkimage.mk +++ b/package/imx-mkimage/imx-mkimage.mk @@ -5,8 +5,7 @@ ################################################################################ IMX_MKIMAGE_VERSION = lf-5.10.72_2.2.0 -IMX_MKIMAGE_SITE = https://source.codeaurora.org/external/imx/imx-mkimage -IMX_MKIMAGE_SITE_METHOD = git +IMX_MKIMAGE_SITE = $(call github,nxp-imx,imx-mkimage,$(IMX_MKIMAGE_VERSION)) IMX_MKIMAGE_LICENSE = GPL-2.0+ IMX_MKIMAGE_LICENSE_FILES = COPYING HOST_IMX_MKIMAGE_DEPENDENCIES = host-zlib From 774c39caf093943aa9416c636fe3b2ec31a64e21 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Thu, 29 Dec 2022 20:47:04 +0100 Subject: [PATCH 0189/5754] package/fmc: update codeaurora URLs to github NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. This commit also: - changes the _SITE_METHOD from "git" to the default "wget", - updates an old and broken freescale.com app note link, - adds the github project page as project url. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. The version "fsl-sdk-v2.0" is an old tag from 2015. It was not migrated to github. This commit use instead the commit id corresponding to this tag. See: https://source.codeaurora.org/external/qoriq/qoriq-yocto-sdk/fmc/commit/?h=fsl-sdk-v2.0&id=a079d2c844edd85dff85a317a63198e7988bcd09 The commit id exists on github: https://github.com/nxp-qoriq/fmc/commit/a079d2c844edd85dff85a317a63198e7988bcd09 Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/fmc/Config.in | 4 +++- package/fmc/fmc.hash | 2 +- package/fmc/fmc.mk | 5 ++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/fmc/Config.in b/package/fmc/Config.in index 4399aa2cab..c89a87c99e 100644 --- a/package/fmc/Config.in +++ b/package/fmc/Config.in @@ -21,5 +21,7 @@ config BR2_PACKAGE_FMC packets flow into hardware configuration. The tool provides an abstraction layer between the end customer's vision of the PCD task definition and real hardware implementation. + See application note: + https://www.nxp.com/docs/en/application-note/AN4760.pdf - http://cache.freescale.com/files/32bit/doc/app_note/AN4760.pdf + https://github.com/nxp-qoriq/fmc diff --git a/package/fmc/fmc.hash b/package/fmc/fmc.hash index fed33091cd..7309562b09 100644 --- a/package/fmc/fmc.hash +++ b/package/fmc/fmc.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 cb896ec1fac2fe9a3a9bb8be2221b79acf5f9b75841609a681db0d9e7bec02a0 fmc-fsl-sdk-v2.0-br1.tar.gz +sha256 e8594e37eb81e5b1f492f8494b98086f65180637b1e2e08d8a4475c23653a404 fmc-a079d2c844edd85dff85a317a63198e7988bcd09.tar.gz sha256 f92862ceb95db5492f50a59d7c799c9395b714db88db92d11891dc0233e2ac42 COPYING diff --git a/package/fmc/fmc.mk b/package/fmc/fmc.mk index b385730138..6ac8c768df 100644 --- a/package/fmc/fmc.mk +++ b/package/fmc/fmc.mk @@ -4,9 +4,8 @@ # ################################################################################ -FMC_VERSION = fsl-sdk-v2.0 -FMC_SITE = https://source.codeaurora.org/external/qoriq/qoriq-yocto-sdk/fmc -FMC_SITE_METHOD = git +FMC_VERSION = a079d2c844edd85dff85a317a63198e7988bcd09 +FMC_SITE = $(call github,nxp-qoriq,fmc,$(FMC_VERSION)) FMC_LICENSE = MIT FMC_LICENSE_FILES = COPYING FMC_DEPENDENCIES = libxml2 tclap fmlib From a94678cfd965ed11a4e2d18d840c03a41c148d6b Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Thu, 29 Dec 2022 20:47:05 +0100 Subject: [PATCH 0190/5754] package/fmlib: update codeaurora URLs to github NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. The version fsl-sdk-v2.0 is an old tag from 2016. It was not migrated to github. This commit use instead the commit id corresponding to this tag. See: https://source.codeaurora.org/external/qoriq/qoriq-yocto-sdk/fmlib/commit/?h=fsl-sdk-v2.0&id=43fa98fdbf0c697167e415c3f060896d5b482791 The commit id exists on github: https://github.com/nxp-qoriq/fmlib/commit/43fa98fdbf0c697167e415c3f060896d5b482791 Note 2: the _SITE_METHOD is also changed from "git" to the default "wget", for faster downloads. This is why the package hash has changed. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/fmlib/Config.in | 2 +- package/fmlib/fmlib.hash | 2 +- package/fmlib/fmlib.mk | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package/fmlib/Config.in b/package/fmlib/Config.in index 7bccfd7c83..97d55d1250 100644 --- a/package/fmlib/Config.in +++ b/package/fmlib/Config.in @@ -13,7 +13,7 @@ config BR2_PACKAGE_FMLIB configure driver parameters and PCD (parse - classify - distribute) rules. - http://git.freescale.com/git/cgit.cgi/ppc/sdk/fmlib.git/tree/README + https://github.com/nxp-qoriq/fmlib if BR2_PACKAGE_FMLIB choice diff --git a/package/fmlib/fmlib.hash b/package/fmlib/fmlib.hash index 47460d091c..d4dcf3be5c 100644 --- a/package/fmlib/fmlib.hash +++ b/package/fmlib/fmlib.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 59415d346af1d22f510f2785be4c7e3606dc3181476a666e832270550f7d44a6 fmlib-fsl-sdk-v2.0-br1.tar.gz +sha256 6e9e6bdb42dc2a6a76cfd756a2d4cdfcc2be90925c1f439e8a11eafa871896a6 fmlib-43fa98fdbf0c697167e415c3f060896d5b482791.tar.gz sha256 837559e20d83910a005e7883b876cc5c42805fe4abcf7e5c5b3c8d036b7f61c8 COPYING diff --git a/package/fmlib/fmlib.mk b/package/fmlib/fmlib.mk index 8cb779201d..9509f3de56 100644 --- a/package/fmlib/fmlib.mk +++ b/package/fmlib/fmlib.mk @@ -4,9 +4,8 @@ # ################################################################################ -FMLIB_VERSION = fsl-sdk-v2.0 -FMLIB_SITE = https://source.codeaurora.org/external/qoriq/qoriq-yocto-sdk/fmlib -FMLIB_SITE_METHOD = git +FMLIB_VERSION = 43fa98fdbf0c697167e415c3f060896d5b482791 +FMLIB_SITE = $(call github,nxp-qoriq,fmlib,$(FMLIB_VERSION)) FMLIB_LICENSE = BSD-3-Clause, GPL-2.0+ FMLIB_LICENSE_FILES = COPYING FMLIB_DEPENDENCIES = linux From 1ed90a96aa1f11fed19045036b4a10d9a8263a98 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Thu, 29 Dec 2022 20:47:06 +0100 Subject: [PATCH 0191/5754] package/freescale-imx/imx-alsa-plugins: update codeaurora URLs to github NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. Note 2: the _SITE_METHOD is also changed from "git" to the default "wget", for faster downloads. This is why the package hash has changed. Note 3: this commit also adds the github as project homepage in Config.in. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/freescale-imx/imx-alsa-plugins/Config.in | 2 ++ package/freescale-imx/imx-alsa-plugins/imx-alsa-plugins.hash | 2 +- package/freescale-imx/imx-alsa-plugins/imx-alsa-plugins.mk | 3 +-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/freescale-imx/imx-alsa-plugins/Config.in b/package/freescale-imx/imx-alsa-plugins/Config.in index ec9b5b19cf..df47edd16d 100644 --- a/package/freescale-imx/imx-alsa-plugins/Config.in +++ b/package/freescale-imx/imx-alsa-plugins/Config.in @@ -13,6 +13,8 @@ config BR2_PACKAGE_IMX_ALSA_PLUGINS * Rate Converter Plugin Using Freescale ASRC Hardware Resampler (i.MX53 and most i.MX6) + https://github.com/nxp-imx/imx-alsa-plugins + comment "imx-alsa-libs needs an imx-specific Linux kernel to be built" depends on BR2_arm depends on !BR2_LINUX_KERNEL diff --git a/package/freescale-imx/imx-alsa-plugins/imx-alsa-plugins.hash b/package/freescale-imx/imx-alsa-plugins/imx-alsa-plugins.hash index bb7beede9d..1ca7697f03 100644 --- a/package/freescale-imx/imx-alsa-plugins/imx-alsa-plugins.hash +++ b/package/freescale-imx/imx-alsa-plugins/imx-alsa-plugins.hash @@ -1,3 +1,3 @@ # Locally calculated: -sha256 a9a5ef408a7329c2c5fa2a084ae7824afbfbebed68612bd72509488ccb0b94b3 imx-alsa-plugins-rel_imx_4.9.x_1.0.0_ga-br1.tar.gz +sha256 089bba009f82bf5e4a1e34b77a7d3badce2948619d92bec7a7ad42e766442d4c imx-alsa-plugins-rel_imx_4.9.x_1.0.0_ga.tar.gz sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING.GPL diff --git a/package/freescale-imx/imx-alsa-plugins/imx-alsa-plugins.mk b/package/freescale-imx/imx-alsa-plugins/imx-alsa-plugins.mk index 9c81ff0df0..912cc7c68b 100644 --- a/package/freescale-imx/imx-alsa-plugins/imx-alsa-plugins.mk +++ b/package/freescale-imx/imx-alsa-plugins/imx-alsa-plugins.mk @@ -5,8 +5,7 @@ ################################################################################ IMX_ALSA_PLUGINS_VERSION = rel_imx_4.9.x_1.0.0_ga -IMX_ALSA_PLUGINS_SITE = https://source.codeaurora.org/external/imx/imx-alsa-plugins -IMX_ALSA_PLUGINS_SITE_METHOD = git +IMX_ALSA_PLUGINS_SITE = $(call github,nxp-imx,imx-alsa-plugins,$(IMX_ALSA_PLUGINS_VERSION)) IMX_ALSA_PLUGINS_LICENSE = GPL-2.0+ IMX_ALSA_PLUGINS_LICENSE_FILES = COPYING.GPL IMX_ALSA_PLUGINS_DEPENDENCIES = host-pkgconf alsa-lib From cec5a941b0867803045450688fbec8992e48d81d Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Thu, 29 Dec 2022 20:47:07 +0100 Subject: [PATCH 0192/5754] package/freescale-imx/imx-kobs: update to NXPmicro github organization imx-kobs was removed from the github codeauroraforum organization. It is now redirecting to NXPmicro. This patch updates the link to directly point to the correct place. The commit also replaces the Config.in comment saying the package does not have an upstream by the github.com project page. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/freescale-imx/imx-kobs/Config.in | 3 +-- package/freescale-imx/imx-kobs/imx-kobs.mk | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/package/freescale-imx/imx-kobs/Config.in b/package/freescale-imx/imx-kobs/Config.in index 61be9f26d4..a81842b9a5 100644 --- a/package/freescale-imx/imx-kobs/Config.in +++ b/package/freescale-imx/imx-kobs/Config.in @@ -5,5 +5,4 @@ config BR2_PACKAGE_IMX_KOBS The imx-kobs tool is used for writing images to NAND on i.MX platforms. - This library is provided by Freescale as-is and doesn't have - an upstream. + https://github.com/NXPmicro/imx-kobs diff --git a/package/freescale-imx/imx-kobs/imx-kobs.mk b/package/freescale-imx/imx-kobs/imx-kobs.mk index d6a250cf72..91b39f6fa4 100644 --- a/package/freescale-imx/imx-kobs/imx-kobs.mk +++ b/package/freescale-imx/imx-kobs/imx-kobs.mk @@ -5,7 +5,7 @@ ################################################################################ IMX_KOBS_VERSION = a0e9adce2fb7fcd57e794d7f9a5deba0f94f521b -IMX_KOBS_SITE = $(call github,codeauroraforum,imx-kobs,$(IMX_KOBS_VERSION)) +IMX_KOBS_SITE = $(call github,NXPmicro,imx-kobs,$(IMX_KOBS_VERSION)) IMX_KOBS_LICENSE = GPL-2.0+ IMX_KOBS_LICENSE_FILES = COPYING From 8c74c6472b8caf31b34a5a57654ab0c3d18dad36 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Thu, 29 Dec 2022 20:47:08 +0100 Subject: [PATCH 0193/5754] package/freescale-imx/imx-lib: update codeaurora URLs to github NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. The commit also: - removes the comment in Config.in that the package does not have an upstream, - adds the new github.com url as the package url Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/freescale-imx/imx-lib/Config.in | 3 +-- package/freescale-imx/imx-lib/imx-lib.mk | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/package/freescale-imx/imx-lib/Config.in b/package/freescale-imx/imx-lib/Config.in index 746788e4c5..0a89bf140f 100644 --- a/package/freescale-imx/imx-lib/Config.in +++ b/package/freescale-imx/imx-lib/Config.in @@ -11,5 +11,4 @@ config BR2_PACKAGE_IMX_LIB platform specific drivers. It requires a kernel that includes the i.MX specific headers to be built. - This library is provided by Freescale as-is and doesn't have - an upstream. + https://github.com/nxp-imx/imx-lib diff --git a/package/freescale-imx/imx-lib/imx-lib.mk b/package/freescale-imx/imx-lib/imx-lib.mk index 721c20e5f8..f06453e8a6 100644 --- a/package/freescale-imx/imx-lib/imx-lib.mk +++ b/package/freescale-imx/imx-lib/imx-lib.mk @@ -5,7 +5,7 @@ ################################################################################ IMX_LIB_VERSION = 3f777974c0c146817e2ff5cb0340ca66a1f99e57 -IMX_LIB_SITE = https://source.codeaurora.org/external/imx/imx-lib +IMX_LIB_SITE = https://github.com/nxp-imx/imx-lib.git IMX_LIB_SITE_METHOD = git IMX_LIB_LICENSE = LGPL-2.1+ IMX_LIB_LICENSE_FILES = COPYING-LGPL-2.1 From f496b36995c02f81b2404ef1f450ecbfba26aace Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Thu, 29 Dec 2022 20:47:09 +0100 Subject: [PATCH 0194/5754] package/freescale-imx/imx-m4fwloader: update URLs to NXPmicro github organization imx-m4fwloader was removed from the github codeauroraforum organization. It is now redirecting to NXPmicro. This patch updates the link to directly point to the correct place. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/freescale-imx/imx-m4fwloader/Config.in | 2 +- package/freescale-imx/imx-m4fwloader/imx-m4fwloader.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/freescale-imx/imx-m4fwloader/Config.in b/package/freescale-imx/imx-m4fwloader/Config.in index 937f82f916..d75480a708 100644 --- a/package/freescale-imx/imx-m4fwloader/Config.in +++ b/package/freescale-imx/imx-m4fwloader/Config.in @@ -5,4 +5,4 @@ config BR2_PACKAGE_IMX_M4FWLOADER This package provides a tool to load a firmware to the Cortex-M4 core available in some i.MX processors. - https://github.com/codeauroraforum/imx-m4fwloader + https://github.com/NXPmicro/imx-m4fwloader diff --git a/package/freescale-imx/imx-m4fwloader/imx-m4fwloader.mk b/package/freescale-imx/imx-m4fwloader/imx-m4fwloader.mk index cc4849330c..320d5dc617 100644 --- a/package/freescale-imx/imx-m4fwloader/imx-m4fwloader.mk +++ b/package/freescale-imx/imx-m4fwloader/imx-m4fwloader.mk @@ -5,7 +5,7 @@ ################################################################################ IMX_M4FWLOADER_VERSION = 8cf4d17a09ba23250d43381b49ba00d92406fad9 -IMX_M4FWLOADER_SITE = $(call github,codeauroraforum,imx-m4fwloader,$(IMX_M4FWLOADER_VERSION)) +IMX_M4FWLOADER_SITE = $(call github,NXPmicro,imx-m4fwloader,$(IMX_M4FWLOADER_VERSION)) IMX_M4FWLOADER_LICENSE = GPL-2.0+ IMX_M4FWLOADER_LICENSE_FILES = LICENSE From a03e57ccbf432f73275869cf9a3e6a7a234cb5de Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Thu, 29 Dec 2022 20:47:10 +0100 Subject: [PATCH 0195/5754] package/mfgtools: update URLs to NXPmicro github organization mfgtools was removed from the github codeauroraforum organization. It is now redirecting to NXPmicro. This patch updates the link to directly point to the correct place. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/mfgtools/Config.in.host | 2 +- package/mfgtools/mfgtools.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mfgtools/Config.in.host b/package/mfgtools/Config.in.host index 2b506c8f67..f1e7ab58e3 100644 --- a/package/mfgtools/Config.in.host +++ b/package/mfgtools/Config.in.host @@ -8,7 +8,7 @@ config BR2_PACKAGE_HOST_MFGTOOLS production. The communication is done over USB using the Freescale UTP protocol. - https://github.com/codeauroraforum/mfgtools + https://github.com/NXPmicro/mfgtools comment "host mfgtools needs a toolchain w/ host gcc >= 4.9" depends on BR2_arm diff --git a/package/mfgtools/mfgtools.mk b/package/mfgtools/mfgtools.mk index 48ce5dda28..3de93936b8 100644 --- a/package/mfgtools/mfgtools.mk +++ b/package/mfgtools/mfgtools.mk @@ -5,7 +5,7 @@ ################################################################################ MFGTOOLS_VERSION = 0.02 -MFGTOOLS_SITE = $(call github,codeauroraforum,mfgtools,v$(MFGTOOLS_VERSION)) +MFGTOOLS_SITE = $(call github,NXPmicro,mfgtools,v$(MFGTOOLS_VERSION)) MFGTOOLS_SUBDIR = MfgToolLib MFGTOOLS_LICENSE = BSD-3-Clause or CPOL MFGTOOLS_LICENSE_FILES = LICENSE README.txt From a019e5e460f0d85b0b44163ba80be7cd6a53738a Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Thu, 29 Dec 2022 20:47:11 +0100 Subject: [PATCH 0196/5754] package/qoriq-rcw: update codeaurora URLs to github NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. Note 2: the _SITE_METHOD is also changed from "git" to the default "wget", for faster downloads. This is why the package hash has changed. Signed-off-by: Julien Olivain Reviewed-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/qoriq-rcw/Config.in.host | 2 +- package/qoriq-rcw/qoriq-rcw.hash | 2 +- package/qoriq-rcw/qoriq-rcw.mk | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package/qoriq-rcw/Config.in.host b/package/qoriq-rcw/Config.in.host index 08fc83acd0..58c16d495b 100644 --- a/package/qoriq-rcw/Config.in.host +++ b/package/qoriq-rcw/Config.in.host @@ -9,7 +9,7 @@ config BR2_PACKAGE_HOST_QORIQ_RCW $(HOST_DIR)/share/rcw. Either a SDK or post scripts can then use this toolset and examples. - https://source.codeaurora.org/external/qoriq/qoriq-components/rcw/ + https://github.com/nxp-qoriq/rcw if BR2_PACKAGE_HOST_QORIQ_RCW diff --git a/package/qoriq-rcw/qoriq-rcw.hash b/package/qoriq-rcw/qoriq-rcw.hash index f34c771d11..2a887d57d4 100644 --- a/package/qoriq-rcw/qoriq-rcw.hash +++ b/package/qoriq-rcw/qoriq-rcw.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 caa6802f2ba5ea92fd27e7c977749010a91c9091fcc3fe626f96d9cacfba1f0a qoriq-rcw-LSDK-21.08-br1.tar.gz +sha256 f199c10e50bd18d7bed0d60f5b68194240dea4f1aa164cec98332723727a4796 qoriq-rcw-LSDK-21.08.tar.gz sha256 68f4b15ecc085729419bc60ca6eeadca5af0237bbfec791e8a79da9c943d42e9 LICENSE diff --git a/package/qoriq-rcw/qoriq-rcw.mk b/package/qoriq-rcw/qoriq-rcw.mk index 0501c36f46..8b1ceacfce 100644 --- a/package/qoriq-rcw/qoriq-rcw.mk +++ b/package/qoriq-rcw/qoriq-rcw.mk @@ -5,8 +5,7 @@ ################################################################################ QORIQ_RCW_VERSION = LSDK-21.08 -QORIQ_RCW_SITE = https://source.codeaurora.org/external/qoriq/qoriq-components/rcw -QORIQ_RCW_SITE_METHOD = git +QORIQ_RCW_SITE = $(call github,nxp-qoriq,rcw,$(QORIQ_RCW_VERSION)) QORIQ_RCW_LICENSE = BSD-3-Clause QORIQ_RCW_LICENSE_FILES = LICENSE From a5bdaf71c7c53655b5526f1fb6973c8fe98da8db Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Thu, 29 Dec 2022 20:47:12 +0100 Subject: [PATCH 0197/5754] package/x11r7/xdriver_xf86-video-imx-viv: update codeaurora URLs to github NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. Note 2: the _SITE_METHOD is also changed from "git" to the default "wget", for faster downloads. This is why the package hash has changed. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- .../xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.hash | 2 +- .../xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.hash b/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.hash index 5873b4b11c..b79c236478 100644 --- a/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.hash +++ b/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 638a8aa8b64f860900d003527529689bc342d18ff5e41a9e1750884544898e67 xdriver_xf86-video-imx-viv-rel_imx_4.9.x_1.0.0_ga-br1.tar.gz +sha256 8fe1f57334b22926d4ff3b0b9fdf50af835a99cdfd0ad3ba6a604b226b723e89 xdriver_xf86-video-imx-viv-rel_imx_4.9.x_1.0.0_ga.tar.gz sha256 9d3e373f0440cc0c58853e963636a7c1ffda9308ec5f30ebe9adfb9c16a8a1e4 COPYING-MIT diff --git a/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk b/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk index 0913427542..3b346f323a 100644 --- a/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk +++ b/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk @@ -5,8 +5,7 @@ ################################################################################ XDRIVER_XF86_VIDEO_IMX_VIV_VERSION = rel_imx_4.9.x_1.0.0_ga -XDRIVER_XF86_VIDEO_IMX_VIV_SITE = https://source.codeaurora.org/external/imx/xf86-video-imx-vivante -XDRIVER_XF86_VIDEO_IMX_VIV_SITE_METHOD = git +XDRIVER_XF86_VIDEO_IMX_VIV_SITE = $(call github,nxp-imx,xf86-video-imx-vivante,$(XDRIVER_XF86_VIDEO_IMX_VIV_VERSION)) XDRIVER_XF86_VIDEO_IMX_VIV_DEPENDENCIES = imx-gpu-viv imx-gpu-g2d xserver_xorg-server \ xorgproto libdrm XDRIVER_XF86_VIDEO_IMX_VIV_LICENSE = MIT From 30668cf9187726731611f7f5f6602098866f3286 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Thu, 29 Dec 2022 20:47:13 +0100 Subject: [PATCH 0198/5754] configs/freescale_imx6dlsabreauto: update codeaurora URLs to github NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. Note 2: this commit updates the Kernel and U-Boot download urls. The method is also changed from _CUSTOM_GIT to _CUSTOM_TARBALL. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- configs/freescale_imx6dlsabreauto_defconfig | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/configs/freescale_imx6dlsabreauto_defconfig b/configs/freescale_imx6dlsabreauto_defconfig index 8fe10f6275..4081fa74a2 100644 --- a/configs/freescale_imx6dlsabreauto_defconfig +++ b/configs/freescale_imx6dlsabreauto_defconfig @@ -16,9 +16,8 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" # kernel BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +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_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-sabreauto" @@ -38,7 +37,6 @@ BR2_PACKAGE_HOST_MTOOLS=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6dlsabreauto" BR2_TARGET_UBOOT_FORMAT_IMX=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +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 0f84cb1f03fda27df856cc4bfee36b9e5569b3d3 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Thu, 29 Dec 2022 20:47:14 +0100 Subject: [PATCH 0199/5754] configs/freescale_imx6dlsabresd: update codeaurora URLs to github NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. Note 2: this commit updates the Kernel and U-Boot download urls. The method is also changed from _CUSTOM_GIT to _CUSTOM_TARBALL. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- configs/freescale_imx6dlsabresd_defconfig | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/configs/freescale_imx6dlsabresd_defconfig b/configs/freescale_imx6dlsabresd_defconfig index 74debbfd46..976c180d6c 100644 --- a/configs/freescale_imx6dlsabresd_defconfig +++ b/configs/freescale_imx6dlsabresd_defconfig @@ -16,9 +16,8 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" # kernel BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +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_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-sabresd" @@ -37,7 +36,6 @@ BR2_PACKAGE_HOST_MTOOLS=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6dlsabresd" BR2_TARGET_UBOOT_FORMAT_IMX=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +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 67a98cdd94b03404bf91b203a998e37a6d5d4e0e Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Thu, 29 Dec 2022 20:47:15 +0100 Subject: [PATCH 0200/5754] configs/freescale_imx6qsabreauto: update codeaurora URLs to github NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. Note 2: this commit updates the Kernel and U-Boot download urls. The method is also changed from _CUSTOM_GIT to _CUSTOM_TARBALL. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- configs/freescale_imx6qsabreauto_defconfig | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/configs/freescale_imx6qsabreauto_defconfig b/configs/freescale_imx6qsabreauto_defconfig index 58b4a5f92d..72696ab1ad 100644 --- a/configs/freescale_imx6qsabreauto_defconfig +++ b/configs/freescale_imx6qsabreauto_defconfig @@ -16,9 +16,8 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" # kernel BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +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_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabreauto" @@ -38,7 +37,6 @@ BR2_PACKAGE_HOST_MTOOLS=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6qsabreauto" BR2_TARGET_UBOOT_FORMAT_IMX=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +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 dd42b159a5f752921ee602530d289c810ad7ee51 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Thu, 29 Dec 2022 20:47:16 +0100 Subject: [PATCH 0201/5754] configs/freescale_imx6qsabresd: update codeaurora URLs to github NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. Note 2: this commit updates the Kernel and U-Boot download urls. The method is also changed from _CUSTOM_GIT to _CUSTOM_TARBALL. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- configs/freescale_imx6qsabresd_defconfig | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/configs/freescale_imx6qsabresd_defconfig b/configs/freescale_imx6qsabresd_defconfig index f2ac993da0..86513d8072 100644 --- a/configs/freescale_imx6qsabresd_defconfig +++ b/configs/freescale_imx6qsabresd_defconfig @@ -16,9 +16,8 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" # kernel BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +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_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd" @@ -39,6 +38,6 @@ 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_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +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 2262e55b12fa032b5ab319a9e2c19babba6b1dc1 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Thu, 29 Dec 2022 21:08:18 +0100 Subject: [PATCH 0202/5754] configs/freescale_imx6sxsabresd: update codeaurora URLs to github NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. Note 2: this commit updates the Kernel and U-Boot download urls. The method is also changed from _CUSTOM_GIT to _CUSTOM_TARBALL. Signed-off-by: Julien Olivain Reviewed-by: Fabio Estevam Signed-off-by: Yann E. MORIN --- configs/freescale_imx6sxsabresd_defconfig | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/configs/freescale_imx6sxsabresd_defconfig b/configs/freescale_imx6sxsabresd_defconfig index 9f48ef2da5..0c585c97f0 100644 --- a/configs/freescale_imx6sxsabresd_defconfig +++ b/configs/freescale_imx6sxsabresd_defconfig @@ -16,9 +16,8 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" # kernel BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +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_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6sx-sdb" @@ -36,8 +35,7 @@ BR2_PACKAGE_HOST_MTOOLS=y # bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6sxsabresd" -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +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_FORMAT_IMX=y BR2_TARGET_UBOOT_NEEDS_DTC=y From 897a75a26679fd68276418ff49b79358b7ca2c7a Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Thu, 29 Dec 2022 22:23:21 +0100 Subject: [PATCH 0203/5754] configs/freescale_imx6ullevk: update codeaurora URLs to github NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. Note 2: this commit updates the Kernel and U-Boot download urls. The method is also changed from _CUSTOM_GIT to _CUSTOM_TARBALL. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- configs/freescale_imx6ullevk_defconfig | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/configs/freescale_imx6ullevk_defconfig b/configs/freescale_imx6ullevk_defconfig index 4c5c3b2524..7a8965be18 100644 --- a/configs/freescale_imx6ullevk_defconfig +++ b/configs/freescale_imx6ullevk_defconfig @@ -4,9 +4,8 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=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_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +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_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ull-14x14-evk" @@ -15,9 +14,8 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6ull_14x14_evk" -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +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 BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_PACKAGE_HOST_DOSFSTOOLS=y From 492d471968e83126cb0f10518e2deba3ff835b08 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Thu, 29 Dec 2022 22:23:22 +0100 Subject: [PATCH 0204/5754] configs/freescale_imx7dsabresd: update codeaurora URLs to github NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. Note 2: this commit updates the Kernel and U-Boot download urls. The method is also changed from _CUSTOM_GIT to _CUSTOM_TARBALL. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- configs/freescale_imx7dsabresd_defconfig | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/configs/freescale_imx7dsabresd_defconfig b/configs/freescale_imx7dsabresd_defconfig index 5a9cff488d..d337865831 100644 --- a/configs/freescale_imx7dsabresd_defconfig +++ b/configs/freescale_imx7dsabresd_defconfig @@ -10,9 +10,8 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" # Kernel BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +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_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx7d-sdb" @@ -25,9 +24,8 @@ BR2_TARGET_ROOTFS_EXT2_4=y # bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx7dsabresd" -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +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_FORMAT_IMX=y BR2_TARGET_UBOOT_NEEDS_DTC=y From a01cb853fe978d85037d9a4dd762113c9132dc4c Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Thu, 29 Dec 2022 22:23:23 +0100 Subject: [PATCH 0205/5754] configs/freescale_imx8mqevk: update codeaurora URLs to github NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. Note 2: this commit updates the Kernel, U-Boot and ATF download urls. The method is also changed from _CUSTOM_GIT to _CUSTOM_TARBALL. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- configs/freescale_imx8mqevk_defconfig | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/configs/freescale_imx8mqevk_defconfig b/configs/freescale_imx8mqevk_defconfig index 7f5dd87b5f..e3f88dc44c 100644 --- a/configs/freescale_imx8mqevk_defconfig +++ b/configs/freescale_imx8mqevk_defconfig @@ -5,9 +5,8 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" 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/imx8mq-evk.dtb" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +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_DEFCONFIG="imx_v8" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mq-evk" @@ -19,16 +18,14 @@ 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_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-5.10.y-1.0.0)/imx-atf-lf-5.10.y-1.0.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mq" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +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_BOARD_DEFCONFIG="imx8mq_evk" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y From e5f10b73007487d5d19e34914ee0e1c35a127c4c Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Thu, 29 Dec 2022 23:25:25 +0100 Subject: [PATCH 0206/5754] configs/freescale_imx8mpevk: update codeaurora URLs to github NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. Note 2: this commit updates the Kernel, U-Boot and ATF download urls. The method is also changed from _CUSTOM_GIT to _CUSTOM_TARBALL. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- configs/freescale_imx8mpevk_defconfig | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/configs/freescale_imx8mpevk_defconfig b/configs/freescale_imx8mpevk_defconfig index 8d0e6e0f3e..5a72406b67 100644 --- a/configs/freescale_imx8mpevk_defconfig +++ b/configs/freescale_imx8mpevk_defconfig @@ -5,9 +5,8 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1" 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/imx8mp-evk.dtb" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +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_DEFCONFIG="imx_v8" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mp-evk" @@ -19,16 +18,14 @@ 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_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-5.10.y-1.0.0)/imx-atf-lf-5.10.y-1.0.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mp" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +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_BOARD_DEFCONFIG="imx8mp_evk" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y From 5d93fe2f2ac6155db3bb8022a85cf89c9ff57f82 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Thu, 29 Dec 2022 23:25:26 +0100 Subject: [PATCH 0207/5754] configs/freescale_imx8mnevk: update codeaurora URLs to github NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. Note 2: this commit updates the Kernel, U-Boot and ATF download urls. The method is also changed from _CUSTOM_GIT to _CUSTOM_TARBALL. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- configs/freescale_imx8mnevk_defconfig | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/configs/freescale_imx8mnevk_defconfig b/configs/freescale_imx8mnevk_defconfig index b24eb1566b..0653978d91 100644 --- a/configs/freescale_imx8mnevk_defconfig +++ b/configs/freescale_imx8mnevk_defconfig @@ -5,9 +5,8 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1" 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/imx8mn-ddr4-evk.dtb" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +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_DEFCONFIG="imx_v8" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mn-ddr4-evk" @@ -20,16 +19,14 @@ 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_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-5.10.y-1.0.0)/imx-atf-lf-5.10.y-1.0.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mn" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +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_BOARD_DEFCONFIG="imx8mn_ddr4_evk" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y From ca0d4287185c5f7f7c4fea7b405effdc0d19c93c Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Thu, 29 Dec 2022 23:25:27 +0100 Subject: [PATCH 0208/5754] configs/freescale_imx8mmevk: update codeaurora URLs to github NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. Note 2: this commit updates the Kernel, U-Boot and ATF download urls. The method is also changed from _CUSTOM_GIT to _CUSTOM_TARBALL. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- configs/freescale_imx8mmevk_defconfig | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/configs/freescale_imx8mmevk_defconfig b/configs/freescale_imx8mmevk_defconfig index ae82f29158..dcb4b42540 100644 --- a/configs/freescale_imx8mmevk_defconfig +++ b/configs/freescale_imx8mmevk_defconfig @@ -5,9 +5,8 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1" 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/imx8mm-evk.dtb" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +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_DEFCONFIG="imx_v8" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mm-evk freescale/imx8mm-evk-revb-qca-wifi" @@ -19,16 +18,14 @@ 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_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-5.10.y-1.0.0)/imx-atf-lf-5.10.y-1.0.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +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_BOARD_DEFCONFIG="imx8mm_evk" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y From 47f2896fe36b4439b80b149f86f1975c53b1e5bb Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Fri, 30 Dec 2022 10:57:23 +0100 Subject: [PATCH 0209/5754] configs/freescale_imx8qmmek: update codeaurora URLs to github NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. Note 2: this commit updates the Kernel, U-Boot and ATF download urls. The method is also changed from _CUSTOM_GIT to _CUSTOM_TARBALL. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- configs/freescale_imx8qmmek_defconfig | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/configs/freescale_imx8qmmek_defconfig b/configs/freescale_imx8qmmek_defconfig index 8a0e866cee..75777646df 100644 --- a/configs/freescale_imx8qmmek_defconfig +++ b/configs/freescale_imx8qmmek_defconfig @@ -4,9 +4,8 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y 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-imx8qm-mek.dtb" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +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_DEFCONFIG="imx_v8" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8qm-mek" @@ -20,16 +19,14 @@ 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_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-5.10.y-1.0.0)/imx-atf-lf-5.10.y-1.0.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8qm" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +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_BOARD_DEFCONFIG="imx8qm_mek" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_PACKAGE_HOST_DOSFSTOOLS=y From 9bcc1c0ef7cfc5263925448c2b3c502318b37691 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Fri, 30 Dec 2022 10:57:24 +0100 Subject: [PATCH 0210/5754] configs/freescale_imx8qxpmek: update codeaurora URLs to github NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. Note 2: this commit updates the Kernel, U-Boot and ATF download urls. The method is also changed from _CUSTOM_GIT to _CUSTOM_TARBALL. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- configs/freescale_imx8qxpmek_defconfig | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/configs/freescale_imx8qxpmek_defconfig b/configs/freescale_imx8qxpmek_defconfig index 1ffbd123e0..ce8f6b7c84 100644 --- a/configs/freescale_imx8qxpmek_defconfig +++ b/configs/freescale_imx8qxpmek_defconfig @@ -6,9 +6,8 @@ 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-imx8qxp-mek.dtb" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +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_DEFCONFIG="imx_v8" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8qxp-mek" @@ -22,16 +21,14 @@ 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_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-5.10.y-1.0.0)/imx-atf-lf-5.10.y-1.0.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8qx" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +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_BOARD_DEFCONFIG="imx8qxp_mek" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_PACKAGE_HOST_DOSFSTOOLS=y From e840a811e5c21f36524a1e334ba76cc90ae53411 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Fri, 30 Dec 2022 10:57:25 +0100 Subject: [PATCH 0211/5754] configs/imx8mmpico: update codeaurora URLs to github NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. Note 2: this commit updates only the ATF download urls. The method is also changed from _CUSTOM_GIT to _CUSTOM_TARBALL. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- configs/imx8mmpico_defconfig | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/configs/imx8mmpico_defconfig b/configs/imx8mmpico_defconfig index 7c19c8c81b..8c34c40fef 100644 --- a/configs/imx8mmpico_defconfig +++ b/configs/imx8mmpico_defconfig @@ -17,9 +17,8 @@ BR2_TARGET_ROOTFS_EXT2_4=y 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_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="lf-5.10.72-2.2.0" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-5.10.72-2.2.0)/imx-atf-lf-5.10.72-2.2.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y From a8fd6036e3b2847f378363b8c0f0ba2cf1a30d1c Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Fri, 30 Dec 2022 10:57:26 +0100 Subject: [PATCH 0212/5754] configs/imx8mpico: update codeaurora URLs to github NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. Note 2: this commit updates only the ATF download urls. The method is also changed from _CUSTOM_GIT to _CUSTOM_TARBALL. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- configs/imx8mpico_defconfig | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/configs/imx8mpico_defconfig b/configs/imx8mpico_defconfig index 55746fb67e..1df8c104ec 100644 --- a/configs/imx8mpico_defconfig +++ b/configs/imx8mpico_defconfig @@ -17,9 +17,8 @@ BR2_TARGET_ROOTFS_EXT2_4=y 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_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="lf-5.10.72-2.2.0" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-5.10.72-2.2.0)/imx-atf-lf-5.10.72-2.2.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mq" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y From 1e96e3c95452aa69dbaad2597146c6da520299fd Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Fri, 30 Dec 2022 10:57:27 +0100 Subject: [PATCH 0213/5754] configs/imx8mqevk: update codeaurora URLs to github NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. Note 2: this commit updates the U-Boot and ATF download urls. The method is also changed from _CUSTOM_GIT to _CUSTOM_TARBALL. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- configs/imx8mqevk_defconfig | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/configs/imx8mqevk_defconfig b/configs/imx8mqevk_defconfig index 73f3f3dcc5..943a479932 100644 --- a/configs/imx8mqevk_defconfig +++ b/configs/imx8mqevk_defconfig @@ -18,16 +18,14 @@ 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_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="rel_imx_5.4.24_2.1.0" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,rel_imx_5.4.24_2.1.0)/imx-atf-rel_imx_5.4.24_2.1.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mq" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_5.4.24_2.1.0" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,rel_imx_5.4.24_2.1.0)/uboot-imx-rel_imx_5.4.24_2.1.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mq_evk" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y From 76e610ef59f2c25577265a103dc37dce79b3e856 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Fri, 30 Dec 2022 10:57:28 +0100 Subject: [PATCH 0214/5754] configs/ls1028ardb: update codeaurora URLs to github NXP moved all its open source code repositories from Code Aurora Forum to github. See for example: https://github.com/nxp-imx/meta-imx/commit/39bc4d81969a40e0da660519cf4ed083b9c53097 Software packages are now grouped in several NXP github projects/organizations (nxp-imx, nxp-qoriq, ...). See: https://www.nxp.com/design/software/embedded-software/nxp-github:NXP-GITHUB The NXP code published on Code Aurora is still present (at the time of this commit) but is no longer receiving updates. It is also expected to be shut down on 2023-03-31. The Code Aurora website https://source.codeaurora.org/ currently show the following message: """ Note: Qualcomm Innovation Center Inc. maintained repositories have migrated to git.codelinaro.org. QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023. If your project depends on these repositories, please adjust your tooling configuration to use the new, up-to-date project location. """ For this reason, the NXP recipes using codeaurora.org urls need to be updated to the correct github.com replacement. Note: this commit does not change the component version. Only the download URL is updated. The archive content is expected to be the same. Note 2: this commit updates the Kernel, U-Boot and ATF download urls. The method is also changed from _CUSTOM_GIT to _CUSTOM_TARBALL. Signed-off-by: Julien Olivain Reviewed-by: Francois Perrad Signed-off-by: Yann E. MORIN --- configs/ls1028ardb_defconfig | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/configs/ls1028ardb_defconfig b/configs/ls1028ardb_defconfig index 1bc84f7b80..a46b94511a 100644 --- a/configs/ls1028ardb_defconfig +++ b/configs/ls1028ardb_defconfig @@ -17,9 +17,8 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/freescale/ls1028ardb/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/qoriq/qoriq-components/linux" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="LSDK-21.08" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,linux,LSDK-21.08)/linux-LSDK-21.08.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v8" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(LINUX_DIR)/arch/arm64/configs/lsdk.config" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -37,9 +36,8 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # Bootloaders BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/qoriq/qoriq-components/atf" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="LSDK-21.08" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,atf,LSDK-21.08)/atf-LSDK-21.08.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="ls1028ardb" BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_RCW=y @@ -48,9 +46,8 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="BOOT_MODE=sd" BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="fip.bin bl2_sd.pbl" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/qoriq/qoriq-components/u-boot" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="LSDK-21.08" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,u-boot,LSDK-21.08)/u-boot-LSDK-21.08.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="ls1028ardb_tfa" BR2_TARGET_UBOOT_NEEDS_DTC=y From bca2c28fc9ed2ebca91e6f1347d947389997a4c7 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 31 Dec 2022 17:43:09 +0100 Subject: [PATCH 0215/5754] package/modem-manager: disable man pages Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/modem-manager/modem-manager.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/modem-manager/modem-manager.mk b/package/modem-manager/modem-manager.mk index 5b8b9c5576..f1fc17523a 100644 --- a/package/modem-manager/modem-manager.mk +++ b/package/modem-manager/modem-manager.mk @@ -13,6 +13,7 @@ MODEM_MANAGER_SELINUX_MODULES = modemmanager MODEM_MANAGER_DEPENDENCIES = host-pkgconf dbus libglib2 $(TARGET_NLS_DEPENDENCIES) host-libxslt MODEM_MANAGER_INSTALL_STAGING = YES MODEM_MANAGER_CONF_OPTS = \ + -Dman=false \ -Dpowerd_suspend_resume=false \ -Dtests=false \ -Dudevdir=/usr/lib/udev From 415c7af0796e1f2212170bcad5a13e9cd16d5d7f Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Wed, 7 Dec 2022 00:10:34 +0100 Subject: [PATCH 0216/5754] package/z3: introduce _ARCH_SUPPORTS z3 package was initially added with a depends on !BR2_nios2. This was detected by testing with "./utils/test-pkg -a -p z3". It turned out that few other architectures are also not supported. The actual z3 requirement is to have a libc that provides AND also provides all the four macros: FE_DOWNWARD, FE_TONEAREST, FE_TOWARDZERO, FE_UPWARD. Quoting glibc manual, or "man fenv": https://www.gnu.org/software/libc/manual/html_node/Rounding.html "fenv.h defines constants which you can use to refer to the various rounding modes. Each one will be defined if and only if the FPU supports the corresponding rounding mode." This patch introduces _ARCH_SUPPORTS to limit only to the architectures with a FPU that has those rounding modes. Fixes: - http://autobuild.buildroot.net/results/2809dd1ae2f3ada8ee7b3f3e388341c7cfb633fb Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/z3/Config.in | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/package/z3/Config.in b/package/z3/Config.in index 55b0e8bb3b..8cd3128687 100644 --- a/package/z3/Config.in +++ b/package/z3/Config.in @@ -1,11 +1,33 @@ +# z3 supports arch for which libc fenv.h provides all four macros: +# FE_DOWNWARD, FE_TONEAREST, FE_TOWARDZERO, FE_UPWARD +# See for example in glibc https://sourceware.org/git/glibc.git +# git grep -E '^[[:space:]]*#[[:space:]]*define[[:space:]]+FE_(TONEAREST|UPWARD|DOWNWARD|TOWARDZERO)' sysdeps/ +config BR2_PACKAGE_Z3_ARCH_SUPPORTS + bool + default y if BR2_aarch64 || BR2_aarch64_be + default y if BR2_arceb || BR2_arcle + default y if BR2_arm || BR2_armeb + default y if BR2_i386 + default y if BR2_m68k + # BR2_microblaze has only FE_TONEAREST + default y if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el + # BR2_nios2 has only FE_TONEAREST + default y if BR2_or1k + default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le + default y if BR2_riscv + default y if BR2_s390x + # BR2_sh has only FE_{TONEAREST,TOWARDZERO} + default y if BR2_sparc || BR2_sparc64 + default y if BR2_x86_64 + # BR2_xtensa supports only uclibc which does not have fenv.h + config BR2_PACKAGE_Z3 bool "z3" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # c++17 # z3 needs fenv.h which is not provided by uclibc depends on !BR2_TOOLCHAIN_USES_UCLIBC - # fenv.h lacks FE_INVALID, FE_OVERFLOW & FE_UNDERFLOW on nios2 - depends on !BR2_nios2 + depends on BR2_PACKAGE_Z3_ARCH_SUPPORTS help Z3, also known as the Z3 Theorem Prover, is a cross-platform satisfiability modulo theories (SMT) solver. From 2f54c2a841861ba587c9bbdd66d5164b6774d9e5 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 18 Sep 2022 23:21:44 +0200 Subject: [PATCH 0217/5754] security hardening: add support for glibc _FORTIFY_SOURCE=3 A new _FORTIFY_SOURCE=3 level was introduced in glibc, in commit: https://sourceware.org/git/?p=glibc.git;a=commit;h=c43c5796121bc5bcc0867f02e5536874aa8196c1 This commit was first included glibc 2.33. At that time, it was only supported by llvm/clang 9, and not by any released gcc version. To support _FORTIFY_SOURCE=3, the needed gcc features were introduced in version 12. The gcc 12 support was added in glibc commit: https://sourceware.org/git/?p=glibc.git;a=commit;h=86bf0feb0e3ec8e37872f72499d6ae33406561d7 This commit was first included in glibc 2.35. Buildroot updated to glibc 2.35 in commit: https://git.buildroot.org/buildroot/commit/?id=68d0aede597d32816c5b2ff32de0ce33cc14eb93 Buildroot introduced gcc 12 support in commit: https://git.buildroot.org/buildroot/commit/?id=0f1ad4fc93286adaba852c99d6e1c2565b5c4258 Support for _FORTIFY_SOURCE=3 can now be added. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- Config.in | 9 +++++++++ package/Makefile.in | 2 ++ 2 files changed, 11 insertions(+) diff --git a/Config.in b/Config.in index 64604a0aed..86699f58c6 100644 --- a/Config.in +++ b/Config.in @@ -930,6 +930,15 @@ config BR2_FORTIFY_SOURCE_2 Also adds checks at run-time (detected buffer overflow terminates the program) +config BR2_FORTIFY_SOURCE_3 + bool "Extended" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_12 + help + This option sets _FORTIFY_SOURCES to 3 and even more + checking is added compared to level 2. Extends checks at + run-time that can introduce an additional performance + overhead. + endchoice comment "Fortify Source needs a glibc toolchain and optimization" diff --git a/package/Makefile.in b/package/Makefile.in index 43d214bcbe..7f1b00ba24 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -160,6 +160,8 @@ ifeq ($(BR2_FORTIFY_SOURCE_1),y) TARGET_HARDENED += -D_FORTIFY_SOURCE=1 else ifeq ($(BR2_FORTIFY_SOURCE_2),y) TARGET_HARDENED += -D_FORTIFY_SOURCE=2 +else ifeq ($(BR2_FORTIFY_SOURCE_3),y) +TARGET_HARDENED += -D_FORTIFY_SOURCE=3 endif TARGET_CPPFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 From e75f3962084045cf50f38f0adf8bfaa8da71dfd5 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Tue, 23 Aug 2022 00:14:29 +0200 Subject: [PATCH 0218/5754] linux: fix builds for kernels < 5.6 and host-gcc >= 10 During a linux-backports update, it was found that kernel v3.10.108 was failing to compile. See: https://lists.buildroot.org/pipermail/buildroot/2022-August/649507.html This issue was introduced by commit 9b41b54be07711c10ad13ce157be272ed1cf402e "linux: fix build with host-gcc 10+", which removes all declarations of "yylloc" symbols in the dtc parser. This symbol is generated by bison, if the "%locations" directive is provided in the parser. See: https://git.savannah.gnu.org/cgit/bison.git/tree/doc/bison.texi?h=v3.8.2#n5984 Kernel versions < 5.6 did not include this directive, so removing all yylloc declararions in the parser also was failing for those version. In the kernel, dtc was updated to v1.5.1-22-gc40aeb60b47a in: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=0cec114e36606412908a35695a5db944cec2e3db This commit is included in kernel v5.6. This dtc update include the dtc commit: https://git.kernel.org/pub/scm/utils/dtc/dtc.git/commit/?id=7150286225476345bd6e7312331e3baf4d621c32 which adds the '%locations' directive. This commit fixes the issue by programmatically adding the '%locations' Bison directive, if it's not found in the parser file. Fixes: - https://bugs.busybox.net/show_bug.cgi?id=14971 Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- linux/linux.mk | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/linux/linux.mk b/linux/linux.mk index 6b547a68ed..7645b5f507 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -155,6 +155,7 @@ LINUX_MAKE_FLAGS = \ INSTALL_MOD_PATH=$(TARGET_DIR) \ CROSS_COMPILE="$(TARGET_CROSS)" \ WERROR=0 \ + REGENERATE_PARSERS=1 \ DEPMOD=$(HOST_DIR)/sbin/depmod ifeq ($(BR2_REPRODUCIBLE),y) @@ -286,6 +287,19 @@ define LINUX_DROP_YYLLOC endef LINUX_POST_PATCH_HOOKS += LINUX_DROP_YYLLOC +# Kernel version < 5.6 breaks if host-gcc version is >= 10 and +# 'yylloc' symbol is removed in previous hook, due to missing +# '%locations' bison directive in dtc-parser.y. See: +# https://bugs.busybox.net/show_bug.cgi?id=14971 +define LINUX_ADD_DTC_LOCATIONS + $(Q)DTC_PARSER=$(@D)/scripts/dtc/dtc-parser.y; \ + if test -e "$${DTC_PARSER}" \ + && ! grep -Eq '^%locations$$' "$${DTC_PARSER}" ; then \ + $(SED) '/^%{$$/i %locations' "$${DTC_PARSER}"; \ + fi +endef +LINUX_POST_PATCH_HOOKS += LINUX_ADD_DTC_LOCATIONS + # Older linux kernels use deprecated perl constructs in timeconst.pl # that were removed for perl 5.22+ so it breaks on newer distributions # Try a dry-run patch to see if this applies, if it does go ahead From acaae6c39bd046a4a2a6250e7c167d77fb24f1f0 Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Sat, 31 Dec 2022 17:17:00 -0300 Subject: [PATCH 0219/5754] package/qemu: allow building only the tools Commit 44be514b21fd (package/qemu: refactor target emulator selection) mistakenly forced to always build at least user or system emulation but it should be possible to choose only the tools (e.g. for a guest VM image). Still, we don't want to configure qemu with neither system nor user emulation, nor the tools enabled; at least one lust be enabled. So, change the selection to force the tools to be enabled if neither the system nor the user emulations are enabled. Reinstate the the machine selection guard behind a dependency on whether at lesat system or user emulation is enabled. Signed-off-by: Carlos Santos [yann.morin.1998@free.fr: - ensure at least one of system, user, or tools - guard the machine selection ] Signed-off-by: Yann E. MORIN --- package/qemu/Config.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/qemu/Config.in b/package/qemu/Config.in index 0f9e353510..2bbc6a14c0 100644 --- a/package/qemu/Config.in +++ b/package/qemu/Config.in @@ -27,7 +27,7 @@ menuconfig BR2_PACKAGE_QEMU select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_PIXMAN select BR2_PACKAGE_ZLIB - select BR2_PACKAGE_QEMU_SYSTEM if !BR2_PACKAGE_QEMU_LINUX_USER + select BR2_PACKAGE_QEMU_TOOLS if !BR2_PACKAGE_QEMU_SYSTEM && !BR2_PACKAGE_QEMU_LINUX_USER help QEMU is a generic and open source machine emulator and virtualizer. @@ -114,6 +114,7 @@ comment "Linux user-land emulation needs a glibc or uClibc toolchain" config BR2_PACKAGE_QEMU_CHOOSE_TARGETS bool "Select individual emulator targets" + depends on BR2_PACKAGE_QEMU_SYSTEM || BR2_PACKAGE_QEMU_LINUX_USER help By default, all targets (system and/or user, subject to the corresponding options, above) are built. If you only need a From 82522d25476fee95fe242a38c989280035a460c5 Mon Sep 17 00:00:00 2001 From: Marcin Niestroj Date: Thu, 3 Nov 2022 11:21:01 +0100 Subject: [PATCH 0220/5754] package/python-dbus-fast: new package Signed-off-by: Marcin Niestroj Reviewed-by: James Hilliard [yann.morin.1998@free.fr: - select host-cython in Config.in - introduce obj_path in test sample ] Signed-off-by: Yann E. MORIN --- DEVELOPERS | 2 + package/Config.in | 1 + package/python-dbus-fast/Config.in | 10 +++++ .../python-dbus-fast/python-dbus-fast.hash | 5 +++ package/python-dbus-fast/python-dbus-fast.mk | 16 +++++++ .../tests/package/sample_python_dbus_fast.py | 45 +++++++++++++++++++ .../tests/package/test_python_dbus_fast.py | 40 +++++++++++++++++ 7 files changed, 119 insertions(+) create mode 100644 package/python-dbus-fast/Config.in create mode 100644 package/python-dbus-fast/python-dbus-fast.hash create mode 100644 package/python-dbus-fast/python-dbus-fast.mk create mode 100644 support/testing/tests/package/sample_python_dbus_fast.py create mode 100644 support/testing/tests/package/test_python_dbus_fast.py diff --git a/DEVELOPERS b/DEVELOPERS index 3217823b6f..8399dcc7af 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1877,6 +1877,7 @@ F: package/murata-cyw-fw/ F: package/netdata/ F: package/python-ansicolors/ F: package/python-bleak/ +F: package/python-dbus-fast/ F: package/python-dbus-next/ F: package/python-iniconfig/ F: package/python-intelhex/ @@ -1888,6 +1889,7 @@ F: package/python-typing-extensions/ F: package/python-xmodem/ F: package/rs485conf/ F: package/turbolua/ +F: support/testing/tests/package/sample_python_dbus_fast.py F: support/testing/tests/package/sample_python_dbus_next.py F: support/testing/tests/package/sample_python_pytest.py F: support/testing/tests/package/sample_python_pytest_asyncio.py diff --git a/package/Config.in b/package/Config.in index 41e15ca77f..995dae2c57 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1022,6 +1022,7 @@ menu "External python modules" source "package/python-daphne/Config.in" source "package/python-dataproperty/Config.in" source "package/python-dateutil/Config.in" + source "package/python-dbus-fast/Config.in" source "package/python-dbus-next/Config.in" source "package/python-decorator/Config.in" source "package/python-defusedxml/Config.in" diff --git a/package/python-dbus-fast/Config.in b/package/python-dbus-fast/Config.in new file mode 100644 index 0000000000..c9562fecfa --- /dev/null +++ b/package/python-dbus-fast/Config.in @@ -0,0 +1,10 @@ +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. + + https://github.com/bluetooth-devices/dbus-fast diff --git a/package/python-dbus-fast/python-dbus-fast.hash b/package/python-dbus-fast/python-dbus-fast.hash new file mode 100644 index 0000000000..f0dceeb43d --- /dev/null +++ b/package/python-dbus-fast/python-dbus-fast.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/dbus-fast/json +md5 eebf2c558dd1af0f8f32b361e91f2fa3 dbus_fast-1.61.1.tar.gz +sha256 bda4a7d559047b74f409eda278f68f610a418e86ad3efa0368fa2ed240daa6b6 dbus_fast-1.61.1.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 new file mode 100644 index 0000000000..de7049ba22 --- /dev/null +++ b/package/python-dbus-fast/python-dbus-fast.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# python-dbus-fast +# +################################################################################ + +PYTHON_DBUS_FAST_VERSION = 1.61.1 +PYTHON_DBUS_FAST_SOURCE = dbus_fast-$(PYTHON_DBUS_FAST_VERSION).tar.gz +PYTHON_DBUS_FAST_SITE = https://files.pythonhosted.org/packages/dd/f4/a280d46b119d59f6a3d84abf474452ae76651558b0963ab8c48ae13b5a44 +PYTHON_DBUS_FAST_SETUP_TYPE = setuptools +PYTHON_DBUS_FAST_LICENSE = MIT +PYTHON_DBUS_FAST_LICENSE_FILES = LICENSE +PYTHON_DBUS_FAST_ENV = REQUIRE_CYTHON=1 +PYTHON_DBUS_FAST_DEPENDENCIES = host-python-cython + +$(eval $(python-package)) diff --git a/support/testing/tests/package/sample_python_dbus_fast.py b/support/testing/tests/package/sample_python_dbus_fast.py new file mode 100644 index 0000000000..4157bccfcf --- /dev/null +++ b/support/testing/tests/package/sample_python_dbus_fast.py @@ -0,0 +1,45 @@ +import asyncio +from dbus_fast.aio import MessageBus +from dbus_fast.service import ServiceInterface, method +import dbus_fast.introspection as intr +from dbus_fast import BusType + + +class SampleInterface(ServiceInterface): + def __init__(self): + super().__init__('test.interface') + + @method() + def Ping(self): + pass + + @method() + def ConcatStrings(self, what1: 's', what2: 's') -> 's': # noqa: F821 + return what1 + what2 + + +async def main(): + bus_name = 'dbus.fast.sample' + obj_path = '/test/path' + + bus = await MessageBus(bus_type=BusType.SYSTEM).connect() + bus2 = await MessageBus(bus_type=BusType.SYSTEM).connect() + + await bus.request_name(bus_name) + + service_interface = SampleInterface() + bus.export(obj_path, service_interface) + + introspection = await bus2.introspect(bus_name, obj_path) + assert type(introspection) is intr.Node + obj = bus2.get_proxy_object(bus_name, obj_path, introspection) + interface = obj.get_interface(service_interface.name) + + result = await interface.call_ping() + assert result is None + + result = await interface.call_concat_strings('hello ', 'world') + assert result == 'hello world' + + +asyncio.run(main()) diff --git a/support/testing/tests/package/test_python_dbus_fast.py b/support/testing/tests/package/test_python_dbus_fast.py new file mode 100644 index 0000000000..5f67cfd8cc --- /dev/null +++ b/support/testing/tests/package/test_python_dbus_fast.py @@ -0,0 +1,40 @@ +import textwrap + + +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3DBusFast(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_DBUS=y + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_DBUS_FAST=y + """ + sample_scripts = ["tests/package/sample_python_dbus_fast.py"] + + def run_sample_scripts(self): + config = \ + """ + + + + + + + + """ + config = textwrap.dedent(config) + config_dir = "/etc/dbus-1/system.d" + config_fn = "dbus.fast.sample.conf" + + # Setup and reload D-Bus configuration + self.emulator.run("mkdir -p " + config_dir) + self.emulator.run("cat > " + config_dir + "/" + config_fn + + " < Date: Mon, 2 Jan 2023 21:54:15 +0100 Subject: [PATCH 0221/5754] configs/spike_riscv64_defconfig: bump Linux kernel to 5.15.86 Signed-off-by: Peter Korsgaard --- configs/spike_riscv64_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/spike_riscv64_defconfig b/configs/spike_riscv64_defconfig index cc145bcd8e..cd8fd8ee04 100644 --- a/configs/spike_riscv64_defconfig +++ b/configs/spike_riscv64_defconfig @@ -2,7 +2,7 @@ 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.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.86" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_TARGET_ROOTFS_CPIO=y From 10672ff957e71fc29a45289f0bfb93fbe9f5e330 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 2 Jan 2023 21:54:16 +0100 Subject: [PATCH 0222/5754] configs/spike_riscv64_defconfig: bump opensbi to 1.1 Instead of the default 0.9 version. Signed-off-by: Peter Korsgaard Reviewed-by: Julien Olivain Tested-by: Julien Olivain Signed-off-by: Peter Korsgaard --- configs/spike_riscv64_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/spike_riscv64_defconfig b/configs/spike_riscv64_defconfig index cd8fd8ee04..26103682f9 100644 --- a/configs/spike_riscv64_defconfig +++ b/configs/spike_riscv64_defconfig @@ -8,6 +8,8 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_TARGET_ROOTFS_CPIO=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_OPENSBI=y +BR2_TARGET_OPENSBI_CUSTOM_VERSION=y +BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.1" BR2_TARGET_OPENSBI_PLAT="generic" BR2_TARGET_OPENSBI_LINUX_PAYLOAD=y BR2_PACKAGE_HOST_RISCV_ISA_SIM=y From a94567b4b5481c14352be3e293672572a326836c Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 2 Jan 2023 23:42:55 +0100 Subject: [PATCH 0223/5754] {linux, linux-headers}: bump 5.15.x / 6.{0, 1}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- 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 b5c65eded4..bca1b3fc8b 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.1.1" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.1.2" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.145-cip17" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.145-cip17-rt7" 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 8d85dc4c6f..8ac04b60f9 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 a3e61377cf4435a9e2966b409a37a1056f6aaa59e561add9125a88e3c0971dfb linux-6.1.1.tar.xz -sha256 d484eb3d4f88be14b42507a85ad4b0932e92e7a742acbce74e8be007124a6820 linux-6.0.15.tar.xz +sha256 ee41f3c4f599b2f46f08aae428c9243db403e7292eb2c9f04ee34909b038d1ae linux-6.1.2.tar.xz +sha256 842071bca611c1f080cbc39c7ab3a6b58d7951f4f41e553b3db4fbe3e0705ce4 linux-6.0.16.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 2c0bae29fac98e0a9408914a4551b2971365ac0000351cb255d6bd9aa0849808 linux-5.15.85.tar.xz +sha256 80fcd9efa443502de9e2750f6dfb59e8de43a5d87a6d2be09dca748d79b5f2ee linux-5.15.86.tar.xz sha256 7aaaf6d0bcd8a2cfa14ad75f02ca62bb2de08aad3bee3eff198de49ea5254079 linux-5.10.161.tar.xz sha256 80253b2cac54c256dfdfd1061800aef907f88432090f7aef74c0ddf50f6e6524 linux-5.4.228.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 60bbe5b768..216b496fe4 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -401,9 +401,9 @@ config BR2_DEFAULT_KERNEL_HEADERS default "4.19.269" if BR2_KERNEL_HEADERS_4_19 default "5.4.228" if BR2_KERNEL_HEADERS_5_4 default "5.10.161" if BR2_KERNEL_HEADERS_5_10 - default "5.15.85" if BR2_KERNEL_HEADERS_5_15 - default "6.0.15" if BR2_KERNEL_HEADERS_6_0 - default "6.1.1" if BR2_KERNEL_HEADERS_6_1 + default "5.15.86" if BR2_KERNEL_HEADERS_5_15 + default "6.0.16" if BR2_KERNEL_HEADERS_6_0 + default "6.1.2" 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 e59365629f882eb3e4ea012ab2cd396bc3d8a4fe Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 2 Jan 2023 22:39:12 +0100 Subject: [PATCH 0224/5754] package/libopenh264: bump version to 2.3.1 Release notes: https://github.com/cisco/openh264/releases/tag/v2.3.1 https://github.com/cisco/openh264/releases/tag/v2.3.0 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/libopenh264/libopenh264.hash | 2 +- package/libopenh264/libopenh264.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libopenh264/libopenh264.hash b/package/libopenh264/libopenh264.hash index 712425a024..eecb0b9625 100644 --- a/package/libopenh264/libopenh264.hash +++ b/package/libopenh264/libopenh264.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e4e5c8ba48e64ba6ce61e8b6e2b76b2d870c74c270147649082feabb40f25905 libopenh264-2.2.0.tar.gz +sha256 453afa66dacb560bc5fd0468aabee90c483741571bca820a39a1c07f0362dc32 libopenh264-2.3.1.tar.gz sha256 dd5c1c9668512530fa5a96e4c29ac4033d70a7eeb0eed7a42fddb6dd794ebdbb LICENSE diff --git a/package/libopenh264/libopenh264.mk b/package/libopenh264/libopenh264.mk index ea41f72661..750ec41e4d 100644 --- a/package/libopenh264/libopenh264.mk +++ b/package/libopenh264/libopenh264.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOPENH264_VERSION = 2.2.0 +LIBOPENH264_VERSION = 2.3.1 LIBOPENH264_SITE = $(call github,cisco,openh264,v$(LIBOPENH264_VERSION)) LIBOPENH264_LICENSE = BSD-2-Clause LIBOPENH264_LICENSE_FILES = LICENSE From 791b530368bee8894fb5c48351846609f97ee9e5 Mon Sep 17 00:00:00 2001 From: Dennis Van Hoorick Date: Tue, 3 Jan 2023 11:34:37 +0100 Subject: [PATCH 0225/5754] package/ncurses: Fix homepage in Config.in The homepage listed in package/ncurses/Config.in is now incorrect, and redirects to https://invisible-island.net/ncurses/, so just use that instead. Signed-off-by: Dennis Van Hoorick Signed-off-by: Yann E. MORIN --- package/ncurses/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/ncurses/Config.in b/package/ncurses/Config.in index 9f7753b06a..c0086cbbe3 100644 --- a/package/ncurses/Config.in +++ b/package/ncurses/Config.in @@ -6,7 +6,7 @@ config BR2_PACKAGE_NCURSES This package installs only a few vital termcap entries - http://www.gnu.org/software/ncurses/ + https://invisible-island.net/ncurses/ if BR2_PACKAGE_NCURSES From 8d7c69a0c9e414b7112347c37e1424ec5f2863ed Mon Sep 17 00:00:00 2001 From: Dennis Van Hoorick Date: Tue, 3 Jan 2023 11:34:38 +0100 Subject: [PATCH 0226/5754] package/ncurses: Switch to git repo with snapshots ncurses does not release dot-versions, but the fixes are released as a set of cumulative patches against the latest version. So far, we carry the list of the patches against 6.3, and this is a tedious task to maintain that list (especially as we have a hash for each of them). Thomas E. Dickey (the ncurses maintainer, so we can trust him) hosts the ncurses snapshots on Github, with patches already applied. So, we switch to using that. This avoids needing to list all incremental patches, and will make future bumping easier. Signed-off-by: Dennis Van Hoorick [yann.morin.1998@free.fr: - don't use 'v' in filename - rework the version string for when there's no snapshot ] Signed-off-by: Yann E. MORIN --- package/ncurses/ncurses.hash | 65 +------------------------------ package/ncurses/ncurses.mk | 75 +++++------------------------------- 2 files changed, 11 insertions(+), 129 deletions(-) diff --git a/package/ncurses/ncurses.hash b/package/ncurses/ncurses.hash index c72a2abf46..c96bf77bce 100644 --- a/package/ncurses/ncurses.hash +++ b/package/ncurses/ncurses.hash @@ -1,65 +1,4 @@ -# Locally calculated after checking pgp signature -sha256 97fc51ac2b085d4cde31ef4d2c3122c21abc217e9090a43a30fc5ec21684e059 ncurses-6.3.tar.gz -sha256 51bad0e386d06d3a26d7f28087b2072658282452f209e7e5eb7722556b042570 ncurses-6.3-20211026.patch.gz -sha256 4e1b0694a2633cc681987c80091175cb2b17a6c882750a7c6afb0560f5447249 ncurses-6.3-20211030.patch.gz -sha256 de7e0b2c784342188da48147d3fa661be38d5b5d517bb224423f15893e27334f ncurses-6.3-20211106.patch.gz -sha256 df78f157336fce33d96ae1e3c2f7d7b48e9b728409d9a4ab59e77242255b03ab ncurses-6.3-20211113.patch.gz -sha256 b7bf59d9a8e243263b05b166c6fe321bfca8e67eb32ebc26a1c813df42d64fee ncurses-6.3-20211115.patch.gz -sha256 7cb46c897e2e54d5f085cd9edc8d523c13b8f4a13878dd01ce094ec52bd26aec ncurses-6.3-20211120.patch.gz -sha256 ee8cf6ab6db3a01f2533959d14a5e1cc8e1412fbce4b2ab4668c7d1101f71684 ncurses-6.3-20211127.patch.gz -sha256 9d9055badff9e15fc1fbe4f4b2cce7c76384d446ab857573cbb1d645430d8ac7 ncurses-6.3-20211204.patch.gz -sha256 6059625cac99819a3580955db377c0820b6be7ae5da4d8a82e9638948a7b0679 ncurses-6.3-20211211.patch.gz -sha256 acb77a09fe6ab37b96e9f70d9ebfde0aaf7bdee064761c605b47125bd31be2ae ncurses-6.3-20211219.patch.gz -sha256 f2786f19c85258da9e9255459480e5ac2efb61b6ea5d0866b9b8507fa8f5b036 ncurses-6.3-20211225.patch.gz -sha256 ca5736eda90cd7cb597be0fdb0ed10f04deb7304cc7ffb0b166dfa07c39ab1e7 ncurses-6.3-20220101.patch.gz -sha256 7e43911e6baa4a7cfeaad1880777bda352eb7b22493db5bc9f72a52aec8d6d78 ncurses-6.3-20220115.patch.gz -sha256 ecfdd8bed6ff3b1fae5050da555c77dd41035c35bebed30162862e343324443e ncurses-6.3-20220122.patch.gz -sha256 32ec2da0fe48c353489c4018b38f890a59eafeb37ab24b82e32ba553845438a4 ncurses-6.3-20220129.patch.gz -sha256 f74b0d1f7f96bf8609c6a62e268019289e4affec9e02f9182ab14817637180e7 ncurses-6.3-20220205.patch.gz -sha256 6506f709e745375f692d05f53c45b50f1e60d13a3e4346db46d14f69e19adbb1 ncurses-6.3-20220212.patch.gz -sha256 349433e684e96096cbacaa1014d3ccd285c441d1bd99a721ae0b705b02de4145 ncurses-6.3-20220219.patch.gz -sha256 2181cf581fcdabb5b534606ab81c4c625bf819f9d351c670972a7f3a85f36197 ncurses-6.3-20220226.patch.gz -sha256 1acd0f2d18ea7c783286658e550c4f61cbe750a907c9be5fc00e67f2ea8f7eb5 ncurses-6.3-20220305.patch.gz -sha256 ced13543cc19ee341d82eb7fd501e15a2f3d1bc08fbbeb9de7edbd6422ca4799 ncurses-6.3-20220312.patch.gz -sha256 450fce90a10b1ab0b20ba5efc222741fe96f8445d1e4528e2a7b7711c26a5254 ncurses-6.3-20220319.patch.gz -sha256 c97213841e41d33b50a8492ba252dc79a24b38721f7ac0966442b3176f5666c7 ncurses-6.3-20220326.patch.gz -sha256 4c6253ea2c3cf83fbac2fdb5af56914e6bdc5a7c6e6e7532a4f218b7af6d05eb ncurses-6.3-20220402.patch.gz -sha256 5b46bc2bec8f9192c2ed7d25f2080c57b7d7ecbe294d85ab8d3c7d4eb4a678fa ncurses-6.3-20220409.patch.gz -sha256 fddd3b7dea2db1dc70adfa46ccb52301c820854821ce35366056e8e8daba8360 ncurses-6.3-20220416.patch.gz -sha256 1dba62d927affe93face3d55710d8abce7b70a904a0dd0114894efff7ba8ac72 ncurses-6.3-20220423.patch.gz -sha256 f6289906a3be560da9240e0d4a7a1bbd213dd9316f0b395e6852524491ff6322 ncurses-6.3-20220430.patch.gz -sha256 a6f631b9b934d0012617c429834b370732084d6f3c1784d11d8f18f26ea9e0d4 ncurses-6.3-20220501.patch.gz -sha256 79e75286b2a3292058bbe0aa67d8ea49682f7942b108c3ffc725a34765d4fce7 ncurses-6.3-20220507.patch.gz -sha256 1dda27245cbd6634f89766624dc72c156312bf00635214ea7ac299c9330b18f2 ncurses-6.3-20220514.patch.gz -sha256 0a251674845e0669e92c8bee6b6e5bb317439f8707f3316424eae590322f87c6 ncurses-6.3-20220521.patch.gz -sha256 411c4fdfc2ea4f56fdb57ff758a13dffa4b2fff68e71b65cf3248c925f6c30ee ncurses-6.3-20220529.patch.gz -sha256 acc315edb22a04f6476d9cd2a43866d478e0f4b2a555f480c92a18983bec5ee7 ncurses-6.3-20220604.patch.gz -sha256 2dae4db33c73766cd63b2b700e09588750bae44622749ce007404e3e30420ada ncurses-6.3-20220612.patch.gz -sha256 1e4b5c3deaab601a9749da591952b66a53d96017967eeec033f3b4d30e12d2de ncurses-6.3-20220618.patch.gz -sha256 65379719532023cd77c80a495cf31ff773345173e919ec8eef8b3f9517969626 ncurses-6.3-20220625.patch.gz -sha256 028864b31ada91862f0d8f4aa016b62bc3fe7e3981d62e81110d5143e26d0e0d ncurses-6.3-20220703.patch.gz -sha256 06c2f6d967480d0bcf20f301db26c8e5c90caf6d3adf616bc277e21407e9c955 ncurses-6.3-20220709.patch.gz -sha256 66aa8564d09fcc7bbd85bbe79685772330633c14d70af2fef00d10491e6b22fb ncurses-6.3-20220716.patch.gz -sha256 fffcc8ec0eab3dcbb7b8d8a208d880a15fe128f6f2dbc63a87d5640d8ade95cf ncurses-6.3-20220724.patch.gz -sha256 1787619c0b5052121dc5816bdb4cbd9699e1b61ba6c98072a3733b17cc7009f9 ncurses-6.3-20220729.patch.gz -sha256 d7fb1f2e2246079527351c8b7c8847c28751c6a5bb46740681d4b6ba790b22cc ncurses-6.3-20220806.patch.gz -sha256 10a04d3189a34187e691e73435c210af3939025f07ff6c34c1bfc48fda6f5a5d ncurses-6.3-20220813.patch.gz -sha256 b9238267413c2fce5bfe4c029f28dbbbef7230cdf47792ecd4070b857fe1a869 ncurses-6.3-20220820.patch.gz -sha256 7d30766caaac9136ab0ff7164d33761b186b698ec237560cb8fce0eb937f90b8 ncurses-6.3-20220827.patch.gz -sha256 5f04fd2d954b3461671290c766f784a4151091eb4e9197a7745dcdbb9c030483 ncurses-6.3-20220903.patch.gz -sha256 b948a0efe45341ccc913cc67231ee1e6bc737f178bcd758ce9f2e856e575071f ncurses-6.3-20220910.patch.gz -sha256 f9ad5781a72d669bdd06fe075136cc79e6a570960f6f641a9c486fc102a45c3b ncurses-6.3-20220917.patch.gz -sha256 bbb9d5afaec836e66b9f919c97c81c0505fd111b479b59ab6e376822ff6df1d3 ncurses-6.3-20220924.patch.gz -sha256 7ffeae28a0f8416c6ab088a99807d0d1ee5be821828c288f0a572ea769a8e2e5 ncurses-6.3-20221001.patch.gz -sha256 204baff40926d29ec30b1def4d4cc5d7ce074918327d8e271a49c960032b5a49 ncurses-6.3-20221008.patch.gz -sha256 f578dbb3beb1976636c74b33ffe5d300fee5a7653bc4f64bb7870d1b9cf85e7b ncurses-6.3-20221015.patch.gz -sha256 b01fc81093a331d5d645dbcbacebf6e5d459430b38cbdae0db053c6e5dff7d7e ncurses-6.3-20221023.patch.gz -sha256 e6e819c78c78c3a0355e7da4360d084f5d69871fa556b51322980f22da4edcea ncurses-6.3-20221029.patch.gz -sha256 4da9b5bf14a1b7d6d8a4181e79a98b9e5782153bc7db93773ac43e0b758c4da2 ncurses-6.3-20221105.patch.gz -sha256 b3381da6071bbed04e6ddaabbd5375d280e50af429f94522e32e9d0f22766155 ncurses-6.3-20221112.patch.gz -sha256 bf30c435283a4483280e0433f6370d9eea1fb704323bd887e540592eb8203e2f ncurses-6.3-20221119.patch.gz -sha256 32dc21b671ead8b199d66111ebd3404e8cd5f8c4ca5587cfeb5c6a4913b2d103 ncurses-6.3-20221126.patch.gz -sha256 8fe3bcacaea784ac7971e102a8eb8ca58c4c2c4c13c1ec33f32334600b9e4f56 ncurses-6.3-20221203.patch.gz - +# Locally calculated +sha256 4057d800ee96623ae70d06b05b2dadb481a80c030e4968aa5d9bcea4439441da ncurses-6.3-20221224.tar.gz # Locally computed sha256 63de87399e9fc8860236082b6b0520e068e9eb1fad0ebd30202aa30bb6f690ac COPYING diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk index 4d93a992e4..73e3c3feb8 100644 --- a/package/ncurses/ncurses.mk +++ b/package/ncurses/ncurses.mk @@ -4,79 +4,22 @@ # ################################################################################ -NCURSES_VERSION = 6.3 -NCURSES_SITE = $(BR2_GNU_MIRROR)/ncurses +# 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 = $(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)) NCURSES_INSTALL_STAGING = YES 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_CONFIG_SCRIPTS = ncurses$(NCURSES_LIB_SUFFIX)6-config -# patch 20220416 + +# Fixed since snapshot 20220416 NCURSES_IGNORE_CVES += CVE-2022-29458 -NCURSES_PATCH = \ - $(addprefix https://invisible-mirror.net/archives/ncurses/$(NCURSES_VERSION)/, \ - ncurses-6.3-20211026.patch.gz \ - ncurses-6.3-20211030.patch.gz \ - ncurses-6.3-20211106.patch.gz \ - ncurses-6.3-20211113.patch.gz \ - ncurses-6.3-20211115.patch.gz \ - ncurses-6.3-20211120.patch.gz \ - ncurses-6.3-20211127.patch.gz \ - ncurses-6.3-20211204.patch.gz \ - ncurses-6.3-20211211.patch.gz \ - ncurses-6.3-20211219.patch.gz \ - ncurses-6.3-20211225.patch.gz \ - ncurses-6.3-20220101.patch.gz \ - ncurses-6.3-20220115.patch.gz \ - ncurses-6.3-20220122.patch.gz \ - ncurses-6.3-20220129.patch.gz \ - ncurses-6.3-20220205.patch.gz \ - ncurses-6.3-20220212.patch.gz \ - ncurses-6.3-20220219.patch.gz \ - ncurses-6.3-20220226.patch.gz \ - ncurses-6.3-20220305.patch.gz \ - ncurses-6.3-20220312.patch.gz \ - ncurses-6.3-20220319.patch.gz \ - ncurses-6.3-20220326.patch.gz \ - ncurses-6.3-20220402.patch.gz \ - ncurses-6.3-20220409.patch.gz \ - ncurses-6.3-20220416.patch.gz \ - ncurses-6.3-20220423.patch.gz \ - ncurses-6.3-20220430.patch.gz \ - ncurses-6.3-20220501.patch.gz \ - ncurses-6.3-20220507.patch.gz \ - ncurses-6.3-20220514.patch.gz \ - ncurses-6.3-20220521.patch.gz \ - ncurses-6.3-20220529.patch.gz \ - ncurses-6.3-20220604.patch.gz \ - ncurses-6.3-20220612.patch.gz \ - ncurses-6.3-20220618.patch.gz \ - ncurses-6.3-20220625.patch.gz \ - ncurses-6.3-20220703.patch.gz \ - ncurses-6.3-20220709.patch.gz \ - ncurses-6.3-20220716.patch.gz \ - ncurses-6.3-20220724.patch.gz \ - ncurses-6.3-20220729.patch.gz \ - ncurses-6.3-20220806.patch.gz \ - ncurses-6.3-20220813.patch.gz \ - ncurses-6.3-20220820.patch.gz \ - ncurses-6.3-20220827.patch.gz \ - ncurses-6.3-20220903.patch.gz \ - ncurses-6.3-20220910.patch.gz \ - ncurses-6.3-20220917.patch.gz \ - ncurses-6.3-20220924.patch.gz \ - ncurses-6.3-20221001.patch.gz \ - ncurses-6.3-20221008.patch.gz \ - ncurses-6.3-20221015.patch.gz \ - ncurses-6.3-20221023.patch.gz \ - ncurses-6.3-20221029.patch.gz \ - ncurses-6.3-20221105.patch.gz \ - ncurses-6.3-20221112.patch.gz \ - ncurses-6.3-20221119.patch.gz \ - ncurses-6.3-20221126.patch.gz \ - ncurses-6.3-20221203.patch.gz \ - ) NCURSES_CONF_OPTS = \ --without-cxx \ From 5cb87730fdf2eb5a7a5b1302c21afba71aeeb5e0 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 29 Dec 2022 17:30:45 +0100 Subject: [PATCH 0227/5754] Revert "package/tiff: add webp optional dependency" This reverts commit 3fd6ada8dbca3370b9bb67feb2971e637cb4b11f to fix the following build failure raised because tiff is already an optional dependency of webp: package/tiff/tiff.mk:122: *** Recursive variable 'TIFF_FINAL_RECURSIVE_DEPENDENCIES' references itself (eventually). Stop. Fixes: - http://autobuild.buildroot.org/results/d8486cd1d5e56fb3719dc88b8aebc76c3e23cdc9 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/tiff/Config.in | 4 ---- package/tiff/tiff.mk | 7 ------- 2 files changed, 11 deletions(-) diff --git a/package/tiff/Config.in b/package/tiff/Config.in index b9e3656e6f..d1004d6668 100644 --- a/package/tiff/Config.in +++ b/package/tiff/Config.in @@ -72,10 +72,6 @@ config BR2_PACKAGE_TIFF_UTILITIES help Install all tiff utilities. -config BR2_PACKAGE_TIFF_WEBP - bool "WEBP compression" - select BR2_PACKAGE_WEBP - config BR2_PACKAGE_TIFF_ZSTD bool "ZSTD compression" select BR2_PACKAGE_ZSTD diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk index c2a4108f35..f0b56150b1 100644 --- a/package/tiff/tiff.mk +++ b/package/tiff/tiff.mk @@ -105,13 +105,6 @@ else TIFF_CONF_OPTS += --disable-tools endif -ifeq ($(BR2_PACKAGE_TIFF_WEBP),y) -TIFF_CONF_OPTS += --enable-webp -TIFF_DEPENDENCIES += webp -else -TIFF_CONF_OPTS += --disable-webp -endif - ifeq ($(BR2_PACKAGE_TIFF_ZSTD),y) TIFF_CONF_OPTS += --enable-zstd TIFF_DEPENDENCIES += zstd From 9db9f9b4dc7d7b728bf2ea9e6456a9fcc6d7098c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 29 Dec 2022 17:30:46 +0100 Subject: [PATCH 0228/5754] package/tiff: explicitly disable webp Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/tiff/tiff.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk index f0b56150b1..d3ab50b79e 100644 --- a/package/tiff/tiff.mk +++ b/package/tiff/tiff.mk @@ -12,9 +12,12 @@ TIFF_CPE_ID_VENDOR = libtiff TIFF_CPE_ID_PRODUCT = libtiff TIFF_INSTALL_STAGING = YES +# 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 = \ --disable-contrib \ --disable-tests \ + --disable-webp \ --without-x TIFF_DEPENDENCIES = host-pkgconf From d64a089a64aff7c8cbf197beea460d644646243d Mon Sep 17 00:00:00 2001 From: Thomas Devoogdt Date: Wed, 4 Jan 2023 08:36:30 +0100 Subject: [PATCH 0229/5754] package/webkitgtk: security bump to version 2.38.3 Bugfix release, with a security patch for CVE-2022-42799, CVE-2022-42823, CVE-2022-42824, CVE-2022-42852, CVE-2022-42856, CVE-2022-42863, CVE-2022-42867, CVE-2022-46691, CVE-2022-46692, CVE-2022-46698, CVE-2022-46699 and CVE-2022-46700. Release notes: https://webkitgtk.org/2022/10/20/webkitgtk2.38.1-released.html https://webkitgtk.org/2022/11/04/webkitgtk2.38.2-released.html https://webkitgtk.org/2022/12/22/webkitgtk2.38.3-released.html Accompanying security advisory: https://webkitgtk.org/security/WSA-2022-0010.html https://webkitgtk.org/security/WSA-2022-0011.html Signed-off-by: Thomas Devoogdt 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 c2512be9c6..eff7f5c18f 100644 --- a/package/webkitgtk/webkitgtk.hash +++ b/package/webkitgtk/webkitgtk.hash @@ -1,7 +1,7 @@ -# From https://webkitgtk.org/releases/webkitgtk-2.38.0.tar.xz.sums -md5 a69cd8fc05f7299458b4faf1bc99b875 webkitgtk-2.38.0.tar.xz -sha1 6dcb65b8dc56c52f086bfeecfca7920e9cc78348 webkitgtk-2.38.0.tar.xz -sha256 f9ce6375a3b6e1329b0b609f46921e2627dc7ad6224b37b967ab2ea643bc0fbd webkitgtk-2.38.0.tar.xz +# From https://webkitgtk.org/releases/webkitgtk-2.38.3.tar.xz.sums +md5 1c1cc5eb59273091e228406937b23947 webkitgtk-2.38.3.tar.xz +sha1 04cb5923d8ac6f435424b74115c3219ec597e9ad webkitgtk-2.38.3.tar.xz +sha256 41f001d1ed448c6936b394a9f20e4640eebf83a7f08262df28504f7410604a5a webkitgtk-2.38.3.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 336744954e..b1bca7b88a 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBKITGTK_VERSION = 2.38.0 +WEBKITGTK_VERSION = 2.38.3 WEBKITGTK_SITE = https://www.webkitgtk.org/releases WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz WEBKITGTK_INSTALL_STAGING = YES From 83c4edf83953bb86257e6b6e3b07f974fc66a37e Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Tue, 3 Jan 2023 20:36:45 +0100 Subject: [PATCH 0230/5754] package/libksba: update _SITE to https Switch to https download for firewall compatibility and security. The https URL is also the one advertised on the package download page: https://gnupg.org/download/index.html Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- package/libksba/libksba.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libksba/libksba.mk b/package/libksba/libksba.mk index 3a8b3fa502..727a836cf4 100644 --- a/package/libksba/libksba.mk +++ b/package/libksba/libksba.mk @@ -6,7 +6,7 @@ LIBKSBA_VERSION = 1.6.2 LIBKSBA_SOURCE = libksba-$(LIBKSBA_VERSION).tar.bz2 -LIBKSBA_SITE = ftp://ftp.gnupg.org/gcrypt/libksba +LIBKSBA_SITE = https://gnupg.org/ftp/gcrypt/libksba LIBKSBA_LICENSE = LGPL-3.0+ or GPL-2.0+ (library, headers), GPL-3.0+ (manual, tests, build system) LIBKSBA_LICENSE_FILES = AUTHORS COPYING COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv3 LIBKSBA_CPE_ID_VENDOR = libksba_project From 456f18409861a0bee1d553d530cef8bf3482ee7a Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Tue, 3 Jan 2023 20:36:46 +0100 Subject: [PATCH 0231/5754] package/libksba: security bump to version 1.6.3 Fixes: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-47629 See also: https://gnupg.org/blog/20221017-pepe-left-the-ksba.html For changelog see: https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libksba.git;a=log;h=libksba-1.6.3 Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- package/libksba/libksba.hash | 2 +- package/libksba/libksba.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libksba/libksba.hash b/package/libksba/libksba.hash index 77485c0cb6..5c6c5eda7a 100644 --- a/package/libksba/libksba.hash +++ b/package/libksba/libksba.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 fce01ccac59812bddadffacff017dac2e4762bdb6ebc6ffe06f6ed4f6192c971 libksba-1.6.2.tar.bz2 +sha256 3f72c68db30971ebbf14367527719423f0a4d5f8103fc9f4a1c01a9fa440de5c libksba-1.6.3.tar.bz2 # Hash for license files: sha256 8f1b87e551d97b2b23b6d3403a5d598c63ea89824cb8ee351f631f6cab2beaa5 AUTHORS diff --git a/package/libksba/libksba.mk b/package/libksba/libksba.mk index 727a836cf4..b7c0508df8 100644 --- a/package/libksba/libksba.mk +++ b/package/libksba/libksba.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBKSBA_VERSION = 1.6.2 +LIBKSBA_VERSION = 1.6.3 LIBKSBA_SOURCE = libksba-$(LIBKSBA_VERSION).tar.bz2 LIBKSBA_SITE = https://gnupg.org/ftp/gcrypt/libksba LIBKSBA_LICENSE = LGPL-3.0+ or GPL-2.0+ (library, headers), GPL-3.0+ (manual, tests, build system) From b5bdcb4cc562942cac592519c710bc67d1decf8e Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Tue, 3 Jan 2023 20:36:47 +0100 Subject: [PATCH 0232/5754] package/libgpg-error: bump to version 1.46 For the changelog, see: https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=log;h=libgpg-error-1.46 Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- package/libgpg-error/libgpg-error.hash | 6 +++--- package/libgpg-error/libgpg-error.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libgpg-error/libgpg-error.hash b/package/libgpg-error/libgpg-error.hash index b29ec37598..ffe27e9d99 100644 --- a/package/libgpg-error/libgpg-error.hash +++ b/package/libgpg-error/libgpg-error.hash @@ -1,10 +1,10 @@ # From https://www.gnupg.org/download/integrity_check.html -sha1 fe724ed37b4935964059a47b7c64d5f8246659d8 libgpg-error-1.45.tar.bz2 +sha1 a6e5efdd72e848aab4064e5ef4c6835ba344bcf1 libgpg-error-1.46.tar.bz2 # Locally calculated after checking pgp signature -# https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.45.tar.bz2.sig +# https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.46.tar.bz2.sig # using key 6DAA6E64A76D2840571B4902528897B826403ADA -sha256 570f8ee4fb4bff7b7495cff920c275002aea2147e9a1d220c068213267f80a26 libgpg-error-1.45.tar.bz2 +sha256 b7e11a64246bbe5ef37748de43b245abd72cfcd53c9ae5e7fc5ca59f1c81268d libgpg-error-1.46.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 252d95ac7f..ab3c7c3bf2 100644 --- a/package/libgpg-error/libgpg-error.mk +++ b/package/libgpg-error/libgpg-error.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGPG_ERROR_VERSION = 1.45 +LIBGPG_ERROR_VERSION = 1.46 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 6f02b4ba5d17922e52d17f00c3ecaa40563522f4 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Tue, 3 Jan 2023 20:36:48 +0100 Subject: [PATCH 0233/5754] DEVELOPERS: add Julien Olivain for package/gnupg2 Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 8399dcc7af..86e3f0e7b1 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1682,6 +1682,7 @@ F: configs/spike_riscv64_defconfig F: configs/zynq_qmtech_defconfig F: package/fluid-soundfont/ F: package/fluidsynth/ +F: package/gnupg2/ F: package/glslsandbox-player/ F: package/octave/ F: package/ola/ From 9ae7a1a22146e817b8d5cac03d321b5eece65bb4 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Thu, 6 Oct 2022 12:58:30 +0300 Subject: [PATCH 0234/5754] package/libwpe: bump to version 1.14.0 This version is the first stable release with support for gamepad input events and configuring target frame rates. These will be used by a follow-up update of the wpewebkit package. Release notes: https://wpewebkit.org/release/libwpe-1.14.0.html Signed-off-by: Adrian Perez de Castro Signed-off-by: Peter Korsgaard --- package/libwpe/libwpe.hash | 8 ++++---- package/libwpe/libwpe.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/libwpe/libwpe.hash b/package/libwpe/libwpe.hash index 2bbe1f0749..28b7685b93 100644 --- a/package/libwpe/libwpe.hash +++ b/package/libwpe/libwpe.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/libwpe-1.12.3.tar.xz.sums -md5 e538eb8e521d92f2bde3c4cd864abaa1 libwpe-1.12.3.tar.xz -sha1 9d94c411a502a10e68f69bd1fa273539cc6af2ca libwpe-1.12.3.tar.xz -sha256 b84fdbfbc849ce4fdf084bb28b58e5463b1b4b6cc8f200dc77b41f8545d5329d libwpe-1.12.3.tar.xz +# From https://wpewebkit.org/releases/libwpe-1.14.0.tar.xz.sums +md5 f9737912975f979f9e4e01eec174a271 libwpe-1.14.0.tar.xz +sha1 7a5d51c99254fc14ffcbcca9e8550cc7940fe871 libwpe-1.14.0.tar.xz +sha256 c073305bbac5f4402cc1c8a4753bfa3d63a408901f86182051eaa5a75dd89c00 libwpe-1.14.0.tar.xz # Hashes for license files: sha256 35bef295cedbbf179eaee14328002587a0e7dc08ebf3f15ea080a6f2815f0d7b COPYING diff --git a/package/libwpe/libwpe.mk b/package/libwpe/libwpe.mk index ac533642d9..e7b3ce9eaf 100644 --- a/package/libwpe/libwpe.mk +++ b/package/libwpe/libwpe.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBWPE_VERSION = 1.12.3 +LIBWPE_VERSION = 1.14.0 LIBWPE_SITE = https://wpewebkit.org/releases LIBWPE_SOURCE = libwpe-$(LIBWPE_VERSION).tar.xz LIBWPE_INSTALL_STAGING = YES From 76dfd8d0278d75dabfe2871cd4e683b7a2790d26 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Thu, 6 Oct 2022 12:58:31 +0300 Subject: [PATCH 0235/5754] package/wpebackend-fdo: bump to version 1.14.0 This new version contains only small fixes after 1.12.1. Release notes: https://wpewebkit.org/release/wpebackend-fdo-1.14.0.html Signed-off-by: Adrian Perez de Castro Signed-off-by: Peter Korsgaard --- package/wpebackend-fdo/wpebackend-fdo.hash | 8 ++++---- package/wpebackend-fdo/wpebackend-fdo.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/wpebackend-fdo/wpebackend-fdo.hash b/package/wpebackend-fdo/wpebackend-fdo.hash index 49c60fce0f..e2f2c6c89f 100644 --- a/package/wpebackend-fdo/wpebackend-fdo.hash +++ b/package/wpebackend-fdo/wpebackend-fdo.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/wpebackend-fdo-1.12.1.tar.xz.sums -md5 494f4a5b2bd89dacef37b69534b2e1ce wpebackend-fdo-1.12.1.tar.xz -sha1 72a85e4615e085926f7ad8fc8414f9c6a878ef28 wpebackend-fdo-1.12.1.tar.xz -sha256 45aa833c44ec292f31fa943b01b8cc75e54eb623ad7ba6a66fc2f118fe69e629 wpebackend-fdo-1.12.1.tar.xz +# From https://wpewebkit.org/releases/wpebackend-fdo-1.14.0.tar.xz.sums +md5 ea62dfa9ecb366598a837d7446ed48ac wpebackend-fdo-1.14.0.tar.xz +sha1 1500be9212381a404f4a46b22b90a9880ba11c01 wpebackend-fdo-1.14.0.tar.xz +sha256 e75b0cb2c7145448416e8696013d8883f675c66c11ed750e06865efec5809155 wpebackend-fdo-1.14.0.tar.xz # Hashes for license files: sha256 c9f6803371047fad3e72200ec6cd226329a5ee08ac61104c8211c2761fb46825 COPYING diff --git a/package/wpebackend-fdo/wpebackend-fdo.mk b/package/wpebackend-fdo/wpebackend-fdo.mk index 2e2bdee94e..afe37b086e 100644 --- a/package/wpebackend-fdo/wpebackend-fdo.mk +++ b/package/wpebackend-fdo/wpebackend-fdo.mk @@ -4,7 +4,7 @@ # ################################################################################ -WPEBACKEND_FDO_VERSION = 1.12.1 +WPEBACKEND_FDO_VERSION = 1.14.0 WPEBACKEND_FDO_SITE = https://wpewebkit.org/releases WPEBACKEND_FDO_SOURCE = wpebackend-fdo-$(WPEBACKEND_FDO_VERSION).tar.xz WPEBACKEND_FDO_INSTALL_STAGING = YES From 917f05975f9c60eca92988ea9974de55a9e91e44 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Thu, 6 Oct 2022 12:58:32 +0300 Subject: [PATCH 0236/5754] package/wpewebkit: bump to version 2.38.0 Update to a new major release which brings in improvements and a few new features. Release notes: https://wpewebkit.org/release/wpewebkit-2.38.0.html This release also includes security fixes for CVE-2022-32886, CVE-2022-32891, and CVE-2022-32912. Accompanying security advisory: https://wpewebkit.org/security/WSA-2022-0009.html Both building documentation and support for gobject-introspection have been added in this release. Version 2.38.0 also introduces a new WebRTC implementation based on GstWebRTC. Options for them are explicitly left disabled to keep the configuration as it was, and may be enabled in follow-up patches. Lastly, the SILENCE_CROSS_COMPILATION_NOTICES option removed because it no longer exists. The patch that fixes the build on 32-bit ARM targets is also updated for the 2.38 release series. Signed-off-by: Adrian Perez de Castro Signed-off-by: Peter Korsgaard --- ...cpp-fails-to-build-NEON-fast-path-se.patch | 30 ++++++++++++++----- package/wpewebkit/wpewebkit.hash | 8 ++--- package/wpewebkit/wpewebkit.mk | 8 +++-- 3 files changed, 31 insertions(+), 15 deletions(-) diff --git a/package/wpewebkit/0001-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se.patch b/package/wpewebkit/0001-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se.patch index b61909b2ac..ea1676abb6 100644 --- a/package/wpewebkit/0001-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se.patch +++ b/package/wpewebkit/0001-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se.patch @@ -1,4 +1,4 @@ -From 59c9e3a4aeb4753be97b3817d106816d9a4ebe73 Mon Sep 17 00:00:00 2001 +From da159b0150cba0e5e5251e4cc6a090440f73cb7c Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Thu, 2 Jun 2022 11:19:06 +0300 Subject: [PATCH] FELightningNEON.cpp fails to build, NEON fast path seems @@ -35,15 +35,28 @@ left for a follow-up fix. Signed-off-by: Adrian Perez de Castro [Upstream status: https://bugs.webkit.org/show_bug.cgi?id=241182] --- + Source/WebCore/Sources.txt | 1 + .../cpu/arm/filters/FELightingNEON.cpp | 4 +- - .../graphics/cpu/arm/filters/FELightingNEON.h | 52 +++++++++---------- + .../graphics/cpu/arm/filters/FELightingNEON.h | 54 +++++++++---------- .../graphics/filters/DistantLightSource.h | 4 ++ .../platform/graphics/filters/FELighting.h | 7 --- .../graphics/filters/PointLightSource.h | 4 ++ .../graphics/filters/SpotLightSource.h | 4 ++ .../software/FELightingSoftwareApplier.h | 16 ++++++ - 7 files changed, 56 insertions(+), 35 deletions(-) + 8 files changed, 58 insertions(+), 36 deletions(-) +diff --git a/Source/WebCore/Sources.txt b/Source/WebCore/Sources.txt +index 8ce3510fe1a8..efd56bcb8746 100644 +--- a/Source/WebCore/Sources.txt ++++ b/Source/WebCore/Sources.txt +@@ -2136,6 +2136,7 @@ platform/graphics/WebMResourceClient.cpp + platform/graphics/WOFFFileFormat.cpp + platform/graphics/WidthIterator.cpp + platform/graphics/cpu/arm/filters/FEBlendNeonApplier.cpp ++platform/graphics/cpu/arm/filters/FELightingNEON.cpp + platform/graphics/displaylists/DisplayList.cpp + platform/graphics/displaylists/DisplayListDrawingContext.cpp + platform/graphics/displaylists/DisplayListItems.cpp diff --git a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp index f6ff8c20a5a8..42a97ffc5372 100644 --- a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp @@ -67,7 +80,7 @@ index f6ff8c20a5a8..42a97ffc5372 100644 // Calling a powf function from the assembly code would require to save // and reload a lot of NEON registers. Since the base is in range [0..1] diff --git a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h -index b17c603d40d3..e4629cda0b7c 100644 +index b17c603d40d3..c6d17f573eca 100644 --- a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h +++ b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h @@ -24,14 +24,15 @@ @@ -98,9 +111,10 @@ index b17c603d40d3..e4629cda0b7c 100644 { - alignas(16) FELightingFloatArgumentsForNeon floatArguments; - FELightingPaintingDataForNeon neonData = { +- data.pixels->data(), + WebCore::FELightingFloatArgumentsForNeon alignas(16) floatArguments; + WebCore::FELightingPaintingDataForNeon neonData = { - data.pixels->data(), ++ data.pixels->bytes(), 1, - data.widthDecreasedByOne - 1, - data.heightDecreasedByOne - 1, @@ -244,7 +258,7 @@ index 0c073bc13f8c..e0db00545c17 100644 float m_surfaceScale; float m_diffuseConstant; diff --git a/Source/WebCore/platform/graphics/filters/PointLightSource.h b/Source/WebCore/platform/graphics/filters/PointLightSource.h -index 5c9c7fb783e6..e53aa012ac1c 100644 +index 126b3b2350f6..d906db21aa9c 100644 --- a/Source/WebCore/platform/graphics/filters/PointLightSource.h +++ b/Source/WebCore/platform/graphics/filters/PointLightSource.h @@ -26,6 +26,10 @@ @@ -259,7 +273,7 @@ index 5c9c7fb783e6..e53aa012ac1c 100644 class PointLightSource : public LightSource { diff --git a/Source/WebCore/platform/graphics/filters/SpotLightSource.h b/Source/WebCore/platform/graphics/filters/SpotLightSource.h -index 04e331ec4ec0..763c8d400b00 100644 +index 641b205f986d..64380d9b6eb8 100644 --- a/Source/WebCore/platform/graphics/filters/SpotLightSource.h +++ b/Source/WebCore/platform/graphics/filters/SpotLightSource.h @@ -26,6 +26,10 @@ @@ -274,7 +288,7 @@ index 04e331ec4ec0..763c8d400b00 100644 class SpotLightSource : public LightSource { diff --git a/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h b/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h -index 3875b0a4b5de..6d3864aafb9a 100644 +index c974d92115ff..e2896660cfbd 100644 --- a/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h +++ b/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h @@ -36,6 +36,7 @@ diff --git a/package/wpewebkit/wpewebkit.hash b/package/wpewebkit/wpewebkit.hash index 9c8beecf2e..5dd64b34b7 100644 --- a/package/wpewebkit/wpewebkit.hash +++ b/package/wpewebkit/wpewebkit.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/wpewebkit-2.36.8.tar.xz.sums -md5 939dc646bb6652fde9a5b6512c17fc58 wpewebkit-2.36.8.tar.xz -sha1 f45936c578f7dcfbb6064e87da6c098efe093e68 wpewebkit-2.36.8.tar.xz -sha256 8d42a349c910b2d0961b8d34fecef29cec3d21e3af5977346c90026692dc75eb wpewebkit-2.36.8.tar.xz +# From https://wpewebkit.org/releases/wpewebkit-2.38.0.tar.xz.sums +md5 e0e6b98c86351c39e41da475afc50780 wpewebkit-2.38.0.tar.xz +sha1 66e6dd1c285a21ce50370fb4d60332838d801663 wpewebkit-2.38.0.tar.xz +sha256 e653e12eca63e6371c06d4cd9efcd5492db67f7d9ef324fd5d8668b1151e72b2 wpewebkit-2.38.0.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 0ff8204519..001c701ee9 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -WPEWEBKIT_VERSION = 2.36.8 +WPEWEBKIT_VERSION = 2.38.0 WPEWEBKIT_SITE = http://www.wpewebkit.org/releases WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz WPEWEBKIT_INSTALL_STAGING = YES @@ -22,9 +22,11 @@ WPEWEBKIT_CONF_OPTS = \ -DPORT=WPE \ -DENABLE_ACCESSIBILITY=OFF \ -DENABLE_API_TESTS=OFF \ + -DENABLE_DOCUMENTATION=OFF \ + -DENABLE_INTROSPECTION=OFF \ -DENABLE_MINIBROWSER=OFF \ - -DUSE_SOUP2=ON \ - -DSILENCE_CROSS_COMPILATION_NOTICES=ON + -DENABLE_WEB_RTC=OFF \ + -DUSE_SOUP2=ON ifeq ($(BR2_PACKAGE_WPEWEBKIT_SANDBOX),y) WPEWEBKIT_CONF_OPTS += \ From 43c833e6cb44d4ffe59629cd83344caa9f63a0c6 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Thu, 6 Oct 2022 12:58:33 +0300 Subject: [PATCH 0237/5754] package/cog: bump to version 0.16.0 This new version includes support for setting proxy options and gamepad support. Release notes: https://wpewebkit.org/release/cog-0.16.0.html This imports a small patch to properly pick libdrm compiler flags, fetched from the upstream repository. Signed-off-by: Adrian Perez de Castro Tested-by: Gary Bisson Tested-by: James Hilliard Signed-off-by: Peter Korsgaard --- ...m-dependency-when-protocols-are-used.patch | 36 ++++++++++++++++++ package/cog/cog.hash | 8 ++-- package/cog/cog.mk | 37 ++++++++++--------- 3 files changed, 60 insertions(+), 21 deletions(-) create mode 100644 package/cog/0001-wl-Fix-libdrm-dependency-when-protocols-are-used.patch diff --git a/package/cog/0001-wl-Fix-libdrm-dependency-when-protocols-are-used.patch b/package/cog/0001-wl-Fix-libdrm-dependency-when-protocols-are-used.patch new file mode 100644 index 0000000000..44e555c121 --- /dev/null +++ b/package/cog/0001-wl-Fix-libdrm-dependency-when-protocols-are-used.patch @@ -0,0 +1,36 @@ +From 9a1982c563e218b7695e6a174c8230d3b063eb27 Mon Sep 17 00:00:00 2001 +From: Gary Bisson +Date: Thu, 6 Oct 2022 09:04:22 +0200 +Subject: [PATCH] wl: Fix libdrm dependency when protocols are used + +As the comment says, cog-platform-wl.c needs drm_fourcc.h to build +properly when wayland_weston_direct_display is enabled. + +However, libdrm.pc doesn't specify "include/libdrm" as part of its +includedir but whether in its cflags. So use the compile_args dep +instead of includes to fix the build failure. + +Signed-off-by: Gary Bisson +(cherry picked from commit 32c1d9533bcdc22cbc01d02bf2e6ac0d4bda2dc2) +Signed-off-by: Adrian Perez de Castro +[Upstream status: https://github.com/Igalia/cog/pull/501] +--- + platform/wayland/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/platform/wayland/meson.build b/platform/wayland/meson.build +index f1e18ec..31e4460 100644 +--- a/platform/wayland/meson.build ++++ b/platform/wayland/meson.build +@@ -67,7 +67,7 @@ if wayland_platform_weston_protocols.length() > 0 + + # The code uses definitions from the drm_fourcc.h header, but does not + # need to link the library; libdrm here is only a build-time dependency. +- wayland_platform_dependencies += [dependency('libdrm').partial_dependency(includes: true)] ++ wayland_platform_dependencies += [dependency('libdrm').partial_dependency(compile_args: true)] + endif + + +-- +2.38.0 + diff --git a/package/cog/cog.hash b/package/cog/cog.hash index aa128d73d8..a2c55c4b94 100644 --- a/package/cog/cog.hash +++ b/package/cog/cog.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/cog-0.14.1.tar.xz.sums -md5 69d72ac046a0fc485ea7b61b96e7e7fc cog-0.14.1.tar.xz -sha1 6236972b0ae0bce38a0a017610f161b349723862 cog-0.14.1.tar.xz -sha256 fb91104e25e1dde27189c91c70acc356e387f47acebaa8997e01ce5879c3a600 cog-0.14.1.tar.xz +# From https://wpewebkit.org/releases/cog-0.16.0.tar.xz.sums +md5 2705472ea4f333290973722c0862b21d cog-0.16.0.tar.xz +sha1 ef16e5e3d91d0da056fe5e4f596c211af7453b4e cog-0.16.0.tar.xz +sha256 2956f719d36c9a6368f63901a0d1ceaf4d27f529f7df441b3748c36d72906fc6 cog-0.16.0.tar.xz # Hashes for license files: sha256 e6c42d93c68b292bcccf6d2ec3e13da85df90b718ba27c2c2a01053a9d009252 COPYING diff --git a/package/cog/cog.mk b/package/cog/cog.mk index 1f24bebee4..241c4e309c 100644 --- a/package/cog/cog.mk +++ b/package/cog/cog.mk @@ -4,7 +4,7 @@ # ################################################################################ -COG_VERSION = 0.14.1 +COG_VERSION = 0.16.0 COG_SITE = https://wpewebkit.org/releases COG_SOURCE = cog-$(COG_VERSION).tar.xz COG_INSTALL_STAGING = YES @@ -12,37 +12,40 @@ COG_DEPENDENCIES = dbus wpewebkit wpebackend-fdo wayland COG_LICENSE = MIT COG_LICENSE_FILES = COPYING COG_CONF_OPTS = \ - -DCOG_BUILD_PROGRAMS=ON \ - -DCOG_PLATFORM_HEADLESS=ON \ - -DINSTALL_MAN_PAGES=OFF \ - -DCOG_HOME_URI='$(call qstrip,$(BR2_PACKAGE_COG_PROGRAMS_HOME_URI))' \ - -DUSE_SOUP2=ON + -Ddocumentation=false \ + -Dmanpages=false \ + -Dprograms=true \ + -Dsoup2=enabled \ + -Dcog_home_uri='$(call qstrip,$(BR2_PACKAGE_COG_PROGRAMS_HOME_URI))' \ + -Dplatforms='$(subst $(space),$(comma),$(strip $(COG_PLATFORMS_LIST)))' + +COG_PLATFORMS_LIST = headless ifeq ($(BR2_PACKAGE_WESTON),y) -COG_CONF_OPTS += -DCOG_WESTON_DIRECT_DISPLAY=ON +COG_CONF_OPTS += -Dwayland_weston_direct_display=true COG_DEPENDENCIES += weston else -COG_CONF_OPTS += -DCOG_WESTON_DIRECT_DISPLAY=OFF +COG_CONF_OPTS += -Dwayland_weston_direct_display=false endif ifeq ($(BR2_PACKAGE_COG_PLATFORM_FDO),y) -COG_CONF_OPTS += -DCOG_PLATFORM_WL=ON +COG_PLATFORMS_LIST += wayland COG_DEPENDENCIES += libxkbcommon wayland-protocols -else -COG_CONF_OPTS += -DCOG_PLATFORM_WL=OFF endif ifeq ($(BR2_PACKAGE_COG_PLATFORM_DRM),y) -COG_CONF_OPTS += -DCOG_PLATFORM_DRM=ON +COG_PLATFORMS_LIST += drm COG_DEPENDENCIES += libdrm libinput libgbm libegl udev -else -COG_CONF_OPTS += -DCOG_PLATFORM_DRM=OFF endif ifeq ($(BR2_PACKAGE_COG_USE_SYSTEM_DBUS),y) -COG_CONF_OPTS += -DCOG_DBUS_SYSTEM_BUS=ON +COG_CONF_OPTS += -Dcog_dbus_control=system else -COG_CONF_OPTS += -DCOG_DBUS_SYSTEM_BUS=OFF +COG_CONF_OPTS += -Dcog_dbus_control=user +endif + +ifeq ($(BR2_PACKAGE_LIBMANETTE),y) +COG_DEPENDENCIES += libmanette endif -$(eval $(cmake-package)) +$(eval $(meson-package)) From e7792f539e440d40566bfab3dd86881a8f8edd7a Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 1 Jan 2023 20:36:28 -0300 Subject: [PATCH 0238/5754] package/tinyxml: fix typo for TINYXML_CPE_ID_VENDOR Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/tinyxml/tinyxml.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/tinyxml/tinyxml.mk b/package/tinyxml/tinyxml.mk index d173254e31..8e706f1a1e 100644 --- a/package/tinyxml/tinyxml.mk +++ b/package/tinyxml/tinyxml.mk @@ -12,7 +12,7 @@ TINYXML_AUTORECONF = YES TINYXML_INSTALL_STAGING = YES TINYXML_LICENSE = Zlib TINYXML_LICENSE_FILES = README -TINYXML_CPE_ID_VENDOT = tinyxml_project +TINYXML_CPE_ID_VENDOR = tinyxml_project # 0001-In-stamp-always-advance-the-pointer-if-p-0xef.patch TINYXML_IGNORE_CVES += CVE-2021-42260 From aa35d8d071faf68abc4538be2a3bb636ea6b4a2c Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 1 Jan 2023 20:36:27 -0300 Subject: [PATCH 0239/5754] package/qcom-db410c-firmware: fix typo for _LICENSE Cc: Mike Frampton Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/qcom-db410c-firmware/qcom-db410c-firmware.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/qcom-db410c-firmware/qcom-db410c-firmware.mk b/package/qcom-db410c-firmware/qcom-db410c-firmware.mk index 9ef32cc9d4..cf4b59b72e 100644 --- a/package/qcom-db410c-firmware/qcom-db410c-firmware.mk +++ b/package/qcom-db410c-firmware/qcom-db410c-firmware.mk @@ -8,7 +8,7 @@ QCOM_DB410C_FIRMWARE_VERSION = 1034.2.1 QCOM_DB410C_FIRMWARE_BASE = linux-board-support-package-r$(QCOM_DB410C_FIRMWARE_VERSION) QCOM_DB410C_FIRMWARE_SOURCE = $(QCOM_DB410C_FIRMWARE_BASE).zip QCOM_DB410C_FIRMWARE_SITE = https://releases.linaro.org/96boards/dragonboard410c/qualcomm/firmware -QCOM_DB410C_FIRMWARE_LICENCE = Qualcomm firmware license +QCOM_DB410C_FIRMWARE_LICENSE = Qualcomm firmware license QCOM_DB410C_FIRMWARE_LICENSE_FILES = LICENSE QCOM_DB410C_FIRMWARE_DEPENDENCIES = host-mtools From 7aeeb632d66dd59e0dbcff8ad6fee724c4e829d3 Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 1 Jan 2023 20:36:26 -0300 Subject: [PATCH 0240/5754] package/libmng: fix optional dependency to lcms2 "0ce9b533e3 libmng: new package" introduced a typo that makes the optional dependency to lcms2 ineffective. Fix the typo LIBMNG_DEPDENDENCIES -> LIBMNG_DEPENDENCIES. Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/libmng/libmng.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libmng/libmng.mk b/package/libmng/libmng.mk index 090fe18380..8ffd74c05b 100644 --- a/package/libmng/libmng.mk +++ b/package/libmng/libmng.mk @@ -14,7 +14,7 @@ LIBMNG_LICENSE = libmng license LIBMNG_LICENSE_FILES = LICENSE ifeq ($(BR2_PACKAGE_LCMS2),y) -LIBMNG_DEPDENDENCIES += lcms2 +LIBMNG_DEPENDENCIES += lcms2 else LIBMNG_CONF_OPTS += --without-lcms2 endif From fa581bb3e6b45da2b7a0cfb9e5d6f869a7cd9b05 Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 1 Jan 2023 20:36:30 -0300 Subject: [PATCH 0241/5754] package/i2pd: really install configuration files While applying [1] the commit "fffbd2c9f7 i2pd: new package" unintentionally removed completely the post-install hooks, so I2PD_INSTALL_CONFIGURATION_FILES is declared but never called. Fix the install of configuration files by adding the defined symbol to the post-install hooks. [1] http://patchwork.ozlabs.org/project/buildroot/patch/20180327212401.5173-1-fontaine.fabrice@gmail.com/ Cc: Fabrice Fontaine Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/i2pd/i2pd.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/i2pd/i2pd.mk b/package/i2pd/i2pd.mk index b99212be47..ad268a235c 100644 --- a/package/i2pd/i2pd.mk +++ b/package/i2pd/i2pd.mk @@ -44,6 +44,7 @@ define I2PD_INSTALL_CONFIGURATION_FILES mkdir -p $(TARGET_DIR)/var/lib/i2pd cp -a $(@D)/contrib/certificates $(TARGET_DIR)/var/lib/i2pd endef +I2PD_POST_INSTALL_TARGET_HOOKS += I2PD_INSTALL_CONFIGURATION_FILES define I2PD_USERS i2pd -1 i2pd -1 * /var/lib/i2pd - - I2P Daemon From ee73336da98a7de04301a90c9b5a881761274a47 Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 1 Jan 2023 20:36:31 -0300 Subject: [PATCH 0242/5754] package/ima-evm-utils: really install to staging Commit "8229196d41 package/ima-evm-utils: new package" added IMA_EVM_UTILS_INSTALL_STAGING_CMDS without enabling IMA_EVM_UTILS_INSTALL_STAGING, so currently the package is not installed to staging. Enable installing to staging. Cc: Petr Vorel Signed-off-by: Ricardo Martincoski Reviewed-by: Petr Vorel Signed-off-by: Peter Korsgaard --- package/ima-evm-utils/ima-evm-utils.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/ima-evm-utils/ima-evm-utils.mk b/package/ima-evm-utils/ima-evm-utils.mk index 7ee34d5e1a..01984402ce 100644 --- a/package/ima-evm-utils/ima-evm-utils.mk +++ b/package/ima-evm-utils/ima-evm-utils.mk @@ -8,6 +8,7 @@ IMA_EVM_UTILS_VERSION = 1.4 IMA_EVM_UTILS_SITE = http://downloads.sourceforge.net/project/linux-ima/ima-evm-utils IMA_EVM_UTILS_LICENSE = GPL-2.0 IMA_EVM_UTILS_LICENSE_FILES = COPYING +IMA_EVM_UTILS_INSTALL_STAGING = YES IMA_EVM_UTILS_DEPENDENCIES = host-pkgconf keyutils openssl tpm2-tss # Tarball doesn't contain configure From 92219bdf2ece2a0ddfbc45691879a03acd5c7442 Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 1 Jan 2023 20:36:32 -0300 Subject: [PATCH 0243/5754] package/qt5/qt5virtualkeyboard: really configure language layouts Commit "170777f342 package/qt5/qt5virtualkeyboard: convert to qmake infrastructure" changed most but not all _QMAKEFLAGS to _CONF_OPTS. As a consequence, BR2_PACKAGE_QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS is ignored and all layouts are compiled in. Some layouts have different licenses (e.g. pinying), so the license information for a build that is configured to not include such layouts is wrong. Change the remaining _QMAKEFLAGS entry, fixing the config for which language layouts are compiled and installed. Cc: Giulio Benetti Cc: Julien Corjon Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk index c31d455c4e..3fefdc874d 100644 --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk @@ -16,7 +16,7 @@ QT5VIRTUALKEYBOARD_LICENSE_FILES = LICENSE.GPL3 QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS = $(call qstrip,$(BR2_PACKAGE_QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS)) ifneq ($(strip $(QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS)),) -QT5VIRTUALKEYBOARD_QMAKEFLAGS += CONFIG+="$(foreach lang,$(QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS),lang-$(lang))" +QT5VIRTUALKEYBOARD_CONF_OPTS += CONFIG+="$(foreach lang,$(QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS),lang-$(lang))" ifneq ($(filter ja_JP all,$(QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS)),) QT5VIRTUALKEYBOARD_LICENSE += , Apache-2.0 (openwnn) From 93036af53fbbd566a800a12fa8979000ea4fa31f Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 1 Jan 2023 20:36:33 -0300 Subject: [PATCH 0244/5754] package/tekui: really disable parallel build Commit "c80789c917 tekui: disable parallel build" added TEKUI_MAKE but that is not a symbol used by the generic package infra. Ensure -j1 is passed to the build and install commands by using TEKUI_MAKE explicitly. Fixes: http://autobuild.buildroot.net/results/c6cd0d488581013a8b215b0ee2fd8f549a868d4b Cc: Francois Perrad Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/tekui/tekui.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tekui/tekui.mk b/package/tekui/tekui.mk index 13000edd3e..3cb7ff51e5 100644 --- a/package/tekui/tekui.mk +++ b/package/tekui/tekui.mk @@ -59,11 +59,11 @@ endif endif define TEKUI_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TEKUI_MAKE_OPTS) PREFIX="/usr" -C $(@D) all + $(TARGET_MAKE_ENV) $(TEKUI_MAKE) $(TEKUI_MAKE_OPTS) PREFIX="/usr" -C $(@D) all endef define TEKUI_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TEKUI_MAKE_OPTS) PREFIX="$(TARGET_DIR)/usr" -C $(@D) install + $(TARGET_MAKE_ENV) $(TEKUI_MAKE) $(TEKUI_MAKE_OPTS) PREFIX="$(TARGET_DIR)/usr" -C $(@D) install endef $(eval $(generic-package)) From c4ce9d01c4244252e18302aa97653e573359dba6 Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 1 Jan 2023 20:36:34 -0300 Subject: [PATCH 0245/5754] Revert "pptp-linux: fix build with high BR2_JLEVEL settings" This reverts commit ffc4afe084a76e7246bd373c73b706f512a86c2b. Commit from 2012 "ffc4afe084 pptp-linux: fix build with high BR2_JLEVEL settings" added _MAKE to a generic package, but the generic infra does not take this symbol into account. The build issue was fixed in 2013 with commit "a5b8081b89 pptp-linux: fix parallel build" by adding a patch file. So drop the bogus PPTP_LINUX_MAKE. Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/pptp-linux/pptp-linux.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/pptp-linux/pptp-linux.mk b/package/pptp-linux/pptp-linux.mk index 7fd0733977..b6c740e710 100644 --- a/package/pptp-linux/pptp-linux.mk +++ b/package/pptp-linux/pptp-linux.mk @@ -7,7 +7,6 @@ PPTP_LINUX_VERSION = 1.10.0 PPTP_LINUX_SITE = http://downloads.sourceforge.net/project/pptpclient/pptp/pptp-$(PPTP_LINUX_VERSION) PPTP_LINUX_SOURCE = pptp-$(PPTP_LINUX_VERSION).tar.gz -PPTP_LINUX_MAKE = $(MAKE1) PPTP_LINUX_LICENSE = GPL-2.0+ PPTP_LINUX_LICENSE_FILES = COPYING From 11614fdde1611f846b8e5d99f55af7c6c131b817 Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 1 Jan 2023 20:36:35 -0300 Subject: [PATCH 0246/5754] Revert "package/zip: install to staging" This reverts commit c5b5b5ccabe35e11f0ca8db4361bb3f335fc59fb. Commit "c5b5b5ccab package/zip: install to staging" contains a typo that prevents installing to staging. ZIP_INSTALLING_STAGING_CMDS -> ZIP_INSTALL_STAGING_CMDS But the package does not install headers or libraries, only ELF and manual files. So instead of fixing the install to staging, revert the bogus commit. Cc: Jan Pedersen Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/zip/zip.mk | 6 ------ 1 file changed, 6 deletions(-) diff --git a/package/zip/zip.mk b/package/zip/zip.mk index 2d11e1c763..67958a4a66 100644 --- a/package/zip/zip.mk +++ b/package/zip/zip.mk @@ -11,7 +11,6 @@ ZIP_SITE = ftp://ftp.info-zip.org/pub/infozip/src ZIP_LICENSE = Info-ZIP ZIP_LICENSE_FILES = LICENSE ZIP_CPE_ID_VENDOR = info-zip_project -ZIP_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_BZIP2),y) ZIP_DEPENDENCIES += bzip2 @@ -41,11 +40,6 @@ define ZIP_INSTALL_TARGET_CMDS prefix=$(TARGET_DIR)/usr endef -define ZIP_INSTALLING_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) -f unix/Makefile install \ - prefix=$(STAGING_DIR)/usr -endef - define HOST_ZIP_BUILD_CMDS $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) \ CFLAGS="$(HOST_CFLAGS) $(ZIP_CFLAGS)" \ From 90e65e46b7c00218058e32efd079df291b736c4a Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 1 Jan 2023 20:36:36 -0300 Subject: [PATCH 0247/5754] boot/ti-k3-r5-loader: drop bogus TI_K3_R5_LOADER_BOARD Commit "0189bcb47c boot/ti-k3-r5-loader: new package" added an unused define. The define value is calculated from an inexistent option BR2_TARGET_TI_K3_R5_LOADER_BOARD, so drop the line. Cc: Anand Gadiyar Cc: Xuanhao Shi Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 1 - 1 file changed, 1 deletion(-) 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 422ab20d71..afa309aa98 100644 --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk @@ -26,7 +26,6 @@ TI_K3_R5_LOADER_KCONFIG_DEPENDENCIES = \ $(BR2_BISON_HOST_DEPENDENCY) \ $(BR2_FLEX_HOST_DEPENDENCY) -TI_K3_R5_LOADER_BOARD = $(call qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_BOARD)) ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_USE_DEFCONFIG),y) TI_K3_R5_LOADER_KCONFIG_DEFCONFIG = $(call qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG))_defconfig else ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_USE_CUSTOM_CONFIG),y) From 1cb6906eeb5a79bf222e881b7170d6d97280370a Mon Sep 17 00:00:00 2001 From: Michael Nosthoff Date: Mon, 2 Jan 2023 13:11:02 +0100 Subject: [PATCH 0248/5754] package/grpc: bump to version 1.51.1 Signed-off-by: Michael Nosthoff Signed-off-by: Peter Korsgaard --- package/grpc/grpc.hash | 2 +- package/grpc/grpc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/grpc/grpc.hash b/package/grpc/grpc.hash index 4d838703cc..e6b76dcb5e 100644 --- a/package/grpc/grpc.hash +++ b/package/grpc/grpc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 76900ab068da86378395a8e125b5cc43dfae671e09ff6462ddfef18676e2165a grpc-1.50.0.tar.gz +sha256 b55696fb249669744de3e71acc54a9382bea0dce7cd5ba379b356b12b82d4229 grpc-1.51.1.tar.gz sha256 590198e3f305f2c347fde64d637c65492bbef554db6c8364e149cd375e3797ee LICENSE diff --git a/package/grpc/grpc.mk b/package/grpc/grpc.mk index 9aac241e47..9125b1f9f6 100644 --- a/package/grpc/grpc.mk +++ b/package/grpc/grpc.mk @@ -4,7 +4,7 @@ # ################################################################################ -GRPC_VERSION = 1.50.0 +GRPC_VERSION = 1.51.1 GRPC_SITE = $(call github,grpc,grpc,v$(GRPC_VERSION)) GRPC_LICENSE = Apache-2.0, BSD-3-Clause (third_party code), MPL-2.0 (etc/roots.pem) GRPC_LICENSE_FILES = LICENSE From 090ebb085f8d77b0d88dcb757835fad0aa530603 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 2 Jan 2023 13:21:00 +0100 Subject: [PATCH 0249/5754] package/ethtool: bump to version 6.1 Signed-off-by: Francois Perrad 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 8a649876d9..609085aa5e 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 3b752a3329827907ac3812f2831dfecf51c8c41c55d2d69cfb9c53ca06449fc6 ethtool-5.19.tar.xz +sha256 c41fc881ffa5a40432d2dd829eb44c64a49dee482e716baacf9262c64daa8f90 ethtool-6.1.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 5d632934396f90c82dfebe3c9512648bbb6333b406113d0cd331b0e0aa2d34a1 LICENSE diff --git a/package/ethtool/ethtool.mk b/package/ethtool/ethtool.mk index 32bd5e7db1..3381344e0a 100644 --- a/package/ethtool/ethtool.mk +++ b/package/ethtool/ethtool.mk @@ -4,7 +4,7 @@ # ################################################################################ -ETHTOOL_VERSION = 5.19 +ETHTOOL_VERSION = 6.1 ETHTOOL_SOURCE = ethtool-$(ETHTOOL_VERSION).tar.xz ETHTOOL_SITE = $(BR2_KERNEL_MIRROR)/software/network/ethtool ETHTOOL_LICENSE = GPL-2.0 From e49d4fe20cbdf6195f23e4e920b1314786e1dac1 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 2 Jan 2023 13:21:12 +0100 Subject: [PATCH 0250/5754] package/hwdata: bump to version 0.365 Signed-off-by: Francois Perrad 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 6c5a091a06..4f56b0c12f 100644 --- a/package/hwdata/hwdata.hash +++ b/package/hwdata/hwdata.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 f0bb38588b9fcb43e15dac4ce8461b7580ef38ac20ecab83cef638413646decb hwdata-0.358.tar.gz +sha256 d6ae2436a69c6f5e04d926f5d753a99d90deb864065a2e2f8a8eda87b70dcdd5 hwdata-0.365.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 21d0406f93e884a050426ebc21931839a45d56bfcbcbfdda7686d583f36f107f LICENSE diff --git a/package/hwdata/hwdata.mk b/package/hwdata/hwdata.mk index b2e1838074..00fe6c1455 100644 --- a/package/hwdata/hwdata.mk +++ b/package/hwdata/hwdata.mk @@ -4,7 +4,7 @@ # ################################################################################ -HWDATA_VERSION = 0.358 +HWDATA_VERSION = 0.365 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 6bee8635d90f3f9e3d04e03a9db2f37a387e077c Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 2 Jan 2023 13:21:24 +0100 Subject: [PATCH 0251/5754] package/libpcap: bump to version 1.10.2 Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/libpcap/Config.in | 2 +- package/libpcap/libpcap.hash | 4 ++-- package/libpcap/libpcap.mk | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libpcap/Config.in b/package/libpcap/Config.in index a5f64bdc81..7ffac64c46 100644 --- a/package/libpcap/Config.in +++ b/package/libpcap/Config.in @@ -5,4 +5,4 @@ config BR2_PACKAGE_LIBPCAP A system-independent library for user-level network packet capture. - http://www.tcpdump.org/ + https://www.tcpdump.org/ diff --git a/package/libpcap/libpcap.hash b/package/libpcap/libpcap.hash index 84c8e405df..b87d9d04ef 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.1.tar.gz.sig -sha256 ed285f4accaf05344f90975757b3dbfe772ba41d1c401c2648b7fa45b711bdd4 libpcap-1.10.1.tar.gz +# https://www.tcpdump.org/release/libpcap-1.10.2.tar.gz.sig +sha256 db6d79d4ad03b8b15fb16c42447d093ad3520c0ec0ae3d331104dcfb1ce77560 libpcap-1.10.2.tar.gz # Hash for license file: sha256 8a54594d257e14a5260ac770f1633516cb51e3fc28c40136ce2697014eda7afd LICENSE diff --git a/package/libpcap/libpcap.mk b/package/libpcap/libpcap.mk index 21422b2c0a..173207de63 100644 --- a/package/libpcap/libpcap.mk +++ b/package/libpcap/libpcap.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBPCAP_VERSION = 1.10.1 +LIBPCAP_VERSION = 1.10.2 LIBPCAP_SITE = https://www.tcpdump.org/release LIBPCAP_LICENSE = BSD-3-Clause LIBPCAP_LICENSE_FILES = LICENSE From 848450f32bd3b877a7529f72e23c1d967f717552 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 2 Jan 2023 13:21:33 +0100 Subject: [PATCH 0252/5754] package/lsof: bump to version 4.96.5 Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- 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 9649e24f7f..29cf443a24 100644 --- a/package/lsof/lsof.hash +++ b/package/lsof/lsof.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2753fc01452a3d2ee665e8365afdac0e9683197f3ec06231aa684a48b286d11c lsof-4.96.3.tar.gz +sha256 e9030af1123ff052ab69e12ef55b8a17dc47ac4bccfba85ee1ca1f31acf29607 lsof-4.96.5.tar.gz sha256 32a728188b19bf86917659d904ab29d0a294b4506e1c98b8b7f1c70ab4975fe1 dialects/linux/dproto.h diff --git a/package/lsof/lsof.mk b/package/lsof/lsof.mk index 8c8c46c4ed..fd5887141b 100644 --- a/package/lsof/lsof.mk +++ b/package/lsof/lsof.mk @@ -4,7 +4,7 @@ # ################################################################################ -LSOF_VERSION = 4.96.3 +LSOF_VERSION = 4.96.5 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 6a779b8966038bb3fa49c56eee1e134333fcb206 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 2 Jan 2023 13:21:44 +0100 Subject: [PATCH 0253/5754] package/nano: bump to version 7.1 Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/nano/nano.hash | 4 ++-- package/nano/nano.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/nano/nano.hash b/package/nano/nano.hash index 86f414aca0..f49b712093 100644 --- a/package/nano/nano.hash +++ b/package/nano/nano.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://www.nano-editor.org/dist/v7/nano-7.0.tar.xz.asc +# https://www.nano-editor.org/dist/v7/nano-7.1.tar.xz.asc # using key 168E6F4297BFD7A79AFD4496514BBE2EB8E1961F -sha256 8dd6eac38b2b8786d82681f0e1afd84f6b75210d17391b6443c437e451552149 nano-7.0.tar.xz +sha256 57ba751e9b7519f0f6ddee505202e387c75dde440c1f7aa1b9310cc381406836 nano-7.1.tar.xz sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING diff --git a/package/nano/nano.mk b/package/nano/nano.mk index f9338550d4..203c417f06 100644 --- a/package/nano/nano.mk +++ b/package/nano/nano.mk @@ -5,7 +5,7 @@ ################################################################################ NANO_VERSION_MAJOR = 7 -NANO_VERSION = $(NANO_VERSION_MAJOR).0 +NANO_VERSION = $(NANO_VERSION_MAJOR).1 NANO_SITE = https://www.nano-editor.org/dist/v$(NANO_VERSION_MAJOR) NANO_SOURCE = nano-$(NANO_VERSION).tar.xz NANO_LICENSE = GPL-3.0+ From 64a03682cc1a90a311b2331224deac62f8c8940f Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 2 Jan 2023 13:21:52 +0100 Subject: [PATCH 0254/5754] package/pcre2: bump to version 10.42 Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/pcre2/pcre2.hash | 4 ++-- package/pcre2/pcre2.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/pcre2/pcre2.hash b/package/pcre2/pcre2.hash index e3fe6b2d53..f609bdaee2 100644 --- a/package/pcre2/pcre2.hash +++ b/package/pcre2/pcre2.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature: -# https://github.com/PhilipHazel/pcre2/releases/download/pcre2-10.40/pcre2-10.40.tar.bz2.sig -sha256 14e4b83c4783933dc17e964318e6324f7cae1bc75d8f3c79bc6969f00c159d68 pcre2-10.40.tar.bz2 +# https://github.com/PhilipHazel/pcre2/releases/download/pcre2-10.42/pcre2-10.42.tar.bz2.sig +sha256 8d36cd8cb6ea2a4c2bb358ff6411b0c788633a2a45dabbf1aeb4b701d1b5e840 pcre2-10.42.tar.bz2 # Locally computed sha256 87d884eceb7fc54611470ce9f74280d28612b0c877adfc767e9676892a638987 LICENCE diff --git a/package/pcre2/pcre2.mk b/package/pcre2/pcre2.mk index 06a0afc9b8..aba378cab6 100644 --- a/package/pcre2/pcre2.mk +++ b/package/pcre2/pcre2.mk @@ -4,7 +4,7 @@ # ################################################################################ -PCRE2_VERSION = 10.40 +PCRE2_VERSION = 10.42 PCRE2_SITE = https://github.com/PhilipHazel/pcre2/releases/download/pcre2-$(PCRE2_VERSION) PCRE2_SOURCE = pcre2-$(PCRE2_VERSION).tar.bz2 PCRE2_LICENSE = BSD-3-Clause From f6e88fff91dd4702c725f47fb4fdd1a00b228f64 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 2 Jan 2023 13:22:00 +0100 Subject: [PATCH 0255/5754] package/prosody: bump to version 0.11.14 Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/prosody/prosody.hash | 8 ++++---- package/prosody/prosody.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/prosody/prosody.hash b/package/prosody/prosody.hash index 3a3a363a4b..1fd1abafe9 100644 --- a/package/prosody/prosody.hash +++ b/package/prosody/prosody.hash @@ -1,8 +1,8 @@ # Locally computed: -md5 7214ee57d4702585bd0d3428e69790b4 prosody-0.11.13.tar.gz -sha1 1cc5a72d98738872d0c1a4c34b1fcb8878348c7d prosody-0.11.13.tar.gz -sha256 39c61b346a09b5125b604cb969e14206cbbcb86c81156ffc6ba2d62527cf0432 prosody-0.11.13.tar.gz -sha512 7616785536b7b51767a26963a80c961ef2403609e1e78dda3f88cf68c00d5bb899278c70a22b006b58c36c62cbb1bbd390a9298bad5b8d6524928a1cd5457813 prosody-0.11.13.tar.gz +md5 93665d86c47e99c9c525610ac53400fb prosody-0.11.14.tar.gz +sha1 abbd0ad42e2b30051f4d3f198c54a52b4e9f39d0 prosody-0.11.14.tar.gz +sha256 ec0c7447ec07ed336b6912d06a2f533439cb16d60d8d3bffa8ce46269ee52c87 prosody-0.11.14.tar.gz +sha512 128e12427ae0b5080fd3cc2380974c04570b16f0f79de7b39ef85cec6e8f579bee2d1150ce70ca731222c487dba646cbcd48bdb4a102a14395644eb5f19f1c88 prosody-0.11.14.tar.gz # Hash for license file: sha256 bbbdc1c5426e5944cf869fc0faeaf19d88a220cd2b39ea98b7b8e86b0e88a2ef COPYING diff --git a/package/prosody/prosody.mk b/package/prosody/prosody.mk index 62ba073b9e..b5d89ebba4 100644 --- a/package/prosody/prosody.mk +++ b/package/prosody/prosody.mk @@ -4,7 +4,7 @@ # ################################################################################ -PROSODY_VERSION = 0.11.13 +PROSODY_VERSION = 0.11.14 PROSODY_SITE = https://prosody.im/downloads/source PROSODY_LICENSE = MIT PROSODY_LICENSE_FILES = COPYING From f1f5e9f15063443bae1b80af072c7a5b0ab91d24 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 2 Jan 2023 13:22:10 +0100 Subject: [PATCH 0256/5754] package/readline: bump to version 8.2 Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/readline/readline.hash | 4 ++-- package/readline/readline.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/readline/readline.hash b/package/readline/readline.hash index b0530a2d72..627746d821 100644 --- a/package/readline/readline.hash +++ b/package/readline/readline.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature from -# https://ftp.gnu.org/gnu/readline/readline-8.1.2.tar.gz.sig -sha256 7589a2381a8419e68654a47623ce7dfcb756815c8fee726b98f90bf668af7bc6 readline-8.1.2.tar.gz +# https://ftp.gnu.org/gnu/readline/readline-8.2.tar.gz.sig +sha256 3feb7171f16a84ee82ca18a36d7b9be109a52c04f492a053331d7d1095007c35 readline-8.2.tar.gz # Hash for license file sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/readline/readline.mk b/package/readline/readline.mk index b1fd181b78..66812dee77 100644 --- a/package/readline/readline.mk +++ b/package/readline/readline.mk @@ -4,7 +4,7 @@ # ################################################################################ -READLINE_VERSION = 8.1.2 +READLINE_VERSION = 8.2 READLINE_SITE = $(BR2_GNU_MIRROR)/readline READLINE_INSTALL_STAGING = YES READLINE_DEPENDENCIES = ncurses host-autoconf From 261b2e25f8fe42395f750d170da313826c5157f6 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 2 Jan 2023 13:22:19 +0100 Subject: [PATCH 0257/5754] package/strace: bump to version 6.1 Signed-off-by: Francois Perrad 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 1743a369b4..9478fbd459 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.0/strace-6.0.tar.xz.asc -sha256 92d720a666855e9f1c6a11512fd6e99674a82bbfe1442557815f2ce8e1293338 strace-6.0.tar.xz +# https://strace.io/files/6.1/strace-6.1.tar.xz.asc +sha256 2579e9cec37dbb786f6ea0bebd15f40dd561ef2bde2a2a2ecdce5963b01859fd strace-6.1.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 09e620530e..cbb574559e 100644 --- a/package/strace/strace.mk +++ b/package/strace/strace.mk @@ -4,7 +4,7 @@ # ################################################################################ -STRACE_VERSION = 6.0 +STRACE_VERSION = 6.1 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 aa2b795b2e48663cb2924a35e22fb47071ef9531 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 2 Jan 2023 13:22:29 +0100 Subject: [PATCH 0258/5754] package/tcpdump: bump to version 4.99.2 Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/tcpdump/Config.in | 2 +- package/tcpdump/tcpdump.hash | 4 ++-- package/tcpdump/tcpdump.mk | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/tcpdump/Config.in b/package/tcpdump/Config.in index 8b54c603df..7429471362 100644 --- a/package/tcpdump/Config.in +++ b/package/tcpdump/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_TCPDUMP help A tool for network monitoring and data acquisition. - http://www.tcpdump.org/ + https://www.tcpdump.org/ if BR2_PACKAGE_TCPDUMP diff --git a/package/tcpdump/tcpdump.hash b/package/tcpdump/tcpdump.hash index 1990aa797b..a950d3fa66 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.1.tar.gz.sig +# https://www.tcpdump.org/release/tcpdump-4.99.2.tar.gz.sig # using key 1F166A5742ABB9E0249A8D30E089DEF1D9C15D0D -sha256 79b36985fb2703146618d87c4acde3e068b91c553fb93f021a337f175fd10ebe tcpdump-4.99.1.tar.gz +sha256 f4304357d34b79d46f4e17e654f1f91f9ce4e3d5608a1badbd53295a26fb44d5 tcpdump-4.99.2.tar.gz sha256 8a54594d257e14a5260ac770f1633516cb51e3fc28c40136ce2697014eda7afd LICENSE diff --git a/package/tcpdump/tcpdump.mk b/package/tcpdump/tcpdump.mk index 7741c3b58e..c38d46e2cd 100644 --- a/package/tcpdump/tcpdump.mk +++ b/package/tcpdump/tcpdump.mk @@ -4,7 +4,7 @@ # ################################################################################ -TCPDUMP_VERSION = 4.99.1 +TCPDUMP_VERSION = 4.99.2 TCPDUMP_SITE = https://www.tcpdump.org/release TCPDUMP_LICENSE = BSD-3-Clause TCPDUMP_LICENSE_FILES = LICENSE From 3e41117c64cada4a06fcb20fd17517354a42e948 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Mon, 2 Jan 2023 16:45:49 +0100 Subject: [PATCH 0259/5754] package/minetest{-game}: bump to version 5.6.1 Release announcement: 5.6.0: https://forum.minetest.net/viewtopic.php?f=18&t=28511 5.6.1: https://forum.minetest.net/viewtopic.php?f=18&t=28703 minetest: - Update license file hash due to new image file in the project sources. - IrrlichtMt 1.9.0mt8 is required to build Minetest >= 5.6.1. - Add xlib_libXi dependency for xinput2 support enabled by default for Linux. - Remove xlib_libXxf86vm dependency previously used by gamma ramp code [1]. [1] https://github.com/minetest/irrlicht/commit/538c9e5cde425ecee1e802fd53344111683b60be Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- package/minetest-game/minetest-game.hash | 2 +- package/minetest-game/minetest-game.mk | 2 +- package/minetest/Config.in | 2 +- package/minetest/minetest.hash | 6 +++--- package/minetest/minetest.mk | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package/minetest-game/minetest-game.hash b/package/minetest-game/minetest-game.hash index 2b7eeffd8f..629871edbe 100644 --- a/package/minetest-game/minetest-game.hash +++ b/package/minetest-game/minetest-game.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 5a24fec4ed838744906f020096c35616e7ba76eeec2b93b980a40af011107e7c minetest-game-5.5.1.tar.gz +sha256 5dc857003d24bb489f126865fcd6bf0d9c0cb146ca4c1c733570699d15abd0e3 minetest-game-5.6.1.tar.gz sha256 f8a254e8d5f6b3ca3873f990986e86c864f943aa5dc9bf56808c5f4bfa509db0 LICENSE.txt sha256 ed2afed388c470e08edc1104e4ff6d12b68a32a76b8c52d760a99d4d2d7716f3 mods/beds/license.txt diff --git a/package/minetest-game/minetest-game.mk b/package/minetest-game/minetest-game.mk index e5ee45b6ab..ec8d5bff26 100644 --- a/package/minetest-game/minetest-game.mk +++ b/package/minetest-game/minetest-game.mk @@ -4,7 +4,7 @@ # ################################################################################ -MINETEST_GAME_VERSION = 5.5.1 +MINETEST_GAME_VERSION = 5.6.1 MINETEST_GAME_SITE = $(call github,minetest,minetest_game,$(MINETEST_GAME_VERSION)) MINETEST_GAME_LICENSE = LGPL-2.1+ (code), CC-BY-SA-2.0, CC-BY-SA-3.0, \ CC-BY-SA-4.0, MIT, CC0 1.0, CC-BY-2.0 (mods) diff --git a/package/minetest/Config.in b/package/minetest/Config.in index 3e331dff7e..4e139ac3e2 100644 --- a/package/minetest/Config.in +++ b/package/minetest/Config.in @@ -28,7 +28,7 @@ config BR2_PACKAGE_MINETEST_CLIENT select BR2_PACKAGE_FREETYPE select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_JPEG - select BR2_PACKAGE_XLIB_LIBXXF86VM + select BR2_PACKAGE_XLIB_LIBXI help Build Minetest client. diff --git a/package/minetest/minetest.hash b/package/minetest/minetest.hash index e78f865969..ec67d4136d 100644 --- a/package/minetest/minetest.hash +++ b/package/minetest/minetest.hash @@ -1,6 +1,6 @@ # Locally calculated -sha256 dc0ae5188ef351db85c38b27f38f8549b133ed82aa46daea6deee148aa3454f4 minetest-5.5.1.tar.gz -sha256 6d38dd7f3e3c8d768e1f5776b98dd5359b184c2e6740ddf733f4dc8615191bef irrlicht-1.9.0mt5.tar.gz +sha256 1440603e19dca70e2691e86a74c822ee2c4a36fceee32b2d85ae74772149e9a3 minetest-5.6.1.tar.gz +sha256 27594242da8c7cc1e5ef45922e1dfdd130c37d77719b5d927359eb47992051e0 irrlicht-1.9.0mt8.tar.gz -sha256 d1d8a63f7f70d89a3a899f3b9fb5ca1ea7dbbd4eb449be2a7b2ff861b1f09192 LICENSE.txt +sha256 b38c8d428ceddf8e9b49dca63610c74499d952895d756b7eab5f5d4cef2954f6 LICENSE.txt sha256 ca38f1ba4ab901111f6eee50009bd46dbd866e6beb98d592d843f7c162d73409 lib/irrlichtmt/doc/irrlicht-license.txt diff --git a/package/minetest/minetest.mk b/package/minetest/minetest.mk index 6d56c3222f..3904bd687c 100644 --- a/package/minetest/minetest.mk +++ b/package/minetest/minetest.mk @@ -4,7 +4,7 @@ # ################################################################################ -MINETEST_VERSION = 5.5.1 +MINETEST_VERSION = 5.6.1 MINETEST_SITE = $(call github,minetest,minetest,$(MINETEST_VERSION)) MINETEST_LICENSE = LGPL-2.1+ (code), CC-BY-SA-3.0 (textures and sounds), Zlib (irrlicht) MINETEST_LICENSE_FILES = LICENSE.txt lib/irrlichtmt/doc/irrlicht-license.txt @@ -12,7 +12,7 @@ MINETEST_CPE_ID_VENDOR = minetest MINETEST_DEPENDENCIES = gmp jsoncpp luajit sqlite zlib zstd -MINETEST_IRRLICHTMT_VERSION = 1.9.0mt5 +MINETEST_IRRLICHTMT_VERSION = 1.9.0mt8 MINETEST_EXTRA_DOWNLOADS = $(call github,minetest,irrlicht,$(MINETEST_IRRLICHTMT_VERSION))/irrlicht-$(MINETEST_IRRLICHTMT_VERSION).tar.gz define MINETEST_IRRLICHTMT_EXTRACT @@ -36,7 +36,7 @@ MINETEST_CONF_OPTS = \ -DBUILD_UNITTESTS=OFF ifeq ($(BR2_PACKAGE_MINETEST_CLIENT),y) -MINETEST_DEPENDENCIES += bzip2 freetype jpeg libgl libpng xlib_libXxf86vm +MINETEST_DEPENDENCIES += bzip2 freetype jpeg libgl libpng xlib_libXi MINETEST_CONF_OPTS += -DBUILD_CLIENT=ON else MINETEST_CONF_OPTS += -DBUILD_CLIENT=OFF From 34f28a9399477f8fceff54976f838b4d9ff6fb22 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Mon, 2 Jan 2023 16:45:50 +0100 Subject: [PATCH 0260/5754] package/flare-{engine,game}: bump to version 1.14 See: https://flarerpg.org/2022/01/31/flare-1-13/ https://flarerpg.org/2022/12/10/flare-1-14/ While at it, change URL to use https. Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- package/flare-engine/Config.in | 2 +- package/flare-engine/flare-engine.hash | 2 +- package/flare-engine/flare-engine.mk | 2 +- package/flare-game/Config.in | 2 +- package/flare-game/flare-game.hash | 2 +- package/flare-game/flare-game.mk | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/flare-engine/Config.in b/package/flare-engine/Config.in index 9c997c2b9a..136cae707e 100644 --- a/package/flare-engine/Config.in +++ b/package/flare-engine/Config.in @@ -15,7 +15,7 @@ config BR2_PACKAGE_FLARE_ENGINE Flare is not a reimplementation of an existing game or engine. It is a tribute to and exploration of the action RPG genre. - http://flarerpg.org + https://flarerpg.org comment "flare-engine needs a toolchain w/ C++, dynamic library" depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS diff --git a/package/flare-engine/flare-engine.hash b/package/flare-engine/flare-engine.hash index 7f6169381c..2e1f87b237 100644 --- a/package/flare-engine/flare-engine.hash +++ b/package/flare-engine/flare-engine.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 287a08532972fa3ac56ce7cb213d21be8be35b529339f61d4eeadbd501c78a8e flare-engine-1.12.tar.gz +sha256 2c1bafeaa5ac26c10449bfcb7151b06e8a22547aa7364d2a39bbcb135aa50a09 flare-engine-1.14.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/flare-engine/flare-engine.mk b/package/flare-engine/flare-engine.mk index cbb7add4bb..e5fa947272 100644 --- a/package/flare-engine/flare-engine.mk +++ b/package/flare-engine/flare-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLARE_ENGINE_VERSION = 1.12 +FLARE_ENGINE_VERSION = 1.14 FLARE_ENGINE_SITE = $(call github,flareteam,flare-engine,v$(FLARE_ENGINE_VERSION)) FLARE_ENGINE_LICENSE = GPL-3.0+ FLARE_ENGINE_LICENSE_FILES = COPYING diff --git a/package/flare-game/Config.in b/package/flare-game/Config.in index ca68d19a69..535a9b18a2 100644 --- a/package/flare-game/Config.in +++ b/package/flare-game/Config.in @@ -10,4 +10,4 @@ config BR2_PACKAGE_FLARE_GAME game engine itself is part of a separate package, flame-engine. - http://flarerpg.org + https://flarerpg.org diff --git a/package/flare-game/flare-game.hash b/package/flare-game/flare-game.hash index 3d6d678c94..9ae88c6daa 100644 --- a/package/flare-game/flare-game.hash +++ b/package/flare-game/flare-game.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 19a909f2c6e0868baae823bb491e8840d5fb3e0454f00201de8da119772e5160 flare-game-1.12.tar.gz +sha256 65758462070aa88842084f8ee69083d8226e93cfbf83481663276d8307494b8e flare-game-1.14.tar.gz sha256 3f941b3b89cf7b8370ceb83cc76d2120d471b58735d8ca60238a751a48d7f72f LICENSE.txt diff --git a/package/flare-game/flare-game.mk b/package/flare-game/flare-game.mk index 41f02bec93..a1a0a5944a 100644 --- a/package/flare-game/flare-game.mk +++ b/package/flare-game/flare-game.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLARE_GAME_VERSION = 1.12 +FLARE_GAME_VERSION = 1.14 FLARE_GAME_SITE = $(call github,flareteam,flare-game,v$(FLARE_GAME_VERSION)) FLARE_GAME_LICENSE = CC-BY-SA-3.0 (data files), GPL-2.0 (GNU Unifont), \ OFL-1.1 (Liberation Sans) From 99b3ea44295a2ec3aa841f83d81c9231f89cb6e5 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 2 Jan 2023 22:18:54 +0100 Subject: [PATCH 0261/5754] package/sqlite: security bump to version 3.40.1 Fixes the following security issues: CVE-2022-46908: SQLite through 3.40.0, when relying on --safe for execution of an untrusted CLI script, does not properly implement the azProhibitedFunctions protection mechanism, and instead allows UDF functions such as WRITEFILE. Release notes: https://sqlite.org/releaselog/3_40_1.html Signed-off-by: Bernd Kuhls [Peter: mark as security bump] 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 ea4e30a463..36f6907fbc 100644 --- a/package/sqlite/sqlite.hash +++ b/package/sqlite/sqlite.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 0333552076d2700c75352256e91c78bf5cd62491589ba0c69aed0a81868980e7 sqlite-autoconf-3400000.tar.gz +sha256 2c5dea207fa508d765af1ef620b637dcb06572afa6f01f0815bd5bbf864b33d9 sqlite-autoconf-3400100.tar.gz sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 tea/license.terms diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index 9d0b60ab59..789eddfa0a 100644 --- a/package/sqlite/sqlite.mk +++ b/package/sqlite/sqlite.mk @@ -4,8 +4,8 @@ # ################################################################################ -SQLITE_VERSION = 3.40.0 -SQLITE_TAR_VERSION = 3400000 +SQLITE_VERSION = 3.40.1 +SQLITE_TAR_VERSION = 3400100 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_TAR_VERSION).tar.gz SQLITE_SITE = https://www.sqlite.org/2022 SQLITE_LICENSE = Public domain From d290f602b679043810dd658eba1f6f1f87faa9b4 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 2 Jan 2023 22:29:26 +0100 Subject: [PATCH 0262/5754] package/vdr: bump version to 2.6.3 Changelog: https://github.com/vdr-projects/vdr/blob/master/HISTORY Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/vdr/vdr.hash | 2 +- package/vdr/vdr.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/vdr/vdr.hash b/package/vdr/vdr.hash index 2216e317fe..1b7ced0b77 100644 --- a/package/vdr/vdr.hash +++ b/package/vdr/vdr.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 dfb252a0466e95071ca16707914d14c7e5c2e45020e4dc530ea85b7b3c3ea17e vdr-2.6.1.tar.gz +sha256 70352c7558d627202c02e80d88c83d25d9df4c5e49a010f7d1d9ae631bd54ad0 vdr-2.6.3.tar.gz sha256 ddb9db7630752f8fdc6898f7c99a99eaeeac5213627ecb093df9c82f56175dc7 COPYING diff --git a/package/vdr/vdr.mk b/package/vdr/vdr.mk index 61acb9971f..a44e1ff512 100644 --- a/package/vdr/vdr.mk +++ b/package/vdr/vdr.mk @@ -4,7 +4,7 @@ # ################################################################################ -VDR_VERSION = 2.6.1 +VDR_VERSION = 2.6.3 VDR_SITE = $(call github,vdr-projects,vdr,$(VDR_VERSION)) VDR_LICENSE = GPL-2.0+ VDR_LICENSE_FILES = COPYING From 1757c1fe0556d7339d23c5726fb49cca1c7d7759 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 2 Jan 2023 22:35:35 +0100 Subject: [PATCH 0263/5754] package/libsndfile: bump to version 1.2.0 Release notes: https://github.com/libsndfile/libsndfile/releases/tag/1.2.0 Drop patch (already in version). Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- ...ute-EXTERNAL_MPEG_LIBS-in-sndfile-pc.patch | 24 ------------------- package/libsndfile/libsndfile.hash | 2 +- package/libsndfile/libsndfile.mk | 4 +--- 3 files changed, 2 insertions(+), 28 deletions(-) delete mode 100644 package/libsndfile/0001-configure-ac-substitute-EXTERNAL_MPEG_LIBS-in-sndfile-pc.patch diff --git a/package/libsndfile/0001-configure-ac-substitute-EXTERNAL_MPEG_LIBS-in-sndfile-pc.patch b/package/libsndfile/0001-configure-ac-substitute-EXTERNAL_MPEG_LIBS-in-sndfile-pc.patch deleted file mode 100644 index 44ed6dc2cb..0000000000 --- a/package/libsndfile/0001-configure-ac-substitute-EXTERNAL_MPEG_LIBS-in-sndfile-pc.patch +++ /dev/null @@ -1,24 +0,0 @@ -From e4fdaeefddd39bae1db27d48ccb7db7733e0c009 Mon Sep 17 00:00:00 2001 -From: Michael Cho -Date: Sun, 17 Apr 2022 21:31:07 -0700 -Subject: [PATCH] configure.ac: substitute EXTERNAL_MPEG_LIBS in sndfile.pc - -[Retrieved from: -https://github.com/libsndfile/libsndfile/commit/e4fdaeefddd39bae1db27d48ccb7db7733e0c009] -Signed-off-by: Fabrice Fontaine ---- - configure.ac | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/configure.ac b/configure.ac -index 727b67bc0..a4c776d70 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -739,6 +739,7 @@ AC_SUBST(SNDIO_LIBS) - AC_SUBST(EXTERNAL_XIPH_CFLAGS) - AC_SUBST(EXTERNAL_XIPH_LIBS) - AC_SUBST(EXTERNAL_XIPH_REQUIRE) -+AC_SUBST(EXTERNAL_MPEG_LIBS) - AC_SUBST(EXTERNAL_MPEG_REQUIRE) - AC_SUBST(MPG123_CFLAGS) - AC_SUBST(MPG123_LIBS) diff --git a/package/libsndfile/libsndfile.hash b/package/libsndfile/libsndfile.hash index 67d10d03c4..be3ba41dc6 100644 --- a/package/libsndfile/libsndfile.hash +++ b/package/libsndfile/libsndfile.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 0f98e101c0f7c850a71225fb5feaf33b106227b3d331333ddc9bacee190bcf41 libsndfile-1.1.0.tar.xz +sha256 0e30e7072f83dc84863e2e55f299175c7e04a5902ae79cfb99d4249ee8f6d60a libsndfile-1.2.0.tar.xz # Locally calculated sha256 ad01ea5cd2755f6048383c8d54c88459cd6fcb17757c5c8892f8c5ea060f6140 COPYING diff --git a/package/libsndfile/libsndfile.mk b/package/libsndfile/libsndfile.mk index 0b57a1fdd8..d8d1725444 100644 --- a/package/libsndfile/libsndfile.mk +++ b/package/libsndfile/libsndfile.mk @@ -4,15 +4,13 @@ # ################################################################################ -LIBSNDFILE_VERSION = 1.1.0 +LIBSNDFILE_VERSION = 1.2.0 LIBSNDFILE_SOURCE = libsndfile-$(LIBSNDFILE_VERSION).tar.xz LIBSNDFILE_SITE = https://github.com/libsndfile/libsndfile/releases/download/$(LIBSNDFILE_VERSION) LIBSNDFILE_INSTALL_STAGING = YES LIBSNDFILE_LICENSE = LGPL-2.1+ LIBSNDFILE_LICENSE_FILES = COPYING LIBSNDFILE_CPE_ID_VENDOR = libsndfile_project -# We're patching configure.ac -LIBSNDFILE_AUTORECONF = YES LIBSNDFILE_DEPENDENCIES = host-pkgconf LIBSNDFILE_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' From 935f8774e5b10028c71d85c014380dd67714af5c Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 2 Jan 2023 23:59:10 +0100 Subject: [PATCH 0264/5754] package/intel-gmmlib: bump version to 22.3.2 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 9491f23680..d36bd8b9b6 100644 --- a/package/intel-gmmlib/intel-gmmlib.hash +++ b/package/intel-gmmlib/intel-gmmlib.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4adcd33a07617e1c95c4bc6d85bac2e3a881ba19ffcca2857da765248295fd2c intel-gmmlib-22.3.1.tar.gz +sha256 f725fbb4291ab67bbc7b31e1a268f523df384667360c931b40144db861be53d7 intel-gmmlib-22.3.2.tar.gz sha256 8b7446825df3f8b0268307e272aa6aaaf78351c83161d860d02c913c22666c48 LICENSE.md diff --git a/package/intel-gmmlib/intel-gmmlib.mk b/package/intel-gmmlib/intel-gmmlib.mk index 81c455eafd..ffd101808b 100644 --- a/package/intel-gmmlib/intel-gmmlib.mk +++ b/package/intel-gmmlib/intel-gmmlib.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_GMMLIB_VERSION = 22.3.1 +INTEL_GMMLIB_VERSION = 22.3.2 INTEL_GMMLIB_SITE = https://github.com/intel/gmmlib/archive INTEL_GMMLIB_LICENSE = MIT INTEL_GMMLIB_LICENSE_FILES = LICENSE.md From 8ebb0f810a21103af0bd6d988a24645503e7d10e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 3 Jan 2023 20:16:51 +0100 Subject: [PATCH 0265/5754] package/intel-mediasdk: bump version to 22.6.5 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 7cbedb7127..903b6f3394 100644 --- a/package/intel-mediasdk/intel-mediasdk.hash +++ b/package/intel-mediasdk/intel-mediasdk.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 197acd056f81e9ff1c27068d50e8c84c2014d94c7ac17cad69d5c2d61e445fd3 intel-mediasdk-22.6.4.tar.gz +sha256 3a671cc692da5111c041088f5e32528b4346e122e8a134fad71310c572705106 intel-mediasdk-22.6.5.tar.gz sha256 dfd67773578903698f9ff4a61eb8f2d84810cbecd56f3f3cee8c649f813b6ea6 LICENSE diff --git a/package/intel-mediasdk/intel-mediasdk.mk b/package/intel-mediasdk/intel-mediasdk.mk index 3bd6197779..f7bce30c74 100644 --- a/package/intel-mediasdk/intel-mediasdk.mk +++ b/package/intel-mediasdk/intel-mediasdk.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_MEDIASDK_VERSION = 22.6.4 +INTEL_MEDIASDK_VERSION = 22.6.5 INTEL_MEDIASDK_SITE = https://github.com/Intel-Media-SDK/MediaSDK/archive INTEL_MEDIASDK_LICENSE = MIT INTEL_MEDIASDK_LICENSE_FILES = LICENSE From 98613ad592828a3626400f52a1504fe5234fc7f1 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 3 Jan 2023 20:16:52 +0100 Subject: [PATCH 0266/5754] package/intel-mediadriver: bump version to 22.6.5 Removed patch included in upstream release. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- .../0001-dont-include-va-dricommon-h.patch | 36 ------------------- .../intel-mediadriver/intel-mediadriver.hash | 2 +- .../intel-mediadriver/intel-mediadriver.mk | 2 +- 3 files changed, 2 insertions(+), 38 deletions(-) delete mode 100644 package/intel-mediadriver/0001-dont-include-va-dricommon-h.patch diff --git a/package/intel-mediadriver/0001-dont-include-va-dricommon-h.patch b/package/intel-mediadriver/0001-dont-include-va-dricommon-h.patch deleted file mode 100644 index 9d512f9c0b..0000000000 --- a/package/intel-mediadriver/0001-dont-include-va-dricommon-h.patch +++ /dev/null @@ -1,36 +0,0 @@ -From e0d2caafcd5e583a01f7792eaec5d1f2d540bdf1 Mon Sep 17 00:00:00 2001 -From: Rudi Heitbaum -Date: Fri, 18 Nov 2022 22:44:52 +1100 -Subject: [PATCH] [Media Common] [VP] dont include va_dricommon.h - - is not in non-X11 libva 2.16.0 -The header "media_libva_putsurface_linux.h" is included - -Downloaded from upstream commit -https://github.com/intel/media-driver/commit/e0d2caafcd5e583a01f7792eaec5d1f2d540bdf1 - -Signed-off-by: Rudi Heitbaum -Signed-off-by: Bernd Kuhls ---- - media_softlet/linux/common/vp/ddi/ddi_vp_functions.cpp | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/media_softlet/linux/common/vp/ddi/ddi_vp_functions.cpp b/media_softlet/linux/common/vp/ddi/ddi_vp_functions.cpp -index 8695d6c86..6719c07b3 100644 ---- a/media_softlet/linux/common/vp/ddi/ddi_vp_functions.cpp -+++ b/media_softlet/linux/common/vp/ddi/ddi_vp_functions.cpp -@@ -23,7 +23,6 @@ - //! \file ddi_vp_functions.cpp - //! \brief ddi vp functions implementaion. - //! --#include - #include "ddi_vp_functions.h" - #include "media_libva_util_next.h" - #include "media_libva_common_next.h" -@@ -4700,4 +4699,4 @@ VAStatus DdiVpFunctions::PutSurfaceLinuxHW( - - return VA_STATUS_SUCCESS; - } --#endif // !defined(ANDROID) && defined(X11_FOUND) -\ No newline at end of file -+#endif // !defined(ANDROID) && defined(X11_FOUND) diff --git a/package/intel-mediadriver/intel-mediadriver.hash b/package/intel-mediadriver/intel-mediadriver.hash index a9b7c6407d..b2c45eb025 100644 --- a/package/intel-mediadriver/intel-mediadriver.hash +++ b/package/intel-mediadriver/intel-mediadriver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 0c04b9d74b92de41fd409b62913ce4afd799236c0b6bc1983a496990764e5d90 intel-media-22.6.4.tar.gz +sha256 cbb6a514564f8c3349b1f78fc0906b636ea2074d7605cb0e820c5b727ce88cdc intel-media-22.6.5.tar.gz sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md diff --git a/package/intel-mediadriver/intel-mediadriver.mk b/package/intel-mediadriver/intel-mediadriver.mk index ff97445181..8d3fc09260 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 = 22.6.4 +INTEL_MEDIADRIVER_VERSION = 22.6.5 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 5424bd0a827ef2a36707b5c12a11251169622160 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Mon, 2 Jan 2023 23:49:41 +0100 Subject: [PATCH 0267/5754] configs/amarula_vyasa_rk3288_defconfig: bump to Linux version 6.1.2 and U-Boot 2022.10 Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- configs/amarula_vyasa_rk3288_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/amarula_vyasa_rk3288_defconfig b/configs/amarula_vyasa_rk3288_defconfig index ff96019e1e..7976537225 100644 --- a/configs/amarula_vyasa_rk3288_defconfig +++ b/configs/amarula_vyasa_rk3288_defconfig @@ -3,14 +3,14 @@ BR2_arm=y BR2_cortex_a17=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 # Bootloader 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="2022.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="vyasa-rk3288" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y @@ -23,7 +23,7 @@ BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl-dtb.bin tpl/u-boot-tpl.bin" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.2" BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x02000000" From 4432cf65ee7ec0fe9cc23bcac251adca16aeb014 Mon Sep 17 00:00:00 2001 From: Michael Nosthoff Date: Mon, 2 Jan 2023 11:44:09 +0100 Subject: [PATCH 0268/5754] package/re2: bump to version 2022-12-01 Signed-off-by: Michael Nosthoff Signed-off-by: Peter Korsgaard --- package/re2/re2.hash | 2 +- package/re2/re2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/re2/re2.hash b/package/re2/re2.hash index 380b547658..9019867db4 100644 --- a/package/re2/re2.hash +++ b/package/re2/re2.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 f89c61410a072e5cbcf8c27e3a778da7d6fd2f2b5b1445cd4f4508bee946ab0f re2-2022-06-01.tar.gz +sha256 665b65b6668156db2b46dddd33405cd422bd611352c5052ab3dae6a5fbac5506 re2-2022-12-01.tar.gz sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 LICENSE diff --git a/package/re2/re2.mk b/package/re2/re2.mk index 39b2c8d990..07bb9378de 100644 --- a/package/re2/re2.mk +++ b/package/re2/re2.mk @@ -4,7 +4,7 @@ # ################################################################################ -RE2_VERSION = 2022-06-01 +RE2_VERSION = 2022-12-01 RE2_SITE = $(call github,google,re2,$(RE2_VERSION)) RE2_LICENSE = BSD-3-Clause RE2_LICENSE_FILES = LICENSE From fbbbe50173ed4b3ef3323cc7df6c90e0d63678d6 Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 1 Jan 2023 20:36:38 -0300 Subject: [PATCH 0269/5754] package/exfat: drop dangling EXFAT_CFLAGS Commit "98538bb0a2 exfat: bump to version 1.2.1" changed the package infra from generic to autotools, but dropped all usages of EXFAT_CFLAGS. This config is ignored by autotools package infra. So drop the dangling symbol. Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/exfat/exfat.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/exfat/exfat.mk b/package/exfat/exfat.mk index 282a30aa5e..c0ef77a113 100644 --- a/package/exfat/exfat.mk +++ b/package/exfat/exfat.mk @@ -11,7 +11,6 @@ EXFAT_DEPENDENCIES = libfuse host-pkgconf EXFAT_LICENSE = GPL-2.0+ EXFAT_LICENSE_FILES = COPYING EXFAT_CPE_ID_VENDOR = exfat_project -EXFAT_CFLAGS = $(TARGET_CFLAGS) -std=c99 EXFAT_CONF_OPTS += --exec-prefix=/ From cbb6a55e6e03ea0b4e0a9b744f289e11da963c62 Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 1 Jan 2023 20:36:39 -0300 Subject: [PATCH 0270/5754] package/falcosecurity-libs: drop bogus FALCOSECURITY_LIBS_SUPPORTS_IN_SOURCE_BUILD Commit "a15e35c4eb falcosecurity-libs: add new package" uses the infras kernel-module and generic-package. Neither of them support _SUPPORTS_IN_SOURCE_BUILD, only the CMake infra does. So drop the bogus symbol. Cc: Francis Laniel Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/falcosecurity-libs/falcosecurity-libs.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/falcosecurity-libs/falcosecurity-libs.mk b/package/falcosecurity-libs/falcosecurity-libs.mk index f2c389948f..92d5c61832 100644 --- a/package/falcosecurity-libs/falcosecurity-libs.mk +++ b/package/falcosecurity-libs/falcosecurity-libs.mk @@ -9,7 +9,6 @@ FALCOSECURITY_LIBS_SITE = $(call github,falcosecurity,libs,$(FALCOSECURITY_LIBS_ FALCOSECURITY_LIBS_LICENSE = Apache-2.0 (userspace), MIT or GPL-2.0 (driver) FALCOSECURITY_LIBS_LICENSE_FILES = COPYING driver/MIT.txt driver/GPL2.txt FALCOSECURITY_LIBS_CPE_ID_VENDOR = falco -FALCOSECURITY_LIBS_SUPPORTS_IN_SOURCE_BUILD = NO FALCOSECURITY_LIBS_DEPENDENCIES = \ c-ares \ From c4f2459e8a94c1f30c0fcbeb3cd72b62b5ee3e64 Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 1 Jan 2023 20:36:40 -0300 Subject: [PATCH 0271/5754] package/glib-networking: drop dangling GLIB_NETWORKING_INSTALL_TARGET_OPTS In 2015, commit "3fe434bf35 glib-networking: specify GIO_MODULE_DIR for target" correctly used _INSTALL_TARGET_OPTS with an autotools package. But later on, in 2018, commit "928a72c49f package/glib-networking: bump version to 2.56.1" changed the package to use the meson infra, that does not support _INSTALL_TARGET_OPTS. So this symbol is bogus since 2018. Drop it now. Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/glib-networking/glib-networking.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/glib-networking/glib-networking.mk b/package/glib-networking/glib-networking.mk index e8905dfff4..4adc13d39f 100644 --- a/package/glib-networking/glib-networking.mk +++ b/package/glib-networking/glib-networking.mk @@ -21,8 +21,6 @@ GLIB_NETWORKING_CONF_OPTS = \ GLIB_NETWORKING_LICENSE = LGPL-2.0+ GLIB_NETWORKING_LICENSE_FILES = COPYING GLIB_NETWORKING_CPE_ID_VENDOR = gnome -GLIB_NETWORKING_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) \ - GIO_MODULE_DIR=/usr/lib/gio/modules install ifeq ($(BR2_PACKAGE_GNUTLS),y) GLIB_NETWORKING_DEPENDENCIES += gnutls From ec6e8c632bf372c1fad7889ca6323166b90e1599 Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 1 Jan 2023 20:36:41 -0300 Subject: [PATCH 0272/5754] package/gobject-introspection: drop bogus GOBJECT_INTROSPECTION_AUTORECONF Commit "7687a396e8 package/gobject-introspection: new package" added the package using the meson infra for both target and host variants. Meson infra does not support _AUTORECONF. So drop the bogus symbol. Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/gobject-introspection/gobject-introspection.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/gobject-introspection/gobject-introspection.mk b/package/gobject-introspection/gobject-introspection.mk index c8ad9b3c72..0d8c666ba1 100644 --- a/package/gobject-introspection/gobject-introspection.mk +++ b/package/gobject-introspection/gobject-introspection.mk @@ -9,7 +9,6 @@ GOBJECT_INTROSPECTION_VERSION = $(GOBJECT_INTROSPECTION_VERSION_MAJOR).0 GOBJECT_INTROSPECTION_SITE = http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/$(GOBJECT_INTROSPECTION_VERSION_MAJOR) GOBJECT_INTROSPECTION_SOURCE = gobject-introspection-$(GOBJECT_INTROSPECTION_VERSION).tar.xz GOBJECT_INTROSPECTION_INSTALL_STAGING = YES -GOBJECT_INTROSPECTION_AUTORECONF = YES GOBJECT_INTROSPECTION_LICENSE = LGPL-2.0+, GPL-2.0+, BSD-2-Clause GOBJECT_INTROSPECTION_LICENSE_FILES = COPYING.LGPL COPYING.GPL giscanner/scannerlexer.l From 1ad6b4e10e4538532c00f8c04363da64f19c313a Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 1 Jan 2023 20:36:42 -0300 Subject: [PATCH 0273/5754] package/libtalloc: drop bogus LIBTALLOC_{C, LD}FLAGS Commit "f0d37e275a package/libtalloc: new package" added these symbols but they are not used in the package and also not recognized by the waf package infra. So drop the ignored symbols. Cc: David GOUARIN Cc: Matt Weber Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/libtalloc/libtalloc.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/libtalloc/libtalloc.mk b/package/libtalloc/libtalloc.mk index 75d3da263b..ca15180d22 100644 --- a/package/libtalloc/libtalloc.mk +++ b/package/libtalloc/libtalloc.mk @@ -31,8 +31,6 @@ LIBTALLOC_CONF_OPTS += --cross-compile \ --with-libiconv=$(STAGING_DIR)/usr ifeq ($(BR2_PACKAGE_LIBTIRPC),y) -LIBTALLOC_CFLAGS += `$(PKG_CONFIG_HOST_BINARY) --cflags libtirpc` -LIBTALLOC_LDFLAGS += `$(PKG_CONFIG_HOST_BINARY) --libs libtirpc` LIBTALLOC_DEPENDENCIES += libtirpc host-pkgconf endif From 5fde4abc8d67ac2317b1de7a1b4cde8091f4e3c7 Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 1 Jan 2023 20:36:43 -0300 Subject: [PATCH 0274/5754] package/lrzsz: drop bogus LRZSZ_BUILD_HOOKS Commit "4f3f291a3b lrzsz: convert to autotools infrastructure" converted the package to use autotools infra but added a define that is never called. Drop the bogus define. Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/lrzsz/lrzsz.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/package/lrzsz/lrzsz.mk b/package/lrzsz/lrzsz.mk index 45c88619e0..3897975d73 100644 --- a/package/lrzsz/lrzsz.mk +++ b/package/lrzsz/lrzsz.mk @@ -18,10 +18,6 @@ define LRZSZ_POST_CONFIGURE_HOOKS $(SED) "s~\(#define ENABLE_SYSLOG.*\)~/* \1 */~;" $(@D)/config.h endef -define LRZSZ_BUILD_HOOKS - $(TARGET_MAKE_ENV) $(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" prefix="$(TARGET_DIR)" -C $(@D) -endef - define LRZSZ_INSTALL_TARGET_CMDS $(INSTALL) -m 0755 -D $(@D)/src/lrz $(TARGET_DIR)/usr/bin/rz $(INSTALL) -m 0755 -D $(@D)/src/lsz $(TARGET_DIR)/usr/bin/sz From 9a4e154c9c583e74846f7ec80ad01d78811722b0 Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 1 Jan 2023 20:36:44 -0300 Subject: [PATCH 0275/5754] package/policycoreutils: drop bogus INSTALL_TARGET_LINUX_PAM_CONFS Commit "cb328f77f8 policycoreutils: new package" added a define that is never called: POLICYCOREUTILS_INSTALL_TARGET_LINUX_PAM_CONFS. The build system from the package already install these files to target. So just drop the bogus define. Cc: Clayton Shotwell Cc: Matt Weber Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/policycoreutils/policycoreutils.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/package/policycoreutils/policycoreutils.mk b/package/policycoreutils/policycoreutils.mk index 60575ac644..8505dbca3f 100644 --- a/package/policycoreutils/policycoreutils.mk +++ b/package/policycoreutils/policycoreutils.mk @@ -16,10 +16,6 @@ POLICYCOREUTILS_MAKE_OPTS = LDLIBS=$(TARGET_NLS_LIBS) ifeq ($(BR2_PACKAGE_LINUX_PAM),y) POLICYCOREUTILS_DEPENDENCIES += linux-pam POLICYCOREUTILS_MAKE_OPTS += NAMESPACE_PRIV=y -define POLICYCOREUTILS_INSTALL_TARGET_LINUX_PAM_CONFS - $(INSTALL) -D -m 0644 $(@D)/newrole/newrole-lspp.pamd $(TARGET_DIR)/etc/pam.d/newrole - $(INSTALL) -D -m 0644 $(@D)/run_init/run_init.pamd $(TARGET_DIR)/etc/pam.d/run_init -endef endif ifeq ($(BR2_PACKAGE_AUDIT),y) From 41aa369d01a4dd6646390066f44135d99f926fe4 Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 1 Jan 2023 20:36:45 -0300 Subject: [PATCH 0276/5754] package/qoriq-rcw: drop bogus QORIQ_RCW_FILE_BIN While applying [1] and cleaning up, the commit "d167f7006e package/qoriq-rcw: add in-tree rcw source support" ended up keeping an unused define. Drop it now. [1] http://patchwork.ozlabs.org/project/buildroot/patch/20200207083857.28058-4-jerry.huang@nxp.com/ Cc: Matt Weber Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/qoriq-rcw/qoriq-rcw.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/qoriq-rcw/qoriq-rcw.mk b/package/qoriq-rcw/qoriq-rcw.mk index 8b1ceacfce..b9c9e99222 100644 --- a/package/qoriq-rcw/qoriq-rcw.mk +++ b/package/qoriq-rcw/qoriq-rcw.mk @@ -59,7 +59,6 @@ endef else ifneq ($(QORIQ_RCW_INTREE),) QORIQ_RCW_PLATFORM = $(firstword $(subst /, ,$(QORIQ_RCW_INTREE))) -QORIQ_RCW_FILE_BIN = $(lastword $(subst /, ,$(QORIQ_RCW_INTREE))) define HOST_QORIQ_RCW_BUILD_CMDS $(MAKE) -C $(@D)/$(QORIQ_RCW_PLATFORM) From eae97036f34e69e2ca197cd31fd87c673f2ebe37 Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 1 Jan 2023 20:36:46 -0300 Subject: [PATCH 0277/5754] package/rhash: drop dangling RHASH_ADDLDFLAGS Commit "ead2afda13 package/rhash: bump version to 1.4.0" dropped the only usage of this define but the define itself was left dangling. Drop it now. Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/rhash/rhash.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/rhash/rhash.mk b/package/rhash/rhash.mk index 8c33de1862..1f7456e4e7 100644 --- a/package/rhash/rhash.mk +++ b/package/rhash/rhash.mk @@ -12,7 +12,6 @@ RHASH_LICENSE_FILES = COPYING RHASH_CPE_ID_VENDOR = rhash_project RHASH_INSTALL_STAGING = YES RHASH_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) -RHASH_ADDLDFLAGS = $(TARGET_NLS_LIBS) ifeq ($(BR2_SYSTEM_ENABLE_NLS),y) RHASH_CONF_OPTS += --enable-gettext From ca5cd8d67554c568daee4da1f058bcf3b35b2976 Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 1 Jan 2023 20:36:47 -0300 Subject: [PATCH 0278/5754] package/swupdate: drop dangling SWUPDATE_BUILD_CONFIG "6c63e4de4a boot/swupdate: don't specify .config to munge" dropped all usages of this define but the define itself was left dangling. Drop it now. Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/swupdate/swupdate.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/swupdate/swupdate.mk b/package/swupdate/swupdate.mk index 8f05b83922..11a3946753 100644 --- a/package/swupdate/swupdate.mk +++ b/package/swupdate/swupdate.mk @@ -208,8 +208,6 @@ define SWUPDATE_SET_WEBSERVER endef endif -SWUPDATE_BUILD_CONFIG = $(@D)/.config - SWUPDATE_KCONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_SWUPDATE_CONFIG)) SWUPDATE_KCONFIG_EDITORS = menuconfig xconfig gconfig nconfig From 11479db32c5ea6bbdd7ce9b77873561a2ca07cfb Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 1 Jan 2023 20:36:48 -0300 Subject: [PATCH 0279/5754] package/wpa_supplicant: drop dangling WPA_SUPPLICANT_{LDFLAGS, MAKE_ENV} Commit "0340b45da0 wpa_supplicant: bump to version 1.0" from 2012 converted the package to use the generic infra, but added a bogus WPA_SUPPLICANT_LDFLAGS end left a dangling WPA_SUPPLICANT_MAKE_ENV. Drop the symbols that are not used since 2012. Cc: Matt Weber Cc: Sergey Matyukevich Cc: Yegor Yefremov Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/wpa_supplicant/wpa_supplicant.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk index e5e3938be1..42c6f772ac 100644 --- a/package/wpa_supplicant/wpa_supplicant.mk +++ b/package/wpa_supplicant/wpa_supplicant.mk @@ -13,7 +13,6 @@ WPA_SUPPLICANT_CONFIG = $(WPA_SUPPLICANT_DIR)/wpa_supplicant/.config WPA_SUPPLICANT_SUBDIR = wpa_supplicant WPA_SUPPLICANT_DBUS_SERVICE = fi.w1.wpa_supplicant1 WPA_SUPPLICANT_CFLAGS = $(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/libnl3/ -WPA_SUPPLICANT_LDFLAGS = $(TARGET_LDFLAGS) WPA_SUPPLICANT_SELINUX_MODULES = networkmanager # install the wpa_client library @@ -157,9 +156,6 @@ endif ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_DBUS),y) WPA_SUPPLICANT_DEPENDENCIES += host-pkgconf dbus -WPA_SUPPLICANT_MAKE_ENV = \ - PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \ - PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_CTRL_IFACE_DBUS_NEW define WPA_SUPPLICANT_INSTALL_DBUS_NEW $(INSTALL) -m 0644 -D \ From f8a2e1dc08a4de2db903a4a5a41c8541e6abfe81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Hundeb=C3=B8ll?= Date: Tue, 3 Jan 2023 14:56:17 +0100 Subject: [PATCH 0280/5754] bash: bump version to 5.2.15 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Hundebøll Signed-off-by: Peter Korsgaard --- ...local_shiftstates-vs.-locale_shiftst.patch | 72 ------------------- ...quote_pathname-vs.-udequote_pathname.patch | 40 ----------- package/bash/bash.hash | 4 +- package/bash/bash.mk | 2 +- 4 files changed, 3 insertions(+), 115 deletions(-) delete mode 100644 package/bash/0002-locale-fix-typo-local_shiftstates-vs.-locale_shiftst.patch delete mode 100644 package/bash/0003-glob-fix-dequote_pathname-vs.-udequote_pathname.patch diff --git a/package/bash/0002-locale-fix-typo-local_shiftstates-vs.-locale_shiftst.patch b/package/bash/0002-locale-fix-typo-local_shiftstates-vs.-locale_shiftst.patch deleted file mode 100644 index 1636c18036..0000000000 --- a/package/bash/0002-locale-fix-typo-local_shiftstates-vs.-locale_shiftst.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 3d6b9e18506ad9daf4ec7b7d406b38d58ec88009 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Thu, 11 Mar 2021 20:48:36 +0100 -Subject: [PATCH] locale: fix typo local_shiftstates vs. locale_shiftstates -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes: - - locale.c:94:3: error: ‘local_shiftstates’ undeclared (first use in this function); did you mean ‘locale_shiftstates’? - 94 | local_shiftstates = 0; - | ^~~~~~~~~~~~~~~~~ - | locale_shiftstates - -Signed-off-by: Peter Seiderer ---- - locale.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/locale.c b/locale.c -index 17ccc58..d6dd95a 100644 ---- a/locale.c -+++ b/locale.c -@@ -91,7 +91,7 @@ set_default_locale () - #if defined (HANDLE_MULTIBYTE) - locale_shiftstates = mblen ((char *)NULL, 0); - #else -- local_shiftstates = 0; -+ locale_shiftstates = 0; - #endif - } - -@@ -117,7 +117,7 @@ set_default_locale_vars () - # if defined (HANDLE_MULTIBYTE) - locale_shiftstates = mblen ((char *)NULL, 0); - # else -- local_shiftstates = 0; -+ locale_shiftstates = 0; - # endif - - u32reset (); -@@ -226,7 +226,7 @@ set_locale_var (var, value) - # if defined (HANDLE_MULTIBYTE) - locale_shiftstates = mblen ((char *)NULL, 0); - # else -- local_shiftstates = 0; -+ locale_shiftstates = 0; - # endif - u32reset (); - return r; -@@ -250,7 +250,7 @@ set_locale_var (var, value) - #if defined (HANDLE_MULTIBYTE) - locale_shiftstates = mblen ((char *)NULL, 0); - #else -- local_shiftstates = 0; -+ locale_shiftstates = 0; - #endif - u32reset (); - } -@@ -391,7 +391,7 @@ reset_locale_vars () - # if defined (HANDLE_MULTIBYTE) - locale_shiftstates = mblen ((char *)NULL, 0); - # else -- local_shiftstates = 0; -+ locale_shiftstates = 0; - # endif - u32reset (); - #endif --- -2.30.1 - diff --git a/package/bash/0003-glob-fix-dequote_pathname-vs.-udequote_pathname.patch b/package/bash/0003-glob-fix-dequote_pathname-vs.-udequote_pathname.patch deleted file mode 100644 index a801f68236..0000000000 --- a/package/bash/0003-glob-fix-dequote_pathname-vs.-udequote_pathname.patch +++ /dev/null @@ -1,40 +0,0 @@ -From a60ab1e5e88863acf9b0e9bcaa7919bbf093da05 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Thu, 11 Mar 2021 20:55:52 +0100 -Subject: [PATCH] glob: fix dequote_pathname vs. udequote_pathname -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes: - - glob.c:123:28: error: static declaration of ‘udequote_pathname’ follows non-static declaration - 123 | # define dequote_pathname udequote_pathname - | ^~~~~~~~~~~~~~~~~ - glob.c:125:13: note: in expansion of macro ‘dequote_pathname’ - 125 | static void dequote_pathname PARAMS((char *)); - | ^~~~~~~~~~~~~~~~ - glob.c:118:6: note: previous declaration of ‘udequote_pathname’ was here - 118 | void udequote_pathname PARAMS((char *)); - | ^~~~~~~~~~~~~~~~~ - -Signed-off-by: Peter Seiderer ---- - lib/glob/glob.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/lib/glob/glob.c b/lib/glob/glob.c -index eb6277f..c903b15 100644 ---- a/lib/glob/glob.c -+++ b/lib/glob/glob.c -@@ -117,6 +117,5 @@ static int mbskipname PARAMS((char *, char *, int)); - #else - # define dequote_pathname udequote_pathname - #endif --static void dequote_pathname PARAMS((char *)); - static int glob_testdir PARAMS((char *, int)); - static char **glob_dir_to_array PARAMS((char *, char **, int)); - --- -2.30.1 - diff --git a/package/bash/bash.hash b/package/bash/bash.hash index 4660e9d38a..e0a1ebac91 100644 --- a/package/bash/bash.hash +++ b/package/bash/bash.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature from -# https://ftp.gnu.org/gnu/bash/bash-5.1.16.tar.gz.sig -sha256 5bac17218d3911834520dad13cd1f85ab944e1c09ae1aba55906be1f8192f558 bash-5.1.16.tar.gz +# https://ftp.gnu.org/gnu/bash/bash-5.2.15.tar.gz.sig +sha256 13720965b5f4fc3a0d4b61dd37e7565c741da9a5be24edc2ae00182fc1b3588c bash-5.2.15.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/bash/bash.mk b/package/bash/bash.mk index 3aca22898e..ec5e2d722f 100644 --- a/package/bash/bash.mk +++ b/package/bash/bash.mk @@ -4,7 +4,7 @@ # ################################################################################ -BASH_VERSION = 5.1.16 +BASH_VERSION = 5.2.15 BASH_SITE = $(BR2_GNU_MIRROR)/bash BASH_DEPENDENCIES = ncurses readline host-bison BASH_LICENSE = GPL-3.0+ From 14956d8908776e52ea9ace2fbb3f41716ebb4262 Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 1 Jan 2023 20:36:37 -0300 Subject: [PATCH 0281/5754] package/checkpolicy: drop bogus CHECKPOLICY_STAGING_CMDS Commit "b06110621d checkpolicy: allow compiling for target" contains a typo that prevents installing to staging. It also forgot to enable CHECKPOLICY_INSTALL_STAGING. But the package does not install headers or libraries, only ELF and manual files. So instead of fixing the install to staging, drop the bogus CHECKPOLICY_STAGING_CMDS. Cc: Clayton Shotwell Cc: Matt Weber Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/checkpolicy/checkpolicy.mk | 5 ----- 1 file changed, 5 deletions(-) diff --git a/package/checkpolicy/checkpolicy.mk b/package/checkpolicy/checkpolicy.mk index af9a58cee8..baf16fb802 100644 --- a/package/checkpolicy/checkpolicy.mk +++ b/package/checkpolicy/checkpolicy.mk @@ -20,11 +20,6 @@ define CHECKPOLICY_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(CHECKPOLICY_MAKE_OPTS) DESTDIR=$(STAGING_DIR) endef -define CHECKPOLICY_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(CHECKPOLICY_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install - -endef - define CHECKPOLICY_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(CHECKPOLICY_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install endef From 1906e1fb7cb4104aa3e326f09926b2b3f5129991 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 29 Dec 2022 20:45:05 +0100 Subject: [PATCH 0282/5754] package/tvheadend: bump version Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/tvheadend/tvheadend.hash | 2 +- package/tvheadend/tvheadend.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tvheadend/tvheadend.hash b/package/tvheadend/tvheadend.hash index 98499eb955..45c8bd62b0 100644 --- a/package/tvheadend/tvheadend.hash +++ b/package/tvheadend/tvheadend.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ed32401d1ed85f9e2d28d122a046c3f2c01b6ca5c0da1a7d78fa8f400e858107 tvheadend-fbc94aee8bfdd25baba87ab62a39234da20e8dd2.tar.gz +sha256 06c6d33a8e9d1d645cea9c63a06f6bddb309e5546177966d7b9285f68313bf5b tvheadend-c9a156a25a07f1f84c2f48a1b03b481430c8257d.tar.gz sha256 54dc3cbc00bf126bcba43e2af7f3ad1dc00f335985da1409fa943c7b7256d942 LICENSE.md diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk index 8ceb7493c8..0ca8f46dc5 100644 --- a/package/tvheadend/tvheadend.mk +++ b/package/tvheadend/tvheadend.mk @@ -4,7 +4,7 @@ # ################################################################################ -TVHEADEND_VERSION = fbc94aee8bfdd25baba87ab62a39234da20e8dd2 +TVHEADEND_VERSION = c9a156a25a07f1f84c2f48a1b03b481430c8257d TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION)) TVHEADEND_LICENSE = GPL-3.0+ TVHEADEND_LICENSE_FILES = LICENSE.md From 43b13ebbdc89f3d7597f476123bcddb7e0a1655d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 29 Dec 2022 21:18:43 +0100 Subject: [PATCH 0283/5754] package/x11r7/xapp_xdriinfo: bump version to 1.0.7 Release notes: https://lists.x.org/archives/xorg-announce/2022-December/003308.html Switched tarball to xz, updated _SITE. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xapp_xdriinfo/xapp_xdriinfo.hash | 8 +++----- package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.hash b/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.hash index 21c50184c7..ce11d06977 100644 --- a/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.hash +++ b/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-March/002858.html -md5 480e63cd365f03eb2515a6527d5f4ca6 xdriinfo-1.0.6.tar.bz2 -sha1 11682ae1f04a311b832651d78bbf4c6ac77f0ed9 xdriinfo-1.0.6.tar.bz2 -sha256 d9ccd2c3e87899417acc9ea1f3e319a4198112babe1dc711273584f607449d51 xdriinfo-1.0.6.tar.bz2 -sha512 7ddd9e19abaef93e4d85004293528ec3814ef84c470d496dbb8dc8313d804bb7520406de8d33d2bc2b3af942bd0a5d5032a109b2726438a966af63ea680a102f xdriinfo-1.0.6.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003308.html +sha256 dd838bae9d2b19ddd71fe6d30ed33abc7c85e19d223e79d35600db3fa44bf734 xdriinfo-1.0.7.tar.xz +sha512 a368cf32c606ca78f3a23bc5d88fb57b9c1a3827d0fec3e48cee153703135e47cecd3db8ee0eba93f309d7f03b4306c3f2e7f46f36d0d2970671c5e5b78093ad xdriinfo-1.0.7.tar.xz # Locally computed sha256 de2fbb160bbb64c48975d7a3ebe3636a312b73227df1efe37488a8cecb9c1932 COPYING diff --git a/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk b/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk index 7f7aac9e15..7672dc8899 100644 --- a/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk +++ b/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XDRIINFO_VERSION = 1.0.6 -XAPP_XDRIINFO_SOURCE = xdriinfo-$(XAPP_XDRIINFO_VERSION).tar.bz2 -XAPP_XDRIINFO_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XDRIINFO_VERSION = 1.0.7 +XAPP_XDRIINFO_SOURCE = xdriinfo-$(XAPP_XDRIINFO_VERSION).tar.xz +XAPP_XDRIINFO_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XDRIINFO_LICENSE = MIT XAPP_XDRIINFO_LICENSE_FILES = COPYING XAPP_XDRIINFO_DEPENDENCIES = libgl xlib_libX11 xorgproto From a70e0bdfdabad5e9d789db181e0f4c37544a426b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 29 Dec 2022 21:18:44 +0100 Subject: [PATCH 0284/5754] package/x11r7/xlib_libSM: bump version to 1.2.4 Release notes: https://lists.x.org/archives/xorg-announce/2022-December/003307.html Switched tarball to xz, updated _SITE. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xlib_libSM/xlib_libSM.hash | 8 +++----- package/x11r7/xlib_libSM/xlib_libSM.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xlib_libSM/xlib_libSM.hash b/package/x11r7/xlib_libSM/xlib_libSM.hash index 7ac288ba4e..3068c85b93 100644 --- a/package/x11r7/xlib_libSM/xlib_libSM.hash +++ b/package/x11r7/xlib_libSM/xlib_libSM.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-October/002922.html -md5 87c7fad1c1813517979184c8ccd76628 libSM-1.2.3.tar.bz2 -sha1 437d7b13fa2eba325df3a106f177df46ccec6546 libSM-1.2.3.tar.bz2 -sha256 2d264499dcb05f56438dee12a1b4b71d76736ce7ba7aa6efbf15ebb113769cbb libSM-1.2.3.tar.bz2 -sha512 74c42e27029db78475e62025b4711dbac5e22d2f8e8a24be98a1c31b03c0fc4afe859928f851800ea0b76854f12147900dc4f27bbfd3d8ea45daaaf24b70a903 libSM-1.2.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003307.html +sha256 fdcbe51e4d1276b1183da77a8a4e74a137ca203e0bcfb20972dd5f3347e97b84 libSM-1.2.4.tar.xz +sha512 7f1d41b7b6c5dd456c49ccad7740c3ba9791a2793fa50fd94814a4164ce2e20c4a0a0ad42a87708e494ed5c23f611be6d3ccd9ef1e9add6d46ac545e2b0f6f86 libSM-1.2.4.tar.xz # Locally computed sha256 af7926a14d85ad367622688636e8c9c6f7807c8a6867536af1c530b5c262bfba COPYING diff --git a/package/x11r7/xlib_libSM/xlib_libSM.mk b/package/x11r7/xlib_libSM/xlib_libSM.mk index 708224e2d1..8e5c90127a 100644 --- a/package/x11r7/xlib_libSM/xlib_libSM.mk +++ b/package/x11r7/xlib_libSM/xlib_libSM.mk @@ -4,9 +4,9 @@ # ################################################################################ -XLIB_LIBSM_VERSION = 1.2.3 -XLIB_LIBSM_SOURCE = libSM-$(XLIB_LIBSM_VERSION).tar.bz2 -XLIB_LIBSM_SITE = http://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBSM_VERSION = 1.2.4 +XLIB_LIBSM_SOURCE = libSM-$(XLIB_LIBSM_VERSION).tar.xz +XLIB_LIBSM_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBSM_LICENSE = MIT XLIB_LIBSM_LICENSE_FILES = COPYING XLIB_LIBSM_INSTALL_STAGING = YES From 2b249eca85819761140f670cc52dcf8fb09ef5b3 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 29 Dec 2022 21:18:45 +0100 Subject: [PATCH 0285/5754] package/x11r7/xcb-util: bump version to 0.4.1 Release notes: https://lists.x.org/archives/xorg-announce/2022-December/003306.html Switched tarball to xz, updated _SITE. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xcb-util/xcb-util.hash | 4 +++- package/x11r7/xcb-util/xcb-util.mk | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/x11r7/xcb-util/xcb-util.hash b/package/x11r7/xcb-util/xcb-util.hash index c088a62bab..b9d6687752 100644 --- a/package/x11r7/xcb-util/xcb-util.hash +++ b/package/x11r7/xcb-util/xcb-util.hash @@ -1,3 +1,5 @@ +# From https://lists.x.org/archives/xorg-announce/2022-December/003306.html +sha256 5abe3bbbd8e54f0fa3ec945291b7e8fa8cfd3cccc43718f8758430f94126e512 xcb-util-0.4.1.tar.xz +sha512 da67f2f017d2a1788dcf35f28d6956e171303a622a1dd085cd3d69fdb2ed77965d83c557cc926ebf9b32e905eb2cbb5921987250192d78a2f5edc4d437ed7d2b xcb-util-0.4.1.tar.xz # locally computed -sha256 46e49469cb3b594af1d33176cd7565def2be3fa8be4371d62271fabb5eae50e9 xcb-util-0.4.0.tar.bz2 sha256 325b64f0b0284e08bbb7a78ae3e55c1edc2a7cd77f603225ae4b8ffc35423e37 COPYING diff --git a/package/x11r7/xcb-util/xcb-util.mk b/package/x11r7/xcb-util/xcb-util.mk index bb73530f94..793c3dc7f2 100644 --- a/package/x11r7/xcb-util/xcb-util.mk +++ b/package/x11r7/xcb-util/xcb-util.mk @@ -4,9 +4,9 @@ # ################################################################################ -XCB_UTIL_VERSION = 0.4.0 -XCB_UTIL_SOURCE = xcb-util-$(XCB_UTIL_VERSION).tar.bz2 -XCB_UTIL_SITE = http://xcb.freedesktop.org/dist +XCB_UTIL_VERSION = 0.4.1 +XCB_UTIL_SOURCE = xcb-util-$(XCB_UTIL_VERSION).tar.xz +XCB_UTIL_SITE = https://xorg.freedesktop.org/archive/individual/lib XCB_UTIL_LICENSE = MIT XCB_UTIL_LICENSE_FILES = COPYING XCB_UTIL_INSTALL_STAGING = YES From 60b4b04dc23d32641981df984f383c1bb3078f8c Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 29 Dec 2022 21:18:46 +0100 Subject: [PATCH 0286/5754] package/x11r7/xserver_xorg-server: bump version to 21.1.6 Fixes a regression in XTestSwapFakeInput() introduced in the fix for CVE-2022-46340 in 21.1.5. Removed patches included in upstream release. Signed-off-by: Bernd Kuhls [Peter: mention regression fix] Signed-off-by: Peter Korsgaard --- ...ntedString-against-request-length-at.patch | 35 ----------- ...possible-memleaks-in-XkbGetKbdByName.patch | 60 ------------------- .../xserver_xorg-server.hash | 6 +- .../xserver_xorg-server.mk | 8 +-- 4 files changed, 4 insertions(+), 105 deletions(-) delete mode 100644 package/x11r7/xserver_xorg-server/0002-xkb-proof-GetCountedString-against-request-length-at.patch delete mode 100644 package/x11r7/xserver_xorg-server/0003-xkb-fix-some-possible-memleaks-in-XkbGetKbdByName.patch diff --git a/package/x11r7/xserver_xorg-server/0002-xkb-proof-GetCountedString-against-request-length-at.patch b/package/x11r7/xserver_xorg-server/0002-xkb-proof-GetCountedString-against-request-length-at.patch deleted file mode 100644 index 8c1869504c..0000000000 --- a/package/x11r7/xserver_xorg-server/0002-xkb-proof-GetCountedString-against-request-length-at.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 11beef0b7f1ed290348e45618e5fa0d2bffcb72e Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Tue, 5 Jul 2022 12:06:20 +1000 -Subject: [PATCH] xkb: proof GetCountedString against request length attacks - -GetCountedString did a check for the whole string to be within the -request buffer but not for the initial 2 bytes that contain the length -field. A swapped client could send a malformed request to trigger a -swaps() on those bytes, writing into random memory. - -Signed-off-by: Peter Hutterer -Signed-off-by: Peter Korsgaard ---- - xkb/xkb.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/xkb/xkb.c b/xkb/xkb.c -index f42f59ef3..1841cff26 100644 ---- a/xkb/xkb.c -+++ b/xkb/xkb.c -@@ -5137,6 +5137,11 @@ _GetCountedString(char **wire_inout, ClientPtr client, char **str) - CARD16 len; - - wire = *wire_inout; -+ -+ if (client->req_len < -+ bytes_to_int32(wire + 2 - (char *) client->requestBuffer)) -+ return BadValue; -+ - len = *(CARD16 *) wire; - if (client->swapped) { - swaps(&len); --- -2.30.2 - diff --git a/package/x11r7/xserver_xorg-server/0003-xkb-fix-some-possible-memleaks-in-XkbGetKbdByName.patch b/package/x11r7/xserver_xorg-server/0003-xkb-fix-some-possible-memleaks-in-XkbGetKbdByName.patch deleted file mode 100644 index 39afec0988..0000000000 --- a/package/x11r7/xserver_xorg-server/0003-xkb-fix-some-possible-memleaks-in-XkbGetKbdByName.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 18f91b950e22c2a342a4fbc55e9ddf7534a707d2 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Wed, 13 Jul 2022 11:23:09 +1000 -Subject: [PATCH] xkb: fix some possible memleaks in XkbGetKbdByName - -GetComponentByName returns an allocated string, so let's free that if we -fail somewhere. - -Signed-off-by: Peter Hutterer -Signed-off-by: Peter Korsgaard ---- - xkb/xkb.c | 26 ++++++++++++++++++++------ - 1 file changed, 20 insertions(+), 6 deletions(-) - -diff --git a/xkb/xkb.c b/xkb/xkb.c -index 4692895db..b79a269e3 100644 ---- a/xkb/xkb.c -+++ b/xkb/xkb.c -@@ -5935,18 +5935,32 @@ ProcXkbGetKbdByName(ClientPtr client) - xkb = dev->key->xkbInfo->desc; - status = Success; - str = (unsigned char *) &stuff[1]; -- if (GetComponentSpec(&str, TRUE, &status)) /* keymap, unsupported */ -- return BadMatch; -+ { -+ char *keymap = GetComponentSpec(&str, TRUE, &status); /* keymap, unsupported */ -+ if (keymap) { -+ free(keymap); -+ return BadMatch; -+ } -+ } - names.keycodes = GetComponentSpec(&str, TRUE, &status); - names.types = GetComponentSpec(&str, TRUE, &status); - names.compat = GetComponentSpec(&str, TRUE, &status); - names.symbols = GetComponentSpec(&str, TRUE, &status); - names.geometry = GetComponentSpec(&str, TRUE, &status); -- if (status != Success) -+ if (status == Success) { -+ len = str - ((unsigned char *) stuff); -+ if ((XkbPaddedSize(len) / 4) != stuff->length) -+ status = BadLength; -+ } -+ -+ if (status != Success) { -+ free(names.keycodes); -+ free(names.types); -+ free(names.compat); -+ free(names.symbols); -+ free(names.geometry); - return status; -- len = str - ((unsigned char *) stuff); -- if ((XkbPaddedSize(len) / 4) != stuff->length) -- return BadLength; -+ } - - CHK_MASK_LEGAL(0x01, stuff->want, XkbGBN_AllComponentsMask); - CHK_MASK_LEGAL(0x02, stuff->need, XkbGBN_AllComponentsMask); --- -2.30.2 - diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash index 654552c8b6..0c3c807ff3 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/2022-December/003303.html -sha256 05b0c8301cee7c5a78083df421ba3a071891553541a417b3d85adf5cf20f8720 xorg-server-21.1.5.tar.xz -sha512 a39c6ba36f94241d330b679a9a6fe2c5fda73fc3f5a9308a7a9cfd0d58503e407291759c9e553455c07cf5a3862952ae3904334eeca29c97ff5af7cffd2e6953 xorg-server-21.1.5.tar.xz +# From https://lists.x.org/archives/xorg-announce/2022-December/003310.html +sha256 1eb86ed674d042b6c8b1f9135e59395cbbca35ed551b122f73a7d8bb3bb22484 xorg-server-21.1.6.tar.xz +sha512 5e3cf879facf3a04aa64b7f6129226ea68a97109a7daca5146b57b4c707cc76a4fbad1924997dd319efd8c8c20eb5bb59570a719101b76ae07e923b7e9656239 xorg-server-21.1.6.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 16b7438ee6..04eb5e90b7 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.5 +XSERVER_XORG_SERVER_VERSION = 21.1.6 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 @@ -12,12 +12,6 @@ XSERVER_XORG_SERVER_LICENSE_FILES = COPYING XSERVER_XORG_SERVER_SELINUX_MODULES = xdg xserver XSERVER_XORG_SERVER_INSTALL_STAGING = YES -# 0002-xkb-proof-GetCountedString-against-request-length-at.patch -XSERVER_XORG_SERVER_IGNORE_CVES += CVE-2022-3550 - -# 0003-xkb-fix-some-possible-memleaks-in-XkbGetKbdByName.patch -XSERVER_XORG_SERVER_IGNORE_CVES += CVE-2022-3551 - XSERVER_XORG_SERVER_DEPENDENCIES = \ xutil_util-macros \ xlib_libX11 \ From d7d48b9840d242acf1b8bfb141c89904e53301fe Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 30 Dec 2022 18:01:24 +0100 Subject: [PATCH 0287/5754] package/check: disable doc documentation can be disabled since version 0.13.0 and https://github.com/libcheck/check/commit/8ca1f79a73c374e9e9172937938947584c921659 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/check/check.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/check/check.mk b/package/check/check.mk index be82539469..ccffd08ee3 100644 --- a/package/check/check.mk +++ b/package/check/check.mk @@ -10,6 +10,7 @@ CHECK_INSTALL_STAGING = YES CHECK_DEPENDENCIES = host-pkgconf CHECK_LICENSE = LGPL-2.1+ CHECK_LICENSE_FILES = COPYING.LESSER +CHECK_CONF_OPTS = --disable-build-docs # Having checkmk in the target makes no sense define CHECK_REMOVE_CHECKMK From 01518e5660366be41e6a8e0a0f2b487d7cdf48a2 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 31 Dec 2022 17:41:41 +0100 Subject: [PATCH 0288/5754] package/janus-gateway: bump to version 1.1.1 https://github.com/meetecho/janus-gateway/blob/v1.1.1/CHANGELOG.md Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/janus-gateway/janus-gateway.hash | 2 +- package/janus-gateway/janus-gateway.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/janus-gateway/janus-gateway.hash b/package/janus-gateway/janus-gateway.hash index 5d73ede87f..7a87ae737a 100644 --- a/package/janus-gateway/janus-gateway.hash +++ b/package/janus-gateway/janus-gateway.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 5b8a7304761783585bfa8db7471bf8c393fa2a0ffc346747afadc0c1a9d213f5 janus-gateway-1.0.3.tar.gz +sha256 bb83c19d6137e39833e8eb2b1deeecb33b5d19d4f503d51703bdcc478c447940 janus-gateway-1.1.1.tar.gz sha256 91d04c97fa1da3fcd28205873276358aafc071c5b00a9ea8c49dd06d487a9dc6 COPYING diff --git a/package/janus-gateway/janus-gateway.mk b/package/janus-gateway/janus-gateway.mk index 9a74350b2c..0d906f1b62 100644 --- a/package/janus-gateway/janus-gateway.mk +++ b/package/janus-gateway/janus-gateway.mk @@ -4,7 +4,7 @@ # ################################################################################ -JANUS_GATEWAY_VERSION = 1.0.3 +JANUS_GATEWAY_VERSION = 1.1.1 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 a16221834a0c7a8744f620c2cada751c693279d4 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 30 Dec 2022 16:45:41 +0100 Subject: [PATCH 0289/5754] package/{mesa3d, mesa3d-headers}: bump version to 22.3.2 Release notes: https://lists.freedesktop.org/archives/mesa-dev/2022-December/225903.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 e5988cad5e..f6b3ade3ea 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.1 +MESA3D_HEADERS_VERSION = 22.3.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/mesa3d.hash b/package/mesa3d/mesa3d.hash index 613ebce89f..e902e6b828 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2022-December/000697.html -sha256 3c9cd611c0859d307aba0659833386abdca4c86162d3c275ba5be62d16cf31eb mesa-22.3.1.tar.xz -sha512 8a7aee67f6351de293d23425229eb7c42d6918fe9ffb46c6e5df9609f79633c98ab78e892507fe48055c51fa88bf103d7b7baa58e826b1758f66067048baed5b mesa-22.3.1.tar.xz +# From https://lists.freedesktop.org/archives/mesa-dev/2022-December/225903.html +sha256 c15df758a8795f53e57f2a228eb4593c22b16dffd9b38f83901f76cd9533140b mesa-22.3.2.tar.xz +sha512 32934dd23cfcd6165c365597d9a469da0b806b72ea98a200f499344c3b47815db3bf78875b4ea766d2d28d9c70b50c1615d2d3fcbfd4769447fe0a9d3b32951f mesa-22.3.2.tar.xz # License sha256 a00275a53178e2645fb65be99a785c110513446a5071ff2c698ed260ad917d75 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index b6f1214102..523b642d0c 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.1 +MESA3D_VERSION = 22.3.2 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos From 80c5be77ceb021e8319b9269b58d6373d378fac5 Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 1 Jan 2023 20:36:29 -0300 Subject: [PATCH 0290/5754] package/gobject-introspection: really use host python for host variant Commit "abc110e362 package/gobject-introspection: bump to version 1.68.0" renamed the define that makes sure g-ir-tool-template uses the host python, but forgot to update its call on pre-configure hooks. Update it now. Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/gobject-introspection/gobject-introspection.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gobject-introspection/gobject-introspection.mk b/package/gobject-introspection/gobject-introspection.mk index 0d8c666ba1..12e5b81b1b 100644 --- a/package/gobject-introspection/gobject-introspection.mk +++ b/package/gobject-introspection/gobject-introspection.mk @@ -66,7 +66,7 @@ HOST_GOBJECT_INTROSPECTION_CONF_ENV = \ define GOBJECT_INTROSPECTION_FIX_TOOLS_PYTHON_PATH $(SED) '1s%#!.*%#!$(HOST_DIR)/bin/python3%' $(@D)/tools/g-ir-tool-template.in endef -HOST_GOBJECT_INTROSPECTION_PRE_CONFIGURE_HOOKS += GOBJECT_INTROSPECTION_FIX_TOOLTEMPLATE_PYTHON_PATH +HOST_GOBJECT_INTROSPECTION_PRE_CONFIGURE_HOOKS += GOBJECT_INTROSPECTION_FIX_TOOLS_PYTHON_PATH # Perform the following: # - Just as above, Ensure that g-ir-tool-template.in uses the host python. From 16168abd26b06656bcc24c2b511c29a0f047ebf4 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 5 Jan 2023 21:10:08 +0100 Subject: [PATCH 0291/5754] package/php: security bump version to 8.1.14 Changelog: https://www.php.net/ChangeLog-8.php#8.1.14 Fixes CVE 2022-31631: https://bugs.php.net/bug.php?id=81740 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 461dc36031..23ec84f19f 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 b15ef0ccdd6760825604b3c4e3e73558dcf87c75ef1d68ef4289d8fd261ac856 php-8.1.13.tar.xz +sha256 e16e47a872d58685913ac848ce92ec49f42c1828110c98c65fb6265a08724a1a php-8.1.14.tar.xz # License file sha256 a188db807d711536f71e27b7d36879d63480f7994dc18adc08e624b3c5430fff LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index 1fdf5c68a2..23dd4ba96f 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.1.13 +PHP_VERSION = 8.1.14 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From 7ff5f7ff0a5ffb8de98d132740fe2fbe4fb71b5a Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 30 Dec 2022 11:37:22 +0100 Subject: [PATCH 0292/5754] package/hiredis: fix debug install hiredis suffix its debug libraries with "d" since version 1.1.0 and https://github.com/redis/hiredis/commit/dde6916b42a4723b364355eff8fbb477723a789a resulting in the following build failure with collectd since commit bd7e90779861bb603fc1cca03f6fad4d951f7bd9: redis . . . . . . . . no (symbol 'redisCommand' not found) (dependency error) Fixes: - http://autobuild.buildroot.org/results/394ebf2b6816c69dbdd7901491c0e3fd52befedc Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/hiredis/hiredis.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/hiredis/hiredis.mk b/package/hiredis/hiredis.mk index d59933845c..f79b6c757a 100644 --- a/package/hiredis/hiredis.mk +++ b/package/hiredis/hiredis.mk @@ -11,7 +11,9 @@ HIREDIS_LICENSE = BSD-3-Clause HIREDIS_LICENSE_FILES = COPYING HIREDIS_CPE_ID_VENDOR = redislabs HIREDIS_INSTALL_STAGING = YES -HIREDIS_CONF_OPTS = -DDISABLE_TESTS=ON +# Set CMAKE_BUILD_TYPE to Release or the libraries will be suffixed with "d" +# resulting in a build failure with collectd +HIREDIS_CONF_OPTS = -DCMAKE_BUILD_TYPE=Release -DDISABLE_TESTS=ON ifeq ($(BR2_PACKAGE_OPENSSL)$(BR2_TOOLCHAIN_HAS_THREADS),yy) HIREDIS_CONF_OPTS += -DENABLE_SSL=ON From 84e52a60b4044d3c54d6d4be5729a6d30aaf5aee Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 30 Dec 2022 10:34:35 +0100 Subject: [PATCH 0293/5754] package/tiff: fix host package Disable webp and zstd on host package to avoid the following build failure with host-gdk-pixbuf raised since bump to version 4.5.0 in commit 5b62ea01369b11f5a4320bb2c909168b21c2642c: Run-time dependency libtiff-4 found: NO (tried cmake) ../output-1/build/host-gdk-pixbuf-2.42.10/meson.build:330:2: ERROR: Dependency lookup for libtiff-4 with method 'pkgconfig' failed: Could not generate cargs for libtiff-4: Package libwebp was not found in the pkg-config search path. Perhaps you should add the directory containing `libwebp.pc' to the PKG_CONFIG_PATH environment variable Package 'libwebp', required by 'libtiff-4', not found [...] Run-time dependency libtiff-4 found: NO (tried cmake) ../output-1/build/host-gdk-pixbuf-2.42.10/meson.build:330:2: ERROR: Dependency lookup for libtiff-4 with method 'pkgconfig' failed: Could not generate cargs for libtiff-4: Package libzstd was not found in the pkg-config search path. Perhaps you should add the directory containing `libzstd.pc' to the PKG_CONFIG_PATH environment variable Package 'libzstd', required by 'libtiff-4', not found While at it, also disable libdeflate even if no build failures are raised by autobuilders Fixes: - http://autobuild.buildroot.org/results/320083dfec4d126043b036cbaec7c7b85069a50a - http://autobuild.buildroot.org/results/8ff1cfa254920749a43e235c4084b8524d0edf6f Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/tiff/tiff.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk index d3ab50b79e..e7de51ea1e 100644 --- a/package/tiff/tiff.mk +++ b/package/tiff/tiff.mk @@ -26,9 +26,12 @@ HOST_TIFF_CONF_OPTS = \ --disable-cxx \ --without-x \ --disable-zlib \ + --disable-libdeflate \ --disable-lzma \ --disable-jpeg \ - --disable-tests + --disable-tests \ + --disable-webp \ + --disable-zstd HOST_TIFF_DEPENDENCIES = host-pkgconf ifeq ($(BR2_INSTALL_LIBSTDCPP),y) From e6365126e731a1d0bf40eea91cb51b98b6918ecf Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 29 Dec 2022 11:39:53 +0100 Subject: [PATCH 0294/5754] package/wireshark: add zlib optional dependency zlib is an optional dependency which is enabled by default since at least version 1.8.0 and https://github.com/wireshark/wireshark/commit/7133f6944dc26740f5ebf56c2ca33be86a6e0f09 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/wireshark/wireshark.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index 5da344fc55..f7fd72558e 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -157,6 +157,13 @@ else WIRESHARK_CONF_OPTS += -DBUILD_sdjournal=OFF endif +ifeq ($(BR2_PACKAGE_ZLIB),y) +WIRESHARK_CONF_OPTS += -DENABLE_ZLIB=ON +WIRESHARK_DEPENDENCIES += zlib +else +WIRESHARK_CONF_OPTS += -DENABLE_ZLIB=OFF +endif + ifeq ($(BR2_PACKAGE_ZSTD),y) WIRESHARK_CONF_OPTS += -DENABLE_ZSTD=ON WIRESHARK_DEPENDENCIES += zstd From 8702cecb142e42c6fd522d8256732ec54bab1711 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 29 Dec 2022 11:46:26 +0100 Subject: [PATCH 0295/5754] package/wireshark: add minizip-zlib optional dependency minizip-zlib is an optional dependency which is enabled by default since version 3.1.0 and https://github.com/wireshark/wireshark/commit/390071ed0bc8aaf378c3468989ccde1c93817542 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/wireshark/wireshark.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index f7fd72558e..c1efef2280 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -115,6 +115,13 @@ else WIRESHARK_CONF_OPTS += -DENABLE_LZ4=OFF endif +ifeq ($(BR2_PACKAGE_MINIZIP_ZLIB),y) +WIRESHARK_CONF_OPTS += -DENABLE_MINIZIP=ON +WIRESHARK_DEPENDENCIES += minizip-zlib +else +WIRESHARK_CONF_OPTS += -DENABLE_MINIZIP=OFF +endif + ifeq ($(BR2_PACKAGE_NGHTTP2),y) WIRESHARK_CONF_OPTS += -DENABLE_NGHTTP2=ON WIRESHARK_DEPENDENCIES += nghttp2 From f70149c80cda5d2f6bbe2266b247d52818391cda Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 29 Dec 2022 11:53:11 +0100 Subject: [PATCH 0296/5754] package/wireshark: add libcap optional dependency libcap is an optional dependency which is enabled by default since at least version 1.8.0 and https://github.com/wireshark/wireshark/commit/9250a69a9976617c735679aa5383e53802e5b43e Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/wireshark/wireshark.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index c1efef2280..d9314fb211 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -65,6 +65,13 @@ else WIRESHARK_CONF_OPTS += -DENABLE_GNUTLS=OFF endif +ifeq ($(BR2_PACKAGE_LIBCAP),y) +WIRESHARK_CONF_OPTS += -DENABLE_CAP=ON +WIRESHARK_DEPENDENCIES += libcap +else +WIRESHARK_CONF_OPTS += -DENABLE_CAP=OFF +endif + ifeq ($(BR2_PACKAGE_LIBKRB5),y) WIRESHARK_CONF_OPTS += -DENABLE_KERBEROS=ON WIRESHARK_DEPENDENCIES += libkrb5 From 4aca99f51cc97cfc3bcd3affa65f4694004dd444 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 29 Dec 2022 11:58:18 +0100 Subject: [PATCH 0297/5754] package/wireshark: bump to version 4.0.2 - pcre2 is mandatory since version 3.7.0 and https://github.com/wireshark/wireshark/commit/b9f2e4b7fa091719b93f6256ac34be8e32bd8e94 - Set HAVE_C99_VSNPRINTF to avoid a build failure due to check_c_source_runs - DISABLE_WERROR was renamed to ENABLE_WERROR 4.x series is the new stable release https://www.wireshark.org/news/20221207.html https://www.wireshark.org/docs/relnotes/wireshark-4.0.2.html Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/wireshark/Config.in | 1 + package/wireshark/wireshark.hash | 6 +++--- package/wireshark/wireshark.mk | 6 ++++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/package/wireshark/Config.in b/package/wireshark/Config.in index cd92beb1d1..8b05599ecb 100644 --- a/package/wireshark/Config.in +++ b/package/wireshark/Config.in @@ -10,6 +10,7 @@ config BR2_PACKAGE_WIRESHARK select BR2_PACKAGE_LIBPCAP select BR2_PACKAGE_LIBGCRYPT select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_PCRE2 select BR2_PACKAGE_SPEEXDSP help Network traffic sniffer and protocol decoder. diff --git a/package/wireshark/wireshark.hash b/package/wireshark/wireshark.hash index 56363e717f..ae06ab09b7 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-3.4.16.txt -sha1 b0e64d5fdd6701106d94bdc8f59dd40a34c7c807 wireshark-3.4.16.tar.xz -sha256 6acb3155b89b65bcdbcdac7a9e6a59013a6e21d8ae6a8249a9af4fe9ce3d91ba wireshark-3.4.16.tar.xz +# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-4.0.2.txt +sha1 0127180ff18515b086fe5603f767f53ddaa64c1a wireshark-4.0.2.tar.xz +sha256 f35915699f2f9b28ddb211202d40ec8984e5834d3c911483144a4984ba44411d wireshark-4.0.2.tar.xz # Locally calculated sha256 7cdbed2b697efaa45576a033f1ac0e73cd045644a91c79bbf41d4a7d81dac7bf COPYING diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index d9314fb211..ee3d6b1905 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRESHARK_VERSION = 3.4.16 +WIRESHARK_VERSION = 4.0.2 WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.xz WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions WIRESHARK_LICENSE = wireshark license @@ -18,13 +18,15 @@ WIRESHARK_DEPENDENCIES = \ libgcrypt \ libglib2 \ libpcap \ + pcre2 \ speexdsp WIRESHARK_CONF_OPTS = \ - -DDISABLE_WERROR=ON \ -DENABLE_ILBC=OFF \ -DENABLE_PCAP=ON \ -DENABLE_SMI=OFF \ + -DENABLE_WERROR=OFF \ + -DHAVE_C99_VSNPRINTF=ON \ -DLEMON_C_COMPILER=$(HOSTCC_NOCCACHE) ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) From 3b3dbd0183265c3f7da49b0b331688fb7573383f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 29 Dec 2022 10:33:55 +0100 Subject: [PATCH 0298/5754] package/ulogd: add libdbi support Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/ulogd/ulogd.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/package/ulogd/ulogd.mk b/package/ulogd/ulogd.mk index 65280a2ba6..561429599c 100644 --- a/package/ulogd/ulogd.mk +++ b/package/ulogd/ulogd.mk @@ -7,7 +7,6 @@ ULOGD_VERSION = 2.0.8 ULOGD_SOURCE = ulogd-$(ULOGD_VERSION).tar.bz2 ULOGD_SITE = http://www.netfilter.org/projects/ulogd/files -ULOGD_CONF_OPTS = --disable-dbi ULOGD_DEPENDENCIES = host-pkgconf \ libmnl libnetfilter_acct libnetfilter_conntrack libnetfilter_log \ libnfnetlink @@ -17,6 +16,12 @@ ULOGD_SELINUX_MODULES = ulogd # DB backends need threads ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) +ifeq ($(BR2_PACKAGE_LIBDBI),y) +ULOGD_CONF_OPTS += --enable-dbi +ULOGD_DEPENDENCIES += libdbi +else +ULOGD_CONF_OPTS += --disable-dbi +endif ifeq ($(BR2_PACKAGE_MYSQL),y) ULOGD_CONF_OPTS += --enable-mysql ULOGD_DEPENDENCIES += mysql From c1e63188347b1e5bab9d524e2489d4f948ec719e Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 1 Jan 2023 21:45:08 -0300 Subject: [PATCH 0299/5754] package/atop: bump to version 2.8.0 Signed-off-by: Ricardo Martincoski Signed-off-by: Peter Korsgaard --- package/atop/atop.hash | 2 +- package/atop/atop.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/atop/atop.hash b/package/atop/atop.hash index 18ba42340c..e42354739a 100644 --- a/package/atop/atop.hash +++ b/package/atop/atop.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 ca48d2f17e071deead5e6e9cc9e388bf6a3270d695e61976b3794d4d927b5c4e atop-2.7.1.tar.gz +sha256 3b002cb9774a7d6b3e820451773ae5e909b5e725738c6f375f14d1c1976d9fba atop-2.8.0.tar.gz # Hash for license file: sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/package/atop/atop.mk b/package/atop/atop.mk index 8a0fcda33b..04a554b474 100644 --- a/package/atop/atop.mk +++ b/package/atop/atop.mk @@ -4,7 +4,7 @@ # ################################################################################ -ATOP_VERSION = 2.7.1 +ATOP_VERSION = 2.8.0 ATOP_SITE = http://www.atoptool.nl/download ATOP_LICENSE = GPL-2.0+ ATOP_LICENSE_FILES = COPYING From 3a22b009992883ad57553ffb3f194303f90ad1a4 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 5 Jan 2023 19:51:40 +0100 Subject: [PATCH 0300/5754] package/libgpg-error: add configure option to install gpg-error-config Upstream commit[1] https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=commitdiff;h=0b47de9c719b0ed0da0791f0525de073737bde5a changed behaviour: "gpg-error-config is now only installed when enabled" Fixes: http://autobuild.buildroot.net/results/bc1/bc1566a0fa42f68f1f15f74a61d4081e269e1689/ [1] included in version 1.46, added in buildroot with commit b5bdcb4cc5 Signed-off-by: Bernd Kuhls Reviewed-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/libgpg-error/libgpg-error.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libgpg-error/libgpg-error.mk b/package/libgpg-error/libgpg-error.mk index ab3c7c3bf2..3f4a45a7e4 100644 --- a/package/libgpg-error/libgpg-error.mk +++ b/package/libgpg-error/libgpg-error.mk @@ -15,6 +15,7 @@ LIBGPG_ERROR_CONFIG_SCRIPTS = gpg-error-config LIBGPG_ERROR_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) LIBGPG_ERROR_CONF_OPTS = \ --host=$(BR2_PACKAGE_LIBGPG_ERROR_SYSCFG) \ + --enable-install-gpg-error-config \ --disable-tests \ --disable-languages From 0c8eefa6a4e2a40ee9b832d5f1e71bf4ddfd9f1e Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Fri, 6 Jan 2023 02:21:33 +0100 Subject: [PATCH 0301/5754] package/libnss: bump version to 3.87 Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- 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 50c5e583af..f847ec4f77 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_86_RTM/src/SHA256SUMS -sha256 3f385fc686476bbba811035fa6821b542475d55747b18c20c221d4d66573b975 nss-3.86.tar.gz +# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_87_RTM/src/SHA256SUMS +sha256 68a1894496d3d158babc75f8a5dda3f55b7c1560573936e3b101a10fa4ac152d nss-3.87.tar.gz # Locally calculated sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index cee0e596a1..90fd9259d5 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSS_VERSION = 3.86 +LIBNSS_VERSION = 3.87 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 1b68271287d470f4dfeab074a1222da869328f4e Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 1 Jan 2023 12:25:27 +0100 Subject: [PATCH 0302/5754] package/fmlib: bump to version LSDK-21.08 License file was updated in commit: https://github.com/nxp-qoriq/fmlib/commit/22126510006f366981c078a340e012a1e0415429 Notable changes in the license update are: - GPL-2.0+ option was removed, - Copyright years updated, - NXP was added, - License text was reflowed. Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- package/fmlib/fmlib.hash | 4 ++-- package/fmlib/fmlib.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/fmlib/fmlib.hash b/package/fmlib/fmlib.hash index d4dcf3be5c..f81b017869 100644 --- a/package/fmlib/fmlib.hash +++ b/package/fmlib/fmlib.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6e9e6bdb42dc2a6a76cfd756a2d4cdfcc2be90925c1f439e8a11eafa871896a6 fmlib-43fa98fdbf0c697167e415c3f060896d5b482791.tar.gz -sha256 837559e20d83910a005e7883b876cc5c42805fe4abcf7e5c5b3c8d036b7f61c8 COPYING +sha256 64dc76c0adc3aa58bce6aba470dee7dee001d4964ccb1958e899a59d9917b21d fmlib-LSDK-21.08.tar.gz +sha256 5d7770fa9f70f0c6f0b4784bbca8401811259a4b1e03455dbd863ffd0d34d2ca COPYING diff --git a/package/fmlib/fmlib.mk b/package/fmlib/fmlib.mk index 9509f3de56..3d185979d5 100644 --- a/package/fmlib/fmlib.mk +++ b/package/fmlib/fmlib.mk @@ -4,9 +4,9 @@ # ################################################################################ -FMLIB_VERSION = 43fa98fdbf0c697167e415c3f060896d5b482791 +FMLIB_VERSION = LSDK-21.08 FMLIB_SITE = $(call github,nxp-qoriq,fmlib,$(FMLIB_VERSION)) -FMLIB_LICENSE = BSD-3-Clause, GPL-2.0+ +FMLIB_LICENSE = BSD-3-Clause FMLIB_LICENSE_FILES = COPYING FMLIB_DEPENDENCIES = linux FMLIB_INSTALL_STAGING = YES From c943cb38e4174cd349b4bb80e5e16269b25079d2 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 1 Jan 2023 12:25:28 +0100 Subject: [PATCH 0303/5754] package/fmc: bump to version LSDK-21.08 This commit also updates the sed pattern, as the default platform was changed in: https://github.com/nxp-qoriq/fmc/commit/4377bfc24626a0db3bedb6e1cbb201f6f6df964c Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- package/fmc/fmc.hash | 2 +- package/fmc/fmc.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/fmc/fmc.hash b/package/fmc/fmc.hash index 7309562b09..961ce18ac7 100644 --- a/package/fmc/fmc.hash +++ b/package/fmc/fmc.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e8594e37eb81e5b1f492f8494b98086f65180637b1e2e08d8a4475c23653a404 fmc-a079d2c844edd85dff85a317a63198e7988bcd09.tar.gz +sha256 a58514816108a16d07307f924ebceb67c7d61709e4449978763fc44ed6e1fc44 fmc-LSDK-21.08.tar.gz sha256 f92862ceb95db5492f50a59d7c799c9395b714db88db92d11891dc0233e2ac42 COPYING diff --git a/package/fmc/fmc.mk b/package/fmc/fmc.mk index 6ac8c768df..4f25545ffd 100644 --- a/package/fmc/fmc.mk +++ b/package/fmc/fmc.mk @@ -4,7 +4,7 @@ # ################################################################################ -FMC_VERSION = a079d2c844edd85dff85a317a63198e7988bcd09 +FMC_VERSION = LSDK-21.08 FMC_SITE = $(call github,nxp-qoriq,fmc,$(FMC_VERSION)) FMC_LICENSE = MIT FMC_LICENSE_FILES = COPYING @@ -26,7 +26,7 @@ endif FMC_PLATFORM = $(call qstrip,$(BR2_PACKAGE_FMLIB_PLATFORM)) define FMC_BUILD_CMDS - $(SED) "s:P4080:$(FMC_PLATFORM):g" $(@D)/source/Makefile + $(SED) "s:LS1043:$(FMC_PLATFORM):g" $(@D)/source/Makefile # The linking step has dependency issues so using MAKE1 $(TARGET_MAKE_ENV) $(MAKE1) $(FMC_MAKE_OPTS) -C $(@D)/source endef From a0a428f135e1b220f8fc6043a7a1b8067f3bb8e2 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 1 Jan 2023 15:32:42 +0100 Subject: [PATCH 0304/5754] package/qemu: pixman only used for system emulation When we initially introduced the target qemu in 98e1a6b9619c (package/qemu: build for the target (i386 or x86_64 only)), we unconditionally enabled all the system and user emulation without distinction, so pixman was made a mandatory dependency. However, soon afterwards, in 68ec49acc7be (package/qemu: add basic target selection), we added an option to enable/disable the system emulation, but the dependency on pixman was not moved to that new option. Fix that now, and only depend on pixman when system emulation is enabled. Signed-off-by: Yann E. MORIN Signed-off-by: Peter Korsgaard --- package/qemu/Config.in | 2 +- package/qemu/qemu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/qemu/Config.in b/package/qemu/Config.in index 2bbc6a14c0..154b98a541 100644 --- a/package/qemu/Config.in +++ b/package/qemu/Config.in @@ -25,7 +25,6 @@ menuconfig BR2_PACKAGE_QEMU depends on BR2_USE_WCHAR # gettext depends on BR2_USE_MMU # fork() select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_PIXMAN select BR2_PACKAGE_ZLIB select BR2_PACKAGE_QEMU_TOOLS if !BR2_PACKAGE_QEMU_SYSTEM && !BR2_PACKAGE_QEMU_LINUX_USER help @@ -53,6 +52,7 @@ comment "Emulators selection" config BR2_PACKAGE_QEMU_SYSTEM bool "Enable systems emulation" depends on !BR2_STATIC_LIBS # dtc + select BR2_PACKAGE_PIXMAN help Say 'y' to build system emulators/virtualisers. diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index 5c7a8d504c..58b4ff10a5 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -27,7 +27,6 @@ QEMU_DEPENDENCIES = \ host-pkgconf \ host-python3 \ libglib2 \ - pixman \ zlib # Need the LIBS variable because librt and libm are @@ -45,6 +44,7 @@ QEMU_VARS = LIBTOOL=$(HOST_DIR)/bin/libtool # checks if the specified sub-set is valid. ifeq ($(BR2_PACKAGE_QEMU_SYSTEM),y) +QEMU_DEPENDENCIES += pixman QEMU_OPTS += --enable-system QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_AARCH64) += aarch64-softmmu QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_ALPHA) += alpha-softmmu From b39bd50e0a4cfb9cd5bba02c6ae913be72f3771a Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 6 Jan 2023 20:47:19 +0100 Subject: [PATCH 0305/5754] configs/nezha_defconfig: use OpenSBI 1.2 Signed-off-by: Peter Korsgaard --- configs/nezha_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/nezha_defconfig b/configs/nezha_defconfig index 854392f929..dd94707905 100644 --- a/configs/nezha_defconfig +++ b/configs/nezha_defconfig @@ -16,7 +16,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_OPENSBI=y BR2_TARGET_OPENSBI_CUSTOM_VERSION=y -BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.1" +BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.2" BR2_TARGET_OPENSBI_PLAT="generic" # BR2_TARGET_OPENSBI_INSTALL_JUMP_IMG is not set BR2_TARGET_UBOOT=y From 7f9a31bb8ce5567c8b3a59e50c44302f69788e02 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 6 Jan 2023 20:47:20 +0100 Subject: [PATCH 0306/5754] configs/sipeed_lichee_rv_defconfig: use OpenSBI 1.2 Signed-off-by: Peter Korsgaard --- configs/sipeed_lichee_rv_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/sipeed_lichee_rv_defconfig b/configs/sipeed_lichee_rv_defconfig index f03a6b4f69..750d2d6e3b 100644 --- a/configs/sipeed_lichee_rv_defconfig +++ b/configs/sipeed_lichee_rv_defconfig @@ -15,7 +15,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_OPENSBI=y BR2_TARGET_OPENSBI_CUSTOM_VERSION=y -BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.1" +BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.2" BR2_TARGET_OPENSBI_PLAT="generic" # BR2_TARGET_OPENSBI_INSTALL_JUMP_IMG is not set BR2_TARGET_UBOOT=y From c1d22c7331d5888c4d1bac0504e35862d72829fe Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 6 Jan 2023 20:47:21 +0100 Subject: [PATCH 0307/5754] configs/sipeed_lichee_rv_dock_defconfig: use OpenSBI 1.2 Signed-off-by: Peter Korsgaard Reviewed-by: Julien Olivain Tested-by: Julien Olivain Signed-off-by: Peter Korsgaard --- configs/sipeed_lichee_rv_dock_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/sipeed_lichee_rv_dock_defconfig b/configs/sipeed_lichee_rv_dock_defconfig index 807209eeec..a228cd8cb7 100644 --- a/configs/sipeed_lichee_rv_dock_defconfig +++ b/configs/sipeed_lichee_rv_dock_defconfig @@ -23,7 +23,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_OPENSBI=y BR2_TARGET_OPENSBI_CUSTOM_VERSION=y -BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.1" +BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.2" BR2_TARGET_OPENSBI_PLAT="generic" # BR2_TARGET_OPENSBI_INSTALL_JUMP_IMG is not set BR2_TARGET_UBOOT=y From a564f4da0ffbfd180186a34bdbdccf1cb5f9272f Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 7 Jan 2023 09:27:06 +0100 Subject: [PATCH 0308/5754] configs/qemu_riscv32_virt_defconfig: use OpenSBI 1.2 Rather than the default (currently 0.9). Signed-off-by: Peter Korsgaard --- configs/qemu_riscv32_virt_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/qemu_riscv32_virt_defconfig b/configs/qemu_riscv32_virt_defconfig index faf4e1e312..f354e303e5 100644 --- a/configs/qemu_riscv32_virt_defconfig +++ b/configs/qemu_riscv32_virt_defconfig @@ -25,6 +25,8 @@ BR2_LINUX_KERNEL_IMAGE=y # Bootloader BR2_TARGET_OPENSBI=y +BR2_TARGET_OPENSBI_CUSTOM_VERSION=y +BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.2" BR2_TARGET_OPENSBI_PLAT="generic" # host-qemu for gitlab testing From 035cc3caf998a71dea37eefb852d20867fd89b39 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 7 Jan 2023 09:27:07 +0100 Subject: [PATCH 0309/5754] configs/qemu_riscv64_virt_defconfig: use OpenSBI 1.2 Rather than the default (currently 0.9). Signed-off-by: Peter Korsgaard --- configs/qemu_riscv64_virt_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/qemu_riscv64_virt_defconfig b/configs/qemu_riscv64_virt_defconfig index c455680ee0..b3174a152c 100644 --- a/configs/qemu_riscv64_virt_defconfig +++ b/configs/qemu_riscv64_virt_defconfig @@ -25,6 +25,8 @@ BR2_LINUX_KERNEL_IMAGE=y # Bootloader BR2_TARGET_OPENSBI=y +BR2_TARGET_OPENSBI_CUSTOM_VERSION=y +BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.2" BR2_TARGET_OPENSBI_PLAT="generic" # host-qemu for gitlab testing From 5db2e5d45e75b44e7c7c5ad8c61d1be2a2748cbc Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 7 Jan 2023 09:27:08 +0100 Subject: [PATCH 0310/5754] configs/spike_riscv64_defconfig: use OpenSBI 1.2 Signed-off-by: Peter Korsgaard Reviewed-by: Julien Olivain Tested-by: Julien Olivain Signed-off-by: Peter Korsgaard --- configs/spike_riscv64_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/spike_riscv64_defconfig b/configs/spike_riscv64_defconfig index 26103682f9..e23f1ce32c 100644 --- a/configs/spike_riscv64_defconfig +++ b/configs/spike_riscv64_defconfig @@ -9,7 +9,7 @@ BR2_TARGET_ROOTFS_CPIO=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_OPENSBI=y BR2_TARGET_OPENSBI_CUSTOM_VERSION=y -BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.1" +BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.2" BR2_TARGET_OPENSBI_PLAT="generic" BR2_TARGET_OPENSBI_LINUX_PAYLOAD=y BR2_PACKAGE_HOST_RISCV_ISA_SIM=y From fad36fa91d9a85ce548ea7f3fd42c1c4b31564ba Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 7 Jan 2023 09:27:09 +0100 Subject: [PATCH 0311/5754] configs/hifive_unleashed_defconfig: explicitly use OpenSBI 0.9 Rather than relying on what is currently the default. Signed-off-by: Peter Korsgaard --- configs/hifive_unleashed_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/hifive_unleashed_defconfig b/configs/hifive_unleashed_defconfig index 0b87f2588f..2b6ee6c08e 100644 --- a/configs/hifive_unleashed_defconfig +++ b/configs/hifive_unleashed_defconfig @@ -37,6 +37,8 @@ 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_PLAT="generic" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y From 658ece1afa84e916503e3e949c40b3c0d24c6335 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Fri, 6 Jan 2023 22:04:17 +0100 Subject: [PATCH 0312/5754] package/ntpsec: bump version to 1.2.2 - remove 001-ntptime-fix-jfmt5-ofmt5-jfmt6-ofmt6-related-compile-.patch (upstream applied, see [1]) - rename 0002-wscript-remove-checks-for-bsd-string.h-fixes-host-co.patch to 0001-wscript-remove-checks-for-bsd-string.h-fixes-host-co.patch - remove 0003-fix-build-with-libressl.patch (upstream applied, see [2]) - update license file list (change from LICENSE.adoc to LICENSES/BSD-2, LICENSES/BSD-3, LICENSES/CC-BY-4.0, LICENSES/MIT, LICENSES/NTP) For details see [3]. [1] https://gitlab.com/NTPsec/ntpsec/-/commit/0bea0bef36ff9cfa3ff52de25a839c283cf46cf7 [2] https://gitlab.com/NTPsec/ntpsec/-/commit/128b66ae122d7b41ce4b99f427383fd6a5923d71 [3] https://gitlab.com/NTPsec/ntpsec/-/blob/master/NEWS.adoc Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- ...5-ofmt5-jfmt6-ofmt6-related-compile-.patch | 90 ------------------- ...ecks-for-bsd-string.h-fixes-host-co.patch} | 0 .../ntpsec/0003-fix-build-with-libressl.patch | 80 ----------------- package/ntpsec/ntpsec.hash | 8 +- package/ntpsec/ntpsec.mk | 12 ++- 5 files changed, 15 insertions(+), 175 deletions(-) delete mode 100644 package/ntpsec/0001-ntptime-fix-jfmt5-ofmt5-jfmt6-ofmt6-related-compile-.patch rename package/ntpsec/{0002-wscript-remove-checks-for-bsd-string.h-fixes-host-co.patch => 0001-wscript-remove-checks-for-bsd-string.h-fixes-host-co.patch} (100%) delete mode 100644 package/ntpsec/0003-fix-build-with-libressl.patch diff --git a/package/ntpsec/0001-ntptime-fix-jfmt5-ofmt5-jfmt6-ofmt6-related-compile-.patch b/package/ntpsec/0001-ntptime-fix-jfmt5-ofmt5-jfmt6-ofmt6-related-compile-.patch deleted file mode 100644 index aa3cb183c3..0000000000 --- a/package/ntpsec/0001-ntptime-fix-jfmt5-ofmt5-jfmt6-ofmt6-related-compile-.patch +++ /dev/null @@ -1,90 +0,0 @@ -From aa9ed14c7f4d0edbda9370760b44be045638f8a0 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Mon, 4 Oct 2021 22:25:58 +0200 -Subject: [PATCH] ntptime: fix jfmt5/ofmt5 jfmt6/ofmt6 related compile failure -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Use same define guard for definiton as for usage ('HAVE_STRUCT_NTPTIMEVAL_TAI' -instead of 'NTP_API && NTP_API > 3'). - -While at it use HAVE_STRUCT_NTPTIMEVAL_TAI define guard for the two remaining -places using NTP_API (which is not defined by the uclibc sys/timex.h header). - -Fixes: - - ../../ntptime/ntptime.c: In function ‘main’: - ../../ntptime/ntptime.c:349:17: error: ‘jfmt5’ undeclared (first use in this function); did you mean ‘jfmt6’? - 349 | printf(json ? jfmt5 : ofmt5, (long)ntv.tai); - | ^~~~~ - | jfmt6 - ../../ntptime/ntptime.c:349:17: note: each undeclared identifier is reported only once for each function it appears in - ../../ntptime/ntptime.c:349:25: error: ‘ofmt5’ undeclared (first use in this function); did you mean ‘ofmt6’? - 349 | printf(json ? jfmt5 : ofmt5, (long)ntv.tai); - | ^~~~~ - | ofmt6 - ../../ntptime/ntptime.c:321:15: warning: unused variable ‘jfmt6’ [-Wunused-variable] - 321 | const char *jfmt6 = ""; - | ^~~~~ - ../../ntptime/ntptime.c:311:15: warning: unused variable ‘ofmt6’ [-Wunused-variable] - 311 | const char *ofmt6 = "\n"; - | ^~~~~ - -[Upstream: https://gitlab.com/NTPsec/ntpsec/-/merge_requests/1245] -Signed-off-by: Peter Seiderer ---- - ntptime/ntptime.c | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/ntptime/ntptime.c b/ntptime/ntptime.c -index ff861cb3b..7fbd09977 100644 ---- a/ntptime/ntptime.c -+++ b/ntptime/ntptime.c -@@ -138,7 +138,7 @@ main( - ntx.modes |= MOD_NANO; - break; - #endif --#if defined NTP_API && NTP_API > 3 -+#if defined(HAVE_STRUCT_NTPTIMEVAL_TAI) - case 'T': - ntx.modes = MOD_TAI; - ntx.constant = atoi(ntp_optarg); -@@ -222,7 +222,7 @@ main( - #else - "", - #endif --#if defined NTP_API && NTP_API > 3 -+#if defined(HAVE_STRUCT_NTPTIMEVAL_TAI) - "-T tai_offset set TAI offset\n", - #else - "", -@@ -305,21 +305,21 @@ main( - const char *ofmt2 = " time %s, (.%0*d),\n"; - const char *ofmt3 = " maximum error %lu us, estimated error %lu us"; - const char *ofmt4 = " ntptime=%x.%x unixtime=%x.%0*d %s"; --#if defined NTP_API && NTP_API > 3 -+#if defined(HAVE_STRUCT_NTPTIMEVAL_TAI) - const char *ofmt5 = ", TAI offset %ld\n"; - #else - const char *ofmt6 = "\n"; --#endif /* NTP_API */ -+#endif /* HAVE_STRUCT_NTPTIMEVAL_TAI */ - /* JSON formats */ - const char *jfmt1 = "{\"gettime-code\":%d,\"gettime-status\":\"%s\","; - const char *jfmt2 = "\"time\":\"%s\",\"fractional-time\":\".%0*d\","; - const char *jfmt3 = "\"maximum-error\":%lu,\"estimated-error\":%lu,"; - const char *jfmt4 = "\"raw-ntp-time\":\"%x.%x\",\"raw-unix-time\":\"%x.%0*d %s\","; --#if defined NTP_API && NTP_API > 3 -+#if defined(HAVE_STRUCT_NTPTIMEVAL_TAI) - const char *jfmt5 = "\"TAI-offset\":%d,"; - #else - const char *jfmt6 = ""; --#endif /* NTP_API */ -+#endif /* HAVE_STRUCT_NTPTIMEVAL_TAI */ - printf(json ? jfmt1 : ofmt1, status, timex_state(status)); - time_frac = ntv.time.tv_frac_sec; - #ifdef STA_NANO --- -2.34.1 - diff --git a/package/ntpsec/0002-wscript-remove-checks-for-bsd-string.h-fixes-host-co.patch b/package/ntpsec/0001-wscript-remove-checks-for-bsd-string.h-fixes-host-co.patch similarity index 100% rename from package/ntpsec/0002-wscript-remove-checks-for-bsd-string.h-fixes-host-co.patch rename to package/ntpsec/0001-wscript-remove-checks-for-bsd-string.h-fixes-host-co.patch diff --git a/package/ntpsec/0003-fix-build-with-libressl.patch b/package/ntpsec/0003-fix-build-with-libressl.patch deleted file mode 100644 index a5c9543157..0000000000 --- a/package/ntpsec/0003-fix-build-with-libressl.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 743f16fb3fed9a05e601226f184be236614efe9a Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 12 Aug 2022 23:35:52 +0200 -Subject: [PATCH] fix build with libressl - -Fix the following build failure with libressl: - -/home/buildroot/autobuild/instance-0/output-1/host/lib/gcc/armeb-buildroot-linux-gnueabi/11.3.0/../../../../armeb-buildroot-linux-gnueabi/bin/ld: libntp/libntp.a(ntp_random.c.1.o): in function `ntp_RAND_priv_bytes': -ntp_random.c:(.text+0xac): undefined reference to `RAND_priv_bytes' - -Fixes: - - http://autobuild.buildroot.org/results/a6a825b7f0efc7c82e8ecf792a1f9951ffb047c5 - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.com/NTPsec/ntpsec/-/merge_requests/1285] ---- - attic/cmac-timing.c | 2 ++ - attic/random.c | 8 ++++++++ - libntp/ntp_random.c | 2 +- - 3 files changed, 11 insertions(+), 1 deletion(-) - -diff --git a/attic/cmac-timing.c b/attic/cmac-timing.c -index 464daa76b..4f2fd3338 100644 ---- a/attic/cmac-timing.c -+++ b/attic/cmac-timing.c -@@ -204,7 +204,9 @@ static void DoPKEY( - printf("## Oops, EVP_MD_CTX_new() failed.\n"); - return; - } -+#ifdef EVP_MD_CTX_FLAG_FINALISE - EVP_MD_CTX_set_flags(ctx, EVP_MD_CTX_FLAG_FINALISE); -+#endif - - clock_gettime(CLOCK_MONOTONIC, &start); - for (int i = 0; i < SAMPLESIZE; i++) { -diff --git a/attic/random.c b/attic/random.c -index 446c68535..8530ecd25 100644 ---- a/attic/random.c -+++ b/attic/random.c -@@ -127,7 +127,11 @@ static int do_avg_priv(unsigned int bytes) { - - clock_gettime(CLOCK_REALTIME, &start); - for (int i = 0; i < BATCHSIZE; i++) { -+#ifdef LIBRESSL_VERSION_NUMBER -+ err += RAND_bytes((unsigned char *)&rnd, bytes); -+#else - err += RAND_priv_bytes((unsigned char *)&rnd, bytes); -+#endif - } - clock_gettime(CLOCK_REALTIME, &stop); - -@@ -209,7 +213,11 @@ static int do_fast_priv(unsigned bytes) { - - for (int i = 0; i < BATCHSIZE; i++) { - clock_gettime(CLOCK_REALTIME, &start); -+#ifdef LIBRESSL_VERSION_NUMBER -+ err += RAND_bytes((unsigned char *)&rnd, bytes); -+#else - err += RAND_priv_bytes((unsigned char *)&rnd, bytes); -+#endif - clock_gettime(CLOCK_REALTIME, &stop); - sec = (stop.tv_sec-start.tv_sec); - nanos = sec*BILLION + (stop.tv_nsec-start.tv_nsec); -diff --git a/libntp/ntp_random.c b/libntp/ntp_random.c -index 9304a790d..adb375b24 100644 ---- a/libntp/ntp_random.c -+++ b/libntp/ntp_random.c -@@ -29,7 +29,7 @@ void ntp_RAND_bytes(unsigned char *buf, int num) { - - void ntp_RAND_priv_bytes(unsigned char *buf, int num) { - int err; --#if (OPENSSL_VERSION_NUMBER > 0x1010100fL) -+#if (OPENSSL_VERSION_NUMBER > 0x1010100fL) && !defined(LIBRESSL_VERSION_NUMBER) - err = RAND_priv_bytes(buf, num); - #else - err = RAND_bytes(buf, num); --- -2.35.1 - diff --git a/package/ntpsec/ntpsec.hash b/package/ntpsec/ntpsec.hash index 49dc4e4d52..44e04b2403 100644 --- a/package/ntpsec/ntpsec.hash +++ b/package/ntpsec/ntpsec.hash @@ -1,4 +1,8 @@ # Locally calculated -sha256 71c9f4bde6953bbc048bbaf278da81c451a56cc08d6772542b4ad37c67d72e89 ntpsec-NTPsec_1_2_1.tar.bz2 -sha256 b4db4de3317c3b0554ed91eb692968800bdfd6ad2c16ffbeee8ce4895ed91da4 LICENSE.adoc +sha256 ad45f5b88d08a159bc9f44ecb79e08358d26d3d22bb6c96ab7aaa3734de130e6 ntpsec-NTPsec_1_2_2.tar.bz2 +sha256 899261d6eb6c922cf8f051225411f27b738ba0014be18c2eaf6afbf30d421bb1 LICENSES/BSD-2 +sha256 5fe38d8724c53ff4e69f0a3492a368b4a6719700ac16f706efeb01a45c62f2b5 LICENSES/BSD-3 +sha256 9ba9550ad48438d0836ddab3da480b3b69ffa0aac7b7878b5a0039e7ab429411 LICENSES/CC-BY-4.0 +sha256 074415b57c6ba1780483d89e55f40dec3ded96c28aaf47d63c486683ba553e7c LICENSES/MIT +sha256 62fec6cd79721af81b7c12f1a679535235fdd22800ab17653042f024187ff274 LICENSES/NTP sha256 d3b21470adadd9abd9c6d675378f8c371ac5a4ea6dbec91859e02fadca3c0856 docs/copyright.adoc diff --git a/package/ntpsec/ntpsec.mk b/package/ntpsec/ntpsec.mk index ac4b90e37a..c7fa2f85a8 100644 --- a/package/ntpsec/ntpsec.mk +++ b/package/ntpsec/ntpsec.mk @@ -6,12 +6,18 @@ NTPSEC_VERSION_MAJOR = 1 NTPSEC_VERSION_MINOR = 2 -NTPSEC_VERSION_POINT = 1 +NTPSEC_VERSION_POINT = 2 NTPSEC_VERSION = $(NTPSEC_VERSION_MAJOR)_$(NTPSEC_VERSION_MINOR)_$(NTPSEC_VERSION_POINT) NTPSEC_SOURCE = ntpsec-NTPsec_$(NTPSEC_VERSION).tar.bz2 NTPSEC_SITE = https://gitlab.com/NTPsec/ntpsec/-/archive/NTPsec_$(NTPSEC_VERSION) -NTPSEC_LICENSE = BSD-2-Clause, NTP, BSD-3-Clause, MIT -NTPSEC_LICENSE_FILES = LICENSE.adoc docs/copyright.adoc +NTPSEC_LICENSE = BSD-2-Clause, NTP, BSD-3-Clause, MIT, CC-BY-4.0 (docs) +NTPSEC_LICENSE_FILES = \ + LICENSES/BSD-2 \ + LICENSES/BSD-3 \ + LICENSES/CC-BY-4.0 \ + LICENSES/MIT \ + LICENSES/NTP \ + docs/copyright.adoc NTPSEC_CPE_ID_VENDOR = ntpsec NTPSEC_CPE_ID_VERSION = $(NTPSEC_VERSION_MAJOR).$(NTPSEC_VERSION_MINOR) From 87ee360f3a18db33d50b5826590c55e37ee9f993 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 6 Jan 2023 14:18:41 -0700 Subject: [PATCH 0313/5754] package/{glibc, localedef}: bump to version 2.36-81-g4f4d7a13edfd2fdc57c9d76e1fd6d017fb47550c Drop patches which are now upstream. Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- ...KEFLAGS-assignment-for-upcoming-make.patch | 117 ------------------ .../0002-x86-Fix-Os-build-BZ-29576.patch | 48 ------- package/glibc/glibc.hash | 2 +- package/glibc/glibc.mk | 2 +- package/localedef/localedef.mk | 2 +- 5 files changed, 3 insertions(+), 168 deletions(-) delete mode 100644 package/glibc/0002-Makerules-fix-MAKEFLAGS-assignment-for-upcoming-make.patch delete mode 100644 package/glibc/0002-x86-Fix-Os-build-BZ-29576.patch diff --git a/package/glibc/0002-Makerules-fix-MAKEFLAGS-assignment-for-upcoming-make.patch b/package/glibc/0002-Makerules-fix-MAKEFLAGS-assignment-for-upcoming-make.patch deleted file mode 100644 index 0c82d7abbe..0000000000 --- a/package/glibc/0002-Makerules-fix-MAKEFLAGS-assignment-for-upcoming-make.patch +++ /dev/null @@ -1,117 +0,0 @@ -From 2d7ed98add14f75041499ac189696c9bd3d757fe Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich -Date: Tue, 13 Sep 2022 13:39:13 -0400 -Subject: [PATCH] Makerules: fix MAKEFLAGS assignment for upcoming make-4.4 - [BZ# 29564] - -make-4.4 will add long flags to MAKEFLAGS variable: - - * WARNING: Backward-incompatibility! - Previously only simple (one-letter) options were added to the MAKEFLAGS - variable that was visible while parsing makefiles. Now, all options - are available in MAKEFLAGS. - -This causes locale builds to fail when long options are used: - - $ make --shuffle - ... - make -C localedata install-locales - make: invalid shuffle mode: '1662724426r' - -The change fixes it by passing eash option via whitespace and dashes. -That way option is appended to both single-word form and whitespace -separated form. - -While at it fixed --silent mode detection in $(MAKEFLAGS) by filtering -out --long-options. Otherwise options like --shuffle flag enable silent -mode unintentionally. $(silent-make) variable consolidates the checks. - -Resolves: BZ# 29564 - -CC: Paul Smith -CC: Siddhesh Poyarekar -Signed-off-by: Sergei Trofimovich -Reviewed-by: Siddhesh Poyarekar -Signed-off-by: James Hilliard -[james.hilliard1@gmail.com: backport from upstream commit -2d7ed98add14f75041499ac189696c9bd3d757fe] ---- - Makeconfig | 18 +++++++++++++++++- - Makerules | 4 ++-- - elf/rtld-Rules | 2 +- - 3 files changed, 20 insertions(+), 4 deletions(-) - -diff --git a/Makeconfig b/Makeconfig -index f8164a0025..842f49eb58 100644 ---- a/Makeconfig -+++ b/Makeconfig -@@ -43,6 +43,22 @@ else - $(error objdir must be defined by the build-directory Makefile) - endif - -+# Did we request 'make -s' run? "yes" or "no". -+# Starting from make-4.4 MAKEFLAGS now contains long -+# options like '--shuffle'. To detect presence of 's' -+# we pick first word with short options. Long options -+# are guaranteed to come after whitespace. We use '-' -+# prefix to always have a word before long options -+# even if no short options were passed. -+# Typical MAKEFLAGS values to watch for: -+# "rs --shuffle=42" (silent) -+# " --shuffle" (not silent) -+ifeq ($(findstring s, $(firstword -$(MAKEFLAGS))),) -+silent-make := no -+else -+silent-make := yes -+endif -+ - # Root of the sysdeps tree. - sysdep_dir := $(..)sysdeps - export sysdep_dir := $(sysdep_dir) -@@ -917,7 +933,7 @@ endif - # umpteen zillion filenames along with it (we use `...' instead) - # but we don't want this echoing done when the user has said - # he doesn't want to see commands echoed by using -s. --ifneq "$(findstring s,$(MAKEFLAGS))" "" # if -s -+ifeq ($(silent-make),yes) # if -s - +cmdecho := echo >/dev/null - else # not -s - +cmdecho := echo -diff --git a/Makerules b/Makerules -index d1e139d03c..09c0cf8357 100644 ---- a/Makerules -+++ b/Makerules -@@ -794,7 +794,7 @@ endif - # Maximize efficiency by minimizing the number of rules. - .SUFFIXES: # Clear the suffix list. We don't use suffix rules. - # Don't define any builtin rules. --MAKEFLAGS := $(MAKEFLAGS)r -+MAKEFLAGS := $(MAKEFLAGS) -r - - # Generic rule for making directories. - %/: -@@ -811,7 +811,7 @@ MAKEFLAGS := $(MAKEFLAGS)r - .PRECIOUS: $(foreach l,$(libtypes),$(patsubst %,$(common-objpfx)$l,c)) - - # Use the verbose option of ar and tar when not running silently. --ifeq "$(findstring s,$(MAKEFLAGS))" "" # if not -s -+ifeq ($(silent-make),no) # if not -s - verbose := v - else # -s - verbose := -diff --git a/elf/rtld-Rules b/elf/rtld-Rules -index ca00dd1fe2..3c5e273f2b 100644 ---- a/elf/rtld-Rules -+++ b/elf/rtld-Rules -@@ -52,7 +52,7 @@ $(objpfx)rtld-libc.a: $(foreach dir,$(rtld-subdirs),\ - mv -f $@T $@ - - # Use the verbose option of ar and tar when not running silently. --ifeq "$(findstring s,$(MAKEFLAGS))" "" # if not -s -+ifeq ($(silent-make),no) # if not -s - verbose := v - else # -s - verbose := --- -2.34.1 - diff --git a/package/glibc/0002-x86-Fix-Os-build-BZ-29576.patch b/package/glibc/0002-x86-Fix-Os-build-BZ-29576.patch deleted file mode 100644 index 4470324f1c..0000000000 --- a/package/glibc/0002-x86-Fix-Os-build-BZ-29576.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 3935b543adcb9a46ab79f8931bc489068b049378 Mon Sep 17 00:00:00 2001 -From: Adhemerval Zanella Netto -Date: Wed, 21 Sep 2022 10:51:08 -0300 -Subject: [PATCH] x86: Fix -Os build (BZ #29576) - -The compiler might transform __stpcpy calls (which are routed to -__builtin_stpcpy as an optimization) to strcpy and x86_64 strcpy -multiarch implementation does not build any working symbol due -ISA_SHOULD_BUILD not being evaluated for IS_IN(rtld). - -Checked on x86_64-linux-gnu. -Reviewed-by: Carlos O'Donell -Tested-by: Carlos O'Donell - -(cherry picked from commit 9dc4e29f630c6ef8299120b275e503321dc0c8c7) -Signed-off-by: Romain Naour ---- - sysdeps/x86_64/multiarch/rtld-strcpy.S | 18 ++++++++++++++++++ - 1 file changed, 18 insertions(+) - create mode 100644 sysdeps/x86_64/multiarch/rtld-strcpy.S - -diff --git a/sysdeps/x86_64/multiarch/rtld-strcpy.S b/sysdeps/x86_64/multiarch/rtld-strcpy.S -new file mode 100644 -index 0000000000..19439c553d ---- /dev/null -+++ b/sysdeps/x86_64/multiarch/rtld-strcpy.S -@@ -0,0 +1,18 @@ -+/* 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 -+ . */ -+ -+#include "../strcpy.S" --- -2.34.3 - diff --git a/package/glibc/glibc.hash b/package/glibc/glibc.hash index 16290461ac..4ce4c6f6d1 100644 --- a/package/glibc/glibc.hash +++ b/package/glibc/glibc.hash @@ -1,5 +1,5 @@ # Locally calculated (fetched from Github) -sha256 51b946f6c8dddd2b0c9902f7792ecf594497da6b0cc8fb9246fa30f108cbb422 glibc-2.36-66-ga1dc0be03c9dd850b864bd7a9c03cf8e396eb7ca.tar.gz +sha256 666482e657c319f7e139121121a0d97d303c65207b9f9730f42a3ee83c79f686 glibc-2.36-81-g4f4d7a13edfd2fdc57c9d76e1fd6d017fb47550c.tar.gz # Hashes for license files sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index bb7c9e9a05..354f035d33 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-66-ga1dc0be03c9dd850b864bd7a9c03cf8e396eb7ca +GLIBC_VERSION = 2.36-81-g4f4d7a13edfd2fdc57c9d76e1fd6d017fb47550c # 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 05db7fa423..6699840854 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-66-ga1dc0be03c9dd850b864bd7a9c03cf8e396eb7ca +LOCALEDEF_VERSION = 2.36-81-g4f4d7a13edfd2fdc57c9d76e1fd6d017fb47550c LOCALEDEF_SOURCE = glibc-$(LOCALEDEF_VERSION).tar.gz LOCALEDEF_SITE = $(call github,bminor,glibc,$(LOCALEDEF_VERSION)) HOST_LOCALEDEF_DL_SUBDIR = glibc From e6195c53041f5a8aa375b9715f90beb5188d33e5 Mon Sep 17 00:00:00 2001 From: Nevo Hed Date: Wed, 4 Jan 2023 20:57:59 -0500 Subject: [PATCH 0314/5754] Makefile: fix use of many br2-external trees The top level Makefile in buildroot has a recursive rule which causes the appearance of a hang as the number of directories in BR2_EXTERNAL increases. When the number of directories in BR2_EXTERNAL is small, the recursion occurs, but make detects the recursion and determines the target does not have to be remade. This allows make to progress. This is the failing rule: define percent_defconfig # Override the BR2_DEFCONFIG from COMMON_CONFIG_ENV with the new defconfig %_defconfig: $(BUILD_DIR)/buildroot-config/conf $(1)/configs/%_defconfig outputmakefile @$$(COMMON_CONFIG_ENV) BR2_DEFCONFIG=$(1)/configs/$$@ \ $$< --defconfig=$(1)/configs/$$@ $$(CONFIG_CONFIG_IN) endef $(eval $(foreach d,$(call reverse,$(TOPDIR) $(BR2_EXTERNAL_DIRS)),$(call percent_defconfig,$(d))$(sep))) The rule for %defconfig is created for each directory in BR2_EXTERNAL. When the rule is matched, the stem is 'defconfig_name'. The second prerequisite is expanded to $(1)/configs/defconfig_name_defconfig. The rule, and all of the other rules defined by this macro, are invoked again, but the stem is now $(1)/configs/defconfig_name_defconfig. The second prerequisite is now expanded to $(1)/configs/($1)/configs/defconfig_name_defconfig. This expansion continues until make detects the infinite recursion. With up to 5 br2-external trees, the time is very small, so that it is not noticeable. But starting with 6 br2-external trees, the time is insanely big (so much so that we did not even let it finish after it ran for hours); see timings toward the end of the commit log. We fix that by adding a single %_defconfig rule, which is now rsponsible to find the actual defconfig file that triggered the rule, by iterating on the reverse list of br2-external trees and then in main tree. Of course, now, there is no way for make to warn that there is no such defconfig, as it is no longer part of the prerequisites of the rule. So, we delegate to the recipe the responsibility to check for that. Timing (seconds) of `make pc_x86_64_bios_defconfig` with 1..1000 external trees, with make 4.2.1 (* with make 4.3), on a Core i7-7700HQ: #trees Before After 1 0.312 0.319 2 0.319 0.323 3 0.325 0.327 4 0.353 0.339 5 0.993 0.349 6 1.26* 0.347 7 9.10* 0.362 8 85.93* 0.360 9 n/a 0.373 10 n/a 0.374 50 n/a 0.738 100 n/a 1.228 500 n/a 7.483 1000 n/a 16.076 How to reproduce: #!/usr/bin/env bash N="${1:-1000}" for i in $(seq 1 1000); do [ -d "br2-external/${i}/configs" ] && break mkdir -p br2-external/${i}/configs touch br2-external/${i}/{Config.in,external.mk} echo "name: BR_TEST_${i}" >br2-external/${i}/external.desc touch br2-external/${i}/configs/foo{,_${i}}_defconfig done time make \ BR2_EXTERNAL="$( for i in $(seq 1 ${N}); do printf '%s\n' "$(pwd)/br2-external/${i}" done )" \ foo_1_defconfig Notes: the timings are very dependent on how much the CPU is otherwise loaded, but having a multi-core CPU slightly loaded helps maintain a high frequency on the siblings, and that can reduce the above timings in half! Best to try on an otherwise-idle system. Fixes: #14996 Reported-by: David Lawson Signed-off-by: Nevo Hed [yann.morin.1998@free.fr: - split long foreach - drastically extend the commit log - provide reproducer script and redo timings ] Signed-off-by: Yann E. MORIN --- Makefile | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 88f90cd2fa..efa0b2a7a0 100644 --- a/Makefile +++ b/Makefile @@ -1013,13 +1013,18 @@ oldconfig syncconfig olddefconfig: $(BUILD_DIR)/buildroot-config/conf outputmake defconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile @$(COMMON_CONFIG_ENV) $< --defconfig$(if $(DEFCONFIG),=$(DEFCONFIG)) $(CONFIG_CONFIG_IN) -define percent_defconfig -# Override the BR2_DEFCONFIG from COMMON_CONFIG_ENV with the new defconfig -%_defconfig: $(BUILD_DIR)/buildroot-config/conf $(1)/configs/%_defconfig outputmakefile - @$$(COMMON_CONFIG_ENV) BR2_DEFCONFIG=$(1)/configs/$$@ \ - $$< --defconfig=$(1)/configs/$$@ $$(CONFIG_CONFIG_IN) -endef -$(eval $(foreach d,$(call reverse,$(TOPDIR) $(BR2_EXTERNAL_DIRS)),$(call percent_defconfig,$(d))$(sep))) +%_defconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile + @defconfig=$(or \ + $(firstword \ + $(foreach d, \ + $(call reverse,$(TOPDIR) $(BR2_EXTERNAL_DIRS)), \ + $(wildcard $(d)/configs/$@) \ + ) \ + ), \ + $(error "Can't find $@") \ + ); \ + $(COMMON_CONFIG_ENV) BR2_DEFCONFIG=$${defconfig} \ + $< --defconfig=$${defconfig} $(CONFIG_CONFIG_IN) update-defconfig: savedefconfig From a92e9e5fb87caff46fbbe8f368564eddf4ff389d Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 8 Jan 2023 11:11:37 +0100 Subject: [PATCH 0315/5754] package/bustle: fix pcap-config call Fix the following build failure raised since bump of libpcap to version 1.10.2 in commit 6bee8635d90f3f9e3d04e03a9db2f37a387e077 and https://github.com/the-tcpdump-group/libpcap/commit/d0cba780dc2b2bb4f3ca9427d1a0f03479f45707: pcap-config: Invalid command-line option pcap-config specified Usage: pcap-config [ --help ] [ --static | --static-pcap-only ] [ --libs | --additional-libs ] perl -nle 'm/^Version:\s+(.*)$/ and print $1' \ bustle.cabal > dist/build/autogen/version.txt echo '#define BUSTLE_VERSION "'`cat dist/build/autogen/version.txt`'"' > dist/build/autogen/version.h /home/buildroot/autobuild/run/instance-2/output-1/host/bin/arm-linux-gcc -Idist/build/autogen -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 \ -o dist/build/bustle-pcap c-sources/pcap-reader.c c-sources/pcap-monitor.c c-sources/bustle-pcap.c \ -I/home/buildroot/autobuild/run/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/glib-2.0 -I/home/buildroot/autobuild/run/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/glib-2.0/include -I/home/buildroot/autobuild/run/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/libmount -I/home/buildroot/autobuild/run/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/blkid -I/home/buildroot/autobuild/run/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/gio-unix-2.0 -pthread -L/home/buildroot/autobuild/run/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib -lgio-2.0 -lgobject-2.0 -lglib-2.0 /home/buildroot/autobuild/run/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: /tmp/cc5SQkTV.o: in function `bustle_pcap_reader_finalize': pcap-reader.c:(.text+0x254): undefined reference to `pcap_close' Fixes: - http://autobuild.buildroot.org/results/f3dcb617488e4172e639e3bd51a93bc9822ea186 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- .../0001-Makefile-fix-pcap-config-call.patch | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 package/bustle/0001-Makefile-fix-pcap-config-call.patch diff --git a/package/bustle/0001-Makefile-fix-pcap-config-call.patch b/package/bustle/0001-Makefile-fix-pcap-config-call.patch new file mode 100644 index 0000000000..b02bea641b --- /dev/null +++ b/package/bustle/0001-Makefile-fix-pcap-config-call.patch @@ -0,0 +1,45 @@ +From 77e2de892cd359f779c84739682431a66eb8cf31 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 8 Jan 2023 11:03:52 +0100 +Subject: [PATCH] Makefile: fix pcap-config call + +Fix the following build failure raised since libpcap version 1.10.2 and +https://github.com/the-tcpdump-group/libpcap/commit/d0cba780dc2b2bb4f3ca9427d1a0f03479f45707: + +pcap-config: Invalid command-line option pcap-config specified +Usage: pcap-config [ --help ] [ --static | --static-pcap-only ] [ --libs | --additional-libs ] +perl -nle 'm/^Version:\s+(.*)$/ and print $1' \ + bustle.cabal > dist/build/autogen/version.txt +echo '#define BUSTLE_VERSION "'`cat dist/build/autogen/version.txt`'"' > dist/build/autogen/version.h +/home/buildroot/autobuild/run/instance-2/output-1/host/bin/arm-linux-gcc -Idist/build/autogen -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 \ + -o dist/build/bustle-pcap c-sources/pcap-reader.c c-sources/pcap-monitor.c c-sources/bustle-pcap.c \ + -I/home/buildroot/autobuild/run/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/glib-2.0 -I/home/buildroot/autobuild/run/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/glib-2.0/include -I/home/buildroot/autobuild/run/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/libmount -I/home/buildroot/autobuild/run/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/blkid -I/home/buildroot/autobuild/run/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/gio-unix-2.0 -pthread -L/home/buildroot/autobuild/run/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib -lgio-2.0 -lgobject-2.0 -lglib-2.0 +/home/buildroot/autobuild/run/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: /tmp/cc5SQkTV.o: in function `bustle_pcap_reader_finalize': +pcap-reader.c:(.text+0x254): undefined reference to `pcap_close' + +Fixes: + - http://autobuild.buildroot.org/results/f3dcb617488e4172e639e3bd51a93bc9822ea186 + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://gitlab.freedesktop.org/bustle/bustle/-/merge_requests/21] +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 8865819..721e714 100644 +--- a/Makefile ++++ b/Makefile +@@ -2,7 +2,7 @@ CFLAGS = -g -O2 -Wall -Wunused -Waddress + DBUS_FLAGS = $(shell pkg-config --cflags --libs dbus-1) + GIO_FLAGS := $(shell pkg-config --cflags --libs 'glib-2.0 >= 2.26' gio-2.0 gio-unix-2.0) + PCAP_CONFIG ?= pcap-config +-PCAP_FLAGS := $(shell $(PCAP_CONFIG) --cflags pcap-config --libs) ++PCAP_FLAGS := $(shell $(PCAP_CONFIG) --cflags --libs) + DESTDIR = + PREFIX = /usr/local + BINDIR = $(DESTDIR)$(PREFIX)/bin +-- +2.39.0 + From f37af1800c82ae255c202ea8cfc7e11a65d489f8 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 30 Dec 2022 18:46:46 +0100 Subject: [PATCH 0316/5754] package/crun: fix static build Fix the following static build failure raised since bump to version 1.7.2 in commit 6987b92da510a8c8b9534a22506850c163d0f035 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 Signed-off-by: Fabrice Fontaine [yann.morin.1998@free.fr: make it an actual backport now] Signed-off-by: Yann E. MORIN --- ...src-crun.c-fix-build-without-dlfcn.h.patch | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create 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 new file mode 100644 index 0000000000..104c19a40f --- /dev/null +++ b/package/crun/0001-src-crun.c-fix-build-without-dlfcn.h.patch @@ -0,0 +1,39 @@ +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 + From a0e134a05342507bd9ac47da03abca4c9c113a64 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 30 Dec 2022 18:53:50 +0100 Subject: [PATCH 0317/5754] package/crun: needs fexecve crun unconditionally uses fexecve since its addition in commit 530d6f661e506a4774b7236cb93d65f669adbc92 and https://github.com/containers/crun/commit/ce4dfbb97a8a05bef125030eaa6c46c07a5f9344: resulting in the following uclibc build failure: /tmp/instance-11/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arceb-snps-linux-uclibc/9.2.1/../../../../arceb-snps-linux-uclibc/bin/ld: src/libcrun/crun-cloned_binary.o: in function `ensure_cloned_binary': cloned_binary.c:(.text+0x1006): undefined reference to `fexecve' In 6e3f7fbc072c (package/runc: add upstream security fix for CVE-2019-5736), we made runc unavailable for uclibc toolchains, and crun uses fexecve for that same reason, to fix CVE-2019-5736. So, also make crun unavailable for uclibc toolchains. Fixes: - http://autobuild.buildroot.org/results/e1f4ef2b392c0e7161390ba0f97d6eef3bd12e9c Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/crun/Config.in | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/package/crun/Config.in b/package/crun/Config.in index 5def7001c1..fa0894e126 100644 --- a/package/crun/Config.in +++ b/package/crun/Config.in @@ -1,8 +1,12 @@ config BR2_PACKAGE_CRUN bool "crun" - select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL + depends on !BR2_TOOLCHAIN_USES_UCLIBC # no fexecve + select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_MUSL select BR2_PACKAGE_YAJL # libocispec help crun is a fast and low-memory OCI Container Runtime in C. https://github.com/containers/crun + +comment "crun needs a glibc or musl toolchain" + depends on BR2_TOOLCHAIN_USES_UCLIBC From 4d5fd84496ac0ec65e7aed73a9386ab62f2a2c19 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 30 Dec 2022 19:08:43 +0100 Subject: [PATCH 0318/5754] package/crun: add libgcrypt optional dependency libgcrypt is an optional dependency which is enabled by default since version 1.7 and https://github.com/containers/crun/commit/dd310aaf5aee336d0f6236c1c2add7b7cb030482 Unfortunately, thetre are no associated --enable/disable flags; it all depends on auto-detection. Signed-off-by: Fabrice Fontaine Reviewed-by: Christian Stewart Signed-off-by: Yann E. MORIN --- package/crun/crun.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/crun/crun.mk b/package/crun/crun.mk index 8c9993993c..fd8bfb0981 100644 --- a/package/crun/crun.mk +++ b/package/crun/crun.mk @@ -26,6 +26,10 @@ else CRUN_CONF_OPTS += --disable-caps endif +ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) +CRUN_DEPENDENCIES += libgcrypt +endif + ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) CRUN_DEPENDENCIES += libseccomp CRUN_CONF_OPTS += --enable-seccomp From 680f28af58364f4152f3d9b582b312538fa0e500 Mon Sep 17 00:00:00 2001 From: TIAN Yuanhao Date: Thu, 6 Oct 2022 07:07:54 -0700 Subject: [PATCH 0319/5754] package/crun: impersonate runc crun is a drop-in replacement for runc, so we can use the former to impersonate the latter when it is not enabled. To do so, we create a runc symlink pointing to crun, when runc is not enabled. See: https://github.com/containerd/containerd/discussions/6162 Signed-off-by: TIAN Yuanhao Reviewed-by: Christian Stewart [yann.morin.1998@free.fr: split into its own patch] Signed-off-by: Yann E. MORIN --- package/crun/crun.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/crun/crun.mk b/package/crun/crun.mk index fd8bfb0981..ddb96a0b33 100644 --- a/package/crun/crun.mk +++ b/package/crun/crun.mk @@ -44,4 +44,11 @@ else CRUN_CONF_OPTS += --disable-systemd endif +ifeq ($(BR2_PACKAGE_RUNC),) +define CRUN_CREATE_SYMLINK + ln -sf crun $(TARGET_DIR)/usr/bin/runc +endef +CRUN_POST_INSTALL_TARGET_HOOKS += CRUN_CREATE_SYMLINK +endif + $(eval $(autotools-package)) From d0ecb9b2803b5b0b293acd7a5a6bba1ed1e3feab Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 8 Jan 2023 17:05:54 +0100 Subject: [PATCH 0320/5754] package/containerd: support crun as runtime crun is a drop-in replacement for runc. If crun is enabled, but runc is not, we already install an impersonation symlink, so we do not need to force runc if crun is enabled. Still, runc is the default if crun is not enabled. Signed-off-by: TIAN Yuanhao Reviewed-by: Christian Stewart [yann.morin.1998@free.fr: split into its own patch] Signed-off-by: Yann E. MORIN --- package/containerd/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/containerd/Config.in b/package/containerd/Config.in index 0e3a55ef39..e69dd6768a 100644 --- a/package/containerd/Config.in +++ b/package/containerd/Config.in @@ -5,7 +5,7 @@ config BR2_PACKAGE_CONTAINERD depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_TOOLCHAIN_USES_UCLIBC # runc depends on BR2_USE_MMU # util-linux - select BR2_PACKAGE_RUNC # runtime dependency + select BR2_PACKAGE_RUNC if !BR2_PACKAGE_CRUN # runtime dependency select BR2_PACKAGE_UTIL_LINUX # runtime dependency select BR2_PACKAGE_UTIL_LINUX_BINARIES select BR2_PACKAGE_UTIL_LINUX_PIVOT_ROOT From 359205b4f5b151a6ddff93cd75fd569a6f5c54b4 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 6 Jan 2023 18:04:34 -0700 Subject: [PATCH 0321/5754] package/hiredis: enable host package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The host-hiredis package is needed for the upcoming ccache update. So, being a dependency of ccache, we can't use ccache, so we must unset the options set by the cmake infra (this will be true only when we eventually bump ccache, but hiredis builds very fast even without ccache so we don't care about ccache even now). Reorder CONF_OPTS assignments so that comments apply equally to the host and target variants. Cc: Dominik Michael Rauh Cc: Anders F Björklund Signed-off-by: James Hilliard [yann.morin.1998@free.fr: - add Dominik and Anders in Cc to ack they provided inspiration - use -Ufoo instead of -Dfoo="" (as per Dominik & Anders) - reorder CONF_OPTS assignments ] Signed-off-by: Yann E. MORIN --- package/hiredis/hiredis.mk | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/package/hiredis/hiredis.mk b/package/hiredis/hiredis.mk index f79b6c757a..a2f7627b58 100644 --- a/package/hiredis/hiredis.mk +++ b/package/hiredis/hiredis.mk @@ -11,9 +11,14 @@ HIREDIS_LICENSE = BSD-3-Clause HIREDIS_LICENSE_FILES = COPYING HIREDIS_CPE_ID_VENDOR = redislabs HIREDIS_INSTALL_STAGING = YES + +HIREDIS_CONF_OPTS = -DDISABLE_TESTS=ON +HOST_HIREDIS_CONF_OPTS = -DDISABLE_TESTS=ON -DENABLE_SSL=OFF + # Set CMAKE_BUILD_TYPE to Release or the libraries will be suffixed with "d" -# resulting in a build failure with collectd -HIREDIS_CONF_OPTS = -DCMAKE_BUILD_TYPE=Release -DDISABLE_TESTS=ON +# resulting in build failures when linking. +HIREDIS_CONF_OPTS += -DCMAKE_BUILD_TYPE=Release +HOST_HIREDIS_CONF_OPTS += -DCMAKE_BUILD_TYPE=Release ifeq ($(BR2_PACKAGE_OPENSSL)$(BR2_TOOLCHAIN_HAS_THREADS),yy) HIREDIS_CONF_OPTS += -DENABLE_SSL=ON @@ -22,4 +27,11 @@ else HIREDIS_CONF_OPTS += -DENABLE_SSL=OFF endif +# We may be a ccache dependency, so we can't use ccache; reset the +# options set by the cmake infra. +HOST_HIREDIS_CONF_OPTS += \ + -UCMAKE_C_COMPILER_LAUNCHER \ + -UCMAKE_CXX_COMPILER_LAUNCHER + $(eval $(cmake-package)) +$(eval $(host-cmake-package)) From 9fba87b8d708caa51ac674a56b9f2a50ed5fdc36 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 6 Jan 2023 18:04:35 -0700 Subject: [PATCH 0322/5754] package/zstd: disable ccache for host package We need to disable ccache when building host-zstd as the upcoming ccache update depends on host-zstd. Signed-off-by: James Hilliard [yann.morin.1998@free.fr: introduce HOST_ZSTD_ENV] Signed-off-by: Yann E. MORIN --- package/zstd/zstd.mk | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/package/zstd/zstd.mk b/package/zstd/zstd.mk index e8f6315222..73bb97a793 100644 --- a/package/zstd/zstd.mk +++ b/package/zstd/zstd.mk @@ -96,14 +96,18 @@ define ZSTD_INSTALL_TARGET_CMDS endef HOST_ZSTD_OPTS += PREFIX=$(HOST_DIR) +HOST_ZSTD_ENV = $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) + +# We are a ccache dependency, so we can't use ccache +HOST_ZSTD_ENV += CC="$(HOSTCC_NOCCACHE)" CXX="$(HOSTCXX_NOCCACHE)" define HOST_ZSTD_BUILD_CMDS - $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) $(HOST_ZSTD_OPTS) \ + $(HOST_ZSTD_ENV) $(MAKE) $(HOST_ZSTD_OPTS) \ -C $(@D) zstd-release lib-release endef define HOST_ZSTD_INSTALL_CMDS - $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) $(HOST_ZSTD_OPTS) \ + $(HOST_ZSTD_ENV) $(MAKE) $(HOST_ZSTD_OPTS) \ -C $(@D) install endef From 006ea057e98afddd7d2b92e118ebefa8bdeb9a6d Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 6 Jan 2023 18:04:36 -0700 Subject: [PATCH 0323/5754] package/pkgconf: disable ccache for host package We need to disable ccache when building host-pkgconf as the upcoming ccache update depends on host-pkgconf indirectly due to host-cmake depending on host-pkgconf which will be required due to host-ccache migrating from autotools to cmake package infrastructure. Note: host-pkgconf does not need _AUTORECONF = YES, so it doesnot depend on any of host-gettext, host-automake, host-autoconf, or host-libtool. If it ever nees to in the future, then those should also be made to build without ccache. Signed-off-by: James Hilliard [yann.morin.1998@free.fr: add note] Signed-off-by: Yann E. MORIN --- package/pkgconf/pkgconf.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/pkgconf/pkgconf.mk b/package/pkgconf/pkgconf.mk index 5d65f69c10..e9587fae6b 100644 --- a/package/pkgconf/pkgconf.mk +++ b/package/pkgconf/pkgconf.mk @@ -11,6 +11,11 @@ PKGCONF_LICENSE = pkgconf license PKGCONF_LICENSE_FILES = COPYING PKGCONF_CPE_ID_VENDOR = pkgconf +# We are a ccache dependency, so we can't use ccache +HOST_PKGCONF_CONF_ENV = \ + CC="$(HOSTCC_NOCCACHE)" \ + CXX="$(HOSTCXX_NOCCACHE)" + PKG_CONFIG_HOST_BINARY = $(HOST_DIR)/bin/pkg-config define PKGCONF_LINK_PKGCONFIG From 75519b19c8d0763fc02647c6df55c67fbe3ac89e Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 6 Jan 2023 18:04:37 -0700 Subject: [PATCH 0324/5754] package/pkg-gemneric: don't add host-ccache dependency to host-{hiredis,pkgconf,zstd} Now that we made those three package never use ccache to build, we don't need to add the dependency to host-ccache for those packages. So far, this is harmless, but when we eventually bump ccache, those packages will be actual dependency of host-ccache, so we will then really want to not have them depend on host-ccache. Signed-off-by: James Hilliard [yann.morin.1998@free.fr: split off into its own patch] Signed-off-by: Yann E. MORIN --- package/pkg-generic.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index f24e03a325..f2bea01d7d 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,$(1)),) +ifeq ($$(filter host-tar host-skeleton host-xz host-lzip host-fakedate host-ccache host-hiredis host-pkgconf host-zstd,$(1)),) $(2)_DEPENDENCIES += host-ccache endif endif From ac2b26fba2ad06fadf14244505319dc5c272906c Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Mon, 9 Jan 2023 17:30:17 +0100 Subject: [PATCH 0325/5754] support/download: fix cargo vendoring Commit de4cf253752d (package/{rust, rust-bin}: bump to version 1.66.0) forgot, despite the big comment above the version strings, to confirm that the vendoring was still working. Previously, we were adding the vendoring equivalence manually, but in commit 04154a651729 (support/download/cargo-post-process: cargo output for vendor config), we switched to using the output of "cargo vendor" (on stdout) to support cases were the vendoring equivalence would be more complex (e.g. when using crates not hosted on crates.io). With rust until and including 1.65.0, "cargo vendor" would output (for crates.io crates) the same output as our manual fixups, except it was preceded by an empty line. So, to avoid recompting all our hashes, we added a tweak to strip away the leading empty line in 04154a651729. But rust 1.66.0 includes [0] which changes the output (on stdout) of "cargo vendor", where the first empty line is no longer emitted. This means that our tweak for rust 1.65.0 now strips out an important part of the cargo vendor output, which renders the archives invalid, and thus generates different archives, which fail to validate against our hashes. Fix this by doing what the comment in the post-process helper states, and just keep the whole output of "cargo vendor", by just removing the "tail --lines=+2". Since that comment is no longer meaningful, we drop it too. Now, all our 6 cargo-based packages, as well as our 5 python packages that have rust code, can be vendored again, without changing our hashes, but most importantly, with valid archives. Still, we keep the comment above the versions strings, in the hope that a future bumper will notice and be more careful at validating the vendoring. [0] https://github.com/rust-lang/cargo/pull/11273 Fixes: http://autobuild.buildroot.org/results/bea/beac7674bbc9fd2f8777b5861f65afee9c485753/ (bat) http://autobuild.buildroot.org/results/d1e/d1ec1ebbde115628a4b8b9099544347242a97c1c/ (dust) http://autobuild.buildroot.org/results/f96/f968be895be9ca98b314fdd688ef8d3bdf4e5dfb/ (hyerfine) http://autobuild.buildroot.org/results/a0c/a0cdb6cc9493f5248d98f98b13da854e12adc2be/ (ripgrep) ... and so many others... Reported-by: Romain Naour Signed-off-by: Yann E. MORIN Cc: James Hilliard Cc: Simon Richter Reviewed-by: James Hilliard Reviewed-by: Romain Naour Tested-by: Romain Naour Signed-off-by: Yann E. MORIN --- support/download/cargo-post-process | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/support/download/cargo-post-process b/support/download/cargo-post-process index 186e9eb69b..21a6be8dbe 100755 --- a/support/download/cargo-post-process +++ b/support/download/cargo-post-process @@ -25,25 +25,11 @@ post_process_unpack "${base_name}" "${output}" pushd "${base_name}" > /dev/null # Create the local .cargo/config with vendor info -# -# The first line of the output to stdout is empty. -# So skip it to have the file start with the vendoring -# configuration (`tail --lines=+2`). -# -# NOTE: -# There is a patch for cargo to remove the first empty line: -# See: https://github.com/rust-lang/cargo/pull/11273 -# -# The patch already landed in +nightly and will end up -# in +stable soon. -# -# -> When updating rust/cargo, the call to `tail` must be removed. -# mkdir -p .cargo/ cargo vendor \ --manifest-path ${BR_CARGO_MANIFEST_PATH-Cargo.toml} \ --locked VENDOR \ - | tail --lines=+2 | tee .cargo/config + | tee .cargo/config popd > /dev/null From fce9f0eea00ed9aaeca12c1529ea380617baa477 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 11 Jan 2023 22:21:11 +0100 Subject: [PATCH 0326/5754] docs/website: update sponsors.html page - Thank Smile for sponsoring the Buildroot Developers Meeting of February 2023 by providing the meeting room - Thank Armadeus and Logilin for their financial sponsoring in 2022 - Move older sponsors to the "Past sponsors" section - Remove section about the Buildroot.org domain sponsor, as that sponsoring ended in 2019. Signed-off-by: Thomas Petazzoni --- docs/website/images/armadeus-systems-logo.png | Bin 0 -> 43363 bytes docs/website/sponsors.html | 69 ++++++++++++------ 2 files changed, 46 insertions(+), 23 deletions(-) create mode 100644 docs/website/images/armadeus-systems-logo.png diff --git a/docs/website/images/armadeus-systems-logo.png b/docs/website/images/armadeus-systems-logo.png new file mode 100644 index 0000000000000000000000000000000000000000..9b6080fb1347abd9f13e7bb70e11665036f9188f GIT binary patch literal 43363 zcmeFYbx>Tno~8nfZjByoOduHwNA7cn_i1tz&OeoI z^NlW_$o<|2bQ^K|`4j$rZ0CLO(by^JU%a}vtjn+4Tsbmwyu0C3{KEQrwfwA(vikM2 z@lM^tZN3BEYolcCk7rYhaf6F->W`09erv|>DaID3R}vEHzvOKkJ>_$q4;|F4K6f5> zKXzbuY24-D6_+H61eD>ueg*!OVvy~Jdnf#{;MIN2*@~~|`?c7>$9Fkjo=K|rZ7S{^ zIe%$re+jtNXr9y=U!D3kdU2F|rIC1aTNm)q{%W_3^5a=PWx(UkYWJ6zfcO4qT(4Pw zG5`AIdUkLt%B#ZdNmmM#fU+>*G`>XZ`<+IsjBhtmx3E?hbJ%u^(c`*F zD7f8Wcr%pPq5jrAVgkn%NJ#po%Lt zXSy| zsTz(>XccTMBM!J?Fx2{r{*4Ovrzy?7w41dvr^vP~t^E1pl7oUR@GkF7kG9kKA3NA( zGOqE7DpF*thJL(l33F%a?w~bc5{@vuoVbt0zs+RL<*lepJ^t}Uzx(pMg7<>0R?TZH z<5fk;iClX}tu>IqUg{l#&29Ql#iDMckp`_qh*e_Wn1CK}{c2`yqNiz$)3+O*@TKT( zMV_uN2iBmU&26`Z*{(t;tsdOCqlk{dFpU;W*zpuV6!Lnc(Sp5it*-gD^PpF`4k^R$ zk{d6nhnn@*`gF5e)RQ_Tol`$#90uQXKVi)$gQ8F1+x-^&b#bZ{7&bQFUxs^Jg3_)* zu&U9!DfXZb zv2S6SN)A2PrL@0&sx)7ss%j|rWbSm%Hp=RTp^aXoFFt?Og!7Xsh(#851{M2Tvs({#X^OOEq6M$X>RV;jh8l#Sc&}eb2|w;g%iG&# zhLMm3o9ej2%fc_<9ys0)m*toizg?71C* zjj)lxtFoFpSv84w7>;lSRHmM}`RCY($;VREw9pK-IsEbE&AFhRnk!{;bMh=w z4C5YZH=kt{Qcm3h3?c z9%Fp&a0&`~T0P|N(Fg|O=vnz=eX{;YK5<*D=jPv;;c&f3`bP`sKzCn8h<5?R%$N%Y zbvzGka{y5Xiq|0JtdL+JPL`J=y#7W8-@r(d+HfKaediZsYRr6I^Yw}+z`UK&vH{ZD zXeu~2yb<%^&@>D?l(UZv<8-l-m7QOD(VMsugyf@Pa&d!+=15dpCP@4g6k2l^BJ6wo zsecN*`8B^dXbEe%O~r+KM6>&$k}G4cvS24LDSHAva)v3YNjdWwV6o$-T<$0ly-CAM z{aIcv{LOwSCr-?6`zIQ<1c#%rAsE^qQ!2*^CM|2ii^zo#4W=D%NdfBN%um4Ub5Z=) zNvUG>GzEwOujYc$yc)nV_T42!S|?aIP99qK2u-cwFkPwIl0vmz`%o{dBxH(B5tHpu zn|<*Z-5vud?`QQXCtN33t_-QVpBIr2QPSU0Y9!k4nN7dij5x>-027bCX6$=dqx_;Y z7DJ{_p>B1f=~qIEi{d*)Pj@u6OP{};>~hqj`zjXoTlz;vCfqwU<-w{8N}EURPf={T z;uKceQ55`}U!`My-(pcIdC6qQ1EDEwkt)kAh1HUvPDf=;>5{zS{iZdz)|zVk(pj9! z*YC3T>@dA=RWthX(X9F0#GokOXv+=@>YZIHMG8uldaObZr;(fY_wRrtC#dRf{cxtP z#WsX`o25d+`*jSMPUzz3@KK2m(#@Lk|U+${lP{e5K$n z?1uBWLJGlz?Y$aB4JlZ^FtCiS!zG43vz-&YmCb__s}LHFIc=*KSVgSHUX{S^ok?Zp z%Yug@bT*^zW1z6^3kkfn+N4Ce+emtwCgzYmod-H-Q>W98(G{ zO=lf)!xW@y;=YKdgcudHIOCt}%fGFLgIgu;$_H%Kb(`Kp{Q$P4)kw@ft~`unY;)LQ zVH`hj;^21Z+=}5=3(g)B1A|+@OwUCsv%Ad^f~T*(BaDAI@^FHP!qoV@N(199PQ2F; z-H(l{qklV*Xg_TF*0eZ4Rk&arX$UPU{ouFJ=8|lk$$!F)b{(E%Afs z(^1ZMQyX8EzGFg~Af#RED-uXRG!g&{02L=X4_ge%bptVL%Lj^%bN2y-v56-5a9}!! z6B5`UUOwYzI&(g;8viK`59eHW)#BYS!AX8$IEOz!+)UnLZ)ms>^r{K!vT8iNF?X+( zeqmrOB#F?=aW`H}@s@VxDVh0 z41TjqGvpa5pxkDl%12Yp4}0yht^U*tCyAy44%&hDncvFbHL%E+&umq#_1gT6$I1|z zR+v-Y(}|A_kUW#RPf?FN?BPJ_SC$u#x`+wW{+=r9#mw;bYL-_1Emw#h0LfsV*)dL6 zNw)++{9aUj4uHWa8BF#o%oz4CoNomGF$njfwdz-l5a`a_EnmWFjvt2l-m0HQ=1sQK za(#Mic!+Y~3`8BNksePfvrwczD7P2x^Wc4d*#!I!c_xfprmYV`j9)R@*!83`(s2Db zg|tCq2p@9rt*J#i8Vwh=n#0=$qQ~{%r&KCLHx@fIk2K{ArHI54W8&O7epa}0bgg)p zpm+(+1zl_qUw_EkK~3tWX>3<}^(7>ccMR*TIy#|NgE%eH6JJYzxiG=(zGu&(l^`jq z2{8~yR@(#tjCOsN#TQG}s)RV+RVj)3e;gtin9v~W^rv04+KfNv0Y@7ngjy@WJ&0>j zOpNPdS4Q%o6Xto=AVdn`&v56d;KPrq8@hX(V!Ww#p@u}}!1h6dY8tjKfC5tYuqGrA zfmGdd)|iai{S}z#&55R2KikdaQXa`ei8a<1-Cc~RD-M+IV*J-1`W5UA44BJhyfu2Q z_$ho)A4LPFkT&w$l5bE=&eq9#Rze=P1g?tob_f)n1^FcCm%{pavbp*2Fo(SuzXJNZ z0+~#)K{Bz)mfmqFj&aWYInHA1i^tgJut;+79x&*S^PTmhk~l_>kP;x$E+}Q2Ldbd) zSM8K-qv(5nd}XK!#V9bC9Z1YZ1~G$CR-z4rU40i%!eu|YQew!M1pgJlQyE_Z`%WZ} z0s{`6tavWi+ED(tUN%hjSGvJ%`j8FbbE^%Rey0oZQZJCEp`=7$-6OS#Q*Ds1G}aVT zS;8QS?_2392uoTplFNau<7sSpbFg`%Egdqdb1>~=#Ct<@ckI?zD)A{7OY9s&S?1!3 za3Se*Fgm%)s1AjM6BxPhVb*N?=Bcd9Xbqud+Ava~OgK##aUO}UN!{5=w|Q9zh`6_Z zV0|mCmJ362@%@THRk2TR+ENA?55gLdhw6%mBcA7f$@WsWrJ{35N*E*Ab!h@5Tk82> z)sqq|2+wcLu+{Z(Yr%Z4M;8hwtq2su8BMa`>%u-(_)eRSJVcK%2V~D@A!^(}FAt?R zR>3k)-X_k7j6&+B8|?DLe#NNK8R<;h1wkza3srr?at;~#r4t|ZDkbKN#zL|OX`9mN zMYJYu%MXTg<|Le>f(56~ns+q@xbVGL{{0e^#zoRs*o}ZWIjh>?=fnlhTyq)J{=j5L zF)mm(LP`&8briiLh07RqIYgLJxM^``Jyu#d(}7M5`%88u0owV9hc%KVsYVjGZ(yfM zabS}78?79^P_4woDZ%puWEBYbv9mG1R^7s_WhAypR636+-m#b@JzL$;;Ac!7If%r5>a zs7?rxfELnNW33vuKS;>W6M|?j49h6~YYwCDJX;nqBHQ9b4?(+b;{=S>a-m8Z_b^xi zq%ZGw3J`{y$<+3B3GqTqXsZkz_82G7+a;*@35qsBRW7^j7+fI@u3&YAozZRayJN zmGc~t>Zi0Tj%6HXL6cq7U<^tE0bQx^xpF_K6$)NFPQpVJDQM75;GL26 zusQ2x-)I8D@oL~-(N3ze;_c3rDEDbLDrkpwadWE4Y|;t6#*@=@2kwx!$8@W zdg9^qi^{_;Upu)oEFJU*=_9x}=Lw=*?QVpVxL-IbV#O77&+W5Gw`Vr;o$%c4^TC5r zyvewLY~--Js{rk7K<-U)JuyJ^a&5XebL1M1?t<{t+!O?ch%uKgm z#=q3S*Q=_(w|y<1wPE(-w%X$7X{xjM5B+SpdztLb^6piUM<-jk55;Op(uZSh0=0OT z#j~^`RPf>61);`3O>)760P0UVh50{+xbXX986YxFi9jXam7Ke@>Rfuvke?Wz)cbcp zOM(2~+-`y@HiE7=Jsw*b7{r>o-j@Mz-`#z4DHJejBXMa)uHP4|lL$i_cV^u*Ta*~K z@mh!BwAX49mj!Je(H9CEEtK9QA4p++qYdWQF4KcUL%u}AI1T|+{jk|&A~qm}Nr(aW zzeN{*l?{^d#d(W`wY_DCLU23KWVNqO=Vs9H4%r|B$yh(e*;Z02xd)_(vdf!B#^Z(* z=us!$HL>>HOmf5x`3y0k^Ty>MrluW)<;@j0lsH~UQx;r`E%n~2R|mZSarq91MH>U! zkGGC$xA6(P_|sy2rd7;5wR{Ynh^7a3?dRrv9k*%Xckp0e*bEA$Au>l6VpArCOB-~3 z)h3=wLcwo=n$W~-8@R2q^@!U@ZZqH}o=`NDmj3vsKEm~bTynP(R6J$5DTSrIxarfC zcxp#hp}W|?P*s+0un@rvCQyO8ev}mW0oIO5jg87tHa0oOkHOQLKmnmtEj+2x5hY6N zLOj(L!&zt_fQIPmg)}SxDgr!}MWu(egdAe4qPiEGV~LBme#Zm&nS)A#r*|%jY4vfA z9l`y+!kSqdn=)<#vr?aecKO(-%VSQ)iFqxM9qqed7j+`=HuxN9_w1xEVC-~82oL!4 z{EJ+HIg*t{zjZx0wN~g;0WwG)8tU27h{o`J5i_%XAAX~PX)4h{fv2TZzd1B{s=FI! zDn`hiqHQWa<}aJ;sx}QtwKqgkj4f~kfkVVq>C{8uFL9iP38D~Os4NdKH`x#7H&$s^ z87T`UmQR3vQkMlxV4`32h>(uSBsP{n@Ibw&$>6s@d4bO0pYAx3sq)e2@WgM*+FOxI zGt4=?n5+VJ$>BO=ND-U?&r0Z!i;(DL5PDcdeja?F;MM5jsZT^(St;=@}N18gPGQh(caot^7PyBfJbT(56@s0x1Vhx!$- zO7fcgm|q$>{6=aHS%@&1_psdEs7|)!;G~TMo^8Rww8AVp?~5(TlQ>b6sMpH_g>Lod zPH84&U0wyxb*Zph)s4VdDTyw`xUYzJ4cXIXA)Yt1@8(EK`000pBy-h!l#-seH(HSO zf6~pJR}&3zJ164w?K2kC^{9Qc66v(A=#2wvnXMhpzCmFT4*Fq4Wvby4w#E zlFLjuT!OjUaEC>Q%A6jg{Kh7|N=bc73|(;JfL!-$gz1m+^|cc#v7M&RquDIfJuwHF zfRAbt<%)CQ9)&xHvo?Y=xF!SS)VH(KiK|)_^(QMqnD3)5AhjDyhcDrY*oSFLzvxfJyy41I^{#il@egbcYs#wjTmeE zx8J_a+DNSoiq{reu!u?Q0bf2pfkC!nb=R6IQDmBycP?HQS)G!DEnhB1US^br^ac4a z*Qq)aE*ST~R~wR7&;G6h8LP_T6F3}=!wa@o2?6}1lMqg(;7%n!1o35@juGi37E<^T zvG)6^Pn;Z-z8#rnRZqhtkZd{JmtIg4`}Vd~wpG^>UfhZLNy!C{+^?s{&VJLXeNjGO zcv-Ej*M2PYh-pBn15`KEOIv@vnlQMlyQ0nu)g=G8qDEC{LXL{xQSvmu;Rgmr{CI*> zL0^`==U>3M?v@e+b()#7jshGJdsWeW7$y)$smUZpSCeST&);4uI3u4}%TiD>zb82k zM{>-+Aa3`twY(hFR74TZz6cAc?h0CP>^?~njyeX_$%jw5f%OGjOy!2llE{Wt<%VpC zDXwPh$np^2t&l|q=PZI8ZYXL3Tk`ddZnHuQ+R~U2^n&2UQK{h=3*pi$xKW}};dq^Q zC~GvPYjmTkNhYnwka9vplKUe(gq#F`(gDRj;}^krBKK82g)#&T_@(H_vLCA^ebff% z<_=bMj;}DpnvGA4Keehkk}S#yI|8S!Ui!!k18r z^mUTDnl~I9ZRf3v;XVU|ps2T`*zd_qEoUP^tP~ow+6KbO74MS#eYX6w5hGs3U@`}!v=MI4YomEW3rrRc86rHlO&u$fA^#-_xIRwhuCce?8tZC!;oFSxoS#3 zQj6>%ShPNW+rm)%gkl0gTV~ux>j%(fFa`2+gI&Y(d}rlh*VTijAZNphHFSlAr#xFd z!Q0eL-`bnBsENVT#=&ig7)PL$#tv1u^T9!K7M3FhBxTtw@dyifss11FvczHs2INek z)e$REp;qnI8YJ`mdmq!G@YiuxeO5l|1c`8A9(;+I1MHG%=|!KuyGfO;5F|+l8RJBh zhlcS7*`SqsprW^+;5H_?IT^*os^%3RmMhbD)7%HfU;Mb!8N&GBCq#I+ji3c@6u*pP zBQF=m_baFv+l`vPOzmFSey&M>pg2zXF#(m*I$B>MsaX8!J}0N}@N)i`{3qcSxj02T z`HH*xftCcHO@=0FbylqL;!Z4=>$^p4{ObB4&%#VfY)MCG_GBr(6p1F6@BvX=X=G27 zHKRO*Rc>J=T`I^4LH}zo9`Qhn=^MG~a_hGEsC~dShB8wO_Cx5XgCD<~_}UYMx>XW$${RW?acJqA#~YO5_E(y26L6yEE4Upd(Z@Yfsa z&@QP6I2e#TC6SDC1tQvE88+SbaJ{m(a=XWRnAE8@mG`lnK1fZ7-xJ*fam|D3 zB&5Jus^*$LW6Ie&5!#80O8&CQ9z}LMujh$RJ-LXVDqS_(wHcR>PY6QdwOoi_v*^O9 zGQ{$FwWAi$d-B)Q(6gGixjV!(x6{Fsre*jJXR*CMqe^R%O+Q*abO;cuVgrn1)gVi(=9$*bo~%f z0O!;M3c})R{+4}dZG_;G_o)D{*1;!cvd*^e)f+!y#R$o8*I2eu!eK-N3B_==KN;=yukwU=J6xIrM+jYipm&w?xwO2WbulJ##B|O@5 za0x{|=@{fd5N8YX_Ib7z+WkELR3>ou>_RJa%DeguTc`uHRWC8qemTtzvzC%lm6wwG zufyAyBikJRBvEjmDqfh1en}BN0&Aooq+FRGI$F>MKU$S~4z&i9*?EPT4Wwh{h!3{y z?ad#k42k(%i%}a)bqBX~xb<7Cpu*#LH)PM(7MT zLRU>aaw=*Fy`AcUcF{cJyC5Oi&E6ra^bod()88S7^xSvnN8Tga> zIrA=Qd}kv@M5ETMV+Lh>!SDnP@Yt{rO*Khkf}%#-kD1_U@72E7$9FO=BRecXNoFwk z<%wjk?CbUhbJ$Gql+acw~&w!Cl?PV4-fl` z1-q-agPVyLyMrt3ABcZoNSnKwxmY{7SvxvV{lPRbb#!+VrJ;GzQ~g(b_D)Jl{|)cp z`cD>K_~7(1apL6W;NrBm=loX>S2r1t7m$Aj^ndhl)qMF<0;jsUtE0P%nYoOIxq}<+ zzd}IF{@dTl-No*2IuJ8Xb31eU7gN`lS-JmhN;!EY)&KVRLxH8Wz0+T>7qb7&(#_i9 zf5`f`*#2n#rt`0Xytw~2?!Q_8SMGm}U#ygrK+=w8?tj9Qmlmb@Gd~F8Xl4xo{k;|7 z<~1{eSO~K7S?~$61G%^a*#*scP1yNN_|3U2AUvi5=Dhy`CGX(sX5wIG{s-y>oWuGB z$4tn?jF+3=f}P)#i=Q26B4EmH!Y3%i4zw^8;1+^daGOFb{sltC#rmZxP3-noAPj*vYYV$c`eLLOa#m5NqW}AttCe216U4;LMB2p7`~{SYhZn@f4dUk3X8%aR z)x^Ub@;A;GtbeG?tV|p%&0o65Kg;#MTfo3R6d+&t_;W?UBR zCKmhxFC$(-0U`5$M|X9!aPu^AF_*A>;qis5m-76}6&2Ipg<}49YfmflKdbOU7&{j? z`~MKe`%l6+|Cuo7pPunw8H;fK-#8KZYw#~k=Ed(HvX|!d(hE8NyBYqIvp;R;|Hq$y zuEqb4GrU0mXOjOFzyG1@KXm=C82Dcq|EIeCL)ZU`f&Z29f2!;MGrCa!=XJ{5;pHjF z^W|lU@hVdKpq2U(f#aJ=+?qQ>w5k3)wtVKc&{-vOfXe10!}OE zmgyVRd)=AKpJW)qWWPsV3w{j<5BSsYr(aDFoHWhyT&)KrJHs8{?c#ir)W{-8|#uZ?d1qa zsR+W$jUI~RpCO#B+Q{G=)|y64{7~tSBCq~v4p3e$)+LOZFPAirsTwrJjF&Mz`HR)e z8_*wBn)Xb?%!}7Yvp@F#&#Gl=9<2f2gh=D@UMk7I07%2_0L{P7CsN#dWHgd^GGwV; zMt>x}0OoHJ%eVh9L-s3T0yzz7{Z;gcP+@OUojfGR|B2Xi{Xsk+migfAOB^?wfvVZ1 z<{s5Akv*J?mwzB<{VRWo`Za@Ffk@%cnN;m%e@xEfoh7%fyx*t?T|N@GsMUYdKw9>N zfrlVXl|FR6d=;1KsbIT{aq3b@CR#tg`+Cne4E=8?9biwyCo=wK<}Z%V!gW+kR`IQ5 z28f4hR64Ktzh)A}!UXGV=N`c%xMH07b3V}1ytQpuz>&eGk?dG2owwoU=U;#$-XjAn zEWhjB58=O9&!|n zK8Wv8Wm=64y(=DtfU{!m>EUT_CnQooaN4Ixy)C?}VYo!X4|hkf}Kx)$WQrfUX8HDIgZ zU6<>;#=6!oo0ZV2(5^x{70IB|)I$L--@2Z0Q|`xOe)rGYHVBU_@($O+;u+SL*2O(x zE6ydDsg=@;xM9)Dml7Vk8x*PKj*%yHK5;k5GZWe1O;tWuhwpF1#-pXc=3)Ru8P~t9 zCLff>A5Y?bqeMWbi@;@!fj3dT`$Cq+`5i7j?ap-;DlcBiKq60U$;1_RLEG6$COj{;W^o!1Q3f-8yZGF)Vjs&* zC$H}FvW+}iwt0j@V&&$G*CSe^SPprdn74TRmcP0mTD3)q-4h9>Ew|_Xm!3~}cxioyzcN0dw zUfGekx~ijAc`Vycic!r1KvHyep2Bqq2QGp-!p(D4t#8rImpl1l#uIN5T6etir8qlM zr4}S-5wjPPs%4V*cH-z2ePLGgdgkkJ`1X>n{PzX>h5Ci(b`vejOTFYr3=q}J_VOcf z6Ur{FkFq2B9+l4^!LhWMo!o9b z5oE{0+6zA0(?$C>Nh3A9E4~VS^U%|oh0e*~#pCu_QA{qH^UM{ELg^@xudwUQ+=2K) zzneC6k_LhfUQDcxvY+EVVaVp^`UbLs^Ar8p=uSS;LKcCCH1ojYPvnfe*oiecuzJY_ zL>&@~kIz5y7DKABZi+=o^SGswd+0$-aD79E>P>2(hqqG#E<>5X|JVh{Mfk|~%CyiQ z7sPHg&wYa7rdO^n`$@*h9qJAx*de%Bi&VhC!T!05(9`d`RuQqPZ4^?4>vYJ=<-q{o zg9(MiCC8s+f$UaADVVb9)^37M1AP2ixKu<7h(xx?w=Tsqeq!v{1K-KbfJ$d2_Qics zKDqB#ODxL@qkn8bI}n-q64dxzrlRov0bJYbE+11Q&K-HsOqB`X(eBehUV^^bN^K@K z%avGMmvZQgob;n07n`n1(Vp$K>hGWm|R4+1*r)|TbNm^g7@SzGES_CbwRg@zR_g-Hn53q`V^Yc=*eJA)Ar}| zs!RSrrjGdaJL2)*@XyeesPQg)F#EyMyLz^<$fEt8>!ss-7W{h>gx=dUB;R4shVUIQ zgl%Al-ARc~Kctg*88!PAxI=mFZLl(V_N(4Lc}waJjCMrtMdk}?gd86{iFQMU48(p5 zQu<`|rAxT>E7&8QjlqP(h%f#drM9V5jf^TxU`jF|`#O1Vsh|b6WHYl$Z<$s4_Pdv5 zo7Iiz3~NP%h7T%P)nT=eK<&hBv9n#FZ7BCFJFgP!0(leh4HXwT4=hq*560N=1Cxn% zB%->>AV&saY58XKL*5}xNJOEdnNW){SGi<5nRmloDz=q2M$UOR_Lee@thXDIr6caD zi?W{>YS#wA%Bi*D?SLAYkMq)>5F53PpFlHt5ep(LN^~8tlTxyr1aQzX1=4STWEew5 zYoy18oex&7LaMtv$VlEFGPn!vHQDIn&0-rUi4sl+{5wimMCVY}76l{5R=UtqAWHo$ z4YdflGL4_f4lVUqp@!1>pZkwu3eX!r1HLH@XTbKfZe7dp=MaBW*UqTt9ZntF7Bd{D zSgfQSq5FgHW(UA`om}$}DQA6#cGon4&8slgF~!DI^9wopexW(r_wyy%k?Xl;DwC(w zNct0l#_Gk84p4W-plvYU9yXMaZ#)hXi|bZf5_n|vq0*i(1oJS)!2OXDIk$6m$!%nA zY^2=dRJZD>9M^tlWU!+sXS;dv4bXzAy|4=|W78mfO2dgbxrr+~$hJtA^t;~I7M;R2 z0@&_ckXm!Je1;@isXGEmhNQ))o5sSYwnDw=beIcLtuM>yBgdN_jCNPj4o|q>P-W55 zVcEKhLsW*2i9D{5^+@H$d)K$=$yZ<{E2FtBNYP#O`XPRZ-q8xARttme7#xlWQzf4% z+#uQRRyBn+LUcw_AXjj^;#_uLS=9!9F~zp%hN=h{V+PSVOrcc9Pu9~z@^oirgh9vt z(sq>U%<46#-f~2Yc!32@O>P(j8RL$E^Wd#xT^Li8YrM!*NPHbj@Wv(HqF$eywp5+E zEk%n9`D|w2$5(eZJYpY)+TH!CFea(n`k=DsL?c-0i3Er(4La-{0y<|c-}KI~5`P8U zbdZJESzDip$v44&glotQ6A_D76rng2Rsea311tiOy`NKqflBhTSg9CaH=}Qb)E0Vb zz9fuy1;6_es(Vjd>W`383QpfF385c?O3?MaA&{=HyX|Uk=Uy8yM)Crlo~q{P%g-JU zjbo(R7s&A&(}migNK?+}c@p`F$OG>M+X$24PHo6+K+PHtGM+pVd3&O$3u)c4MNIHz zvjl3Fpo?P#O^4q^?|je?#%Ua|`*5t_38e9+zX~&%GJQZGf2`Rh?&r;>JVM2Tz<+7p@bjq^`?6GkTw zPKKY*%WU%GI(yP@{VA$=$x|64{>rCG%Ha&&zf7r>kCa}&lkOUhzw49|?1mY^^x$RP zHgJR%&E5bP#(GkleYsI2zZIpy1(b24#4Dk+!8(LhY5CRm>}+eV;@DCpVp%iL&j0Dk zbtm_kwDt+E(GcnTN5%)%78uwSaZ4mjGb%{TI^yw4z?UnuSVBz3r>HxI>1oCSz!OYm-#TO= zj}xAsHzF9#JXnJHRBIOj%;0kTt>ASV zfSSA60vq%G<>{#b!{jsUh6Av|h+WnHtWBt3eJfIp8Nl!fj7OX1iWL{G{(G6bXp}1% z&7_jA5fm>=8(CAxFQLQ-NQlCU>S16Cjz+(lbC&>P8wDnU3>F4=P5`oB!lqX4CQ)nG z`*)7O=@MVUPuNUBV;lNl4|10THOzH;aP$W1)FFYThX&i5Gr;)ityiLP_#m_}X z7w#Q*O(jG({s>sHeuw>Y^0`?UaDoU%`w2Py+I9j*f1==fOJsnFgquS&r#U=OFz*~$ z#??fdc?fS|1zTC1xoO?V6Qx;ZyiX)X66A%Pk0zlx5X0;i@Ug)B)3oeL3M3siph+;X z$nm39IPPA3QZJ2Q{`OC_kri-9kjmmTTVD%d;t#S$LaI92>knXG@(&Bn2XC;X#`Fu9 zX8Ex8xUy-JsdqAq&T3=&)X5fq*#6u|MJcyA_t|!ac%fA&tqWwo#dI5JWNB>-dDn&3 z{g^*Jh<Jlt()di9ekG7jeE1D2 zH$T*{=S@Mk8qOx)S8$VYQc72*Y8}dw`+1F)pJkk%KS7HNarZBR89&UH_F(>nVLhG1 z1+pj*%}7)nmV7vOF!p9IbZB+hVR_Rv^CIG$;p;kQ9u)2f0Y+@9!B!`dT43Uw~;6y~TY(!RBL+BpO1@Co?x10fvtlK zD*CoyFw-9P=xP2)yICa&YnCzJl-0@)c9-trLhj;J*KfV|htldVrN?Eyt+xCWj^8*OQ(=%WSY7ztio+v@Q5(hLji0$GsR3$p3wn zOo3>QuF{h@6>)yts+{MBg*vS^kbGcXdCMkcf4FaWt`3XbAC_2DMZ^P#R7VYk)F(v1 z-m?cI*&ZQe?LFav@I6DY;MXHA9zU|z*K|Kt2_rv@LE=d3{i6I1a3yem{5U+4*Xl1ngyAB>WdC)BGwSg5I=pyGCnoC33hwESAYd;Ph^a$cB_<8zR&xJw zBt4WLMw>v@$B2~@x)hJCs9W43aSw3?k80a2d4)qvv!{7gwm%ab{CwCM(;5C@RLJ+R zxHC4kG|1-c6SriG4GjnP5S_Sco~7Wj7c!0OcVxq2%O;!;N_ud(E)BX(yigDbw3U9}q$*fFOcscVR1En9q;uo8g{1XR>wLo($>x+JsgKJwU3SwFy%} zggtb_%AF>Se#U$nv1|0?tSMSEOQ+^&X>7F$AMcF25A@9hk@E3k(jv|zqPMy~@9TQL z|89XSzJF6Y;q;D2V$M{FCi zKp0}7@QS#Qw(f;VxIGka%;Z|^`8uiQ)`ZeK^fan(W+LTB_d66n$#`T7cqIIeQ#4ES zX|wOi6b-~Hao>Ijwb{mDJSC?Z;1;>!JKpUUuQft{vXvpvsAL_b6gPexr|h+ z4wHtrZ9=vS@X}GnhwKx@QuJvKav|T&HoxD1osFi6^B!N;_geg>!#yzAuiBkkXb(eY z1g&L@m?H&>$-3=WCvU4@=RPz1xRXmdq?1ky*;{|j)Ii&#WZ0AQo5$jU5BzMFp}YT zW@eiVwsmN)K&E1NG?i{3fn92YuhZ*FByhry>LoJjuRmLh8(_Ull9TkE^cU272!f@q z6JO{7)>2LAsL^`n*<_sH_h#WPD|4lp^{1#{=RXs;Y~c=1Gjh*6i*TFgJ@xVJ8SFdr z61?=6oI7Ck_t2Z8jsk9~JyrYG?V|$$7I*Q=e~5zO>LE2#@`cx&^OeUYkNc(Ejk^vXa280-VkHD}r~aPmJr8Y< z&ZeW?zj7Tuu7Y~Mx>`_2m4#h0?y21J%lFjM^tKK7;XWjOK^`0)oWKThfmM<{8?(I- z4@!)rIYF@Mr2G+a-Ph~T^txRbZ0#)If}!U?#QPhsX;#H#@|oXdYg<(qhrwypleFo1 z^#ngRChN2C{yo{pKx;x^EPyvZjP!Nrybe`Y^NQSx2T66P=}4`Y0p|s`7ci? zMTSY6%#dTeQqbU2rln7TI1@v}55C3=+3$~@-&VdX4_LcYew<8xKqb4^lFhp#zq%s4 z=-Z=;KP%3T6Kgmq3j0WSa5(Dk#+X^~;ruOfaBVO%gNR*)8q=hNAfd^&y)dT?SqUrB zPl*pr&9{ai5Q60w_{9KN1%YVbA%?9<#JVK5j7Piv$;S#&EAt-K6FsRMCDvs>i{J^~1HIxo{BFf$3qLjx+v|ZAZ3%C9d%^XCBJo#iktm^|n#+$>nG0JKp(Nke_j8@ld z7gF64SHovGO8#g?qd}1mRyvW@j>E-Bu~SK%QMP;qpHXwo4Se%L@jwbzz65$zR?9)- zo1Y2p2p|%l=G*wU^f&PN^u#}5F{XG$_4FG@sHTL*nc#vetu%Xw_&TNUAb4A5iHhR( zuoa3l7g*AKMQ`w#7gg{kOPYUhdJ|8YKH3-u%97D}$!(v@_H80+2Z z)!&aF(H4(2rU!&@`@>On^emdQ4574U@D#nbea zK@WlI#6wz)&eK@@6f()Ere^){Br?nL%F(}BT(hd8dsc^IHM?2jy7rDz)e zK6zB*8Nuh~$ciWGDe)lV*G3_+dm=w{kY+hsO8@g+iKnrDy5GIh&n8x@BXomh@vdH? z0olTvfk-L_Xg-~`-$y}0o*0SKa%7QLGJCQZz6PUQg6Te&jY z6~j#NObFzGDs&BWxpv*3czt@r+6l)+0uoFRJPQoEYzd2ow~@x zrS*}T9mz-~!fvQC zVhtPH)i9I%;%Bvit8j@oh59vJ&V71hI;XJqT9`H=kxPaU`vV_o$bb&-qY{af51g(y zlA}cm4}CLN1B>BI!3?`pSq|OkLSVgbIo>M`D~PH5y*J$}V|%H{r`am2)j!0jqwU0u9lX zMWc-e#e#Ew*^kpc!)N&sMOCei;oLiTC>TULvYY8}Pzx9het*QaxJTHs!!J<|m5RIJ zTX6`~@#NU3t>%mHvA}Xh(+U-25tn%glKKj&l!}i?$-D^piNXdspea-@Of%;VDhEO+ge4j@U|g=KAcd8A&^4-Z+^&P%RALG zsd}O2cJtcw4J|HYhkfefzGr;J0E+($=0F+0CLRtN&-Vy`l%RO8c?#(|EWbrG_cH$4 z^RW6FbmkFm^c{}bc4X2Y*StmNf7^lL8HymWAq&=vi)x6Eb!!^Eb_4dIurc*gcud{t z7GWS??u0B?s&R-r%T8c4aH{Rj=Q+flLLXOfAT*4YW&z_p+L(vt75wU(=a77x-+MUE!8?OZ!egoLo|{5}z#9VZ>5ZTd z0}YK}tf7L#c^4*uNXWE_0biNMOgw`mqZs3G={$L74$V@G?|^IK^E%?!5%rgZ7gPWM zAOJ~3K~%jK2w-z3x`fscx+9O3pmey?-Yb}^WahUc&WR6K#@D6Xs*a&+Q~=Js0R0WOZ4FfA)mqe8%VlPWE3{; zMxhDXV@wdLicMG;j-Uf%kA4*{{1(x%Co%ERy~{wT$ER&%`5n0VJY4=ubp16Xy@aTs z#)Lz;3ksh7-A>LaE>|>x%qgiaS|*DBx3ZxY>9re(4uGNRLki!9yR^}w{>XaV&>7_6 z@8BmNC9)n`>u778thr3wUO-z{aqI6w>oT^}LVOED9nl;u0@6}cWxL{-ToLTv%h;nX z9kt?u^eJEws+AhVG0wS-W>#Z1iNs4XhR!?-lb=Lx{8it6m+d#Z+o4vnOBP}W&nZ_W zu0)v0M{yzZaDRi)q1Q2PuR`lxG@svg(F2oFA}gUD#tKFhPlS#>0~fvn$DY7cMhgKn z{on@*s)x=REWD1n@@Fvjcj(G55M3^)O+kll5xCq7{Gg!%oTB?X^^oZZxkR9KRP#`g zEFoT|IHV}|@g_XJRqNJBs4?>D0l|csMqsPx(I=sj5V;JWrI@sibk?A=h_By()%Vf* z0@8Y)IC~G@Uc$AOF}{uHTBua_1^q*aqu}Z2eml`su#sXW&SNSGxnmOz>rdm0jqoEU zu`^#n=YI&kS$IQc3&rwxhieVGrdzZv6yy<%`M_^B3V7$R?PdJ?&%@>a7oGi6B%epr6s-}m z{{=i?UuY3;3i{WA`YOZ~(m275e*_&)kmhT|?s`Fcf?8y^O`=6@X6@hpdIsbL^@}D3JF9hK0 zo$BKK`o~7;zV8TozOJg^a*)vpWb$HY0>01p@S&z-s-WxdAgz_nLRDM!V5}pKg+@zB zjHPnw+t~Bp#8f7?%~HRe*iP>byIY{q<FW$S$-U@AYk3lGk z`ao$M;IxLZL&)e^Wc(vUm6KpDBCRXXna8I$@Ujs+?vA@bL+82a_Jt8@f<&}vzc5Il z1EPTUYiMVl*td&n>!Jd??<0t*;75;RM~`E81o3UOu}HM^4u1U#>9v0(yZSR^}`mif|JbFlW9E%P&D8=-R)Q zv`53pekde@4>cXL#>4WfXueiNadk&G#E2nxj>sNI&i^(t zauTu89gj{4@rE#JW+x!>&f%7?kzD!L=sSOe)L#n4d8Wr6iXE{feXV;3q;3a&<`nM} zq%wvKJxX%&lbGY5LMNXjiB7;;3UB`_yoP(cWkX|G6^wYqhL#M}kpspDZzwXM@64&< zCB)mj3SJ#n90u3Z3mSxzw*Mp8Dl$5Q9iBn*Hg@PDm3E44{T*sUa5nWG6W)kOgt&PB zfi((!seey`8G8yDK8_gK3_3fsc4#sJ5C0~5`Cr4zYtTI>eQRptUa>jVAKu^Z;GOQL ze<6`~5qA1$D$W`&q!OCUq8@~sa|2d?y7|HgwJ_pK>Y`yD;^`Ck0R3RC`Rv#ih^$E<0 zXW`_t$jEt|tzcVilJ)}Dx3T2KM(fIFXc4sap|%Q71Vr75r3GMmEdtyMiTKd)Yb#W% zV@O;9BYT=HqJ`#>^Ny_DBwBlqq4k%8?`}g*FZbY`k|{VJB-Nrq+gWz=3S|V2e-@LB z>^a*RMG^kU!^qk1AgjLw21vjf?IjyGc}HC^8gz-g-!q74@tLCt7=HvOac@#=NyiSL zc?GFohUOK}`rwLNAkT%47X-&h4V=4*d-qSUC!PU&^tMy-U9l`J+9i4w&%K~0sLydL zmx+G)-y`q-KI&EjrMR89?C<>74cg%~q~2Y096NHJc=}n)@z3CLyLK55s+J9 zczBr9j1X&#@u3R3t4`w7fcM1KgQ1sAM1|Z3(C}JlHyOdBQJ>lGp%9Nl`)ElS-A{DLTmrI`te9#rt%vt8n4B;JtqXYi|vX z#cXYj(Ob}HV>Y~`Tf~wAZHLOZV2)nI*yvDCwFIF~xCAT&>a?nt^D9S{|~8-6)GSIo1lXEu=gO zWdUD=J#5i?=71O>bHO{PjGja%9!I0Nz)HR4c~gbF)5P3-iRkS=L>B)7O$P5#*_5jH zJMVo3uQ4)m96j~~W}n$ku>!{)N6-Eyy!PMiO^9=VEX=lQaM_w^D?Z288E7gv57Fc_ zIx^jpr@ik%=&;f;<8xU036d}OE_8RkycVqlX)dUEs*wzIg;rfJd0>5Blk#o7q(9KN-HdFzib@BAO&r5AU(rA+A74NE8{?B?%8HP9th zsGPzaeT?MzuVK&r8jM{)lTnPd16^Qa43RNJ#~;OCohECJfYynl;0=XN`9QU_C}i9a z77NhQ$-}_M%y>kgI{pyx$*1Ay6BrZin#oaBa_7SNO52#(SFvyXE6j~QK_d31T(~P> z3os1FK7$#VDyZQ;K|dZsF8&j^{0C59U{`IbThVA8K-+p?v^~J>i};UDei~CfQpB6? z|NVPt>6l4Z(Z)}~FZK{@1gJfuh6*`0BAoGVKx;J3o2nUXr2LHPzz@Gqg2j)2hM*R8GjUp zjw8lmciDC#LSzk&U_mkn%cG4Q&q|HoGf=3*GArd0sGE(F*pAl)s?}2x)%wIEr3lthM)NwA{Fdy ztSd1FH}w>D`q$yozX4sj{YBajM!G{Rsn6YW>ah{X$VVWq9SQ(C)O3uMx1lo|sF-LU z1yfQNE_Ed?3f?fAip{JA*Z2kg`uAb{5oCCh+bNCj)|^C9M4G0gS&D0~Ay=NqzV*+M z&Rbw|^bXdNphU$K&@@xpxiEbCvs51W&ynfR@A{M08AvwNm7O;fTw$7W5U z*_YrK{{mTh5m-R%9vq%q08%*g8usX;aN<*&Xz0Gp*3gUpA+DkofQ6Se41Ck=Bn%KVkP2a6nfLL1O*Zv$c z^L2b>2piY-?G1IQSQJHMc}{b630Z!dk$3+HyY}}OyS;Wv_PA&_Z!kf<$B1BJh2y`D zKl5uae3B^MpBHDW#fnfpei8GL-z6VDLFc_cAZ=a+-y$mXrG?NrpXExHK`Rf1iesY@ z!xI;X&;AC?dDf2CKh7(`EpnB8ZxM1LPzY;zIaFcifB$ji1BKAECoj=-BBy14i%3mfk_H{tY85 ze}^%Rfy#XQz8XdPT|HD{s94C?E|K1N33Kd87@r9h%KIp4Q&o~mm1yQ^vf4OlQX`-J zA-eJgSvp7V7m*yi3aL|K3quoAB(O(=a@ZijJ6dndldXIeJ^cluv1y{ANlX;)DEz+dZf`B7I)a&c3{xE?KlMrc^%rr= zub|C0@L7har)Di9qgCw0M`83a?9or5laJtsrw~atwY>Ca2J<{8O;gn8M6E@V8~=!T z^Y?MfFCu0Yv93>;Z99N^^*BN?*yS%o8j1V-AM0*8; z)?cQw)+EiAajiM@$j9&}p2ChyVXI@8K1${Ch(&(XyaM(`VAzl zW5}^_g?MNT8J@z|rl5K}NOstG(?{tB=DQRORm8Q4*De#?d=a_)UHs~c7_)*g?v@IW zA|Xibfy8!`WzzR|Qj9%{a13E4E@00*heoxc)#T1h1bk&2nfV6H{{rgELEmJjRk_W} zk$tUcr-mpQhOvu5^q<4yJRCYYrhqKJj%pLc7Yd1?-JqxBDSHeph{w3A=-l(@^sl0o zG1S!d4MN^IOk5>Cb^%v^npXNQ?Q{WalsMW)97s3c;q$_As+z!B`n~_yFJPKWbXxOd z3onqbeg%8{Y2p)4pu@)?O0YKClUHP-7_k#j8^=$c$EHohrx+BBMQsJ*3Ya+1gyQzC zY!n_k=Yr>>faWB=L$vlD_U%7}>(ArrFC(T?6h@joT%T}4G8g1Sy0lFDM;_}Vcfo<{aC-lv;#b}sZw*~$=R>f?w} zD%l$Co8KeN=ds1yF4<@BRRuhj*m?{bB48T}Ux{$w-$Cl{k*15drJv*0K1*`^X&5<; z9iGG{Ll~Q2tSQtD2j63REi6$56IJ>SRW}7zL#4Cd0N~=wIR`$+`VO|eh+X;x_U50V z*Pq8XuVQQ#&V%m#97G~?3ZRME(6;W*g!O=$1UvZ%=FAtNGLA8KZ@r6vADzaWdJdic zG16%*!y+SmS!%q^41psMFvtYHl; z6;WUL!FJGq$mSRkZ2Agm^Ag$G%cM6R$4owjo_Gd5@+fBHM3~@dBaE@T2C=uUef1t+ zym_}z&U=RuQvgs7>am(*(`DkNH?VVmht9u%Uwa-jLSo%$UX{VIvB5V8gTawILlkdx z&#M}o=6DjMdJc2?b8zz0AB-rSt-zVDz~w)Kg=KJyw;B5x3`km}=D|RvhKyglugCiw zembTeXoTbiIL|Y^W4lBpE}d zKTncW0Z%sfmpH!|w3lxg?Ai*V;3o!j0 z+PDdg<-H;3t}m#4$q2zYLnIY+=yaG8!r{q`9X>jy9$kF{>0CuM3&TD8bY^zH6K%m2 z-jSck_?HtrMAS_wMhV zKuP!Zd}E-JK%^e$uH%-jp{wAp{SX~{jCAxYj6Z=4oy8>+NHUH_G1w#w`7yS~9m8i5 z#QS0*NQTQ&B=2CeHB5URnsb=-H;~5LVcJRKWpF7Pg+46XfAD*Wj|})saRg}=y6BA+ zoHsb1<7Egr{v2}tTbN@X{Xn(BeN;uxd<&U>60HI=0tIGa;=KgE_P)uw z=BXNv?JMuW@*fX&7GSYhM&b*=i^Pq|orCJ+;$;VL+ z7Zp2HAf&2DYYm#OZ)z>q+gjS&*McaJzXyvy#*CiE4^N>oxEfhRh~v2D3GMi@Hb#zr z9I^im(fDKNGk_Dx7%#kXHY*MbMA(Q$}QfE~fxA=Jdd zBT`$a2BwH_W3qK5TPAYXFq)!8oJ-7JK~i^|hql{5M1vtpJgs(k4THeMQ^@(>#-8~+ zX5>UqisS>eWC+fF73N1z@{huF zkO2}Tx4o!uS$7jW3bd;qq``~yv(TB{8H^pn~r_(tJ-41ho(w(8;O^+@Ytoo0l}`HB<_3Apnuj!P$iP$j7i_XF{g$ zUT#`jMQ6T@w3eXxDs)zMKTo>LIqDAK^oq6PF#H5mCpnCENI*!jr0CM$7ZWM=5QyHg z5Vobbci9iF^(NW-e~V0f40GfRuo;NDKko;OtO1n>PJ9ACd;&lE1akemL~B2R_Ekh% zy`$PRXI}RRNOGGXC40uK58ejI**Xo9r_~r5xsbQ!sI0w)J#q$WqxbX(jRAl35w!jc zvicm%es_P@WQ#OxsFYSJ@dPsZIPNy(M@kU7SMi{9CER`dK5x1**k#t;sGFO`FTG55 z{U3?PPloK#UGS4dAc`z*bOu-b4czFXF!y)J>|Z0zH<9cH#<#cp%@#nqo0;1^^g-=; z;+Nbduc+_!oGMvRnnjFaB7rPJ=Kcc4PoX0-Xgqvxy`f|njy(nSUx%f?g{;006x-~n zd-XVls5S%>595>)gbpkSxg1%!1ljez`BQgq1NIL_5Q@<@=_T6N|BC$VuM&?lV|3P1W0SpFGi?Z>eCN->GGpEJ?(knWhO=^h^2W%#J*U4HLfp6VRM zq?Dj%JycP0C$RVej6MOAA4ezdZE>G5f{va-Pkjn`|Ff|0H#;`4?g-!l_>j2-iyamR;E#M1zy2&b`#g5_-@)qJnEYzrA$Iln%%FhT-uJiM-uc;0+x>&MB;Fg;d#nvj ztC0<=1R{bq7t#3_F{hrx51&Gl(R&-vjjQPR8RXQrVfDw5u5T~C^gd(|cb-BO^y6#= z#!tY|i4uekFc*Wo2`jIHO9yU>yFmlCPX93`CGj`Nu796=`f2RY6xQDTm2QlMN(~cF zFXljw7Sg}HstRvHR?MzgT`s?8I<-q&RV-0 zRKSEXgD|2=F<5f%k@{=M{7;eLv*_`sxtB$`A_gks_!FPOT>DJ$hGYlo#ZF#QSj09O zh2e+Lc#K1eL5Bl`Bwaz9uibj3-_41<0+B3`FZ~1g(j`po7^?DtEOui;m#f$aiHGnb zC()s^xRp<#vp>MBejjNs5cvhXYtgSzEa z9m?Aa$ihpQ;c1wBEY$JbOS1`n{2|QAZ@}`8iW&B@<;LJQB}r5_h81+Z?S^d} z8ZJTT;BhgeHIMqM1^4%Nmul>`&PS8q9;B9cId9ghPG2Q0UIG^1assZ`OqXX zd;-7lNGKa<{*1hF4dd4^+JJ6-tp+bay6D+=DnxD%6Yd6H-N{+9^pAb+KSzO=?3G~#bk;@Om`YYSIf45QR4fVGov?S=KqE>l^R#Y$A9wnj*y9g>;0xV^$T*tRkf@5UjN*n*Ax9pA#xwZ2 zpCk2OkT>5$@^!ph4MmT|5XPr?|&mxT@AH!|KmSZ~g>3c?MId-m^t+jUdSoCO!vaGf4In$&t^(`kVOq zm!WY9)?dSS=5c8odai95~pI=pV2GGcX zhy)0dU=E5@FqN!eOO!m3g^$X8jdnd?2vaDcB zvMgE>DN+II&}mB-4%ZI{Ju|q9-;V917*mf zP29^UbeDsW0f`xibRkT0jzrA#ikQpW4FzgL9x+Mm_8-w34xwrF2zC9IRk3{viUwLa z!dnjItr+FIP$GRWc>y)lixIkoj16Lj`Y@AmbQwdMF?1nO^gCLTDnKYA9c{CG7jk9D zutd!?UyrY)>_1hpn%L<&B;zA!KrzyCZZF$H7O}2T+t<92{I)yQK3O(>5ZeQ`Y zwj@FT?qWn~2concS-u}7K7ktTg-9=Q>^x?uA0ym_ndpN=98=fPrH(LCy`5E1WXhi; zETB__k{${wu(|}KeN6I>Z)V9#XCYsZOYkF!l$k8S5LoSBr>~(6y^pLu1Vwf08m?Cq z1;bYf&9B1kcOWsj@Is}ZSD?5mkwtAtSKyvC#qNF(N=9Mk1|)BRkf|W`{H9w5Ys_)T zF5=8yq~)j(I&O1-ME_eDwFfahek-*8Es|ANt08?=;HyFg+YovfS$+s5HjFxZ6&b#P znCilek6=V^VJ4%wz?XnUx%cUV?E1bTc1Obf@832Vbxo&F@kw7LN5 z3MfYEI<{7n(u9=MA+S;oGUsX(gbRz6kYs8g!eVe;hj?-V|L|$V$QPK+udv=bTTxVG z{UeC($6)9KYZ2u9O1mjND86ziZs1<0yAp&<3Frw#xE~R{n48YL5EvEelOVe|^p4b> z{|lN+z{Dpoc^T7Rj#L9|^!B-$0w^9(tHE21!d^&*G2=6c=om_T93?i0jE}=~7iQ=d z#HR4ZLnI>882ThGZ5qW642XN*xf| zh$JOQJ&HDa6JlLUE_}@Q8?m5gG<%cGmrf%T@R)-n`rbz^-Hz(=qNv(k(TGZ9+O6(@ zm3Zl^v9fw)(hBWICvnFnG2@eH$q9_e2%)Kd+_E3nFg~W)hfESVO5? zRZ!f7p?L1S38nXjIVM4$ftkx-L|1O3%$3Nt7|&Y`tK@MFndzV0Zk^ch2gthT(E?Qn zMdj`rCLl8E;8eh6^_O-B5yj1DNE8edJ%%?ti(}untkS1-<44q<_|)J?4!_Ycw7mTi9caZUc*R4?wOIjIeT2BKuOUsgIh?Jf5%F&WAU}k zwZrZl0ww1t;A`_=Lx8FpxHX6yCT3(D2H!@;CfEJlr~+hh9n`-J?y?--Hl;vuSKunC z0$=4l+1UOb03ivn3B=4zNc7Dkbu%RGYF;}Fl;*#NP!v3R7vlD(n4w{$si(#O-J?vT z2ozs2dd*=>PYY5BtWX=33u>D}C`&%45GJlvtx7x|hVi2)6K9ZSa{bp!RbkU(5ZnU< zv(QqS65Ly$s2N;E+z)gY;;e-DB!qe_zfeA=Q}O}Q>Y8jQ*?=VHm>4cK3}eS&x*JoE zrAH;-lO#ZMxu9|8Zo?Z$hr|yfg=dmiq$DBqBBfv2IIhET)p%ex8i~R&1`#bB#<^QWVgV zmyi?ZFrt&l)Ii326N3b*B2fM1$lAxzy=_RD+CcMZjD@c4LLU|)71mPTJ z?skZ)sJR8>RL^^pYJIN=2R-hIyR)t8iT*Bto%LB&@QL zRCBpJQAw8unkI-P!JN7b!$*;cDXVmSz1OXB2UI=`Y9$g#8VaUxqXw!`{B=lhKxm_p zX#(*Hi1s0kp(XkRvIQrKymPFw$!3F*qJR=P4HK7;;o)zE(brYD3jzLGM8!c2_ht;~ zT|7#rtk$~QFF4=tGXExVYXBz6xCtZgBBrimehZqabO#Wdo&bM62p@)_BeZgqKqdGp z?u*FS-KPmj6Jp~K=>uatcYfGXOsKpfb#EoE=7ce5@ z7^ZPgGnA@;5^O}Rc?emw3*A&OO;NaDn43qm6hG1;0>=g;MFEcsq%=sxO&ER)W^RHJ zUw1QBdP*@jJq!MJOyLGsEqJStnveU1?k*5YP9vg2)_k#LglU%_2`emVG2dYVdh`~? z*jI?jF3{t^Juc#0KD4?=5akb`i!uyTtT0@^`Vmf51+PnxG$rQrdBn&ki1@_1o6JH8 zXm}hdA4Iq|Aw0E6cNtQs4hU^Te~=j+foOj^NwE->JZ~oLawKWKjZuKO5Zl;QkS7_Si)smKZUV*^lvNWSa%tYS)HB5Ki z85^~ZCam;VVbnf>TK)iPSqs8j%Kb!l4G2jjgl<8&7immetzDPu|H+p}v{HRK({#(Z zX@ROpG#AKZANtrC#Kbq4-$H`ix^FCZ0HtCFTE)YlRic~1ili&7-hj##I<^%R+%7PL zL{6NAk(0>8)cX5|q$F9n8*SVFgsbrh6ki!aI3Tpav><6UvJc%vMtd`)BCC>gnBz-Y ziP@&)hM+wzP!vgW>T8lCClS$cKw=oiJq<*nXcKD9LDZ6i=q4B$fq2lRt_exEZzT8B~{>WHL2peJP2b ztgPo*_WR6@vW#fjjm%ksTVWl z#Nw}WW%Yj9{v%a@s!EL5H0Jnen7jyy={47eWO_30{iy|Qco4ETru9D)AxseZ0#0cq z&#{IkTi&YuMYJK!M3X(lM^BR+zkz8O_derkUS#Pul$w{&+-{OdbNQP)PkGF0nQfYC zfq@yhf*d`An7X{?z9G{zal73cZYY8SLKz^WC<;QT2+aeE3n|=KEl2HR5pK=|Bsuq3 z11)I*?Z_I510HPx5$z;4_!UMXd{3KX>386(L{uHZU9=h9SX>)g)HG(5H6&@}H))yx zV+v#ZYpV}*a&6y_X__didf%F28y%+ar5rfbc$A;T~bisFFKMm5C@!>|$+y_Mjt0<|o|98;0PlLjQID3%XGs35e| zVgH*2DzDeUWXl911>CM_wD<*#;Zr0dv)@YbC&3HG)@D~^}Jyyc(n((-=Tn-KhZ9Fnk4qHvrPzB&AMwaY> zqTQfYrAxQ0L%VZim}gQ*q+%Z_EeUOoPf5+QBx@91nNMWiDd_txvC$josX6fX zBnDyiRyK=UQEHzTp`;3Zf;*t>5%BE-wGu%xPdHc0V~VM%Xo^HCW{&nW_jB_{*Tkw; z?+XDgWfFh*518G*ATid79*^F`#jOJ2_M_B4j<0kth9OB?B84Q2uF{$pQaYk4I;tWu zqt{9FehA_IRWIeRKuAdiU+!OBNd3ou{KtRXV9p>6(}Yy+j2$(w@WqGFiY;e?5l1A3 z5X7+>W~lREtdfDXsh@>njU-MtyRuC&CC~RVwWS3@Gt0J8B&rA_Bi$q-2D-Z%#T~Rl zw&LDvt)~bDsTCo@L+InDkQlhMR7;C|Yq?lAgw-^i^Z4#eBT77yz*W+QQr>}3)Kvo@ zAuLl2NdMmfp$$TbWD-*0`7BjcD41#h;VK8M43V4xV+u?iflg|G?mYUuG7l)JX;2cR zG#ylOt6S~Qo4K|_+R43K>1?8k8D!)ZvCuG3ikhk+QtSkyd&oD0&=5k!96d)OGKAYL zP=!dXe*tT`fIL`DXSRJidNPJI6+G1kF+HnO;cjXBA|nmO(S$aRDV9oO*EB7E?u1a0 zt`eko6N;w_OqW$*Z-fC8fu0hPX128{=1RV~WgpfU87UMH1|pS7Yqba!88fepJMBV+ z$d0lt=#gG*ZwfSKA##)W)J^ng6d^Sfmm8tD?#yzR5>truu!*}8hZKR-N>Cyr#7B;! zY2eaC3Xn6ihUdwhSO}0-(QkC8Ep>uO*uYcV2o<{*)LQ1|6wL=NhGAezGfUeq^qhtA z)7*2|+4&m{@V-?L%D1?-nwt4y?6L;y^Ad!DaQTtmdQ5LC!cz;P2n-1_nd&vBq*ASo z)W4Id9z=!(RH>isLjqFj7WiPKO}rEgA<>aiM`ET&2Z^*zAQs*ovQWkWP1O;J9`uO=4U5JL~)cBM4YJKm$L|K>%T z1riun#cUH+5@Rf$KvQ>h?qT~0?VlIA{(R*h znfJDl07=MiAze3fAuWKovyl^tI8sX7Za0deSfg=GBfV(Z;3bfzfuhf##RrgM=aHc+ z$VfjjK8!S{F%#2ZMvz1S-GUUw%)@JzsdY!nDH*;XGX-XIq#OnU2`DM>0tGY8yy+I5 z8Q-&>QcnS0zD=SaF-hv6Csh(OA_5%S205MplU9}JQ6yS z(K27Rl+rQ@SiE-4>arm+ZdRn8J^wz>d|&qUvlw1VL^4eD*xxhT^IL+&Gq^ReWWQ&P1HpHCkiae`iom^Po$pb<;dsWWWT=V@b)6O6(5Gs%oTuFmSSS1=7 z#gmL;YW~za7k3gO=LpHnHMQ4FQ4|u%BuPDq%jL=fio9UGh?%w6-}C*ukn7y@Ae3(* zY|Y5+c4e7kin!Ac)P7;Mw6UdF`n;}k@RvhyGnh$)9>a`JBN9ZV8WsO3mA3O-MI0nIt^u&fs{=gTs+wu`-OyTT{al2%QL zHO5VMWg6?0=L_P zOH)CJdG(c*3JS3V{1S7tD%~(JO#_$9ji$Mm1&@YdWbyd@+P))86WS;h+_tJ}7)Ewj zevS`gu??Ez>A6pu_1gI>g);PFpId9b$OJ*R*NYjI7!o|1d*iOL>LQtlqw5BmCYSx( zrfK4Gxz=s1H#`V!6co1YVp}D>-=)L-L~4flW(%W@NJ=V&z%bkzHnyNnMh(vGpCHePQvqe zJZPGhE=wr%{br8FzL%W1nJx!M6WV~9kmHQrnBb%9IgsArOUtOPuA-!*gyQ02yk763qit+ZyBoBj<$#c* z3FQHy4N*nwXh0i^bX{k5HpKAoFulFKT)K3L-rgQMySf-18DV;Qns7KwGLb;lw5&u^ zpU;Qi@29x9n5wEOT3cIbXlP*Xp1riTwNhDGNgxndFuc83HTYd^dN{nE3qsCIaVS$- zhe9EShK4wE<||H~JV|Hg4Z6E;F*P;G^z=0Gc)Z~AdA(kO!5}3iCA77+v3t*M9)0vt z_U_$FU0od>pD%A@WFu90ua;KnxEmJ00CO$I2sm_CYCmIRZJGpD*pNvBS-#X`<^o0Lf&MSS*(12XVXIR8&;3efxHvc;X43fBr=} zc5J6K7`$)HTL*;Z0U_xasP{d^<8f}@yvau&eZ>18e!%%}&NDtXMm!!*M|1*#0A*!m zR99Ei(9nR-=fmsu5eWEE6qRH$VL7amNhT*J85kH~YHEt9sVO3nNE*mI9uKv(wLJCI z)4cfN3q1GSa|DCIb#c}jhLHx!Oj1>K&Bri1)c_mV9CPT~2cRoguJFbiZ}9HB@6y%P zMK~Nz14czf1)NN^3`UOw%a*I*K*>Nz*i3E?2saX+B2M zb)85gl2^4~bNe|Xvslx#bS}jGTIQqx6_-oJ>+$0C`w5m5Q(9h5ZFM!p#l`r1zPzdP_O(Cy=#NZIO)TCwS%`FE zU2(CM%TiZYOJ!vx#l^*FnwGQSq?AlfPI2P%&lw&WURUt3tIgdm7jBP-($dmYPEHNw z<>mN%-h%uNx@j^zJj{FVy~~?#zDa+7e;R-~Iy!ju$g6zk@L_iE-bHb7F&>X+Nn>d; z0nv6|@7lGCy1F`Qs;s=Bk3RZ{iHQlK(I_WRp5)Cp-=w0Vg0{A{H8YD0!(e7+hMAd} z96)yH9y7N{0DJm+VtSm@vT^;RPw$RejLR(uK!C(+g zbCKOUT@nt5dH?+nxOJ;5EBiM8brjrgHy)3Nva)hYN`h?Nx`np3Hg@mcO;uGD9*-x- zozSlGaBV~x$yb?l$DpUY11ZJS~hcF|9)EATJih+3y+UM5{pLp z=9_Q$-S2)!Pft%;3utL+;iZ>e;*}$>uw}~@N=izyKyA6aq9_VJpO3n_I-Y#;NrVtg zPE2z2Pe;*poyo~b-hcmn4jw#6U0oeTMMd9=U&b+)?h$j$PVv8b^(t4dUR@Lj=3$rg zcwE~ID=8_Vxw)C`+qd(~GtaPd=T7SD8*sa`JJcl-39eti%B4#e3%a&l5p6qJYinz1 zX=&lvXP@QCC!eIXwKZ+-*w=`~Vszf@;_TV8>pHU82BNe^UUTyL^F2i9x%sJ;+90ra!xL1 zlV;BuvuJ2&h`zo)u3Wi7EEXdci&0uyhNk68>u5B>?CfmLwHNa9*fcymOlM~&V`F1@ zy`GMPk5 zNivyaYHErzXUFFuL;cyxl;_*10oi}*%%{OUnZRN<3Bb1ky=YW~6>-6^x@W(%XOkZDL z`uEMvExh*HYwX&!i=qqwvcD4wg@{I@i<`Fy6jeniR&J5U<4G5?W4NGTZ@7~t5kW9-_so8sc)CFRvD29kDl{%UEi*3ikqd3)}&%y%D!1Q=HG z-9m-QQl4c)f{@4K;koC(%hdGbl3%)ESotPXQ&aT!^m6XPc?Jds(i^}uO?rEKIez>& z2M!#dy}cc`yL8d>ZrZeo!-o%3T2^L(kYSKaCK(zU;^xhp+_-UrP$-oCd?*y+(@#I; z`R8Atp}szyCA^SERaI5Rk(Xbgq%^oF6OD|F@bCZr?`dtsrna^=zW2TF<%EmvV$zY3 zk#s%R@bGY&p>$p6#*G`i_10TF@W2C8GC(kH^vi9prE?MzJsuAaKKLL{JozNI zdTtSq$4Mj-oH%iUm%jHs8XD>g3YpvdrRzGnuIEfAwJDiQ5|77M9MQDTpNJe?F0?V%w)_`@G~`?tTPx3@QI;RXfKh zo_p@O90zJX+PZZsKm1QWq^Y?nUCEqCBp4qb=i0Sv{OVV~;gwXd4?oNSp&cDN_~8$KNJ&Xajs&x{wEq5n z-hcmn-hKC7Mn*=mnC#T4Q(V1zmA1CFtPXyrX)-Y}!Lj4V>FMc7-*aPQ6R*5-gqoU~ zyo@zDImywZM|tnP_Z9^qJJrFhxhShBr>d%ky?ghtYxgc5e&`{B!C)4Umjp}r?svb- z`|tmrfq?-4u3fvvrHdEYzi;27AY^OIc9s9c#6)U?>KH~g@0q5_rAwEV9SO5H@a*g? z;c%Go@o@`C5($zi@S6{Wf+Z#F-n%EAeqfp=*REY-baXW9vlSH;G&VF+T~oc_z4Y|- zGB`MhuHOMMzu!-NeLeLJ4Y>1wSUiznW_p^bsVTOt*vd*C{A&4 zG0iQ_w70jTr7FK|6KBVc9R!0x`g{Ah(bbvtJzGOsEbU$hf#2_^Zc`nNO^pkFHXe@? z4u`#+hd0~(+sC^pEvn{SyQ+3;j~GQ&6>ZgOP?XvuYH!t2Rkf<9nHr%+xb0d=Ywy^5 zhu9-hD+!*D-}8I^g(v68;hf0%e%5up->>URzIeX|xxkN+k&*Te4p|iyk}#_G#p_P9 zsC1oFX)y?-3l>C36<$?RQtEAqWcI}++m>m!1F>x$tZbexmp%f%Sri*_mt#3IoZ~mP zWBWtIL!Q3}2kys2sjPlGmD~zC;LM^%*Rg+B^)_bFoJqO(mFyUsrSn(0eg5`qtgNh9 zxVqkF^i9J})wqLANNFvA^h8Oq-MWPZ!PB(fCk|`~B9Zv%Ay0Sj$5`=d2zGICvFyT~ zWa!*72A)@59+{D00(1s_4Bw}_Rs<@*FvrUMWln8POo-z*BQC)j_L#s_bk)M|!UMh< znFU$v(h(QqpB?tVW_Xz*5y7K-K+7z^IW`mvHPPc zFV9<#8p$5l!CW13_33`_JmE-Mni834-m!g94s^O%0A5|x9Mui-s=t)&`E%!P5zp=s zFi5ZQq@#HeB*Ej$az6+X`>vd zb>Cq}@YebH^K*YbM81E{6KCP&l{i@qlYl_9gqf`T{5}JXBn_MC9zmLnSJ>+@5k`iF zc7I=_-8oC{J^6)3CE|)wQM#~2nD2MDt2>< zC8XtB+c;0-XqCyagk_9`lG2}zjca(HsgzH34=jt=1A7=4a_!xYcCDj1l`~q5K!8;^ zT8xjJ(F+ddJX;9A-X0`UVYmIZT!2IBs`63Cv%`&Y3=1o3sl(A%P3`HIU(LIAIi>Fv z+?bW%@@T{S7?_!P3RJvkl2Bp7LogaAC#RNZY3@sZEMlXhX&4Ot3~kpx9=z|qv8|r1 z=BTYo2@H+@{ssbt%E06CMI`F5Mku}ElaBUwN~2;^ozXCX&#GOx9ySFZR}~T}H}|8F znQyXMILE6#xMgZ}c6N4}g6~(LEBQCe{{h?Z@9N;0)*l)gdJ_`cg#hM{<3h*-`S==i z2|Plxt0ILO)M?x|TdxQ0Vo#H3m3-iT{`|R9$qX%!R_dF@kkG+!_zB_J>c&R5ribv* zw^X4t@w;Ac0*fEK&cleEzy3-iMcmP$$Ufyubo4H9y@arCek!l^QY6V^`sJ}AYUYQy zcO3KNr0UBX*;!dUQz?lpuD~lkm(|~iG@*RVpq`n-`zhBRnyT|m4nLB0fPZpMOP4`V zNGSj3&vvoZuN|_vuPsyP)k}|6;(^_N~X+v(I;R7gVd1^+nmGoMr8R-HyBDzwqGB8u#V0Lv4d$eQ{@9d6C<* zBz=ZECD7#UaxH-dfyDqYBv@}?6D*iCnYLWDe$n}^Po{3o+S=MMhSS8cuhjj4Qw$2x zI5R#L*0;ErgK$W7M?`4y#F!>FN{wFA<4HH=e4M`TE51WTZBwO_0MT?T9cnbo4! zRHa5AoV&B6zqPfM<}VL4CP&cW>(0(6x(py{P+iEh`1e~`S((B0!4d(=u%_1_H?FL$ zWtEh`^Yb-rY-}`n7kC#Uh8{uFEK6BzF&SN@d&mtZcLTFxy7vPEFTA$LwRqW{1fv=P z9SwavrR?uqv%M=-K+P*{^Q3uo)t--U>$@|sHXlDeVo-neSKe#lAwL5jQ)K2{B;Nty z$jlPY68D(bwj9%j1@4Z4kr5#i@(P=<>LYdSLuqNLzGg2{uCb{p{#j5s=gCUA(|B1J zxORp7E2MpimD*k-^T3vSL3nDOxc016BpMCJwka<+M_|gyj%FoEdGMf*XmS_&M@?zO zg2h#rY6|rmgkt#QX6yDriO}}gk(G=*#JzjiLNgY91m-hSgCm!>ax09=FsUm+#;%N8 z#SQ?V67)%m^6~03(_gM3Gc!t!^Uo9c^jG*Q^s%eH-)mjXdn|EdAk!a)2Olaw=A&Q5 zBqk*G4-HjVSRcD3|D>ZJT4MAcGyMVxn*J?M93<6vP*PAYcdCA!W~GBSJAWz%coXsa zeVFcUZTUCpv&pH8L(F+)WY2KerJ4{+VyT6E_k*y18LMIqjV)-KyE!!OI zbRQD>GA3Cb6sY~l6-zD5fKpp2&|{`wA|fNhn0Ye@Fsc~C+GNQ=;xp8Z{ zZoJZw8F1J;)uImz3SKbqtNwI!Y{dk!dr3;cV=2R%9yZQj&ig}^nd2x+@ccIRFV~wC zzV!5TGI?2f87Oyapsu?59U*@=_UXc$_?qs2&*&WvO)QWS-uEVGCc2g7<__a^9lHq77!-@1f;hN_u?04NBw?GUJKYfN3sPIdT;g^FV6g zj%$||0XEflqqL1*6ch~Y^2=O5QP#ZUUB4#tBF?_Fh^ zORd^KcGWzcStsBs)N7g~u3DBtt_FK87NYPT1% z?Yh*-*xA*kYanubTr-j1hDB6Jo)NgoDrcZaqtl3u*DtHSc+z^e^=PMw*4@pB9Hb0{ z1h{v_9s`&>dpf~4^J?YX3lXxnZ{LRYb{_qNU%i z&slVohvmjuZw9)%ua%dVLr<~?cHII5Y>U5reJHNN{|$rIHFGU>%v@)W2nDdVGyW-0 z&G>Xj-)6|2qK40}SL9C00}je|7Y3ZT*SzY+(ZR~Vg0^ddj}2h20HT=howfKbRwUNh z`DayCB5)pW0Y#MkJC>=QT`((1d7U=K71y1d#ymDO)Es#a)ee3hdwP0C-*)3pNlRP6 zW^?8>EhpQd`*nUG-j6$^LkJ2fxi=^;@e2rO7UDFUECK>7XCxzl0Jk+tN-+5*{-LX@ z%a@FA^IZ*N<~Qfko*W<7w6}-)ab-;pIia>L#K+%+YQ75!ez#jDP7X3pjNymho?71% zUKxEEz4NbBc>o{;%g2)e7r4wNT@b#imz}rtjlyj+d_Ufjamk6-*ldSpYG$ZX0u8>h zvGFj4&t#%{(Zg@-{@K|CfXCN)HJmf(``rwmGwk;MSS2}nOO>bvle}r?>vg;a$$cft zjQGRF$e7?QneLNza#`N|5zmd**0!?WnH3e^_V>L6g#?+th1zu9$Pf^A3O0%MI{$a? zueh9V9#+-a`MNuW*{%TWA=o&8cU`8YR_`B}J9XXxuu5R| z^yGk*jcxG|kJZ-JrlSgb%u7$eX;~9-8(ca-I09PaJrfwNLCd~SIcoN*vf_gQMP}T5 zTs>u-f1Bvq`g+o}2ZadssX`=#+E)~yDG?Dw)res7eVv<%$vM>}NdO{vcZMN+Sy))P ztiRh7Jn-;R$p?X4O_-_SqN)IBQv0Mj{K zN1wp$otzeTm%7eEG8h$Kysy;jy3vv5W(GC2i_nAN*;!28HmVEkrGLd#D7oUg;lFYC zUj)7p?F;turxw)%41)3xm20zIk%btPmSqm8Q`OVwiCY_405fWuI?k? zJg`{oxob2uyWz^@kOy23)YQ~ww!&2@MPJqbZf;Ijx%kmu{J!k(WjOptef>tS&5c-X zUI54JJ|LIn8d2P$YVi?B(Jc<}of6l(ueAAs^6GZaKahY(Xc>6!rG(dSe>D5E zzNt`BP+$py5a2HKQIEuQ;!Ubu-r~AhL6IQ-qUxPLToA9V#m?cv)sV}BdV1v5XTe#8 zg^_?3`nD0S(bDE=0An~jUT(|E%GyyAZJz=R5<*7R-Ccr$mZN*&Hut5F2k)vxoaKJs zmzHi#GSA4eYTH-W*;nlf?dn0(f-zQ>h-cI-cduH9&hWJo5NcUIjU1NID)=M;NO0{a;1nvvb-FCeK84%4_!-7WWrOm zYBSicm$mZh;3QpBscBMj@t_`2YNeq;^ZW7zbv6apcNX`*dvd%Q^*xyO1`#p1c6=mY z-meb1ZK-cypiUY=N=i$+?X3+LIi?@2U6XN{vH)x0qmc1Ft^A1S#LT$N=R!ks-EDnD zq_wS0FVo$#rO{TjeXM+qN@`oMP;k_gtE851XkehR%6U>Qkl0lej`lg?Ih{ox3#m0# zj{`^ybca2c@ylrb?ob;Rt)55b9k_;DyZ$3<900CKNl7XE?Q2RStvTAfn5F;)zK-R# z7{YOqdG8vIKh(m}AF_Z*dLB9lxV9-eNHJZ~p>VTM6HuK07{8Gb+>W}g?z`za?{fbG zj%aq0@H))4H*Mbb6l+VK!vsC>_lGPkG1{e2t=f=sC=8h_A2B2`oS}jJ?O9Bvb6BC^? z4gN^sb-8t}OP4h&i%=W$`Zw!TLrc0ZOwFK_Ks+WKCM(>!73$#NAnUfs2mpTKol>Cw z+hRDEiF@k+{(#MgCz5|nPh@d1Xf^+GJt2Qp{p@IeVfuRR8>S z2yF(s1!!n_i1*f;w%&B8aVTclYJCI=&WzjP&gWUbUh||g5#*>?7aE@pEx=yDXHQ5oknUXA5M){@gd-5;IZnc!E;0D zl8;%9`a?IV*dYvV|TOh~T{ zC&YVmaeO-{smrJ&hjhRO2}+wq9ZMSw4}+a;eLik<9g&$C0!lML8$IQTYnHsOEf80z z;NG+8wd`C4BN*!H-nfS*2cqOiQm}?&FGHpsfQ0nG`6b|VK3_OrI8RDTL>~!~mM?Bj zOc>L!%Qr`2(7%Jp3wy%K?Z90FVuD?0i99?$xg43ws6G#>B4;=S%2nY%Dw^TD51k3X zMhQPiPfJ@|?1%^6hg;FlUleF5#!Dx_Qv+T89)7%G3*7$IkM=nvdyG`3){`ebn-nEX zlA&`Z=ehm+CnqKj>(C@fXJ@CZ7g^RSJ3F*#-eXy|4&D7(aRXOvWr-Y-GAd9P9zHCJjPrMMcGq%xTvtFo*7cvC867is`+cWvNHcw6%+5ZwzgE4FY9EdrHP!)wmr1 z2qBPdh>`?tzCpDsOhR8~0KDq0D+cOY1AHhru%Q81W*)`Ht3{#hc9NYdD|UY{ua8AX z|0sYGiILH0!Onjcpnm59P?$rlSGenJmcX9J|n4l;ea)l0I(Ljs^G zYaQ2r&HbF6ML;zh`l6(w!edxm0SK7k;bBQBDMYfC!LSFTcjod>B=R-`l{HeWBduRH z66pybS8q9}uym7(K&37^db6H5;dquLdP0heMT7R0gRW45j3?kw;OOdK)+LN1`HGcM z$NKyG9}(Bx0hXD2TQgo(nf`%-_PLRf3@pcai%@GSN~7c&d%A0W;$0vpBpcXTAdr@x zu0E=xt!F;Ml6q7@yhuSahyRsdP=EtodUXrcvazA<_qfqAr@+BXN7KN7BVg|Q$-=#p z3o&i+y|bn6-igF(iNR9nD>d|}>JPLC1VUkd3`-t1KV}3w<`z0XnZ01P&XyKvE(O08 zIxxN6+RySx&D}}-l?+suE_ir&yb&(rqT^pkFfyBu)8OdnBs;-inDa$TN+ux5V3bc4 zAYL24;)8jApo*1X3+5z^(KKGZyi(titpd)KgODH2|Q#GS2r| z7W4BmviP4jkJ_SfYr};AgwaPl9B5*sn&infh=D@mJlVClM$Z7gg}@K)=M2vc3a46^ z+{!&2Az)rE&?^4ztCxD$HKXTteUr5gp~hpscTY37R=|eF+@xb^Glk#eVjTU~j!V_B zS-!ab@7hn2Po|zQ_el$FpyXHGukQHO0|Y57-#Au0&B_73n>fZcILsxW@wE@tU;1$)*(WJrC4tM|zO@ zqxx99kE^YRkgx~R#@4n5RE^J=tgQDIn={g6Y+&XQPuyH8=r2(SNF6mJNu11co+u3) zstO!V;q`Bg^_PnA-R1lANW|h(%fe&muXmHc;)6Z#o%zzHK&4@SRK)@p(bEEy07H znZyP(IVjlA@2!@Wmf^SU;&YkZNwTvFgoG;D%E>evm&Jf{wuOkokU6)f&ic8&FIJ>> z)0>nqFL-E=u4psu7I|g#wQ&Y_qsauc>%wA$M`C#!_H0=LmLapR4~nNfHpWyuJsAxW z3=YYOHaV1+)qBjmN&gO>NaQV@9JVRv78QL#6T8s4R&8GN5tqyZ-hMtknLXu{c6OLE zKUvBH39Z3GCT3bN&Jhqb+1;rUSx(f-fCn^r4=4o zH!fsVGA(p08VM9VV5@?;M&3UT%Z>UvUG(ux#th~NALs3gZgW~%2>lIa1AmD-q zD_%PO#$`e-t3-oXye3cvnX9Z>cotBm!UC(nMIW(4CSVBN<Cdv=L@ z1p5WNtVxv_ zU%%3yfe#?h^``kc1v>>q1sm5Zjc3<7c>7;=|KlSo(KOc1FHtT5>S(S&Ac7=i=j7Ba zcwpz?0BW=#4xlUooB~>u8uysI3Y`;+S|rBKRmXLl=cf3?U&6l(%CHQ~%!5EXcEsOZ ztr>3W>!ZUzRAApn0eMy{&@ky7rBRkXlFS#UIH5V}2_^~e!&Wld*51w^e^ZY?!SK%M z*a|0+?%e%LsG)|h+& zP@}8OcxGT=D$2|eLjlKV*yj&tRMt1Iz+`|L^mEU-{qHgX=qc;r~AW|NWE5<5T67lfi-4 VAG(*o&BM=Wsy}^LtZMQ8e*gnG(L?|M literal 0 HcmV?d00001 diff --git a/docs/website/sponsors.html b/docs/website/sponsors.html index 2f3f6309ae..9c17bed0c7 100644 --- a/docs/website/sponsors.html +++ b/docs/website/sponsors.html @@ -9,18 +9,40 @@
+
- - + +
- Tap2Open - financially sponsored the Buildroot Association - in 2020.
+ Smile sponsored the + Buildroot project by hosting + the Buildroot + Developers Meeting of February 2023 in Brussels, + after the FOSDEM + conference. +
+
+
+
+ +
+
+
+
+ + + +
+
+ Armadeus + Systems financially sponsored + the Buildroot + Association in 2022.
@@ -36,7 +58,7 @@
Logilin financially sponsored the Buildroot Association - in 2020.
+ in 2022.
@@ -44,23 +66,6 @@ -
-
Sponsor of the Buildroot.org domain
-
-
-

The Buildroot community would like to thank - Zillabit for - donating the buildroot.org domain name and sponsoring - the registration fees 2009 - 2019.

-
-
- - - -
-
-
-
Past sponsors
@@ -343,6 +348,24 @@
+
+
+
+
+
+ + + +
+
+ Tap2Open + financially sponsored the Buildroot Association + in 2020.
+
+
+
+
+ From 24c532c9f6885174ddf1a9621cc1d55412139676 Mon Sep 17 00:00:00 2001 From: Bartosz Golaszewski Date: Wed, 11 Jan 2023 08:55:14 +0100 Subject: [PATCH 0327/5754] DEVELOPERS: remove Bartosz Golaszewski It's been a while since I've even used buildroot at all and I don't really have any spare cycles to spend on maintaining its packages. Let's face reality and drop me from the DEVELOPERS file. Signed-off-by: Bartosz Golaszewski Signed-off-by: Peter Korsgaard --- DEVELOPERS | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 86e3f0e7b1..8e1d68c026 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -283,17 +283,6 @@ F: package/ttyd/ F: package/qt5/qt5scxml/ F: package/qt5/qt5webview/ -N: Bartosz Golaszewski -F: package/autoconf-archive/ -F: package/doxygen/ -F: package/libgpiod/ -F: package/libserialport/ -F: package/libsigrok/ -F: package/libsigrokdecode/ -F: package/libzip/ -F: package/pulseview/ -F: package/sigrok-cli/ - N: Baruch Siach F: board/solidrun/clearfog_gt_8k/ F: configs/solidrun_clearfog_gt_8k_defconfig From 693c88d9d276c16e7a3aad333cb20e56cfffbf20 Mon Sep 17 00:00:00 2001 From: Marcin Niestroj Date: Wed, 11 Jan 2023 18:58:36 +0100 Subject: [PATCH 0328/5754] boot/barebox: bump version to 2022.12.0 Signed-off-by: Marcin Niestroj Signed-off-by: Peter Korsgaard --- boot/barebox/Config.in | 4 ++-- boot/barebox/barebox.hash | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in index 726f0f980b..3961c69c56 100644 --- a/boot/barebox/Config.in +++ b/boot/barebox/Config.in @@ -12,7 +12,7 @@ choice Select the specific Barebox version you want to use config BR2_TARGET_BAREBOX_LATEST_VERSION - bool "2022.04.0" + bool "2022.12.0" config BR2_TARGET_BAREBOX_CUSTOM_VERSION bool "Custom version" @@ -40,7 +40,7 @@ endif config BR2_TARGET_BAREBOX_VERSION string - default "2022.04.0" if BR2_TARGET_BAREBOX_LATEST_VERSION + default "2022.12.0" if BR2_TARGET_BAREBOX_LATEST_VERSION default BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE if BR2_TARGET_BAREBOX_CUSTOM_VERSION default "custom" if BR2_TARGET_BAREBOX_CUSTOM_TARBALL default BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT diff --git a/boot/barebox/barebox.hash b/boot/barebox/barebox.hash index 3a92f7fd82..161fc43d43 100644 --- a/boot/barebox/barebox.hash +++ b/boot/barebox/barebox.hash @@ -1,8 +1,8 @@ -# From https://www.barebox.org/download/barebox-2021.12.0.tar.bz2.md5 -md5 e4970687cf7943eadf71b1ae6d344ff7 barebox-2022.04.0.tar.bz2 +# From https://www.barebox.org/download/barebox-2022.12.0.tar.bz2.md5 +md5 e4bf25cbf1e0b0c9a67ee56214617b9c barebox-2022.12.0.tar.bz2 # Locally calculated -sha256 f751b506deb0a5d82682a85cf65e329dd562e48ea057533dc5c8876120a09ebc barebox-2022.04.0.tar.bz2 +sha256 9f570d4ae089560bd6c17b2b7d21cdb6557ecb00612c77ecee72ac47575a6b74 barebox-2022.12.0.tar.bz2 # License files, locally computed sha256 ab1122aa9f9073ad1ec824edcd970b16a6a7881a34a18fd56c080debb2dca5d4 COPYING From ab8a8066f5cf397d98c76a06757a9523d25d6500 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Wed, 11 Jan 2023 20:05:01 -0800 Subject: [PATCH 0329/5754] package/go: bump version to 1.19.5 go1.19.5 (released 2023-01-10) includes fixes to the compiler, the linker, and the crypto/x509, net/http, sync/atomic, and syscall packages. https://github.com/golang/go/issues?q=milestone%3AGo1.19.5+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 d35db10213..4c22f0f274 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://go.dev/dl -sha256 eda74db4ac494800a3e66ee784e495bfbb9b8e535df924a8b01b1a8028b7f368 go1.19.4.src.tar.gz +sha256 8e486e8e85a281fc5ce3f0bedc5b9d2dbf6276d7db0b25d3ec034f313da0375f go1.19.5.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index 44e0c622c9..d3ed07f03b 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.19.4 +GO_VERSION = 1.19.5 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz From 57817fe05a4250a260a08201812c6652b306a0e5 Mon Sep 17 00:00:00 2001 From: Marcin Niestroj Date: Wed, 11 Jan 2023 18:57:48 +0100 Subject: [PATCH 0330/5754] package/parted: bump to version 3.5 Signed-off-by: Marcin Niestroj Signed-off-by: Peter Korsgaard --- package/parted/parted.hash | 2 +- package/parted/parted.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/parted/parted.hash b/package/parted/parted.hash index 392436ec4b..8a167d9bb8 100644 --- a/package/parted/parted.hash +++ b/package/parted/parted.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 e1298022472da5589b7f2be1d5ee3c1b66ec3d96dfbad03dc642afd009da5342 parted-3.4.tar.xz +sha256 4938dd5c1c125f6c78b1f4b3e297526f18ee74aa43d45c248578b1d2470c05a2 parted-3.5.tar.xz # Locally calculated sha256 0abbff814cd00e2b0b6d08395af2b419c1a92026c4b4adacbb65ccda45fa58cf COPYING diff --git a/package/parted/parted.mk b/package/parted/parted.mk index 23158179e4..6d4626e2e6 100644 --- a/package/parted/parted.mk +++ b/package/parted/parted.mk @@ -4,7 +4,7 @@ # ################################################################################ -PARTED_VERSION = 3.4 +PARTED_VERSION = 3.5 PARTED_SOURCE = parted-$(PARTED_VERSION).tar.xz PARTED_SITE = $(BR2_GNU_MIRROR)/parted PARTED_DEPENDENCIES = host-pkgconf util-linux From 56561f22b5b9971de67118bdb8db7f6b4af1c149 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 12 Jan 2023 12:20:28 +0100 Subject: [PATCH 0331/5754] package/intel-gmmlib: bump version to 22.3.3 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 d36bd8b9b6..693d9d0905 100644 --- a/package/intel-gmmlib/intel-gmmlib.hash +++ b/package/intel-gmmlib/intel-gmmlib.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 f725fbb4291ab67bbc7b31e1a268f523df384667360c931b40144db861be53d7 intel-gmmlib-22.3.2.tar.gz +sha256 86651bd2803c9f0afd82471bec784e65d2b418dee315a053d22215eb2a679be7 intel-gmmlib-22.3.3.tar.gz sha256 8b7446825df3f8b0268307e272aa6aaaf78351c83161d860d02c913c22666c48 LICENSE.md diff --git a/package/intel-gmmlib/intel-gmmlib.mk b/package/intel-gmmlib/intel-gmmlib.mk index ffd101808b..3eb3458ee7 100644 --- a/package/intel-gmmlib/intel-gmmlib.mk +++ b/package/intel-gmmlib/intel-gmmlib.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_GMMLIB_VERSION = 22.3.2 +INTEL_GMMLIB_VERSION = 22.3.3 INTEL_GMMLIB_SITE = https://github.com/intel/gmmlib/archive INTEL_GMMLIB_LICENSE = MIT INTEL_GMMLIB_LICENSE_FILES = LICENSE.md From c163b2c782e6034f0ae6d60c479d092a539263e0 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 12 Jan 2023 12:20:29 +0100 Subject: [PATCH 0332/5754] package/intel-mediadriver: bump version to 22.6.6 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 b2c45eb025..a5e9c64e97 100644 --- a/package/intel-mediadriver/intel-mediadriver.hash +++ b/package/intel-mediadriver/intel-mediadriver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 cbb6a514564f8c3349b1f78fc0906b636ea2074d7605cb0e820c5b727ce88cdc intel-media-22.6.5.tar.gz +sha256 b553290e829dfd824eb62295c9f07dbe8062ce7998f7c527cc92856d0792562d intel-media-22.6.6.tar.gz sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md diff --git a/package/intel-mediadriver/intel-mediadriver.mk b/package/intel-mediadriver/intel-mediadriver.mk index 8d3fc09260..8fa93218fa 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 = 22.6.5 +INTEL_MEDIADRIVER_VERSION = 22.6.6 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 7a029f6e8855b7c6b0b558a4f715d25faf1dba32 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 12 Jan 2023 12:52:29 +0100 Subject: [PATCH 0333/5754] package/fetchmail: bump version to 6.4.35 Release notes: https://sourceforge.net/p/fetchmail/mailman/message/37756758/ 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 4b2cf90ed8..bb03dcf94a 100644 --- a/package/fetchmail/fetchmail.hash +++ b/package/fetchmail/fetchmail.hash @@ -1,4 +1,4 @@ -# From https://sourceforge.net/p/fetchmail/mailman/message/37721221/ -sha256 c3bdded1b5ce236960bd1ceeee3f3257220ed99c3eec84a5d76bb5618e3258d4 fetchmail-6.4.34.tar.xz +# From https://sourceforge.net/p/fetchmail/mailman/message/37756758/ +sha256 7b0b56cbc0fca854504f167795fab532d5a54d5a7d3b6e3e36a33f34a0960a01 fetchmail-6.4.35.tar.xz # Locally computed: sha256 6d87443b61041067a5eddb2cabf8aebff15b8b40771ad6b5e4754e607ec21b39 COPYING diff --git a/package/fetchmail/fetchmail.mk b/package/fetchmail/fetchmail.mk index 063e41b2e1..d6053508a5 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).34 +FETCHMAIL_VERSION = $(FETCHMAIL_VERSION_MAJOR).35 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 250d7df53acdccdb3c65c941ad426f6cc0502996 Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Thu, 22 Dec 2022 06:37:10 +0000 Subject: [PATCH 0334/5754] configs/zynqmp_kria_kv260_defconfig: use CONFIG_MULTI_DTB_FIT When using the buildroot compiler, it builds the u-boot.itb immediately after building the fit-dtb.blob. This causes a build failure when using the CONFIG_MULTI_DTB_FIT build configuration. This patch adds the necessary dependency to guarantee that the fit-dtb.blob has finished building before trying to build the u-boot.itb. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3310463281 This patch has been submitted to u-boot mainline: https://lore.kernel.org/all/20221221075446.47141-1-neal.frager@amd.com/ Signed-off-by: Neal Frager Reviewed-by: Luca Ceresoli Signed-off-by: Peter Korsgaard --- board/zynqmp/kria/kv260/kv260.sh | 2 +- ...-0001-makefile-add-multi_dtb_fit-dep.patch | 32 +++++++++++++++++++ board/zynqmp/kria/uboot.fragment | 1 + configs/zynqmp_kria_kv260_defconfig | 1 + 4 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 board/zynqmp/kria/patches/uboot/v1-0001-makefile-add-multi_dtb_fit-dep.patch diff --git a/board/zynqmp/kria/kv260/kv260.sh b/board/zynqmp/kria/kv260/kv260.sh index e891852009..e3467f3068 100755 --- a/board/zynqmp/kria/kv260/kv260.sh +++ b/board/zynqmp/kria/kv260/kv260.sh @@ -8,5 +8,5 @@ UBOOT_DIR=$4 -fdtoverlay -o ${UBOOT_DIR}/arch/arm/dts/zynqmp-smk-k26-revA.dtb -i ${UBOOT_DIR}/arch/arm/dts/zynqmp-smk-k26-revA.dtb ${UBOOT_DIR}/arch/arm/dts/zynqmp-sck-kv-g-revB.dtbo +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/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 new file mode 100644 index 0000000000..ddc04cacac --- /dev/null +++ b/board/zynqmp/kria/patches/uboot/v1-0001-makefile-add-multi_dtb_fit-dep.patch @@ -0,0 +1,32 @@ +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/kria/uboot.fragment b/board/zynqmp/kria/uboot.fragment index 9e32edfb36..40709549dc 100644 --- a/board/zynqmp/kria/uboot.fragment +++ b/board/zynqmp/kria/uboot.fragment @@ -1,4 +1,5 @@ CONFIG_SYS_SPI_U_BOOT_OFFS=0xF80000 +CONFIG_MULTI_DTB_FIT=y CONFIG_DTB_RESELECT=y CONFIG_DMA=y CONFIG_XILINX_DPDMA=y diff --git a/configs/zynqmp_kria_kv260_defconfig b/configs/zynqmp_kria_kv260_defconfig index 5c53122b46..3214d45fa9 100644 --- a/configs/zynqmp_kria_kv260_defconfig +++ b/configs/zynqmp_kria_kv260_defconfig @@ -38,3 +38,4 @@ 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" From b3f5c5cb87b2f5d0e24b291697d959b8773e8b86 Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Thu, 22 Dec 2022 10:31:44 +0000 Subject: [PATCH 0335/5754] configs/zynqmp_kria_kv260_defconfig: fix linux dts name The Linux DTS name has changed for the zynqmp_kria_kv260 with Xilinx 2022.2. smk-k26-revA-sck-kv-g-revB has become zynqmp-smk-k26-revA-sck-kv-g-revB. This DTS corresponds to generating the zynqmp-smk-k26-revA.dtb for the k26 som and applying the zynqmp-sck-kv-g-revB.dtbo for the kv260 carrier board. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3477506541 Signed-off-by: Neal Frager Signed-off-by: Neal Frager Reviewed-by: Luca Ceresoli Signed-off-by: Peter Korsgaard --- configs/zynqmp_kria_kv260_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/zynqmp_kria_kv260_defconfig b/configs/zynqmp_kria_kv260_defconfig index 3214d45fa9..94631da034 100644 --- a/configs/zynqmp_kria_kv260_defconfig +++ b/configs/zynqmp_kria_kv260_defconfig @@ -8,7 +8,7 @@ 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_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/smk-k26-revA-sck-kv-g-revB" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-smk-k26-revA-sck-kv-g-revB" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y From 7e9929e9a826d93ff47060267fe6cc1d9ec35718 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 11 Jan 2023 09:55:22 +0100 Subject: [PATCH 0336/5754] configs/olimex_a20_olinuxino_lime*: bump Linux and U-Boot Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- 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 1bb628b56b..a0ebcaed66 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="5.15.71" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.86" 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="2022.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" 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 7105ea9962..f685d19421 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="5.15.71" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.86" 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="2022.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino-Lime" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y From 57a907fb3b1c303c2402268450616a13f8571a5d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 12 Jan 2023 12:42:58 +0100 Subject: [PATCH 0337/5754] package/perl-file-listing: bump version to 6.15 Updated license hash due to typo/whitespace-only fixes in license file. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/perl-file-listing/perl-file-listing.hash | 6 +++--- package/perl-file-listing/perl-file-listing.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/perl-file-listing/perl-file-listing.hash b/package/perl-file-listing/perl-file-listing.hash index 2358965714..cb52c127cd 100644 --- a/package/perl-file-listing/perl-file-listing.hash +++ b/package/perl-file-listing/perl-file-listing.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 cf60a79563185391831613178a79b4cd File-Listing-6.14.tar.gz -sha256 15b3a4871e23164a36f226381b74d450af41f12cc94985f592a669fcac7b48ff File-Listing-6.14.tar.gz +md5 8ba34641a6c5a2ec1b0bf7064f68c535 File-Listing-6.15.tar.gz +sha256 46c4fb9f9eb9635805e26b7ea55b54455e47302758a10ed2a0b92f392713770c File-Listing-6.15.tar.gz # computed by scancpan -sha256 7f0ccec295e6d7d2be1439cedd7caf6cc6247191f4c10ac56d91ee9bc265ba02 LICENSE +sha256 287e6f0fdf2db790a24975b492cde64b210c16af7137f44373cbd03fcf844212 LICENSE diff --git a/package/perl-file-listing/perl-file-listing.mk b/package/perl-file-listing/perl-file-listing.mk index 61bbc18eb8..c8584ffa8a 100644 --- a/package/perl-file-listing/perl-file-listing.mk +++ b/package/perl-file-listing/perl-file-listing.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_FILE_LISTING_VERSION = 6.14 +PERL_FILE_LISTING_VERSION = 6.15 PERL_FILE_LISTING_SOURCE = File-Listing-$(PERL_FILE_LISTING_VERSION).tar.gz PERL_FILE_LISTING_SITE = $(BR2_CPAN_MIRROR)/authors/id/P/PL/PLICEASE PERL_FILE_LISTING_LICENSE = Artistic or GPL-1.0+ From e35750b5246e1cd7bce0c53b6e32cca592c4f3ca Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 12 Jan 2023 12:42:59 +0100 Subject: [PATCH 0338/5754] package/perl-html-parser: bump version to 3.80 Updated license hash due to typo/whitespace-only fixes in license file: https://github.com/libwww-perl/HTML-Parser/commit/96192e7cb1f31559e8ad834fd5d7642d04e35f65#diff-c693279643b8cd5d248172d9c22cb7cf4ed163a3c98c8a3f69c2717edd3eacb7 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/perl-html-parser/perl-html-parser.hash | 6 +++--- package/perl-html-parser/perl-html-parser.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/perl-html-parser/perl-html-parser.hash b/package/perl-html-parser/perl-html-parser.hash index 36b094a7cb..ccd115d6c9 100644 --- a/package/perl-html-parser/perl-html-parser.hash +++ b/package/perl-html-parser/perl-html-parser.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 60e266d5a07fbea671a0383dd8af7b6c HTML-Parser-3.76.tar.gz -sha256 64d9e2eb2b420f1492da01ec0e6976363245b4be9290f03f10b7d2cb63fa2f61 HTML-Parser-3.76.tar.gz +md5 8e7151d08f30457a2ba80020b936285f HTML-Parser-3.80.tar.gz +sha256 63411db03016747e37c2636db11b05f8cc71608ef5bff36d04ddb0dc92f7835b HTML-Parser-3.80.tar.gz # computed by scancpan -sha256 0e57338bc10d5fb8891012ebee65a7b504b247f5bb485e121b8b48d7a118a60b LICENSE +sha256 9081922eb873ec1809c20672a7385a65f3c6b1163166bf69b2bbe986fb5b0159 LICENSE diff --git a/package/perl-html-parser/perl-html-parser.mk b/package/perl-html-parser/perl-html-parser.mk index 097564dbcb..1e1f8e6050 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.76 +PERL_HTML_PARSER_VERSION = 3.80 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 6e69d76aae479ab2d5f15baa79f25fd480e12eab Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 12 Jan 2023 12:43:00 +0100 Subject: [PATCH 0339/5754] package/perl-http-daemon: bump version to 6.14 Updated license hash due to typo/whitespace-only fixes in license file: https://github.com/libwww-perl/HTTP-Daemon/commit/605bc6efdabf39d2c9f9c7f613bf88d497454e5a#diff-b4668a52683f65fbc0528f6590ba160c9c64c88c302b6262c506266eb1d35180 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/perl-http-daemon/perl-http-daemon.hash | 6 +++--- package/perl-http-daemon/perl-http-daemon.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/perl-http-daemon/perl-http-daemon.hash b/package/perl-http-daemon/perl-http-daemon.hash index f8272a4fce..c19b3b9558 100644 --- a/package/perl-http-daemon/perl-http-daemon.hash +++ b/package/perl-http-daemon/perl-http-daemon.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 63674e3f81760a29075853413eb157d8 HTTP-Daemon-6.12.tar.gz -sha256 df47bed10c38670c780fd0116867d5fd4693604acde31ba63380dce04c4e1fa6 HTTP-Daemon-6.12.tar.gz +md5 3111b0081d08d8b225f52884033de349 HTTP-Daemon-6.14.tar.gz +sha256 f0767e7f3cbb80b21313c761f07ad8ed253bce9fa2d0ba806b3fb72d309b2e1d HTTP-Daemon-6.14.tar.gz # computed by scancpan -sha256 e84ac5ab84ace59952d2640e0ca4522eb0aaa8c2aa696352d1252aa109ea20bc LICENCE +sha256 311f168ba9a7819ffab4fea19858f9e880737baf6d112929d11530205035a4cc LICENCE diff --git a/package/perl-http-daemon/perl-http-daemon.mk b/package/perl-http-daemon/perl-http-daemon.mk index e475072628..fe50c768bf 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.12 +PERL_HTTP_DAEMON_VERSION = 6.14 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 79e8aad721099eb05e60b449432136691275022f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 12 Jan 2023 12:43:01 +0100 Subject: [PATCH 0340/5754] package/perl-http-message: bump version to 6.44 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/perl-http-message/perl-http-message.hash | 4 ++-- package/perl-http-message/perl-http-message.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/perl-http-message/perl-http-message.hash b/package/perl-http-message/perl-http-message.hash index 0e05da644e..94b5c06a4f 100644 --- a/package/perl-http-message/perl-http-message.hash +++ b/package/perl-http-message/perl-http-message.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 17ca8ec3be118d50c5299b232f3109d7 HTTP-Message-6.37.tar.gz -sha256 0e59da0a85e248831327ebfba66796314cb69f1bfeeff7a9da44ad766d07d802 HTTP-Message-6.37.tar.gz +md5 926a077669a7828c5ca39b5cf7735625 HTTP-Message-6.44.tar.gz +sha256 398b647bf45aa972f432ec0111f6617742ba32fc773c6612d21f64ab4eacbca1 HTTP-Message-6.44.tar.gz # computed by scancpan sha256 f2f428b5f8a3bf4e6a71cd5ea92558a3d123d3d7c5075d34923e71e46dea94df LICENSE diff --git a/package/perl-http-message/perl-http-message.mk b/package/perl-http-message/perl-http-message.mk index 79402c3298..67b68b0de2 100644 --- a/package/perl-http-message/perl-http-message.mk +++ b/package/perl-http-message/perl-http-message.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_HTTP_MESSAGE_VERSION = 6.37 +PERL_HTTP_MESSAGE_VERSION = 6.44 PERL_HTTP_MESSAGE_SOURCE = HTTP-Message-$(PERL_HTTP_MESSAGE_VERSION).tar.gz PERL_HTTP_MESSAGE_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS PERL_HTTP_MESSAGE_LICENSE = Artistic or GPL-1.0+ From 6375be324460f2e2de888e36f6b255b9033d5120 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 12 Jan 2023 12:43:03 +0100 Subject: [PATCH 0341/5754] package/perl-net-dns: bump version to 1.36 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/perl-net-dns/perl-net-dns.hash | 4 ++-- package/perl-net-dns/perl-net-dns.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/perl-net-dns/perl-net-dns.hash b/package/perl-net-dns/perl-net-dns.hash index 52f2f2bff2..a98ac3525d 100644 --- a/package/perl-net-dns/perl-net-dns.hash +++ b/package/perl-net-dns/perl-net-dns.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 f10276a44ce157cd5f709be4c70c34a8 Net-DNS-1.34.tar.gz -sha256 de756e3fb6addbd32beafc869c4dd1c6a0b3783c5ef56dbefc6809443a4b1d15 Net-DNS-1.34.tar.gz +md5 b70b74481908d995f57569ab7cfe6432 Net-DNS-1.36.tar.gz +sha256 143ba0e530f8b727be61ec052974cbf52df5b0afc0582d75b04809e0b2a95ebe Net-DNS-1.36.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 cfb16d8ded..f4c20c07ad 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.34 +PERL_NET_DNS_VERSION = 1.36 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 0d924b20fc4fc2c2dc5476d2e8975cb127e8868e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 12 Jan 2023 12:43:04 +0100 Subject: [PATCH 0342/5754] package/perl-uri: bump version to 5.17 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/perl-uri/perl-uri.hash | 4 ++-- package/perl-uri/perl-uri.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/perl-uri/perl-uri.hash b/package/perl-uri/perl-uri.hash index a169fc067d..daf043347f 100644 --- a/package/perl-uri/perl-uri.hash +++ b/package/perl-uri/perl-uri.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 d7fc1b1c88d03357aed2f03b455a223e URI-5.12.tar.gz -sha256 66abe0eaddd76b74801ecd28ec1411605887550fc0a45ef6aa744fdad768d9b3 URI-5.12.tar.gz +md5 63675c429cfb1df73d7d21a9302e1000 URI-5.17.tar.gz +sha256 5f7e42b769cb27499113cfae4b786c37d49e7c7d32dbb469602cd808308568f8 URI-5.17.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 b0ac885c10..d4bfcb44ef 100644 --- a/package/perl-uri/perl-uri.mk +++ b/package/perl-uri/perl-uri.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_URI_VERSION = 5.12 +PERL_URI_VERSION = 5.17 PERL_URI_SOURCE = URI-$(PERL_URI_VERSION).tar.gz PERL_URI_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS PERL_URI_LICENSE = Artistic or GPL-1.0+ From 3c21710040224448d71d4417e166cdd2c7f6a06b Mon Sep 17 00:00:00 2001 From: Nicolas Cavallari Date: Tue, 10 Jan 2023 10:35:37 +0100 Subject: [PATCH 0343/5754] package/iw: bump version to 5.19 Signed-off-by: Nicolas Cavallari Signed-off-by: Peter Korsgaard --- package/iw/iw.hash | 2 +- package/iw/iw.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/iw/iw.hash b/package/iw/iw.hash index 33dd117368..376dc3b499 100644 --- a/package/iw/iw.hash +++ b/package/iw/iw.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/software/network/iw/sha256sums.asc -sha256 4c44e42762f903f9094ba5a598998c800a97a62afd6fd31ec1e0a799e308659c iw-5.16.tar.xz +sha256 f167bbe947dd53bb9ebc0c1dcef5db6ad73ac1d6084f2c6f9376c5c360cc4d4e iw-5.19.tar.xz # Locally calculated sha256 5932fb70481e128940168a5fdf133e6454293c0865c7e757874b235cb6daa2af COPYING diff --git a/package/iw/iw.mk b/package/iw/iw.mk index 9bf6ddbfc6..60ada9d57f 100644 --- a/package/iw/iw.mk +++ b/package/iw/iw.mk @@ -4,7 +4,7 @@ # ################################################################################ -IW_VERSION = 5.16 +IW_VERSION = 5.19 IW_SOURCE = iw-$(IW_VERSION).tar.xz IW_SITE = $(BR2_KERNEL_MIRROR)/software/network/iw IW_LICENSE = ISC From e3842ca3c66c6368fd13a7329a518c4d02b1beb6 Mon Sep 17 00:00:00 2001 From: Marcin Niestroj Date: Tue, 10 Jan 2023 21:43:19 +0100 Subject: [PATCH 0344/5754] configs/chiliboard: bump linux to 6.1.4 Signed-off-by: Marcin Niestroj Signed-off-by: Peter Korsgaard --- configs/grinn_chiliboard_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/grinn_chiliboard_defconfig b/configs/grinn_chiliboard_defconfig index 80f3077b76..df483d991a 100644 --- a/configs/grinn_chiliboard_defconfig +++ b/configs/grinn_chiliboard_defconfig @@ -1,12 +1,12 @@ BR2_arm=y BR2_cortex_a8=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/grinn/chiliboard/genimage.cfg" 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.4" BR2_LINUX_KERNEL_DEFCONFIG="omap2plus" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-chiliboard" From 93d0979fbf063a8b65fd9d4c58891b21805804c6 Mon Sep 17 00:00:00 2001 From: Marcin Niestroj Date: Tue, 10 Jan 2023 21:43:20 +0100 Subject: [PATCH 0345/5754] configs/chiliboard: bump u-boot to 2023.01 Signed-off-by: Marcin Niestroj Signed-off-by: Peter Korsgaard --- configs/grinn_chiliboard_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/grinn_chiliboard_defconfig b/configs/grinn_chiliboard_defconfig index df483d991a..e7862d1738 100644 --- a/configs/grinn_chiliboard_defconfig +++ b/configs/grinn_chiliboard_defconfig @@ -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="2020.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="chiliboard" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y From d5c509bcc0e28a71d58248158e904315486624bd Mon Sep 17 00:00:00 2001 From: Marcin Niestroj Date: Tue, 10 Jan 2023 21:43:41 +0100 Subject: [PATCH 0346/5754] configs/liteboard: bump linux to 6.1.4 Signed-off-by: Marcin Niestroj Signed-off-by: Peter Korsgaard --- configs/grinn_liteboard_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/grinn_liteboard_defconfig b/configs/grinn_liteboard_defconfig index 9cad66e15a..ab22911d66 100644 --- a/configs/grinn_liteboard_defconfig +++ b/configs/grinn_liteboard_defconfig @@ -1,12 +1,12 @@ BR2_arm=y BR2_cortex_a7=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/grinn/liteboard/genimage.cfg" 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.4" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ul-liteboard" From 895a5562c02b7f1ac762f17dcd08ee8b2a39e4f1 Mon Sep 17 00:00:00 2001 From: Marcin Niestroj Date: Tue, 10 Jan 2023 21:43:42 +0100 Subject: [PATCH 0347/5754] configs/liteboard: bump u-boot to 2023.01 Signed-off-by: Marcin Niestroj Signed-off-by: Peter Korsgaard --- configs/grinn_liteboard_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/grinn_liteboard_defconfig b/configs/grinn_liteboard_defconfig index ab22911d66..3ae4a2a0b5 100644 --- a/configs/grinn_liteboard_defconfig +++ b/configs/grinn_liteboard_defconfig @@ -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="liteboard" BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMG=y From 3949fe31120917b2bac139fbfc6f285ef0f780ef Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 10 Jan 2023 18:16:00 -0700 Subject: [PATCH 0348/5754] package/python-maturin: bump to version 0.14.9 Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- 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 9d68751c03..b104b1fbbe 100644 --- a/package/python-maturin/python-maturin.hash +++ b/package/python-maturin/python-maturin.hash @@ -1,5 +1,5 @@ # Locally calculated after vendoring -sha256 383f60977a330ec8699a51c37ea9c5175ee7e95fc36b06d9415e0eec1f3acaf0 maturin-0.14.5.tar.gz +sha256 59157a06c0a482aec750d64746f2b23e556ce3ec62d9cdce74fcb7b4658b722b maturin-0.14.9.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 4570ad4535..3484e09d22 100644 --- a/package/python-maturin/python-maturin.mk +++ b/package/python-maturin/python-maturin.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MATURIN_VERSION = 0.14.5 +PYTHON_MATURIN_VERSION = 0.14.9 PYTHON_MATURIN_SOURCE = maturin-$(PYTHON_MATURIN_VERSION).tar.gz -PYTHON_MATURIN_SITE = https://files.pythonhosted.org/packages/36/83/2bdec738921e253d774ab8b9e99f4540a406ad0d8a1442c84575e5506686 +PYTHON_MATURIN_SITE = https://files.pythonhosted.org/packages/90/f9/f4242c0e8bc5def9a7135c12574449dbb411ecc595cf72202ca97a79c2ad PYTHON_MATURIN_SETUP_TYPE = setuptools PYTHON_MATURIN_LICENSE = Apache-2.0 or MIT PYTHON_MATURIN_LICENSE_FILES = license-apache license-mit From 19eaece70a9c7aac8b26bd09c1a49b30e29f824a Mon Sep 17 00:00:00 2001 From: Marcin Niestroj Date: Tue, 10 Jan 2023 22:40:07 +0100 Subject: [PATCH 0349/5754] board/orangepi-zero-plus: bump Linux/U-Boot and switch to extlinux Follow changes to other OrangePi boards, most importantly orangepi-zero-plus2, which this board support is based on. This includes switching to extlinux as boot mechanism and dropping custom U-Boot boot script. Rootfs image no longer fits into default 60M (mostly due to Linux modules), so increase it to 120M. While at it, bump Linux to 6.1.4 and U-Boot to 2023.01. Signed-off-by: Marcin Niestroj Signed-off-by: Peter Korsgaard --- board/orangepi/orangepi-zero-plus/boot.cmd | 6 --- .../orangepi/orangepi-zero-plus/genimage.cfg | 40 ------------------- configs/orangepi_zero_plus_defconfig | 27 +++++++------ 3 files changed, 15 insertions(+), 58 deletions(-) delete mode 100644 board/orangepi/orangepi-zero-plus/boot.cmd delete mode 100644 board/orangepi/orangepi-zero-plus/genimage.cfg diff --git a/board/orangepi/orangepi-zero-plus/boot.cmd b/board/orangepi/orangepi-zero-plus/boot.cmd deleted file mode 100644 index 18c4d521af..0000000000 --- a/board/orangepi/orangepi-zero-plus/boot.cmd +++ /dev/null @@ -1,6 +0,0 @@ -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait - -fatload mmc 0 $kernel_addr_r Image -fatload mmc 0 $fdt_addr_r sun50i-h5-orangepi-zero-plus.dtb - -booti $kernel_addr_r - $fdt_addr_r diff --git a/board/orangepi/orangepi-zero-plus/genimage.cfg b/board/orangepi/orangepi-zero-plus/genimage.cfg deleted file mode 100644 index a8f3161c39..0000000000 --- a/board/orangepi/orangepi-zero-plus/genimage.cfg +++ /dev/null @@ -1,40 +0,0 @@ -image boot.vfat { - vfat { - files = { - "Image", - "sun50i-h5-orangepi-zero-plus.dtb", - "boot.scr" - } - } - - size = 64M -} - -image sdcard.img { - hdimage { - } - - partition spl { - in-partition-table = "no" - image = "sunxi-spl.bin" - offset = 8K - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot.itb" - offset = 40K - size = 1M # 1MB - 40KB - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/configs/orangepi_zero_plus_defconfig b/configs/orangepi_zero_plus_defconfig index e8de5c203d..26a25bd9f8 100644 --- a/configs/orangepi_zero_plus_defconfig +++ b/configs/orangepi_zero_plus_defconfig @@ -2,7 +2,7 @@ BR2_aarch64=y BR2_cortex_a53=y BR2_ARM_FPU_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_7=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y BR2_SYSTEM_DHCP="eth0" @@ -17,35 +17,38 @@ 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="2020.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero_plus" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin" -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-zero-plus/boot.cmd" +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" +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.7.19" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.4" 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" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y # Filesystem BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi Zero Plus" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y -BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" + +# host tools BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y + +# image scripts +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 board/orangepi/orangepi-zero-plus/genimage.cfg" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" From bb066af7f9d84abf890c5692879477aaca36bff8 Mon Sep 17 00:00:00 2001 From: Lang Daniel Date: Mon, 9 Jan 2023 08:51:56 +0000 Subject: [PATCH 0350/5754] package/libsigc: bump to version 3.4.0 https://github.com/libsigcplusplus/libsigcplusplus/blob/3.4.0/NEWS Signed-off-by: Daniel Lang Signed-off-by: Peter Korsgaard --- package/libsigc/libsigc.hash | 4 ++-- package/libsigc/libsigc.mk | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/libsigc/libsigc.hash b/package/libsigc/libsigc.hash index 046584fc2b..a358732faa 100644 --- a/package/libsigc/libsigc.hash +++ b/package/libsigc/libsigc.hash @@ -1,5 +1,5 @@ -# From http://ftp.gnome.org/pub/gnome/sources/libsigc++/3.2/libsigc++-3.2.0.sha256sum -sha256 8cdcb986e3f0a7c5b4474aa3c833d676e62469509f4899110ddf118f04082651 libsigc++-3.2.0.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/libsigc++/3.4/libsigc++-3.4.0.sha256sum +sha256 02e2630ffb5ce93cd52c38423521dfe7063328863a6e96d41d765a6116b8707e libsigc++-3.4.0.tar.xz # Locally calculated sha256 97628afebc60f026f5c2b25d7491c46a5c4ee61f693e7cfa07fbd2c03605979b COPYING diff --git a/package/libsigc/libsigc.mk b/package/libsigc/libsigc.mk index eca4111ff6..2de49a0c1c 100644 --- a/package/libsigc/libsigc.mk +++ b/package/libsigc/libsigc.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSIGC_VERSION_MAJOR = 3.2 +LIBSIGC_VERSION_MAJOR = 3.4 LIBSIGC_VERSION = $(LIBSIGC_VERSION_MAJOR).0 LIBSIGC_SOURCE = libsigc++-$(LIBSIGC_VERSION).tar.xz LIBSIGC_SITE = http://ftp.gnome.org/pub/GNOME/sources/libsigc++/$(LIBSIGC_VERSION_MAJOR) @@ -13,6 +13,7 @@ LIBSIGC_LICENSE = LGPL-3.0+ LIBSIGC_LICENSE_FILES = COPYING LIBSIGC_CONF_OPTS = \ -Dbuild-examples=false \ + -Dbuild-tests=false \ -Dvalidation=false $(eval $(meson-package)) From 21175102a0cd544a789c3cedead7d5141191275c Mon Sep 17 00:00:00 2001 From: Lang Daniel Date: Mon, 9 Jan 2023 08:52:18 +0000 Subject: [PATCH 0351/5754] package/libsigc: switch to https download Signed-off-by: Daniel Lang Signed-off-by: Peter Korsgaard --- package/libsigc/libsigc.hash | 2 +- package/libsigc/libsigc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libsigc/libsigc.hash b/package/libsigc/libsigc.hash index a358732faa..6becfb19ce 100644 --- a/package/libsigc/libsigc.hash +++ b/package/libsigc/libsigc.hash @@ -1,4 +1,4 @@ -# From http://ftp.gnome.org/pub/gnome/sources/libsigc++/3.4/libsigc++-3.4.0.sha256sum +# From https://download.gnome.org/sources/libsigc++/3.4/libsigc++-3.4.0.sha256sum sha256 02e2630ffb5ce93cd52c38423521dfe7063328863a6e96d41d765a6116b8707e libsigc++-3.4.0.tar.xz # Locally calculated diff --git a/package/libsigc/libsigc.mk b/package/libsigc/libsigc.mk index 2de49a0c1c..c054575ea6 100644 --- a/package/libsigc/libsigc.mk +++ b/package/libsigc/libsigc.mk @@ -7,7 +7,7 @@ LIBSIGC_VERSION_MAJOR = 3.4 LIBSIGC_VERSION = $(LIBSIGC_VERSION_MAJOR).0 LIBSIGC_SOURCE = libsigc++-$(LIBSIGC_VERSION).tar.xz -LIBSIGC_SITE = http://ftp.gnome.org/pub/GNOME/sources/libsigc++/$(LIBSIGC_VERSION_MAJOR) +LIBSIGC_SITE = https://download.gnome.org/sources/libsigc++/$(LIBSIGC_VERSION_MAJOR) LIBSIGC_INSTALL_STAGING = YES LIBSIGC_LICENSE = LGPL-3.0+ LIBSIGC_LICENSE_FILES = COPYING From 189543e4ab6c421001209423cce45c75e3242d75 Mon Sep 17 00:00:00 2001 From: Lang Daniel Date: Mon, 9 Jan 2023 08:52:42 +0000 Subject: [PATCH 0352/5754] DEVELOPERS: add Daniel Lang for package/libsigc Signed-off-by: Daniel Lang Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 8e1d68c026..e8e0dffcd3 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -639,6 +639,7 @@ F: package/dacapo/ N: Daniel Lang F: package/dbus-cxx/ +F: package/libsigc/ F: package/paho-mqtt-cpp/ N: Damien Lanson From f397197b3658968931a5a4b273fcebf5fdca1569 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 9 Jan 2023 00:16:11 -0700 Subject: [PATCH 0353/5754] package/python-ujson: bump to version 5.7.0 Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-ujson/python-ujson.hash | 4 ++-- package/python-ujson/python-ujson.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-ujson/python-ujson.hash b/package/python-ujson/python-ujson.hash index 3dfc681167..759cafc250 100644 --- a/package/python-ujson/python-ujson.hash +++ b/package/python-ujson/python-ujson.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/ujson/json -md5 45a74680e2936470821bf74a8f043a71 ujson-5.6.0.tar.gz -sha256 f881e2d8a022e9285aa2eab6ba8674358dbcb2b57fa68618d88d62937ac3ff04 ujson-5.6.0.tar.gz +md5 f93bd7aa33e3e6ed41c9e3782abe7b48 ujson-5.7.0.tar.gz +sha256 e788e5d5dcae8f6118ac9b45d0b891a0d55f7ac480eddcb7f07263f2bcf37b23 ujson-5.7.0.tar.gz # Locally computed sha256 checksums sha256 6a00a8f8b4050303368b694147bde1aed9c96bdff869c181dbbf3ccb784a1501 LICENSE.txt diff --git a/package/python-ujson/python-ujson.mk b/package/python-ujson/python-ujson.mk index 24ad4822b8..3afd33cb5a 100644 --- a/package/python-ujson/python-ujson.mk +++ b/package/python-ujson/python-ujson.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_UJSON_VERSION = 5.6.0 +PYTHON_UJSON_VERSION = 5.7.0 PYTHON_UJSON_SOURCE = ujson-$(PYTHON_UJSON_VERSION).tar.gz -PYTHON_UJSON_SITE = https://files.pythonhosted.org/packages/45/48/466d672c53fcb93d64a2817e3a0306214103e3baba109821c88e1150c100 +PYTHON_UJSON_SITE = https://files.pythonhosted.org/packages/43/1a/b0a027144aa5c8f4ea654f4afdd634578b450807bb70b9f8bad00d6f6d3c PYTHON_UJSON_SETUP_TYPE = setuptools PYTHON_UJSON_LICENSE = BSD-3-Clause PYTHON_UJSON_LICENSE_FILES = LICENSE.txt From 0a598dedd8090d3c7ba4ea8c323a702289586647 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 9 Jan 2023 00:18:50 -0700 Subject: [PATCH 0354/5754] package/python-watchdog: bump to version 2.2.1 Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-watchdog/python-watchdog.hash | 4 ++-- package/python-watchdog/python-watchdog.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-watchdog/python-watchdog.hash b/package/python-watchdog/python-watchdog.hash index 3bacccf2d6..0653787110 100644 --- a/package/python-watchdog/python-watchdog.hash +++ b/package/python-watchdog/python-watchdog.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/watchdog/json -md5 d029b806814bcba26745c26769a847bc watchdog-2.2.0.tar.gz -sha256 83cf8bc60d9c613b66a4c018051873d6273d9e45d040eed06d6a96241bd8ec01 watchdog-2.2.0.tar.gz +md5 04cda210c7ffd04582d2466328ee7368 watchdog-2.2.1.tar.gz +sha256 cdcc23c9528601a8a293eb4369cbd14f6b4f34f07ae8769421252e9c22718b6f watchdog-2.2.1.tar.gz # Locally computed sha256 checksums sha256 02c8760f988a76e92a9d6cb525456a86f7b0fd1953870dd491de5955cb974d41 COPYING sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/python-watchdog/python-watchdog.mk b/package/python-watchdog/python-watchdog.mk index bb9f145e16..9c058e38ad 100644 --- a/package/python-watchdog/python-watchdog.mk +++ b/package/python-watchdog/python-watchdog.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_WATCHDOG_VERSION = 2.2.0 +PYTHON_WATCHDOG_VERSION = 2.2.1 PYTHON_WATCHDOG_SOURCE = watchdog-$(PYTHON_WATCHDOG_VERSION).tar.gz -PYTHON_WATCHDOG_SITE = https://files.pythonhosted.org/packages/c3/fb/bd960970258366b0704307ccd12617d64201407bfb6d31ae412d2762ccf1 +PYTHON_WATCHDOG_SITE = https://files.pythonhosted.org/packages/11/6f/0396d373e039b89c60e23a1a9025edc6dd203121fe0af7d1427e85d5ec98 PYTHON_WATCHDOG_SETUP_TYPE = setuptools PYTHON_WATCHDOG_LICENSE = Apache-2.0 PYTHON_WATCHDOG_LICENSE_FILES = LICENSE COPYING From 6abb8721dbf0987ec43f248c84ce4f0f4d11b697 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 9 Jan 2023 00:21:38 -0700 Subject: [PATCH 0355/5754] package/python-weasyprint: bump to version 57.2 Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- 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 4da8ea479a..d6026cf034 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 bab389bdfb25e03d64591c56367fb344 weasyprint-57.1.tar.gz -sha256 397a9d11298f94485ec3b7b68aeef1c6106fb638350126d9d4a64109b73508a0 weasyprint-57.1.tar.gz +md5 497030cecafffca06bae2b161846b461 weasyprint-57.2.tar.gz +sha256 b8e9ef2dcbcfbc82e99215acfd68f947b2b5f1999b5b156db75fabe380ba7e9a weasyprint-57.2.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 d1e5e7983d..27b07226d9 100644 --- a/package/python-weasyprint/python-weasyprint.mk +++ b/package/python-weasyprint/python-weasyprint.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_WEASYPRINT_VERSION = 57.1 +PYTHON_WEASYPRINT_VERSION = 57.2 PYTHON_WEASYPRINT_SOURCE = weasyprint-$(PYTHON_WEASYPRINT_VERSION).tar.gz -PYTHON_WEASYPRINT_SITE = https://files.pythonhosted.org/packages/32/3f/d305dc714c119e5b11c0ea1ecff9741407b6da90d6b684859d3b3e586692 +PYTHON_WEASYPRINT_SITE = https://files.pythonhosted.org/packages/b1/88/335dd6cb71a9d58584c975bf1db0ab9a3a9f15f9bffef1cbfac0fb1ee72e PYTHON_WEASYPRINT_SETUP_TYPE = flit PYTHON_WEASYPRINT_LICENSE = BSD-3-Clause PYTHON_WEASYPRINT_LICENSE_FILES = LICENSE From fbdc0f8ef8bdbe919925e281b2d5ce1583fd1aab Mon Sep 17 00:00:00 2001 From: Titouan Christophe Date: Mon, 9 Jan 2023 08:23:55 +0100 Subject: [PATCH 0356/5754] package/redis: bump to v7.0.7 From the release notes (https://github.com/redis/redis/blob/7.0.7/00-RELEASENOTES) ================================================================================ Redis 7.0.7 Released Fri Dec 16 12:00:00 IST 2022 ================================================================================ Upgrade urgency: MODERATE, Contains fix for a regression in Geo commands. ================================================================================ Redis 7.0.6 Released Mon Dec 12 12:00:00 IST 2022 ================================================================================ Upgrade urgency: MODERATE, Contains fixes for a few non-critical or unlikely bugs, and some dramatic optimizations to Geo, EVAL, and Sorted sets commands. 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 a10df46031..eb8c21be98 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 67054cc37b58c125df93bd78000261ec0ef4436a26b40f38262c780e56315cc3 redis-7.0.5.tar.gz +sha256 8d327d7e887d1bb308fc37aaf717a0bf79f58129e3739069aaeeae88955ac586 redis-7.0.7.tar.gz # Locally calculated sha256 97f0a15b7bbae580d2609dad2e11f1956ae167be296ab60f4691ab9c30ee9828 COPYING diff --git a/package/redis/redis.mk b/package/redis/redis.mk index 7a637c106c..b08be11538 100644 --- a/package/redis/redis.mk +++ b/package/redis/redis.mk @@ -4,7 +4,7 @@ # ################################################################################ -REDIS_VERSION = 7.0.5 +REDIS_VERSION = 7.0.7 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 f675fd79d57fc6c8fe0b15fe1c3e3d5aabcd8bd2 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 9 Jan 2023 00:25:05 -0700 Subject: [PATCH 0357/5754] package/python-web2py: bump to version 2.23.0 Signed-off-by: James Hilliard 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 dbf85437f2..a853497768 100644 --- a/package/python-web2py/python-web2py.hash +++ b/package/python-web2py/python-web2py.hash @@ -1,3 +1,3 @@ # sha256 locally computed -sha256 d4a15fc15254d3fa9e9e9b5a726ae51a0989b7d740d53fd7c3d5b81ac6b8274e python-web2py-2.22.5.tar.gz +sha256 356f88b671e2bcdd9c89df526ee063ee9d6f4f57b60182ec2684adddcc426e99 python-web2py-2.23.0.tar.gz sha256 2aae96826184a492bc799add49aed7b29036e7aba2d2294fb65053bd30fe55fe LICENSE diff --git a/package/python-web2py/python-web2py.mk b/package/python-web2py/python-web2py.mk index b9a4e95609..4425b09d12 100644 --- a/package/python-web2py/python-web2py.mk +++ b/package/python-web2py/python-web2py.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_WEB2PY_VERSION = 2.22.5 +PYTHON_WEB2PY_VERSION = 2.23.0 PYTHON_WEB2PY_SITE = $(call github,web2py,web2py,v$(PYTHON_WEB2PY_VERSION)) PYTHON_WEB2PY_LICENSE = LGPL-3.0 PYTHON_WEB2PY_LICENSE_FILES = LICENSE From 431683def0785583705fb32dc1a54f82da65e423 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 9 Jan 2023 00:28:00 -0700 Subject: [PATCH 0358/5754] package/python-xlsxwriter: bump to version 3.0.6 License hash changed due to date update: https://github.com/jmcnamara/XlsxWriter/commit/ba92afc31a232322597709bf7ad4a3b14ca7b293 Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-xlsxwriter/python-xlsxwriter.hash | 6 +++--- package/python-xlsxwriter/python-xlsxwriter.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-xlsxwriter/python-xlsxwriter.hash b/package/python-xlsxwriter/python-xlsxwriter.hash index 4363799079..4a4b946fcb 100644 --- a/package/python-xlsxwriter/python-xlsxwriter.hash +++ b/package/python-xlsxwriter/python-xlsxwriter.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/xlsxwriter/json -md5 b08fcc4753c14aa64b9d99219475d91e XlsxWriter-3.0.3.tar.gz -sha256 e89f4a1d2fa2c9ea15cde77de95cd3fd8b0345d0efb3964623f395c8c4988b7f XlsxWriter-3.0.3.tar.gz +md5 3df433a1b6427d40af6e7cac36f0b5c4 XlsxWriter-3.0.6.tar.gz +sha256 2f9e5ea13343fe85486e349d4e5fdf746bb69dc7bc1dedfa9b5fae2bb48c0795 XlsxWriter-3.0.6.tar.gz # Locally computed sha256 checksums -sha256 6287be39bd007c8729f5c3cf8dfda9b462af725c1d06e3bf0e17b1532196a08f LICENSE.txt +sha256 b3b494c7e7456dad12ac1b3e61c60e850d60d3ce865fa056c4ce0ae680c03677 LICENSE.txt diff --git a/package/python-xlsxwriter/python-xlsxwriter.mk b/package/python-xlsxwriter/python-xlsxwriter.mk index 4055e52622..f05b10670c 100644 --- a/package/python-xlsxwriter/python-xlsxwriter.mk +++ b/package/python-xlsxwriter/python-xlsxwriter.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_XLSXWRITER_VERSION = 3.0.3 +PYTHON_XLSXWRITER_VERSION = 3.0.6 PYTHON_XLSXWRITER_SOURCE = XlsxWriter-$(PYTHON_XLSXWRITER_VERSION).tar.gz -PYTHON_XLSXWRITER_SITE = https://files.pythonhosted.org/packages/53/04/91ff43803c3e88c32aa272fdbda5859fc3c3b50b0de3a1e439cc57455330 +PYTHON_XLSXWRITER_SITE = https://files.pythonhosted.org/packages/d4/b5/cef6fadeaf316a3bbe82a506252081f2e6533cdf4b69ed64f8831ac01fb0 PYTHON_XLSXWRITER_SETUP_TYPE = setuptools PYTHON_XLSXWRITER_LICENSE = BSD-2-Clause PYTHON_XLSXWRITER_LICENSE_FILES = LICENSE.txt From cbc80c75570f535e991297602191c724ff33a04d Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 8 Jan 2023 21:34:03 +0100 Subject: [PATCH 0359/5754] package/libpjsip: security bump to version 2.13 - Fix CVE-2022-39269, CVE-2022-39244 and CVE-2022-31031: https://github.com/pjsip/pjproject/security/advisories/GHSA-wx5m-cj97-4wwg https://github.com/pjsip/pjproject/security/advisories/GHSA-fq45-m3f7-3mhj https://github.com/pjsip/pjproject/security/advisories/GHSA-26j7-ww69-c4qj - Drop patch (already in version) - libuuid configure option is available since https://github.com/pjsip/pjproject/commit/0b0488f17b41c5323028b522cc7323f2cd9b684c - libupnp is an optional dependency since https://github.com/pjsip/pjproject/commit/82247cb8c0441d0eafd18cb69e6c7bf55fc6a088 - libsrtp is optional since https://github.com/pjsip/pjproject/commit/fe6cbbc39764cae8ff6789a98f8ef8e85c63445c https://github.com/pjsip/pjproject/releases/tag/2.13 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...ull-request-from-GHSA-26j7-ww69-c4qj.patch | 44 ------------------- package/libpjsip/Config.in | 1 - package/libpjsip/libpjsip.hash | 2 +- package/libpjsip/libpjsip.mk | 28 +++++++++--- 4 files changed, 22 insertions(+), 53 deletions(-) delete mode 100644 package/libpjsip/0001-Merge-pull-request-from-GHSA-26j7-ww69-c4qj.patch diff --git a/package/libpjsip/0001-Merge-pull-request-from-GHSA-26j7-ww69-c4qj.patch b/package/libpjsip/0001-Merge-pull-request-from-GHSA-26j7-ww69-c4qj.patch deleted file mode 100644 index 42b842a616..0000000000 --- a/package/libpjsip/0001-Merge-pull-request-from-GHSA-26j7-ww69-c4qj.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 450baca94f475345542c6953832650c390889202 Mon Sep 17 00:00:00 2001 -From: sauwming -Date: Tue, 7 Jun 2022 12:00:13 +0800 -Subject: [PATCH] Merge pull request from GHSA-26j7-ww69-c4qj - -[Retrieved from: -https://github.com/pjsip/pjproject/commit/450baca94f475345542c6953832650c390889202] -Signed-off-by: Fabrice Fontaine ---- - pjlib-util/src/pjlib-util/stun_simple.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/pjlib-util/src/pjlib-util/stun_simple.c b/pjlib-util/src/pjlib-util/stun_simple.c -index 722519584..d0549176d 100644 ---- a/pjlib-util/src/pjlib-util/stun_simple.c -+++ b/pjlib-util/src/pjlib-util/stun_simple.c -@@ -54,6 +54,7 @@ PJ_DEF(pj_status_t) pjstun_parse_msg( void *buf, pj_size_t buf_len, - { - pj_uint16_t msg_type, msg_len; - char *p_attr; -+ int attr_max_cnt = PJ_ARRAY_SIZE(msg->attr); - - PJ_CHECK_STACK(); - -@@ -83,7 +84,7 @@ PJ_DEF(pj_status_t) pjstun_parse_msg( void *buf, pj_size_t buf_len, - msg->attr_count = 0; - p_attr = (char*)buf + sizeof(pjstun_msg_hdr); - -- while (msg_len > 0) { -+ while (msg_len > 0 && msg->attr_count < attr_max_cnt) { - pjstun_attr_hdr **attr = &msg->attr[msg->attr_count]; - pj_uint32_t len; - pj_uint16_t attr_type; -@@ -111,6 +112,10 @@ PJ_DEF(pj_status_t) pjstun_parse_msg( void *buf, pj_size_t buf_len, - p_attr += len; - ++msg->attr_count; - } -+ if (msg->attr_count == attr_max_cnt) { -+ PJ_LOG(4, (THIS_FILE, "Warning: max number attribute %d reached.", -+ attr_max_cnt)); -+ } - - return PJ_SUCCESS; - } diff --git a/package/libpjsip/Config.in b/package/libpjsip/Config.in index 727d2ec3d0..980fada3d5 100644 --- a/package/libpjsip/Config.in +++ b/package/libpjsip/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_LIBPJSIP bool "libpjsip" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS - select BR2_PACKAGE_LIBSRTP help PJSIP is a free and open source multimedia communication library written in C language implementing standard based diff --git a/package/libpjsip/libpjsip.hash b/package/libpjsip/libpjsip.hash index b1ccdb2f37..9935575567 100644 --- a/package/libpjsip/libpjsip.hash +++ b/package/libpjsip/libpjsip.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 d0feef6963b07934e821ba4328aecb4c36358515c1b3e507da5874555d713533 pjproject-2.12.1.tar.gz +sha256 4178bb9f586299111463fc16ea04e461adca4a73e646f8ddef61ea53dafa92d9 pjproject-2.13.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk index 4134d40da8..5cc0423f5d 100644 --- a/package/libpjsip/libpjsip.mk +++ b/package/libpjsip/libpjsip.mk @@ -4,11 +4,10 @@ # ################################################################################ -LIBPJSIP_VERSION = 2.12.1 +LIBPJSIP_VERSION = 2.13 LIBPJSIP_SOURCE = pjproject-$(LIBPJSIP_VERSION).tar.gz LIBPJSIP_SITE = $(call github,pjsip,pjproject,$(LIBPJSIP_VERSION)) -LIBPJSIP_DEPENDENCIES = libsrtp LIBPJSIP_LICENSE = GPL-2.0+ LIBPJSIP_LICENSE_FILES = COPYING LIBPJSIP_CPE_ID_VENDOR = teluu @@ -16,9 +15,6 @@ LIBPJSIP_CPE_ID_PRODUCT = pjsip LIBPJSIP_INSTALL_STAGING = YES LIBPJSIP_MAKE = $(MAKE1) -# 0001-Merge-pull-request-from-GHSA-26j7-ww69-c4qj.patch -LIBPJSIP_IGNORE_CVES += CVE-2022-31031 - LIBPJSIP_CFLAGS = $(TARGET_CFLAGS) -DPJ_HAS_IPV6=1 # relocation truncated to fit: R_68K_GOT16O @@ -40,8 +36,7 @@ LIBPJSIP_CONF_OPTS = \ --disable-l16-codec \ --disable-g722-codec \ --disable-ipp \ - --disable-silk \ - --with-external-srtp + --disable-silk # Note: aconfigure.ac is broken: --enable-epoll or --disable-epoll will # both enable it. But that's OK, epoll is better than the alternative, @@ -103,6 +98,22 @@ else LIBPJSIP_CONF_OPTS += --disable-libsamplerate endif +ifeq ($(BR2_PACKAGE_LIBSRTP),y) +LIBPJSIP_DEPENDENCIES += libsrtp +LIBPJSIP_CONF_OPTS += \ + --enable-libsrtp \ + --with-external-srtp +else +LIBPJSIP_CONF_OPTS += --disable-libsrtp +endif + +ifeq ($(BR2_PACKAGE_LIBUPNP),y) +LIBPJSIP_DEPENDENCIES += libupnp +LIBPJSIP_CONF_OPTS += --with-upnp=$(STAGING_DIR)/usr +else +LIBPJSIP_CONF_OPTS += --disable-upnp +endif + ifeq ($(BR2_PACKAGE_LIBV4L),y) # --enable-v4l2 is broken (check for libv4l2 will be omitted) LIBPJSIP_DEPENDENCIES += libv4l @@ -161,6 +172,9 @@ endif ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y) LIBPJSIP_DEPENDENCIES += util-linux +LIBPJSIP_CONF_OPTS += --enable-libuuid +else +LIBPJSIP_CONF_OPTS += --disable-libuuid endif # disable build of test binaries From bb79d78554632e96df52f41333aa62f928b6817f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 8 Jan 2023 20:14:05 +0100 Subject: [PATCH 0360/5754] package/wireshark: fix legal info Commit 4aca99f51cc97cfc3bcd3affa65f4694004dd444 forgot to update hash of COPYING file and add hash of README.md due to the following commit which moved the introductory note about the GPL from the COPYING license text file to the README: https://github.com/wireshark/wireshark/commit/d2b6b89b94bd3e18520c472affae9cd4a03283e2 Fixes: - http://autobuild.buildroot.org/results/aaed32b55cc56beb32152ed61ac9b7f69d3ebef5 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/wireshark/wireshark.hash | 3 ++- package/wireshark/wireshark.mk | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/wireshark/wireshark.hash b/package/wireshark/wireshark.hash index ae06ab09b7..e9026b8caa 100644 --- a/package/wireshark/wireshark.hash +++ b/package/wireshark/wireshark.hash @@ -3,4 +3,5 @@ sha1 0127180ff18515b086fe5603f767f53ddaa64c1a wireshark-4.0.2.tar.xz sha256 f35915699f2f9b28ddb211202d40ec8984e5834d3c911483144a4984ba44411d wireshark-4.0.2.tar.xz # Locally calculated -sha256 7cdbed2b697efaa45576a033f1ac0e73cd045644a91c79bbf41d4a7d81dac7bf COPYING +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 fce67c1558e448fac784ce9a30cb47956488bc3ef6ec16316c38b0668b3cad2e README.md diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index ee3d6b1905..e2a424ef0f 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -8,7 +8,7 @@ WIRESHARK_VERSION = 4.0.2 WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.xz WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions WIRESHARK_LICENSE = wireshark license -WIRESHARK_LICENSE_FILES = COPYING +WIRESHARK_LICENSE_FILES = COPYING README.md WIRESHARK_CPE_ID_VENDOR = wireshark WIRESHARK_SELINUX_MODULES = wireshark WIRESHARK_DEPENDENCIES = \ From 49ca11e339c41ea2dd0484556b7b5beacff9fee9 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 8 Jan 2023 20:56:26 +0100 Subject: [PATCH 0361/5754] package/trinity: fix build with kernel >= 6.1 Fix the following build failure with kernel >= 6.1: net/proto-decnet.c:5:10: fatal error: linux/dn.h: No such file or directory 5 | #include | ^~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/47e0a5e0b6fcf33ab4f9848d5d8c2be9e5283950 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/trinity/0004-drop-decnet.patch | 130 +++++++++++++++++++++++++ 1 file changed, 130 insertions(+) create mode 100644 package/trinity/0004-drop-decnet.patch diff --git a/package/trinity/0004-drop-decnet.patch b/package/trinity/0004-drop-decnet.patch new file mode 100644 index 0000000000..15ba7f8e82 --- /dev/null +++ b/package/trinity/0004-drop-decnet.patch @@ -0,0 +1,130 @@ +From ec8dcc7faf13c57f5f6d785e4429818f1239a058 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 8 Jan 2023 20:50:18 +0100 +Subject: [PATCH] drop decnet + +Drop decnet as it has been removed since kernel 6.1 and +https://github.com/torvalds/linux/commit/1202cdd665315c525b5237e96e0bedc76d7e754f +resulting in the following build failure: + +net/proto-decnet.c:5:10: fatal error: linux/dn.h: No such file or directory + 5 | #include + | ^~~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/47e0a5e0b6fcf33ab4f9848d5d8c2be9e5283950 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/kernelslacker/trinity/pull/41] +--- + include/net.h | 1 - + net/proto-decnet.c | 59 ---------------------------------------------- + net/proto-unix.c | 1 - + net/protocols.c | 1 - + 4 files changed, 62 deletions(-) + delete mode 100644 net/proto-decnet.c + +diff --git a/include/net.h b/include/net.h +index 99d55363..791e8090 100644 +--- a/include/net.h ++++ b/include/net.h +@@ -80,7 +80,6 @@ extern const struct netproto proto_atmpvc; + extern const struct netproto proto_atmsvc; + extern const struct netproto proto_x25; + extern const struct netproto proto_rose; +-extern const struct netproto proto_decnet; + extern const struct netproto proto_llc; + extern const struct netproto proto_netlink; + extern const struct netproto proto_packet; +diff --git a/net/proto-decnet.c b/net/proto-decnet.c +deleted file mode 100644 +index 7711cf00..00000000 +--- a/net/proto-decnet.c ++++ /dev/null +@@ -1,59 +0,0 @@ +-#include +-#include +-#include +-#include +-#include +-#include +-#include "net.h" +-#include "random.h" +-#include "utils.h" // RAND_ARRAY +-#include "compat.h" +- +-static void decnet_gen_sockaddr(struct sockaddr **addr, socklen_t *addrlen) +-{ +- struct sockaddr_dn *dn; +- unsigned int i; +- +- dn = zmalloc(sizeof(struct sockaddr_dn)); +- +- dn->sdn_family = PF_DECnet; +- dn->sdn_flags = rnd(); +- dn->sdn_objnum = rnd(); +- dn->sdn_objnamel = rnd() % 16; +- for (i = 0; i < dn->sdn_objnamel; i++) +- dn->sdn_objname[i] = rnd(); +- dn->sdn_add.a_len = RAND_BOOL(); +- dn->sdn_add.a_addr[0] = rnd(); +- dn->sdn_add.a_addr[1] = rnd(); +- *addr = (struct sockaddr *) dn; +- *addrlen = sizeof(struct sockaddr_dn); +-} +- +-static const unsigned int decnet_opts[] = { +- SO_CONDATA, SO_CONACCESS, SO_PROXYUSR, SO_LINKINFO, +- DSO_CONDATA, DSO_DISDATA, DSO_CONACCESS, DSO_ACCEPTMODE, +- DSO_CONACCEPT, DSO_CONREJECT, DSO_LINKINFO, DSO_STREAM, +- DSO_SEQPACKET, DSO_MAXWINDOW, DSO_NODELAY, DSO_CORK, +- DSO_SERVICES, DSO_INFO +-}; +- +-static void decnet_setsockopt(struct sockopt *so, __unused__ struct socket_triplet *triplet) +-{ +- so->level = SOL_DECNET; +- so->optname = RAND_ARRAY(decnet_opts); +- +- // TODO: set optlen correctly +-} +- +-static struct socket_triplet decnet_triplets[] = { +- { .family = PF_DECnet, .protocol = DNPROTO_NSP, .type = SOCK_SEQPACKET }, +- { .family = PF_DECnet, .protocol = DNPROTO_NSP, .type = SOCK_STREAM }, +-}; +- +-const struct netproto proto_decnet = { +- .name = "decnet", +- .setsockopt = decnet_setsockopt, +- .gen_sockaddr = decnet_gen_sockaddr, +- .valid_triplets = decnet_triplets, +- .nr_triplets = ARRAY_SIZE(decnet_triplets), +-}; +diff --git a/net/proto-unix.c b/net/proto-unix.c +index f7427a22..119c1429 100644 +--- a/net/proto-unix.c ++++ b/net/proto-unix.c +@@ -2,7 +2,6 @@ + #include + #include + #include +-#include + #include + #include "net.h" + #include "random.h" +diff --git a/net/protocols.c b/net/protocols.c +index ea64d5f5..278f08b5 100644 +--- a/net/protocols.c ++++ b/net/protocols.c +@@ -18,7 +18,6 @@ const struct protoptr net_protocols[TRINITY_PF_MAX] = { + #ifdef USE_IPV6 + [PF_INET6] = { .proto = &proto_inet6 }, + #endif +- [PF_DECnet] = { .proto = &proto_decnet }, + [PF_PACKET] = { .proto = &proto_packet }, + #ifdef USE_NETECONET + [PF_ECONET] = { .proto = &proto_econet }, +-- +2.39.0 + From 9103c8f2e94f69d7ef392746aa53bbf2f468a008 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 4 Jan 2023 10:03:17 +0100 Subject: [PATCH 0362/5754] package/perl: bump to version 5.36.0 Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/perl/perl.hash | 8 ++++---- package/perl/perl.mk | 4 ++-- utils/scancpan | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package/perl/perl.hash b/package/perl/perl.hash index 9ec2b42e34..b21023f730 100644 --- a/package/perl/perl.hash +++ b/package/perl/perl.hash @@ -1,7 +1,7 @@ -# Hashes from: https://www.cpan.org/src/5.0/perl-5.34.1.tar.xz.{md5,sha1,sha256}.txt -md5 7d2ece7f50775ea1ff739831935a24bd perl-5.34.1.tar.xz -sha1 e7dbef3c1ea7caa73e2c705bba9e4bfb92ea98f0 perl-5.34.1.tar.xz -sha256 6d52cf833ff1af27bb5e986870a2c30cec73c044b41e3458cd991f94374039f7 perl-5.34.1.tar.xz +# 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 # 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 diff --git a/package/perl/perl.mk b/package/perl/perl.mk index 27acfaeff2..9be00e1b2c 100644 --- a/package/perl/perl.mk +++ b/package/perl/perl.mk @@ -5,8 +5,8 @@ ################################################################################ # When updating the version here, also update utils/scancpan -PERL_VERSION_MAJOR = 34 -PERL_VERSION = 5.$(PERL_VERSION_MAJOR).1 +PERL_VERSION_MAJOR = 36 +PERL_VERSION = 5.$(PERL_VERSION_MAJOR).0 PERL_SITE = https://www.cpan.org/src/5.0 PERL_SOURCE = perl-$(PERL_VERSION).tar.xz PERL_LICENSE = Artistic or GPL-1.0+ diff --git a/utils/scancpan b/utils/scancpan index 48f8bd83b7..e7739a8ad1 100755 --- a/utils/scancpan +++ b/utils/scancpan @@ -488,9 +488,9 @@ use Digest::SHA qw(sha256_hex); use Text::Wrap; $Text::Wrap::columns = 62; -# Below, 5.034 should be aligned with the version of perl actually +# Below, 5.036 should be aligned with the version of perl actually # bundled in Buildroot: -die <<"MSG" if $] < 5.034; +die <<"MSG" if $] < 5.036; This script needs a host perl with the same major version as Buildroot target perl. Your current host perl is: @@ -498,7 +498,7 @@ Your current host perl is: version $] You may install a local one by running: - perlbrew install perl-5.34.0 + perlbrew install perl-5.36.0 MSG my ($help, $man, $quiet, $force, $recommend, $test, $host); @@ -967,7 +967,7 @@ in order to work with the right CoreList data. =head1 LICENSE -Copyright (C) 2013-2020 by Francois Perrad +Copyright (C) 2013-2023 by Francois Perrad 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 From 035f18db042d218777394b868beadc575976a5ac Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 8 Jan 2023 20:15:14 +0100 Subject: [PATCH 0363/5754] package/crun: needs gcc >= 4.9 crun unconditionally uses atomic_bool when libgcrypt is found since version 1.7.1 and https://github.com/containers/crun/commit/40f66c0a74b8d918ecc7ae9228dca32a4fd71084 resulting in the following build failure with gcc 4.8 since commit 6987b92da510a8c8b9534a22506850c163d0f035: src/libcrun/seccomp.c: In function 'calculate_seccomp_checksum': src/libcrun/seccomp.c:374:3: error: unknown type name 'atomic_bool' static atomic_bool initialized = false; ^ Fixes: - http://autobuild.buildroot.org/results/924806ffd6d83cd6d8226577c3877b0b8ca2722d Signed-off-by: Fabrice Fontaine Reviewed-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/crun/Config.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/crun/Config.in b/package/crun/Config.in index fa0894e126..45c86f0655 100644 --- a/package/crun/Config.in +++ b/package/crun/Config.in @@ -1,6 +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_YAJL # libocispec help @@ -8,5 +9,6 @@ config BR2_PACKAGE_CRUN https://github.com/containers/crun -comment "crun needs a glibc or musl toolchain" - depends on BR2_TOOLCHAIN_USES_UCLIBC +comment "crun needs a glibc or musl toolchain, gcc >= 4.9" + depends on BR2_TOOLCHAIN_USES_UCLIBC || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 From 479b042433447214cf318964cc7557b6b5f5d05f Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 12 Jan 2023 18:57:33 +0100 Subject: [PATCH 0364/5754] {linux, linux-headers}: bump 4.9.x / 5.{10, 15}.x / 6.{0, 1}.x series 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 bca1b3fc8b..e18b515311 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.1.2" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.1.5" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.145-cip17" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.145-cip17-rt7" 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 8ac04b60f9..157f267a9d 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 ee41f3c4f599b2f46f08aae428c9243db403e7292eb2c9f04ee34909b038d1ae linux-6.1.2.tar.xz -sha256 842071bca611c1f080cbc39c7ab3a6b58d7951f4f41e553b3db4fbe3e0705ce4 linux-6.0.16.tar.xz +sha256 bc7f6d9a8a8bbe9a723e82346bba94b58d926f78bfba106b21e041e0290076fc linux-6.1.5.tar.xz +sha256 abe37eb0e2e331bdc7c4110115664e180e7d43b7336de6b4cd2bd1b123d30207 linux-6.0.19.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 80fcd9efa443502de9e2750f6dfb59e8de43a5d87a6d2be09dca748d79b5f2ee linux-5.15.86.tar.xz -sha256 7aaaf6d0bcd8a2cfa14ad75f02ca62bb2de08aad3bee3eff198de49ea5254079 linux-5.10.161.tar.xz +sha256 e7359bd2935b54fe8bb821cf748591c36a95bed019e752d3e4d5803d9da1ccb4 linux-5.15.87.tar.xz +sha256 2ec400fc50ffdfe4c836a3c02bf6e7aebcd7963dd2ac1425e6d41545c37dd217 linux-5.10.162.tar.xz sha256 80253b2cac54c256dfdfd1061800aef907f88432090f7aef74c0ddf50f6e6524 linux-5.4.228.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 1f6de11306cc9f82fe1d4dd03565cdf43906fa6f77302913d942fd63b77b500c linux-4.9.336.tar.xz +sha256 5385aaec55c766e3f462511453f5c63d7898b2d0e9ea74f22a23ebbedab0b3c6 linux-4.9.337.tar.xz sha256 e32a230d71072a4ee50bd4386aa23ca4e617b8ad07b6f9fb223b65bf004c4c80 linux-4.14.302.tar.xz sha256 6e0ba5d224ab216b7b938cc9ff2478be7882a884bbdf15374149bade4d58b20a linux-4.19.269.tar.xz # Locally computed diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 216b496fe4..1ad9fffcd3 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -396,14 +396,14 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.9.336" if BR2_KERNEL_HEADERS_4_9 + default "4.9.337" if BR2_KERNEL_HEADERS_4_9 default "4.14.302" if BR2_KERNEL_HEADERS_4_14 default "4.19.269" if BR2_KERNEL_HEADERS_4_19 default "5.4.228" if BR2_KERNEL_HEADERS_5_4 - default "5.10.161" if BR2_KERNEL_HEADERS_5_10 - default "5.15.86" if BR2_KERNEL_HEADERS_5_15 - default "6.0.16" if BR2_KERNEL_HEADERS_6_0 - default "6.1.2" if BR2_KERNEL_HEADERS_6_1 + default "5.10.162" if BR2_KERNEL_HEADERS_5_10 + default "5.15.87" if BR2_KERNEL_HEADERS_5_15 + default "6.0.19" if BR2_KERNEL_HEADERS_6_0 + default "6.1.5" 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 d6469c513d5ee9b46c1a7484b93f1c50162aa359 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 12 Jan 2023 20:09:14 +0100 Subject: [PATCH 0365/5754] package/{mesa3d, mesa3d-headers}: bump version to 22.3.3 Release notes: https://lists.freedesktop.org/archives/mesa-announce/2023-January/000699.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 f6b3ade3ea..c1765c3eaa 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.2 +MESA3D_HEADERS_VERSION = 22.3.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 e902e6b828..c2ceaa6ead 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/mesa-dev/2022-December/225903.html -sha256 c15df758a8795f53e57f2a228eb4593c22b16dffd9b38f83901f76cd9533140b mesa-22.3.2.tar.xz -sha512 32934dd23cfcd6165c365597d9a469da0b806b72ea98a200f499344c3b47815db3bf78875b4ea766d2d28d9c70b50c1615d2d3fcbfd4769447fe0a9d3b32951f mesa-22.3.2.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2023-January/000699.html +sha256 bed799788bf2bd9ef079d97cd8e09348bf53cb086818578e40773b2b17812922 mesa-22.3.3.tar.xz +sha512 dcf166bc7c80e6ad09337e0188219e5ea4bdc558bc4b4ca35ce30d5421568f6b5328e5508b3175a2696521214e466354d8652ade22468ce448d9f61d5709c8a1 mesa-22.3.3.tar.xz # License sha256 a00275a53178e2645fb65be99a785c110513446a5071ff2c698ed260ad917d75 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 523b642d0c..9fa2c05230 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.2 +MESA3D_VERSION = 22.3.3 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos From 0da2742abbe2123d8bafe30e307b94c2b72f94cd Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Wed, 11 Jan 2023 17:14:31 -0700 Subject: [PATCH 0366/5754] package/{rust, rust-bin}: security bump to version 1.66.1 Fixes CVE-2022-46176: Cargo did not perform SSH host key verification when cloning indexes and dependencies via SSH https://blog.rust-lang.org/2023/01/10/cve-2022-46176.html Link to Rust 1.66.1 announcement: https://blog.rust-lang.org/2023/01/10/Rust-1.66.1.html Newest version of the source archives have been retrieved with their hash values, and the signature of the .asc files have been verified as follows: $ curl -fsSL https://static.rust-lang.org/rust-key.gpg.ascii | gpg --import $ gpg --verify There is no typographical error in the packages according to the check-pakage utility: $ ./utils/check-package package/rust-bin/* $ ./utils/check-package package/rust/* The testsuite tool were successfully run for rust and rust-bin packages to test the Rust toolchain under 1.66.1: $ ./support/testing/run-tests -k -d dl/ -o testsuite tests.package.test_rust.TestRustBin $ ./support/testing/run-tests -k -d dl/ -o testsuite tests.package.test_rust.TestRust In order to verify the compatibility of packages depending on Rust 1.66.1, tests using `./utils/test-pkg` were run. You may want to execute the test-pkg command after creating a `.config` file enabling the corresponding BR2_PACKAGE, for example: Create a file `buildroot/ripgrep.config` containing "BR2_PACKAGE_RIPGREP=y" Then execute: $ ./utils/test-pkg -d test-pkg -c ripgrep.config -p ripgrep Results: librsvg OK ripgrep OK suricata OK bat OK 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 7cc1052dd9..adf1799ad7 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.66.0-aarch64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.66.0-aarch64-unknown-linux-gnu.tar.xz.asc -sha256 e8d853383355aa17fd8d7efae740ac0f18b3a5f452c9ac62f5042fc96ebda3e9 rust-1.66.0-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.66.0-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.66.0-i686-unknown-linux-gnu.tar.xz.asc -sha256 c9551f9650fcaf74ea4fb6874b6853f9ffecb6925e7a087afb4f36840e5b7b8d rust-1.66.0-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.66.0-mips-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.66.0-mips-unknown-linux-gnu.tar.xz.asc -sha256 ec49ef94889c88f8fd107e9c263003aa6dcd9fb4d17ba057ffab4e4dc28fefd4 rust-1.66.0-mips-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.66.0-mipsel-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.66.0-mipsel-unknown-linux-gnu.tar.xz.asc -sha256 755bcca28ee9d4504b7bd87265dc492a8e39550211f8081740940ada9e48cc7e rust-1.66.0-mipsel-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.66.0-powerpc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.66.0-powerpc-unknown-linux-gnu.tar.xz.asc -sha256 eaaca0295a75a180082456eb3606e6c3fbc16a4f2b54bd754caab5a69b192f88 rust-1.66.0-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.66.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.66.0-powerpc64-unknown-linux-gnu.tar.xz.asc -sha256 a194c1a8f1bd8c450872ad2220bfe74e590c5706d4ec939577c69a013a0bbcff rust-1.66.0-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.66.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.66.0-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 9fa197239eb374e071ef4486939c4713a2d662c5e7ebca0505626a3a53a7ed75 rust-1.66.0-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.66.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.66.0-riscv64gc-unknown-linux-gnu.tar.xz.asc -sha256 6331e676198af2e75734f6566ca62ae22bb61b1d55e749494c454e777a73f195 rust-1.66.0-riscv64gc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.66.0-s390x-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.66.0-s390x-unknown-linux-gnu.tar.xz.asc -sha256 8d7053db5ea68f4801c7a808a222473076b8a602af70379975e81eede8a7e0ea rust-1.66.0-s390x-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.66.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.66.0-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 a656328e1cd36b253bf39807b5a3eacdf0ce7d982fc9fb51a026f273386de84a rust-1.66.0-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-aarch64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-aarch64-unknown-linux-gnu.tar.xz.asc -sha256 b5ac5985a8fefd2a0de67197f7c2549aacee502cc784a3c3c93921b005aa31fa rust-std-1.66.0-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-aarch64-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-aarch64-unknown-linux-musl.tar.xz.asc -sha256 ca62347018d1ace5e13a4a2f898dd2b19d5cb96db41482119418538f6482e2db rust-std-1.66.0-aarch64-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-arm-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-arm-unknown-linux-gnueabi.tar.xz.asc -sha256 c8d10c558605673fe975b3b1c8ec8d2a9887f18cb97690bf900c19668b6d05ba rust-std-1.66.0-arm-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-arm-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-arm-unknown-linux-gnueabihf.tar.xz.asc -sha256 70650b3a8c04c183a83a2a4ebee7047d6546e69a81e227c24afa6d34ad54fe9b rust-std-1.66.0-arm-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-arm-unknown-linux-musleabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-arm-unknown-linux-musleabihf.tar.xz.asc -sha256 262a2024250e4aa7865a33d52d9b6826b5f059f0562a73f6067a04020879d4f0 rust-std-1.66.0-arm-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-arm-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-arm-unknown-linux-musleabi.tar.xz.asc -sha256 e41c5f840d73ed1073ef3a8abb125e6f41a66008ad7817fb2a1e703cf93f0a8b rust-std-1.66.0-arm-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-armv5te-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-armv5te-unknown-linux-gnueabi.tar.xz.asc -sha256 8b8ab8fe4af3ce9604e264fada7ddaed610d8e517d8425d5d85184ea4f111b52 rust-std-1.66.0-armv5te-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-armv5te-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-armv5te-unknown-linux-musleabi.tar.xz.asc -sha256 ec0552562348852c487e401168a0ad5f9e90cfc4cf03f5200f80b6594aa47d6d rust-std-1.66.0-armv5te-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-armv7-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-armv7-unknown-linux-gnueabihf.tar.xz.asc -sha256 5d166402813621d8c426bdb7dc857f97c72c921c2f2b52a893639a4c73862838 rust-std-1.66.0-armv7-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-armv7-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-armv7-unknown-linux-gnueabi.tar.xz.asc -sha256 a7170034ddb9218f4f78d6a1d8f8d7ce8c17419015393a96a24aa13f9c89da2d rust-std-1.66.0-armv7-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-armv7-unknown-linux-musleabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-armv7-unknown-linux-musleabihf.tar.xz.asc -sha256 fbc7e7565196fb7ec18b9b2ef0c8a1267fb4825bf68ff0559c0956841d5ade14 rust-std-1.66.0-armv7-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-armv7-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-armv7-unknown-linux-musleabi.tar.xz.asc -sha256 7caecb4b926d78ec879e53eaaa4d8001ef575cd80e6340e0518545fd8500eb8f rust-std-1.66.0-armv7-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-i586-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-i586-unknown-linux-gnu.tar.xz.asc -sha256 b22aaa59dee87dfc504f7e37ec1f297bbbe3f9ca5a7e4177d40975f2b4b32570 rust-std-1.66.0-i586-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-i586-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-i586-unknown-linux-musl.tar.xz.asc -sha256 b538209ea82733f25d88e3a9dc7d7b00f23f61ede128142412404c37846bad69 rust-std-1.66.0-i586-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-i686-unknown-linux-gnu.tar.xz.asc -sha256 5c7da9cc8d71e72021bfcc8040a6d2c248127d1fbed12d81e2e4bdf61c70b8d6 rust-std-1.66.0-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-i686-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-i686-unknown-linux-musl.tar.xz.asc -sha256 3f14c6381c74b175e32ce0f2e6337811a5ea2cc048239fc55101b6319b0ce7f8 rust-std-1.66.0-i686-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-mips-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-mips-unknown-linux-gnu.tar.xz.asc -sha256 8909dff6e3fd2c0a2f7c747d8c31003cf6d4fd2ea877ddb933b3fd7861c1cf87 rust-std-1.66.0-mips-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-mips-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-mips-unknown-linux-musl.tar.xz.asc -sha256 e76c5fea6da85b42a6f313cc326d064067314532d6a057cfc95f733c2f019de1 rust-std-1.66.0-mips-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-mips64-unknown-linux-gnuabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-mips64-unknown-linux-gnuabi64.tar.xz.asc -sha256 26e5304dc5d592b2a34933794c4636220ad86d78e9c639e36c18f46d3a8c0235 rust-std-1.66.0-mips64-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-mips64-unknown-linux-muslabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-mips64-unknown-linux-muslabi64.tar.xz.asc -sha256 a621c95eef9b548d59234beeea031cc369d5744312a5ebfe4ac2250cb1b900e8 rust-std-1.66.0-mips64-unknown-linux-muslabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-mips64el-unknown-linux-gnuabi64.tar.xz.asc -sha256 41b2e528e2b123220b2dbc8b6bf93986c22d86091f7cd653ac55d1b169720e1f rust-std-1.66.0-mips64el-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-mips64el-unknown-linux-muslabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-mips64el-unknown-linux-muslabi64.tar.xz.asc -sha256 28de7df8cead0a09a6c4dbb3be6898f7bb495c803e5d1f15945dd66a60ebb2c4 rust-std-1.66.0-mips64el-unknown-linux-muslabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-mipsel-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-mipsel-unknown-linux-gnu.tar.xz.asc -sha256 519403a99b0859f21d4cabd347bada629f24fff913dafc54af255e4776d18f1b rust-std-1.66.0-mipsel-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-mipsel-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-mipsel-unknown-linux-musl.tar.xz.asc -sha256 d1a8d76bd7549b3845dad92cdab45876c987e7ba6a27ea67f39414d498a66761 rust-std-1.66.0-mipsel-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-powerpc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-powerpc-unknown-linux-gnu.tar.xz.asc -sha256 b68691f94417033b612f0fdb510d385499558ea19dcf2caf02a5c1d7141816fd rust-std-1.66.0-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-powerpc64-unknown-linux-gnu.tar.xz.asc -sha256 0be870ead23d432b83981a45b37bb173315965485ef9ad6dcee1418702a26a3a rust-std-1.66.0-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 ed05f169784776c94c4880281fbabab66b49ed05a221d8e06c6926e1161b8bbe rust-std-1.66.0-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-riscv64gc-unknown-linux-gnu.tar.xz.asc -sha256 93a8b0514106c8039a8767b961090e8a0f8e4b62d1488e70e93e2e553860f70c rust-std-1.66.0-riscv64gc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-s390x-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-s390x-unknown-linux-gnu.tar.xz.asc -sha256 304008a504385f91672ab6ddf86b50f05a588432f01537049f4fbe95f8d41402 rust-std-1.66.0-s390x-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-sparc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-sparc64-unknown-linux-gnu.tar.xz.asc -sha256 107045313c7b6678579eba1fb0b96519585a2e282570635c64c02ef4544aacaa rust-std-1.66.0-sparc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 c59ca7959a019f3f660c1f46bea3c13e7769b67732731469c0c42d02f28d08e7 rust-std-1.66.0-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.66.0-x86_64-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.66.0-x86_64-unknown-linux-musl.tar.xz.asc -sha256 b4dbc07eb417f77d9b794546d647f014d1650e1e0c0e76ff3d878dc09479e320 rust-std-1.66.0-x86_64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-1.66.1-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.66.1-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 a1279760f91b3571733e0b0268128d143be2734916753900b5fe7b8ecc3c0900 rust-1.66.1-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.66.1-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.66.1-i686-unknown-linux-gnu.tar.xz.asc +sha256 835b4e1b4d396674f7866a83b9a4f44db16fd12f01a7eaed527282b3700a9b92 rust-1.66.1-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.66.1-mips-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.66.1-mips-unknown-linux-gnu.tar.xz.asc +sha256 c7349617c42274bf50f6e3662dfb4f6832a93780099c3bb510be1a5b93d04c37 rust-1.66.1-mips-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.66.1-mipsel-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.66.1-mipsel-unknown-linux-gnu.tar.xz.asc +sha256 fc38663870f0af47a27241d980ca886c3f7d432267920deb412ac8576bef68f0 rust-1.66.1-mipsel-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.66.1-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.66.1-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 2b1a6c54db49a9e62d60cc96c1768f405e0f4c59d698186bf3a28a1bb017b6b5 rust-1.66.1-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.66.1-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.66.1-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 777d3a650448c15048710282388e90d10740540f570f5d17ed4a2dbdabb89552 rust-1.66.1-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 875bb310bae7c8c1d2d228a49aa4b547608b6c807ddc9ec44bc87272c77d869b rust-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz.asc +sha256 89164ccf75909b3d02bdcb787e33876cad87e55ab0e6239b030b4b6631ed356a rust-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.66.1-s390x-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.66.1-s390x-unknown-linux-gnu.tar.xz.asc +sha256 e83f9fc473072db23376783595a008cdd9b2f2e9b3be109e55939392864840eb rust-1.66.1-s390x-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.66.1-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.66.1-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 a201aa4595ec8015662b7103b1409a4787c6d1f1d540bb68746633527d855858 rust-1.66.1-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 9d96ba6a5a255339cd04af079d906753d56c85503c727279c227d24bd4987e24 rust-std-1.66.1-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-aarch64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-aarch64-unknown-linux-musl.tar.xz.asc +sha256 520ac446f20490685cc4d73192cfbb4c9b9e55c884aa4ae2b098e3a54d891de8 rust-std-1.66.1-aarch64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-gnueabi.tar.xz.asc +sha256 42afd189ef64988f64976f767a734734bccd7c71e578780e902148c98226fa29 rust-std-1.66.1-arm-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-gnueabihf.tar.xz.asc +sha256 506126773af9c3dacc506776a0b2e12fe6fa0c95eaf4f4ebb5cdbd335feb83fa rust-std-1.66.1-arm-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-musleabihf.tar.xz.asc +sha256 3d21b478fbf07bd27902bdd189e6988341f0c2c0108b538f926cea3031bc8ea6 rust-std-1.66.1-arm-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-arm-unknown-linux-musleabi.tar.xz.asc +sha256 5282fc97111a7eafbead3463ed7bc0f3065332f21aec6a39a740157fe42f943a rust-std-1.66.1-arm-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-armv5te-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-armv5te-unknown-linux-gnueabi.tar.xz.asc +sha256 0ebf0178bbe9c5572d1db89e190dee23aef0e2f667995abedbd66e33d0bd73ab rust-std-1.66.1-armv5te-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-armv5te-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-armv5te-unknown-linux-musleabi.tar.xz.asc +sha256 938e7442c21ea0895c44ec78fa718ea1d3abe32ed0425ed328c905e188af250e rust-std-1.66.1-armv5te-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-gnueabihf.tar.xz.asc +sha256 bdc491f4c05669e7a3382b6bfdaeaa20e2cfa5ef553305df0e0d73729a45e6e4 rust-std-1.66.1-armv7-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-gnueabi.tar.xz.asc +sha256 d75c6dc3c00d662b0d3f6ce7fde0f76057542edfbc97a20b29247842c8a711d2 rust-std-1.66.1-armv7-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-musleabihf.tar.xz.asc +sha256 830285e5388081c68fac9dc955aa824a4d919b0e24eadc6e0b95b30103d79db9 rust-std-1.66.1-armv7-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-armv7-unknown-linux-musleabi.tar.xz.asc +sha256 d720bd1e493f53797f90d83dbe6d52ecbe1ff3cae282f4b2e18c37fe92c9adf6 rust-std-1.66.1-armv7-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-i586-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-i586-unknown-linux-gnu.tar.xz.asc +sha256 90eb8e2490283930e682b79842d664d4867414563353d53dafc47eccf44aea17 rust-std-1.66.1-i586-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-i586-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-i586-unknown-linux-musl.tar.xz.asc +sha256 c4bab2d63223d0c6e63806082e30d8c38b37eefc10ee2e7380971e3012c00bca rust-std-1.66.1-i586-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-i686-unknown-linux-gnu.tar.xz.asc +sha256 b32cbbb9002f8a20b302823a2ff122a91f077b5e1a7bc1340de690ded86bf10b rust-std-1.66.1-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-i686-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-i686-unknown-linux-musl.tar.xz.asc +sha256 52013329eb6697d94f5dce01dd509b4b93b473c18a3a2c05d0230b9dfeab14d1 rust-std-1.66.1-i686-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-mips-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mips-unknown-linux-gnu.tar.xz.asc +sha256 e6029b4cec5d6c06c34a0dbec614fa252fdc8cf31013d6e561112cf90f742568 rust-std-1.66.1-mips-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-mips-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mips-unknown-linux-musl.tar.xz.asc +sha256 23f917eccaca59d4c911eb96d8ffefe86834dbcdf902c9ab6dad8558c31c4575 rust-std-1.66.1-mips-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-mips64-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mips64-unknown-linux-gnuabi64.tar.xz.asc +sha256 70d1406e0981d5d31c1d3f85c848bba0476e0ff6203e7706f66b4d2212f01b66 rust-std-1.66.1-mips64-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-mips64-unknown-linux-muslabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mips64-unknown-linux-muslabi64.tar.xz.asc +sha256 0fd221d4b4205ce548e83f0e7416c8332eb12b64d5a43c0b3ed61e9f7d6edf13 rust-std-1.66.1-mips64-unknown-linux-muslabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mips64el-unknown-linux-gnuabi64.tar.xz.asc +sha256 132d6d5750a877972ebc6f23e831f2ef3077465b2ab24ca645d32ea83c496fe3 rust-std-1.66.1-mips64el-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-mips64el-unknown-linux-muslabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mips64el-unknown-linux-muslabi64.tar.xz.asc +sha256 533f370368ac8b6192e1450289c64544ebf9cacc38c3a52ef6c0ecded7ee6fa5 rust-std-1.66.1-mips64el-unknown-linux-muslabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-mipsel-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mipsel-unknown-linux-gnu.tar.xz.asc +sha256 8bfa3d6079c6df049978fe61b1ccaf992aecd006e23df2439ecfc883bd8bc31b rust-std-1.66.1-mipsel-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-mipsel-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-mipsel-unknown-linux-musl.tar.xz.asc +sha256 d7028820888d0decde047a6e77b866e690532aa09522c9a23a3fbf8780a72257 rust-std-1.66.1-mipsel-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 417b12a9bf090d694514937cd8c321ed625f155248f63c0de8207b17fa4b35b1 rust-std-1.66.1-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 7074c4ea9fcc683ceb0adcca6ba07544a1d91f0e5d2a4cf14c81eb14316ebf35 rust-std-1.66.1-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 4c64a09be872b5832b50d681fbe29691b6a5d3e23ee5535020fa22b8b453c770 rust-std-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz.asc +sha256 776eff6f451845e88224714ee6da7819e34f01b7625bf927394c2b91e5c8243c rust-std-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-s390x-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-s390x-unknown-linux-gnu.tar.xz.asc +sha256 51d1567e1d28e43c2165886f5a4955dcdaa41aa5ddcec5fb08200491fd1f6062 rust-std-1.66.1-s390x-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-sparc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-sparc64-unknown-linux-gnu.tar.xz.asc +sha256 3aee03fa61c28bb242023efb09a22e38a76b075cc72bcad9894560be8b28a927 rust-std-1.66.1-sparc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 c5e2c9b160bd8d99514f13cfbc0e42a722fd9ca14e6aaca4b9b77731a7a48377 rust-std-1.66.1-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.66.1-x86_64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.66.1-x86_64-unknown-linux-musl.tar.xz.asc +sha256 a9710727ba28955deb7fbec799faed19486c9af3c7e3088ec6659a257515ffca rust-std-1.66.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 b341bc4b7c..89009288f4 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.66.0 +RUST_BIN_VERSION = 1.66.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 35028b304b..545a452bf0 100644 --- a/package/rust/rust.hash +++ b/package/rust/rust.hash @@ -1,6 +1,6 @@ -# From https://static.rust-lang.org/dist/rustc-1.66.0-src.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rustc-1.66.0-src.tar.xz.asc -sha256 0dc176e34fae9871f855a6ba4cb30fa19d69c5b4428d29281a07419c4950715c rustc-1.66.0-src.tar.xz +# From https://static.rust-lang.org/dist/rustc-1.66.1-src.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rustc-1.66.1-src.tar.xz.asc +sha256 07ac4e6c93e0d8ecfaf3b86c4c78bbbde3f5be675f0334e7fb343cb4a0b81ebe rustc-1.66.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 55fa38df18..691683b492 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.66.0 +RUST_VERSION = 1.66.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 de51efc543775cf32456c1090d1b396d0b67f9bc Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Fri, 13 Jan 2023 02:05:52 -0800 Subject: [PATCH 0367/5754] package/docker-engine: bump version to 20.10.22 Bug fixes and enhancements - Improve error message when attempting to pull an unsupported image format or OCI artifact (moby/moby#44413, moby/moby#44569) - Fix an issue where the host's ephemeral port-range was ignored when selecting random ports for containers (moby/moby#44476). - Fix ssh: parse error in message type 27 errors during docker build on hosts using OpenSSH 8.9 or above (moby/moby#3862). - seccomp: block socket calls to AF_VSOCK in default profile (moby/moby#44564). https://github.com/moby/moby/releases/tag/v20.10.22 Signed-off-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 10e9727a08..d15b1359cb 100644 --- a/package/docker-engine/docker-engine.hash +++ b/package/docker-engine/docker-engine.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 61f4c3a2d0426e1bbbda1b0e5dd33ec203776f7d99d1a61522c77c04c4ed09fe docker-engine-20.10.21.tar.gz +sha256 ee0e2168e27ec87f1b0650e86af5d3e167a07fd2ff8c1ce3bb588f0b4f9a4658 docker-engine-20.10.22.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index 36c66485ba..2a9b72ca78 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_ENGINE_VERSION = 20.10.21 +DOCKER_ENGINE_VERSION = 20.10.22 DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 From 8e6fcd46fb6c671998c8508743abbc1e3938ce3b Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Fri, 13 Jan 2023 02:05:53 -0800 Subject: [PATCH 0368/5754] package/docker-cli: bump version to 20.10.22 https://github.com/moby/moby/releases/tag/v20.10.22 Signed-off-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 d9477cf3af..c6db95f9b3 100644 --- a/package/docker-cli/docker-cli.hash +++ b/package/docker-cli/docker-cli.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f0f62ca1c80e8fd5b9e140ca64ef3e75dc7cf7a28040b3d10b260307128946e8 docker-cli-20.10.21.tar.gz +sha256 84d71ac2b508b54e8df9f3ea425aa33e254fd3645fe9bad5619b98eaffb33408 docker-cli-20.10.22.tar.gz sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE diff --git a/package/docker-cli/docker-cli.mk b/package/docker-cli/docker-cli.mk index a14edb2c31..cb44c68c1b 100644 --- a/package/docker-cli/docker-cli.mk +++ b/package/docker-cli/docker-cli.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CLI_VERSION = 20.10.21 +DOCKER_CLI_VERSION = 20.10.22 DOCKER_CLI_SITE = $(call github,docker,cli,v$(DOCKER_CLI_VERSION)) DOCKER_CLI_LICENSE = Apache-2.0 From e2e2da2e70f638889f3aa0aeb7125f3bf16a7f67 Mon Sep 17 00:00:00 2001 From: Heiko Thiery Date: Sat, 14 Jan 2023 09:04:04 +0100 Subject: [PATCH 0369/5754] package/modem-manager: bump version to 1.20.4 Drop patch that is now upstream. Signed-off-by: Heiko Thiery Signed-off-by: Peter Korsgaard --- ...n-hardcode-building-a-shared-library.patch | 54 ------------------- package/modem-manager/modem-manager.hash | 2 +- package/modem-manager/modem-manager.mk | 2 +- 3 files changed, 2 insertions(+), 56 deletions(-) delete mode 100644 package/modem-manager/0001-meson-Un-hardcode-building-a-shared-library.patch diff --git a/package/modem-manager/0001-meson-Un-hardcode-building-a-shared-library.patch b/package/modem-manager/0001-meson-Un-hardcode-building-a-shared-library.patch deleted file mode 100644 index e99396d0d1..0000000000 --- a/package/modem-manager/0001-meson-Un-hardcode-building-a-shared-library.patch +++ /dev/null @@ -1,54 +0,0 @@ -From a9651f2390d3691dc74bcdb24b69a043fb0aacae Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 31 Dec 2022 10:18:32 +0100 -Subject: [PATCH] meson: Un-hardcode building a shared library - -Use library() instead of shared_library() to allow specifying which kind -of library to build with "meson setup --default-library ..." - -This will avoid the following static build failure: - -FAILED: src/ModemManager -/home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/bin/m68k-linux-gcc -o src/ModemManager src/ModemManager.p/meson-generated_.._mm-daemon-enums-types.c.o src/ModemManager.p/main.c.o src/ModemManager.p/mm-auth-provider.c.o src/ModemManager.p/mm-base-bearer.c.o src/ModemManager.p/mm-base-call.c.o src/ModemManager.p/mm-base-manager.c.o src/ModemManager.p/mm-base-modem-at.c.o src/ModemManager.p/mm-base-modem.c.o src/ModemManager.p/mm-base-sim.c.o src/ModemManager.p/mm-base-sms.c.o src/ModemManager.p/mm-bearer-list.c.o src/ModemManager.p/mm-broadband-bearer.c.o src/ModemManager.p/mm-broadband-modem.c.o src/ModemManager.p/mm-call-list.c.o src/ModemManager.p/mm-context.c.o src/ModemManager.p/mm-device.c.o src/ModemManager.p/mm-dispatcher.c.o src/ModemManager.p/mm-dispatcher-connection.c.o src/ModemManager.p/mm-dispatcher-fcc-unlock.c.o src/ModemManager.p/mm-filter.c.o src/ModemManager.p/mm-iface-modem-3gpp.c.o src/ModemManager.p/mm-iface-modem-3gpp-profile-manager.c.o src/ModemManager.p/mm-iface-modem-3gpp-ussd.c.o src/ModemManager.p/mm-iface-modem.c.o src/ModemManager.p/mm-iface-modem-cdma.c.o src/ModemManager.p/mm-iface-modem-firmware.c.o src/ModemManager.p/mm-iface-modem-location.c.o src/ModemManager.p/mm-iface-modem-messaging.c.o src/ModemManager.p/mm-iface-modem-oma.c.o src/ModemManager.p/mm-iface-modem-sar.c.o src/ModemManager.p/mm-iface-modem-signal.c.o src/ModemManager.p/mm-iface-modem-simple.c.o src/ModemManager.p/mm-iface-modem-time.c.o src/ModemManager.p/mm-iface-modem-voice.c.o src/ModemManager.p/mm-plugin.c.o src/ModemManager.p/mm-plugin-manager.c.o src/ModemManager.p/mm-port-probe.c.o src/ModemManager.p/mm-port-probe-at.c.o src/ModemManager.p/mm-private-boxed-types.c.o src/ModemManager.p/mm-sms-list.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,-O1 -static '-Wl,-rpath,$ORIGIN/../libmm-glib' -Wl,-rpath-link,/home/autobuild/autobuild/instance-11/output-1/build/modem-manager-1.20.2/build/libmm-glib -Wl,--start-group src/libport.a src/libkerneldevice.a src/libhelpers.a libmm-glib/libmm-glib.so.0.9.0 libqcdm/src/libqcdm.a libmm-glib/generated/tests/libmm-test-generated.a -Wl,--export-dynamic /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libgmodule-2.0.a /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libglib-2.0.a -pthread -lm /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libpcre.a /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libgio-2.0.a /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libgobject-2.0.a /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libffi.a /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libz.a /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libmount.a /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libblkid.a -Wl,--end-group -/home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/opt/ext-toolchain/bin/../lib/gcc/m68k-buildroot-linux-uclibc/11.2.0/../../../../m68k-buildroot-linux-uclibc/bin/ld: attempted static link of dynamic object `libmm-glib/libmm-glib.so.0.9.0' - -Fixes: - - http://autobuild.buildroot.org/results/9803d593305df36c4a8d67aac2fb4c9a3120a072 - -Signed-off-by: Fabrice Fontaine -[yann.morin.1998@free.fr: actual backport of upstreeam commit] -Signed-off-by: Yann E. MORIN ---- - libmm-glib/meson.build | 2 +- - plugins/meson.build | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libmm-glib/meson.build b/libmm-glib/meson.build -index 42f8ac61..de668dab 100644 ---- a/libmm-glib/meson.build -+++ b/libmm-glib/meson.build -@@ -129,7 +129,7 @@ deps = [include_dep] - - libname = 'mm-glib' - --libmm_glib = shared_library( -+libmm_glib = library( - libname, - version: mm_glib_version, - sources: sources, -diff --git a/plugins/meson.build b/plugins/meson.build -index f849bb53..9e081beb 100644 ---- a/plugins/meson.build -+++ b/plugins/meson.build -@@ -18,7 +18,7 @@ if enable_tests - libmm_test_generated_dep - ] - -- libmm_test_common = shared_library( -+ libmm_test_common = library( - 'mm-test-common', - sources: sources, - include_directories: top_inc, --- -2.25.1 - diff --git a/package/modem-manager/modem-manager.hash b/package/modem-manager/modem-manager.hash index e6967f8d62..4b8b795af7 100644 --- a/package/modem-manager/modem-manager.hash +++ b/package/modem-manager/modem-manager.hash @@ -1,4 +1,4 @@ #Locally calculated after checking https://www.freedesktop.org/software/ModemManager/ModemManager-1.18.12.tar.xz.asc -sha256 ba56aa764edc148f58348a589743cf1c1e27c55dcd7ebd820dcedd52fb8d7179 ModemManager-1.20.2.tar.gz +sha256 9c16b47547faac9515f2d03d1e8175de9c5e6769b1ee16b608ba6cfe6f04b03e ModemManager-1.20.4.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/modem-manager/modem-manager.mk b/package/modem-manager/modem-manager.mk index f1fc17523a..979a80a8e9 100644 --- a/package/modem-manager/modem-manager.mk +++ b/package/modem-manager/modem-manager.mk @@ -4,7 +4,7 @@ # ################################################################################ -MODEM_MANAGER_VERSION = 1.20.2 +MODEM_MANAGER_VERSION = 1.20.4 MODEM_MANAGER_SOURCE = ModemManager-$(MODEM_MANAGER_VERSION).tar.gz MODEM_MANAGER_SITE = https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/archive/$(MODEM_MANAGER_VERSION) MODEM_MANAGER_LICENSE = GPL-2.0+ (programs, plugins), LGPL-2.0+ (libmm-glib) From beeb4a2aad034d201a13caecd9ddbfb19761beb1 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 14 Jan 2023 10:09:07 +0100 Subject: [PATCH 0370/5754] package/tor: security bump version to 0.4.7.13 Changelog: https://gitlab.torproject.org/tpo/core/tor/-/blob/main/ChangeLog?expanded=true&viewer=simple Fixes CVE-2023-23589 aka TROVE-2022-002: https://gitlab.torproject.org/tpo/core/tor/-/issues/40730 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 2a2953dc29..51892f15c3 100644 --- a/package/tor/tor.hash +++ b/package/tor/tor.hash @@ -1,4 +1,4 @@ -# From https://dist.torproject.org/tor-0.4.7.12.tar.gz.sha256sum -sha256 3b5d969712c467851bd028f314343ef15a97ea457191e93ffa97310b05b9e395 tor-0.4.7.12.tar.gz +# From https://dist.torproject.org/tor-0.4.7.13.tar.gz.sha256sum +sha256 2079172cce034556f110048e26083ce9bea751f3154b0ad2809751815b11ea9d tor-0.4.7.13.tar.gz # Locally computed sha256 47b54ed17e8fdcab3c44729a1789a09b208f9a63a845a7e50def9df729eebad0 LICENSE diff --git a/package/tor/tor.mk b/package/tor/tor.mk index 6812005618..03bd998708 100644 --- a/package/tor/tor.mk +++ b/package/tor/tor.mk @@ -4,7 +4,7 @@ # ################################################################################ -TOR_VERSION = 0.4.7.12 +TOR_VERSION = 0.4.7.13 TOR_SITE = https://dist.torproject.org TOR_LICENSE = BSD-3-Clause TOR_LICENSE_FILES = LICENSE From 3587c27c8ef0a24507fa0eaa5602fae80aae45ef Mon Sep 17 00:00:00 2001 From: Heiko Thiery Date: Sat, 14 Jan 2023 09:05:25 +0100 Subject: [PATCH 0371/5754] package/network-manager: bump version to 1.40.10 Signed-off-by: Heiko Thiery Signed-off-by: Peter Korsgaard --- package/network-manager/network-manager.hash | 4 ++-- package/network-manager/network-manager.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/network-manager/network-manager.hash b/package/network-manager/network-manager.hash index f503665a9a..3895c1ffc3 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.6.sha256sum -sha256 2f025b2d5af7de593bbf47c17e4d98a2b9608ea90a8260fb08080be97439534e NetworkManager-1.40.6.tar.xz +# From https://download.gnome.org/sources/NetworkManager/1.40/NetworkManager-1.40.10.sha256sum +sha256 fa251455df3c38e2bf1e1ff806b4bc4346938dd135a3568bd250e92caa85eaf7 NetworkManager-1.40.10.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 847c6a82ba..138ff46e4a 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -5,7 +5,7 @@ ################################################################################ NETWORK_MANAGER_VERSION_MAJOR = 1.40 -NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).6 +NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).10 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 346bd6a20c22fc3b95f2e27030289de726fcfdf0 Mon Sep 17 00:00:00 2001 From: Heiko Thiery Date: Sat, 14 Jan 2023 09:06:12 +0100 Subject: [PATCH 0372/5754] package/network-manager-openvpn: bump to version 1.10.2 Signed-off-by: Heiko Thiery Signed-off-by: Peter Korsgaard --- package/network-manager-openvpn/network-manager-openvpn.hash | 4 ++-- package/network-manager-openvpn/network-manager-openvpn.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/network-manager-openvpn/network-manager-openvpn.hash b/package/network-manager-openvpn/network-manager-openvpn.hash index d0cbc7ca87..11fb28f8c8 100644 --- a/package/network-manager-openvpn/network-manager-openvpn.hash +++ b/package/network-manager-openvpn/network-manager-openvpn.hash @@ -1,4 +1,4 @@ -# From https://download.gnome.org/sources/NetworkManager-openvpn/1.8/NetworkManager-openvpn-1.8.14.sha256sum -sha256 e7419053fc3b5a7e25f1a7517c313ad4531b6ea280255524ebb85a70c76fdbeb NetworkManager-openvpn-1.8.14.tar.xz +# From https://download.gnome.org/sources/NetworkManager-openvpn/1.10/NetworkManager-openvpn-1.10.2.sha256sum +sha256 62f0f2a8782221b923f212ac2a8ebbc1002efd6a90ee945dad4adfb56d076d21 NetworkManager-openvpn-1.10.2.tar.xz # Locally computed sha256 c39e345d992dfba62db265f8c6d6ff1d90c61d92876635ae05adbfa2f45fff46 COPYING diff --git a/package/network-manager-openvpn/network-manager-openvpn.mk b/package/network-manager-openvpn/network-manager-openvpn.mk index d5d4c5da42..ccc86e45f7 100644 --- a/package/network-manager-openvpn/network-manager-openvpn.mk +++ b/package/network-manager-openvpn/network-manager-openvpn.mk @@ -4,8 +4,8 @@ # ################################################################################ -NETWORK_MANAGER_OPENVPN_VERSION_MAJOR = 1.8 -NETWORK_MANAGER_OPENVPN_VERSION = $(NETWORK_MANAGER_OPENVPN_VERSION_MAJOR).14 +NETWORK_MANAGER_OPENVPN_VERSION_MAJOR = 1.10 +NETWORK_MANAGER_OPENVPN_VERSION = $(NETWORK_MANAGER_OPENVPN_VERSION_MAJOR).2 NETWORK_MANAGER_OPENVPN_SOURCE = NetworkManager-openvpn-$(NETWORK_MANAGER_OPENVPN_VERSION).tar.xz NETWORK_MANAGER_OPENVPN_SITE = https://download.gnome.org/sources/NetworkManager-openvpn/$(NETWORK_MANAGER_OPENVPN_VERSION_MAJOR) NETWORK_MANAGER_OPENVPN_DEPENDENCIES = network-manager openvpn From 16d83fa724e97c51b78d516674842a1f33c9a71b Mon Sep 17 00:00:00 2001 From: Kyle Harding Date: Fri, 13 Jan 2023 14:02:42 -0500 Subject: [PATCH 0373/5754] package/unbound: bump version to 1.17.1 Signed-off-by: Kyle Harding Signed-off-by: Peter Korsgaard --- package/unbound/unbound.hash | 4 ++-- package/unbound/unbound.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/unbound/unbound.hash b/package/unbound/unbound.hash index 147ac7b13a..91e1d82dd2 100644 --- a/package/unbound/unbound.hash +++ b/package/unbound/unbound.hash @@ -1,5 +1,5 @@ -# From https://nlnetlabs.nl/downloads/unbound/unbound-1.17.0.tar.gz.sha256 -sha256 dcbc95d7891d9f910c66e4edc9f1f2fde4dea2eec18e3af9f75aed44a02f1341 unbound-1.17.0.tar.gz +# From https://nlnetlabs.nl/downloads/unbound/unbound-1.17.1.tar.gz.sha256 +sha256 ee4085cecce12584e600f3d814a28fa822dfaacec1f94c84bfd67f8a5571a5f4 unbound-1.17.1.tar.gz # Locally calculated sha256 8eb9a16cbfb8703090bbfa3a2028fd46bb351509a2f90dc1001e51fbe6fd45db LICENSE diff --git a/package/unbound/unbound.mk b/package/unbound/unbound.mk index 7b62522727..fa7884e937 100644 --- a/package/unbound/unbound.mk +++ b/package/unbound/unbound.mk @@ -4,7 +4,7 @@ # ################################################################################ -UNBOUND_VERSION = 1.17.0 +UNBOUND_VERSION = 1.17.1 UNBOUND_SITE = https://www.unbound.net/downloads UNBOUND_INSTALL_STAGING = YES UNBOUND_DEPENDENCIES = host-pkgconf expat libevent openssl From fbddd126011611e97cc920e40cd58784e29f242d Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 14 Jan 2023 15:48:53 +0100 Subject: [PATCH 0374/5754] support/download: fix concurrent cargo vendor Commit 8450b7691870 (package/pkg-cargo: move CARGO_HOME into DL_DIR) allowed for a shared cargo cache of crates. Internally, cargo is supposed to lock themselves when accessing that cache, and that commit even had some research in that area, pointing at [0] for complaints about too-coarse the lock, so it was deemed safe to have a shared cargo home. However, in practice, the locking as implemented by cargo, fails to properly protect the concurrent accesses to the crates cache, with random failures that manifest themselves like so: Blocking waiting for file lock on package cache Blocking waiting for file lock on package cache Downloading crates ... error: failed to sync Caused by: failed to download packages Caused by: failed to download `autocfg v1.1.0` Caused by: unable to get packages from source Caused by: failed to unpack package `autocfg v1.1.0` Caused by: failed to unpack entry at `autocfg-1.1.0/src/tests.rs` Caused by: No such file or directory (os error 2) while canonicalizing [...] with the last few errors sometime being: Caused by: failed to parse manifest at `[...]/aho-corasick-0.7.18/Cargo.toml` Caused by: can't find library `aho_corasick`, rename file to `src/lib.rs` or specify lib.path So, as we do not systematically use our own cargo build (we can use a pre-built one with host-rust-bin), we can't patch cargo (even if we knew what to do!). Instead, we implement a lock ourselves, by wrapping the call to "cargo vendor" with a flock(1) on cargo home. Note: the download wrapper is already flock-ed, but it is a per-package lock, so it does not prevent different packages from being downloaded in parallel; if those packages need cargo vendoring, that will not be protected by the flock on the dl wrapper. So we really do need a flock on cargo home. [0] https://github.com/rust-lang/cargo/issues/6930 Fixes: 8450b769187087751f83cbefcf0a88f70d9da670 Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Cc: Moritz Bitsch Signed-off-by: Thomas Petazzoni --- support/download/cargo-post-process | 2 ++ 1 file changed, 2 insertions(+) diff --git a/support/download/cargo-post-process b/support/download/cargo-post-process index 21a6be8dbe..aea2d8da7a 100755 --- a/support/download/cargo-post-process +++ b/support/download/cargo-post-process @@ -26,6 +26,8 @@ pushd "${base_name}" > /dev/null # Create the local .cargo/config with vendor info mkdir -p .cargo/ +mkdir -p "${CARGO_HOME}" +flock "${CARGO_HOME}"/.br-lock \ cargo vendor \ --manifest-path ${BR_CARGO_MANIFEST_PATH-Cargo.toml} \ --locked VENDOR \ From 3cd1090d9a7fd15eddf4dc843800256d846a9955 Mon Sep 17 00:00:00 2001 From: Heiko Thiery Date: Sat, 14 Jan 2023 11:48:30 +0100 Subject: [PATCH 0375/5754] package/libyang: bump version to 2.1.4 Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- package/libyang/libyang.hash | 2 +- package/libyang/libyang.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libyang/libyang.hash b/package/libyang/libyang.hash index c064c2e69c..da8600351b 100644 --- a/package/libyang/libyang.hash +++ b/package/libyang/libyang.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 94898ee391c238dcd29ff21092e5dcab4e17b9623e88862a55b72fc6168846f8 libyang-2.0.194.tar.gz +sha256 f30ee1c3e13f0c5d25c4d2fb628e4b262b483d0a500464a7c12008ccc393a69e libyang-2.1.4.tar.gz sha256 0b7ec43747d211a1e49c53588b0822062947bab6bdcc95238578beab34cba5bb LICENSE diff --git a/package/libyang/libyang.mk b/package/libyang/libyang.mk index 36f452ca07..6c57a2dd42 100644 --- a/package/libyang/libyang.mk +++ b/package/libyang/libyang.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBYANG_VERSION = 2.0.194 +LIBYANG_VERSION = 2.1.4 LIBYANG_SITE = $(call github,CESNET,libyang,v$(LIBYANG_VERSION)) LIBYANG_LICENSE = BSD-3-Clause LIBYANG_LICENSE_FILES = LICENSE From c9259635564f799ff4b0e63b1baff62505571938 Mon Sep 17 00:00:00 2001 From: Heiko Thiery Date: Sat, 14 Jan 2023 11:48:32 +0100 Subject: [PATCH 0376/5754] package/libnetconf2: bump version to 2.1.25. Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- package/libnetconf2/libnetconf2.hash | 2 +- package/libnetconf2/libnetconf2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libnetconf2/libnetconf2.hash b/package/libnetconf2/libnetconf2.hash index 001a51d682..34e934089e 100644 --- a/package/libnetconf2/libnetconf2.hash +++ b/package/libnetconf2/libnetconf2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 0b0f0c84291710b0ca2497e1e02504a5ded7b83d49deeb4992bea7936e1d74b9 libnetconf2-2.1.11.tar.gz +sha256 2f1a6559e8e43ea18ea337ab5f194f8443695c7ab4dde5d7b2560603f9bf702a libnetconf2-2.1.25.tar.gz sha256 bd962ab457c8a8cb8faaaa36c11484680f3c9a47dbc336507817ae8935384064 LICENSE diff --git a/package/libnetconf2/libnetconf2.mk b/package/libnetconf2/libnetconf2.mk index 6aa9aa9498..0d4294d8d3 100644 --- a/package/libnetconf2/libnetconf2.mk +++ b/package/libnetconf2/libnetconf2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNETCONF2_VERSION = 2.1.11 +LIBNETCONF2_VERSION = 2.1.25 LIBNETCONF2_SITE = $(call github,CESNET,libnetconf2,v$(LIBNETCONF2_VERSION)) LIBNETCONF2_INSTALL_STAGING = YES LIBNETCONF2_LICENSE = BSD-3-Clause From 113e3a8fed6c89e947bea2f44672c47338d08c96 Mon Sep 17 00:00:00 2001 From: Heiko Thiery Date: Sat, 14 Jan 2023 11:48:34 +0100 Subject: [PATCH 0377/5754] package/libnetconf2: bump version 2.2.12 Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- package/sysrepo/sysrepo.hash | 2 +- package/sysrepo/sysrepo.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/sysrepo/sysrepo.hash b/package/sysrepo/sysrepo.hash index 1db33df626..a90d8259bf 100644 --- a/package/sysrepo/sysrepo.hash +++ b/package/sysrepo/sysrepo.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 357a50851e4cc052b484b924ed0a5808c29159a7c9d48d9b1b8c42784c4b6917 sysrepo-2.1.64.tar.gz +sha256 1bc866f13e41ba5e7e4acd52b5c3d42b1a2a1e032775e0a9b094f3265844cd25 sysrepo-2.2.12.tar.gz sha256 88f1b7e5c64d2c113e07105aa9c0fb80639b40287565be1c2afd0949df83d826 LICENSE diff --git a/package/sysrepo/sysrepo.mk b/package/sysrepo/sysrepo.mk index 0ed27e3cfb..9da8c22ca2 100644 --- a/package/sysrepo/sysrepo.mk +++ b/package/sysrepo/sysrepo.mk @@ -4,7 +4,7 @@ # ################################################################################ -SYSREPO_VERSION = 2.1.64 +SYSREPO_VERSION = 2.2.12 SYSREPO_SITE = $(call github,sysrepo,sysrepo,v$(SYSREPO_VERSION)) SYSREPO_INSTALL_STAGING = YES SYSREPO_LICENSE = BSD-3-Clause From 06aa16e23490d03ef9098e61cdcf698af7317a96 Mon Sep 17 00:00:00 2001 From: Heiko Thiery Date: Sat, 14 Jan 2023 11:48:36 +0100 Subject: [PATCH 0378/5754] package/netopeer2: bump version to 2.1.42 Drop patch that is in upstream. Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- ...X-use-DESTDIR-when-executing-scripts.patch | 47 ------------------- package/netopeer2/netopeer2.hash | 2 +- package/netopeer2/netopeer2.mk | 2 +- 3 files changed, 2 insertions(+), 49 deletions(-) delete mode 100644 package/netopeer2/0001-build-BUGFIX-use-DESTDIR-when-executing-scripts.patch diff --git a/package/netopeer2/0001-build-BUGFIX-use-DESTDIR-when-executing-scripts.patch b/package/netopeer2/0001-build-BUGFIX-use-DESTDIR-when-executing-scripts.patch deleted file mode 100644 index 99febb56ad..0000000000 --- a/package/netopeer2/0001-build-BUGFIX-use-DESTDIR-when-executing-scripts.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 696b6be8a623f4466def2a161baa26094e5592a4 Mon Sep 17 00:00:00 2001 -From: Michal Vasko -Date: Wed, 18 May 2022 09:14:35 +0200 -Subject: [PATCH] build BUGFIX use DESTDIR when executing scripts - -Fixes #1217 - -[Upstream accepted 696b6be8a623f4466def2a161baa26094e5592a4] -Signed-off-by: Heiko Thiery ---- - CMakeLists.txt | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index efe922d..60e3150 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -351,7 +351,7 @@ if(INSTALL_MODULES) - set(ENV{NP2_MODULE_GROUP} \"${MODULES_GROUP}\") - set(ENV{SYSREPOCTL_EXECUTABLE} \"${SYSREPOCTL_EXECUTABLE}\") - set(ENV{SYSREPOCFG_EXECUTABLE} \"${SYSREPOCFG_EXECUTABLE}\") -- execute_process(COMMAND \"${SCRIPT_DIR}/setup.sh\" RESULT_VARIABLE SETUP_RES) -+ execute_process(COMMAND \"\$ENV{DESTDIR}${SCRIPT_DIR}/setup.sh\" RESULT_VARIABLE SETUP_RES) - if(NOT SETUP_RES EQUAL \"0\") - message(FATAL_ERROR \" scripts/setup.sh failed: \${SETUP_RES}\") - endif() -@@ -364,7 +364,7 @@ if(GENERATE_HOSTKEY) - message(STATUS \"Generating a new RSA host key \\\"genkey\\\" if not already added...\") - set(ENV{SYSREPOCTL_EXECUTABLE} \"${SYSREPOCTL_EXECUTABLE}\") - set(ENV{SYSREPOCFG_EXECUTABLE} \"${SYSREPOCFG_EXECUTABLE}\") -- execute_process(COMMAND ${SCRIPT_DIR}/merge_hostkey.sh RESULT_VARIABLE MERGE_HOSTKEY_RES) -+ execute_process(COMMAND \"\$ENV{DESTDIR}${SCRIPT_DIR}/merge_hostkey.sh\" RESULT_VARIABLE MERGE_HOSTKEY_RES) - if(NOT MERGE_HOSTKEY_RES EQUAL \"0\") - message(FATAL_ERROR \" scripts/merge_hostkey.sh failed: \${MERGE_HOSTKEY_RES}\") - endif() -@@ -375,7 +375,7 @@ if(MERGE_LISTEN_CONFIG) - message(STATUS \"Merging default server listen configuration if there is none...\") - set(ENV{SYSREPOCTL_EXECUTABLE} \"${SYSREPOCTL_EXECUTABLE}\") - set(ENV{SYSREPOCFG_EXECUTABLE} \"${SYSREPOCFG_EXECUTABLE}\") -- execute_process(COMMAND ${SCRIPT_DIR}/merge_config.sh RESULT_VARIABLE MERGE_CONFIG_RES) -+ execute_process(COMMAND \"\$ENV{DESTDIR}${SCRIPT_DIR}/merge_config.sh\" RESULT_VARIABLE MERGE_CONFIG_RES) - if(NOT MERGE_CONFIG_RES EQUAL \"0\") - message(FATAL_ERROR \" scripts/merge_config.sh failed: \${MERGE_CONFIG_RES}\") - endif() --- -2.30.2 - diff --git a/package/netopeer2/netopeer2.hash b/package/netopeer2/netopeer2.hash index b352bbb239..cc71a2dab8 100644 --- a/package/netopeer2/netopeer2.hash +++ b/package/netopeer2/netopeer2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 89f7572d188e7b04be4b10656d7161d65fb557bac222d8c4596a97eaf833b691 netopeer2-2.1.23.tar.gz +sha256 b166fe3425bb55b5f330fb7f53158f613bffc07493925ac437193e4d2defb3e7 netopeer2-2.1.42.tar.gz sha256 b46f161fbdcf127d3ef22602e15958c3092fe3294f71a2dc8cdf8f6689cba95b LICENSE diff --git a/package/netopeer2/netopeer2.mk b/package/netopeer2/netopeer2.mk index d9a20d9969..7cb9202575 100644 --- a/package/netopeer2/netopeer2.mk +++ b/package/netopeer2/netopeer2.mk @@ -4,7 +4,7 @@ # ################################################################################ -NETOPEER2_VERSION = 2.1.23 +NETOPEER2_VERSION = 2.1.42 NETOPEER2_SITE = $(call github,CESNET,Netopeer2,v$(NETOPEER2_VERSION)) NETOPEER2_DL_SUBDIR = netopeer2 NETOPEER2_LICENSE = BSD-3-Clause From 60cf07079b78d4c4bb495fd18cb2a145a4cb3635 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 14 Jan 2023 18:01:25 +0100 Subject: [PATCH 0379/5754] package/janus-gateway: add libcurl optional dependency libcurl is an optional dependency which is enabled by default since at least version 0.0.9 and https://github.com/meetecho/janus-gateway/commit/ca9c0a86f975f88fbdd791af3cb4f8986883c1c2 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/janus-gateway/janus-gateway.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/janus-gateway/janus-gateway.mk b/package/janus-gateway/janus-gateway.mk index 0d906f1b62..dd898563e5 100644 --- a/package/janus-gateway/janus-gateway.mk +++ b/package/janus-gateway/janus-gateway.mk @@ -128,6 +128,13 @@ else JANUS_GATEWAY_CONF_OPTS += --disable-websockets endif +ifeq ($(BR2_PACKAGE_LIBCURL),y) +JANUS_GATEWAY_DEPENDENCIES += libcurl +JANUS_GATEWAY_CONF_OPTS += --enable-turn-rest-api +else +JANUS_GATEWAY_CONF_OPTS += --disable-turn-rest-api +endif + ifeq ($(BR2_PACKAGE_SYSTEMD),y) JANUS_GATEWAY_DEPENDENCIES += systemd JANUS_GATEWAY_CONF_OPTS += --enable-systemd-sockets From 664897295a3667db2ff95c5c1b458b16c1192a47 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 14 Jan 2023 18:01:26 +0100 Subject: [PATCH 0380/5754] package/janus-gateway: fix libcurl build Fix the following libcurl build failure raised since bump to version 1.1.1 in commit 01518e5660366be41e6a8e0a0f2b487d7cdf48a2: In file included from /home/autobuild/autobuild/instance-11/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/curl/curl.h:3195, from turnrest.c:21: turnrest.c: In function 'janus_turnrest_request': turnrest.c:168:2: error: void value not ignored as it ought to be 168 | curl_easy_setopt(curl, api_http_get ? CURLOPT_HTTPGET : CURLOPT_POST, 1); | ^ Fixes: - http://autobuild.buildroot.org/results/11bb0079f5a7d06d3494a61b411f0af2e8c4d342 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...se-parentheses-to-ensure-compilation.patch | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create 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 new file mode 100644 index 0000000000..f91c13d1f6 --- /dev/null +++ b/package/janus-gateway/0003-Use-parentheses-to-ensure-compilation.patch @@ -0,0 +1,27 @@ +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); From f1d7155952d9abcad4d5d75b56508114469c2a1c Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 13 Jan 2023 08:53:48 +0100 Subject: [PATCH 0381/5754] Cleanup/simplify copyright info Historically we have been (more-or-less consistently, sometimes forgetting some files) updating the end year of the copyright statements at the beginning of a new year. We're naturally not alone in that. Recently this was discussed in curl, and it turns out that copyright years are not really required: https://daniel.haxx.se/blog/2023/01/08/copyright-without-years/ So drop the years and simplify the copyright statements. While we're at it, also ensure the same syntax (capital C, email address) is used everywhere. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- Makefile | 4 +--- docs/manual/manual.txt | 2 +- docs/website/copyright.txt | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index efa0b2a7a0..8517d563d5 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,6 @@ # Makefile for buildroot # -# Copyright (C) 1999-2005 by Erik Andersen -# Copyright (C) 2006-2014 by the Buildroot developers -# Copyright (C) 2014-2020 by the Buildroot developers +# Copyright (C) the Buildroot developers # # 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 diff --git a/docs/manual/manual.txt b/docs/manual/manual.txt index fab66dbda5..d6534ca295 100644 --- a/docs/manual/manual.txt +++ b/docs/manual/manual.txt @@ -12,7 +12,7 @@ It is licensed under the GNU General Public License, version 2. Refer to the http://git.buildroot.org/buildroot/tree/COPYING?id={sys:git rev-parse HEAD}[COPYING] file in the Buildroot sources for the full text of this license. -Copyright (C) 2004-2020 The Buildroot developers +Copyright (C) The Buildroot developers image::logo.png[] diff --git a/docs/website/copyright.txt b/docs/website/copyright.txt index b15ac5f919..3fe19bab8b 100644 --- a/docs/website/copyright.txt +++ b/docs/website/copyright.txt @@ -1,7 +1,7 @@ The code and graphics on this website (and it's mirror sites, if any) are -Copyright (c) 1999-2005 by Erik Andersen, 2006-2020 The Buildroot -developers. All rights reserved. +Copyright (C) The Buildroot developers . All +rights reserved. Documents on this Web site including their graphical elements, design, and layout are protected by trade dress and other laws and MAY BE COPIED OR From c541df41806f0940128ab333d693fb7766e98da7 Mon Sep 17 00:00:00 2001 From: Nicolas Carrier Date: Fri, 13 Jan 2023 12:46:22 +0100 Subject: [PATCH 0382/5754] package/pkg-generic.mk: no legal info WARNING if REDISTRIBUTE = NO Packages making use of OVERRIDE_SRC_DIR or of the local SITE_METHOD, will trigger a warning when the legal-info target is built, for example: WARNING: foo: sources not saved (local packages not handled) But in the situation where the packages has explicitly defined FOO_REDISTRIBUTE = NO in its .mk file, it makes no sense since the sources wouldn't be saved anyway. This patch swap the conditions on the type of package and on the REDISTRIBUTE value, so that the warnings get issued only if REDISTRIBUTE equals YES. Signed-off-by: Nicolas Carrier Signed-off-by: Yann E. MORIN --- package/pkg-generic.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index f2bea01d7d..2f8ba39edf 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -1145,6 +1145,7 @@ else $(Q)$$(foreach F,$$($(2)_LICENSE_FILES),$$(call legal-license-file,$$($(2)_RAWNAME),$$($(2)_BASENAME_RAW),$$($(2)_HASH_FILE),$$(F),$$($(2)_DIR)/$$(F),$$(call UPPERCASE,$(4)))$$(sep)) endif # license files +ifeq ($$($(2)_REDISTRIBUTE),YES) ifeq ($$($(2)_SITE_METHOD),local) # Packages without a tarball: don't save and warn @$$(call legal-warning-nosource,$$($(2)_RAWNAME),local) @@ -1155,7 +1156,6 @@ else ifneq ($$($(2)_OVERRIDE_SRCDIR),) else # Other packages -ifeq ($$($(2)_REDISTRIBUTE),YES) # Save the source tarball and any extra downloads, but not # patches, as they are handled specially afterwards. $$(foreach e,$$($(2)_ACTUAL_SOURCE_TARBALL) $$(notdir $$($(2)_EXTRA_DOWNLOADS)),\ @@ -1169,9 +1169,9 @@ ifeq ($$($(2)_REDISTRIBUTE),YES) $$($(2)_REDIST_SOURCES_DIR) || exit 1; \ printf "%s\n" "$$$${f##*/}" >>$$($(2)_REDIST_SOURCES_DIR)/series || exit 1; \ done <$$($(2)_DIR)/.applied_patches_list -endif # redistribute - endif # other packages + +endif # redistribute @$$(call legal-manifest,$$(call UPPERCASE,$(4)),$$($(2)_RAWNAME),$$($(2)_VERSION),$$(subst $$(space)$$(comma),$$(comma),$$($(2)_LICENSE)),$$($(2)_MANIFEST_LICENSE_FILES),$$($(2)_ACTUAL_SOURCE_TARBALL),$$($(2)_ACTUAL_SOURCE_SITE),$$(call legal-deps,$(1))) endif # ifneq ($$(call qstrip,$$($(2)_SOURCE)),) $$(foreach hook,$$($(2)_POST_LEGAL_INFO_HOOKS),$$(call $$(hook))$$(sep)) From 52afc0b3b504c9616b3875dcdf67ab7be41455f5 Mon Sep 17 00:00:00 2001 From: Nicolas Carrier Date: Fri, 13 Jan 2023 14:39:53 +0100 Subject: [PATCH 0383/5754] package/lpeg: add missing LPEG_LICENSE_FILES The lpeg.html file declares the licensing terms at its bottom, so it should work as a license file. Signed-off-by: Nicolas Carrier [yann.morin.1998@free.fr: use LPEG_SUBDIR] Signed-off-by: Yann E. MORIN --- package/lpeg/lpeg.hash | 2 ++ package/lpeg/lpeg.mk | 1 + 2 files changed, 3 insertions(+) diff --git a/package/lpeg/lpeg.hash b/package/lpeg/lpeg.hash index 1ccaf242c4..cb995bde2c 100644 --- a/package/lpeg/lpeg.hash +++ b/package/lpeg/lpeg.hash @@ -1,2 +1,4 @@ # computed by luarocks/buildroot sha256 e0d0d687897f06588558168eeb1902ac41a11edd1b58f1aa61b99d0ea0abbfbc lpeg-1.0.2-1.src.rock +# computed locally +sha256 2b80a8cce793e008ba433e5e0184f20aca4a67ec741439fafd86a874a6a91c49 lpeg-1.0.2/lpeg.html diff --git a/package/lpeg/lpeg.mk b/package/lpeg/lpeg.mk index cdb2e81a5f..7326e59e01 100644 --- a/package/lpeg/lpeg.mk +++ b/package/lpeg/lpeg.mk @@ -6,5 +6,6 @@ LPEG_VERSION = 1.0.2-1 LPEG_LICENSE = MIT +LPEG_LICENSE_FILES = $(LPEG_SUBDIR)/lpeg.html $(eval $(luarocks-package)) From dce238f045f25d75b31681ea56ea5b9c668912dd Mon Sep 17 00:00:00 2001 From: Vincent Fazio Date: Fri, 13 Jan 2023 16:54:25 -0600 Subject: [PATCH 0384/5754] package/ipmitool: use the standard github helper Signed-off-by: Vincent Fazio Signed-off-by: Vincent Fazio Signed-off-by: Thomas Petazzoni --- package/ipmitool/ipmitool.hash | 2 +- package/ipmitool/ipmitool.mk | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/package/ipmitool/ipmitool.hash b/package/ipmitool/ipmitool.hash index bb0b0d80b0..c3b298e3ba 100644 --- a/package/ipmitool/ipmitool.hash +++ b/package/ipmitool/ipmitool.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 48b010e7bcdf93e4e4b6e43c53c7f60aa6873d574cbd45a8d86fa7aaeebaff9c IPMITOOL_1_8_19.tar.gz +sha256 48b010e7bcdf93e4e4b6e43c53c7f60aa6873d574cbd45a8d86fa7aaeebaff9c ipmitool-1_8_19.tar.gz sha256 b7e2382a8be43b5f6cb092f2d2bda163bf1a1938be9300f821a845cbcd535f56 COPYING diff --git a/package/ipmitool/ipmitool.mk b/package/ipmitool/ipmitool.mk index b9f60d8151..5e34434a03 100644 --- a/package/ipmitool/ipmitool.mk +++ b/package/ipmitool/ipmitool.mk @@ -5,8 +5,7 @@ ################################################################################ IPMITOOL_VERSION = 1_8_19 -IPMITOOL_SOURCE = IPMITOOL_$(IPMITOOL_VERSION).tar.gz -IPMITOOL_SITE = https://github.com/ipmitool/ipmitool/archive/refs/tags +IPMITOOL_SITE = $(call github,ipmitool,ipmitool,IPMITOOL_$(IPMITOOL_VERSION)) IPMITOOL_LICENSE = BSD-3-Clause IPMITOOL_LICENSE_FILES = COPYING IPMITOOL_CPE_ID_VENDOR = ipmitool_project From c9d6f0e1c8a99eec548b1690e1bb58d90189a44d Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 9 Jan 2023 15:03:29 -0700 Subject: [PATCH 0385/5754] package/libbpf: bump to version 1.1.0 Drop patch which is now upstream. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- ...cross-compilation-for-32-bit-targets.patch | 38 ------------------- package/libbpf/libbpf.hash | 2 +- package/libbpf/libbpf.mk | 2 +- 3 files changed, 2 insertions(+), 40 deletions(-) delete mode 100644 package/libbpf/0001-Makefile-Fix-cross-compilation-for-32-bit-targets.patch diff --git a/package/libbpf/0001-Makefile-Fix-cross-compilation-for-32-bit-targets.patch b/package/libbpf/0001-Makefile-Fix-cross-compilation-for-32-bit-targets.patch deleted file mode 100644 index 12c22f3147..0000000000 --- a/package/libbpf/0001-Makefile-Fix-cross-compilation-for-32-bit-targets.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 68e6f83f223ebf3fbf0d94c0f4592e5e6773f0c1 Mon Sep 17 00:00:00 2001 -From: Tobias Waldekranz -Date: Fri, 14 Oct 2022 21:14:14 +0200 -Subject: [PATCH] Makefile: Fix cross-compilation for 32-bit targets - -Determining the correct library installation path (lib vs. lib64) -using uname(1) breaks in cross compilation scenarios where word widths -differ between the host and target system. - -Instead, source the information from the compilers '-dumpmachine' -option (supported by both GCC and Clang). - -We call this the "host" architecture, using the same nomenclature as -Autotools (--host configure option). - -Upstream: https://github.com/libbpf/libbpf/commit/68e6f83f223ebf3fbf0d94c0f4592e5e6773f0c1 -Signed-off-by: Tobias Waldekranz ---- - src/Makefile | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/Makefile b/src/Makefile -index 3cd0854..d535f81 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -77,7 +77,8 @@ INSTALL = install - - DESTDIR ?= - --ifeq ($(filter-out %64 %64be %64eb %64le %64el s390x, $(shell uname -m)),) -+HOSTARCH = $(firstword $(subst -, ,$(shell $(CC) -dumpmachine))) -+ifeq ($(filter-out %64 %64be %64eb %64le %64el s390x, $(HOSTARCH)),) - LIBSUBDIR := lib64 - else - LIBSUBDIR := lib --- -2.34.1 - diff --git a/package/libbpf/libbpf.hash b/package/libbpf/libbpf.hash index 4305872d9f..75f2b1695c 100644 --- a/package/libbpf/libbpf.hash +++ b/package/libbpf/libbpf.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 3d6afde67682c909e341bf194678a8969f17628705af25f900d5f68bd299cb03 libbpf-1.0.1.tar.gz +sha256 5da826c968fdb8a2f714701cfef7a4b7078be030cf58b56143b245816301cbb8 libbpf-1.1.0.tar.gz sha256 847f4addbd56e2d5be20c4ea0845e972672fc07b755fadaae5f7abd35d71e349 LICENSE sha256 e1638b9a0c68ca90fad3df1d6b4e430804d2fbdc15e58d02cffddfae38953bbf LICENSE.BSD-2-Clause sha256 0b9a4febcdee6de55872501d5c1a8f5d8b0d1650cd4d5351995ceb22e889f8ca LICENSE.LGPL-2.1 diff --git a/package/libbpf/libbpf.mk b/package/libbpf/libbpf.mk index 820f1dc4bf..b498136ace 100644 --- a/package/libbpf/libbpf.mk +++ b/package/libbpf/libbpf.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBBPF_VERSION = 1.0.1 +LIBBPF_VERSION = 1.1.0 LIBBPF_SITE = $(call github,libbpf,libbpf,v$(LIBBPF_VERSION)) LIBBPF_LICENSE = GPL-2.0, LGPL-2.1, BSD-2-Clause LIBBPF_LICENSE_FILES = LICENSE LICENSE.BSD-2-Clause LICENSE.LGPL-2.1 From 4db36b268d8978b65bb5ed46e8f7e57412f3097f Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 9 Jan 2023 18:56:58 -0700 Subject: [PATCH 0386/5754] package/bpftool: bump to version 7.1.0 Use install-bin for installation instead of install as we don't want bash-completion files to be installed. Set empty host installation prefix so that we install to: $(HOST_DIR)/sbin/bpftool Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/bpftool/bpftool.hash | 2 +- package/bpftool/bpftool.mk | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/bpftool/bpftool.hash b/package/bpftool/bpftool.hash index 92b9359fe3..cfd3c54515 100644 --- a/package/bpftool/bpftool.hash +++ b/package/bpftool/bpftool.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 465a50fea4afbacd326f2209d81ae0dcff637fbb2c9d1a315e94f79a788ce960 bpftool-v7.0.0-br1.tar.gz +sha256 35ff149cab4a3ab209b0c04cab2707243ab7ee753de5f4b5678296c975cf7fe0 bpftool-v7.1.0-br1.tar.gz sha256 7c588754d5e81e92e2a12e47cf78949d485c9c22b4850f12d21b3835c85947d1 LICENSE sha256 6313108c23efffa36948f8b2cff1560a5935373b527b0e1a837cc77e6ed1bacd LICENSE.BSD-2-Clause sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL-2.0 diff --git a/package/bpftool/bpftool.mk b/package/bpftool/bpftool.mk index 3b27698130..cd68d89799 100644 --- a/package/bpftool/bpftool.mk +++ b/package/bpftool/bpftool.mk @@ -4,7 +4,7 @@ # ################################################################################ -BPFTOOL_VERSION = v7.0.0 +BPFTOOL_VERSION = v7.1.0 BPFTOOL_SITE = https://github.com/libbpf/bpftool BPFTOOL_SITE_METHOD = git BPFTOOL_GIT_SUBMODULES = YES @@ -33,12 +33,12 @@ endef define BPFTOOL_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) \ - -C $(@D)/src install DESTDIR="$(TARGET_DIR)" prefix=/usr + -C $(@D)/src install-bin DESTDIR="$(TARGET_DIR)" prefix=/usr endef define HOST_BPFTOOL_INSTALL_CMDS $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) \ - -C $(@D)/src install DESTDIR="$(HOST_DIR)" prefix=/usr + -C $(@D)/src install-bin DESTDIR="$(HOST_DIR)" prefix= endef $(eval $(generic-package)) From 424f53ac0730ea8e8aac4f3341f25a9829582cbb Mon Sep 17 00:00:00 2001 From: Lang Daniel Date: Tue, 10 Jan 2023 09:32:43 +0000 Subject: [PATCH 0387/5754] package/freescale-imx/imx-gpu-viv: drop X11 output Since e8df0f7 (package/freescale-imx/imx-gpu-viv: bump to version 6.4.3.p4.4) the X11 folder is no longer included in the archive. Signed-off-by: Daniel Lang Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 6 +++++ package/freescale-imx/imx-gpu-viv/Config.in | 22 ++++--------------- .../freescale-imx/imx-gpu-viv/imx-gpu-viv.mk | 16 +------------- 3 files changed, 11 insertions(+), 33 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 6d66f1b958..41c5fdefb3 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11 + bool "imx-gpu-viv X11 output has been removed" + select BR2_LEGACY + help + The X11 output was dropped by NXP. + config BR2_PACKAGE_QEMU_CUSTOM_TARGETS string "the QEMU specific targets option has been removed" help diff --git a/package/freescale-imx/imx-gpu-viv/Config.in b/package/freescale-imx/imx-gpu-viv/Config.in index 9ba3d0428e..9372b6313f 100644 --- a/package/freescale-imx/imx-gpu-viv/Config.in +++ b/package/freescale-imx/imx-gpu-viv/Config.in @@ -27,9 +27,9 @@ config BR2_PACKAGE_IMX_GPU_VIV Userspace libraries for Vivante GPU on i.MX platforms It contains libraries and headers for GLES, OpenCL, and - OpenVG. It also contains a DRI plugin for X11. It also - contains a plugin for DirectFB-1.4.0, but that doesn't work - together with buildroot's DirectFB version. + OpenVG. It also contains a plugin for DirectFB-1.4.0, but + that doesn't work together with buildroot's DirectFB + version. This library is provided by Freescale as-is and doesn't have an upstream. @@ -40,22 +40,9 @@ choice prompt "Output option" help There are two versions of this library: one for - direct framebuffer access, one for X11 rendering. + direct framebuffer access, one for wayland rendering. Choose here which version to install. -config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11 - bool "X11" - depends on BR2_PACKAGE_XORG7 - # The i.MX8 blob doesn't support X11 output - depends on !BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M - select BR2_PACKAGE_XLIB_LIBXDAMAGE - select BR2_PACKAGE_XLIB_LIBXEXT - select BR2_PACKAGE_XLIB_LIBXFIXES - -comment "X11 backend needs Xorg package" - depends on !BR2_PACKAGE_XORG7 - depends on !BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M - config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_FB bool "Framebuffer" # The i.MX8 blob doesn't support FB output @@ -70,7 +57,6 @@ endchoice config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT string - default "x11" if BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11 default "fb" if BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_FB default "wayland" if BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL diff --git a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk index 06fbbc7343..e0e8a31533 100644 --- a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk +++ b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk @@ -26,14 +26,6 @@ endif IMX_GPU_VIV_LIB_TARGET = $(call qstrip,$(BR2_PACKAGE_IMX_GPU_VIV_OUTPUT)) -ifeq ($(IMX_GPU_VIV_LIB_TARGET),x11) -# The libGAL.so library provided by imx-gpu-viv uses X functions. Packages -# may want to link against libGAL.so (QT5 Base with OpenGL and X support -# does so). For this to work we need build dependencies to libXdamage, -# libXext and libXfixes so that X functions used in libGAL.so are referenced. -IMX_GPU_VIV_DEPENDENCIES += xlib_libXdamage xlib_libXext xlib_libXfixes -endif - # Libraries are linked against libdrm, except framebuffer output on ARM ifneq ($(IMX_GPU_VIV_LIB_TARGET)$(BR2_arm),fby) IMX_GPU_VIV_DEPENDENCIES += libdrm @@ -55,12 +47,6 @@ else ifeq ($(IMX_GPU_VIV_LIB_TARGET),wayland) define IMX_GPU_VIV_FIXUP_PKGCONFIG ln -sf egl_wayland.pc $(@D)/gpu-core/usr/lib/pkgconfig/egl.pc endef -else ifeq ($(IMX_GPU_VIV_LIB_TARGET),x11) -define IMX_GPU_VIV_FIXUP_PKGCONFIG - $(foreach lib,egl glesv1_cm glesv2 vg, \ - ln -sf $(lib)_x11.pc $(@D)/gpu-core/usr/lib/pkgconfig/$(lib).pc - ) -endef endif # Instead of building, we fix up the inconsistencies that exist @@ -68,7 +54,7 @@ endif # Make sure these commands are idempotent. define IMX_GPU_VIV_BUILD_CMDS cp -dpfr $(@D)/gpu-core/usr/lib/$(IMX_GPU_VIV_LIB_TARGET)/* $(@D)/gpu-core/usr/lib/ - $(foreach backend,fb x11 wayland, \ + $(foreach backend,fb wayland, \ $(RM) -r $(@D)/gpu-core/usr/lib/$(backend) ) $(IMX_GPU_VIV_FIXUP_PKGCONFIG) From 838c9a33be603e59ff7f65041bbcc138e573d13f Mon Sep 17 00:00:00 2001 From: Lang Daniel Date: Tue, 10 Jan 2023 09:33:39 +0000 Subject: [PATCH 0388/5754] package/freescale-imx/imx-gpu-viv: add platform specific drivers Since e8df0f7 (package/freescale-imx/imx-gpu-viv: bump to version 6.4.3.p4.4) the archive contains platform specific drivers that need to be copied and included. Signed-off-by: Daniel Lang Signed-off-by: Thomas Petazzoni --- package/freescale-imx/imx-gpu-viv/Config.in | 8 ++++++++ package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk | 11 +++++++++++ 2 files changed, 19 insertions(+) diff --git a/package/freescale-imx/imx-gpu-viv/Config.in b/package/freescale-imx/imx-gpu-viv/Config.in index 9372b6313f..3e095b730c 100644 --- a/package/freescale-imx/imx-gpu-viv/Config.in +++ b/package/freescale-imx/imx-gpu-viv/Config.in @@ -77,6 +77,14 @@ if BR2_aarch64 config BR2_PACKAGE_PROVIDES_LIBGBM default "imx-gpu-viv" +config BR2_PACKAGE_IMX_GPU_VIV_PLATFORM + string + default "mx8mn" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN + default "mx8mp" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MP + default "mx8mq" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M + default "mx8qm" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8 + default "mx8qxp" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X + endif config BR2_PACKAGE_IMX_GPU_VIV_EXAMPLES diff --git a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk index e0e8a31533..f72735e093 100644 --- a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk +++ b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk @@ -49,6 +49,13 @@ define IMX_GPU_VIV_FIXUP_PKGCONFIG endef endif +IMX_GPU_VIV_PLATFORM_DIR = $(call qstrip,$(BR2_PACKAGE_IMX_GPU_VIV_PLATFORM)) +ifneq ($(IMX_GPU_VIV_PLATFORM_DIR),) +define IMX_GPU_VIV_COPY_PLATFORM + cp -dpfr $(@D)/gpu-core/usr/lib/$(IMX_GPU_VIV_PLATFORM_DIR)/* $(@D)/gpu-core/usr/lib/ +endef +endif + # Instead of building, we fix up the inconsistencies that exist # in the upstream archive here. We also remove unused backend files. # Make sure these commands are idempotent. @@ -57,6 +64,10 @@ define IMX_GPU_VIV_BUILD_CMDS $(foreach backend,fb wayland, \ $(RM) -r $(@D)/gpu-core/usr/lib/$(backend) ) + $(IMX_GPU_VIV_COPY_PLATFORM) + $(foreach platform,mx8mn mx8mp mx8mq mx8qm mx8qxp mx8ulp, \ + $(RM) -r $(@D)/gpu-core/usr/lib/$(platform) + ) $(IMX_GPU_VIV_FIXUP_PKGCONFIG) endef From dde078790a965dfd469ec6ed745e4f7b5edc60ba Mon Sep 17 00:00:00 2001 From: Lang Daniel Date: Thu, 12 Jan 2023 09:22:07 +0000 Subject: [PATCH 0389/5754] package/at-spi2-core: switch to https download Signed-off-by: Daniel Lang Signed-off-by: Thomas Petazzoni --- package/at-spi2-core/at-spi2-core.hash | 2 +- package/at-spi2-core/at-spi2-core.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/at-spi2-core/at-spi2-core.hash b/package/at-spi2-core/at-spi2-core.hash index e2cc403e71..764e4c3661 100644 --- a/package/at-spi2-core/at-spi2-core.hash +++ b/package/at-spi2-core/at-spi2-core.hash @@ -1,4 +1,4 @@ -# From http://ftp.acc.umu.se/pub/gnome/sources/at-spi2-core/2.36/at-spi2-core-2.36.0.sha256sum +# 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 # locally calculated diff --git a/package/at-spi2-core/at-spi2-core.mk b/package/at-spi2-core/at-spi2-core.mk index cf7fdd297c..f0b019c0ed 100644 --- a/package/at-spi2-core/at-spi2-core.mk +++ b/package/at-spi2-core/at-spi2-core.mk @@ -7,7 +7,7 @@ AT_SPI2_CORE_VERSION_MAJOR = 2.36 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 = http://ftp.gnome.org/pub/gnome/sources/at-spi2-core/$(AT_SPI2_CORE_VERSION_MAJOR) +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 From 59461ec52ef6d70d08d0e68cd24a6a3db2dbb7fc Mon Sep 17 00:00:00 2001 From: Michael Nosthoff Date: Mon, 2 Jan 2023 12:27:36 +0100 Subject: [PATCH 0390/5754] package/{python-}protobuf: bump to version 21.12 Signed-off-by: Michael Nosthoff Signed-off-by: Yann E. MORIN --- package/protobuf/protobuf.hash | 2 +- package/protobuf/protobuf.mk | 2 +- package/python-protobuf/python-protobuf.hash | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/protobuf/protobuf.hash b/package/protobuf/protobuf.hash index f1f5fa77cd..b092c9303f 100644 --- a/package/protobuf/protobuf.hash +++ b/package/protobuf/protobuf.hash @@ -1,3 +1,3 @@ # Locally calculated sha256 6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d LICENSE -sha256 96f0ab99b7414e44e7bf9b218bb59510d61549ca68e648f19e3622f9999bec00 protobuf-cpp-3.21.11.tar.gz +sha256 4eab9b524aa5913c6fffb20b2a8abf5ef7f95a80bc0701f3a6dbb4c607f73460 protobuf-cpp-3.21.12.tar.gz diff --git a/package/protobuf/protobuf.mk b/package/protobuf/protobuf.mk index 33a7c40f40..8cd4e99e06 100644 --- a/package/protobuf/protobuf.mk +++ b/package/protobuf/protobuf.mk @@ -7,7 +7,7 @@ # When bumping this package, make sure to also verify if the # python-protobuf package still works and to update its hash, # as they share the same version/site variables. -PROTOBUF_VERSION = 21.11 +PROTOBUF_VERSION = 21.12 PROTOBUF_SOURCE = protobuf-cpp-3.$(PROTOBUF_VERSION).tar.gz PROTOBUF_SITE = https://github.com/protocolbuffers/protobuf/releases/download/v$(PROTOBUF_VERSION) PROTOBUF_LICENSE = BSD-3-Clause diff --git a/package/python-protobuf/python-protobuf.hash b/package/python-protobuf/python-protobuf.hash index c2afc3955a..e7af678b97 100644 --- a/package/python-protobuf/python-protobuf.hash +++ b/package/python-protobuf/python-protobuf.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ae4ca6e1da635f31019d8911923163f372d9d333e8857510f513acba33172d0c protobuf-python-4.21.11.tar.gz +sha256 e2b976e67d6fcf7078f799143a73f2a4d9cf3126ca68a1a6f1bda30fe5f3585c protobuf-python-4.21.12.tar.gz sha256 6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d LICENSE From c35f2393327abab5d21a9155d468067482af383b Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 8 Jan 2023 19:52:01 -0700 Subject: [PATCH 0391/5754] package/python-aioblescan: bump to version 0.2.14 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-aioblescan/python-aioblescan.hash | 4 ++-- package/python-aioblescan/python-aioblescan.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-aioblescan/python-aioblescan.hash b/package/python-aioblescan/python-aioblescan.hash index 9a40ca4560..c754325fb1 100644 --- a/package/python-aioblescan/python-aioblescan.hash +++ b/package/python-aioblescan/python-aioblescan.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aioblescan/json -md5 0601cf9335e5d89166a88f53597c79bf aioblescan-0.2.13.tar.gz -sha256 28632e32c8180ea4b792f4cf9b88968dd100f4d3cee0cf16d27c193cf954422a aioblescan-0.2.13.tar.gz +md5 10014cfd24b8f9f54099bbf7e2ea528a aioblescan-0.2.14.tar.gz +sha256 3a47c5292186ee87fc49cb076a5271c766510f44749b93ac4a32bbb4cb5258a0 aioblescan-0.2.14.tar.gz # Locally computed sha256 checksums sha256 c2066cd44079e0c706234001af18cb6ad4b62fc68d0d08d29fdc7319916647e0 LICENSE.txt diff --git a/package/python-aioblescan/python-aioblescan.mk b/package/python-aioblescan/python-aioblescan.mk index f0e277d528..7e0cde6c85 100644 --- a/package/python-aioblescan/python-aioblescan.mk +++ b/package/python-aioblescan/python-aioblescan.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOBLESCAN_VERSION = 0.2.13 +PYTHON_AIOBLESCAN_VERSION = 0.2.14 PYTHON_AIOBLESCAN_SOURCE = aioblescan-$(PYTHON_AIOBLESCAN_VERSION).tar.gz -PYTHON_AIOBLESCAN_SITE = https://files.pythonhosted.org/packages/bd/04/c6798c76704d57da22f19c2e47485821d4b23144ef75f9c0e18dbfe47565 +PYTHON_AIOBLESCAN_SITE = https://files.pythonhosted.org/packages/45/15/faf503083bc5a2d81f1b17fbbe30d15f35217b6c5e944c771c8760354d59 PYTHON_AIOBLESCAN_SETUP_TYPE = setuptools PYTHON_AIOBLESCAN_LICENSE = MIT PYTHON_AIOBLESCAN_LICENSE_FILES = LICENSE.txt From cde8b664b5fef509df74582097b925b899191543 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 8 Jan 2023 19:55:28 -0700 Subject: [PATCH 0392/5754] package/python-alembic: bump to version 1.9.1 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-alembic/python-alembic.hash | 4 ++-- package/python-alembic/python-alembic.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-alembic/python-alembic.hash b/package/python-alembic/python-alembic.hash index e256e9dc08..f94f5ab10a 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 667a722df7dbef926a4ce760b9917622 alembic-1.8.1.tar.gz -sha256 cd0b5e45b14b706426b833f06369b9a6d5ee03f826ec3238723ce8caaf6e5ffa alembic-1.8.1.tar.gz +md5 999392ffc900da18afbf10d2ac31bdc6 alembic-1.9.1.tar.gz +sha256 f9f76e41061f5ebe27d4fe92600df9dd612521a7683f904dab328ba02cffa5a2 alembic-1.9.1.tar.gz # Locally computed sha256 checksums sha256 f0e3f7a5080879ccae798882d9bee3d48fe335d0bad84ca8eec86fa594375ea0 LICENSE diff --git a/package/python-alembic/python-alembic.mk b/package/python-alembic/python-alembic.mk index 735678b384..64ce85bead 100644 --- a/package/python-alembic/python-alembic.mk +++ b/package/python-alembic/python-alembic.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ALEMBIC_VERSION = 1.8.1 +PYTHON_ALEMBIC_VERSION = 1.9.1 PYTHON_ALEMBIC_SOURCE = alembic-$(PYTHON_ALEMBIC_VERSION).tar.gz -PYTHON_ALEMBIC_SITE = https://files.pythonhosted.org/packages/37/ab/80e6d86ca81235ea1a7104089dddf74de4b45f8af0a05d4b265be44d6ff9 +PYTHON_ALEMBIC_SITE = https://files.pythonhosted.org/packages/81/87/5c531d2923c61e7ae68b23c8660df289ae4241a0d38f3fbcbd8dba64ca6b PYTHON_ALEMBIC_SETUP_TYPE = setuptools PYTHON_ALEMBIC_LICENSE = MIT PYTHON_ALEMBIC_LICENSE_FILES = LICENSE From 823e3e98671bf70135d526298346a8c72beacd8a Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 8 Jan 2023 19:59:23 -0700 Subject: [PATCH 0393/5754] package/python-asgiref: bump to version 3.6.0 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-asgiref/python-asgiref.hash | 4 ++-- package/python-asgiref/python-asgiref.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-asgiref/python-asgiref.hash b/package/python-asgiref/python-asgiref.hash index fec707ce02..26d8e78e47 100644 --- a/package/python-asgiref/python-asgiref.hash +++ b/package/python-asgiref/python-asgiref.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/asgiref/json -md5 b3cf42bb1f9191196f9ed1678f9dc106 asgiref-3.5.2.tar.gz -sha256 4a29362a6acebe09bf1d6640db38c1dc3d9217c68e6f9f6204d72667fc19a424 asgiref-3.5.2.tar.gz +md5 562ecd896dcbf5576db8c29cb1881ca4 asgiref-3.6.0.tar.gz +sha256 9567dfe7bd8d3c8c892227827c41cce860b368104c3431da67a0c5a65a949506 asgiref-3.6.0.tar.gz # Locally computed sha256 checksums sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/package/python-asgiref/python-asgiref.mk b/package/python-asgiref/python-asgiref.mk index afc083fb1f..bfd90f10e8 100644 --- a/package/python-asgiref/python-asgiref.mk +++ b/package/python-asgiref/python-asgiref.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ASGIREF_VERSION = 3.5.2 +PYTHON_ASGIREF_VERSION = 3.6.0 PYTHON_ASGIREF_SOURCE = asgiref-$(PYTHON_ASGIREF_VERSION).tar.gz -PYTHON_ASGIREF_SITE = https://files.pythonhosted.org/packages/1f/35/e7d59b92ceffb1dc62c65156278de378670b46ab2364a3ea7216fe194ba3 +PYTHON_ASGIREF_SITE = https://files.pythonhosted.org/packages/78/2d/797c0537426266d6c9377a2ed6a4ac61e50c2d5b1ab4da101a4b9bfe26e2 PYTHON_ASGIREF_SETUP_TYPE = setuptools PYTHON_ASGIREF_LICENSE = BSD-3-Clause PYTHON_ASGIREF_LICENSE_FILES = LICENSE From 3f8d6264d79f6645ce4f2bbf0b76a919db29fcb5 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 8 Jan 2023 20:02:10 -0700 Subject: [PATCH 0394/5754] package/python-attrs: bump to version 22.2.0 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-attrs/python-attrs.hash | 4 ++-- package/python-attrs/python-attrs.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-attrs/python-attrs.hash b/package/python-attrs/python-attrs.hash index d5548c0ed3..66b2082cff 100644 --- a/package/python-attrs/python-attrs.hash +++ b/package/python-attrs/python-attrs.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/attrs/json -md5 0487081b7ead8753fc46cf7c6d1e28e3 attrs-22.1.0.tar.gz -sha256 29adc2665447e5191d0e7c568fde78b21f9672d344281d0c6e1ab085429b22b6 attrs-22.1.0.tar.gz +md5 eff16b3bbd0d9b72e118cca83a19d380 attrs-22.2.0.tar.gz +sha256 c9227bfc2f01993c03f68db37d1d15c9690188323c067c641f1a35ca58185f99 attrs-22.2.0.tar.gz # Locally computed sha256 checksums sha256 882115c95dfc2af1eeb6714f8ec6d5cbcabf667caff8729f42420da63f714e9f LICENSE diff --git a/package/python-attrs/python-attrs.mk b/package/python-attrs/python-attrs.mk index 33651ee80a..0462f7cb0b 100644 --- a/package/python-attrs/python-attrs.mk +++ b/package/python-attrs/python-attrs.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ATTRS_VERSION = 22.1.0 +PYTHON_ATTRS_VERSION = 22.2.0 PYTHON_ATTRS_SOURCE = attrs-$(PYTHON_ATTRS_VERSION).tar.gz -PYTHON_ATTRS_SITE = https://files.pythonhosted.org/packages/1a/cb/c4ffeb41e7137b23755a45e1bfec9cbb76ecf51874c6f1d113984ecaa32c +PYTHON_ATTRS_SITE = https://files.pythonhosted.org/packages/21/31/3f468da74c7de4fcf9b25591e682856389b3400b4b62f201e65f15ea3e07 PYTHON_ATTRS_SETUP_TYPE = setuptools PYTHON_ATTRS_LICENSE = MIT PYTHON_ATTRS_LICENSE_FILES = LICENSE From 0cd7fadb263decfa5b4566f6ad71c02914726146 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 8 Jan 2023 20:11:16 -0700 Subject: [PATCH 0395/5754] package/python-autobahn: bump to version 22.12.1 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-autobahn/python-autobahn.hash | 4 ++-- package/python-autobahn/python-autobahn.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-autobahn/python-autobahn.hash b/package/python-autobahn/python-autobahn.hash index 4ae158be03..f9b68dcb22 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 2921fb2bdea60b4cb36ccec367625995 autobahn-22.7.1.tar.gz -sha256 8b462ea2e6aad6b4dc0ed45fb800b6cbfeb0325e7fe6983907f122f2be4a1fe9 autobahn-22.7.1.tar.gz +md5 98d8451385ccd8ece2d2fac023c61a19 autobahn-22.12.1.tar.gz +sha256 43b4e8b1aeaeb20a0cc0a81572e613dc958057c0ab248a7d6b41b2763270f925 autobahn-22.12.1.tar.gz # Locally computed sha256 checksums sha256 0387eefce570453daaa60633f28676003731eeca28b2d0a0071c628e3a0004ef LICENSE diff --git a/package/python-autobahn/python-autobahn.mk b/package/python-autobahn/python-autobahn.mk index fb3a7b84de..4c14151960 100644 --- a/package/python-autobahn/python-autobahn.mk +++ b/package/python-autobahn/python-autobahn.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AUTOBAHN_VERSION = 22.7.1 +PYTHON_AUTOBAHN_VERSION = 22.12.1 PYTHON_AUTOBAHN_SOURCE = autobahn-$(PYTHON_AUTOBAHN_VERSION).tar.gz -PYTHON_AUTOBAHN_SITE = https://files.pythonhosted.org/packages/c5/b5/c92d6640fd55cbbdd97c05800ab534d84197f7b485d89a9df981ab67cce3 +PYTHON_AUTOBAHN_SITE = https://files.pythonhosted.org/packages/a8/6f/78b90951f263232e468439627f31a2c0846e36043c95af96dc527a4aeee6 PYTHON_AUTOBAHN_LICENSE = MIT PYTHON_AUTOBAHN_LICENSE_FILES = LICENSE PYTHON_AUTOBAHN_CPE_ID_VENDOR = crossbar From 1db8f1edf859a501fb8444e90a2af7916f48de42 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 8 Jan 2023 20:14:07 -0700 Subject: [PATCH 0396/5754] package/python-bidict: bump to version 0.22.1 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-bidict/python-bidict.hash | 4 ++-- package/python-bidict/python-bidict.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-bidict/python-bidict.hash b/package/python-bidict/python-bidict.hash index fe9a94af53..bcb9ea3f34 100644 --- a/package/python-bidict/python-bidict.hash +++ b/package/python-bidict/python-bidict.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/bidict/json -md5 da3d37ae93c740c191b5666918c3164f bidict-0.22.0.tar.gz -sha256 5c826b3e15e97cc6e615de295756847c282a79b79c5430d3bfc909b1ac9f5bd8 bidict-0.22.0.tar.gz +md5 67dd74f41341e7ff437d69e00a6fd514 bidict-0.22.1.tar.gz +sha256 1e0f7f74e4860e6d0943a05d4134c63a2fad86f3d4732fb265bd79e4e856d81d bidict-0.22.1.tar.gz # Locally computed sha256 checksums sha256 be0487398bba08e7772b4077b637787b94973b53c44b3cbdd6c7dab10ed15035 LICENSE diff --git a/package/python-bidict/python-bidict.mk b/package/python-bidict/python-bidict.mk index 7ba15db605..ae3a1ee024 100644 --- a/package/python-bidict/python-bidict.mk +++ b/package/python-bidict/python-bidict.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BIDICT_VERSION = 0.22.0 +PYTHON_BIDICT_VERSION = 0.22.1 PYTHON_BIDICT_SOURCE = bidict-$(PYTHON_BIDICT_VERSION).tar.gz -PYTHON_BIDICT_SITE = https://files.pythonhosted.org/packages/2b/84/159749556b9c49ea4489dadeb94d44f05d6033d1db3af4c83120ecac5b15 +PYTHON_BIDICT_SITE = https://files.pythonhosted.org/packages/f2/be/b31e6ea9c94096a323e7a0e2c61480db01f07610bb7e7ea72a06fd1a23a8 PYTHON_BIDICT_SETUP_TYPE = setuptools PYTHON_BIDICT_LICENSE = MPL-2.0 PYTHON_BIDICT_LICENSE_FILES = LICENSE From 63f59977dd884c36fe9a4fe4a51e3bd5d183705a Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 8 Jan 2023 20:15:53 -0700 Subject: [PATCH 0397/5754] package/python-boto3: bump to version 1.26.45 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- 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 60fd07681c..eecc87ab2d 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 9d5447419233a259b3ade6fb86d86cb6 boto3-1.26.27.tar.gz -sha256 255a7565226c21c5d500f69aabb977e1ac07dbaf576f4428d00558e8e508a23b boto3-1.26.27.tar.gz +md5 e3777333a201a2511dd7c814782fe9f0 boto3-1.26.45.tar.gz +sha256 cc7f652df93e1ce818413fd82ffd645d4f92a64fec67c72946212d3750eaa80f boto3-1.26.45.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 e40ac92f09..4d8fe58701 100644 --- a/package/python-boto3/python-boto3.mk +++ b/package/python-boto3/python-boto3.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BOTO3_VERSION = 1.26.27 +PYTHON_BOTO3_VERSION = 1.26.45 PYTHON_BOTO3_SOURCE = boto3-$(PYTHON_BOTO3_VERSION).tar.gz -PYTHON_BOTO3_SITE = https://files.pythonhosted.org/packages/62/7b/7cdcb980d9d90c910a6abec2cdee0ff6aa7a3d8afea4044ffd968d5c107c +PYTHON_BOTO3_SITE = https://files.pythonhosted.org/packages/f5/5d/62bfcda02d90699d41d5ff2573f88b5555354fb87308e8a3427fef3956c5 PYTHON_BOTO3_SETUP_TYPE = setuptools PYTHON_BOTO3_LICENSE = Apache-2.0 PYTHON_BOTO3_LICENSE_FILES = LICENSE From 2abc0d6a3809eaa9c71043368b3915572f5d0735 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 8 Jan 2023 20:18:22 -0700 Subject: [PATCH 0398/5754] package/python-botocore: bump to version 1.29.45 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- 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 8314c534e9..0e9d0572d7 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 488df64a4fcd884f9fbcf990bdc8b34c botocore-1.29.27.tar.gz -sha256 0932b22d8737b11037adf7e734f9b90425b575d0757e4c1a035e99f382955221 botocore-1.29.27.tar.gz +md5 3946a693e09b65a0f6615a1a30f606d7 botocore-1.29.45.tar.gz +sha256 62ae03e591ff25555854aa338da35190ffe18c0b1be2ebf5cfb277164233691f botocore-1.29.45.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 4b14af4368..ceb3fbe6ea 100644 --- a/package/python-botocore/python-botocore.mk +++ b/package/python-botocore/python-botocore.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BOTOCORE_VERSION = 1.29.27 +PYTHON_BOTOCORE_VERSION = 1.29.45 PYTHON_BOTOCORE_SOURCE = botocore-$(PYTHON_BOTOCORE_VERSION).tar.gz -PYTHON_BOTOCORE_SITE = https://files.pythonhosted.org/packages/08/3f/e9f97b0700e0be670404a7d4a9ac62fd59495897f15c928dd38874e98ef7 +PYTHON_BOTOCORE_SITE = https://files.pythonhosted.org/packages/9d/4f/1c24126941d1f8c1f2ecf459f88959d59566af34a55a81d926368fd2e6e5 PYTHON_BOTOCORE_SETUP_TYPE = setuptools PYTHON_BOTOCORE_LICENSE = Apache-2.0 PYTHON_BOTOCORE_LICENSE_FILES = LICENSE.txt From 7be2ff33abdd049dc3670c5a6e2e385c1fba6f41 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 8 Jan 2023 20:23:18 -0700 Subject: [PATCH 0399/5754] package/python-canopen: bump to version 2.1.0 Verified license remains MIT after hash changed. Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-canopen/python-canopen.hash | 6 +++--- package/python-canopen/python-canopen.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-canopen/python-canopen.hash b/package/python-canopen/python-canopen.hash index 610dca3f34..e6485e72f0 100644 --- a/package/python-canopen/python-canopen.hash +++ b/package/python-canopen/python-canopen.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/canopen/json -md5 0719b73bd8ccaeaa9fb758c5338fd030 canopen-2.0.0.tar.gz -sha256 bcc8aa9ea83f7ada5da0dade81038977be52a93802c2657649729eb1f82065d9 canopen-2.0.0.tar.gz +md5 d51443bdc8a55faea63c9da82196dd47 canopen-2.1.0.tar.gz +sha256 bc126bb1dcb62e3b34d8a12e38a07b5aa8319c17457c9bfe208f0bbbda90ff61 canopen-2.1.0.tar.gz # Locally computed sha256 checksums -sha256 0740d30978affcd91c0fc817b7cf942a332381bf0380fe17e60c6a0b377c6e0d LICENSE.txt +sha256 d9035caf7b8b135899da92a2730e2ac2e9f5ae3220dc98bd661be18045fcf689 LICENSE.txt diff --git a/package/python-canopen/python-canopen.mk b/package/python-canopen/python-canopen.mk index bd0a3bfba7..a0f5220ded 100644 --- a/package/python-canopen/python-canopen.mk +++ b/package/python-canopen/python-canopen.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CANOPEN_VERSION = 2.0.0 +PYTHON_CANOPEN_VERSION = 2.1.0 PYTHON_CANOPEN_SOURCE = canopen-$(PYTHON_CANOPEN_VERSION).tar.gz -PYTHON_CANOPEN_SITE = https://files.pythonhosted.org/packages/9e/d6/6ced4b410b904aeee5f7d0227187eae95a5ad769f01014a74fc0e016845e +PYTHON_CANOPEN_SITE = https://files.pythonhosted.org/packages/29/d1/54462c949c384b1a9a2bd260143a8ec6f4259a18d119bd122e8f8a791b50 PYTHON_CANOPEN_SETUP_TYPE = setuptools PYTHON_CANOPEN_LICENSE = MIT PYTHON_CANOPEN_LICENSE_FILES = LICENSE.txt From 3030baaa67dcafcc9f2c0802278c51f2ea016936 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 8 Jan 2023 20:26:31 -0700 Subject: [PATCH 0400/5754] package/python-crontab: bump to version 2.7.1 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-crontab/python-crontab.hash | 4 ++-- package/python-crontab/python-crontab.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-crontab/python-crontab.hash b/package/python-crontab/python-crontab.hash index b3aa96fc1b..d9519096df 100644 --- a/package/python-crontab/python-crontab.hash +++ b/package/python-crontab/python-crontab.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/python-crontab/json -md5 2982bdce2d9b7789f32da649a9507c4b python-crontab-2.6.0.tar.gz -sha256 1e35ed7a3cdc3100545b43e196d34754e6551e7f95e4caebbe0e1c0ca41c2f1b python-crontab-2.6.0.tar.gz +md5 0a71aa83eed18752c2850632d84cfd89 python-crontab-2.7.1.tar.gz +sha256 b21af4647c7bbb848fef2f020616c6b0289dcb9f94b4f991a55310ff9bec5749 python-crontab-2.7.1.tar.gz # Locally computed sha256 checksums sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 COPYING diff --git a/package/python-crontab/python-crontab.mk b/package/python-crontab/python-crontab.mk index 9b29e11ccd..1c2802ef61 100644 --- a/package/python-crontab/python-crontab.mk +++ b/package/python-crontab/python-crontab.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_CRONTAB_VERSION = 2.6.0 -PYTHON_CRONTAB_SITE = https://files.pythonhosted.org/packages/06/b0/c270a1b5c83d9e0f83ab654d3153c39d80f61ba49fefde50fd23ab351381 +PYTHON_CRONTAB_VERSION = 2.7.1 +PYTHON_CRONTAB_SITE = https://files.pythonhosted.org/packages/6a/b6/94d861e868698b8e3f288f7e4684e30535b0d9a6b38316ee0a3d4d31e6ae PYTHON_CRONTAB_SETUP_TYPE = setuptools PYTHON_CRONTAB_LICENSE = LGPL-3.0+ PYTHON_CRONTAB_LICENSE_FILES = COPYING From d31937ab88097a9ed3a34bf05fa07278abed77ae Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 8 Jan 2023 20:37:48 -0700 Subject: [PATCH 0401/5754] package/python-cython: bump to version 0.29.33 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- 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 3ed9fb56a1..e7e86264d2 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 91c36ea86c00adcc5c1c11cf48b733c0 Cython-0.29.32.tar.gz -sha256 8733cf4758b79304f2a4e39ebfac5e92341bce47bcceb26c1254398b2f8c1af7 Cython-0.29.32.tar.gz +md5 bd42c555cb2298b8a94fa8de7ee679ba Cython-0.29.33.tar.gz +sha256 5040764c4a4d2ce964a395da24f0d1ae58144995dab92c6b96f44c3f4d72286a Cython-0.29.33.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 9a90f6198e..b11d75b33d 100644 --- a/package/python-cython/python-cython.mk +++ b/package/python-cython/python-cython.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CYTHON_VERSION = 0.29.32 +PYTHON_CYTHON_VERSION = 0.29.33 PYTHON_CYTHON_SOURCE = Cython-$(PYTHON_CYTHON_VERSION).tar.gz -PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/4c/76/1e41fbb365ad20b6efab2e61b0f4751518444c953b390f9b2d36cf97eea0 +PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/dc/f6/e8e302f9942cbebede88b1a0c33d0be3a738c3ac37abae87254d58ffc51c PYTHON_CYTHON_SETUP_TYPE = setuptools PYTHON_CYTHON_LICENSE = Apache-2.0 PYTHON_CYTHON_LICENSE_FILES = COPYING.txt LICENSE.txt From f29c7f18d6267e65863aedb6d0c515cf8f9404f1 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 8 Jan 2023 20:42:18 -0700 Subject: [PATCH 0402/5754] package/python-dbus-fast: bump to version 1.84.0 Signed-off-by: James Hilliard Reviewed-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 f0dceeb43d..e9a3992f8e 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 eebf2c558dd1af0f8f32b361e91f2fa3 dbus_fast-1.61.1.tar.gz -sha256 bda4a7d559047b74f409eda278f68f610a418e86ad3efa0368fa2ed240daa6b6 dbus_fast-1.61.1.tar.gz +md5 21e3675168e3dbe807c6c8a29267241f dbus_fast-1.84.0.tar.gz +sha256 d64f1b68c1c81268e846471caeb9264a9306a6c6ad356c30d5cdf7d1ecc251a1 dbus_fast-1.84.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 de7049ba22..9dd88f613f 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.61.1 +PYTHON_DBUS_FAST_VERSION = 1.84.0 PYTHON_DBUS_FAST_SOURCE = dbus_fast-$(PYTHON_DBUS_FAST_VERSION).tar.gz -PYTHON_DBUS_FAST_SITE = https://files.pythonhosted.org/packages/dd/f4/a280d46b119d59f6a3d84abf474452ae76651558b0963ab8c48ae13b5a44 +PYTHON_DBUS_FAST_SITE = https://files.pythonhosted.org/packages/81/67/a83522d6692a72911c3586e2fcd2363ce22d1522a7e17e1012f255a6083b PYTHON_DBUS_FAST_SETUP_TYPE = setuptools PYTHON_DBUS_FAST_LICENSE = MIT PYTHON_DBUS_FAST_LICENSE_FILES = LICENSE From fc457e3d320bea68eac1bab8bd759c1ba0f7b40b Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 8 Jan 2023 20:47:08 -0700 Subject: [PATCH 0403/5754] package/python-dicttoxml: bump to version 1.7.16 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-dicttoxml/python-dicttoxml.hash | 4 ++-- package/python-dicttoxml/python-dicttoxml.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-dicttoxml/python-dicttoxml.hash b/package/python-dicttoxml/python-dicttoxml.hash index dcde7cf1b6..1c94d3446a 100644 --- a/package/python-dicttoxml/python-dicttoxml.hash +++ b/package/python-dicttoxml/python-dicttoxml.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/dicttoxml/json -md5 234550e3aa875c6f3520aa9a2dff1ef1 dicttoxml-1.7.15.tar.gz -sha256 5540fe7dfde2d2ed9467e67fcc981cbd2e164dc3120c862bdb7333202ac48838 dicttoxml-1.7.15.tar.gz +md5 f4853a05c41f9056172447d4e59517b9 dicttoxml-1.7.16.tar.gz +sha256 6f36ce644881db5cd8940bee9b7cb3f3f6b7b327ba8a67d83d3e2caa0538bf9d dicttoxml-1.7.16.tar.gz # Locally computed sha256 checksums sha256 4514114bd9da0b2fbf8c4fa264c0e6cc80fd41e6ac7f09d7a39a215662951c7c LICENCE.txt diff --git a/package/python-dicttoxml/python-dicttoxml.mk b/package/python-dicttoxml/python-dicttoxml.mk index 3e5f90e9de..c26c16b72a 100644 --- a/package/python-dicttoxml/python-dicttoxml.mk +++ b/package/python-dicttoxml/python-dicttoxml.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_DICTTOXML_VERSION = 1.7.15 +PYTHON_DICTTOXML_VERSION = 1.7.16 PYTHON_DICTTOXML_SOURCE = dicttoxml-$(PYTHON_DICTTOXML_VERSION).tar.gz -PYTHON_DICTTOXML_SITE = https://files.pythonhosted.org/packages/45/b5/efa170fd88e8b8bc025c59592eade0fb7de6ae02ed3dd63957956adc1396 +PYTHON_DICTTOXML_SITE = https://files.pythonhosted.org/packages/ee/c9/3132427f9e64d572688e6a1cbe3d542d1a03f676b81fb600f3d1fd7d2ec5 PYTHON_DICTTOXML_SETUP_TYPE = distutils PYTHON_DICTTOXML_LICENSE = GPL-2.0 PYTHON_DICTTOXML_LICENSE_FILES = LICENCE.txt From 203cf2d8b7e9668ba51dc8a72636896e656e7e1b Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 8 Jan 2023 20:56:56 -0700 Subject: [PATCH 0404/5754] package/python-django: bump to version 4.1.5 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- 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 40526bc0ff..1d3035bb98 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 02e2222d064d800f37c6a0ba78ce87f3 Django-4.1.4.tar.gz -sha256 d38a4e108d2386cb9637da66a82dc8d0733caede4c83c4afdbda78af4214211b Django-4.1.4.tar.gz +md5 6b6a47d7478ead15b0a0835841c433dc Django-4.1.5.tar.gz +sha256 ff56ebd7ead0fd5dbe06fe157b0024a7aaea2e0593bb3785fb594cf94dad58ef Django-4.1.5.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 96ec53f82c..e08de68954 100644 --- a/package/python-django/python-django.mk +++ b/package/python-django/python-django.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_DJANGO_VERSION = 4.1.4 +PYTHON_DJANGO_VERSION = 4.1.5 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/de/7d/ca5d224f7d345b0defd0a57c6deb0c6115fbe5304e4d9571f728b617f1a3 +PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/41/c8/b3c469353f9d1b7f0e99b45520582b891da02cd87408bc867affa6e039a3 PYTHON_DJANGO_LICENSE = BSD-3-Clause PYTHON_DJANGO_LICENSE_FILES = LICENSE From 9b88d0f7b9775db73da55504f3968bc0ff25687a Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 8 Jan 2023 21:06:02 -0700 Subject: [PATCH 0405/5754] package/python-filelock: bump to version 3.9.0 Migrate from setuptools to hatchling pep517 build backend. Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-filelock/python-filelock.hash | 4 ++-- package/python-filelock/python-filelock.mk | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/python-filelock/python-filelock.hash b/package/python-filelock/python-filelock.hash index f9e6bc03e8..4ef7afed00 100644 --- a/package/python-filelock/python-filelock.hash +++ b/package/python-filelock/python-filelock.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/filelock/json -md5 d66099b8823ebbdd980cde0dae8f7341 filelock-3.8.2.tar.gz -sha256 7565f628ea56bfcd8e54e42bdc55da899c85c1abfe1b5bcfd147e9188cebb3b2 filelock-3.8.2.tar.gz +md5 40eeb4a2963e1b07b8eab12b5db08418 filelock-3.9.0.tar.gz +sha256 7b319f24340b51f55a2bf7a12ac0755a9b03e718311dac567a0f4f7fabd2f5de filelock-3.9.0.tar.gz # Locally computed sha256 checksums sha256 88d9b4eb60579c191ec391ca04c16130572d7eedc4a86daa58bf28c6e14c9bcd LICENSE diff --git a/package/python-filelock/python-filelock.mk b/package/python-filelock/python-filelock.mk index 86f1220b54..02759935ad 100644 --- a/package/python-filelock/python-filelock.mk +++ b/package/python-filelock/python-filelock.mk @@ -4,11 +4,12 @@ # ################################################################################ -PYTHON_FILELOCK_VERSION = 3.8.2 +PYTHON_FILELOCK_VERSION = 3.9.0 PYTHON_FILELOCK_SOURCE = filelock-$(PYTHON_FILELOCK_VERSION).tar.gz -PYTHON_FILELOCK_SITE = https://files.pythonhosted.org/packages/d8/73/292d9ea2370840a163e6dd2d2816a571244e9335e2f6ad957bf0527c492f -PYTHON_FILELOCK_SETUP_TYPE = setuptools +PYTHON_FILELOCK_SITE = https://files.pythonhosted.org/packages/0b/dc/eac02350f06c6ed78a655ceb04047df01b02c6b7ea3fc02d4df24ca87d24 +PYTHON_FILELOCK_SETUP_TYPE = pep517 PYTHON_FILELOCK_LICENSE = Public Domain PYTHON_FILELOCK_LICENSE_FILES = LICENSE +PYTHON_FILELOCK_DEPENDENCIES = host-python-hatchling host-python-hatch-vcs $(eval $(python-package)) From 194c0247e796e9d1b3c6682b3cf37395d05f95d9 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 8 Jan 2023 21:15:15 -0700 Subject: [PATCH 0406/5754] package/python-hatchling: bump to version 1.12.2 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-hatchling/python-hatchling.hash | 4 ++-- package/python-hatchling/python-hatchling.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-hatchling/python-hatchling.hash b/package/python-hatchling/python-hatchling.hash index 41d7be977e..154c1fdcac 100644 --- a/package/python-hatchling/python-hatchling.hash +++ b/package/python-hatchling/python-hatchling.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/hatchling/json -md5 e06cc65ac646f9b01df5406aa1f97022 hatchling-1.11.1.tar.gz -sha256 9f84361f70cf3a7ab9543b0c3ecc64211ed2ba8a606a71eb6a473c1c9b08e1d0 hatchling-1.11.1.tar.gz +md5 5a6e2fd0c877feea7e71b9d72bbdbed9 hatchling-1.12.2.tar.gz +sha256 8a6d719d96653a0f3901072b12710c9c3cc934f9061b443775c6789b45333495 hatchling-1.12.2.tar.gz # Locally computed sha256 checksums sha256 7f143a8127ad4873862d70854b5bd2abd0085aa73e64fd2b08704a3b9f5c07fc LICENSE.txt diff --git a/package/python-hatchling/python-hatchling.mk b/package/python-hatchling/python-hatchling.mk index 13155a20a4..61aa1a6c23 100644 --- a/package/python-hatchling/python-hatchling.mk +++ b/package/python-hatchling/python-hatchling.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_HATCHLING_VERSION = 1.11.1 +PYTHON_HATCHLING_VERSION = 1.12.2 PYTHON_HATCHLING_SOURCE = hatchling-$(PYTHON_HATCHLING_VERSION).tar.gz -PYTHON_HATCHLING_SITE = https://files.pythonhosted.org/packages/24/20/3e21d2bc57229822ac9fb9b314d7892c16f829f34a0eb247c55fc11e09a8 +PYTHON_HATCHLING_SITE = https://files.pythonhosted.org/packages/f5/ea/3ed5a7ecdd8a8f7e84cffd3b5ec24279a09ce2694c218ff922c35c6f1a77 PYTHON_HATCHLING_LICENSE = MIT PYTHON_HATCHLING_LICENSE_FILES = LICENSE.txt PYTHON_HATCHLING_SETUP_TYPE = pep517 From f947ac259692879cf651c13dc595236103b0d1f9 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 8 Jan 2023 21:23:14 -0700 Subject: [PATCH 0407/5754] package/python-iniconfig: bump to version 2.0.0 Migrate from setuptools to hatchling pep517 build backend. Signed-off-by: James Hilliard Reviewed-by: Marcin Niestroj Signed-off-by: Yann E. MORIN --- package/python-iniconfig/python-iniconfig.hash | 4 ++-- package/python-iniconfig/python-iniconfig.mk | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/python-iniconfig/python-iniconfig.hash b/package/python-iniconfig/python-iniconfig.hash index b2469db99b..541ae3e3f3 100644 --- a/package/python-iniconfig/python-iniconfig.hash +++ b/package/python-iniconfig/python-iniconfig.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/iniconfig/json -md5 0b7f3be87481211c183eae095bcea6f1 iniconfig-1.1.1.tar.gz -sha256 bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32 iniconfig-1.1.1.tar.gz +md5 3c030b3f51dcc3aca585de05635600e4 iniconfig-2.0.0.tar.gz +sha256 2d91e135bf72d31a410b17c16da610a82cb55f6b0477d1a902134b24a455b8b3 iniconfig-2.0.0.tar.gz # Locally computed sha256 checksums sha256 2af680c39ef493fb82830356d1d3df1acb5a06033cba2dec7a19e21caa77a866 LICENSE diff --git a/package/python-iniconfig/python-iniconfig.mk b/package/python-iniconfig/python-iniconfig.mk index 5c31c69957..99e946f0ab 100644 --- a/package/python-iniconfig/python-iniconfig.mk +++ b/package/python-iniconfig/python-iniconfig.mk @@ -4,11 +4,12 @@ # ################################################################################ -PYTHON_INICONFIG_VERSION = 1.1.1 +PYTHON_INICONFIG_VERSION = 2.0.0 PYTHON_INICONFIG_SOURCE = iniconfig-$(PYTHON_INICONFIG_VERSION).tar.gz -PYTHON_INICONFIG_SITE = https://files.pythonhosted.org/packages/23/a2/97899f6bd0e873fed3a7e67ae8d3a08b21799430fb4da15cfedf10d6e2c2 -PYTHON_INICONFIG_SETUP_TYPE = setuptools +PYTHON_INICONFIG_SITE = https://files.pythonhosted.org/packages/d7/4b/cbd8e699e64a6f16ca3a8220661b5f83792b3017d0f79807cb8708d33913 +PYTHON_INICONFIG_SETUP_TYPE = pep517 PYTHON_INICONFIG_LICENSE = MIT PYTHON_INICONFIG_LICENSE_FILES = LICENSE +PYTHON_INICONFIG_DEPENDENCIES = host-python-hatchling host-python-hatch-vcs $(eval $(python-package)) From 5d88b18fd42fceb375339c7255cc1d07f755f85c Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 8 Jan 2023 21:26:48 -0700 Subject: [PATCH 0408/5754] package/python-ipython: bump to version 8.8.0 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-ipython/python-ipython.hash | 4 ++-- package/python-ipython/python-ipython.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-ipython/python-ipython.hash b/package/python-ipython/python-ipython.hash index aae34f6f9b..f11ad1e18c 100644 --- a/package/python-ipython/python-ipython.hash +++ b/package/python-ipython/python-ipython.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/ipython/json -md5 3adf9fca317512e5b3516a9ac25b3442 ipython-8.7.0.tar.gz -sha256 882899fe78d5417a0aa07f995db298fa28b58faeba2112d2e3a4c95fe14bb738 ipython-8.7.0.tar.gz +md5 a1ea9b6e43c5568e5031974eb3a6acb0 ipython-8.8.0.tar.gz +sha256 f3bf2c08505ad2c3f4ed5c46ae0331a8547d36bf4b21a451e8ae80c0791db95b ipython-8.8.0.tar.gz # Locally computed sha256 checksums sha256 341afcbd729887b7046fe7b98fc4f4edff3aed8d38f06eefd9b30670f043df17 COPYING.rst sha256 e0e390748ed440ab893ca1f135a88a920aaf5409dbb90a5b427c75c5e51268fb LICENSE diff --git a/package/python-ipython/python-ipython.mk b/package/python-ipython/python-ipython.mk index 1af1081741..f5a114c2f3 100644 --- a/package/python-ipython/python-ipython.mk +++ b/package/python-ipython/python-ipython.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_IPYTHON_VERSION = 8.7.0 +PYTHON_IPYTHON_VERSION = 8.8.0 PYTHON_IPYTHON_SOURCE = ipython-$(PYTHON_IPYTHON_VERSION).tar.gz -PYTHON_IPYTHON_SITE = https://files.pythonhosted.org/packages/82/2b/026af47da09998404f51064d328f5f1f68c78829082d2945be489343fde6 +PYTHON_IPYTHON_SITE = https://files.pythonhosted.org/packages/f5/39/89664d8c3e4dfb0a73862cbbff8eb4028a1e3d4305da80ab0a493848ed9b PYTHON_IPYTHON_LICENSE = BSD-3-Clause PYTHON_IPYTHON_LICENSE_FILES = COPYING.rst LICENSE PYTHON_IPYTHON_CPE_ID_VENDOR = ipython From c20f5be37a14fb32e4382a37a4cb79eddd0f06e4 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 8 Jan 2023 21:31:06 -0700 Subject: [PATCH 0409/5754] package/python-keyring: bump to version 23.13.1 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-keyring/python-keyring.hash | 4 ++-- package/python-keyring/python-keyring.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-keyring/python-keyring.hash b/package/python-keyring/python-keyring.hash index 791ee6563b..837743f5c2 100644 --- a/package/python-keyring/python-keyring.hash +++ b/package/python-keyring/python-keyring.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/keyring/json -md5 edf0645c28f16884e2b121b2c51e0770 keyring-23.11.0.tar.gz -sha256 ad192263e2cdd5f12875dedc2da13534359a7e760e77f8d04b50968a821c2361 keyring-23.11.0.tar.gz +md5 a0640ab7525b4fe58061b5999cca5026 keyring-23.13.1.tar.gz +sha256 ba2e15a9b35e21908d0aaf4e0a47acc52d6ae33444df0da2b49d41a46ef6d678 keyring-23.13.1.tar.gz # Locally computed sha256 checksums sha256 db3f0246b1f9278f15845b99fec478b8b506eb76487993722f8c6e254285faf8 LICENSE diff --git a/package/python-keyring/python-keyring.mk b/package/python-keyring/python-keyring.mk index c1f124cb3e..766139f525 100644 --- a/package/python-keyring/python-keyring.mk +++ b/package/python-keyring/python-keyring.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_KEYRING_VERSION = 23.11.0 +PYTHON_KEYRING_VERSION = 23.13.1 PYTHON_KEYRING_SOURCE = keyring-$(PYTHON_KEYRING_VERSION).tar.gz -PYTHON_KEYRING_SITE = https://files.pythonhosted.org/packages/1c/35/c22960f14f5e17384296b2f09da259f8b5244fb3831eccec71cf948a49c6 +PYTHON_KEYRING_SITE = https://files.pythonhosted.org/packages/55/fe/282f4c205add8e8bb3a1635cbbac59d6def2e0891b145aa553a0e40dd2d0 PYTHON_KEYRING_SETUP_TYPE = setuptools PYTHON_KEYRING_LICENSE = MIT PYTHON_KEYRING_LICENSE_FILES = LICENSE From 89a2bafaa4bd5aee71a13fb1542a15c7410cd6af Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 8 Jan 2023 21:37:41 -0700 Subject: [PATCH 0410/5754] package/python-multidict: bump to version 6.0.4 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-multidict/python-multidict.hash | 4 ++-- package/python-multidict/python-multidict.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-multidict/python-multidict.hash b/package/python-multidict/python-multidict.hash index eae60af37c..568c320c53 100644 --- a/package/python-multidict/python-multidict.hash +++ b/package/python-multidict/python-multidict.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/multidict/json -md5 b5875cf0a0578956dcfffc123d8344ca multidict-6.0.3.tar.gz -sha256 2523a29006c034687eccd3ee70093a697129a3ffe8732535d3b2df6a4ecc279d multidict-6.0.3.tar.gz +md5 ec06a613d871dadfb66f2be3a1f2f3fa multidict-6.0.4.tar.gz +sha256 3666906492efb76453c0e7b97f2cf459b0682e7402c0489a95484965dbc1da49 multidict-6.0.4.tar.gz # Locally computed sha256 checksums sha256 06a240ea10ba868fda2de58df859886961df873aa74bbab1e0f13eaf99f92b7b LICENSE diff --git a/package/python-multidict/python-multidict.mk b/package/python-multidict/python-multidict.mk index bfffb84709..cd35dcb4cb 100644 --- a/package/python-multidict/python-multidict.mk +++ b/package/python-multidict/python-multidict.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MULTIDICT_VERSION = 6.0.3 +PYTHON_MULTIDICT_VERSION = 6.0.4 PYTHON_MULTIDICT_SOURCE = multidict-$(PYTHON_MULTIDICT_VERSION).tar.gz -PYTHON_MULTIDICT_SITE = https://files.pythonhosted.org/packages/b5/5b/1dd3b9cf73c474ea1d0f0b1f8b7b712b0f13817493fd93101256ec856b59 +PYTHON_MULTIDICT_SITE = https://files.pythonhosted.org/packages/4a/15/bd620f7a6eb9aa5112c4ef93e7031bcd071e0611763d8e17706ef8ba65e0 PYTHON_MULTIDICT_SETUP_TYPE = setuptools PYTHON_MULTIDICT_LICENSE = Apache-2.0 PYTHON_MULTIDICT_LICENSE_FILES = LICENSE From d5a1a38c8975153838f4e3f43ea03820613e4882 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 8 Jan 2023 21:43:01 -0700 Subject: [PATCH 0411/5754] package/python-networkx: bump to version 3.0 Drop no longer required decorator dependency. License hash changed due to year update: https://github.com/networkx/networkx/commit/49f20fe11d2a804a83d538759e06511eb90ad5a3 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-networkx/Config.in | 1 - package/python-networkx/python-networkx.hash | 6 +++--- package/python-networkx/python-networkx.mk | 5 ++--- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/package/python-networkx/Config.in b/package/python-networkx/Config.in index 0f3e86f497..e2fc6ae478 100644 --- a/package/python-networkx/Config.in +++ b/package/python-networkx/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_NETWORKX bool "python-networkx" - select BR2_PACKAGE_PYTHON_DECORATOR # runtime help A Python package for the creation, manipulation, and study of the structure, dynamics, and diff --git a/package/python-networkx/python-networkx.hash b/package/python-networkx/python-networkx.hash index d166f0b8d8..96ef9777da 100644 --- a/package/python-networkx/python-networkx.hash +++ b/package/python-networkx/python-networkx.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/networkx/json -md5 22139ab5a47818fa00cbaa91eb126381 networkx-2.8.8.tar.gz -sha256 230d388117af870fce5647a3c52401fcf753e94720e6ea6b4197a5355648885e networkx-2.8.8.tar.gz +md5 1bfbb5cd184b486feae8345f541a5e50 networkx-3.0.tar.gz +sha256 9a9992345353618ae98339c2b63d8201c381c2944f38a2ab49cb45a4c667e412 networkx-3.0.tar.gz # Locally computed sha256 checksums -sha256 aae9f809fb1a1592ed72e9f52df10cfad8fe226b8d4d28385f90dd4341ce7119 LICENSE.txt +sha256 50b5a27cb43f7a20cede7aa7b9ab2033552e0412c9a1fde51d38885c1417e95f LICENSE.txt diff --git a/package/python-networkx/python-networkx.mk b/package/python-networkx/python-networkx.mk index f097671d66..d369df1a04 100644 --- a/package/python-networkx/python-networkx.mk +++ b/package/python-networkx/python-networkx.mk @@ -4,15 +4,14 @@ # ################################################################################ -PYTHON_NETWORKX_VERSION = 2.8.8 +PYTHON_NETWORKX_VERSION = 3.0 PYTHON_NETWORKX_SOURCE = networkx-$(PYTHON_NETWORKX_VERSION).tar.gz -PYTHON_NETWORKX_SITE = https://files.pythonhosted.org/packages/cd/16/c44e8550012735b8f21b3df7f39e8ba5a987fb764ac017ad5f3589735889 +PYTHON_NETWORKX_SITE = https://files.pythonhosted.org/packages/99/f9/d45c9ecf50a6b67a200e0bbd324201b5cd777dfc0e6c8f6d1620ce5a7ada PYTHON_NETWORKX_LICENSE = BSD-3-Clause PYTHON_NETWORKX_LICENSE_FILES = LICENSE.txt PYTHON_NETWORKX_CPE_ID_VENDOR = python PYTHON_NETWORKX_CPE_ID_PRODUCT = networkx PYTHON_NETWORKX_SETUP_TYPE = setuptools -HOST_PYTHON_NETWORKX_DEPENDENCIES = host-python-decorator $(eval $(python-package)) $(eval $(host-python-package)) From 64848d5dcddad89dd0b151282d3b5060d96dffaf Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 8 Jan 2023 21:51:25 -0700 Subject: [PATCH 0412/5754] package/python-pillow: bump to version 9.4.0 License hash changed due to year update: https://github.com/python-pillow/Pillow/commit/13306974e749871822dac413be66e699a0f4645e Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- 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 46da25dddc..d514bdfe56 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 a6507c1e811a51071d2d6de83070e703 Pillow-9.3.0.tar.gz -sha256 c935a22a557a560108d780f9a0fc426dd7459940dc54faa49d83249c8d3e760f Pillow-9.3.0.tar.gz +md5 ee6e9a6c729ed9e9a78ccd3f6e9d7143 Pillow-9.4.0.tar.gz +sha256 a1c2d7780448eb93fbcc3789bf3916aa5720d942e37945f4056680317f1cd23e Pillow-9.4.0.tar.gz # Locally computed sha256 checksums -sha256 a6554cb737ba6c9b47d3301f78de03b4ed0d3f08d6cf9400714f3d4c894f6943 LICENSE +sha256 4e1755595052d843e2f350c930759f945ecf707bf812883948d181016b12dd0f LICENSE diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk index 5ea9fcf264..c02968610f 100644 --- a/package/python-pillow/python-pillow.mk +++ b/package/python-pillow/python-pillow.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_PILLOW_VERSION = 9.3.0 -PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/16/11/da8d395299ca166aa56d9436e26fe8440e5443471de16ccd9a1d06f5993a +PYTHON_PILLOW_VERSION = 9.4.0 +PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/bc/07/830784e061fb94d67649f3e438ff63cfb902dec6d48ac75aeaaac7c7c30e PYTHON_PILLOW_SOURCE = Pillow-$(PYTHON_PILLOW_VERSION).tar.gz PYTHON_PILLOW_LICENSE = HPND PYTHON_PILLOW_LICENSE_FILES = LICENSE From 46d6bd7820622c67ed11ca09a1161a574f6af9e3 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 8 Jan 2023 21:53:46 -0700 Subject: [PATCH 0413/5754] package/python-posix-ipc: bump to version 1.1.1 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-posix-ipc/python-posix-ipc.hash | 4 ++-- package/python-posix-ipc/python-posix-ipc.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-posix-ipc/python-posix-ipc.hash b/package/python-posix-ipc/python-posix-ipc.hash index 74d2db0f5e..427e4c7b55 100644 --- a/package/python-posix-ipc/python-posix-ipc.hash +++ b/package/python-posix-ipc/python-posix-ipc.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/posix-ipc/json -md5 81baeabebd3e4064972ec62fd9eace0b posix_ipc-1.1.0.tar.gz -sha256 f86a15b32b38573c78e305ebd9100d8198a3d9facc03ffafe39edc35833738e3 posix_ipc-1.1.0.tar.gz +md5 523a31c4dbd56e0d4fd677f33e126e5d posix_ipc-1.1.1.tar.gz +sha256 e2456ba0cfb2ee5ba14121450e8d825b3c4a1461fca0761220aab66d4111cbb7 posix_ipc-1.1.1.tar.gz # Locally computed sha256 checksums sha256 2b58f0bf31a8cbd7e56bfef030e9f7f02758ce8a810d073ccf41753bdc2a0747 LICENSE diff --git a/package/python-posix-ipc/python-posix-ipc.mk b/package/python-posix-ipc/python-posix-ipc.mk index c25af9ecbd..bdd2f1d4af 100644 --- a/package/python-posix-ipc/python-posix-ipc.mk +++ b/package/python-posix-ipc/python-posix-ipc.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_POSIX_IPC_VERSION = 1.1.0 +PYTHON_POSIX_IPC_VERSION = 1.1.1 PYTHON_POSIX_IPC_SOURCE = posix_ipc-$(PYTHON_POSIX_IPC_VERSION).tar.gz -PYTHON_POSIX_IPC_SITE = https://files.pythonhosted.org/packages/41/72/90b6702782921c0e3e0b10a66f2a47d8cfaf9c2255d763ab45cc8cea25eb +PYTHON_POSIX_IPC_SITE = https://files.pythonhosted.org/packages/07/7f/b954f224a226960a4aa98b6c5fa3d4f3fafb20bb8461446e41b563aee863 PYTHON_POSIX_IPC_LICENSE = BSD-3-Clause PYTHON_POSIX_IPC_LICENSE_FILES = LICENSE PYTHON_POSIX_IPC_SETUP_TYPE = setuptools From 4364444cb31f60826e37cf3efa193c78a7c7947f Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 8 Jan 2023 22:03:01 -0700 Subject: [PATCH 0414/5754] package/python-pybind: bump to version 2.10.3 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pybind/python-pybind.hash | 2 +- package/python-pybind/python-pybind.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/python-pybind/python-pybind.hash b/package/python-pybind/python-pybind.hash index 530cbf64af..971eceaa07 100644 --- a/package/python-pybind/python-pybind.hash +++ b/package/python-pybind/python-pybind.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 111014b516b625083bef701df7880f78c2243835abdb263065b6b59b960b6bad python-pybind-2.10.1.tar.gz +sha256 5d8c4c5dda428d3a944ba3d2a5212cb988c2fae4670d58075a5a49075a6ca315 python-pybind-2.10.3.tar.gz # License files, locally calculated sha256 83965b843b98f670d3a85bd041ed4b372c8ec50d7b4a5995a83ac697ba675dcb LICENSE diff --git a/package/python-pybind/python-pybind.mk b/package/python-pybind/python-pybind.mk index e89d77147e..1fd106b981 100644 --- a/package/python-pybind/python-pybind.mk +++ b/package/python-pybind/python-pybind.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_PYBIND_VERSION = 2.10.1 +PYTHON_PYBIND_VERSION = 2.10.3 PYTHON_PYBIND_SITE = $(call github,pybind,pybind11,v$(PYTHON_PYBIND_VERSION)) PYTHON_PYBIND_LICENSE = BSD-3-Clause PYTHON_PYBIND_LICENSE_FILES = LICENSE From 7cb432250dafc98b6517cfbe0b7d320426245d0b Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 8 Jan 2023 22:04:53 -0700 Subject: [PATCH 0415/5754] package/python-pydantic: bump to version 1.10.4 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- 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 a5eb025fcb..e73a3099a8 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 9691f29e97c1280ab56b7d0a2dade9c1 pydantic-1.10.2.tar.gz -sha256 91b8e218852ef6007c2b98cd861601c6a09f1aa32bbbb74fab5b1c33d4a1e410 pydantic-1.10.2.tar.gz +md5 2e036b5f993b93dd83f6a7009252ae78 pydantic-1.10.4.tar.gz +sha256 b9a3859f24eb4e097502a3be1fb4b2abb79b6103dd9e2e0edb70613a4459a648 pydantic-1.10.4.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 04014214e1..a1a4dc9b16 100644 --- a/package/python-pydantic/python-pydantic.mk +++ b/package/python-pydantic/python-pydantic.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYDANTIC_VERSION = 1.10.2 +PYTHON_PYDANTIC_VERSION = 1.10.4 PYTHON_PYDANTIC_SOURCE = pydantic-$(PYTHON_PYDANTIC_VERSION).tar.gz -PYTHON_PYDANTIC_SITE = https://files.pythonhosted.org/packages/7d/7d/58dd62f792b002fa28cce4e83cb90f4359809e6d12db86eedf26a752895c +PYTHON_PYDANTIC_SITE = https://files.pythonhosted.org/packages/53/17/34e54e352f6a3d304044e52d5ddd5cd621a62ec8fb7af08cc73af65dd3e1 PYTHON_PYDANTIC_SETUP_TYPE = setuptools PYTHON_PYDANTIC_LICENSE = MIT PYTHON_PYDANTIC_LICENSE_FILES = LICENSE From e1f426de2e67018d8b57c03457dbf1d719ac3b19 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 8 Jan 2023 22:07:46 -0700 Subject: [PATCH 0416/5754] package/python-pygments: bump to version 2.14.0 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- 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 610acb96d7..f7396cb3d6 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 6ccae578d28d18968b30a4711652fd9a Pygments-2.13.0.tar.gz -sha256 56a8508ae95f98e2b9bdf93a6be5ae3f7d8af858b43e02c5a2ff083726be40c1 Pygments-2.13.0.tar.gz +md5 447be4afb076c8325a7dc659aff5b931 Pygments-2.14.0.tar.gz +sha256 b3ed06a9e8ac9a9aae5a6f5dbe78a8a58655d17b43b93c078f094ddc476ae297 Pygments-2.14.0.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 c09350c42b..9c4f0be6c8 100644 --- a/package/python-pygments/python-pygments.mk +++ b/package/python-pygments/python-pygments.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYGMENTS_VERSION = 2.13.0 +PYTHON_PYGMENTS_VERSION = 2.14.0 PYTHON_PYGMENTS_SOURCE = Pygments-$(PYTHON_PYGMENTS_VERSION).tar.gz -PYTHON_PYGMENTS_SITE = https://files.pythonhosted.org/packages/e0/ef/5905cd3642f2337d44143529c941cc3a02e5af16f0f65f81cbef7af452bb +PYTHON_PYGMENTS_SITE = https://files.pythonhosted.org/packages/da/6a/c427c06913204e24de28de5300d3f0e809933f376e0b7df95194b2bb3f71 PYTHON_PYGMENTS_LICENSE = BSD-2-Clause PYTHON_PYGMENTS_LICENSE_FILES = LICENSE PYTHON_PYGMENTS_CPE_ID_VENDOR = pygments From e52a5966ec9be07d846ca3a0264cbd892d256b53 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 8 Jan 2023 22:23:04 -0700 Subject: [PATCH 0417/5754] package/{, python-py}mupdf: bump to version 1.21.1 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/mupdf/mupdf.hash | 4 ++-- package/mupdf/mupdf.mk | 2 +- package/python-pymupdf/python-pymupdf.hash | 4 ++-- package/python-pymupdf/python-pymupdf.mk | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/mupdf/mupdf.hash b/package/mupdf/mupdf.hash index 6785aa163a..ef91abee18 100644 --- a/package/mupdf/mupdf.hash +++ b/package/mupdf/mupdf.hash @@ -1,8 +1,8 @@ # From https://mupdf.com/downloads/index.html: -sha1 27d75cae256450abb9f50cd00b3e5a895fc684cf mupdf-1.21.0-source.tar.lz +sha1 f759d914ec6ad6a3b96f994630ff70b75823831b mupdf-1.21.1-source.tar.lz # Locally computed: -sha256 f23fc1ad9081375d9c5f2318d6e6e5c5be490ecb70b10ed7167932afbe1ccfb5 mupdf-1.21.0-source.tar.lz +sha256 66a43490676c7f7c2ff74067328ef13285506fcc758d365ae27ea3668bd5e620 mupdf-1.21.1-source.tar.lz # Hash for license files: sha256 57c8ff33c9c0cfc3ef00e650a1cc910d7ee479a8bc509f6c9209a7c2a11399d6 COPYING diff --git a/package/mupdf/mupdf.mk b/package/mupdf/mupdf.mk index e93a41bd00..d6cc407c49 100644 --- a/package/mupdf/mupdf.mk +++ b/package/mupdf/mupdf.mk @@ -5,7 +5,7 @@ ################################################################################ # python-pymupdf's version must match mupdf's version -MUPDF_VERSION = 1.21.0 +MUPDF_VERSION = 1.21.1 MUPDF_SOURCE = mupdf-$(MUPDF_VERSION)-source.tar.lz MUPDF_SITE = https://mupdf.com/downloads/archive MUPDF_LICENSE = AGPL-3.0+ diff --git a/package/python-pymupdf/python-pymupdf.hash b/package/python-pymupdf/python-pymupdf.hash index d930d04335..bda356d905 100644 --- a/package/python-pymupdf/python-pymupdf.hash +++ b/package/python-pymupdf/python-pymupdf.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pymupdf/json -md5 ae24d77d44369e46bbcd5457fe97d776 PyMuPDF-1.21.0.tar.gz -sha256 a63dfc289e127a16ab60310ee6005fe83121c7a97f7c120db688f9281c9e5d0f PyMuPDF-1.21.0.tar.gz +md5 be10963679ac6d52b7aed2311ca7e3c5 PyMuPDF-1.21.1.tar.gz +sha256 f815741a435c62a0036bbcbf5fa6c533567bd69c5338d413714fc57b22db93e0 PyMuPDF-1.21.1.tar.gz # Locally computed sha256 checksums sha256 57c8ff33c9c0cfc3ef00e650a1cc910d7ee479a8bc509f6c9209a7c2a11399d6 COPYING diff --git a/package/python-pymupdf/python-pymupdf.mk b/package/python-pymupdf/python-pymupdf.mk index 38212dc44b..70448e8d90 100644 --- a/package/python-pymupdf/python-pymupdf.mk +++ b/package/python-pymupdf/python-pymupdf.mk @@ -5,9 +5,9 @@ ################################################################################ # python-pymupdf's version must match mupdf's version -PYTHON_PYMUPDF_VERSION = 1.21.0 +PYTHON_PYMUPDF_VERSION = 1.21.1 PYTHON_PYMUPDF_SOURCE = PyMuPDF-$(PYTHON_PYMUPDF_VERSION).tar.gz -PYTHON_PYMUPDF_SITE = https://files.pythonhosted.org/packages/61/14/632eefe5568ee7a4ec95aa7fc9c63996ff6a6d2464d4e3a9dc35da11a409 +PYTHON_PYMUPDF_SITE = https://files.pythonhosted.org/packages/30/44/9fce79689e5df7deebe2d17cb2b9b2a6b888439c241e71296e732aefa649 PYTHON_PYMUPDF_SETUP_TYPE = setuptools PYTHON_PYMUPDF_LICENSE = AGPL-3.0+ PYTHON_PYMUPDF_LICENSE_FILES = COPYING From 208bf69626d25761f6e502b967b6d8ecf7d5df00 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 8 Jan 2023 22:25:51 -0700 Subject: [PATCH 0418/5754] package/python-pyopenssl: bump to version 23.0.0 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pyopenssl/python-pyopenssl.hash | 4 ++-- package/python-pyopenssl/python-pyopenssl.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pyopenssl/python-pyopenssl.hash b/package/python-pyopenssl/python-pyopenssl.hash index bc65bb5868..f9b1e4a86b 100644 --- a/package/python-pyopenssl/python-pyopenssl.hash +++ b/package/python-pyopenssl/python-pyopenssl.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyopenssl/json -md5 6834da75e33d3c8dcd891b723bfcec9e pyOpenSSL-22.1.0.tar.gz -sha256 7a83b7b272dd595222d672f5ce29aa030f1fb837630ef229f62e72e395ce8968 pyOpenSSL-22.1.0.tar.gz +md5 1be2c02bf3c0c4e5e7c51b9ac90ebd72 pyOpenSSL-23.0.0.tar.gz +sha256 c1cc5f86bcacefc84dada7d31175cae1b1518d5f60d3d0bb595a67822a868a6f pyOpenSSL-23.0.0.tar.gz # Locally computed sha256 checksums sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/python-pyopenssl/python-pyopenssl.mk b/package/python-pyopenssl/python-pyopenssl.mk index 85f856b319..1d89f5b696 100644 --- a/package/python-pyopenssl/python-pyopenssl.mk +++ b/package/python-pyopenssl/python-pyopenssl.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYOPENSSL_VERSION = 22.1.0 +PYTHON_PYOPENSSL_VERSION = 23.0.0 PYTHON_PYOPENSSL_SOURCE = pyOpenSSL-$(PYTHON_PYOPENSSL_VERSION).tar.gz -PYTHON_PYOPENSSL_SITE = https://files.pythonhosted.org/packages/e7/2f/c6d89edac75482f11e231b644e365d31d5479b7b727734e6a8f3d00decd5 +PYTHON_PYOPENSSL_SITE = https://files.pythonhosted.org/packages/af/6e/0706d5e0eac08fcff586366f5198c9bf0a8b46f0f45b1858324e0d94c295 PYTHON_PYOPENSSL_LICENSE = Apache-2.0 PYTHON_PYOPENSSL_LICENSE_FILES = LICENSE PYTHON_PYOPENSSL_CPE_ID_VENDOR = pyopenssl From 1b6a466ea306d0e760b35fe84330d7f57a3a624b Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 8 Jan 2023 22:28:46 -0700 Subject: [PATCH 0419/5754] package/python-pyrsistent: bump to version 0.19.3 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pyrsistent/python-pyrsistent.hash | 4 ++-- package/python-pyrsistent/python-pyrsistent.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pyrsistent/python-pyrsistent.hash b/package/python-pyrsistent/python-pyrsistent.hash index bb55c7135d..d5c9a22656 100644 --- a/package/python-pyrsistent/python-pyrsistent.hash +++ b/package/python-pyrsistent/python-pyrsistent.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyrsistent/json -md5 23da81256b8817e123568a858bf78997 pyrsistent-0.19.2.tar.gz -sha256 bfa0351be89c9fcbcb8c9879b826f4353be10f58f8a677efab0c017bf7137ec2 pyrsistent-0.19.2.tar.gz +md5 761266eab1f9dc9280cdb0a6d2dedb08 pyrsistent-0.19.3.tar.gz +sha256 1a2994773706bbb4995c31a97bc94f1418314923bd1048c6d964837040376440 pyrsistent-0.19.3.tar.gz # Locally computed sha256 checksums sha256 3ea56753cbd0cc897d3f4414a902f5694991db7c1b3abb8230216381185f9112 LICENSE.mit diff --git a/package/python-pyrsistent/python-pyrsistent.mk b/package/python-pyrsistent/python-pyrsistent.mk index 6a5ac30a15..f3457feebe 100644 --- a/package/python-pyrsistent/python-pyrsistent.mk +++ b/package/python-pyrsistent/python-pyrsistent.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYRSISTENT_VERSION = 0.19.2 +PYTHON_PYRSISTENT_VERSION = 0.19.3 PYTHON_PYRSISTENT_SOURCE = pyrsistent-$(PYTHON_PYRSISTENT_VERSION).tar.gz -PYTHON_PYRSISTENT_SITE = https://files.pythonhosted.org/packages/b8/ef/325da441a385a8a931b3eeb70db23cb52da42799691988d8d943c5237f10 +PYTHON_PYRSISTENT_SITE = https://files.pythonhosted.org/packages/bf/90/445a7dbd275c654c268f47fa9452152709134f61f09605cf776407055a89 PYTHON_PYRSISTENT_SETUP_TYPE = setuptools PYTHON_PYRSISTENT_LICENSE = MIT PYTHON_PYRSISTENT_LICENSE_FILES = LICENSE.mit From 1ffc7b4bb1241eb64272aa78448aac35d67ff4ba Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 8 Jan 2023 22:33:59 -0700 Subject: [PATCH 0420/5754] package/python-pysmb: bump to version 1.2.9 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pysmb/python-pysmb.hash | 2 +- package/python-pysmb/python-pysmb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/python-pysmb/python-pysmb.hash b/package/python-pysmb/python-pysmb.hash index 025e47d030..87b1edf595 100644 --- a/package/python-pysmb/python-pysmb.hash +++ b/package/python-pysmb/python-pysmb.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 9215356c446e4c6b335b4a481f52d746ff60926badfecbc33524b94908fdc0e1 pysmb-1.2.8.tar.gz +sha256 30558c11ba141e9ad26e5edb1b85b94813a335ed5c0fe11df8046942b0c7e813 pysmb-1.2.9.tar.gz sha256 8c487d5c10f024e44a9cf1df21d1fd28a80bd2dfddd9f1dcd109a47d721f497f LICENSE diff --git a/package/python-pysmb/python-pysmb.mk b/package/python-pysmb/python-pysmb.mk index 36993ce42c..394a9d806c 100644 --- a/package/python-pysmb/python-pysmb.mk +++ b/package/python-pysmb/python-pysmb.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_PYSMB_VERSION = 1.2.8 +PYTHON_PYSMB_VERSION = 1.2.9 PYTHON_PYSMB_SOURCE = pysmb-$(PYTHON_PYSMB_VERSION).tar.gz PYTHON_PYSMB_SITE = https://miketeo.net/files/Projects/pysmb PYTHON_PYSMB_LICENSE = Libpng From cc64eb6d1238515b4c53b2b34d89fc3bd09fb59b Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 8 Jan 2023 22:37:55 -0700 Subject: [PATCH 0421/5754] package/python-pyspnego: bump to version 0.7.0 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pyspnego/python-pyspnego.hash | 4 ++-- package/python-pyspnego/python-pyspnego.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pyspnego/python-pyspnego.hash b/package/python-pyspnego/python-pyspnego.hash index 400e380b5d..0ae6cf1d4e 100644 --- a/package/python-pyspnego/python-pyspnego.hash +++ b/package/python-pyspnego/python-pyspnego.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/pyspnego/json -md5 67114f5e59c6d5b45fe2b38c128c2140 pyspnego-0.6.3.tar.gz -sha256 6060a0e683171090adcf92c9d319ddd334f15117fa199a703d8c9bd094d9f6c0 pyspnego-0.6.3.tar.gz +md5 93ab1a088d65e6a7c97efdb567ba37b0 pyspnego-0.7.0.tar.gz +sha256 da78096fd7c9f40e716f6fbe3e30d913103d75fd676f839f98fc3a6fee92fbe3 pyspnego-0.7.0.tar.gz # Locally computed sha256 286517c93031c343f809f64b38563a783614b762e1367242af6cdd4107335471 LICENSE diff --git a/package/python-pyspnego/python-pyspnego.mk b/package/python-pyspnego/python-pyspnego.mk index 0910c57b7d..2fbb779d98 100644 --- a/package/python-pyspnego/python-pyspnego.mk +++ b/package/python-pyspnego/python-pyspnego.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYSPNEGO_VERSION = 0.6.3 +PYTHON_PYSPNEGO_VERSION = 0.7.0 PYTHON_PYSPNEGO_SOURCE = pyspnego-$(PYTHON_PYSPNEGO_VERSION).tar.gz -PYTHON_PYSPNEGO_SITE = https://files.pythonhosted.org/packages/ba/13/7b4e7dcff1eb24a13e0a631a4b49eab361678e4490d691c03253ae736da4 +PYTHON_PYSPNEGO_SITE = https://files.pythonhosted.org/packages/97/f3/bdf3cd5f4c5a1bf9e1d4bb771c133850ee08241c18cafd90a6d872937a9f PYTHON_PYSPNEGO_SETUP_TYPE = setuptools PYTHON_PYSPNEGO_LICENSE = MIT PYTHON_PYSPNEGO_LICENSE_FILES = LICENSE From cec8c511127ccb6223a133399a88b3fd5cd8ded9 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 8 Jan 2023 22:40:53 -0700 Subject: [PATCH 0422/5754] package/python-pytest-asyncio: bump to version 0.20.3 Signed-off-by: James Hilliard Reviewed-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 b683c60553..051670aa51 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 894109d45a7b6f46718bbe4611aa7817 pytest-asyncio-0.20.1.tar.gz -sha256 626699de2a747611f3eeb64168b3575f70439b06c3d0206e6ceaeeb956e65519 pytest-asyncio-0.20.1.tar.gz +md5 dce438c7b0081d7f580b5a79d7105570 pytest-asyncio-0.20.3.tar.gz +sha256 83cbf01169ce3e8eb71c6c278ccb0574d1a7a3bb8eaaf5e50e0ad342afb33b36 pytest-asyncio-0.20.3.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 b70e0ad0f4..c94c9ea876 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.1 +PYTHON_PYTEST_ASYNCIO_VERSION = 0.20.3 PYTHON_PYTEST_ASYNCIO_SOURCE = pytest-asyncio-$(PYTHON_PYTEST_ASYNCIO_VERSION).tar.gz -PYTHON_PYTEST_ASYNCIO_SITE = https://files.pythonhosted.org/packages/9e/8f/5a918ac4e2366b61156e16fa9bfb3be52401d81f5309efb1f4e04d99ac39 +PYTHON_PYTEST_ASYNCIO_SITE = https://files.pythonhosted.org/packages/6e/06/38b0ca5d53582bb49697626975b5540435ea064762d852b5c66646c729e9 PYTHON_PYTEST_ASYNCIO_SETUP_TYPE = setuptools PYTHON_PYTEST_ASYNCIO_LICENSE = Apache-2.0 PYTHON_PYTEST_ASYNCIO_LICENSE_FILES = LICENSE From 9af376f6da76c7c8b38e01d9d3cae04948d5f758 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 8 Jan 2023 22:46:28 -0700 Subject: [PATCH 0423/5754] package/python-pytz: bump to version 2022.7 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- 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 e71e77e5b7..6d6e1b606c 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 bf46b54a7e9bcb65ea38f54646181979 pytz-2022.6.tar.gz -sha256 e89512406b793ca39f5971bc999cc538ce125c0e51c27941bef4568b460095e2 pytz-2022.6.tar.gz +md5 3b9356e4dcd441df922cc01e8eb15983 pytz-2022.7.tar.gz +sha256 7ccfae7b4b2c067464a6733c6261673fdb8fd1be905460396b97a073e9fa683a pytz-2022.7.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 58f06e1993..057a3ef173 100644 --- a/package/python-pytz/python-pytz.mk +++ b/package/python-pytz/python-pytz.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYTZ_VERSION = 2022.6 +PYTHON_PYTZ_VERSION = 2022.7 PYTHON_PYTZ_SOURCE = pytz-$(PYTHON_PYTZ_VERSION).tar.gz -PYTHON_PYTZ_SITE = https://files.pythonhosted.org/packages/76/63/1be349ff0a44e4795d9712cc0b2d806f5e063d4d34631b71b832fac715a8 +PYTHON_PYTZ_SITE = https://files.pythonhosted.org/packages/6d/37/54f2d7c147e42dc85ffbc6910862bb4f141fb3fc14d9a88efaa1a76c7df2 PYTHON_PYTZ_SETUP_TYPE = setuptools PYTHON_PYTZ_LICENSE = MIT PYTHON_PYTZ_LICENSE_FILES = LICENSE.txt From 8c2d7e401296e4b17ba9c6d521eca62eaff15159 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 8 Jan 2023 22:50:42 -0700 Subject: [PATCH 0424/5754] package/python-scapy: bump to version 2.5.0 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-scapy/python-scapy.hash | 4 ++-- package/python-scapy/python-scapy.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-scapy/python-scapy.hash b/package/python-scapy/python-scapy.hash index 4dccffd39a..7b21e6cb30 100644 --- a/package/python-scapy/python-scapy.hash +++ b/package/python-scapy/python-scapy.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/scapy/json -md5 54072af118e9291b6c7898b4ea87cdaf scapy-2.4.5.tar.gz -sha256 bc707e3604784496b6665a9e5b2a69c36cc9fb032af4864b29051531b24c8593 scapy-2.4.5.tar.gz +md5 f546b1c82c2c98e0dae1a436219dd042 scapy-2.5.0.tar.gz +sha256 5b260c2b754fd8d409ba83ee7aee294ecdbb2c235f9f78fe90bc11cb6e5debc2 scapy-2.5.0.tar.gz # Locally computed sha256 checksums sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/python-scapy/python-scapy.mk b/package/python-scapy/python-scapy.mk index 9cf17db671..a2c6cc6872 100644 --- a/package/python-scapy/python-scapy.mk +++ b/package/python-scapy/python-scapy.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SCAPY_VERSION = 2.4.5 +PYTHON_SCAPY_VERSION = 2.5.0 PYTHON_SCAPY_SOURCE = scapy-$(PYTHON_SCAPY_VERSION).tar.gz -PYTHON_SCAPY_SITE = https://files.pythonhosted.org/packages/85/47/c919432ca258f354bb2c1e645623f891603f185bfc7563d4a21f6432e7ed +PYTHON_SCAPY_SITE = https://files.pythonhosted.org/packages/67/a1/2a60d5b6f0fed297dd0c0311c887d5e8a30ba1250506585b897e5a662f4c PYTHON_SCAPY_SETUP_TYPE = setuptools PYTHON_SCAPY_LICENSE = GPL-2.0 PYTHON_SCAPY_LICENSE_FILES = LICENSE From b341e0cc646665ccda1c6997fb845503c12a0d06 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 8 Jan 2023 22:52:56 -0700 Subject: [PATCH 0425/5754] package/python-sentry-sdk: bump to version 1.12.1 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-sentry-sdk/python-sentry-sdk.hash | 4 ++-- package/python-sentry-sdk/python-sentry-sdk.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-sentry-sdk/python-sentry-sdk.hash b/package/python-sentry-sdk/python-sentry-sdk.hash index 2aa739f398..38ae3380a8 100644 --- a/package/python-sentry-sdk/python-sentry-sdk.hash +++ b/package/python-sentry-sdk/python-sentry-sdk.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/sentry-sdk/json -md5 4980e01dc73c6bcf794b0b7d3f3e08d7 sentry-sdk-1.11.1.tar.gz -sha256 675f6279b6bb1fea09fd61751061f9a90dca3b5929ef631dd50dc8b3aeb245e9 sentry-sdk-1.11.1.tar.gz +md5 ea2d728c847879f66c3d24cfbade2026 sentry-sdk-1.12.1.tar.gz +sha256 5bbe4b72de22f9ac1e67f2a4e6efe8fbd595bb59b7b223443f50fe5802a5551c sentry-sdk-1.12.1.tar.gz # Locally computed sha256 checksums sha256 59404d4c854e579097d41bfccd5006afde9d6d70e646cf55074cdbfead5ecf1c LICENSE diff --git a/package/python-sentry-sdk/python-sentry-sdk.mk b/package/python-sentry-sdk/python-sentry-sdk.mk index 056a015952..c3092a5184 100644 --- a/package/python-sentry-sdk/python-sentry-sdk.mk +++ b/package/python-sentry-sdk/python-sentry-sdk.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SENTRY_SDK_VERSION = 1.11.1 +PYTHON_SENTRY_SDK_VERSION = 1.12.1 PYTHON_SENTRY_SDK_SOURCE = sentry-sdk-$(PYTHON_SENTRY_SDK_VERSION).tar.gz -PYTHON_SENTRY_SDK_SITE = https://files.pythonhosted.org/packages/a3/d5/db26377e9817407ae8d7b65e15b3c3b8d817c301633be15bd2aef61f38a3 +PYTHON_SENTRY_SDK_SITE = https://files.pythonhosted.org/packages/32/03/496a7c8313658dec419303e8add969f314b7538c29f4ec5ebe6d86fb8ce2 PYTHON_SENTRY_SDK_SETUP_TYPE = setuptools PYTHON_SENTRY_SDK_LICENSE = BSD-2-Clause PYTHON_SENTRY_SDK_LICENSE_FILES = LICENSE From 3dfa2421e1840758f9ec5292da85a9c884567318 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 8 Jan 2023 22:57:57 -0700 Subject: [PATCH 0426/5754] package/python-setuptools-scm: bump to version 7.1.0 Drop no longer required host-python-tomli dependency. Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-setuptools-scm/python-setuptools-scm.hash | 4 ++-- package/python-setuptools-scm/python-setuptools-scm.mk | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package/python-setuptools-scm/python-setuptools-scm.hash b/package/python-setuptools-scm/python-setuptools-scm.hash index 8ef125840a..8cfe07d1d9 100644 --- a/package/python-setuptools-scm/python-setuptools-scm.hash +++ b/package/python-setuptools-scm/python-setuptools-scm.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/setuptools-scm/json -md5 0df4e7fd923e4983cd65786efaa0e0d0 setuptools_scm-7.0.5.tar.gz -sha256 031e13af771d6f892b941adb6ea04545bbf91ebc5ce68c78aaf3fff6e1fb4844 setuptools_scm-7.0.5.tar.gz +md5 158dc741637fb4fa4b955c62bd2c08be setuptools_scm-7.1.0.tar.gz +sha256 6c508345a771aad7d56ebff0e70628bf2b0ec7573762be9960214730de278f27 setuptools_scm-7.1.0.tar.gz # sha256 locally computed sha256 89807acf2309bd285f033404ee78581602f3cd9b819a16ac2f0e5f60ff4a473e LICENSE diff --git a/package/python-setuptools-scm/python-setuptools-scm.mk b/package/python-setuptools-scm/python-setuptools-scm.mk index 87d5dd290d..5a35c35a1f 100644 --- a/package/python-setuptools-scm/python-setuptools-scm.mk +++ b/package/python-setuptools-scm/python-setuptools-scm.mk @@ -4,16 +4,15 @@ # ################################################################################ -PYTHON_SETUPTOOLS_SCM_VERSION = 7.0.5 +PYTHON_SETUPTOOLS_SCM_VERSION = 7.1.0 PYTHON_SETUPTOOLS_SCM_SOURCE = setuptools_scm-$(PYTHON_SETUPTOOLS_SCM_VERSION).tar.gz -PYTHON_SETUPTOOLS_SCM_SITE = https://files.pythonhosted.org/packages/d0/43/f038b5009f93bcd77b1b8da9e6d424b739ab17aec9726f3a99eba23d53ca +PYTHON_SETUPTOOLS_SCM_SITE = https://files.pythonhosted.org/packages/98/12/2c1e579bb968759fc512391473340d0661b1a8c96a59fb7c65b02eec1321 PYTHON_SETUPTOOLS_SCM_LICENSE = MIT PYTHON_SETUPTOOLS_SCM_LICENSE_FILES = LICENSE PYTHON_SETUPTOOLS_SCM_SETUP_TYPE = setuptools HOST_PYTHON_SETUPTOOLS_SCM_DEPENDENCIES = \ host-python-packaging \ - host-python-tomli \ host-python-typing-extensions $(eval $(host-python-package)) From 9779ba9cc603df2b75156fcc8979175d8b2ff665 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 8 Jan 2023 23:01:40 -0700 Subject: [PATCH 0427/5754] package/python-simplejson: bump to version 3.18.1 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-simplejson/python-simplejson.hash | 4 ++-- package/python-simplejson/python-simplejson.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-simplejson/python-simplejson.hash b/package/python-simplejson/python-simplejson.hash index 1c99b87590..a8b946b2c4 100644 --- a/package/python-simplejson/python-simplejson.hash +++ b/package/python-simplejson/python-simplejson.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/simplejson/json -md5 83e24e662f024e06af2fffe698227da4 simplejson-3.18.0.tar.gz -sha256 58a429d2c2fa80834115b923ff689622de8f214cf0dc4afa9f59e824b444ab31 simplejson-3.18.0.tar.gz +md5 ecd07fca7a7fa0bcc9acdf9d82e41eb1 simplejson-3.18.1.tar.gz +sha256 746086e3ef6d74b53599df31b491d88a355abf2e31c837137dd90f8c4561cafa simplejson-3.18.1.tar.gz # Locally computed sha256 checksums sha256 fcaa1e313a99304322e2e0836ea4ee7d839ce9a480438f3922a853edfdde129f LICENSE.txt diff --git a/package/python-simplejson/python-simplejson.mk b/package/python-simplejson/python-simplejson.mk index 1607d9c90c..5782626387 100644 --- a/package/python-simplejson/python-simplejson.mk +++ b/package/python-simplejson/python-simplejson.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SIMPLEJSON_VERSION = 3.18.0 +PYTHON_SIMPLEJSON_VERSION = 3.18.1 PYTHON_SIMPLEJSON_SOURCE = simplejson-$(PYTHON_SIMPLEJSON_VERSION).tar.gz -PYTHON_SIMPLEJSON_SITE = https://files.pythonhosted.org/packages/17/3d/b8bfe1f40558f6a16f70c349adf97480dc71a7d11b2b1a5dc0824a87faa0 +PYTHON_SIMPLEJSON_SITE = https://files.pythonhosted.org/packages/0f/a0/79d2bec499cb53678bc20d41f9706ca02777f0876efa9b29a69fb3d55dfd PYTHON_SIMPLEJSON_LICENSE = Academic Free License (AFL), MIT PYTHON_SIMPLEJSON_LICENSE_FILES = LICENSE.txt PYTHON_SIMPLEJSON_CPE_ID_VENDOR = simplejson_project From c60f09bf11cd465caa51c7f099508c44d6359a01 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 8 Jan 2023 23:06:24 -0700 Subject: [PATCH 0428/5754] package/python-tempora: bump to version 5.2.0 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-tempora/python-tempora.hash | 4 ++-- package/python-tempora/python-tempora.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-tempora/python-tempora.hash b/package/python-tempora/python-tempora.hash index 39249eb4fa..ac6483b77f 100644 --- a/package/python-tempora/python-tempora.hash +++ b/package/python-tempora/python-tempora.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/tempora/json -md5 f9954a8c3b091f9769eb7bbe0faddccf tempora-5.1.0.tar.gz -sha256 3e7c4a5369a1788c88a99b6be3a4c74c0c7728d3b62fd768a7e81bd0be0e88df tempora-5.1.0.tar.gz +md5 87fc0d99edd557323e61a16017707a8b tempora-5.2.0.tar.gz +sha256 af82eb016decda8daf566d1e4836f94f7f8ba8c7153637460156e081aadc64df tempora-5.2.0.tar.gz # Locally computed sha256 checksums sha256 db3f0246b1f9278f15845b99fec478b8b506eb76487993722f8c6e254285faf8 LICENSE diff --git a/package/python-tempora/python-tempora.mk b/package/python-tempora/python-tempora.mk index 68516a8388..3074ad0de2 100644 --- a/package/python-tempora/python-tempora.mk +++ b/package/python-tempora/python-tempora.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TEMPORA_VERSION = 5.1.0 +PYTHON_TEMPORA_VERSION = 5.2.0 PYTHON_TEMPORA_SOURCE = tempora-$(PYTHON_TEMPORA_VERSION).tar.gz -PYTHON_TEMPORA_SITE = https://files.pythonhosted.org/packages/a9/4e/41863232e77742b3a5b30a81e1398abd102aa0a67657bc86a53800966b8e +PYTHON_TEMPORA_SITE = https://files.pythonhosted.org/packages/97/70/5cf5031a83ca6d0431a53459b2a98aa387ba23d06710a5e48d681ff3956f PYTHON_TEMPORA_LICENSE = MIT PYTHON_TEMPORA_LICENSE_FILES = LICENSE PYTHON_TEMPORA_SETUP_TYPE = setuptools From 1e85e54729ece9fd7285c2e4d3f7ea537aabe0a3 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 8 Jan 2023 23:09:29 -0700 Subject: [PATCH 0429/5754] package/python-termcolor: bump to version 2.2.0 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-termcolor/python-termcolor.hash | 4 ++-- package/python-termcolor/python-termcolor.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-termcolor/python-termcolor.hash b/package/python-termcolor/python-termcolor.hash index 73fb9129ed..9be0ad00c8 100644 --- a/package/python-termcolor/python-termcolor.hash +++ b/package/python-termcolor/python-termcolor.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/termcolor/json -md5 f7f59efd147dd1ec2a25e667616e8a52 termcolor-2.1.1.tar.gz -sha256 67cee2009adc6449c650f6bcf3bdeed00c8ba53a8cda5362733c53e0a39fb70b termcolor-2.1.1.tar.gz +md5 ba0af4ee713cd0030c2d436091af4241 termcolor-2.2.0.tar.gz +sha256 dfc8ac3f350788f23b2947b3e6cfa5a53b630b612e6cd8965a015a776020b99a termcolor-2.2.0.tar.gz # Locally computed sha256 checksums sha256 e79b6bd82962c1330caaa7c42278567b08667777673f8e2371a624d5715d4c0e COPYING.txt diff --git a/package/python-termcolor/python-termcolor.mk b/package/python-termcolor/python-termcolor.mk index d7511d692f..5cbedfb396 100644 --- a/package/python-termcolor/python-termcolor.mk +++ b/package/python-termcolor/python-termcolor.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TERMCOLOR_VERSION = 2.1.1 +PYTHON_TERMCOLOR_VERSION = 2.2.0 PYTHON_TERMCOLOR_SOURCE = termcolor-$(PYTHON_TERMCOLOR_VERSION).tar.gz -PYTHON_TERMCOLOR_SITE = https://files.pythonhosted.org/packages/19/da/ff1f0906818a5bd2e69e773d88801ca3c9e92d0d7caa99db1665658819ea +PYTHON_TERMCOLOR_SITE = https://files.pythonhosted.org/packages/e5/4e/b2a54a21092ad2d5d70b0140e4080811bee06a39cc8481651579fe865c89 PYTHON_TERMCOLOR_SETUP_TYPE = pep517 PYTHON_TERMCOLOR_LICENSE = MIT PYTHON_TERMCOLOR_LICENSE_FILES = COPYING.txt From e68d50ffb27acc6b89d55ebc7d19c3daae269a40 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 8 Jan 2023 23:26:56 -0700 Subject: [PATCH 0430/5754] package/python-traitlets: bump to version 5.8.0 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-traitlets/python-traitlets.hash | 4 ++-- package/python-traitlets/python-traitlets.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-traitlets/python-traitlets.hash b/package/python-traitlets/python-traitlets.hash index 0c68e04518..80fa8d4d44 100644 --- a/package/python-traitlets/python-traitlets.hash +++ b/package/python-traitlets/python-traitlets.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/traitlets/json -md5 74ad03a0c8dd45d5621b12e0be0ab38f traitlets-5.7.1.tar.gz -sha256 fde8f62c05204ead43c2c1b9389cfc85befa7f54acb5da28529d671175bb4108 traitlets-5.7.1.tar.gz +md5 95b21c721316bbc06922df9d97af5158 traitlets-5.8.0.tar.gz +sha256 6cc57d6dc28c85d5365961726ffd19b538739347749e13ebe34e03323a0e8f84 traitlets-5.8.0.tar.gz # Locally computed sha256 checksums sha256 3dcd47086529bf178cf7d10f35a8c188a1e9710391acecceef700898a4cf099b COPYING.md diff --git a/package/python-traitlets/python-traitlets.mk b/package/python-traitlets/python-traitlets.mk index 8cda56817f..7054557a48 100644 --- a/package/python-traitlets/python-traitlets.mk +++ b/package/python-traitlets/python-traitlets.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TRAITLETS_VERSION = 5.7.1 +PYTHON_TRAITLETS_VERSION = 5.8.0 PYTHON_TRAITLETS_SOURCE = traitlets-$(PYTHON_TRAITLETS_VERSION).tar.gz -PYTHON_TRAITLETS_SITE = https://files.pythonhosted.org/packages/0b/db/9adbbb2bef9a43ecfa4f1cbcec1d662adade10262328a4b7ef65effc6341 +PYTHON_TRAITLETS_SITE = https://files.pythonhosted.org/packages/56/48/0eb99357330a02974d537be8e4096bc58cfac1089e3153570119ccea7a40 PYTHON_TRAITLETS_LICENSE = BSD-3-Clause PYTHON_TRAITLETS_LICENSE_FILES = COPYING.md PYTHON_TRAITLETS_SETUP_TYPE = pep517 From c81ab9f8a978ee6d2d6a882d6e9ba6ce93dd6a23 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 10 Jan 2023 18:21:05 -0700 Subject: [PATCH 0431/5754] package/python-cryptography: bump to version 39.0.0 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 a01c8810e3..3f2204eeb1 100644 --- a/package/python-cryptography/python-cryptography.hash +++ b/package/python-cryptography/python-cryptography.hash @@ -1,5 +1,5 @@ # Locally calculated after vendoring -sha256 2abbeb6d42e8844de036bf2e0d78a42feeee1d57ebf29a07684490f98bdcab37 cryptography-38.0.4.tar.gz +sha256 2d00e023261719f85caf360ee061d37ee27654a0344d1376441c8a29ea3bac86 cryptography-39.0.0.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 4254fa3557..6868ff4633 100644 --- a/package/python-cryptography/python-cryptography.mk +++ b/package/python-cryptography/python-cryptography.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CRYPTOGRAPHY_VERSION = 38.0.4 +PYTHON_CRYPTOGRAPHY_VERSION = 39.0.0 PYTHON_CRYPTOGRAPHY_SOURCE = cryptography-$(PYTHON_CRYPTOGRAPHY_VERSION).tar.gz -PYTHON_CRYPTOGRAPHY_SITE = https://files.pythonhosted.org/packages/e3/3f/41186b1f2fd86a542d399175f6b8e43f82cd4dfa51235a0b030a042b811a +PYTHON_CRYPTOGRAPHY_SITE = https://files.pythonhosted.org/packages/12/e3/c46c274cf466b24e5d44df5d5cd31a31ff23e57f074a2bb30931a8c9b01a 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 627c38caf07de44e26b187e40f0cfed9e2e6591a Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 10 Jan 2023 18:25:01 -0700 Subject: [PATCH 0432/5754] package/python-orjson: bump to version 3.8.4 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-orjson/python-orjson.hash | 2 +- package/python-orjson/python-orjson.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-orjson/python-orjson.hash b/package/python-orjson/python-orjson.hash index 515590795b..f1298c05ce 100644 --- a/package/python-orjson/python-orjson.hash +++ b/package/python-orjson/python-orjson.hash @@ -1,5 +1,5 @@ # Locally calculated after vendoring -sha256 0c8d161dfd8b9e4133beabd81e3e1473c246efe55abec571845f72a2ba7b74e4 orjson-3.8.3.tar.gz +sha256 b932fc1e43598fb91022b1dc651afeaef650793a2a590ca4fbeef57a3808abf5 orjson-3.8.4.tar.gz # Locally computed sha256 checksums sha256 a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2 LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/python-orjson/python-orjson.mk b/package/python-orjson/python-orjson.mk index bda0a8ab48..8eeadecb3d 100644 --- a/package/python-orjson/python-orjson.mk +++ b/package/python-orjson/python-orjson.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ORJSON_VERSION = 3.8.3 +PYTHON_ORJSON_VERSION = 3.8.4 PYTHON_ORJSON_SOURCE = orjson-$(PYTHON_ORJSON_VERSION).tar.gz -PYTHON_ORJSON_SITE = https://files.pythonhosted.org/packages/1c/b9/a0b4fb195ded02820e0a933ffe28b782b7e5ef7a4f8c1e1c742d619548e4 +PYTHON_ORJSON_SITE = https://files.pythonhosted.org/packages/8f/2d/ae31eddf7e097eec5e25c7da954ef6e944f4dbf79153676f94cea3dc5116 PYTHON_ORJSON_SETUP_TYPE = pep517 PYTHON_ORJSON_LICENSE = Apache-2.0 or MIT PYTHON_ORJSON_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT From 8eef1e1488bce0732dbce137baa4f506a29dd13f Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Mon, 16 Jan 2023 19:43:48 +0100 Subject: [PATCH 0433/5754] package/z3: bump to version 4.12.0 For change log since v4.11.2, see: - https://github.com/Z3Prover/z3/releases/tag/z3-4.12.0 Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- 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 d38c5f1971..517e2f4923 100644 --- a/package/z3/z3.hash +++ b/package/z3/z3.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e3a82431b95412408a9c994466fad7252135c8ed3f719c986cd75c8c5f234c7e z3-4.11.2.tar.gz +sha256 5f575f0a3950760436217da1cc1a714569b6d4f664a75bb6775876328cf0a580 z3-4.12.0.tar.gz sha256 e617cad2ab9347e3129c2b171e87909332174e17961c5c3412d0799469111337 LICENSE.txt diff --git a/package/z3/z3.mk b/package/z3/z3.mk index 2252e05395..ecd79325dc 100644 --- a/package/z3/z3.mk +++ b/package/z3/z3.mk @@ -4,7 +4,7 @@ # ################################################################################ -Z3_VERSION = 4.11.2 +Z3_VERSION = 4.12.0 Z3_SITE = $(call github,Z3Prover,z3,z3-$(Z3_VERSION)) Z3_LICENSE = MIT Z3_LICENSE_FILES = LICENSE.txt From af8200a4c3543403ca653f4064f6649a052440e1 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Mon, 16 Jan 2023 19:04:34 +0100 Subject: [PATCH 0434/5754] package/sscep: requires des support in openssl Enable des in openssl to fix the following build failure raised since the addition of the package in commit 72fa60dc102679f51b228336ec38f5af78ff7646: src/sscep.c: In function 'get_cipher_alg': src/sscep.c:119:32: warning: implicit declaration of function 'EVP_des_ede3_cbc'; did you mean 'NID_des_ede3_cbc'? [-Wimplicit-function-declaration] 119 | return EVP_des_ede3_cbc(); | ^~~~~~~~~~~~~~~~ | NID_des_ede3_cbc Fixes: - http://autobuild.buildroot.net/results/34bd76e8e5e7df0db31918d610a0dadf531f369d Signed-off-by: Dario Binacchi Signed-off-by: Yann E. MORIN --- package/sscep/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/sscep/Config.in b/package/sscep/Config.in index 2e5e29f7c8..549c65274b 100644 --- a/package/sscep/Config.in +++ b/package/sscep/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_SSCEP bool "sscep" select BR2_PACKAGE_LIBOPENSSL_ENABLE_BLOWFISH if BR2_PACKAGE_LIBOPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL select BR2_PACKAGE_OPENSSL help SSCEP is a client-only implementation of the SCEP From 04fc02a8b7a70bc0afe17fe0625cfd2b4c55b776 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Mon, 16 Jan 2023 19:05:50 +0100 Subject: [PATCH 0435/5754] package/sscep: fix linking error Apply the patch to fix the following build failure raised since the addition of the package in commit 72fa60dc102679f51b228336ec38f5af78ff7646: uclibc/sysroot/usr/lib/libc.a(getopt.os): in function `__GI_getopt': getopt.c:(.text+0x598): multiple definition of `getopt'; src/getopt.o:getopt.c:(.text+0x0): first defined here The patch has been submitted and accepted upstream to address this issue. Fixes: - http://autobuild.buildroot.net/results/844c7dd79f69ef2ea8f293bb73a2d4b7533aa97c Signed-off-by: Dario Binacchi [yann.morin.1998@free.fr: do an actual bacport] Signed-off-by: Yann E. MORIN --- .../sscep/0001-Fix-getopt-linking-error.patch | 57 +++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 package/sscep/0001-Fix-getopt-linking-error.patch diff --git a/package/sscep/0001-Fix-getopt-linking-error.patch b/package/sscep/0001-Fix-getopt-linking-error.patch new file mode 100644 index 0000000000..9427593cc3 --- /dev/null +++ b/package/sscep/0001-Fix-getopt-linking-error.patch @@ -0,0 +1,57 @@ +From 65561b53344b834877e6b63320066a1e26038a3c Mon Sep 17 00:00:00 2001 +From: Dario Binacchi +Date: Fri, 9 Dec 2022 18:18:27 +0100 +Subject: [PATCH] Fix getopt linking error + +The buildroot project, to which the sscep application was added, has +configurations that raise the following linking error: +buildroot/output/host/lib/gcc/arc-buildroot-linux-uclibc/11.3.0/../../../../arc-buildroot-linux-uclibc/bin/ld: buildroot/output/host/bin/../arc-buildroot-linux-uclibc/sysroot/usr/lib/libc.a(getopt.os):(.data+0x8): multiple definition of `optind'; src/getopt.o:(.data+0x0): first defined here +buildroot/output/host/lib/gcc/arc-buildroot-linux-uclibc/11.3.0/../../../../arc-buildroot-linux-uclibc/bin/ld: buildroot/output/host/bin/../arc-buildroot-linux-uclibc/sysroot/usr/lib/libc.a(getopt.os): in function `__GI_getopt': +getopt.c:(.text+0x5a4): multiple definition of `getopt'; src/getopt.o:getopt.c:(.text+0x0): first defined here +buildroot/output/host/lib/gcc/arc-buildroot-linux-uclibc/11.3.0/../../../../arc-buildroot-linux-uclibc/bin/ld: buildroot/output/host/bin/../arc-buildroot-linux-uclibc/sysroot/usr/lib/libc.a(getopt.os): in function `getopt_long': +getopt.c:(.text+0x5b0): multiple definition of `getopt_long'; src/getopt.o:getopt.c:(.text+0x128): first defined here +collect2: error: ld returned 1 exit status +make[2]: *** [Makefile:507: sscep] Error 1 +make[1]: *** [package/pkg-generic.mk:293: buildroot/output/build/sscep-0.10.0/.stamp_built] Error 2 + +The patch re-added a check that commit +81f56f635259b9 ("Replaced GNU getopt by a BSD licensed alternative") +removed. + +Signed-off-by: Dario Binacchi +[yann.morin.1998@free.fr: make that an actual backport] +Signed-off-by: Yann E. MORIN +--- + src/getopt.c | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/src/getopt.c b/src/getopt.c +index eae36a6..0109406 100644 +--- a/src/getopt.c ++++ b/src/getopt.c +@@ -31,6 +31,16 @@ + #include + #include + ++#define GETOPT_INTERFACE_VERSION 2 ++#if !defined _LIBC && defined __GLIBC__ && __GLIBC__ >= 2 ++# include ++# if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION ++# define ELIDE_CODE ++# endif ++#endif ++ ++#ifndef ELIDE_CODE ++ + char* optarg; + int optopt; + /* The variable optind [...] shall be initialized to 1 by the system. */ +@@ -226,3 +236,5 @@ int getopt_long(int argc, char* const argv[], const char* optstring, + ++optind; + return retval; + } ++ ++#endif /* Not ELIDE_CODE. */ +-- +2.25.1 + From aac8ce4999c3c2e105347fd247ba65304ab0d26a Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 16 Jan 2023 12:29:44 +0100 Subject: [PATCH 0436/5754] package/lua-cffi: bump to version 0.2.3 Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/lua-cffi/lua-cffi.hash | 2 +- package/lua-cffi/lua-cffi.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lua-cffi/lua-cffi.hash b/package/lua-cffi/lua-cffi.hash index e710199936..318f60fefe 100644 --- a/package/lua-cffi/lua-cffi.hash +++ b/package/lua-cffi/lua-cffi.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 34fb4eea7a0abec2095f08596f604ac01c81b979bead7d2f5cb084b3e2b46cbc lua-cffi-0.2.2.tar.gz +sha256 1d2577a62a843e5e6db35af1b58300d279b4df58eccef5e823441501f960d388 lua-cffi-0.2.3.tar.gz sha256 f5653a4d5864a3920ea1e07dacfd646067314be647598f0acaaf685beaa2e396 COPYING.md diff --git a/package/lua-cffi/lua-cffi.mk b/package/lua-cffi/lua-cffi.mk index ac351f7f98..30427ac34c 100644 --- a/package/lua-cffi/lua-cffi.mk +++ b/package/lua-cffi/lua-cffi.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_CFFI_VERSION = 0.2.2 +LUA_CFFI_VERSION = 0.2.3 LUA_CFFI_SITE = $(call github,q66,cffi-lua,v$(LUA_CFFI_VERSION)) LUA_CFFI_LICENSE = MIT LUA_CFFI_LICENSE_FILES = COPYING.md From 07a745e55d76616802a20dcbfd72dfe6fe8e3b05 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 16 Jan 2023 11:50:31 +0100 Subject: [PATCH 0437/5754] package/go: set GOCACHE for download post-process The go mod vendor call in support/download/go-post-process accesses the go cache, so pass GOCACHE= in the environment to ensure our cache directory is used. The go cache defaults to ~/.cache/go-build if not set, so this fixes builds where that location (or GOCACHE if set in the environment) is not writable: rm -rf ~/.cache/go-build chmod -w ~/.cache make docker-compose-source .. failed to initialize build cache at /home/peko/.cache/go-build: mkdir /home/peko/.cache/go-build: permission denied make[1]: *** [package/pkg-generic.mk:189: /home/peko/source/buildroot/output/build/docker-compose-2.14.0/.stamp_downloaded] Error 1 We use two different cache directories for target and host builds, but the download/vendoring should be independent of the architecture, so use the target variant even for host-only packages for simplicity. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/go/go.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/go/go.mk b/package/go/go.mk index d3ed07f03b..c4f72d403c 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -25,6 +25,7 @@ HOST_GO_COMMON_ENV = \ GOFLAGS=-mod=vendor \ GOROOT="$(HOST_GO_ROOT)" \ GOPATH="$(HOST_GO_GOPATH)" \ + GOCACHE="$(HOST_GO_TARGET_CACHE)" \ GOPROXY=off \ PATH=$(BR_PATH) \ GOBIN= \ @@ -75,7 +76,6 @@ HOST_GO_TARGET_ENV = \ $(HOST_GO_COMMON_ENV) \ GOOS="linux" \ GOARCH=$(GO_GOARCH) \ - GOCACHE="$(HOST_GO_TARGET_CACHE)" \ CC="$(TARGET_CC)" \ CXX="$(TARGET_CXX)" \ CGO_CFLAGS="$(TARGET_CFLAGS)" \ From 162f656884185662d85e5366871284adca87a465 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 16 Jan 2023 11:50:32 +0100 Subject: [PATCH 0438/5754] package/go: explicitly set GOMODCACHE go mod vendor caches downloaded modules to the Go module cache, which defaults to $GOPATH/pkg/mod - But can be overridden with the GOMODCACHE environment variable: https://go.dev/ref/mod#module-cache So explicitly set GOMODCACHE= for reproducibility. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/go/go.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/go/go.mk b/package/go/go.mk index c4f72d403c..c38ae0b99c 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -26,6 +26,7 @@ HOST_GO_COMMON_ENV = \ GOROOT="$(HOST_GO_ROOT)" \ GOPATH="$(HOST_GO_GOPATH)" \ GOCACHE="$(HOST_GO_TARGET_CACHE)" \ + GOMODCACHE="$(HOST_GO_GOPATH)/pkg/mod" \ GOPROXY=off \ PATH=$(BR_PATH) \ GOBIN= \ From ac5ecaf86809a999d68d851c2200705a8f10a7b0 Mon Sep 17 00:00:00 2001 From: Casey Reeves Date: Mon, 16 Jan 2023 09:33:52 +0100 Subject: [PATCH 0439/5754] fs/erofs: enable support for reproducible build By default, mkfs.erofs will sue the current date to set some metadata in the filesystem it generates, and will also use generate a random UUID for that filesystem. This is not reproducible. When BR2_REPRODUCIBLE is selected, set the filesystem timestamps to $SOURCE_DATE_EPOCH, and the filesystem UUID to the nil uuid (as good as any other arbitrary one). Signed-off-by: Casey Reeves [yann.morin.1998@free.fr: - one multi-line assignment, not two - slightly rephrase the commit log ] Signed-off-by: Yann E. MORIN --- fs/erofs/erofs.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/fs/erofs/erofs.mk b/fs/erofs/erofs.mk index 0e9d4401a9..e43d74927b 100644 --- a/fs/erofs/erofs.mk +++ b/fs/erofs/erofs.mk @@ -10,6 +10,12 @@ ifeq ($(BR2_TARGET_ROOTFS_EROFS_LZ4HC),y) ROOTFS_EROFS_ARGS += -zlz4hc endif +ifeq ($(BR2_REPRODUCIBLE),y) +ROOTFS_EROFS_ARGS += \ + -T $(SOURCE_DATE_EPOCH) \ + -U 00000000-0000-0000-0000-000000000000 +endif + ifneq ($(BR2_TARGET_ROOTFS_EROFS_PCLUSTERSIZE),0) ROOTFS_EROFS_ARGS += -C$(strip $(BR2_TARGET_ROOTFS_EROFS_PCLUSTERSIZE)) endif From ccaf9f316544f0c8c3546b70568ed48c265e801b Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Mon, 16 Jan 2023 08:08:38 +0100 Subject: [PATCH 0440/5754] package/frr: bump to version 8.4.2 Changes since 8.3.1: - https://frrouting.org/release/8.4 - https://frrouting.org/release/8.4.1 Signed-off-by: Joachim Wiberg Signed-off-by: Yann E. MORIN --- package/frr/frr.hash | 2 +- package/frr/frr.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/frr/frr.hash b/package/frr/frr.hash index 87ade19c16..836f130b93 100644 --- a/package/frr/frr.hash +++ b/package/frr/frr.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9b0430d01f8da2d780ac5e41de2cf4e53abff0ed06a0cc75d745f4b1f29e5b9e frr-8.3.1.tar.gz +sha256 8a6b0e0fa1e89493ba84cf176674e55c7a814821fd02a7188095b76c37c3935f frr-8.4.2.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/frr/frr.mk b/package/frr/frr.mk index 72c46ba4aa..abae784c40 100644 --- a/package/frr/frr.mk +++ b/package/frr/frr.mk @@ -4,7 +4,7 @@ # ################################################################################ -FRR_VERSION = 8.3.1 +FRR_VERSION = 8.4.2 FRR_SITE = $(call github,FRRouting,frr,frr-$(FRR_VERSION)) FRR_LICENSE = GPL-2.0 FRR_LICENSE_FILES = COPYING From 4b6ccffcfb84938d2f0813d7c98907d75b49b842 Mon Sep 17 00:00:00 2001 From: Vincent Fazio Date: Sun, 15 Jan 2023 13:17:51 -0600 Subject: [PATCH 0441/5754] package/ipmitool: fix broken IANA PEN registry URL Backport the upstream fix for the IANA Private Enterprise Numbers registry URL so the correct file gets downloaded and installed. Signed-off-by: Vincent Fazio Signed-off-by: Vincent Fazio Signed-off-by: Yann E. MORIN --- .../0002-Fix-enterprise-numbers-URL.patch | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 package/ipmitool/0002-Fix-enterprise-numbers-URL.patch diff --git a/package/ipmitool/0002-Fix-enterprise-numbers-URL.patch b/package/ipmitool/0002-Fix-enterprise-numbers-URL.patch new file mode 100644 index 0000000000..07cdbd4527 --- /dev/null +++ b/package/ipmitool/0002-Fix-enterprise-numbers-URL.patch @@ -0,0 +1,36 @@ +From 1edb0e27e44196d1ebe449aba0b9be22d376bcb6 Mon Sep 17 00:00:00 2001 +From: Alexander Amelkin +Date: Tue, 22 Nov 2022 13:55:33 +0300 +Subject: [PATCH] Fix enterprise-numbers URL + +IANA has changed their URL scheme, and the content at the old URL for +enterprise-numbers switched from text/plain to text/html. + +Fix Makefile.am to use the new URL + +Resolves ipmitool/ipmitool#377 + +Signed-off-by: Alexander Amelkin + +[vfazio: backport from upstream 1edb0e27e44196d1ebe449aba0b9be22d376bcb6] +Signed-off-by: Vincent Fazio +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index ce3267f..3182a52 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -41,7 +41,7 @@ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure configure-stamp \ + $(distdir).tar.gz $(distdir).tar.bz2 + + SUBDIRS = lib src include doc contrib control +-IANA_PEN = http://www.iana.org/assignments/enterprise-numbers ++IANA_PEN = http://www.iana.org/assignments/enterprise-numbers.txt + + dist-hook: + cp control/ipmitool.spec $(distdir) +-- +2.25.1 + From a796cfb2e0343730a1232d0f5aff405a9788a15d Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 18 Jan 2023 09:04:16 +0100 Subject: [PATCH 0442/5754] Update for 2022.11.1 Signed-off-by: Peter Korsgaard (cherry picked from commit d48a8beb39275a479185ab9b3232cd15dcfb87ab) [Peter: drop Makefile change] Signed-off-by: Peter Korsgaard --- CHANGES | 50 ++++++++++++++++++++++++++++++++++++++++ support/misc/Vagrantfile | 2 +- 2 files changed, 51 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 6de79c7d35..e23cd4eaf8 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,53 @@ +2022.11.1, released January 18th, 2023 + + Important / security related fixes. + + Br2-external: Fix make performance issue when many (> 6) + external trees are used together. + + Erofs: Use fixed timestamp and UUID when BR2_REPRODUCIBLE is + used. + + Go: Ensure our go build and module cache is used, even for the + download step. + + Legal-info: Stop warning about not saving sources for local / + override packages if _REDISTRIBUTE is set to NO. + + Linux: Fix build of < 5.6 kernels with host-gcc >= 10. + + A large number of NXP related packages and defconfigs have + been updated as upstream moved the git repositories to Github. + + Defconfigs: zcu106, kria kv260: Fix U-Boot build + + Updated/fixed packages: asterisk, bearssl, botan, cairo, + capnproto, check, checkpolicy, connman, containerd, crun, + dbus-cxx, docker-cli, docker-engine, exempi, exfat, + exfat-utils, falcosecurity-libs, fluidsynth, fmc, fmlib, + freeradius-server, gcc, glib-networking, go, + gobject-introspection, gperf, i2pd, ima-evm-utils, + imx-alsa-plugins, imx-kobs, imx-lib, imx-m4fwloader, + imx-mkimage, intel-microcode, janus-gateway, libcurl, + libdeflate, libftdi1, libkcapi, libksba, libmbim, libmng, + libpjsip, libtalloc, libuwsc, libxkbcommon, lpeg, lrzsz, + lttng-tools, lua-cqueues, mali-driver, mbedtls, mfgtools, + moby-buildkit, mutt, opensc, php, policycoreutils, polkit, + postgresql, pptp-linux, qcom-db410c-firmware, qemu, qoriq-rcw, + qt5virtualkeyboard, redis, rhash, rtl8189es, rtl8192eu, + rtl_433, ruby, sqlite, swupdate, tealdeer, tekui, tiff, + tinyxml, tor, webkitgtk, wireshark, wpasupplicant, wpewebkit, + xr819-xradio, xdriver_xf86-video-imx-viv, xserver_xorg-server, + xxhash, zip + + Issues resolved (http://bugs.uclibc.org): + + #14971: Kernel 3.10.108 fail to build in Buildroot 2022.08-rc1 + #14996: Too many directories in BR2_EXTERNAL causes hang during make + #15161: kernel can't support SUBDIR + #15196: Setting BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE does not work + #15226: lsblk: not found + 2022.11, released December 5th, 2022 Fixes all over the tree. diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile index 02fe6bca67..9eee9955ec 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2022.11' +RELEASE='2022.11.1' ### Change here for more memory/cores ### VM_MEMORY=2048 From 281e51f00b838dc26be5babf4acf9730f8ad87be Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 18 Jan 2023 17:53:51 +0100 Subject: [PATCH 0443/5754] docs/website: update for 2022.11.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 7fc5d1169b..0b62522043 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -42,37 +42,37 @@

buildroot-2022.02.8.tar.xz -

Latest stable release: 2022.11

+

Latest stable release: 2022.11.1

- +
- +
-

buildroot-2022.11.tar.gz

-

PGP signature

+

buildroot-2022.11.1.tar.gz

+

PGP signature

- +
- +
-

buildroot-2022.11.tar.xz

-

PGP signature

+

buildroot-2022.11.1.tar.xz

+

PGP signature

http://server/path/to/name.config - toolchains=($(sed -r -e 's/,.*//; /internal/d; /^#/d; /^$/d;' "${toolchains_csv}" \ - |if [ ${random} -gt 0 ]; then \ - sort -R |head -n ${random} - elif [ ${number} -gt 0 ]; then \ - head -n ${number} - else - sort - fi - ) - ) + mapfile -t toolchains < <(sed -r -e 's/,.*//; /internal/d; /^#/d; /^$/d;' "${toolchains_csv}" \ + | if [ "${random}" -gt 0 ]; then \ + sort -R | head -n "${random}" + elif [ "${number}" -gt 0 ]; then \ + head -n "${number}" + else + sort + fi + ) nb_tc="${#toolchains[@]}" - if [ ${nb_tc} -eq 0 ]; then + if [ "${nb_tc}" -eq 0 ]; then printf "error: no toolchain found (networking issue?)\n" >&2; exit 1 fi @@ -131,7 +130,7 @@ main() { : $((nb++)) toolchain="$(basename "${toolchainconfig}" .config)" build_dir="${dir}/${toolchain}" - printf "%40s [%*d/%d]: " "${toolchain}" ${#nb_tc} ${nb} ${nb_tc} + printf "%40s [%*d/%d]: " "${toolchain}" ${#nb_tc} "${nb}" "${nb_tc}" build_one "${build_dir}" "${toolchainconfig}" "${cfg}" "${pkg}" "${prepare_only}" && ret=0 || ret=${?} case ${ret} in (0) printf "OK\n";; @@ -143,7 +142,7 @@ main() { done printf "%d builds, %d skipped, %d build failed, %d legal-info failed, %d show-info failed\n" \ - ${nb} ${nb_skip} ${nb_fail} ${nb_legal} ${nb_show} + "${nb}" "${nb_skip}" "${nb_fail}" "${nb_legal}" "${nb_show}" return $((nb_fail + nb_legal)) } @@ -157,7 +156,7 @@ build_one() { mkdir -p "${dir}" - CONFIG_= support/kconfig/merge_config.sh -O "${dir}" \ + CONFIG_="" support/kconfig/merge_config.sh -O "${dir}" \ "${toolchainconfig}" "support/config-fragments/minimal.config" "${cfg}" \ >> "${dir}/logfile" 2>&1 # We want all the options from the snippet to be present as-is (set @@ -178,7 +177,7 @@ build_one() { rm -f "${dir}/missing.config" # Defer building the job to the caller (e.g. a gitlab pipeline) - if [ ${prepare_only} -eq 1 ]; then + if [ "${prepare_only}" -eq 1 ]; then return 0 fi From 2b021bc1d77ce485ac46114482024d12339d6b5b Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Sun, 31 Jul 2022 16:35:15 -0300 Subject: [PATCH 0838/5754] utils/check-package: check files in utils/ All the errors in existing scripts in utils/ have been fixed, so nothing needs to be added to .checkpackageignore. Signed-off-by: Ricardo Martincoski Signed-off-by: Arnout Vandecappelle --- utils/check-package | 1 + 1 file changed, 1 insertion(+) diff --git a/utils/check-package b/utils/check-package index 12009b2476..98a25bd0b2 100755 --- a/utils/check-package +++ b/utils/check-package @@ -113,6 +113,7 @@ DO_CHECK_INTREE = re.compile(r"|".join([ r"package/", r"system/", r"toolchain/", + r"utils/", ])) DO_NOT_CHECK_INTREE = re.compile(r"|".join([ r"boot/barebox/barebox\.mk$", From 7df32882203fdd525156ddb785d171b193e5b282 Mon Sep 17 00:00:00 2001 From: Sebastian Weyer Date: Wed, 8 Feb 2023 12:05:51 +0100 Subject: [PATCH 0839/5754] package/rust: fix bootstrap build The update to v1.67.0 of rust broke the bootstrap build. This patch applies an upstream patch to fix this: https://github.com/rust-lang/rust/commit/3fe64ebbce21e79adb64099984e96dfb79bdd0f9 Fixes: http://autobuild.buildroot.org/results/214/214fcbb3458893784b7f85b60f7ee1edb428c77f/build-end.log Signed-off-by: Sebastian Weyer Cc: Eric Le Bihan Cc: James Hilliard Reviewed-by: Romain Naour Signed-off-by: Peter Korsgaard --- ...-unsoundness-in-bootstrap-cache-code.patch | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 package/rust/0001-fix-unsoundness-in-bootstrap-cache-code.patch diff --git a/package/rust/0001-fix-unsoundness-in-bootstrap-cache-code.patch b/package/rust/0001-fix-unsoundness-in-bootstrap-cache-code.patch new file mode 100644 index 0000000000..3eae34642f --- /dev/null +++ b/package/rust/0001-fix-unsoundness-in-bootstrap-cache-code.patch @@ -0,0 +1,43 @@ +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 + From e5a83df8da04f5854c2e248e23dea3af620954cd Mon Sep 17 00:00:00 2001 From: Vincent Fazio Date: Wed, 8 Feb 2023 08:23:58 -0600 Subject: [PATCH 0840/5754] package/xz: patch configure due to microblaze patch Commit bed21bb9b added a patch to change configure.ac but failed to update configure which caused build failures due to the timestamp difference between configure and configure.ac and the makefile attempting to run aclocal. XZ_AUTORECONF = YES creates a circular dependency where the host autotools need host-xz which also gets patched. Because of this, we need to patch xz's configure script manually and NOT patch configure.ac so its timestamp stays older than Makefile.in. While we're doing this, correct the language in the commit body of the patch, remove a stray whitespace, and fix the offset for configure.ac Fixes: bed21bb9b ("package/xz: fix microblaze compiles") Fixes: http://autobuild.buildroot.net/results/958/9586f21e447ef9923606b1385ff333138406b685/ Signed-off-by: Vincent Fazio [Peter: Only patch configure] Signed-off-by: Peter Korsgaard --- ...0001-Detect-symver-attribute-support.patch | 71 +++++++++++-------- 1 file changed, 40 insertions(+), 31 deletions(-) diff --git a/package/xz/0001-Detect-symver-attribute-support.patch b/package/xz/0001-Detect-symver-attribute-support.patch index 9ec43ea7a0..462fa9d86b 100644 --- a/package/xz/0001-Detect-symver-attribute-support.patch +++ b/package/xz/0001-Detect-symver-attribute-support.patch @@ -1,11 +1,11 @@ -From 231add523328ad9e021d8f2b02697b6a11719430 Mon Sep 17 00:00:00 2001 +From f0e0e8bd08b4d4e7c89a5a3b7d9a3c083f7e5432 Mon Sep 17 00:00:00 2001 From: Vincent Fazio -Date: Tue, 7 Feb 2023 08:51:24 -0600 +Date: Wed, 8 Feb 2023 12:58:37 +0000 Subject: [PATCH] Detect symver attribute support -On non-ELF platforms, such as microblaze, builds will fail when trying -to add symver information because __attribute__((symver ..)) is not -supported even though __has_attribute(__symver__) returns true. +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]. @@ -18,33 +18,16 @@ it is supported and define a variable to advertise support. 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.ac | 9 +++++++++ - src/liblzma/common/common.h | 2 +- - 2 files changed, 10 insertions(+), 1 deletion(-) + configure | 15 +++++++++++++++ + src/liblzma/common/common.h | 2 +- + 2 files changed, 16 insertions(+), 1 deletion(-) -diff --git a/configure.ac b/configure.ac -index 5ad5589..08c623a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -791,6 +791,15 @@ else - time with Libtool if neither --with-pic nor - --without-pic is used). This define must be - used together with liblzma_linux.map.]) -+ OLD_CFLAGS="$CFLAGS" -+ CFLAGS="$CFLAGS -Werror" # we need -Werror to make sure the attribute is not ignored -+ AC_COMPILE_IFELSE([AC_LANG_SOURCE( -+ [__attribute__ ((symver ("test@TEST"))) void foo(void) { } -+ ])], -+ [AC_DEFINE([HAVE_SYMVER_ATTRIBUTE], [1], -+ [Define to 1 if GCC supports the symver attribute])], -+ []) -+ CFLAGS="$OLD_CFLAGS" - ;; - *) - enable_symbol_versions=generic diff --git a/src/liblzma/common/common.h b/src/liblzma/common/common.h -index 11fec52..1d2ef9c 100644 +index 671d3bc..27b56ee 100644 --- a/src/liblzma/common/common.h +++ b/src/liblzma/common/common.h @@ -76,7 +76,7 @@ @@ -52,10 +35,36 @@ index 11fec52..1d2ef9c 100644 // 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) ++# 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.25.1 +2.34.1 From 2a571acddd0badaf9636649d98fd095757878348 Mon Sep 17 00:00:00 2001 From: TIAN Yuanhao Date: Sun, 9 Oct 2022 04:14:23 -0700 Subject: [PATCH 0841/5754] package/open-iscsi: new package Signed-off-by: TIAN Yuanhao Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/open-iscsi/Config.in | 18 ++++++++++++++++++ package/open-iscsi/open-iscsi.hash | 3 +++ package/open-iscsi/open-iscsi.mk | 29 +++++++++++++++++++++++++++++ 5 files changed, 52 insertions(+) create mode 100644 package/open-iscsi/Config.in create mode 100644 package/open-iscsi/open-iscsi.hash create mode 100644 package/open-iscsi/open-iscsi.mk diff --git a/DEVELOPERS b/DEVELOPERS index 0bb4db81bb..0e116e92a3 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2791,6 +2791,7 @@ F: package/most/ N: TIAN Yuanhao F: package/cli11/ F: package/libsolv/ +F: package/open-iscsi/ F: package/open-isns/ F: package/reproc/ F: package/termcolor/ diff --git a/package/Config.in b/package/Config.in index 2adfcdbb1d..511e691ed3 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2408,6 +2408,7 @@ endif source "package/odhcp6c/Config.in" source "package/odhcploc/Config.in" source "package/olsr/Config.in" + source "package/open-iscsi/Config.in" source "package/open-lldp/Config.in" source "package/open-plc-utils/Config.in" source "package/openntpd/Config.in" diff --git a/package/open-iscsi/Config.in b/package/open-iscsi/Config.in new file mode 100644 index 0000000000..e55bbfd867 --- /dev/null +++ b/package/open-iscsi/Config.in @@ -0,0 +1,18 @@ +config BR2_PACKAGE_OPEN_ISCSI + bool "open-iscsi" + depends on BR2_USE_MMU # fork() + depends on BR2_TOOLCHAIN_HAS_THREADS # pthread + depends on !BR2_STATIC_LIBS # kmod + select BR2_PACKAGE_KMOD + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_OPEN_ISNS + select BR2_PACKAGE_UTIL_LINUX + select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT + help + iSCSI tools for Linux. + + https://www.open-iscsi.com + +comment "open-iscsi needs a toolchain w/ threads, dynamic library" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/open-iscsi/open-iscsi.hash b/package/open-iscsi/open-iscsi.hash new file mode 100644 index 0000000000..9fd651cae8 --- /dev/null +++ b/package/open-iscsi/open-iscsi.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 9565bdf6b68b223e1e0d455d9a04d7536724a3f5b5a254e9398d06b2a0c6b6d2 open-iscsi-2.1.8.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/open-iscsi/open-iscsi.mk b/package/open-iscsi/open-iscsi.mk new file mode 100644 index 0000000000..249253c64f --- /dev/null +++ b/package/open-iscsi/open-iscsi.mk @@ -0,0 +1,29 @@ +################################################################################ +# +# open-iscsi +# +################################################################################ + +OPEN_ISCSI_VERSION = 2.1.8 +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_DEPENDENCIES = kmod open-isns openssl util-linux + +OPEN_ISCSI_CONF_OPTS = -Ddbroot=/var/lib/iscsi + +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +OPEN_ISCSI_DEPENDENCIES += systemd +OPEN_ISCSI_CONF_OPTS += -Dno_systemd=false +else +OPEN_ISCSI_CONF_OPTS += -Dno_systemd=true +endif + +define OPEN_ISCSI_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_SCSI_LOWLEVEL) + $(call KCONFIG_ENABLE_OPT,CONFIG_ISCSI_TCP) +endef + +$(eval $(meson-package)) From c33a133704166d602090b0b0d394aa9428e6acd4 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 31 Dec 2022 11:14:51 +0100 Subject: [PATCH 0842/5754] boot/afboot-stm32: disable stack-protector Disable stack-protector to avoid the following build failure: /home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld -T stm32f429.lds --gc-sections -o stm32f469i-disco.elf stm32f469i-disco.o gpio.o mpu.o qspi.o start_kernel.o usart-f4.o /home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: stm32f469i-disco.o: in function `main': stm32f469i-disco.c:(.text.startup.main+0x3b0): undefined reference to `__stack_chk_guard' /home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: stm32f469i-disco.c:(.text.startup.main+0x4c0): undefined reference to `__stack_chk_fail' /home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: stm32f469i-disco.c:(.text.startup.main+0x4ec): undefined reference to `__stack_chk_guard' Fixes: - http://autobuild.buildroot.org/results/fa6ffab24c3998f21034ab24e8d2852cacde08c1 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...003-Makefile-disable-stack-protector.patch | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 boot/afboot-stm32/0003-Makefile-disable-stack-protector.patch diff --git a/boot/afboot-stm32/0003-Makefile-disable-stack-protector.patch b/boot/afboot-stm32/0003-Makefile-disable-stack-protector.patch new file mode 100644 index 0000000000..27a81b45d5 --- /dev/null +++ b/boot/afboot-stm32/0003-Makefile-disable-stack-protector.patch @@ -0,0 +1,36 @@ +From d65b07d6fe438e760fdbc33a8e42650a27d5b417 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 31 Dec 2022 11:09:38 +0100 +Subject: [PATCH] Makefile: disable stack-protector + +Disable stack-protector to avoid the following build failure: + +/home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld -T stm32f429.lds --gc-sections -o stm32f469i-disco.elf stm32f469i-disco.o gpio.o mpu.o qspi.o start_kernel.o usart-f4.o +/home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: stm32f469i-disco.o: in function `main': +stm32f469i-disco.c:(.text.startup.main+0x3b0): undefined reference to `__stack_chk_guard' +/home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: stm32f469i-disco.c:(.text.startup.main+0x4c0): undefined reference to `__stack_chk_fail' +/home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: stm32f469i-disco.c:(.text.startup.main+0x4ec): undefined reference to `__stack_chk_guard' + +Fixes: + - http://autobuild.buildroot.org/results/fa6ffab24c3998f21034ab24e8d2852cacde08c1 + +Signed-off-by: Fabrice Fontaine +--- + Makefile | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Makefile b/Makefile +index 8f42be1..8da7a25 100644 +--- a/Makefile ++++ b/Makefile +@@ -14,6 +14,7 @@ CFLAGS := -mthumb -mcpu=cortex-m4 + CFLAGS += -ffunction-sections -fdata-sections + CFLAGS += -Os -std=gnu99 -Wall + CFLAGS += -fno-builtin ++CFLAGS += -fno-stack-protector + LINKERFLAGS := --gc-sections + + obj-y += gpio.o mpu.o qspi.o start_kernel.o +-- +2.35.1 + From 6ff07d3e60d23816a958aae413d4dc7e2dd17003 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Wed, 8 Feb 2023 17:27:26 +0100 Subject: [PATCH 0843/5754] package/qt6base: additional disable FEATURE_avx512vbmi2 and FEATURE_vaes - additional disable new FEATURE_avx512vbmi2/FEATURE_vaes (added with upstream commit [1]) [1] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=38e6b637b71fae274caedc1d326f641b904e00a4 Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/qt6/qt6base/qt6base.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 212b2d689e..e6cf4f14bb 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -72,7 +72,9 @@ QT6BASE_CONF_OPTS += \ -DFEATURE_avx512ifma=OFF \ -DFEATURE_avx512pf=OFF \ -DFEATURE_avx512vbmi=OFF \ - -DFEATURE_avx512vl=OFF + -DFEATURE_avx512vbmi2=OFF \ + -DFEATURE_avx512vl=OFF \ + -DFEATURE_vaes=OFF define QT6BASE_BUILD_CMDS $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(QT6BASE_BUILDDIR) From 040896bd4338f7ca419766578db49af154b762c7 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Wed, 8 Feb 2023 17:25:34 +0100 Subject: [PATCH 0844/5754] package/libopenssl: security bump to version 1.1.1t Changelog (for details see [1] and [2]): Changes between 1.1.1s and 1.1.1t [7 Feb 2023] *) Fixed X.400 address type confusion in X.509 GeneralName. There is a type confusion vulnerability relating to X.400 address processing inside an X.509 GeneralName. X.400 addresses were parsed as an ASN1_STRING but subsequently interpreted by GENERAL_NAME_cmp as an ASN1_TYPE. This vulnerability may allow an attacker who can provide a certificate chain and CRL (neither of which need have a valid signature) to pass arbitrary pointers to a memcmp call, creating a possible read primitive, subject to some constraints. Refer to the advisory for more information. Thanks to David Benjamin for discovering this issue. (CVE-2023-0286) This issue has been fixed by changing the public header file definition of GENERAL_NAME so that x400Address reflects the implementation. It was not possible for any existing application to successfully use the existing definition; however, if any application references the x400Address field (e.g. in dead code), note that the type of this field has changed. There is no ABI change. [Hugo Landau] *) Fixed Use-after-free following BIO_new_NDEF. The public API function BIO_new_NDEF is a helper function used for streaming ASN.1 data via a BIO. It is primarily used internally to OpenSSL to support the SMIME, CMS and PKCS7 streaming capabilities, but may also be called directly by end user applications. The function receives a BIO from the caller, prepends a new BIO_f_asn1 filter BIO onto the front of it to form a BIO chain, and then returns the new head of the BIO chain to the caller. Under certain conditions, for example if a CMS recipient public key is invalid, the new filter BIO is freed and the function returns a NULL result indicating a failure. However, in this case, the BIO chain is not properly cleaned up and the BIO passed by the caller still retains internal pointers to the previously freed filter BIO. If the caller then goes on to call BIO_pop() on the BIO then a use-after-free will occur. This will most likely result in a crash. (CVE-2023-0215) [Viktor Dukhovni, Matt Caswell] *) Fixed Double free after calling PEM_read_bio_ex. The function PEM_read_bio_ex() reads a PEM file from a BIO and parses and decodes the "name" (e.g. "CERTIFICATE"), any header data and the payload data. If the function succeeds then the "name_out", "header" and "data" arguments are populated with pointers to buffers containing the relevant decoded data. The caller is responsible for freeing those buffers. It is possible to construct a PEM file that results in 0 bytes of payload data. In this case PEM_read_bio_ex() will return a failure code but will populate the header argument with a pointer to a buffer that has already been freed. If the caller also frees this buffer then a double free will occur. This will most likely lead to a crash. The functions PEM_read_bio() and PEM_read() are simple wrappers around PEM_read_bio_ex() and therefore these functions are also directly affected. These functions are also called indirectly by a number of other OpenSSL functions including PEM_X509_INFO_read_bio_ex() and SSL_CTX_use_serverinfo_file() which are also vulnerable. Some OpenSSL internal uses of these functions are not vulnerable because the caller does not free the header argument if PEM_read_bio_ex() returns a failure code. (CVE-2022-4450) [Kurt Roeckx, Matt Caswell] *) Fixed Timing Oracle in RSA Decryption. A timing based side channel exists in the OpenSSL RSA Decryption implementation which could be sufficient to recover a plaintext across a network in a Bleichenbacher style attack. To achieve a successful decryption an attacker would have to be able to send a very large number of trial messages for decryption. The vulnerability affects all RSA padding modes: PKCS#1 v1.5, RSA-OEAP and RSASVE. (CVE-2022-4304) [Dmitry Belyavsky, Hubert Kario] Changes between 1.1.1r and 1.1.1s [1 Nov 2022] *) Fixed a regression introduced in 1.1.1r version not refreshing the certificate data to be signed before signing the certificate. [Gibeom Gwon] Changes between 1.1.1q and 1.1.1r [11 Oct 2022] *) Fixed the linux-mips64 Configure target which was missing the SIXTY_FOUR_BIT bn_ops flag. This was causing heap corruption on that platform. [Adam Joseph] *) Fixed a strict aliasing problem in bn_nist. Clang-14 optimisation was causing incorrect results in some cases as a result. [Paul Dale] *) Fixed SSL_pending() and SSL_has_pending() with DTLS which were failing to report correct results in some cases [Matt Caswell] *) Fixed a regression introduced in 1.1.1o for re-signing certificates with different key sizes [Todd Short] *) Added the loongarch64 target [Shi Pujin] *) Fixed a DRBG seed propagation thread safety issue [Bernd Edlinger] *) Fixed a memory leak in tls13_generate_secret [Bernd Edlinger] *) Fixed reported performance degradation on aarch64. Restored the implementation prior to commit 2621751 ("aes/asm/aesv8-armx.pl: avoid 32-bit lane assignment in CTR mode") for 64bit targets only, since it is reportedly 2-17% slower and the silicon errata only affects 32bit targets. The new algorithm is still used for 32 bit targets. [Bernd Edlinger] *) Added a missing header for memcmp that caused compilation failure on some platforms [Gregor Jasny] [1] https://www.openssl.org/news/cl111.txt [2] https://www.openssl.org/news/vulnerabilities.html Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- 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 8457df6c0a..ebc56b11dd 100644 --- a/package/libopenssl/libopenssl.hash +++ b/package/libopenssl/libopenssl.hash @@ -1,5 +1,5 @@ -# From https://www.openssl.org/source/openssl-1.1.1q.tar.gz.sha256 -sha256 d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca openssl-1.1.1q.tar.gz +# From https://www.openssl.org/source/openssl-1.1.1t.tar.gz.sha256 +sha256 8dee9b24bdb1dcbf0c3d1e9b02fb8f6bf22165e807f45adeb7c9677536859d3b openssl-1.1.1t.tar.gz # License files sha256 c32913b33252e71190af2066f08115c69bc9fddadf3bf29296e20c835389841c LICENSE diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index fc22c20467..6e84f06175 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOPENSSL_VERSION = 1.1.1q +LIBOPENSSL_VERSION = 1.1.1t LIBOPENSSL_SITE = https://www.openssl.org/source LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz LIBOPENSSL_LICENSE = OpenSSL or SSLeay From 41671deec7b00de10dcc372cdeee4400df1d76ee Mon Sep 17 00:00:00 2001 From: Frank Vanbever Date: Wed, 8 Feb 2023 16:57:51 +0100 Subject: [PATCH 0845/5754] package/nginx-modsecurity: bump to version 1.0.3 Signed-off-by: Frank Vanbever Signed-off-by: Thomas Petazzoni --- package/nginx-modsecurity/nginx-modsecurity.hash | 4 ++-- package/nginx-modsecurity/nginx-modsecurity.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/nginx-modsecurity/nginx-modsecurity.hash b/package/nginx-modsecurity/nginx-modsecurity.hash index fbaf1ca239..0cd2ee07cd 100644 --- a/package/nginx-modsecurity/nginx-modsecurity.hash +++ b/package/nginx-modsecurity/nginx-modsecurity.hash @@ -1,4 +1,4 @@ -# From https://github.com/SpiderLabs/ModSecurity-nginx/releases/download/v1.0.2/modsecurity-nginx-v1.0.2.tar.gz.sha256 -sha256 41a6660c50508c60df59f8f09c444d18ef8112a4c118cdc791a3992390b78c32 modsecurity-nginx-v1.0.2.tar.gz +# From https://github.com/SpiderLabs/ModSecurity-nginx/releases/download/v1.0.3/modsecurity-nginx-v1.0.3.tar.gz.sha256 +sha256 ae811c7208ac029cb7a99d6f63e03d3971797607517187f47620df39c1f78add modsecurity-nginx-v1.0.3.tar.gz # Localy calculated sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/nginx-modsecurity/nginx-modsecurity.mk b/package/nginx-modsecurity/nginx-modsecurity.mk index 90ef8ecd51..a00c200469 100644 --- a/package/nginx-modsecurity/nginx-modsecurity.mk +++ b/package/nginx-modsecurity/nginx-modsecurity.mk @@ -4,7 +4,7 @@ # ################################################################################ -NGINX_MODSECURITY_VERSION = 1.0.2 +NGINX_MODSECURITY_VERSION = 1.0.3 NGINX_MODSECURITY_SOURCE = modsecurity-nginx-v$(NGINX_MODSECURITY_VERSION).tar.gz NGINX_MODSECURITY_SITE = https://github.com/SpiderLabs/ModSecurity-nginx/releases/download/v$(NGINX_MODSECURITY_VERSION) NGINX_MODSECURITY_LICENSE = Apache-2.0 From 416213be39c6adb860a9d3e85f0a634139c27cac Mon Sep 17 00:00:00 2001 From: Frank Vanbever Date: Wed, 8 Feb 2023 16:57:52 +0100 Subject: [PATCH 0846/5754] DEVELOPERS: update e-mail for Frank Vanbever Signed-off-by: Frank Vanbever Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index 0e116e92a3..32c6e54919 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1088,7 +1088,7 @@ F: package/sane-backends/ F: package/upx/ F: package/zxing-cpp/ -N: Frank Vanbever +N: Frank Vanbever F: package/elixir/ F: package/libmodsecurity/ F: package/nginx-modsecurity/ From dd2e9a2a0d7fd4e407e831503979cc00aa2c4858 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Fri, 30 Dec 2022 06:40:05 +0100 Subject: [PATCH 0847/5754] package/xr819-xradio: bump to 2022-12-30 version on branch master This version allows to build with Linux 6.1 Fixes: Still not reported Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- 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 08a3b6e8cc..60185db736 100644 --- a/package/xr819-xradio/xr819-xradio.hash +++ b/package/xr819-xradio/xr819-xradio.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 839fdae93eba29121d4116de335b00a026ef63874caf516747dbdf24c17f208b xr819-xradio-58d597bcf081e44904335916e6033bc8ef28b043.tar.gz +sha256 2b297fbcc9b5ed190bcfff9f6f808c170632ac3d69dbd92156a7f4f57142dec9 xr819-xradio-005f28cfe9e20b7f2dfd9d32d38ee97060dc707f.tar.gz # Locally computed sha256 db296f2f7f35bca3a174efb0eb392b3b17bd94b341851429a3dff411b1c2fc73 LICENSE diff --git a/package/xr819-xradio/xr819-xradio.mk b/package/xr819-xradio/xr819-xradio.mk index 8c1cb1587f..e5daaa6051 100644 --- a/package/xr819-xradio/xr819-xradio.mk +++ b/package/xr819-xradio/xr819-xradio.mk @@ -4,7 +4,7 @@ # ################################################################################ -XR819_XRADIO_VERSION = 58d597bcf081e44904335916e6033bc8ef28b043 +XR819_XRADIO_VERSION = 005f28cfe9e20b7f2dfd9d32d38ee97060dc707f XR819_XRADIO_SITE = $(call github,fifteenhex,xradio,$(XR819_XRADIO_VERSION)) XR819_XRADIO_LICENSE = GPL-2.0 XR819_XRADIO_LICENSE_FILES = LICENSE From 672544148b3cafa1cda47cd6e4b88210fc693e14 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Tue, 13 Dec 2022 22:13:13 +0100 Subject: [PATCH 0848/5754] package/rtl8723ds: change CFLAGS approach Instead of undefining endiannes CFLAGS let's change the approach. Let's disable the CONFIG_PLATFORM_I386_PC that is set to y by default involving the endianness to be set to little. This way we can set the CFLAGS according to architecture with some default define like: -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT -Wno-error Suggested-by: Arnout Vandecappelle Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/rtl8723ds/rtl8723ds.mk | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/package/rtl8723ds/rtl8723ds.mk b/package/rtl8723ds/rtl8723ds.mk index 7e27fa75ea..f303a24041 100644 --- a/package/rtl8723ds/rtl8723ds.mk +++ b/package/rtl8723ds/rtl8723ds.mk @@ -8,12 +8,14 @@ RTL8723DS_VERSION = a638cc8639015b8b9390af3350fab0366b6c87e7 RTL8723DS_SITE = $(call github,lwfinger,rtl8723ds,$(RTL8723DS_VERSION)) RTL8723DS_LICENSE = GPL-2.0 -# Undefine the hardcoded CONFIG_LITTLE_ENDIAN -RTL8723DS_USER_EXTRA_CLAGS = -UCONFIG_LITTLE_ENDIAN -# Set endianness -RTL8723DS_USER_EXTRA_CLAGS += -DCONFIG_$(call qstrip,$(BR2_ENDIAN))_ENDIAN +RTL8723DS_USER_EXTRA_CLAGS = \ + -DCONFIG_$(call qstrip,$(BR2_ENDIAN))_ENDIAN \ + -DCONFIG_IOCTL_CFG80211 \ + -DRTW_USE_CFG80211_STA_EVENT \ + -Wno-error RTL8723DS_MODULE_MAKE_OPTS = \ + CONFIG_PLATFORM_I386_PC=n \ CONFIG_RTL8723DS=m \ KVER=$(LINUX_VERSION_PROBED) \ KSRC=$(LINUX_DIR) \ From 554d79f5cc01c20d886cbe9c676195159947f066 Mon Sep 17 00:00:00 2001 From: Maxim Kochetkov Date: Wed, 8 Feb 2023 12:45:43 +0300 Subject: [PATCH 0849/5754] lksctp-tools: bump to version 1.0.19 Release notes: https://github.com/sctp/lksctp-tools/blob/v1.0.19/ChangeLog Signed-off-by: Maxim Kochetkov Tested-by: Maksim Kiselev Signed-off-by: Arnout Vandecappelle --- package/lksctp-tools/lksctp-tools.hash | 4 ++-- package/lksctp-tools/lksctp-tools.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/lksctp-tools/lksctp-tools.hash b/package/lksctp-tools/lksctp-tools.hash index fb892fdc3b..b3a1f59d86 100644 --- a/package/lksctp-tools/lksctp-tools.hash +++ b/package/lksctp-tools/lksctp-tools.hash @@ -1,6 +1,6 @@ # From https://sourceforge.net/projects/lksctp/files/lksctp-tools/ -md5 68e9b8fa4d4e331029b247b72d46d7a5 lksctp-tools-1.0.17.tar.gz -sha1 941b0b5c39e364a971f514bba66120435660e518 lksctp-tools-1.0.17.tar.gz +md5 0fbb288c9f9625b88d3ab21c9ed9f011 lksctp-tools-1.0.19.tar.gz +sha1 d410a596485c38464177a38ae7c7081444e6589e lksctp-tools-1.0.19.tar.gz # Locally computed sha256 dee5f35e583183abb9212938643ecb2d858fd89e2e286f4b1d903f65d49d6c76 COPYING.lib sha256 cc2a6651c315b233ebc110b49ea3c6452eff9a28f8bc051ffd2bb92a8dcfa3d2 COPYING diff --git a/package/lksctp-tools/lksctp-tools.mk b/package/lksctp-tools/lksctp-tools.mk index 5ac794e842..af86a28516 100644 --- a/package/lksctp-tools/lksctp-tools.mk +++ b/package/lksctp-tools/lksctp-tools.mk @@ -4,8 +4,8 @@ # ################################################################################ -LKSCTP_TOOLS_VERSION = 1.0.17 -LKSCTP_TOOLS_SITE = http://downloads.sourceforge.net/project/lksctp/lksctp-tools +LKSCTP_TOOLS_VERSION = 1.0.19 +LKSCTP_TOOLS_SITE = $(call github,sctp,lksctp-tools,v$(LKSCTP_TOOLS_VERSION)) LKSCTP_TOOLS_INSTALL_STAGING = YES # configure not shipped LKSCTP_TOOLS_AUTORECONF = YES From b1bceb4b51581e0c7b3953181ee3a2c31f0094f6 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Thu, 9 Feb 2023 11:52:03 -0700 Subject: [PATCH 0850/5754] package/pipewire-media-session: bump to version 0.4.2 Explicitly set installed_tests to disabled. Drop patch which is now upstream. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- ...remove-session-managers-option-check.patch | 36 ------------------- .../pipewire-media-session.hash | 2 +- .../pipewire-media-session.mk | 7 ++-- 3 files changed, 6 insertions(+), 39 deletions(-) delete mode 100644 package/pipewire-media-session/0001-meson-remove-session-managers-option-check.patch diff --git a/package/pipewire-media-session/0001-meson-remove-session-managers-option-check.patch b/package/pipewire-media-session/0001-meson-remove-session-managers-option-check.patch deleted file mode 100644 index fc1d25edb3..0000000000 --- a/package/pipewire-media-session/0001-meson-remove-session-managers-option-check.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 1923c97fbd0b3d8cacdb72386886f860c818bccf Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Wed, 10 Nov 2021 08:54:06 -0700 -Subject: [PATCH] meson: remove session-managers option check. - -This option no longer exists and causes a build failure if building -with the systemd system service enabled. - -Signed-off-by: James Hilliard -[Upstream status: -https://gitlab.freedesktop.org/pipewire/media-session/-/merge_requests/24] ---- - systemd/system/meson.build | 10 ++++------ - 1 file changed, 4 insertions(+), 6 deletions(-) - -diff --git a/systemd/system/meson.build b/systemd/system/meson.build -index ab0d49064..0e9885b0f 100644 ---- a/systemd/system/meson.build -+++ b/systemd/system/meson.build -@@ -4,9 +4,7 @@ systemd_system_services_dir = systemd.get_variable(pkgconfig: 'systemdsystemunit - systemd_config = configuration_data() - systemd_config.set('PW_MEDIA_SESSION_BINARY', media_session_bindir / 'pipewire-media-session') - --if get_option('session-managers').contains('media-session') -- configure_file(input : 'pipewire-media-session.service.in', -- output : 'pipewire-media-session.service', -- configuration : systemd_config, -- install_dir : systemd_system_services_dir) --endif -+configure_file(input : 'pipewire-media-session.service.in', -+ output : 'pipewire-media-session.service', -+ configuration : systemd_config, -+ install_dir : systemd_system_services_dir) --- -2.25.1 - diff --git a/package/pipewire-media-session/pipewire-media-session.hash b/package/pipewire-media-session/pipewire-media-session.hash index e335fd8913..e6b176eea2 100644 --- a/package/pipewire-media-session/pipewire-media-session.hash +++ b/package/pipewire-media-session/pipewire-media-session.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 ebdf9f8e389896fdc4b58da5f909afce18441b4b53d5b4f2104dd53586ea8681 media-session-0.4.1.tar.bz2 +sha256 26e21852e0834a4418b40eae342ac5178dfe40342b9c5afe204d43ef8aafa14e media-session-0.4.2.tar.bz2 sha256 8909c319a7e27dbb33a15b9035f89ab3b7b2f6a12f8bcddc755206a8db1ada44 COPYING sha256 77b9c867237ef919e33c0fdbcf22ab84b1cf24a63f9431ec68759026b658c994 LICENSE diff --git a/package/pipewire-media-session/pipewire-media-session.mk b/package/pipewire-media-session/pipewire-media-session.mk index d349fd7454..cc7317f925 100644 --- a/package/pipewire-media-session/pipewire-media-session.mk +++ b/package/pipewire-media-session/pipewire-media-session.mk @@ -4,7 +4,7 @@ # ################################################################################ -PIPEWIRE_MEDIA_SESSION_VERSION = 0.4.1 +PIPEWIRE_MEDIA_SESSION_VERSION = 0.4.2 PIPEWIRE_MEDIA_SESSION_SOURCE = media-session-$(PIPEWIRE_MEDIA_SESSION_VERSION).tar.bz2 PIPEWIRE_MEDIA_SESSION_SITE = https://gitlab.freedesktop.org/pipewire/media-session/-/archive/$(PIPEWIRE_MEDIA_SESSION_VERSION) PIPEWIRE_MEDIA_SESSION_LICENSE = MIT @@ -17,7 +17,10 @@ PIPEWIRE_MEDIA_SESSION_DEPENDENCIES = \ pipewire \ $(TARGET_NLS_DEPENDENCIES) -PIPEWIRE_MEDIA_SESSION_CONF_OPTS = -Ddocs=disabled -Dtests=disabled +PIPEWIRE_MEDIA_SESSION_CONF_OPTS = \ + -Ddocs=disabled \ + -Dtests=disabled \ + -Dinstalled_tests=disabled PIPEWIRE_MEDIA_SESSION_MODULE_SETS_LIST = alsa From 4856c75b2fe0cbab36fcae7f5f223026b24e884f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 8 Feb 2023 18:44:31 +0100 Subject: [PATCH 0851/5754] package/open-iscsi: add OPEN_ISCSI_CPE_ID_VENDOR cpe:2.3:a:open-iscsi_project:open-iscsi is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aopen-iscsi_project%3Aopen-iscsi Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/open-iscsi/open-iscsi.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/open-iscsi/open-iscsi.mk b/package/open-iscsi/open-iscsi.mk index 249253c64f..e5b965b80d 100644 --- a/package/open-iscsi/open-iscsi.mk +++ b/package/open-iscsi/open-iscsi.mk @@ -10,6 +10,7 @@ OPEN_ISCSI_SITE = $(call github,open-iscsi,open-iscsi,$(OPEN_ISCSI_VERSION)) # 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_CPE_ID_VENDOR = open-iscsi_project OPEN_ISCSI_DEPENDENCIES = kmod open-isns openssl util-linux OPEN_ISCSI_CONF_OPTS = -Ddbroot=/var/lib/iscsi From 8cee8fb37c6ad0164d3f7bad8cfd0f812592ad6c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 8 Feb 2023 18:50:08 +0100 Subject: [PATCH 0852/5754] package/libsolv: add LIBSOLV_CPE_ID_VENDOR cpe:2.3:a:opensuse:libsolv is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aopensuse%3Alibsolv Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/libsolv/libsolv.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libsolv/libsolv.mk b/package/libsolv/libsolv.mk index 144ce68a83..29f8a6a3d2 100644 --- a/package/libsolv/libsolv.mk +++ b/package/libsolv/libsolv.mk @@ -8,6 +8,7 @@ LIBSOLV_VERSION = 0.7.22 LIBSOLV_SITE = $(call github,openSUSE,libsolv,$(LIBSOLV_VERSION)) LIBSOLV_LICENSE = BSD-3-Clause LIBSOLV_LICENSE_FILES = LICENSE.BSD +LIBSOLV_CPE_ID_VENDOR = opensuse LIBSOLV_INSTALL_STAGING = YES LIBSOLV_DEPENDENCIES = zlib LIBSOLV_CONF_OPTS = -DCMAKE_CXX_COMPILER_FORCED=ON From e2fd606b91784ced64c7312e02fcbf95f3e736d6 Mon Sep 17 00:00:00 2001 From: Andreas Klinger Date: Wed, 8 Feb 2023 09:45:08 +0100 Subject: [PATCH 0853/5754] package/ply: add dependency on Linux headers >= 5.5 Version 2.3.0 of ply now requires Linux headers >= 5.5 This was missing in commit b9612601b037e6deb79af300e64e0557dda1be5c ("package/ply: bump to version 2.3.0") Fixes: http://autobuild.buildroot.net/results/ce37039991cb0fb02b97d341d78327e54d0e1d26 http://autobuild.buildroot.net/results/c00714847ae92dd609bc8990df318bee58be38b8 http://autobuild.buildroot.net/results/8210bd2b9c67d6d7616ada525019b2658195416a Signed-off-by: Andreas Klinger Signed-off-by: Arnout Vandecappelle --- package/ply/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/ply/Config.in b/package/ply/Config.in index 0500e7883f..f7507095c1 100644 --- a/package/ply/Config.in +++ b/package/ply/Config.in @@ -5,16 +5,16 @@ config BR2_PACKAGE_PLY_ARCH_SUPPORTS default y if BR2_powerpc default y if BR2_x86_64 -comment "ply needs a toolchain w/ dynamic library, headers >= 4.14" +comment "ply needs a toolchain w/ dynamic library, headers >= 5.5" depends on BR2_PACKAGE_PLY_ARCH_SUPPORTS depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 || BR2_STATIC_LIBS + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_5 || BR2_STATIC_LIBS config BR2_PACKAGE_PLY bool "ply" depends on BR2_PACKAGE_PLY_ARCH_SUPPORTS depends on BR2_USE_MMU # fork() - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 # BPF_JLT + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_5 # BPF_JLT depends on !BR2_STATIC_LIBS help ply is a light-weight dynamic tracer for Linux. By means of From 1b4d7f6e13212b4c65ec2832681719fd960e75e6 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 8 Feb 2023 19:19:28 +0100 Subject: [PATCH 0854/5754] package/pkg-waf.mk: drop bundled waf/waflib when external waf is used Waf requires that the version of the waf script matches the version of waflib, so drop any bundled waf/waflib if _NEEDS_EXTERNAL_WAF is used, as otherwise waf errors out with errors like: Waf script '2.0.24' and library '1.9.3' do not match Signed-off-by: Peter Korsgaard Reviewed-by: Romain Naour [Peter: Run as a post-patch hook as suggested by Yann] Signed-off-by: Peter Korsgaard --- package/pkg-waf.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/pkg-waf.mk b/package/pkg-waf.mk index e090afa9e6..0e752072c8 100644 --- a/package/pkg-waf.mk +++ b/package/pkg-waf.mk @@ -38,6 +38,13 @@ WAF_OPTS = $(if $(VERBOSE),-v) -j $(PARALLEL_JOBS) define inner-waf-package +# The version of waflib has to match with the version of waf, +# otherwise waf errors out with: +# Waf script 'X' and library 'Y' do not match +define WAF_PACKAGE_REMOVE_WAF_LIB + $(RM) -fr $(@D)/waf $(@D)/waflib +endef + # We need host-python3 to run waf $(2)_DEPENDENCIES += host-python3 @@ -47,6 +54,7 @@ $(2)_NEEDS_EXTERNAL_WAF ?= NO ifeq ($$($(2)_NEEDS_EXTERNAL_WAF),YES) $(2)_DEPENDENCIES += host-waf $(2)_WAF = $$(HOST_DIR)/bin/waf +$(2)_POST_PATCH_HOOKS += WAF_PACKAGE_REMOVE_WAF_LIB else $(2)_WAF ?= ./waf endif From c4543911494b2a485f159eae21bb703b676ec2c9 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 8 Feb 2023 19:19:29 +0100 Subject: [PATCH 0855/5754] package/aubio: drop AUBIO_REMOVE_OLD_WAF hook As that is now handled by the waf-package infrastructure. Signed-off-by: Peter Korsgaard Reviewed-by: Romain Naour Signed-off-by: Peter Korsgaard --- package/aubio/aubio.mk | 6 ------ 1 file changed, 6 deletions(-) diff --git a/package/aubio/aubio.mk b/package/aubio/aubio.mk index c995fdfac7..64174a113d 100644 --- a/package/aubio/aubio.mk +++ b/package/aubio/aubio.mk @@ -21,12 +21,6 @@ AUBIO_CONF_OPTS = \ # https://github.com/jackaudio/jack2/issues/898 AUBIO_NEEDS_EXTERNAL_WAF = YES -# The old waf script bundled in aubio 0.4.9 need to be removed first. -define AUBIO_REMOVE_OLD_WAF - $(RM) -fr $(@D)/waf $(@D)/waflib -endef -AUBIO_POST_EXTRACT_HOOKS = AUBIO_REMOVE_OLD_WAF - # Add --notests for each build step to avoid running unit tests on the # build machine. AUBIO_WAF_OPTS = --notests From e331da62fb7612b7a52a40e37312753cc1c1eef5 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 8 Feb 2023 19:19:30 +0100 Subject: [PATCH 0856/5754] package/glmark2: use external waf Fixes: http://autobuild.buildroot.net/results/bbd/bbd90f11975b691f694412a6fc3446f37dd7c0aa/ The bundled waf script is too old (1.9.3) for python >= 3.11 as it uses the 'U' modifier to open (universal newlines), which have been deprecated since python 3.3 and finally removed in 3.11. Signed-off-by: Peter Korsgaard --- package/glmark2/glmark2.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/glmark2/glmark2.mk b/package/glmark2/glmark2.mk index e8d6f71dad..bac9d9ff6f 100644 --- a/package/glmark2/glmark2.mk +++ b/package/glmark2/glmark2.mk @@ -10,6 +10,9 @@ GLMARK2_LICENSE = GPL-3.0+, SGIv1 GLMARK2_LICENSE_FILES = COPYING COPYING.SGI GLMARK2_DEPENDENCIES = host-pkgconf jpeg libegl libpng +# The bundled waf script is too old for >= python3.11 +GLMARK2_NEEDS_EXTERNAL_WAF = YES + ifeq ($(BR2_PACKAGE_GLMARK2_FLAVOR_DRM_GLESV2),y) GLMARK2_DEPENDENCIES += libdrm libgbm libgles udev GLMARK2_FLAVORS += drm-glesv2 From e8fe92584446bba2bb81f454c5ebbcb4f80a371b Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 8 Feb 2023 19:19:31 +0100 Subject: [PATCH 0857/5754] package/jack2: fix build with host python >= 3.11 Fixes: http://autobuild.buildroot.net/results/5ce/5ce5ebd20e0e509b31b51d2ec1aed56fdb8f45aa/ The bundled waf script is too old (2.0.12) for python >= 3.11 as it uses the 'U' modifier to open (universal newlines), which have been deprecated since python 3.3 and finally removed in 3.11. Jack unfortunately uses a modified waf, so we cannot just set JACK2_NEEDS_EXTERNAL_WAF, so instead backport an upstream patch fixing the compatibility issue: https://github.com/jackaudio/jack2/pull/884 Signed-off-by: Peter Korsgaard --- ...U-mode-bit-for-opening-files-in-pyth.patch | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 package/jack2/0001-Remove-usage-of-U-mode-bit-for-opening-files-in-pyth.patch diff --git a/package/jack2/0001-Remove-usage-of-U-mode-bit-for-opening-files-in-pyth.patch b/package/jack2/0001-Remove-usage-of-U-mode-bit-for-opening-files-in-pyth.patch new file mode 100644 index 0000000000..9ee5a43e18 --- /dev/null +++ b/package/jack2/0001-Remove-usage-of-U-mode-bit-for-opening-files-in-pyth.patch @@ -0,0 +1,55 @@ +From 328c58967dce8be426f9208ba7717ab5afc2c4f3 Mon Sep 17 00:00:00 2001 +From: Daan De Meyer +Date: Mon, 11 Jul 2022 00:56:28 +0200 +Subject: [PATCH] Remove usage of 'U' mode bit for opening files in python + +The 'U' mode bit is removed in python 3.11. It has been +deprecated for a long time. The 'U' mode bit has no effect +so this change doesn't change any behavior. + +See https://docs.python.org/3.11/whatsnew/3.11.html#changes-in-the-python-api + +Signed-off-by: Peter Korsgaard +--- + waflib/ConfigSet.py | 2 +- + waflib/Context.py | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/waflib/ConfigSet.py b/waflib/ConfigSet.py +index b300bb56..84736c9c 100644 +--- a/waflib/ConfigSet.py ++++ b/waflib/ConfigSet.py +@@ -312,7 +312,7 @@ class ConfigSet(object): + :type filename: string + """ + tbl = self.table +- code = Utils.readf(filename, m='rU') ++ code = Utils.readf(filename, m='r') + for m in re_imp.finditer(code): + g = m.group + tbl[g(2)] = eval(g(3)) +diff --git a/waflib/Context.py b/waflib/Context.py +index 9fee3fa1..761b521f 100644 +--- a/waflib/Context.py ++++ b/waflib/Context.py +@@ -266,7 +266,7 @@ class Context(ctx): + cache[node] = True + self.pre_recurse(node) + try: +- function_code = node.read('rU', encoding) ++ function_code = node.read('r', encoding) + exec(compile(function_code, node.abspath(), 'exec'), self.exec_dict) + finally: + self.post_recurse(node) +@@ -662,7 +662,7 @@ def load_module(path, encoding=None): + + module = imp.new_module(WSCRIPT_FILE) + try: +- code = Utils.readf(path, m='rU', encoding=encoding) ++ code = Utils.readf(path, m='r', encoding=encoding) + except EnvironmentError: + raise Errors.WafError('Could not read the file %r' % path) + +-- +2.30.2 + From 8012a86f5cf751f9c4d5d4a63f6502a6ac60d13a Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 8 Feb 2023 19:19:32 +0100 Subject: [PATCH 0858/5754] package/norm: use external waf Fixes: http://autobuild.buildroot.net/results/ee1/ee15cadf8af10dee6c83b9726a034367e8ae81a7/ The bundled waf script is too old (2.0.7) for python >= 3.11 as it uses the 'U' modifier to open (universal newlines), which have been deprecated since python 3.3 and finally removed in 3.11. Signed-off-by: Peter Korsgaard --- package/norm/norm.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/norm/norm.mk b/package/norm/norm.mk index 2f9fc7b657..a3fa1b4f80 100644 --- a/package/norm/norm.mk +++ b/package/norm/norm.mk @@ -11,6 +11,9 @@ NORM_INSTALL_STAGING = YES NORM_LICENSE = NRL License NORM_LICENSE_FILES = LICENSE.TXT +# The bundled waf script is too old for >= python3.11 +NORM_NEEDS_EXTERNAL_WAF = YES + ifeq ($(BR2_PACKAGE_LIBNETFILTER_QUEUE),y) NORM_DEPENDENCIES += libnetfilter_queue endif From 57e297a215193c92f6a178139db53616f2ee23b5 Mon Sep 17 00:00:00 2001 From: Maxim Kochetkov Date: Fri, 10 Feb 2023 10:22:28 +0300 Subject: [PATCH 0859/5754] package/postgresql: bump version to 15.2 Release notes: https://www.postgresql.org/docs/release/15.2/ Signed-off-by: Maxim Kochetkov Signed-off-by: Peter Korsgaard --- 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 ef2806c2dd..e6a9bd6658 100644 --- a/package/postgresql/postgresql.hash +++ b/package/postgresql/postgresql.hash @@ -1,4 +1,4 @@ -# From https://ftp.postgresql.org/pub/source/v14.6/postgresql-15.1.tar.bz2.sha256 -sha256 64fdf23d734afad0dfe4077daca96ac51dcd697e68ae2d3d4ca6c45cb14e21ae postgresql-15.1.tar.bz2 +# From https://ftp.postgresql.org/pub/source/v15.2/postgresql-15.2.tar.bz2.sha256 +sha256 99a2171fc3d6b5b5f56b757a7a3cb85d509a38e4273805def23941ed2b8468c7 postgresql-15.2.tar.bz2 # License file, Locally calculated sha256 f6d6616acdb598742e2a7c64fa0551c1c72c309d279fd2d90370e5fdd41c8945 COPYRIGHT diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index 2ffcac6595..e90aa794b0 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -4,7 +4,7 @@ # ################################################################################ -POSTGRESQL_VERSION = 15.1 +POSTGRESQL_VERSION = 15.2 POSTGRESQL_SOURCE = postgresql-$(POSTGRESQL_VERSION).tar.bz2 POSTGRESQL_SITE = https://ftp.postgresql.org/pub/source/v$(POSTGRESQL_VERSION) POSTGRESQL_LICENSE = PostgreSQL From 16e5c92ff5fd2b44a1126bd7d7538c68ce838213 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 9 Feb 2023 18:07:05 +0100 Subject: [PATCH 0860/5754] package/webkitgtk: Build with ninja Webkitgtk needs cmake >= 3.20 when building with the make backend since webkitgtk 3.8.0. Cmake 3.20 is above our minimal version in support/dependencies/check-host-cmake.mk, so this breaks builds on hosts with cmake >= 3.18 < 3.20 - So use the ninja backend instead. https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f Signed-off-by: Peter Korsgaard --- package/webkitgtk/webkitgtk.mk | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index b42ac3b644..a6974db926 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -139,4 +139,23 @@ 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 78d499409f71d8a22b0632c8ebc06f67ee6ae6dd Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 9 Feb 2023 18:07:06 +0100 Subject: [PATCH 0861/5754] package/wpewebkit: Build with ninja Wpewebkit needs cmake >= 3.20 when building with the make backend since wpewebkit 3.8.0. Cmake 3.20 is above our minimal version in support/dependencies/check-host-cmake.mk, so this breaks builds on hosts with cmake >= 3.18 < 3.20 - So use the ninja backend instead. https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f Signed-off-by: Peter Korsgaard --- package/wpewebkit/wpewebkit.mk | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index 54f37fd702..b9c2fef395 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -103,4 +103,23 @@ 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 1613273542554776b089b3df2b6b71c1af2cc0da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexis=20Lothor=C3=A9?= Date: Fri, 10 Feb 2023 11:26:55 +0100 Subject: [PATCH 0862/5754] package/python-flit-core: set license path MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When generating legal info with a configuration enabling a package which uses flit as setup type, we get a warning about python-flit-core license: WARNING: python-flit-core-3.8.0: cannot save license (HOST_PYTHON_FLIT_CORE_LICENSE_FILES not defined) Add missing variable to point to python-flit-core license file Signed-off-by: Alexis Lothoré [Peter: add sha256sum to .hash file] Signed-off-by: Peter Korsgaard --- package/python-flit-core/python-flit-core.hash | 2 ++ package/python-flit-core/python-flit-core.mk | 1 + 2 files changed, 3 insertions(+) diff --git a/package/python-flit-core/python-flit-core.hash b/package/python-flit-core/python-flit-core.hash index 9281635f1a..f63a64ed1b 100644 --- a/package/python-flit-core/python-flit-core.hash +++ b/package/python-flit-core/python-flit-core.hash @@ -1,3 +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 +# 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 4d7bee81da..f96191ade6 100644 --- a/package/python-flit-core/python-flit-core.mk +++ b/package/python-flit-core/python-flit-core.mk @@ -8,6 +8,7 @@ PYTHON_FLIT_CORE_VERSION = 3.8.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_LICENSE = BSD-3-Clause +PYTHON_FLIT_CORE_LICENSE_FILES = LICENSE PYTHON_FLIT_CORE_SETUP_TYPE = flit-bootstrap # Use flit built in bootstrap_install for installing host-python-flit-core. From 406698de03a9c9e4ded5a50070de2249398380ff Mon Sep 17 00:00:00 2001 From: Frank Vanbever Date: Fri, 10 Feb 2023 12:06:43 +0100 Subject: [PATCH 0863/5754] package/elixir: drop package Elixir was a dependency of rabbitmq-server which got dropped in 89815bad0a531d01ee2733dd9c17576a7647e1d9. It is a host package with no other users, hence it is no longer required. Additionally, newer versions require Erlang 23+. Signed-off-by: Frank Vanbever Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 - package/elixir/elixir.hash | 3 --- package/elixir/elixir.mk | 21 --------------------- 3 files changed, 25 deletions(-) delete mode 100644 package/elixir/elixir.hash delete mode 100644 package/elixir/elixir.mk diff --git a/DEVELOPERS b/DEVELOPERS index 32c6e54919..e8e0671709 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1089,7 +1089,6 @@ F: package/upx/ F: package/zxing-cpp/ N: Frank Vanbever -F: package/elixir/ F: package/libmodsecurity/ F: package/nginx-modsecurity/ diff --git a/package/elixir/elixir.hash b/package/elixir/elixir.hash deleted file mode 100644 index 6d083e72de..0000000000 --- a/package/elixir/elixir.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Computed locally -sha256 f3465d8a8e386f3e74831bf9594ee39e6dfde6aa430fe9260844cfe46aa10139 elixir-1.9.4.tar.gz -sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9 LICENSE diff --git a/package/elixir/elixir.mk b/package/elixir/elixir.mk deleted file mode 100644 index 6d935516f4..0000000000 --- a/package/elixir/elixir.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# elixir -# -################################################################################ - -ELIXIR_VERSION = 1.9.4 -ELIXIR_SITE = $(call github,elixir-lang,elixir,v$(ELIXIR_VERSION)) -ELIXIR_LICENSE = Apache-2.0 -ELIXIR_LICENSE_FILES = LICENSE -HOST_ELIXIR_DEPENDENCIES = host-erlang - -define HOST_ELIXIR_BUILD_CMDS - $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) compile -endef - -define HOST_ELIXIR_INSTALL_CMDS - $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) PREFIX="$(HOST_DIR)" -C $(@D) install -endef - -$(eval $(host-generic-package)) From 0f868e97f6b42ccaa0844880775f86002656227d Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Fri, 6 Jan 2023 12:11:41 +0100 Subject: [PATCH 0864/5754] package/gnupg2: bump to version 2.4.0 See announce: https://lists.gnupg.org/pipermail/gnupg-announce/2022q4/000477.html This commit also drop a patch which is now included in the new version. See: https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commitdiff;h=7011286ce6e1fb56c2989fdafbd11b931c489faa Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/gnupg2/0001-ks_ldap_free_state.patch | 21 -------------------- package/gnupg2/gnupg2.hash | 10 +++++----- package/gnupg2/gnupg2.mk | 2 +- 3 files changed, 6 insertions(+), 27 deletions(-) delete mode 100644 package/gnupg2/0001-ks_ldap_free_state.patch diff --git a/package/gnupg2/0001-ks_ldap_free_state.patch b/package/gnupg2/0001-ks_ldap_free_state.patch deleted file mode 100644 index fa55d27c04..0000000000 --- a/package/gnupg2/0001-ks_ldap_free_state.patch +++ /dev/null @@ -1,21 +0,0 @@ - -Fix undefined reference to `ks_ldap_free_state' if OpenLDAP is not -installed - -Backported from: 7011286ce6e1fb56c2989fdafbd11b931c489faa - -Signed-off-by: Michael Fischer - ---- a/dirmngr/server.c -+++ b/dirmngr/server.c -@@ -3137,8 +3137,10 @@ start_command_handler (assuan_fd_t fd, unsigned int session_id) - ctrl->refcount); - else - { -+#if USE_LDAP - ks_ldap_free_state (ctrl->ks_get_state); - ctrl->ks_get_state = NULL; -+#endif - release_ctrl_ocsp_certs (ctrl); - xfree (ctrl->server_local); - dirmngr_deinit_default_ctrl (ctrl); diff --git a/package/gnupg2/gnupg2.hash b/package/gnupg2/gnupg2.hash index f9c071ad45..c642862fe2 100644 --- a/package/gnupg2/gnupg2.hash +++ b/package/gnupg2/gnupg2.hash @@ -1,7 +1,7 @@ -# From https://lists.gnupg.org/pipermail/gnupg-announce/2022q4/000476.html -sha1 1f31b7b4c9c9adad97f94ea3acf1aa64c0424bcc gnupg-2.3.8.tar.bz2 +# From https://lists.gnupg.org/pipermail/gnupg-announce/2022q4/000477.html +sha1 63dde155a8df0d5e1987efa5fc17438beca83ac1 gnupg-2.4.0.tar.bz2 # Calculated based on the hash above and signature -# https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.3.8.tar.bz2.sig -# using key 6DAA6E64A76D2840571B4902528897B826403ADA and AC8E115BF73E2D8D47FA9908E98E9B2D19C6C8BD -sha256 540b7a40e57da261fb10ef521a282e0021532a80fd023e75fb71757e8a4969ed gnupg-2.3.8.tar.bz2 +# https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.4.0.tar.bz2.sig +# using key 6DAA6E64A76D2840571B4902528897B826403ADA +sha256 1d79158dd01d992431dd2e3facb89fdac97127f89784ea2cb610c600fb0c1483 gnupg-2.4.0.tar.bz2 sha256 bc2d6664f6276fa0a72d57633b3ae68dc7dcb677b71018bf08c8e93e509f1357 COPYING diff --git a/package/gnupg2/gnupg2.mk b/package/gnupg2/gnupg2.mk index 9dc29ca99e..5935ce6939 100644 --- a/package/gnupg2/gnupg2.mk +++ b/package/gnupg2/gnupg2.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNUPG2_VERSION = 2.3.8 +GNUPG2_VERSION = 2.4.0 GNUPG2_SOURCE = gnupg-$(GNUPG2_VERSION).tar.bz2 GNUPG2_SITE = https://gnupg.org/ftp/gcrypt/gnupg GNUPG2_LICENSE = GPL-3.0+ From f661c00342befb21c0032e593c758dfb2d336007 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Fri, 6 Jan 2023 22:01:33 +0100 Subject: [PATCH 0865/5754] package/gtest: drop patch adding debug 'd' to library names in pkg-config files - drop patch adding debug 'd' to gmock/gtest library names in pkg-config files (not longer needed since gtest version bump to 1.22 ([1]) and upstream commit 'FIX #2174 -- remove `DEBUG_POSTFIX`' ([2]). Fixes: http://autobuild.buildroot.net/results/5ea8f180e4909f8157565238b25f567fcf1f3beb .../host/opt/ext-toolchain/bin/../lib/gcc/aarch64-linux-gnu/7.3.1/../../../../aarch64-linux-gnu/bin/ld: cannot find -lgtestd [1] https://git.buildroot.net/buildroot/commit/?id=a336b731af5979a25213b33c5840de6d1ed88bdc [2] https://github.com/google/googletest/commit/ca3ffd90f2726f6c0c6e790f05c7c88491a16466 Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- ...test.pc-gmock.pc-library-names-for-t.patch | 62 ------------------- 1 file changed, 62 deletions(-) delete mode 100644 package/gtest/0001-pkg-config-fix-gtest.pc-gmock.pc-library-names-for-t.patch diff --git a/package/gtest/0001-pkg-config-fix-gtest.pc-gmock.pc-library-names-for-t.patch b/package/gtest/0001-pkg-config-fix-gtest.pc-gmock.pc-library-names-for-t.patch deleted file mode 100644 index c47e8fc8f8..0000000000 --- a/package/gtest/0001-pkg-config-fix-gtest.pc-gmock.pc-library-names-for-t.patch +++ /dev/null @@ -1,62 +0,0 @@ -From cf5a3177159ca832470e7f876cab0a1923fa666f Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Fri, 22 Oct 2021 20:17:36 +0200 -Subject: [PATCH] pkg-config: fix gtest.pc/gmock.pc library names for the debug - build - -In case CMAKE_BUILD_TYPE is set to Debug the gtest library is -name libgtestd.a but the link command returned from gtest.pc is -'-lgtest' (without the debug d) and so the linking of dependent -packages fails (see [1] for a buildroot failure example). - -Enhance the gtest.pc ang gmock.pc generation to honour the debug 'd'. - -[1] http://lists.busybox.net/pipermail/buildroot/2021-October/626382.html - -[Upstream: https://github.com/google/googletest/pull/3625] -Signed-off-by: Peter Seiderer ---- - googlemock/cmake/gmock.pc.in | 2 +- - googletest/cmake/gtest.pc.in | 2 +- - googletest/cmake/internal_utils.cmake | 3 +++ - 3 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/googlemock/cmake/gmock.pc.in b/googlemock/cmake/gmock.pc.in -index 23c67b5c..0f469857 100644 ---- a/googlemock/cmake/gmock.pc.in -+++ b/googlemock/cmake/gmock.pc.in -@@ -6,5 +6,5 @@ Description: GoogleMock (without main() function) - Version: @PROJECT_VERSION@ - URL: https://github.com/google/googletest - Requires: gtest = @PROJECT_VERSION@ --Libs: -L${libdir} -lgmock @CMAKE_THREAD_LIBS_INIT@ -+Libs: -L${libdir} -lgmock@DEBUG_POSTFIX@ @CMAKE_THREAD_LIBS_INIT@ - Cflags: -I${includedir} @GTEST_HAS_PTHREAD_MACRO@ -diff --git a/googletest/cmake/gtest.pc.in b/googletest/cmake/gtest.pc.in -index b4148fae..225bba81 100644 ---- a/googletest/cmake/gtest.pc.in -+++ b/googletest/cmake/gtest.pc.in -@@ -5,5 +5,5 @@ Name: gtest - Description: GoogleTest (without main() function) - Version: @PROJECT_VERSION@ - URL: https://github.com/google/googletest --Libs: -L${libdir} -lgtest @CMAKE_THREAD_LIBS_INIT@ -+Libs: -L${libdir} -lgtest@DEBUG_POSTFIX@ @CMAKE_THREAD_LIBS_INIT@ - Cflags: -I${includedir} @GTEST_HAS_PTHREAD_MACRO@ -diff --git a/googletest/cmake/internal_utils.cmake b/googletest/cmake/internal_utils.cmake -index 58fc9bfb..fd81b825 100644 ---- a/googletest/cmake/internal_utils.cmake -+++ b/googletest/cmake/internal_utils.cmake -@@ -335,6 +335,9 @@ function(install_project) - # Configure and install pkgconfig files. - foreach(t ${ARGN}) - set(configured_pc "${generated_dir}/${t}.pc") -+ if(CMAKE_BUILD_TYPE MATCHES Debug) -+ set(DEBUG_POSTFIX "d") -+ endif() - configure_file("${PROJECT_SOURCE_DIR}/cmake/${t}.pc.in" - "${configured_pc}" @ONLY) - install(FILES "${configured_pc}" --- -2.33.1 - From e738d5b7251918a62922f3f3b6491b642f9ec182 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Wed, 4 Jan 2023 01:21:10 +0100 Subject: [PATCH 0866/5754] configs/asus_tinker_rk3288: fix boot by prepending tpl to spl+u-boot During the last U-boot version bump it's not been noted that the TPL was not prepended to SPL anymore preventing the board to boot, so let's copy TPL to the image folder, prepend it to u-boot-spl-dtb.bin and place it at offset 32KB, where RK3288 bootrom expects to find it. Let's also place u-boot-dtb separated from SPL at offset 8M, where the SPL expects it to find it. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- board/asus/tinker/genimage.cfg | 11 +++++++++-- board/asus/tinker/post-build.sh | 4 ++-- configs/asus_tinker_rk3288_defconfig | 3 +-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/board/asus/tinker/genimage.cfg b/board/asus/tinker/genimage.cfg index a4b1e8d608..fa7fd734f2 100644 --- a/board/asus/tinker/genimage.cfg +++ b/board/asus/tinker/genimage.cfg @@ -2,12 +2,19 @@ image sdcard.img { hdimage { } - partition u-boot-spl-dtb { + partition u-boot-tpl-spl-dtb { in-partition-table = "no" - image = "u-boot-spl-dtb.img" + image = "u-boot-tpl-spl-dtb.img" offset = 32K } + partition u-boot-dtb { + in-partition-table = "no" + image = "u-boot-dtb.img" + offset = 8M + size = 30M + } + partition rootfs { partition-type = 0x83 image = "rootfs.ext4" diff --git a/board/asus/tinker/post-build.sh b/board/asus/tinker/post-build.sh index 8108ed83ff..ffbbcdeb58 100755 --- a/board/asus/tinker/post-build.sh +++ b/board/asus/tinker/post-build.sh @@ -3,7 +3,7 @@ MKIMAGE=$HOST_DIR/bin/mkimage BOARD_DIR="$(dirname $0)" -$MKIMAGE -n rk3288 -T rksd -d $BINARIES_DIR/u-boot-spl-dtb.bin $BINARIES_DIR/u-boot-spl-dtb.img -cat $BINARIES_DIR/u-boot-dtb.bin >> $BINARIES_DIR/u-boot-spl-dtb.img +$MKIMAGE -n rk3288 -T rksd -d $BINARIES_DIR/u-boot-tpl.bin $BINARIES_DIR/u-boot-tpl.img +cat $BINARIES_DIR/u-boot-tpl.img $BINARIES_DIR/u-boot-spl-dtb.bin > $BINARIES_DIR/u-boot-tpl-spl-dtb.img install -m 0644 -D $BOARD_DIR/extlinux.conf $TARGET_DIR/boot/extlinux/extlinux.conf diff --git a/configs/asus_tinker_rk3288_defconfig b/configs/asus_tinker_rk3288_defconfig index 6963fa939f..02b340a7f1 100644 --- a/configs/asus_tinker_rk3288_defconfig +++ b/configs/asus_tinker_rk3288_defconfig @@ -17,9 +17,8 @@ BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y -BR2_TARGET_UBOOT_FORMAT_DTB_BIN=y BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl-dtb.bin" +BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl-dtb.bin tpl/u-boot-tpl.bin" # Kernel BR2_LINUX_KERNEL=y From d4b46bc3c6997e32050b332d7578f0cb289b57be Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Wed, 4 Jan 2023 01:21:11 +0100 Subject: [PATCH 0867/5754] board/asus/tinker: rename label linux-next to linux in extlinux.conf We're not using next branch so let's rename label linux-next to linux. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- board/asus/tinker/extlinux.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/asus/tinker/extlinux.conf b/board/asus/tinker/extlinux.conf index 136af0debd..bb96ddb893 100644 --- a/board/asus/tinker/extlinux.conf +++ b/board/asus/tinker/extlinux.conf @@ -1,4 +1,4 @@ -label Tinker linux-next +label Tinker linux kernel /boot/uImage devicetree /boot/rk3288-tinker.dtb append console=ttyS2,115200n8 root=/dev/mmcblk0p1 rootwait From 0fdf20249574b64285979f109bef74eb9cdbf0db Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Wed, 4 Jan 2023 01:21:12 +0100 Subject: [PATCH 0868/5754] configs/asus_tinker_rk3288: bump Linux to 6.1.2 and U-boot to 2022.10 Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- configs/asus_tinker_rk3288_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/asus_tinker_rk3288_defconfig b/configs/asus_tinker_rk3288_defconfig index 02b340a7f1..40f4125880 100644 --- a/configs/asus_tinker_rk3288_defconfig +++ b/configs/asus_tinker_rk3288_defconfig @@ -3,14 +3,14 @@ BR2_arm=y BR2_cortex_a17=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 # Bootloader 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="2022.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="tinker-rk3288" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y @@ -23,7 +23,7 @@ BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl-dtb.bin tpl/u-boot-tpl.bin" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.2" BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x02000000" From 2d87d6281869d4023e0ff888b99cdd5bdf2a0326 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Wed, 4 Jan 2023 01:21:13 +0100 Subject: [PATCH 0869/5754] board/asus/tinker: add a note to readme.txt for power supply Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- board/asus/tinker/readme.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/board/asus/tinker/readme.txt b/board/asus/tinker/readme.txt index 7372d29520..110e2168c9 100644 --- a/board/asus/tinker/readme.txt +++ b/board/asus/tinker/readme.txt @@ -35,3 +35,9 @@ You can write this image directly to an SD card device (i.e. /dev/xxx): $ sudo sync Finally, you can insert the SD card to the Tinker RK3288 board and boot it. + +NOTE: +USB power supply requires more than the standard 500mA USB current, so +this board must be supplied from a capable port or from an external +AC/DC adapter. Otherwise it will hang forever while loading the kernel +image. From a82eec628c25f96a15ed7f1443923ff625e0d2bc Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Wed, 4 Jan 2023 23:20:07 +0100 Subject: [PATCH 0870/5754] support/testing/tests/package/test_gnupg2.py: new runtime test Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + support/testing/tests/package/test_gnupg2.py | 114 +++++++++++++++++++ 2 files changed, 115 insertions(+) create mode 100644 support/testing/tests/package/test_gnupg2.py diff --git a/DEVELOPERS b/DEVELOPERS index e8e0671709..0af1323340 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1708,6 +1708,7 @@ 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_gnupg2.py F: support/testing/tests/package/test_hwloc.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_gnupg2.py b/support/testing/tests/package/test_gnupg2.py new file mode 100644 index 0000000000..4505e1c339 --- /dev/null +++ b/support/testing/tests/package/test_gnupg2.py @@ -0,0 +1,114 @@ +import os + +import infra.basetest + + +class TestGnupg2(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_GNUPG2=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() + + # Some common data for all the tests + plain_data = "Some plain text data" + plain_file = "file.txt" + gpg_file = plain_file + ".gpg" + asc_file = plain_file + ".asc" + sig_file = plain_file + ".sig" + good_passphrase = "Good Passphrase" + gpg_userid = "br-test@buildroot" + + # Test the program can execute + self.assertRunOk("gpg --version") + + # Generate plain text data + cmd = "echo '{}' > {}".format(plain_data, plain_file) + self.assertRunOk(cmd) + + # Test symmetric encrypt + cmd = "gpg --batch --symmetric" + cmd += " --passphrase '{}' {}".format(good_passphrase, plain_file) + self.assertRunOk(cmd) + + # Test symmetric decrypt + cmd = "gpg --batch --decrypt" + cmd += " --passphrase '{}' {}".format(good_passphrase, gpg_file) + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + self.assertIn(plain_data, output) + + # Test a failed decrypt with a bad password + cmd = "gpg --batch --decrypt" + cmd += " --passphrase 'A-Bad-Password' {}".format(gpg_file) + _, exit_code = self.emulator.run(cmd) + self.assertNotEqual(exit_code, 0) + + # Test the generation of an asymmetric key + cmd = "gpg --batch --passphrase ''" + cmd += " --quick-generate-key {} default default".format(gpg_userid) + self.assertRunOk(cmd) + + # Test asymmetric encrypt+sign + cmd = "gpg --batch --yes --encrypt --sign" + cmd += " --recipient {} {}".format(gpg_userid, plain_file) + self.assertRunOk(cmd) + + # Test asymmetric decrypt+verify + cmd = "gpg --decrypt {}".format(gpg_file) + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + self.assertIn(plain_data, output) + self.assertRegex("\n".join(output), r'gpg: Good signature') + + # Test asymmetric armored encrypt+sign + cmd = "gpg --batch --yes --armor --encrypt --sign" + cmd += " --recipient {} {}".format(gpg_userid, plain_file) + self.assertRunOk(cmd) + + # Test asymmetric armored decrypt+verify + cmd = "gpg --armor --decrypt {}".format(asc_file) + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + self.assertIn(plain_data, output) + self.assertRegex("\n".join(output), r'gpg: Good signature') + + # Test detached signature + cmd = "gpg --batch --yes --detach-sign {}".format(plain_file) + self.assertRunOk(cmd) + + # Test detached signature verification + cmd = "gpg --verify {}".format(sig_file) + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + self.assertRegex("\n".join(output), r'gpg: Good signature') + + # Test detached armored signature + cmd = "gpg --batch --yes --armor --detach-sign {}".format(plain_file) + self.assertRunOk(cmd) + + # Test detached armored signature verification + cmd = "gpg --armor --verify {}".format(asc_file) + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + self.assertRegex("\n".join(output), r'gpg: Good signature') + + # Test the signature verification of a corrupted file actually fails + cmd = "echo 'CORRUPTED' >> {}".format(plain_file) + self.assertRunOk(cmd) + + cmd = "gpg --verify {}".format(sig_file) + _, exit_code = self.emulator.run(cmd) + self.assertNotEqual(exit_code, 0) + + cmd = "gpg --armor --verify {}".format(asc_file) + _, exit_code = self.emulator.run(cmd) + self.assertNotEqual(exit_code, 0) From d6e3d36a85f19acedd2ed58f5b8616dbf24f57a4 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Fri, 10 Feb 2023 19:47:04 +0100 Subject: [PATCH 0871/5754] package/ssdp-responder; drop systemd unit installation, not needed When systemd is enabled the ssdp-responder build system already installs the unit file, with the correct name, so we can safely drop this. This fixes the recurring autobuilder problems that cropped up the last week+ or so after fixing the spelling error in 6e0ba6b. - http://autobuild.buildroot.net/results/f6912d6f79155c5d12811beeb6cb43860e37e7e7 - http://autobuild.buildroot.net/results/7ee4ed26de7e45b52a9f6f36b839e578d2319247 - http://autobuild.buildroot.net/results/33d9c10ea58a7cd3b3e2ed75d586007a92ccdaf0 - http://autobuild.buildroot.net/results/f1238081fc94e3004aebb8e849fdd567a92a2d39 - http://autobuild.buildroot.net/results/f7f2cf790f51e6224dca258c52bd31d21d621074 Signed-off-by: Joachim Wiberg Signed-off-by: Thomas Petazzoni --- package/ssdp-responder/ssdp-responder.mk | 5 ----- 1 file changed, 5 deletions(-) diff --git a/package/ssdp-responder/ssdp-responder.mk b/package/ssdp-responder/ssdp-responder.mk index d40f6f8c57..5193966908 100644 --- a/package/ssdp-responder/ssdp-responder.mk +++ b/package/ssdp-responder/ssdp-responder.mk @@ -25,9 +25,4 @@ define SSDP_RESPONDER_INSTALL_INIT_SYSV $(TARGET_DIR)/etc/init.d/S50ssdpd endef -define SSDP_RESPONDER_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 $(@D)/ssdp-responder.service \ - $(TARGET_DIR)/usr/lib/systemd/system/ssdp-responder.service -endef - $(eval $(autotools-package)) From 0de216f95fc28c57cc430f39f011d5f88ead083b Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 25 Sep 2022 21:20:27 +0200 Subject: [PATCH 0872/5754] package/nodejs: add patch to adjust default NodeJS search path By default, NodeJS searches global modules in /usr/lib/node, but NPM installs them in /usr/lib/node_modules/. Therefore by default, if one installs modules with BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL, they are not accessible by NodeJS, unless by passing a NODE_PATH=/usr/lib/node_modules/ variable. Since this is not obvious, and it's nicer when things work out of the box, we simply patch NodeJS to look for modules at the right place. See https://stackoverflow.com/questions/15636367/nodejs-require-a-global-module-package for some discussions on this topic. Signed-off-by: Thomas Petazzoni Reviewed-by: Romain Naour Signed-off-by: Yann E. MORIN --- ...ules-cjs-loader.js-adjust-default-pa.patch | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 package/nodejs/0004-lib-internal-modules-cjs-loader.js-adjust-default-pa.patch diff --git a/package/nodejs/0004-lib-internal-modules-cjs-loader.js-adjust-default-pa.patch b/package/nodejs/0004-lib-internal-modules-cjs-loader.js-adjust-default-pa.patch new file mode 100644 index 0000000000..5b93998e5e --- /dev/null +++ b/package/nodejs/0004-lib-internal-modules-cjs-loader.js-adjust-default-pa.patch @@ -0,0 +1,36 @@ +From a31425bdfcb5d695ab25c3d295898326784cffec Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sun, 25 Sep 2022 11:10:06 +0200 +Subject: [PATCH] lib/internal/modules/cjs/loader.js: adjust default path to + search modules + +NPM installs modules in /usr/lib/node_modules/, but by default NodeJS +searches for them only in /usr/lib/node/. We could also set the +NODE_PATH environment variable, but it is more convienient to have +NodeJS configured by default to find modules where they are installed. + +This issue is discussed at +https://stackoverflow.com/questions/15636367/nodejs-require-a-global-module-package. + +Signed-off-by: Thomas Petazzoni +--- + lib/internal/modules/cjs/loader.js | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js +index f1971c40a4..5fe3884156 100644 +--- a/lib/internal/modules/cjs/loader.js ++++ b/lib/internal/modules/cjs/loader.js +@@ -1261,7 +1261,8 @@ Module._initPaths = function() { + path.resolve(process.execPath, '..') : + path.resolve(process.execPath, '..', '..'); + +- const paths = [path.resolve(prefixDir, 'lib', 'node')]; ++ const paths = [path.resolve(prefixDir, 'lib', 'node'), ++ path.resolve(prefixDir, 'lib', 'node_modules')]; + + if (homeDir) { + ArrayPrototypeUnshift(paths, path.resolve(homeDir, '.node_libraries')); +-- +2.37.3 + From f25b0b6d1dcc8580f6b880eb57872b5c4064b89f Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 25 Sep 2022 21:20:28 +0200 Subject: [PATCH 0873/5754] support/testing/tests: add NodeJS tests This commit adds two new test cases: - TestNodeJSBasic which builds a target configuration with just NodeJS enabled, and which runs a very simple NodeJS script on the target. - TestNodeJSModule, which builds a target configuration with NodeJS enabled + the installation of one extra module, which means npm on the host (from host-nodejs) is used, and which runs a very simple NodeJS script on the target that uses this extra module. Having both tests separately allows to validate that both nodejs-only and nodejs+host-nodejs configurations behave correctly, at least in minimal scenarios. Signed-off-by: Thomas Petazzoni Tested-by: Romain Naour Signed-off-by: Yann E. MORIN --- DEVELOPERS | 3 ++ .../tests/package/sample_nodejs_basic.js | 3 ++ .../tests/package/sample_nodejs_module.js | 7 +++ support/testing/tests/package/test_nodejs.py | 52 +++++++++++++++++++ 4 files changed, 65 insertions(+) create mode 100644 support/testing/tests/package/sample_nodejs_basic.js create mode 100644 support/testing/tests/package/sample_nodejs_module.js create mode 100644 support/testing/tests/package/test_nodejs.py diff --git a/DEVELOPERS b/DEVELOPERS index 0af1323340..ae698f87c5 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2944,11 +2944,14 @@ F: package/weston/ F: support/testing/tests/boot/test_grub.py F: support/testing/tests/boot/test_grub/ F: support/testing/tests/boot/test_syslinux.py +F: support/testing/tests/package/sample_nodejs_basic.js +F: support/testing/tests/package/sample_nodejs_module.js F: support/testing/tests/package/sample_python_augeas.py F: support/testing/tests/package/sample_python_flask.py F: support/testing/tests/package/sample_python_flask_expects_json.py F: support/testing/tests/package/sample_python_git.py F: support/testing/tests/package/sample_python_unittest_xml_reporting.py +F: support/testing/tests/package/test_nodejs.py F: support/testing/tests/package/test_python_augeas.py F: support/testing/tests/package/test_python_flask.py F: support/testing/tests/package/test_python_flask_expects_json.py diff --git a/support/testing/tests/package/sample_nodejs_basic.js b/support/testing/tests/package/sample_nodejs_basic.js new file mode 100644 index 0000000000..7633173c64 --- /dev/null +++ b/support/testing/tests/package/sample_nodejs_basic.js @@ -0,0 +1,3 @@ +var assert = require('assert'); +assert.strictEqual(1, 1); +console.log("Hello World"); diff --git a/support/testing/tests/package/sample_nodejs_module.js b/support/testing/tests/package/sample_nodejs_module.js new file mode 100644 index 0000000000..57aee73408 --- /dev/null +++ b/support/testing/tests/package/sample_nodejs_module.js @@ -0,0 +1,7 @@ +var assert = require('assert'); +var lodash = require('lodash'); +result = lodash.chunk(['a', 'b', 'c', 'd'], 2); +expected = [ [ 'a', 'b' ], [ 'c', 'd' ] ]; +assert.deepStrictEqual(result, expected) + + diff --git a/support/testing/tests/package/test_nodejs.py b/support/testing/tests/package/test_nodejs.py new file mode 100644 index 0000000000..9463c76b72 --- /dev/null +++ b/support/testing/tests/package/test_nodejs.py @@ -0,0 +1,52 @@ +import os + +import infra.basetest + + +class TestNodeJSBasic(infra.basetest.BRTest): + config = \ + """ + BR2_arm=y + BR2_cortex_a9=y + BR2_ARM_ENABLE_VFP=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_PACKAGE_NODEJS=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + 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_nodejs_basic.js")) + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv7", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + self.assertRunOk("node sample_nodejs_basic.js") + + +class TestNodeJSModule(infra.basetest.BRTest): + config = \ + """ + BR2_arm=y + BR2_cortex_a9=y + BR2_ARM_ENABLE_VFP=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_PACKAGE_NODEJS=y + BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL="lodash" + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + 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_nodejs_module.js")) + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv7", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + self.assertRunOk("node sample_nodejs_module.js") From 9d1b223b91b08acdb52611864ae5921b9f3c757b Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 11 Feb 2023 10:42:02 +0100 Subject: [PATCH 0874/5754] package/pkg-waf: add missing $ We want to have $(@D) expanded at the time the recipe is run, so like all other variables, we need to $$-expand it. Fixes: 1b4d7f6e13212b4c65ec2832681719fd960e75e6 Fixes: http://autobuild.buildroot.org/results/b6f/b6fd3a866af182edc7831492aecc8323f377b826 Signed-off-by: Romain Naour Cc: Yann E. MORIN Cc: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/pkg-waf.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-waf.mk b/package/pkg-waf.mk index 0e752072c8..c3e965bdf3 100644 --- a/package/pkg-waf.mk +++ b/package/pkg-waf.mk @@ -42,7 +42,7 @@ define inner-waf-package # otherwise waf errors out with: # Waf script 'X' and library 'Y' do not match define WAF_PACKAGE_REMOVE_WAF_LIB - $(RM) -fr $(@D)/waf $(@D)/waflib + $(RM) -fr $$(@D)/waf $$(@D)/waflib endef # We need host-python3 to run waf From 33107962eb29d2d33fcf4bed429d5239c1b2d278 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 11 Feb 2023 12:00:55 +0100 Subject: [PATCH 0875/5754] package/pkg-waf: add one more missing $ Further fix on top on 9d1b223b91b0 (package/pkg-waf: add missing $). Repeat after me: all variables in an inner-package macro must be expanded, except for: parameters, pkgdir, and pkgname. Signed-off-by: Yann E. MORIN --- package/pkg-waf.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-waf.mk b/package/pkg-waf.mk index c3e965bdf3..0529bb6dda 100644 --- a/package/pkg-waf.mk +++ b/package/pkg-waf.mk @@ -42,7 +42,7 @@ define inner-waf-package # otherwise waf errors out with: # Waf script 'X' and library 'Y' do not match define WAF_PACKAGE_REMOVE_WAF_LIB - $(RM) -fr $$(@D)/waf $$(@D)/waflib + $$(RM) -fr $$(@D)/waf $$(@D)/waflib endef # We need host-python3 to run waf From 2bf4d02ff35bd8a0d5aace354c987a166437db88 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Sat, 11 Feb 2023 12:41:08 +0100 Subject: [PATCH 0876/5754] configs/stm32f429_xip_defconfig: bump Linux version to 6.1.10 The size of xipImage has grown by 84KB but there are still 278KB left before running out of 2MB of flash memory. Signed-off-by: Dario Binacchi Signed-off-by: Yann E. MORIN --- configs/stm32f429_disco_xip_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/stm32f429_disco_xip_defconfig b/configs/stm32f429_disco_xip_defconfig index f9b3270ecd..872e4b6a30 100644 --- a/configs/stm32f429_disco_xip_defconfig +++ b/configs/stm32f429_disco_xip_defconfig @@ -1,12 +1,12 @@ BR2_arm=y BR2_cortex_m4=y -BR2_KERNEL_HEADERS_5_15=y +BR2_KERNEL_HEADERS_6_1=y # BR2_UCLIBC_INSTALL_UTILS is not set 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="5.15" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.10" 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 451672e890b5f605aa9ad7a386491a31397c737f Mon Sep 17 00:00:00 2001 From: James Kent Date: Wed, 8 Feb 2023 18:27:31 +0000 Subject: [PATCH 0877/5754] package/chrony: run as unprivileged user There are three ways to run chronyd: - start as root, and continue running as root; - start as root, then setuid() to a non-root user via either a command line option or a configuration directive; - start as root, and setuid() to a build-time specified non-root user. Currently, the first situation is used by Buildroot, which does not follow security best practices of dropping elevated privileges for daemon at runtime when that is possible. We switch to the third situation, where a compile-time default non-root user is then used at runtime to drop privileges, with libcap used to keep the capabilities required to call the appropriate syscalls to adjust the system time (typically, CAP_SYS_TIME to call adjtimex() or clock_settime() et al.). This means that libcap is now a mandatory dependency. To be noted: users who previously had configured their systems to run chronyd as non root, would have done so with either the command-line option (`-u`), or the configuration directive (`user`). Those take precedence over the compile-time default, so this should not break their systems (presumably, they also run as the `chrony` user). They would also have taken care to run chronyc as the appropriate user to manipulate chronyd at runtime via the UNIX socket. For those who were running chronyd as root, this does not change either: the functionality is unchanged, and they were running chronyc as root, which should still be capable of manipulating chronyd via its UNIX socket. Take that opportunity to brine chrony's Config.in to current coding style: enclose sub-option in an if-endif block. Signed-off-by: James Kent Signed-off-by: Yann E. MORIN --- package/chrony/Config.in | 6 +++++- package/chrony/chrony.mk | 11 +++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/package/chrony/Config.in b/package/chrony/Config.in index 158dc20530..c22b756c11 100644 --- a/package/chrony/Config.in +++ b/package/chrony/Config.in @@ -1,16 +1,20 @@ config BR2_PACKAGE_CHRONY bool "chrony" depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_LIBCAP help Chrony is a pair of programs which are used to maintain the accuracy of the system clock. http://chrony.tuxfamily.org/ +if BR2_PACKAGE_CHRONY + config BR2_PACKAGE_CHRONY_DEBUG_LOGGING bool "enable debug logging support" - depends on BR2_PACKAGE_CHRONY help Enable support for debug logging output from Chrony when enabled at runtime. If disabled, code for debug logging will not be compiled in. + +endif diff --git a/package/chrony/chrony.mk b/package/chrony/chrony.mk index 379e95a778..86f23d9060 100644 --- a/package/chrony/chrony.mk +++ b/package/chrony/chrony.mk @@ -10,20 +10,19 @@ CHRONY_LICENSE = GPL-2.0 CHRONY_LICENSE_FILES = COPYING CHRONY_CPE_ID_VENDOR = tuxfamily CHRONY_SELINUX_MODULES = chronyd -CHRONY_DEPENDENCIES = host-pkgconf +CHRONY_DEPENDENCIES = host-pkgconf libcap CHRONY_CONF_OPTS = \ --host-system=Linux \ --host-machine=$(BR2_ARCH) \ --prefix=/usr \ --without-tomcrypt \ + --with-user=chrony \ $(if $(BR2_PACKAGE_CHRONY_DEBUG_LOGGING),--enable-debug,--disable-debug) -ifeq ($(BR2_PACKAGE_LIBCAP),y) -CHRONY_DEPENDENCIES += libcap -else -CHRONY_CONF_OPTS += --without-libcap -endif +define CHRONY_USERS + chrony -1 chrony -1 * /run/chrony - - Time daemon +endef ifeq ($(BR2_PACKAGE_LIBNSS),y) CHRONY_DEPENDENCIES += libnss From a54bb2a2d99b835f672ae194dc4934757881e08b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 11 Feb 2023 19:22:00 +0100 Subject: [PATCH 0878/5754] package/php: bump version to 8.2.2 Release notes: https://news-web.php.net/php.announce/345 Changelog: https://www.php.net/ChangeLog-8.php#8.2.2 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 a9c3b7640b..869cb9b94f 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 650d3bd7a056cabf07f6a0f6f1dd8ba45cd369574bbeaa36de7d1ece212c17af php-8.2.1.tar.xz +sha256 bdc4aa38e652bac86039601840bae01c0c3653972eaa6f9f93d5f71953a7ee33 php-8.2.2.tar.xz # License file sha256 080d0d0cca64181ef8bf1df9fba0c6f0c485f78f79540c479a45b593bb3b33b5 LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index 372d55f68a..9ce153f4fa 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.2.1 +PHP_VERSION = 8.2.2 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From 9b9bea584c2f2c14122395eba7cdbf325ed7256c Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 11 Feb 2023 19:25:36 +0100 Subject: [PATCH 0879/5754] package/x11r7/xlib_libX11: bump version to 1.8.4 Release notes: https://lists.x.org/archives/xorg-announce/2023-February/003318.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 62b67ad544..ed68164d5f 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/2022-December/003305.html -sha256 e31565c84006b6b8e01dc9399c806085739710bc2db2e0930f1511ed9d6585bd libX11-1.8.3.tar.xz -sha512 bc862338fed855986659e9ffa641db6b36c3ac9abced590d1b164e3cc24446671936e3688cdca18393129c4ea41777977eeb37e87d8edc14d6cc5d194a9c0325 libX11-1.8.3.tar.xz +# 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 # Locally computed sha256 2e7012a140f000735a7172674a2d314398d79622444fba65d108b029b29ab283 COPYING diff --git a/package/x11r7/xlib_libX11/xlib_libX11.mk b/package/x11r7/xlib_libX11/xlib_libX11.mk index 3bb3fffce0..add16f49db 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.3 +XLIB_LIBX11_VERSION = 1.8.4 XLIB_LIBX11_SOURCE = libX11-$(XLIB_LIBX11_VERSION).tar.xz XLIB_LIBX11_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBX11_LICENSE = MIT From 5e1fdd144300106704e21176673e465163245669 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 11 Feb 2023 19:14:39 +0100 Subject: [PATCH 0880/5754] package/libdrm: bump version to 2.4.115 Release notes: https://lists.x.org/archives/xorg-announce/2023-February/003323.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- 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 387beadc3f..87cc170617 100644 --- a/package/libdrm/libdrm.hash +++ b/package/libdrm/libdrm.hash @@ -1,6 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2022-November/003250.html -sha256 3049cf843a47d12e5eeefbc3be3496d782fa09f42346bf0b7defe3d1e598d026 libdrm-2.4.114.tar.xz -sha512 8dcd4be5674e3ea2ab4394fa8f461914e5aa7f4f57a2f448c5216d84ee6682e16b45eafabf97b7d9f5c062183d9a6bf3f0c97499d4cb01c19807a51209a0f644 libdrm-2.4.114.tar.xz +# 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 # Hash for license file sha256 d0a616a9020dc0271e36e6dd4bad174b4e2c2a42636f13785f8e18dd5f85fd83 data/meson.build diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk index 56366b6c48..52ac13b7d0 100644 --- a/package/libdrm/libdrm.mk +++ b/package/libdrm/libdrm.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBDRM_VERSION = 2.4.114 +LIBDRM_VERSION = 2.4.115 LIBDRM_SOURCE = libdrm-$(LIBDRM_VERSION).tar.xz LIBDRM_SITE = https://dri.freedesktop.org/libdrm LIBDRM_LICENSE = MIT From d8f0c02574b485e3250030d8cbf5c057ced578a7 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 11 Feb 2023 19:31:42 +0100 Subject: [PATCH 0881/5754] package/x11r7/xserver_xorg-server: security bump version to 21.1.7 Release notes: https://lists.x.org/archives/xorg-announce/2023-February/003321.html Fixes CVE-2023-0494: https://lists.x.org/archives/xorg-announce/2023-February/003320.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 0c3c807ff3..e2a2a251c3 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/2022-December/003310.html -sha256 1eb86ed674d042b6c8b1f9135e59395cbbca35ed551b122f73a7d8bb3bb22484 xorg-server-21.1.6.tar.xz -sha512 5e3cf879facf3a04aa64b7f6129226ea68a97109a7daca5146b57b4c707cc76a4fbad1924997dd319efd8c8c20eb5bb59570a719101b76ae07e923b7e9656239 xorg-server-21.1.6.tar.xz +# 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 # 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 04eb5e90b7..33b35b7979 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.6 +XSERVER_XORG_SERVER_VERSION = 21.1.7 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 5be2d9bb621e3f3aa552516c8887a7821ed62788 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 10 Feb 2023 16:04:56 +0100 Subject: [PATCH 0882/5754] support/dependencies/dependencies.sh: require diagnostics perl package for mosh Fixes: http://autobuild.buildroot.net/results/820/820e98b1c126469b1f180f078d102ded43b9c40e/ scripts/Makefile.am of mosh-1.4.0 needs the perl diagnostics module on the host: make[3]: Entering directory '/home/buildroot/autobuild/instance-2/output-1/build/mosh-1.4.0/scripts' perl -Mdiagnostics -c ./mosh.pl Can't locate diagnostics.pm in @INC (you may need to install the diagnostics module) (@INC contains: /home/buildroot/autobuild/instance-2/output-1/host/lib/perl /usr/local/lib64/perl5/5.36 /usr/local/share/perl5/5.36 /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 /usr/share/perl5). BEGIN failed--compilation aborted. So add a check for it in dependencies.sh similar to the other perl modules. Signed-off-by: Peter Korsgaard --- support/dependencies/dependencies.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index cf6635bff6..4353e9585e 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -281,6 +281,10 @@ required_perl_modules="$required_perl_modules ExtUtils::MakeMaker" # Used by hos required_perl_modules="$required_perl_modules Thread::Queue" # Used by host-automake required_perl_modules="$required_perl_modules FindBin" # Used by (host-)libopenssl +if grep -q ^BR2_PACKAGE_MOSH=y $BR2_CONFIG ; then + required_perl_modules="$required_perl_modules diagnostics" +fi + if grep -q ^BR2_PACKAGE_MPV=y $BR2_CONFIG ; then required_perl_modules="$required_perl_modules Math::BigInt" required_perl_modules="$required_perl_modules Math::BigRat" From d758b054b496619999e03c60c63b6636d818f3e5 Mon Sep 17 00:00:00 2001 From: Michael Nosthoff Date: Thu, 9 Feb 2023 21:53:01 +0100 Subject: [PATCH 0883/5754] package/re2: bump to version 2023-02-01 Signed-off-by: Michael Nosthoff Signed-off-by: Peter Korsgaard --- package/re2/re2.hash | 2 +- package/re2/re2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/re2/re2.hash b/package/re2/re2.hash index 9019867db4..a39dece7a9 100644 --- a/package/re2/re2.hash +++ b/package/re2/re2.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 665b65b6668156db2b46dddd33405cd422bd611352c5052ab3dae6a5fbac5506 re2-2022-12-01.tar.gz +sha256 cbce8b7803e856827201a132862e41af386e7afd9cc6d9a9bc7a4fa4d8ddbdde re2-2023-02-01.tar.gz sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 LICENSE diff --git a/package/re2/re2.mk b/package/re2/re2.mk index 07bb9378de..5587366b1f 100644 --- a/package/re2/re2.mk +++ b/package/re2/re2.mk @@ -4,7 +4,7 @@ # ################################################################################ -RE2_VERSION = 2022-12-01 +RE2_VERSION = 2023-02-01 RE2_SITE = $(call github,google,re2,$(RE2_VERSION)) RE2_LICENSE = BSD-3-Clause RE2_LICENSE_FILES = LICENSE From a39116b5dba6cf0695620e2ba5302f21fa80a4a5 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Fri, 10 Feb 2023 23:31:42 +0100 Subject: [PATCH 0884/5754] support/download: catch post-process errors Fixes: http://autobuild.buildroot.net/results/12a/12a63ae177fe3ed0c9a1ef2fa01870f334f36b0f/ Currently, when the post-process helper fails while downloading from upstream, there is no fallback to the backup mirror. In case the post-process helper fails, we must consider that to be a download failure, so we must bail out as if the download backend itself did fail, but we fail to do so. Duplicate the logic we have for the download helper: if the post-process helper fails, remove the downloaded stuff, and continue on to the next URI, which will ultimately hit the backup mirror (if one has been configured). Reported-by: Peter Korsgaard Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- support/download/dl-wrapper | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/support/download/dl-wrapper b/support/download/dl-wrapper index 09a6ac1f1a..1e8d6058f6 100755 --- a/support/download/dl-wrapper +++ b/support/download/dl-wrapper @@ -138,9 +138,15 @@ main() { fi if [ -n "${post_process}" ] ; then - "${OLDPWD}/support/download/${post_process}-post-process" \ - -o "${tmpf}" \ - -n "${raw_base_name}" + if ! "${OLDPWD}/support/download/${post_process}-post-process" \ + -o "${tmpf}" \ + -n "${raw_base_name}" + then + # cd back to keep path coherence + cd "${OLDPWD}" + rm -rf "${tmpd}" + continue + fi fi # cd back to free the temp-dir, so we can remove it later From 59b2e826f2a6c1874c5d032d3a5852326028bc0e Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Fri, 10 Feb 2023 23:31:43 +0100 Subject: [PATCH 0885/5754] support/download: fix the cargo post-process in face of failed vendoring In commit 04154a651729 (support/download/cargo-post-process: cargo output for vendor config), we switched away from our hand-crafted cargo.toml mangling, to use cargo itself to update that file. In doing so, we enabled the shell pipefail option, so that we could catch cargo failures, while redirecting its output through tee to the cargo.toml. However, pipefail is overzealous, and will hit us even for pipes we do not want to globally fail, like the one that actually checks whether an archive is already vendored or not: if tar tf "${output}" | grep -q "^[^/]*/VENDOR" ; then ... with pipefail, the above may always fail: - if the tarball is already vendored, grep will exit on the first match because of -q (it only needs a single match to decide that its return code will be zero), so the | will get closed, and tar may get -EPIPE before it had a chance to finish listing the archive, and thus would terminate in error; - if the tarball is not vendored, grep will exit in error. It turns out that the tee was only added so that we could see the messages emitted by cargo, and still fill the cargo.tom with the output of cargo. But that's a bit overkill: the cargo messages are going to stderr, and the blurb to add to cargo.toml to stdout, so we just need to redirect stdout. Yes, we do not see what cargo added to cargo.toml, but that is not so interesting. Still, cargo ends its messages with a suggestion for the user to modify cargo.toml, with: To use vendored sources, add this to your .cargo/config.toml for this project: But since we've already redirected that to cargo.toml, there is nothing for the user to edit, so the above can get confusing. Emit a little blurb that states that everything is under control. And then we can drop pipefail. Note: the go-post-process initially had pipefail too, but it was dropped in bfd1a31d0e59 (support/download/go-post-process: drop -o pipefail) as it was causing spurious breakage when extracting the archive before vendoring, so it is only reasonable that we also remove it from the cargo-post-process. Reported-by: Peter Korsgaard Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Cc: Simon Richter Signed-off-by: Peter Korsgaard --- support/download/cargo-post-process | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/support/download/cargo-post-process b/support/download/cargo-post-process index aea2d8da7a..3f4666c006 100755 --- a/support/download/cargo-post-process +++ b/support/download/cargo-post-process @@ -1,7 +1,6 @@ #!/usr/bin/env bash set -e -set -o pipefail . "${0%/*}/helpers" @@ -31,7 +30,13 @@ flock "${CARGO_HOME}"/.br-lock \ cargo vendor \ --manifest-path ${BR_CARGO_MANIFEST_PATH-Cargo.toml} \ --locked VENDOR \ - | tee .cargo/config + > .cargo/config + +# "cargo vendor' outputs on stderr a message directing to add some data +# to the project's .cargo/config.toml, data that it outputs on stdout. +# Since we redirect stdout to .cargo/config.toml, the message on stderr +# gets confusing, so instruct the user that it's been handled. +printf '(note: .cargo/config.toml automatically updated by Buildroot)\n\n' popd > /dev/null From 99024eca8f154062ea88af985ff10e12ae7016b6 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Sun, 12 Feb 2023 14:00:32 +0100 Subject: [PATCH 0886/5754] package/libnss: bump version to 3.88.1 Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- 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 f847ec4f77..ec3fe0d777 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_87_RTM/src/SHA256SUMS -sha256 68a1894496d3d158babc75f8a5dda3f55b7c1560573936e3b101a10fa4ac152d nss-3.87.tar.gz +# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_88_1_RTM/src/SHA256SUMS +sha256 27d243edf87d1cf1bb9c861f03d387e0e9230ce5017f4308c941f558b54b3496 nss-3.88.1.tar.gz # Locally calculated sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index 90fd9259d5..ac342cf3af 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSS_VERSION = 3.87 +LIBNSS_VERSION = 3.88.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 1bb77eb8f14585bc79307fd672cab79b7e4e476d Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 12 Feb 2023 13:58:44 +0100 Subject: [PATCH 0887/5754] package/log4cplus: bump to version 2.1.0 https://github.com/log4cplus/log4cplus/blob/REL_2_1_0/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/log4cplus/log4cplus.hash | 2 +- package/log4cplus/log4cplus.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/log4cplus/log4cplus.hash b/package/log4cplus/log4cplus.hash index c4540c9d56..1779b30949 100644 --- a/package/log4cplus/log4cplus.hash +++ b/package/log4cplus/log4cplus.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 f5949e713cf8635fc554384ab99b04716e3430f28eed6dd7d71ad03d959b91a0 log4cplus-2.0.8.tar.xz +sha256 d84ac8b1c46645122fbf72691f8eacef68c71b587403ee833bd9a252e06d46cc log4cplus-2.1.0.tar.xz sha256 91d7e42ff80e74c4c94e5ad353375fa0358cd0abbf43f5fe957097cdbd4e2c4d LICENSE diff --git a/package/log4cplus/log4cplus.mk b/package/log4cplus/log4cplus.mk index 2dab661654..28eb4ed8f4 100644 --- a/package/log4cplus/log4cplus.mk +++ b/package/log4cplus/log4cplus.mk @@ -4,7 +4,7 @@ # ################################################################################ -LOG4CPLUS_VERSION = 2.0.8 +LOG4CPLUS_VERSION = 2.1.0 LOG4CPLUS_SOURCE = log4cplus-$(LOG4CPLUS_VERSION).tar.xz LOG4CPLUS_SITE = http://downloads.sourceforge.net/project/log4cplus/log4cplus-stable/$(LOG4CPLUS_VERSION) LOG4CPLUS_LICENSE = Apache-2.0, BSD-2-Clause, BSD-like (threadpool) From 6f33c8490fe8d110c13a1f28bd5a2063983002fd Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 12 Feb 2023 17:33:21 +0100 Subject: [PATCH 0888/5754] DEVELOPERS: reorder entries for Julien Olivain Entries for "gnupg2" and "test_python_hkdf.py" were not at the right position. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- DEVELOPERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index ae698f87c5..ece0d986ae 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1685,8 +1685,8 @@ F: configs/spike_riscv64_defconfig F: configs/zynq_qmtech_defconfig F: package/fluid-soundfont/ F: package/fluidsynth/ -F: package/gnupg2/ F: package/glslsandbox-player/ +F: package/gnupg2/ F: package/octave/ F: package/ola/ F: package/perftest/ @@ -1716,8 +1716,8 @@ F: support/testing/tests/package/test_ola.py F: support/testing/tests/package/test_ola/ F: support/testing/tests/package/test_perftest.py F: support/testing/tests/package/test_python_distro.py -F: support/testing/tests/package/test_python_hkdf.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_magic_wormhole.py F: support/testing/tests/package/test_python_pyalsa.py F: support/testing/tests/package/test_python_spake2.py From d0dc2fa3865b0dbb2a6c103d6bc3bbc294ada604 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 12 Feb 2023 17:33:22 +0100 Subject: [PATCH 0889/5754] DEVELOPERS: add Julien Olivain for z3 runtime test files 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 ece0d986ae..dcc607ba60 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1724,6 +1724,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_z3.py +F: support/testing/tests/package/test_z3/ N: Julien Viard de Galbert F: package/dieharder/ From 6dbf3909dd4816230001f0d71dd31d9e96939083 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 12 Feb 2023 16:09:19 +0100 Subject: [PATCH 0890/5754] package/zxing-cpp: update homepage Commit 456a7398316655ad0b669635f580e4887c24a700 decided to switch to an active fork but forgot to update homepage in Config.in Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/zxing-cpp/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/zxing-cpp/Config.in b/package/zxing-cpp/Config.in index 6c17565d2a..2550dcf023 100644 --- a/package/zxing-cpp/Config.in +++ b/package/zxing-cpp/Config.in @@ -13,4 +13,4 @@ config BR2_PACKAGE_ZXING_CPP implemented in Java, with ports to other languages. This compiles the C++ port. - https://github.com/glassechidna/zxing-cpp + https://github.com/zxing-cpp/zxing-cpp From 631d0289fe880952d9bedf37cc10b043c70c1482 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 12 Feb 2023 16:09:20 +0100 Subject: [PATCH 0891/5754] package/zxing-cpp: needs wchar wchar is mandatory since switch to an active fork in commit 456a7398316655ad0b669635f580e4887c24a700: In file included from /home/autobuild/autobuild/instance-13/output-1/build/zxing-cpp-1.4.0/core/src/Result.h:12, from /home/autobuild/autobuild/instance-13/output-1/build/zxing-cpp-1.4.0/core/src/GTIN.cpp:9: /home/autobuild/autobuild/instance-13/output-1/build/zxing-cpp-1.4.0/core/src/Content.h:40:14: error: 'wstring' in namespace 'std' does not name a type 40 | std::wstring render(bool withECI) const; | ^~~~~~~ Fixes: - http://autobuild.buildroot.org/results/4f97f1b291a99218f4706fce8b2934bd845755e1 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/gstreamer1/gst1-plugins-bad/Config.in | 6 ++++-- package/zxing-cpp/Config.in | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in index d477924eec..d2ef450d74 100644 --- a/package/gstreamer1/gst1-plugins-bad/Config.in +++ b/package/gstreamer1/gst1-plugins-bad/Config.in @@ -741,11 +741,13 @@ comment "zbar plugin needs a toolchain w/ threads, C++ and headers >= 3.0" config BR2_PACKAGE_GST1_PLUGINS_BAD_ZXING bool "zxing" depends on !BR2_STATIC_LIBS # zxing-cpp + depends on BR2_USE_WCHAR # zxing-cpp depends on BR2_INSTALL_LIBSTDCPP # zxing-cpp select BR2_PACKAGE_ZXING_CPP -comment "zxing plugin needs a toolchain w/ C++, dynamic library" - depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP +comment "zxing plugin needs a toolchain w/ C++, wchar, dynamic library" + depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || \ + !BR2_INSTALL_LIBSTDCPP endif diff --git a/package/zxing-cpp/Config.in b/package/zxing-cpp/Config.in index 2550dcf023..0d8b79538d 100644 --- a/package/zxing-cpp/Config.in +++ b/package/zxing-cpp/Config.in @@ -1,9 +1,11 @@ -comment "zxing-cpp needs a toolchain w/ C++, dynamic library" - depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS +comment "zxing-cpp needs a toolchain w/ C++, wchar, dynamic library" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ + BR2_STATIC_LIBS config BR2_PACKAGE_ZXING_CPP bool "zxing-cpp" depends on !BR2_STATIC_LIBS + depends on BR2_USE_WCHAR depends on BR2_INSTALL_LIBSTDCPP select BR2_PACKAGE_STB select BR2_PACKAGE_PYTHON_PYBIND if BR2_PACKAGE_PYTHON3 From d40cab45e21cd1c66bfffa911b1310e29c321486 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 12 Feb 2023 15:53:12 +0100 Subject: [PATCH 0892/5754] package/opencv3: bump to version 3.4.19 This bump will fix the following build failure with gcc >= 12: /home/thomas/autobuild/instance-1/output-1/build/opencv3-3.4.17/modules/core/src/persistence_base64.cpp: In function 'bool base64::base64_valid(const uint8_t*, size_t, size_t)': /home/thomas/autobuild/instance-1/output-1/build/opencv3-3.4.17/modules/core/src/persistence_base64.cpp:167:31: error: comparing the result of pointer addition '(src + ((sizetype)off))' and NULL [-Werror=address] 167 | if (src == 0 || src + off == 0) | ~~~~~~~~~~^~~~ cc1plus: some warnings being treated as errors Update hash of LICENSE file (update in year: https://github.com/opencv/opencv/commit/f6fe5c07f61eb0bc934672200b2bfd453f2fc41d) https://github.com/opencv/opencv/wiki/ChangeLog#version3419 Fixes: - http://autobuild.buildroot.org/results/cb9c120c15c8042e6919858d6885c1cc4d996c0c Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/opencv3/opencv3.hash | 4 ++-- package/opencv3/opencv3.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/opencv3/opencv3.hash b/package/opencv3/opencv3.hash index 30308188aa..3d6fd2ed8a 100644 --- a/package/opencv3/opencv3.hash +++ b/package/opencv3/opencv3.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1353eec67849aadb20df71d8bae18b83708e18fc5da080fe5efeabb1e99b2ee8 opencv3-3.4.17.tar.gz -sha256 9076d3d934839a2f8e7bfe549abda6faea4751f1edd6e9460ff703559890ad5f LICENSE +sha256 9b913e74299ce4416a5c94000da577c592bf670fd53bad16220eb115a0821529 opencv3-3.4.19.tar.gz +sha256 c1fed9cd2f557ba23a1b37a21e2c90629d1a60bdb61e92d0e79369bb6fca3390 LICENSE diff --git a/package/opencv3/opencv3.mk b/package/opencv3/opencv3.mk index 8e4c90786e..29fb246e65 100644 --- a/package/opencv3/opencv3.mk +++ b/package/opencv3/opencv3.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENCV3_VERSION = 3.4.17 +OPENCV3_VERSION = 3.4.19 OPENCV3_SITE = $(call github,opencv,opencv,$(OPENCV3_VERSION)) OPENCV3_INSTALL_STAGING = YES OPENCV3_LICENSE = BSD-3-Clause From 4706e04e3ca7428c755bffd79ddf8ef8628141e0 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 12 Feb 2023 15:43:15 +0100 Subject: [PATCH 0893/5754] package/libsolv: drop unrecognized variables Drop unrecognized variables: CMake Warning: Manually-specified variables were not used by the project: BUILD_DOC BUILD_DOCS BUILD_EXAMPLE BUILD_EXAMPLES BUILD_TEST BUILD_TESTING BUILD_TESTS CMAKE_CXX_COMPILER_FORCED DISABLE_STATIC ENABLE_SHARED Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libsolv/libsolv.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package/libsolv/libsolv.mk b/package/libsolv/libsolv.mk index 29f8a6a3d2..04fdb387fd 100644 --- a/package/libsolv/libsolv.mk +++ b/package/libsolv/libsolv.mk @@ -11,16 +11,15 @@ LIBSOLV_LICENSE_FILES = LICENSE.BSD LIBSOLV_CPE_ID_VENDOR = opensuse LIBSOLV_INSTALL_STAGING = YES LIBSOLV_DEPENDENCIES = zlib -LIBSOLV_CONF_OPTS = -DCMAKE_CXX_COMPILER_FORCED=ON ifeq ($(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS),y) LIBSOLV_CONF_OPTS += -DENABLE_STATIC=ON else -LIBSOLV_CONF_OPTS += -DDISABLE_STATIC=ON +LIBSOLV_CONF_OPTS += -DENABLE_STATIC=OFF endif ifeq ($(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),y) -LIBSOLV_CONF_OPTS += -DENABLE_SHARED=ON +LIBSOLV_CONF_OPTS += -DDISABLE_SHARED=OFF else LIBSOLV_CONF_OPTS += -DDISABLE_SHARED=ON endif From add76a41c3c68e649ecae69aa896d5f8b627d1be Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 12 Feb 2023 15:43:16 +0100 Subject: [PATCH 0894/5754] package/libsolv: fix build without C++ Fix the following build failure without C++ raised since the addition ot the package in commit 93ce3c1be0753189d6af3ee9968b935037519c25: CMake Error at CMakeLists.txt:1 (PROJECT): No CMAKE_CXX_COMPILER could be found. Tell CMake where to find the compiler by setting either the environment variable "CXX" or the CMake cache entry CMAKE_CXX_COMPILER to the full path to the compiler, or to the compiler name if it is in the PATH. Fixes: - http://autobuild.buildroot.org/results/a7f2176d40f156c319754ef5d3b7fd0decfe754f Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- .../libsolv/0001-Fix-build-without-C.patch | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 package/libsolv/0001-Fix-build-without-C.patch diff --git a/package/libsolv/0001-Fix-build-without-C.patch b/package/libsolv/0001-Fix-build-without-C.patch new file mode 100644 index 0000000000..2389aebcde --- /dev/null +++ b/package/libsolv/0001-Fix-build-without-C.patch @@ -0,0 +1,49 @@ +From 5691f58d1f8ce1332b02536e48f1ac5864629c6c Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 12 Feb 2023 15:27:27 +0100 +Subject: [PATCH] Fix build without C++ + +Fix the following build failure without C++: + +CMake Error at CMakeLists.txt:1 (PROJECT): + No CMAKE_CXX_COMPILER could be found. + + Tell CMake where to find the compiler by setting either the environment + variable "CXX" or the CMake cache entry CMAKE_CXX_COMPILER to the full path + to the compiler, or to the compiler name if it is in the PATH. + +Fixes: + - http://autobuild.buildroot.org/results/a7f2176d40f156c319754ef5d3b7fd0decfe754f + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/openSUSE/libsolv/pull/520] +--- + CMakeLists.txt | 2 +- + ext/CMakeLists.txt | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3541f496..f899c49a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-PROJECT (libsolv) ++PROJECT (libsolv C) + + CMAKE_MINIMUM_REQUIRED (VERSION 2.8.5) + +diff --git a/ext/CMakeLists.txt b/ext/CMakeLists.txt +index f01c0238..589fa946 100644 +--- a/ext/CMakeLists.txt ++++ b/ext/CMakeLists.txt +@@ -103,6 +103,7 @@ IF (ENABLE_CUDFREPO) + ENDIF (ENABLE_CUDFREPO) + + IF (ENABLE_HAIKU) ++ enable_language(CXX) + SET (libsolvext_SRCS ${libsolvext_SRCS} + repo_haiku.cpp) + SET (libsolvext_HEADERS ${libsolvext_HEADERS} +-- +2.39.0 + From 895686180fa73a23f2e4e9ee374618fa259a79ce Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 12 Feb 2023 13:44:21 +0100 Subject: [PATCH 0895/5754] package/zabbix: fix BR2_SHARED_STATIC_LIBS zabbix uses custom --enable-{static,shared} options, instead of standard libtool directives resulting in the following build failure with openssl or libcurl: configure:13132: /home/autobuild/autobuild/instance-6/output-1/host/bin/or1k-buildroot-linux-gnu-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Ofast -g0 -I/home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -rdynamic -static -L/home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/lib conftest.c -lssl -lcrypto -lm >&5 /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/10.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: /home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.a(dso_dlfcn.o): in function `dlfcn_globallookup': dso_dlfcn.c:(.text+0x2c): warning: Using 'dlopen' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/10.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: /home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.a(b_addr.o): in function `BIO_lookup_ex': b_addr.c:(.text+0x1128): warning: Using 'getaddrinfo' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/10.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: /home/autobuild/autobuild/instance-6/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/lib/libcrypto.a(b_sock.o): in function `BIO_gethostbyname': b_sock.c:(.text+0x90): warning: Using 'gethostbyname' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/10.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: /tmp/cceWHjDi.o: in function `main': conftest.c:(.text.startup+0x8): undefined reference to `SSL_connect' [...] configure: error: OpenSSL library libssl or libcrypto not found Signed-off-by: Yann E. MORIN --- package/zabbix/zabbix.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/zabbix/zabbix.mk b/package/zabbix/zabbix.mk index adc54028ad..e00d693ba5 100644 --- a/package/zabbix/zabbix.mk +++ b/package/zabbix/zabbix.mk @@ -125,6 +125,13 @@ endif endif # BR2_PACKAGE_ZABBIX_SERVER +# zabbix uses custom --enable-{static,shared} options, instead of +# standard libtool directives resulting in a build failure with libcurl +# or openssl. +ifeq ($(BR2_SHARED_STATIC_LIBS),y) +ZABBIX_CONF_OPTS += --disable-static +endif + define ZABBIX_INSTALL_INIT_SYSTEMD $(foreach unit,$(ZABBIX_SYSTEMD_UNITS),\ $(INSTALL) -D -m 0644 $(ZABBIX_PKGDIR)/$(unit) $(TARGET_DIR)/usr/lib/systemd/system/$(unit) && \ From a0c933adab99e1767bb673610b69de5eedf42c5a Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 12 Feb 2023 10:54:24 +0100 Subject: [PATCH 0896/5754] package/python-magic-wormhole-mailbox-server: add missing reverse dependency on host-rustc As reported by Yann in [1], Kconfig warns about an unmet dependency. The issue can be reproduced on master branch at commit 451672e, with the command: KCONFIG_SEED=0x1D15B9D4 make randconfig The patch adds the missing dependency. Fixes: WARNING: unmet direct dependencies detected for BR2_PACKAGE_PYTHON_AUTOBAHN Depends on [n]: BR2_PACKAGE_PYTHON3 [=y] && BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS [=n] Selected by [y]: - BR2_PACKAGE_PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER [=y] && BR2_PACKAGE_PYTHON3 [=y] [1] https://lists.buildroot.org/pipermail/buildroot/2023-February/661898.html Cc: Yann E. MORIN Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/python-magic-wormhole-mailbox-server/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-magic-wormhole-mailbox-server/Config.in b/package/python-magic-wormhole-mailbox-server/Config.in index db20d3e7b6..a0721e866f 100644 --- a/package/python-magic-wormhole-mailbox-server/Config.in +++ b/package/python-magic-wormhole-mailbox-server/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER bool "python-magic-wormhole-mailbox-server" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-autobahn -> python-cryptography select BR2_PACKAGE_PYTHON3_SQLITE # runtime select BR2_PACKAGE_PYTHON_ATTRS # runtime select BR2_PACKAGE_PYTHON_AUTOBAHN # runtime From 27f38e175346c09eed003e95daa0f065b43e27e4 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Sat, 11 Feb 2023 17:42:16 -0800 Subject: [PATCH 0897/5754] package/rtl8723ds: bump to 2023-02-11 version with new license file A COPYING file has been added to rtl8723ds as of the most recent commit. Update the version of the package and add the license file hash. Signed-off-by: Christian Stewart Signed-off-by: Yann E. MORIN --- package/rtl8723ds/rtl8723ds.hash | 3 ++- package/rtl8723ds/rtl8723ds.mk | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/package/rtl8723ds/rtl8723ds.hash b/package/rtl8723ds/rtl8723ds.hash index d5abf9913c..e94a7b40ef 100644 --- a/package/rtl8723ds/rtl8723ds.hash +++ b/package/rtl8723ds/rtl8723ds.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 97f3ebc5d977ba35d10c9c06e6817e4a00458727b651b56fc00c207c05a61995 rtl8723ds-a638cc8639015b8b9390af3350fab0366b6c87e7.tar.gz +sha256 672787c3f3d1f795b750cd74de8ca34bb661b8ae60f5aa50fb279ec08ff3f05f rtl8723ds-ec85dc6b9f72bfe413bff464ed01a272e29c8dbe.tar.gz +sha256 cd5c66af63b509ccd75ec85fee41b6e5cbb77cd6bf9392a54900acc0f02be4a6 COPYING diff --git a/package/rtl8723ds/rtl8723ds.mk b/package/rtl8723ds/rtl8723ds.mk index f303a24041..1bb164fa86 100644 --- a/package/rtl8723ds/rtl8723ds.mk +++ b/package/rtl8723ds/rtl8723ds.mk @@ -4,9 +4,10 @@ # ################################################################################ -RTL8723DS_VERSION = a638cc8639015b8b9390af3350fab0366b6c87e7 +RTL8723DS_VERSION = ec85dc6b9f72bfe413bff464ed01a272e29c8dbe RTL8723DS_SITE = $(call github,lwfinger,rtl8723ds,$(RTL8723DS_VERSION)) RTL8723DS_LICENSE = GPL-2.0 +RTL8723DS_LICENSE_FILES = COPYING RTL8723DS_USER_EXTRA_CLAGS = \ -DCONFIG_$(call qstrip,$(BR2_ENDIAN))_ENDIAN \ From 8f48b3983cdb32dfcd59e7e549c8eaa1503fe342 Mon Sep 17 00:00:00 2001 From: Francois Dugast Date: Sat, 11 Feb 2023 23:47:55 +0100 Subject: [PATCH 0898/5754] board/visionfive2: add link to documentation Add a link to RVspace Documentation Center, which did not exist when readme.txt was first submitted. It provides datasheet, quick start, schematics, and so on. Signed-off-by: Francois Dugast Signed-off-by: Yann E. MORIN --- board/visionfive2/readme.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/board/visionfive2/readme.txt b/board/visionfive2/readme.txt index 2da98f3847..1924cbc12b 100644 --- a/board/visionfive2/readme.txt +++ b/board/visionfive2/readme.txt @@ -4,6 +4,8 @@ Starfive VisionFive2 The VisionFive2 is a low-cost RISC-V 64-bit based platform, powered by a Starfive JH7110 processor. +https://doc-en.rvspace.org/Doc_Center/visionfive_2.html + How to build ============ From aa93d0cdd7adf1051cdb1643e978c81ae183327c Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 11 Feb 2023 19:37:15 +0100 Subject: [PATCH 0899/5754] package/x11r7/xapp_beforelight: bump version to 1.0.6 Release notes: https://lists.x.org/archives/xorg-announce/2023-January/003317.html The license file was previously a stub, but it now contains the proper license text since upstream commit: https://gitlab.freedesktop.org/xorg/app/beforelight/-/commit/fa1e473dd64673a36a73a01a84a8db61eaa425dc Switched tarball to xz, updated _SITE. Signed-off-by: Bernd Kuhls [yann.morin.1998@free.fr: properly explain the license hash change] Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_beforelight/xapp_beforelight.hash | 7 ++++--- package/x11r7/xapp_beforelight/xapp_beforelight.mk | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/package/x11r7/xapp_beforelight/xapp_beforelight.hash b/package/x11r7/xapp_beforelight/xapp_beforelight.hash index 00aff75779..f5b0cb21a4 100644 --- a/package/x11r7/xapp_beforelight/xapp_beforelight.hash +++ b/package/x11r7/xapp_beforelight/xapp_beforelight.hash @@ -1,4 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2013-January/002131.html -sha256 8fcab6f15148ca680c0d3da8de7dcb41f8e6a076f442cf8bdcf272be9e348166 beforelight-1.0.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-January/003317.html +sha256 53f0bf085b7272ebbf626d1b9b0ad320d1a07bc1fe7f3ae260c86a71a857ad28 beforelight-1.0.6.tar.xz +sha512 48a165d151676f6d213883bee98b34007403a77e025253c8649f9a0f5ea258b09381ab523a5e906030ac9fc8245fce2c6beaf9ad0f81116e302d51ad4a0fad5a beforelight-1.0.6.tar.xz # Locally computed -sha256 27d8cbdcde7a0bd062ce49cdf8c672201452a64e3e6823f09b1beffe2c4b8eff COPYING +sha256 3909739fae1ee37c3c7167a91f53d29317965aaf932813e16ef733f033619a7b COPYING diff --git a/package/x11r7/xapp_beforelight/xapp_beforelight.mk b/package/x11r7/xapp_beforelight/xapp_beforelight.mk index 7dcb715ef3..6b753833f7 100644 --- a/package/x11r7/xapp_beforelight/xapp_beforelight.mk +++ b/package/x11r7/xapp_beforelight/xapp_beforelight.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_BEFORELIGHT_VERSION = 1.0.5 -XAPP_BEFORELIGHT_SOURCE = beforelight-$(XAPP_BEFORELIGHT_VERSION).tar.bz2 -XAPP_BEFORELIGHT_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_BEFORELIGHT_VERSION = 1.0.6 +XAPP_BEFORELIGHT_SOURCE = beforelight-$(XAPP_BEFORELIGHT_VERSION).tar.xz +XAPP_BEFORELIGHT_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_BEFORELIGHT_LICENSE = MIT XAPP_BEFORELIGHT_LICENSE_FILES = COPYING XAPP_BEFORELIGHT_DEPENDENCIES = xlib_libX11 xlib_libXScrnSaver xlib_libXaw xlib_libXt From 888ac96e55c0c53bf5ada2f3f6d58e9e1179d91b Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Sun, 12 Feb 2023 21:53:34 +0100 Subject: [PATCH 0900/5754] package/cryptsetup: bump version to 2.6.1 Signed-off-by: Giulio Benetti Signed-off-by: Yann E. MORIN --- package/cryptsetup/cryptsetup.hash | 2 +- package/cryptsetup/cryptsetup.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/cryptsetup/cryptsetup.hash b/package/cryptsetup/cryptsetup.hash index 149d1e71f1..87cdf840c3 100644 --- a/package/cryptsetup/cryptsetup.hash +++ b/package/cryptsetup/cryptsetup.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/linux/utils/cryptsetup/v2.6/sha256sums.asc -sha256 44397ba76e75a9cde5b02177bc63cd7af428a785788e3a7067733e7761842735 cryptsetup-2.6.0.tar.xz +sha256 410ded65a1072ab9c8e41added37b9729c087fef4d2db02bb4ef529ad6da4693 cryptsetup-2.6.1.tar.xz sha256 45670cce8b6a0ddd66c8016cd8ccef6cd71f35717cbacc7f1e895b3855207b33 COPYING sha256 8c33cc37871654ec7ed87e6fbb896c8cf33ef5ef05b1611a5aed857596ffafa5 COPYING.LGPL diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk index 659fdfa2a4..3f3034475f 100644 --- a/package/cryptsetup/cryptsetup.mk +++ b/package/cryptsetup/cryptsetup.mk @@ -5,7 +5,7 @@ ################################################################################ CRYPTSETUP_VERSION_MAJOR = 2.6 -CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).0 +CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).1 CRYPTSETUP_SOURCE = cryptsetup-$(CRYPTSETUP_VERSION).tar.xz CRYPTSETUP_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/cryptsetup/v$(CRYPTSETUP_VERSION_MAJOR) CRYPTSETUP_DEPENDENCIES = \ From 89710c804ede6879db45c8e41aca3607bd2bb051 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 11 Feb 2023 19:28:38 +0100 Subject: [PATCH 0901/5754] package/x11r7/xapp_xvidtune: bump version to 1.0.4 Release notes: https://lists.x.org/archives/xorg-announce/2023-February/003319.html Switched tarball to xz, updated _SITE. Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/x11r7/xapp_xvidtune/xapp_xvidtune.hash | 5 +++-- package/x11r7/xapp_xvidtune/xapp_xvidtune.mk | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xapp_xvidtune/xapp_xvidtune.hash b/package/x11r7/xapp_xvidtune/xapp_xvidtune.hash index ecf7d0330b..0e7e231383 100644 --- a/package/x11r7/xapp_xvidtune/xapp_xvidtune.hash +++ b/package/x11r7/xapp_xvidtune/xapp_xvidtune.hash @@ -1,4 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2013-January/002129.html -sha256 24e5e103933a04bfb2e1d18562619ed74031ab515e7343eb546bacdbcbeecf01 xvidtune-1.0.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-February/003319.html +sha256 0d4eecd54e440cc11f1bdaaa23180fcf890f003444343f533f639086b05b2cc5 xvidtune-1.0.4.tar.xz +sha512 747d5358f4f7d3d7db508c3f034711ce4b9dd278160d35312e9c4d1604623e84a2438d039b536546fd2df7db8c5ea1907e8a6101985fad2932b6dee5a62c7b80 xvidtune-1.0.4.tar.xz # Locally computed sha256 f3da8eaed19e27e4f67e6f076d4ebdb8d649e15a8ad33a415fb65a23de1b6689 COPYING diff --git a/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk b/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk index d7c4d5bf56..cc40d39098 100644 --- a/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk +++ b/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XVIDTUNE_VERSION = 1.0.3 -XAPP_XVIDTUNE_SOURCE = xvidtune-$(XAPP_XVIDTUNE_VERSION).tar.bz2 -XAPP_XVIDTUNE_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XVIDTUNE_VERSION = 1.0.4 +XAPP_XVIDTUNE_SOURCE = xvidtune-$(XAPP_XVIDTUNE_VERSION).tar.xz +XAPP_XVIDTUNE_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XVIDTUNE_LICENSE = MIT XAPP_XVIDTUNE_LICENSE_FILES = COPYING XAPP_XVIDTUNE_DEPENDENCIES = xlib_libXaw xlib_libXxf86vm From 4733f9bd5774171b8309e5c42e0419a0e8264308 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Thu, 24 Nov 2022 23:05:51 +0100 Subject: [PATCH 0902/5754] package/highway: new package Highway is a C++ library that provides portable SIMD/vector intrinsics. https://github.com/google/highway Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 + package/Config.in | 1 + ...Check-for-the-presence-of-sys-auxv.h.patch | 62 +++++++++++++++++++ package/highway/Config.in | 34 ++++++++++ package/highway/highway.hash | 3 + package/highway/highway.mk | 50 +++++++++++++++ support/testing/tests/package/test_highway.py | 22 +++++++ 7 files changed, 174 insertions(+) create mode 100644 package/highway/0001-Check-for-the-presence-of-sys-auxv.h.patch create mode 100644 package/highway/Config.in create mode 100644 package/highway/highway.hash create mode 100644 package/highway/highway.mk create mode 100644 support/testing/tests/package/test_highway.py diff --git a/DEVELOPERS b/DEVELOPERS index dcc607ba60..28cad8f58f 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1687,6 +1687,7 @@ F: package/fluid-soundfont/ F: package/fluidsynth/ F: package/glslsandbox-player/ F: package/gnupg2/ +F: package/highway/ F: package/octave/ F: package/ola/ F: package/perftest/ @@ -1709,6 +1710,7 @@ 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_gnupg2.py +F: support/testing/tests/package/test_highway.py F: support/testing/tests/package/test_hwloc.py F: support/testing/tests/package/test_ncdu.py F: support/testing/tests/package/test_octave.py diff --git a/package/Config.in b/package/Config.in index 511e691ed3..d205bcd816 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2034,6 +2034,7 @@ menu "Other" source "package/gsl/Config.in" source "package/gtest/Config.in" source "package/gumbo-parser/Config.in" + source "package/highway/Config.in" source "package/jemalloc/Config.in" source "package/lapack/Config.in" source "package/libabseil-cpp/Config.in" 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 new file mode 100644 index 0000000000..df86798613 --- /dev/null +++ b/package/highway/0001-Check-for-the-presence-of-sys-auxv.h.patch @@ -0,0 +1,62 @@ +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/Config.in b/package/highway/Config.in new file mode 100644 index 0000000000..f4cef30e01 --- /dev/null +++ b/package/highway/Config.in @@ -0,0 +1,34 @@ +config BR2_PACKAGE_HIGHWAY + bool "highway" + depends on BR2_TOOLCHAIN_HAS_ATOMIC + depends on BR2_INSTALL_LIBSTDCPP + # For gcc bug 58969, see: + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58969 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++11, GCC_BUG_58969 + help + Highway is a C++ library that provides portable SIMD/vector + intrinsics. + + https://github.com/google/highway + +if BR2_PACKAGE_HIGHWAY + +config BR2_PACKAGE_HIGHWAY_CONTRIB + bool "Enable Contrib" + help + Build Highway contrib library which contains extra + SIMD-related utilities: an image class with aligned rows, a + math library (16 functions already implemented, mostly + trigonometry), and functions for computing dot products and + sorting. + +config BR2_PACKAGE_HIGHWAY_EXAMPLES + bool "Enable Examples" + help + Build Highway examples + +endif + +comment "highway needs a toolchain w/ C++, gcc >= 7" + depends on BR2_TOOLCHAIN_HAS_ATOMIC + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_7 diff --git a/package/highway/highway.hash b/package/highway/highway.hash new file mode 100644 index 0000000000..3ff468443e --- /dev/null +++ b/package/highway/highway.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 e8ef71236ac0d97f12d553ec1ffc5b6375d57b5f0b860c7447dd69b6ed1072db highway-1.0.2.tar.gz +sha256 43070e2d4e532684de521b885f385d0841030efa2b1a20bafb76133a5e1379c1 LICENSE diff --git a/package/highway/highway.mk b/package/highway/highway.mk new file mode 100644 index 0000000000..ed7f6ca871 --- /dev/null +++ b/package/highway/highway.mk @@ -0,0 +1,50 @@ +################################################################################ +# +# highway +# +################################################################################ + +HIGHWAY_VERSION = 1.0.2 +HIGHWAY_SITE = $(call github,google,highway,$(HIGHWAY_VERSION)) +HIGHWAY_LICENSE = Apache-2.0 +HIGHWAY_LICENSE_FILES = LICENSE +HIGHWAY_INSTALL_STAGING = YES + +HIGHWAY_CXXFLAGS = $(TARGET_CXXFLAGS) + +ifeq ($(BR2_PACKAGE_HIGHWAY_CONTRIB),y) +HIGHWAY_CONF_OPTS += -DHWY_ENABLE_CONTRIB=ON +else +HIGHWAY_CONF_OPTS += -DHWY_ENABLE_CONTRIB=OFF +endif + +ifeq ($(BR2_PACKAGE_HIGHWAY_EXAMPLES),y) +HIGHWAY_CONF_OPTS += -DHWY_ENABLE_EXAMPLES=ON +# Examples are not installed by cmake. This binary can be useful for +# quick testing and debug. +define HIGHWAY_INSTALL_EXAMPLES + $(INSTALL) -m 0755 \ + $(@D)/examples/hwy_benchmark \ + $(TARGET_DIR)/usr/bin/hwy_benchmark +endef +HIGHWAY_POST_INSTALL_TARGET_HOOKS += HIGHWAY_INSTALL_EXAMPLES +else +HIGHWAY_CONF_OPTS += -DHWY_ENABLE_EXAMPLES=OFF +endif + +ifeq ($(BR2_ARM_FPU_VFPV4),y) +HIGHWAY_CONF_OPTS += -DHWY_CMAKE_ARM7=ON +else +HIGHWAY_CONF_OPTS += -DHWY_CMAKE_ARM7=OFF +endif + +# Workaround for gcc bug 104028 on m68k. +# See: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104028 +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_104028),y) +HIGHWAY_CXXFLAGS += -O0 +endif + +HIGHWAY_CONF_OPTS += \ + -DCMAKE_CXX_FLAGS="$(HIGHWAY_CXXFLAGS)" + +$(eval $(cmake-package)) diff --git a/support/testing/tests/package/test_highway.py b/support/testing/tests/package/test_highway.py new file mode 100644 index 0000000000..f32363e26f --- /dev/null +++ b/support/testing/tests/package/test_highway.py @@ -0,0 +1,22 @@ +import os + +import infra.basetest + + +class TestHighway(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_HIGHWAY=y + BR2_PACKAGE_HIGHWAY_EXAMPLES=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("hwy_benchmark", timeout=20) From e648d399d8bd609697e78f13f7fa76be06d91a57 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Thu, 24 Nov 2022 23:05:52 +0100 Subject: [PATCH 0903/5754] package/libjxl: new package libjxl is the reference implementation of JPEG XL (encoder and decoder). https://github.com/libjxl/libjxl Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 + package/Config.in | 1 + package/libjxl/Config.in | 25 +++++++++ package/libjxl/libjxl.hash | 4 ++ package/libjxl/libjxl.mk | 33 ++++++++++++ support/testing/tests/package/test_libjxl.py | 53 ++++++++++++++++++++ toolchain/Config.in | 5 ++ 7 files changed, 123 insertions(+) create mode 100644 package/libjxl/Config.in create mode 100644 package/libjxl/libjxl.hash create mode 100644 package/libjxl/libjxl.mk create mode 100644 support/testing/tests/package/test_libjxl.py diff --git a/DEVELOPERS b/DEVELOPERS index 28cad8f58f..df2b98ad53 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1688,6 +1688,7 @@ F: package/fluidsynth/ F: package/glslsandbox-player/ F: package/gnupg2/ F: package/highway/ +F: package/libjxl/ F: package/octave/ F: package/ola/ F: package/perftest/ @@ -1712,6 +1713,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_libjxl.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/package/Config.in b/package/Config.in index d205bcd816..fff2fb7a93 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1603,6 +1603,7 @@ menu "Graphics" source "package/libgta/Config.in" source "package/libgtk2/Config.in" source "package/libgtk3/Config.in" + source "package/libjxl/Config.in" source "package/libmediaart/Config.in" source "package/libmng/Config.in" source "package/libpng/Config.in" diff --git a/package/libjxl/Config.in b/package/libjxl/Config.in new file mode 100644 index 0000000000..da04b89f9b --- /dev/null +++ b/package/libjxl/Config.in @@ -0,0 +1,25 @@ +config BR2_PACKAGE_LIBJXL + bool "libjxl" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # highway + depends on BR2_TOOLCHAIN_HAS_ATOMIC # highway + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_INSTALL_LIBSTDCPP # highway + # libjxl fail to link statically due to libatomic issue + depends on !BR2_STATIC_LIBS + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_81426 + select BR2_PACKAGE_BROTLI + select BR2_PACKAGE_HIGHWAY + select BR2_PACKAGE_LCMS2 + help + libjxl is the reference implementation of JPEG XL (encoder + and decoder). + + https://github.com/libjxl/libjxl + +comment "libjxl needs a toolchain with C++, threads, gcc >= 7, dynamic library" + depends on BR2_TOOLCHAIN_HAS_ATOMIC + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_81426 + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ + !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_HAS_THREADS || \ + BR2_STATIC_LIBS diff --git a/package/libjxl/libjxl.hash b/package/libjxl/libjxl.hash new file mode 100644 index 0000000000..e71d32e61d --- /dev/null +++ b/package/libjxl/libjxl.hash @@ -0,0 +1,4 @@ +# Locally computed: +sha256 3114bba1fabb36f6f4adc2632717209aa6f84077bc4e93b420e0d63fa0455c5e libjxl-0.7.0.tar.gz +sha256 8405932022a556380c2d8c272eff154a923feb197233f348ce5f7334fb0a5ede LICENSE +sha256 91915f8ae056a68a3c5bdf05d9f6f78bb6903e27a8ca3a8434c9e4ac87300575 PATENTS diff --git a/package/libjxl/libjxl.mk b/package/libjxl/libjxl.mk new file mode 100644 index 0000000000..cc24ba258c --- /dev/null +++ b/package/libjxl/libjxl.mk @@ -0,0 +1,33 @@ +################################################################################ +# +# libjxl +# +################################################################################ + +LIBJXL_VERSION = 0.7.0 +LIBJXL_SITE = $(call github,libjxl,libjxl,v$(LIBJXL_VERSION)) +LIBJXL_LICENSE = BSD-3-Clause +LIBJXL_LICENSE_FILES = LICENSE PATENTS +LIBJXL_CPE_ID_VENDOR = libjxl_project +LIBJXL_INSTALL_STAGING = YES + +LIBJXL_DEPENDENCIES = \ + brotli \ + lcms2 \ + highway + +ifeq ($(BR2_PACKAGE_LIBPNG),y) +LIBJXL_DEPENDENCIES += libpng +endif + +LIBJXL_CONF_OPTS = \ + -DJPEGXL_BUNDLE_LIBPNG=OFF \ + -DJPEGXL_BUNDLE_SKCMS=OFF \ + -DJPEGXL_ENABLE_DOXYGEN=OFF \ + -DJPEGXL_ENABLE_JNI=OFF \ + -DJPEGXL_ENABLE_MANPAGES=OFF \ + -DJPEGXL_ENABLE_OPENEXR=OFF \ + -DJPEGXL_ENABLE_SJPEG=OFF \ + -DJPEGXL_ENABLE_SKCMS=OFF + +$(eval $(cmake-package)) diff --git a/support/testing/tests/package/test_libjxl.py b/support/testing/tests/package/test_libjxl.py new file mode 100644 index 0000000000..b6d5ffc9ce --- /dev/null +++ b/support/testing/tests/package/test_libjxl.py @@ -0,0 +1,53 @@ +import os + +import infra.basetest + + +class TestLibJXL(infra.basetest.BRTest): + # infra.basetest.BASIC_TOOLCHAIN_CONFIG is not used as it is armv5 + # and the image encoding would take too long (several minutes). + # We also add GraphicsMagick to generate and compare images for + # the test. + 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="5.15.79" + 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_GRAPHICSMAGICK=y + BR2_PACKAGE_LIBJXL=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", "-m", "256M", "-initrd", img]) + self.emulator.login() + + ref = "/var/tmp/reference.ppm" + jxl = "/var/tmp/encoded.jxl" + dec = "/var/tmp/decoded.ppm" + + cmd = "gm convert IMAGE:LOGO {}".format(ref) + self.assertRunOk(cmd) + + cmd = "cjxl {} {}".format(ref, jxl) + self.assertRunOk(cmd, timeout=30) + + cmd = "djxl {} {}".format(jxl, dec) + self.assertRunOk(cmd) + + cmd = "gm compare -metric mse -maximum-error 1e-3 {} {}".format( + ref, dec) + self.assertRunOk(cmd) diff --git a/toolchain/Config.in b/toolchain/Config.in index 01215e0e96..08e4ccad9e 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -141,6 +141,11 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_68485 bool default y if BR2_microblaze +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81426 +config BR2_TOOLCHAIN_HAS_GCC_BUG_81426 + bool + default y if BR2_sh + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=83143 # Error: invalid operands (*UND* and .text sections) for `-' on sh4. # This bug no longer exists in gcc 10.x but reappeared on gcc 11.x and From 86a3bd33c2d52b2d3e014913857abaa7f24f428c Mon Sep 17 00:00:00 2001 From: Andreas Ziegler Date: Mon, 13 Feb 2023 10:26:11 +0100 Subject: [PATCH 0904/5754] package/mpd: update to version 0.23.12 List of changes: decoder::mad: fix integer underflow with very small files input::curl: require CURL 7.55.0 or later output::pipewire: adjust to PipeWire 0.3.64 API change tags:: fix crash bug due to race condition fix build failures with GCC 13 Change log: https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.23.12/NEWS Commit: https://github.com/MusicPlayerDaemon/MPD/commit/b1422fb Tested on: i386 (build) x86_64 (build, run) Aarch64 (build) 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 8c488d0357..2521238f64 100644 --- a/package/mpd/mpd.hash +++ b/package/mpd/mpd.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 edb4e7a8f9dff238b5610f9e2461940ea98c727a5462fafb1cdf836304dfdca9 mpd-0.23.11.tar.xz +sha256 b7fca62284ecc25a681ea6a07abc49200af5353be42cb5a31e3173be9d8702e7 mpd-0.23.12.tar.xz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index 449600eda2..6c25c9b46f 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).11 +MPD_VERSION = $(MPD_VERSION_MAJOR).12 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 36a8be4770d93c0a4346008c56f6ab6862b9b509 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 13 Feb 2023 12:58:09 +0100 Subject: [PATCH 0905/5754] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.1.x series 4.9.x / 6.0.x is now EOL. 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 774f1e0975..11dc5cce07 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.1.9" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.1.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 e88abe5bb8..f797d5a61a 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 d60cf185693c386e7acd9f3eb3a94ae30ffbfee0a9447a20e83711e0bdf5922b linux-6.1.9.tar.xz +sha256 581b0560077863c5116512c0b5fd93b97814092c80e6ebebabe88101949af7a1 linux-6.1.11.tar.xz sha256 abe37eb0e2e331bdc7c4110115664e180e7d43b7336de6b4cd2bd1b123d30207 linux-6.0.19.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 a63c2bb1beb15f1aea9c63cf80559f5b7ab58afd2da2fa5e7670c515ebe1fe80 linux-5.15.91.tar.xz -sha256 0051a1780e5bda0efc68dafab7c728b8283d2b028fedb439418f478be7d3e1af linux-5.10.166.tar.xz -sha256 a74fd32ccc1025b72f3ba7183208761f7c6190fb96e8f484f6d543a5a183e62f linux-5.4.230.tar.xz +sha256 e7ed24f2690bf0e11158ccfa8ddc5c0e8a4816d83c4055d205218853da9c5dad linux-5.15.93.tar.xz +sha256 d807f97812e566410cd13b3170009e0d7552748d4f22d608ffd4dbd7f85bf9c6 linux-5.10.167.tar.xz +sha256 8dd0ea7f1db4c1e89d485255798e3c3dfb9be63c0f2af369912a1a37b75f36a8 linux-5.4.231.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc sha256 5385aaec55c766e3f462511453f5c63d7898b2d0e9ea74f22a23ebbedab0b3c6 linux-4.9.337.tar.xz -sha256 64cbb234e46c196bc12bde74b233c7d3cb3b68d9c8ed48bf06715bd0f5c549d5 linux-4.14.304.tar.xz -sha256 636d3f9cb48eaf06df14e56bd9d57bfc7c1b5952a75b9f841d41a43b75829d1a linux-4.19.271.tar.xz +sha256 a35bcde16b13aa423a1822675775a1b0abf17f5392454febabd8c3757187959a linux-4.14.305.tar.xz +sha256 489fb9368bd7ab808264dea1a4acdf607f057bf1ba19f647a17aa18d08f313f9 linux-4.19.272.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 1146231e41..8a76f93d62 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -394,13 +394,13 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string default "4.9.337" if BR2_KERNEL_HEADERS_4_9 - default "4.14.304" if BR2_KERNEL_HEADERS_4_14 - default "4.19.271" if BR2_KERNEL_HEADERS_4_19 - default "5.4.230" if BR2_KERNEL_HEADERS_5_4 - default "5.10.166" if BR2_KERNEL_HEADERS_5_10 - default "5.15.91" if BR2_KERNEL_HEADERS_5_15 + default "4.14.305" if BR2_KERNEL_HEADERS_4_14 + default "4.19.272" if BR2_KERNEL_HEADERS_4_19 + default "5.4.231" if BR2_KERNEL_HEADERS_5_4 + default "5.10.167" if BR2_KERNEL_HEADERS_5_10 + default "5.15.93" if BR2_KERNEL_HEADERS_5_15 default "6.0.19" if BR2_KERNEL_HEADERS_6_0 - default "6.1.9" if BR2_KERNEL_HEADERS_6_1 + default "6.1.11" 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 6634710cdb12ec5b972c2c4068636dfd591cae4d Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 13 Feb 2023 12:58:10 +0100 Subject: [PATCH 0906/5754] package/linux-headers: drop 4.9.x option The 4.9.x series is now EOL upstream, so drop the linux-headers option and add legacy handling for it. Signed-off-by: Peter Korsgaard --- Config.in.legacy | 7 +++++++ linux/linux.hash | 1 - package/linux-headers/Config.in.host | 6 ------ 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 72deb03c35..e2dc854c78 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2023.02" +config BR2_KERNEL_HEADERS_4_9 + bool "kernel headers version 4.9.x are no longer supported" + select BR2_LEGACY + help + Version 4.9.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + config BR2_PACKAGE_DOCKER_PROXY bool "docker-proxy removed" select BR2_LEGACY diff --git a/linux/linux.hash b/linux/linux.hash index f797d5a61a..ae8b5e5f62 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -6,7 +6,6 @@ sha256 e7ed24f2690bf0e11158ccfa8ddc5c0e8a4816d83c4055d205218853da9c5dad linux- sha256 d807f97812e566410cd13b3170009e0d7552748d4f22d608ffd4dbd7f85bf9c6 linux-5.10.167.tar.xz sha256 8dd0ea7f1db4c1e89d485255798e3c3dfb9be63c0f2af369912a1a37b75f36a8 linux-5.4.231.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 5385aaec55c766e3f462511453f5c63d7898b2d0e9ea74f22a23ebbedab0b3c6 linux-4.9.337.tar.xz sha256 a35bcde16b13aa423a1822675775a1b0abf17f5392454febabd8c3757187959a linux-4.14.305.tar.xz sha256 489fb9368bd7ab808264dea1a4acdf607f057bf1ba19f647a17aa18d08f313f9 linux-4.19.272.tar.xz # Locally computed diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 8a76f93d62..6970090855 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -24,11 +24,6 @@ config BR2_KERNEL_HEADERS_AS_KERNEL depends on BR2_LINUX_KERNEL select BR2_KERNEL_HEADERS_LATEST if BR2_LINUX_KERNEL_LATEST_VERSION -config BR2_KERNEL_HEADERS_4_9 - bool "Linux 4.9.x kernel headers" - depends on !BR2_riscv - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 - config BR2_KERNEL_HEADERS_4_14 bool "Linux 4.14.x kernel headers" depends on !BR2_riscv @@ -393,7 +388,6 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.9.337" if BR2_KERNEL_HEADERS_4_9 default "4.14.305" if BR2_KERNEL_HEADERS_4_14 default "4.19.272" if BR2_KERNEL_HEADERS_4_19 default "5.4.231" if BR2_KERNEL_HEADERS_5_4 From e2b70aa9492517717f948f199e99f055a5c1dde1 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 13 Feb 2023 12:58:11 +0100 Subject: [PATCH 0907/5754] package/linux-headers: drop 6.0.x option The 6.0.x series is now EOL upstream, so drop the linux-headers option and add legacy handling for it. 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 e2dc854c78..7f69462f2e 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2023.02" +config BR2_KERNEL_HEADERS_6_0 + bool "kernel headers version 6.0.x are no longer supported" + select BR2_LEGACY + help + Version 6.0.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + config BR2_KERNEL_HEADERS_4_9 bool "kernel headers version 4.9.x are no longer supported" select BR2_LEGACY diff --git a/linux/linux.hash b/linux/linux.hash index ae8b5e5f62..52eb534b40 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 581b0560077863c5116512c0b5fd93b97814092c80e6ebebabe88101949af7a1 linux-6.1.11.tar.xz -sha256 abe37eb0e2e331bdc7c4110115664e180e7d43b7336de6b4cd2bd1b123d30207 linux-6.0.19.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc sha256 e7ed24f2690bf0e11158ccfa8ddc5c0e8a4816d83c4055d205218853da9c5dad linux-5.15.93.tar.xz sha256 d807f97812e566410cd13b3170009e0d7552748d4f22d608ffd4dbd7f85bf9c6 linux-5.10.167.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 6970090855..18c179ec8d 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -45,10 +45,6 @@ config BR2_KERNEL_HEADERS_5_15 bool "Linux 5.15.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 -config BR2_KERNEL_HEADERS_6_0 - bool "Linux 6.0.x kernel headers" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0 - config BR2_KERNEL_HEADERS_6_1 bool "Linux 6.1.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 @@ -393,7 +389,6 @@ config BR2_DEFAULT_KERNEL_HEADERS default "5.4.231" if BR2_KERNEL_HEADERS_5_4 default "5.10.167" if BR2_KERNEL_HEADERS_5_10 default "5.15.93" if BR2_KERNEL_HEADERS_5_15 - default "6.0.19" if BR2_KERNEL_HEADERS_6_0 default "6.1.11" if BR2_KERNEL_HEADERS_6_1 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL From 4231054b05436978795267330202f72be0d3a4d4 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 13 Feb 2023 19:13:32 +0100 Subject: [PATCH 0908/5754] package/apr-util: security bump to version 1.6.3 *) SECURITY: CVE-2022-25147 (cve.mitre.org) Integer Overflow or Wraparound vulnerability in apr_base64 functions of Apache Portable Runtime Utility (APR-util) allows an attacker to write beyond bounds of a buffer. https://downloads.apache.org/apr/Announcement-aprutil-1.x.html https://downloads.apache.org/apr/CHANGES-APR-UTIL-1.6 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/apr-util/apr-util.hash | 4 ++-- package/apr-util/apr-util.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/apr-util/apr-util.hash b/package/apr-util/apr-util.hash index 59ef590109..7e2793cd77 100644 --- a/package/apr-util/apr-util.hash +++ b/package/apr-util/apr-util.hash @@ -1,4 +1,4 @@ -# From http://www.apache.org/dist/apr/apr-util-1.6.1.tar.bz2.sha256 -sha256 d3e12f7b6ad12687572a3a39475545a072608f4ba03a6ce8a3778f607dd0035b apr-util-1.6.1.tar.bz2 +# From http://www.apache.org/dist/apr/apr-util-1.6.3.tar.bz2.sha256 +sha256 a41076e3710746326c3945042994ad9a4fcac0ce0277dd8fea076fec3c9772b5 apr-util-1.6.3.tar.bz2 # Locally calculated sha256 ef5609d18601645ad6fe22c6c122094be40e976725c1d0490778abacc836e7a2 LICENSE diff --git a/package/apr-util/apr-util.mk b/package/apr-util/apr-util.mk index fb0735f5e7..02b6d5e277 100644 --- a/package/apr-util/apr-util.mk +++ b/package/apr-util/apr-util.mk @@ -4,7 +4,7 @@ # ################################################################################ -APR_UTIL_VERSION = 1.6.1 +APR_UTIL_VERSION = 1.6.3 APR_UTIL_SOURCE = apr-util-$(APR_UTIL_VERSION).tar.bz2 APR_UTIL_SITE = https://archive.apache.org/dist/apr APR_UTIL_LICENSE = Apache-2.0 From 89fa774a191d41ed5d125d87d812ff3478902251 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 13 Feb 2023 19:15:23 +0100 Subject: [PATCH 0909/5754] package/zabbix: bump to version 6.2.7 - host-pkgconf is now mandatory - switch to pcre2 which is supported since version 6.0.0 and https://github.com/zabbix/zabbix/commit/18917f919a68abc863a5c79ba88c0cb156255fdc - Update hash of README (links updated with https://github.com/zabbix/zabbix/commit/067f5f873fb18ae7b22c5eaef40f0898b98edeb5 https://github.com/zabbix/zabbix/commit/499dbc81b987513233d579610335b8938f1ae91d) https://github.com/zabbix/zabbix/blob/6.2.7/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/zabbix/Config.in | 2 +- package/zabbix/zabbix.hash | 4 ++-- package/zabbix/zabbix.mk | 7 +++---- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/package/zabbix/Config.in b/package/zabbix/Config.in index 0f7a0b0003..377c0ff692 100644 --- a/package/zabbix/Config.in +++ b/package/zabbix/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_ZABBIX bool "zabbix" depends on BR2_TOOLCHAIN_USES_GLIBC - select BR2_PACKAGE_PCRE + select BR2_PACKAGE_PCRE2 help Zabbix is an enterprise-class open source distributed monitoring solution. Zabbix is free of cost. Zabbix is diff --git a/package/zabbix/zabbix.hash b/package/zabbix/zabbix.hash index 42cc0bda57..bb6127e5ec 100644 --- a/package/zabbix/zabbix.hash +++ b/package/zabbix/zabbix.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 19686628df76e8d5ef7c2ed2975b258c7ca3ec7d151b1bb59d7e132f9fc7c941 zabbix-5.4.9.tar.gz -sha256 10d68ec3abacc29222c07748fc5e5cb9474fd7cd9ccdde1b92ff941ded946b78 README +sha256 6d423810667b948ed22052d9aa84a035e2d4b92cbe8efdb669cac529806b722d zabbix-6.2.7.tar.gz +sha256 f8fc3fd12521b60d53d8c5d48a883eb3c9c5ddec9de986a273e1b77f69d811db README sha256 444fe54aecc95ac0f3314289c300afc73b3946a4dc9fbd7e022709b3e0924dd0 COPYING diff --git a/package/zabbix/zabbix.mk b/package/zabbix/zabbix.mk index e00d693ba5..db9efed78b 100644 --- a/package/zabbix/zabbix.mk +++ b/package/zabbix/zabbix.mk @@ -4,8 +4,8 @@ # ################################################################################ -ZABBIX_VERSION_MAJOR = 5.4 -ZABBIX_VERSION = $(ZABBIX_VERSION_MAJOR).9 +ZABBIX_VERSION_MAJOR = 6.2 +ZABBIX_VERSION = $(ZABBIX_VERSION_MAJOR).7 ZABBIX_SITE = https://cdn.zabbix.com/zabbix/sources/stable/$(ZABBIX_VERSION_MAJOR) ZABBIX_LICENSE = GPL-2.0+ ZABBIX_LICENSE_FILES = README COPYING @@ -13,9 +13,8 @@ ZABBIX_CPE_ID_VENDOR = zabbix # We're patching m4/netsnmp.m4 ZABBIX_AUTORECONF = YES -ZABBIX_DEPENDENCIES = pcre +ZABBIX_DEPENDENCIES = host-pkgconf pcre2 ZABBIX_CONF_OPTS = \ - --with-libpcre=$(STAGING_DIR)/usr/bin/ \ --without-sqlite3 \ --enable-agent \ --disable-agent2 \ From 3cd0132561ecfb471d76409f40aa565612f10208 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 13 Feb 2023 19:12:17 +0100 Subject: [PATCH 0910/5754] package/postgresql: fix legal info Commit 57e297a215193c92f6a178139db53616f2ee23b5 forgot to update hash of COPYRIGHT file (year updated with https://github.com/postgres/postgres/commit/1fbcb1360bc19b89369209203ea7cc19b8cde224) Fixes: - http://autobuild.buildroot.org/results/93f40dc71619745ddc6741598c9a488c81ea440f Signed-off-by: Fabrice Fontaine Reviewed-by: Maxim Kochetkov Signed-off-by: Peter Korsgaard --- package/postgresql/postgresql.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/postgresql/postgresql.hash b/package/postgresql/postgresql.hash index e6a9bd6658..3e89d3ec35 100644 --- a/package/postgresql/postgresql.hash +++ b/package/postgresql/postgresql.hash @@ -1,4 +1,4 @@ # From https://ftp.postgresql.org/pub/source/v15.2/postgresql-15.2.tar.bz2.sha256 sha256 99a2171fc3d6b5b5f56b757a7a3cb85d509a38e4273805def23941ed2b8468c7 postgresql-15.2.tar.bz2 # License file, Locally calculated -sha256 f6d6616acdb598742e2a7c64fa0551c1c72c309d279fd2d90370e5fdd41c8945 COPYRIGHT +sha256 1a7d13c3ab31961b91ba256f77d6e82e0b54bf992253060fe93bdb5466df416a COPYRIGHT From 38101cea6ed695901ec54e52ae3db528f5e19979 Mon Sep 17 00:00:00 2001 From: Heiko Thiery Date: Tue, 14 Feb 2023 10:04:25 +0100 Subject: [PATCH 0911/5754] package/dnsmasq: bump version to 2.89 Signed-off-by: Heiko Thiery Tested-by: Marcus Hoffmann Signed-off-by: Peter Korsgaard --- package/dnsmasq/dnsmasq.hash | 4 ++-- package/dnsmasq/dnsmasq.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/dnsmasq/dnsmasq.hash b/package/dnsmasq/dnsmasq.hash index fd015d38ac..02ffb2656b 100644 --- a/package/dnsmasq/dnsmasq.hash +++ b/package/dnsmasq/dnsmasq.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.88.tar.xz.asc -sha256 23544deda10340c053bea6f15a93fed6ea7f5aaa85316bfc671ffa6d22fbc1b3 dnsmasq-2.88.tar.xz +# https://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.89.tar.xz.asc +sha256 02bd230346cf0b9d5909f5e151df168b2707103785eb616b56685855adebb609 dnsmasq-2.89.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING-v3 diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk index 3945e4256a..58c5390433 100644 --- a/package/dnsmasq/dnsmasq.mk +++ b/package/dnsmasq/dnsmasq.mk @@ -4,7 +4,7 @@ # ################################################################################ -DNSMASQ_VERSION = 2.88 +DNSMASQ_VERSION = 2.89 DNSMASQ_SOURCE = dnsmasq-$(DNSMASQ_VERSION).tar.xz DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq DNSMASQ_MAKE_ENV = $(TARGET_MAKE_ENV) CC="$(TARGET_CC)" From 67eb00b807ddd168a9765e953405d03e18599fb5 Mon Sep 17 00:00:00 2001 From: Heiko Thiery Date: Tue, 14 Feb 2023 10:11:42 +0100 Subject: [PATCH 0912/5754] package/wireless-regdb: bump version to 2023.02.13 Signed-off-by: Heiko Thiery Signed-off-by: Peter Korsgaard --- 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 91fcb320d2..36451f839d 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 8828c25a4ee25020044004f57374bb9deac852809fad70f8d3d01770bf9ac97f wireless-regdb-2022.02.18.tar.xz +sha256 fe81e8a8694dc4753a45087a1c4c7e1b48dee5a59f5f796ce374ea550f0b2e73 wireless-regdb-2023.02.13.tar.xz # Locally computed sha256 678b0df753c86198fc496d1f1033429bbd57f101472132ee7eaaf9f5e0a7fae1 LICENSE diff --git a/package/wireless-regdb/wireless-regdb.mk b/package/wireless-regdb/wireless-regdb.mk index 35a8c6686d..68fbe35b8b 100644 --- a/package/wireless-regdb/wireless-regdb.mk +++ b/package/wireless-regdb/wireless-regdb.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRELESS_REGDB_VERSION = 2022.02.18 +WIRELESS_REGDB_VERSION = 2023.02.13 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 910aae1e23806fff74b16088c8975827e6664c2e Mon Sep 17 00:00:00 2001 From: Michael Fischer Date: Tue, 14 Feb 2023 10:05:35 +0100 Subject: [PATCH 0913/5754] package/sdl2: bump version to 2.26.3 Update the license hash because of a change in copyright year: - Copyright (C) 1997-2022 Sam Lantinga + Copyright (C) 1997-2023 Sam Lantinga Signed-off-by: Michael Fischer Signed-off-by: Peter Korsgaard --- package/sdl2/sdl2.hash | 6 +++--- package/sdl2/sdl2.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/sdl2/sdl2.hash b/package/sdl2/sdl2.hash index 86e0d86e7c..e26dcee301 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.2.tar.gz.sig -sha256 95d39bc3de037fbdfa722623737340648de4f180a601b0afad27645d150b99e0 SDL2-2.26.2.tar.gz +# 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 -sha256 fcb07e07ac6bc8b2fcf047b50431ef4ebe5b619d7ca7c82212018309a9067426 LICENSE.txt +sha256 9928507f684c1965d07f2b6ef4b4723d5efc2f6b4ab731f743a413c51c319927 LICENSE.txt diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk index 8995178e71..c01f12d12c 100644 --- a/package/sdl2/sdl2.mk +++ b/package/sdl2/sdl2.mk @@ -4,7 +4,7 @@ # ################################################################################ -SDL2_VERSION = 2.26.2 +SDL2_VERSION = 2.26.3 SDL2_SOURCE = SDL2-$(SDL2_VERSION).tar.gz SDL2_SITE = http://www.libsdl.org/release SDL2_LICENSE = Zlib From df50979e7bf0ff7f0b8a2461ed7ae9dbd103d836 Mon Sep 17 00:00:00 2001 From: Michael Fischer Date: Tue, 14 Feb 2023 10:34:14 +0100 Subject: [PATCH 0914/5754] package/gnuplot: bump version to 5.4.6 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 1ee6b53694..de0741d609 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.5/ -md5 c10cf81faa69d77e255a1dcfc625ba78 gnuplot-5.4.5.tar.gz -sha1 1179a768fd5f585a5dcb6aedea76cfa7a8dd5dfe gnuplot-5.4.5.tar.gz +# 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 # Locally computed -sha256 66f679115dd30559e110498fc94d926949d4d370b4999a042e724b8e910ee478 gnuplot-5.4.5.tar.gz +sha256 02fc27918200ed64d8f0c3b84fe81b95b59cd47ad99f270939ae497c19f27419 gnuplot-5.4.6.tar.gz sha256 895928ec0735cca1c8cec42656c7e314a065d0242813bb8693c0c1bf61fd4e4d Copyright diff --git a/package/gnuplot/gnuplot.mk b/package/gnuplot/gnuplot.mk index 1ee49cb6ce..c49fbc497d 100644 --- a/package/gnuplot/gnuplot.mk +++ b/package/gnuplot/gnuplot.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNUPLOT_VERSION = 5.4.5 +GNUPLOT_VERSION = 5.4.6 GNUPLOT_SITE = http://downloads.sourceforge.net/project/gnuplot/gnuplot/$(GNUPLOT_VERSION) GNUPLOT_LICENSE = gnuplot license (open source) GNUPLOT_LICENSE_FILES = Copyright From efdcc850be902de2596412dbf0f142c3f679ce35 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: Tue, 14 Feb 2023 18:51:29 +0300 Subject: [PATCH 0915/5754] package/libmdbx: bump version to 0.11.14 "Sergey Kapitsa" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is stable bugfix release of libmdbx, in memory of Sergey Kapitsa (Russian physicist and demographer) on his 95th birthday. It is reasonable to backport this patch to all applicable releases/branches of Buildroot, at least this release fixes build for sh4 arch. Release notes for v0.11.14 -------------------------- Fixes: - backport: Refined the `__cold`/`__hot` macros to avoid the `error: inlining failed in call to ‘always_inline FOO(...)’: target specific option mismatch` issue during build using GCC >10.x for SH4 arch. Actually this is GCC' SH4-backend bug which triggered by the `__attribute__((__optimize__("Os")))` used in conjunction with the `__attribute__((__cold__))`. - backport: Fixed `SIGSEGV` or an erroneous call to `free()` in case where errors occur when reopening by `mdbx_env_open()` of a previously used environment. - backport: Fixed `cursor_put_nochecklen()` internals for case when dupsort'ed named subDb contains a single key with multiple values (aka duplicates), which are replaced with a single value by put-operation with the `MDBX_UPSERT+MDBX_ALLDUPS` flags. In this case, the database becomes completely empty, without any pages. However exactly this condition was not considered and thus wasn't handled correctly. See [issue#8](https://gitflic.ru/project/erthink/libmdbx/issue/8) for more information. - backport: Fixed extra assertion inside `override_meta()`, which could lead to false-positive failing of the assertion in a debug builds during DB recovery and/or auto-rollback. Minors: - backport: Fixed typos. - backport: Refined `const` and `noexcept` for few C++ API methods. - backport: Resolve false-posirive `used uninitialized` warning from GCC >10.x while build for SH4 arch. - backport: Fixed insignificant typo of `||` inside `#if` byte-order condition. 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 e3fb309461..b1a2891b91 100644 --- a/package/libmdbx/libmdbx.hash +++ b/package/libmdbx/libmdbx.hash @@ -1,5 +1,5 @@ # Hashes from: https://libmdbx.dqdkfa.ru/release/SHA256SUMS -sha256 9449fd357119e19902363ab90134d82c9a713b706394c2a1389b5bb4787b5164 libmdbx-amalgamated-0.11.13.tar.xz +sha256 97b03965b5b61727dc4232c50ccb174c632470a3d24438b3c52315bef6fb4033 libmdbx-amalgamated-0.11.14.tar.xz # Locally calculated sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 LICENSE diff --git a/package/libmdbx/libmdbx.mk b/package/libmdbx/libmdbx.mk index a139e062f6..5e7995f8c8 100644 --- a/package/libmdbx/libmdbx.mk +++ b/package/libmdbx/libmdbx.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMDBX_VERSION = 0.11.13 +LIBMDBX_VERSION = 0.11.14 LIBMDBX_SOURCE = libmdbx-amalgamated-$(LIBMDBX_VERSION).tar.xz LIBMDBX_SITE = https://libmdbx.dqdkfa.ru/release LIBMDBX_SUPPORTS_IN_SOURCE_BUILD = NO From 98e0452ebb7cb25311d4f615e07df89a5776268b Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Tue, 14 Feb 2023 23:29:23 -0800 Subject: [PATCH 0916/5754] package/go: security bump to version 1.19.6 go1.19.6 (released 2023-02-14) includes security fixes to the crypto/tls, mime/multipart, net/http, and path/filepath packages, as well as bug fixes to the go command, the linker, the runtime, and the crypto/x509, net/http, and time packages. See the Go 1.19.6 milestone on the Go issue tracker for details. CVE-2022-41725: net/http, mime/multipart: denial of service from excessive resource consumption CVE-2022-41724: crypto/tls: large handshake records may cause panics CVE-2022-41723: net/http: avoid quadratic complexity in HPACK decoding https://go.dev/doc/devel/release#go1.19.minor 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 4c22f0f274..8254a91524 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://go.dev/dl -sha256 8e486e8e85a281fc5ce3f0bedc5b9d2dbf6276d7db0b25d3ec034f313da0375f go1.19.5.src.tar.gz +sha256 d7f0013f82e6d7f862cc6cb5c8cdb48eef5f2e239b35baa97e2f1a7466043767 go1.19.6.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index c38ae0b99c..a9056da47b 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.19.5 +GO_VERSION = 1.19.6 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz From 656af31891cc68eb8b27866cb9e9a7ca428a2b16 Mon Sep 17 00:00:00 2001 From: Thomas Devoogdt Date: Sat, 11 Feb 2023 19:25:43 +0100 Subject: [PATCH 0917/5754] package/fluent-bit: bump to version 2.0.9 - Release Notes: https://fluentbit.io/announcements/v2.0.9/ - Patch dropped, as it is upstream: https://github.com/fluent/fluent-bit/commit/7bcb502ebdcd647d6b83c972805e734ad522eb1a Signed-off-by: Thomas Devoogdt Signed-off-by: Peter Korsgaard --- ...eLists.txt-only-require-a-C-compiler.patch | 27 ------------------- package/fluent-bit/fluent-bit.hash | 2 +- package/fluent-bit/fluent-bit.mk | 2 +- 3 files changed, 2 insertions(+), 29 deletions(-) delete mode 100644 package/fluent-bit/0001-CMakeLists.txt-only-require-a-C-compiler.patch diff --git a/package/fluent-bit/0001-CMakeLists.txt-only-require-a-C-compiler.patch b/package/fluent-bit/0001-CMakeLists.txt-only-require-a-C-compiler.patch deleted file mode 100644 index e71bcf0c0d..0000000000 --- a/package/fluent-bit/0001-CMakeLists.txt-only-require-a-C-compiler.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 7bcb502ebdcd647d6b83c972805e734ad522eb1a Mon Sep 17 00:00:00 2001 -From: Thomas Devoogdt -Date: Mon, 30 Jan 2023 09:10:37 +0100 -Subject: [PATCH] CMakeLists.txt: only require a C compiler - -Fluent-bit is mostly written in C, -so don't require CXX in the top-level project. - -Signed-off-by: Thomas Devoogdt ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a7adb02de..3ff7360d8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,5 +1,5 @@ - cmake_minimum_required(VERSION 3.12) --project(fluent-bit) -+project(fluent-bit C) - - # CMP0069 ensures that LTO is enabled for all compilers - cmake_policy(SET CMP0069 NEW) --- -2.30.2 - diff --git a/package/fluent-bit/fluent-bit.hash b/package/fluent-bit/fluent-bit.hash index ce7cea7b59..0caadcd56f 100644 --- a/package/fluent-bit/fluent-bit.hash +++ b/package/fluent-bit/fluent-bit.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8ff5566389033669feabc9c69a5c6f417dad5c8b066454388e6a706507262acf fluent-bit-2.0.8.tar.gz +sha256 393ad4a6ced48c327607653d610ef273843085a17b6e5c8013877abdf31e6945 fluent-bit-2.0.9.tar.gz sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk index 13077e53cc..c10ef613d7 100644 --- a/package/fluent-bit/fluent-bit.mk +++ b/package/fluent-bit/fluent-bit.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLUENT_BIT_VERSION = 2.0.8 +FLUENT_BIT_VERSION = 2.0.9 FLUENT_BIT_SITE = $(call github,fluent,fluent-bit,v$(FLUENT_BIT_VERSION)) FLUENT_BIT_LICENSE = Apache-2.0 FLUENT_BIT_LICENSE_FILES = LICENSE From d649bcd3805a26cedb30120ebbdcf12f8fbf449f Mon Sep 17 00:00:00 2001 From: Thomas Devoogdt Date: Sat, 11 Feb 2023 19:25:44 +0100 Subject: [PATCH 0918/5754] package/fluent-bit: add support for non glibc toolchain - require threads and dynamic library support - require sync_4 support - provide fts.h through musl-fts static_assert is not available if no C++ toolchain or no glibc is used, so add two patches to fix this Signed-off-by: Thomas Devoogdt Signed-off-by: Peter Korsgaard --- .../0001-lib-cfl-fixup-static_assert.patch | 33 +++++++++++ .../0002-lib-c-ares-fixup-static_assert.patch | 56 +++++++++++++++++++ package/fluent-bit/Config.in | 10 +++- package/fluent-bit/fluent-bit.mk | 11 +++- 4 files changed, 105 insertions(+), 5 deletions(-) create mode 100644 package/fluent-bit/0001-lib-cfl-fixup-static_assert.patch create mode 100644 package/fluent-bit/0002-lib-c-ares-fixup-static_assert.patch diff --git a/package/fluent-bit/0001-lib-cfl-fixup-static_assert.patch b/package/fluent-bit/0001-lib-cfl-fixup-static_assert.patch new file mode 100644 index 0000000000..19dab7cac6 --- /dev/null +++ b/package/fluent-bit/0001-lib-cfl-fixup-static_assert.patch @@ -0,0 +1,33 @@ +From e4f825dd9e952f4a056bf89342049e67102ae6bb Mon Sep 17 00:00:00 2001 +From: Thomas Devoogdt +Date: Wed, 1 Feb 2023 11:38:15 +0100 +Subject: [PATCH] lib: cfl: fixup static_assert + +"undefined reference to 'static_assert'" + +Not defined when using uClibc or if not C++ >= 11. + +upstream: https://github.com/Cyan4973/xxHash/commit/6189ecd3d44a693460f86280ccf49d33cb4b18e1 + +Signed-off-by: Thomas Devoogdt +--- + lib/cfl/lib/xxhash/xxhash.h | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/lib/cfl/lib/xxhash/xxhash.h b/lib/cfl/lib/xxhash/xxhash.h +index 08ab79457..511c4d12b 100644 +--- a/lib/cfl/lib/xxhash/xxhash.h ++++ b/lib/cfl/lib/xxhash/xxhash.h +@@ -1546,8 +1546,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 +-- +2.34.1 + diff --git a/package/fluent-bit/0002-lib-c-ares-fixup-static_assert.patch b/package/fluent-bit/0002-lib-c-ares-fixup-static_assert.patch new file mode 100644 index 0000000000..d9b918ea8a --- /dev/null +++ b/package/fluent-bit/0002-lib-c-ares-fixup-static_assert.patch @@ -0,0 +1,56 @@ +From f55f9bf6d9201169d2e5d3782068b03ff17dec90 Mon Sep 17 00:00:00 2001 +From: Thomas Devoogdt +Date: Wed, 1 Feb 2023 11:26:56 +0100 +Subject: [PATCH] lib: c-ares: fixup static_assert + +"undefined reference to 'static_assert'" + +Not defined when using uClibc or if not C++ >= 11. + +upstream: https://github.com/c-ares/c-ares/issues/504 + +Signed-off-by: Thomas Devoogdt +--- + lib/c-ares-1.19.0/configure | 4 ++++ + lib/c-ares-1.19.0/m4/ax_cxx_compile_stdcxx_11.m4 | 3 +++ + 2 files changed, 7 insertions(+) + +diff --git a/lib/c-ares-1.19.0/configure b/lib/c-ares-1.19.0/configure +index 4c5e1a966..58712ec34 100755 +--- a/lib/c-ares-1.19.0/configure ++++ b/lib/c-ares-1.19.0/configure +@@ -6317,6 +6317,8 @@ else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + ++#define static_assert _Static_assert ++ + template + struct check + { +@@ -6394,6 +6396,8 @@ else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + ++#define static_assert _Static_assert ++ + template + struct check + { +diff --git a/lib/c-ares-1.19.0/m4/ax_cxx_compile_stdcxx_11.m4 b/lib/c-ares-1.19.0/m4/ax_cxx_compile_stdcxx_11.m4 +index 229de3091..fe4a11c67 100644 +--- a/lib/c-ares-1.19.0/m4/ax_cxx_compile_stdcxx_11.m4 ++++ b/lib/c-ares-1.19.0/m4/ax_cxx_compile_stdcxx_11.m4 +@@ -37,6 +37,9 @@ + #serial 9 + + m4_define([_AX_CXX_COMPILE_STDCXX_11_testbody], [[ ++ ++#define static_assert _Static_assert ++ + template + struct check + { +-- +2.34.1 + diff --git a/package/fluent-bit/Config.in b/package/fluent-bit/Config.in index 6c2299e695..f53eacb447 100644 --- a/package/fluent-bit/Config.in +++ b/package/fluent-bit/Config.in @@ -1,6 +1,9 @@ config BR2_PACKAGE_FLUENT_BIT bool "fluent-bit" - depends on BR2_TOOLCHAIN_USES_GLIBC + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_STATIC_LIBS # dlfcn.h + select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_LIBYAML help @@ -29,5 +32,6 @@ config BR2_PACKAGE_FLUENT_BIT_WASM endif -comment "fluent-bit needs a glibc toolchain" - depends on !BR2_TOOLCHAIN_USES_GLIBC +comment "fluent-bit needs a toolchain w/ threads, dynamic library" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk index c10ef613d7..4ecf813511 100644 --- a/package/fluent-bit/fluent-bit.mk +++ b/package/fluent-bit/fluent-bit.mk @@ -49,12 +49,19 @@ FLUENT_BIT_CONF_OPTS += \ -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -U_FILE_OFFSET_BITS" \ -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -U_FILE_OFFSET_BITS" +ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),) +FLUENT_BIT_DEPENDENCIES += musl-fts +FLUENT_BIT_LDFLAGS += -lfts +endif + # Uses __atomic_compare_exchange_8 ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -FLUENT_BIT_CONF_OPTS += \ - -DCMAKE_EXE_LINKER_FLAGS=-latomic +FLUENT_BIT_LDFLAGS += -latomic endif +FLUENT_BIT_CONF_OPTS += \ + -DCMAKE_EXE_LINKER_FLAGS="$(FLUENT_BIT_LDFLAGS)" + define FLUENT_BIT_INSTALL_INIT_SYSV $(INSTALL) -D -m 0755 package/fluent-bit/S99fluent-bit \ $(TARGET_DIR)/etc/init.d/S99fluent-bit From 5cbb458bd44778376ccdd5ffccc3e5fc5492766a Mon Sep 17 00:00:00 2001 From: Thomas Devoogdt Date: Sat, 11 Feb 2023 19:25:45 +0100 Subject: [PATCH 0919/5754] package/fluent-bit: fix builds on s390x architectures Fixes: - http://autobuild.buildroot.net/results/856fd250f75a696694c70e3208ffcef7470a7082 - http://autobuild.buildroot.net/results/dceb413fb5d459338417d8dd5a42d95aa23e849b Signed-off-by: Thomas Devoogdt Signed-off-by: Peter Korsgaard --- package/fluent-bit/fluent-bit.mk | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk index 4ecf813511..d618fdf1e2 100644 --- a/package/fluent-bit/fluent-bit.mk +++ b/package/fluent-bit/fluent-bit.mk @@ -12,6 +12,9 @@ FLUENT_BIT_CPE_ID_VENDOR = treasuredata FLUENT_BIT_CPE_ID_PRODUCT = fluent_bit FLUENT_BIT_DEPENDENCIES = host-bison host-flex libyaml openssl +FLUENT_BIT_CFLAGS = $(TARGET_CFLAGS) +FLUENT_BIT_CXXFLAGS = $(TARGET_CXXFLAGS) + FLUENT_BIT_CONF_OPTS += \ -DFLB_DEBUG=No \ -DFLB_RELEASE=Yes \ @@ -42,12 +45,16 @@ FLUENT_BIT_CONF_OPTS += \ FLUENT_BIT_CONF_OPTS += \ -DCMAKE_INSTALL_SYSCONFDIR="/etc/" +# Fix multiple definition of `mk_tls_*'. +# https://github.com/fluent/fluent-bit/issues/5537 +FLUENT_BIT_CFLAGS += -fcommon +FLUENT_BIT_CXXFLAGS += -fcommon + # Undefining _FILE_OFFSET_BITS here because of a "bug" with glibc fts.h # large file support. -# See https://bugzilla.redhat.com/show_bug.cgi?id=574992 for more information. -FLUENT_BIT_CONF_OPTS += \ - -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -U_FILE_OFFSET_BITS" \ - -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -U_FILE_OFFSET_BITS" +# https://bugzilla.redhat.com/show_bug.cgi?id=574992 +FLUENT_BIT_CFLAGS += -U_FILE_OFFSET_BITS +FLUENT_BIT_CXXFLAGS += -U_FILE_OFFSET_BITS ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),) FLUENT_BIT_DEPENDENCIES += musl-fts @@ -60,7 +67,9 @@ FLUENT_BIT_LDFLAGS += -latomic endif FLUENT_BIT_CONF_OPTS += \ - -DCMAKE_EXE_LINKER_FLAGS="$(FLUENT_BIT_LDFLAGS)" + -DCMAKE_EXE_LINKER_FLAGS="$(FLUENT_BIT_LDFLAGS)" \ + -DCMAKE_C_FLAGS="$(FLUENT_BIT_CFLAGS)" \ + -DCMAKE_CXX_FLAGS="$(FLUENT_BIT_CXXFLAGS)" define FLUENT_BIT_INSTALL_INIT_SYSV $(INSTALL) -D -m 0755 package/fluent-bit/S99fluent-bit \ From 740d923423f18d94d62e60d0efe8200c7bd889d6 Mon Sep 17 00:00:00 2001 From: Thomas Devoogdt Date: Sat, 11 Feb 2023 16:58:26 +0100 Subject: [PATCH 0920/5754] support/config-fragments: add a bootlin s390x toolchain I do constantly get mails that fluent-bit fails to build for s390x. So added this to ensure that the s390x architecture is checked as well if I manually do: $ ./utils/test-pkg -p fluent-bit -a Signed-off-by: Thomas Devoogdt Signed-off-by: Peter Korsgaard --- .../autobuild/bootlin-s390x-z13-glibc.config | 5 +++++ support/config-fragments/autobuild/toolchain-configs.csv | 1 + 2 files changed, 6 insertions(+) create mode 100644 support/config-fragments/autobuild/bootlin-s390x-z13-glibc.config diff --git a/support/config-fragments/autobuild/bootlin-s390x-z13-glibc.config b/support/config-fragments/autobuild/bootlin-s390x-z13-glibc.config new file mode 100644 index 0000000000..fe3f0380c9 --- /dev/null +++ b/support/config-fragments/autobuild/bootlin-s390x-z13-glibc.config @@ -0,0 +1,5 @@ +BR2_s390x=y +BR2_s390x_z13=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_S390X_Z13_GLIBC_BLEEDING_EDGE=y diff --git a/support/config-fragments/autobuild/toolchain-configs.csv b/support/config-fragments/autobuild/toolchain-configs.csv index 0b19051543..a65e9bacc3 100644 --- a/support/config-fragments/autobuild/toolchain-configs.csv +++ b/support/config-fragments/autobuild/toolchain-configs.csv @@ -38,6 +38,7 @@ support/config-fragments/autobuild/bootlin-powerpc-e500mc-uclibc.config,x86_64 support/config-fragments/autobuild/bootlin-riscv32-glibc.config,x86_64 support/config-fragments/autobuild/bootlin-riscv64-glibc.config,x86_64 support/config-fragments/autobuild/bootlin-riscv64-musl.config,x86_64 +support/config-fragments/autobuild/bootlin-s390x-z13-glibc.config,x86_64 support/config-fragments/autobuild/bootlin-sh4-uclibc.config,x86_64 support/config-fragments/autobuild/bootlin-sparc-uclibc.config,x86_64 support/config-fragments/autobuild/bootlin-sparc64-glibc.config,x86_64 From 69284602e6b93b069b8c99bd2499aef97bc09d47 Mon Sep 17 00:00:00 2001 From: Heiko Thiery Date: Mon, 13 Feb 2023 19:19:43 +0100 Subject: [PATCH 0921/5754] package/libyang: bump version to 2.1.30 Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- package/libyang/libyang.hash | 2 +- package/libyang/libyang.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libyang/libyang.hash b/package/libyang/libyang.hash index da8600351b..26a28d6eed 100644 --- a/package/libyang/libyang.hash +++ b/package/libyang/libyang.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f30ee1c3e13f0c5d25c4d2fb628e4b262b483d0a500464a7c12008ccc393a69e libyang-2.1.4.tar.gz +sha256 761cfd959342b147f6a43a84c931c7fde68dd3a1ad540a0e5302288b204f073d libyang-2.1.30.tar.gz sha256 0b7ec43747d211a1e49c53588b0822062947bab6bdcc95238578beab34cba5bb LICENSE diff --git a/package/libyang/libyang.mk b/package/libyang/libyang.mk index 6c57a2dd42..f160035c09 100644 --- a/package/libyang/libyang.mk +++ b/package/libyang/libyang.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBYANG_VERSION = 2.1.4 +LIBYANG_VERSION = 2.1.30 LIBYANG_SITE = $(call github,CESNET,libyang,v$(LIBYANG_VERSION)) LIBYANG_LICENSE = BSD-3-Clause LIBYANG_LICENSE_FILES = LICENSE From d22988bfbdca479b18cce6a60b7d51b59e125a6d Mon Sep 17 00:00:00 2001 From: Heiko Thiery Date: Mon, 13 Feb 2023 19:19:45 +0100 Subject: [PATCH 0922/5754] package/libnetconf2: bump version to 2.1.28 Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- package/libnetconf2/libnetconf2.hash | 2 +- package/libnetconf2/libnetconf2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libnetconf2/libnetconf2.hash b/package/libnetconf2/libnetconf2.hash index 34e934089e..675c76a500 100644 --- a/package/libnetconf2/libnetconf2.hash +++ b/package/libnetconf2/libnetconf2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2f1a6559e8e43ea18ea337ab5f194f8443695c7ab4dde5d7b2560603f9bf702a libnetconf2-2.1.25.tar.gz +sha256 72e9a6461fadbd22f0cf0d23ba68d62b297c8f564f7f2bee069748fb67fc3a24 libnetconf2-2.1.28.tar.gz sha256 bd962ab457c8a8cb8faaaa36c11484680f3c9a47dbc336507817ae8935384064 LICENSE diff --git a/package/libnetconf2/libnetconf2.mk b/package/libnetconf2/libnetconf2.mk index 0d4294d8d3..e349c1bce4 100644 --- a/package/libnetconf2/libnetconf2.mk +++ b/package/libnetconf2/libnetconf2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNETCONF2_VERSION = 2.1.25 +LIBNETCONF2_VERSION = 2.1.28 LIBNETCONF2_SITE = $(call github,CESNET,libnetconf2,v$(LIBNETCONF2_VERSION)) LIBNETCONF2_INSTALL_STAGING = YES LIBNETCONF2_LICENSE = BSD-3-Clause From 8972b7ec25c0c053eb62ce7ea445830b8aac394f Mon Sep 17 00:00:00 2001 From: Heiko Thiery Date: Mon, 13 Feb 2023 19:19:47 +0100 Subject: [PATCH 0923/5754] package/sysrepo: bump version to 2.2.36 Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- package/sysrepo/sysrepo.hash | 2 +- package/sysrepo/sysrepo.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/sysrepo/sysrepo.hash b/package/sysrepo/sysrepo.hash index a90d8259bf..6a5e98f41b 100644 --- a/package/sysrepo/sysrepo.hash +++ b/package/sysrepo/sysrepo.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1bc866f13e41ba5e7e4acd52b5c3d42b1a2a1e032775e0a9b094f3265844cd25 sysrepo-2.2.12.tar.gz +sha256 bebb7901682eb23bf4c73d086d0a45c124ec751a67793a66024f1d4203425730 sysrepo-2.2.36.tar.gz sha256 88f1b7e5c64d2c113e07105aa9c0fb80639b40287565be1c2afd0949df83d826 LICENSE diff --git a/package/sysrepo/sysrepo.mk b/package/sysrepo/sysrepo.mk index 9da8c22ca2..6b031ae6f9 100644 --- a/package/sysrepo/sysrepo.mk +++ b/package/sysrepo/sysrepo.mk @@ -4,7 +4,7 @@ # ################################################################################ -SYSREPO_VERSION = 2.2.12 +SYSREPO_VERSION = 2.2.36 SYSREPO_SITE = $(call github,sysrepo,sysrepo,v$(SYSREPO_VERSION)) SYSREPO_INSTALL_STAGING = YES SYSREPO_LICENSE = BSD-3-Clause From 4cc59b5cb397ee79d1a8152540eec512354b1825 Mon Sep 17 00:00:00 2001 From: Heiko Thiery Date: Mon, 13 Feb 2023 19:19:49 +0100 Subject: [PATCH 0924/5754] package/netopeer2: bump version to 2.1.49 Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- package/netopeer2/netopeer2.hash | 2 +- package/netopeer2/netopeer2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/netopeer2/netopeer2.hash b/package/netopeer2/netopeer2.hash index cc71a2dab8..6a278fbbaf 100644 --- a/package/netopeer2/netopeer2.hash +++ b/package/netopeer2/netopeer2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b166fe3425bb55b5f330fb7f53158f613bffc07493925ac437193e4d2defb3e7 netopeer2-2.1.42.tar.gz +sha256 2b1daac037f18c303e0c0dc3318ba30196459472e4c59f2f8547ee74d4cdf31d netopeer2-2.1.49.tar.gz sha256 b46f161fbdcf127d3ef22602e15958c3092fe3294f71a2dc8cdf8f6689cba95b LICENSE diff --git a/package/netopeer2/netopeer2.mk b/package/netopeer2/netopeer2.mk index 7cb9202575..47fcd31acd 100644 --- a/package/netopeer2/netopeer2.mk +++ b/package/netopeer2/netopeer2.mk @@ -4,7 +4,7 @@ # ################################################################################ -NETOPEER2_VERSION = 2.1.42 +NETOPEER2_VERSION = 2.1.49 NETOPEER2_SITE = $(call github,CESNET,Netopeer2,v$(NETOPEER2_VERSION)) NETOPEER2_DL_SUBDIR = netopeer2 NETOPEER2_LICENSE = BSD-3-Clause From 0b5b92019ba30aecdaa7ba34c255d15e0c0489e8 Mon Sep 17 00:00:00 2001 From: Matthew Weber Date: Tue, 14 Feb 2023 18:05:05 +0000 Subject: [PATCH 0925/5754] DEVELOPERS: drop Matt Weber I regret that my work situation doesn't sustain me contributing. Signed-off-by: Matthew Weber Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 105 ----------------------------------------------------- 1 file changed, 105 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index df2b98ad53..72a56deb4c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1984,111 +1984,6 @@ F: board/technologic/ts4900/ F: configs/ts4900_defconfig F: package/ts4900-fpga/ -N: Matt Weber -F: board/freescale/p* -F: board/freescale/t* -F: board/qemu/ppc64-e5500/ -F: configs/freescale_p* -F: configs/freescale_t* -F: configs/qemu_ppc64_e5500_defconfig -F: package/ace/ -F: package/argp-standalone/ -F: package/aufs/ -F: package/aufs-util/ -F: package/bc/ -F: package/bridge-utils/ -F: package/checkpolicy/ -F: package/checksec/ -F: package/cgroupfs-mount/ -F: package/compiler-rt/ -F: package/crda/ -F: package/cunit/ -F: package/dacapo/ -F: package/davici/ -F: package/dnsmasq/ -F: package/dosfstools/ -F: package/eigen/ -F: package/ethtool/ -F: package/flashbench/ -F: package/fmc/ -F: package/fmlib/ -F: package/freeradius-server/ -F: package/git/ -F: package/gnutls/ -F: package/hostapd/ -F: package/i2c-tools/ -F: package/ifplugd/ -F: package/igmpproxy/ -F: package/iperf/ -F: package/iperf3/ -F: package/iputils/ -F: package/iw/ -F: package/jitterentropy-library/ -F: package/kvm-unit-tests/ -F: package/kvmtool/ -F: package/libcsv/ -F: package/libcurl/ -F: package/libeastl/ -F: package/libfcgi/ -F: package/libopenssl/ -F: package/libselinux/ -F: package/libsemanage/ -F: package/libsepol/ -F: package/libssh2/ -F: package/libtalloc/ -F: package/libqmi/ -F: package/lighttpd/ -F: package/logrotate/ -F: package/makedevs/ -F: package/memtester/ -F: package/mii-diag/ -F: package/mrouted/ -F: package/mtd/ -F: package/mtools/ -F: package/nginx-upload/ -F: package/omniorb/ -F: package/openresolv/ -F: package/paxtest/ -F: package/picocom/ -F: package/policycoreutils/ -F: package/proftpd/ -F: package/protobuf-c/ -F: package/protobuf/ -F: package/python-colorama/ -F: package/python-filelock/ -F: package/python-flask-cors/ -F: package/python-iptables/ -F: package/python-ipy/ -F: package/python-iwlib/ -F: package/python-posix-ipc/ -F: package/python-pycairo/ -F: package/python-pysftp/ -F: package/python-tinyrpc/ -F: package/python-txdbus/ -F: package/qoriq-rcw/ -F: package/raptor/ -F: package/rng-tools/ -F: package/rsyslog/ -F: package/setools/ -F: package/sloci-image/ -F: package/smcroute/ -F: package/tclap/ -F: package/tini/ -F: package/uboot-tools/ -F: package/unionfs/ -F: package/valijson/ -F: package/wpa_supplicant/ -F: package/wireless_tools/ -F: package/xen/ -F: package/xml-security-c/ -F: support/testing/tests/fs/test_oci.py -F: support/testing/tests/package/br2-external/clang-compiler-rt/ -F: support/testing/tests/package/br2-external/openjdk/ -F: support/testing/tests/package/test_clang.py -F: support/testing/tests/package/test_openjdk.py -F: support/testing/tests/package/test_opkg/ -F: support/testing/tests/package/test_opkg.py - N: Mauro Condarelli F: package/mc/ F: package/python-autobahn/ From 4433ad8f5c88fafe3f0aebbaff1abdae17aadcb7 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 11 Feb 2023 19:28:38 +0100 Subject: [PATCH 0926/5754] toolchain/helper: check the arch sysroot Since the commit [1], the utils/genrandconfig script improved the configuration randomization used by autobuilders. Since then it can generate a configuration that is not suitable for an external toolchain such the "Codescape IMG GNU Linux Toolchain". Indeed this toolchain can be selected for mips32r5 or mips64r5 while only mips32r2 or mips64r2 are really supported. The toolchain issue will be fixed in a followup change. We want to catch such issue in check_unusable_toolchain function otherwise it is detected late during the sysroot import into staging and trigger a weird error message: ln: failed to create symbolic link 'output/host/mips64el-buildroot-linux-gnu/sysroot//nvmedata/autobuild/instance-25/buildroot/libc.a': No such file or directory ln: failed to create symbolic link 'output/host/mips64el-buildroot-linux-gnu/sysroot/usr//nvmedata/autobuild/instance-25/buildroot/libc.a': No such file or directory This is similar test than for the main sysroot check but this time we have to use the toolchain cflags to check the architecture sysroot. If the architecture sysroot doesn't exist, the toolchain will reply with "libc.a". Either the toolchain is really broken or we used a wrong target architecture variant. In the later case, the toolchain infrastructure will print a meaningful error message. Note: We also may get a similar issue using the toolchain-external-custom package if a toolchain is used with a wrong target architecture variant. Fixes: http://autobuild.buildroot.org/results/701/701e8a5f713f7bdd1f32a4c549cdaac580e2522a/ [1] aeee90ec109b83c42779e6a2617f7d57e25a2b65 Signed-off-by: Romain Naour Cc: Giulio Benetti Cc: Thomas De Schampheleire Cc: Thomas Petazzoni Signed-off-by: Arnout Vandecappelle --- toolchain/helpers.mk | 11 +++++++++++ .../toolchain-external/pkg-toolchain-external.mk | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk index 1cd7494fdb..24c482923a 100644 --- a/toolchain/helpers.mk +++ b/toolchain/helpers.mk @@ -422,12 +422,16 @@ check_cross_compiler_exists = \ # the host tuple. # - Exclude distro-class toolchains which are not relocatable. # - Exclude broken toolchains which return "libc.a" with -print-file-name. +# - Exclude toolchains used with wrong toolchain cflags or broken toolchains +# which return "libc.a" with -print-file-name and toolchain cflags. # - Exclude toolchains which doesn't support --sysroot option. # # $1: cross-gcc path +# $1: toolchain cflags # check_unusable_toolchain = \ __CROSS_CC=$(strip $1) ; \ + __TOOLCHAIN_CFLAGS=$(strip $2) ; \ vendor=`$${__CROSS_CC} -dumpmachine | cut -f2 -d'-'` ; \ if test "$${vendor}" = "angstrom" ; then \ echo "Angstrom toolchains are not pure toolchains: they contain" ; \ @@ -449,6 +453,13 @@ check_unusable_toolchain = \ echo "Unable to detect the toolchain sysroot, Buildroot cannot use this toolchain." ; \ exit 1 ; \ fi ; \ + libc_a_archsysroot_path=`$${__CROSS_CC} $${__TOOLCHAIN_CFLAGS} -print-file-name=libc.a` ; \ + if test "$${libc_a_archsysroot_path}" = "libc.a" ; then \ + echo "Unable to detect the toolchain architecture sysroot." ; \ + echo "Please check the Target Architecture Variant selected, the toolchains may not support it." ; \ + echo "Buildroot cannot use this toolchain." ; \ + exit 1 ; \ + fi; \ sysroot_dir="$(call toolchain_find_sysroot,$${__CROSS_CC})" ; \ if test -z "$${sysroot_dir}" ; then \ echo "External toolchain doesn't support --sysroot. Cannot use." ; \ diff --git a/toolchain/toolchain-external/pkg-toolchain-external.mk b/toolchain/toolchain-external/pkg-toolchain-external.mk index 299b6008aa..c37f3500d9 100644 --- a/toolchain/toolchain-external/pkg-toolchain-external.mk +++ b/toolchain/toolchain-external/pkg-toolchain-external.mk @@ -563,7 +563,7 @@ endif # kernel headers version, type of C library and all C library features. define $(2)_CONFIGURE_CMDS $$(Q)$$(call check_cross_compiler_exists,$$(TOOLCHAIN_EXTERNAL_CC)) - $$(Q)$$(call check_unusable_toolchain,$$(TOOLCHAIN_EXTERNAL_CC)) + $$(Q)$$(call check_unusable_toolchain,$$(TOOLCHAIN_EXTERNAL_CC),"$$(TOOLCHAIN_EXTERNAL_CFLAGS)") $$(Q)SYSROOT_DIR="$$(call toolchain_find_sysroot,$$(TOOLCHAIN_EXTERNAL_CC))" ; \ $$(call check_kernel_headers_version,\ $$(BUILD_DIR),\ From 8eee178355cafa156d93bdc0cd447618dd1a1abc Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 11 Feb 2023 19:28:39 +0100 Subject: [PATCH 0927/5754] toolchain/toolchain-external/toolchain-external-codescape-mti-mips: remove wrong MIPS32r5 and MIPS64r5 support This toolchain doesn't support MIPS32r5 and MIPS64r5 and the toolchain infrastructure fail to import the sysroot to staging. Fixes: c4a62fa6278058461ff9e501ba6e822486453493 Fixes: http://autobuild.buildroot.org/results/701/701e8a5f713f7bdd1f32a4c549cdaac580e2522a/ Signed-off-by: Romain Naour Cc: Thomas Petazzoni Signed-off-by: Arnout Vandecappelle --- .../toolchain-external-codescape-mti-mips/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in b/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in index c58c55119a..8217ddc38c 100644 --- a/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in +++ b/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in @@ -3,8 +3,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_7 depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - depends on BR2_MIPS_CPU_MIPS32R2 || (BR2_MIPS_CPU_MIPS64R2 && !BR2_MIPS_SOFT_FLOAT) || \ - BR2_MIPS_CPU_MIPS32R5 || (BR2_MIPS_CPU_MIPS64R5 && !BR2_MIPS_SOFT_FLOAT) + depends on BR2_MIPS_CPU_MIPS32R2 || (BR2_MIPS_CPU_MIPS64R2 && !BR2_MIPS_SOFT_FLOAT) select BR2_TOOLCHAIN_EXTERNAL_GLIBC select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_7 From c3a1f0fe1b912727bb7b5baebe938f75036e566b Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Mon, 13 Feb 2023 15:15:34 +0100 Subject: [PATCH 0928/5754] package/pkg-golang: disable version control information By default go tries to include version control (VCS) information in binaries. Since Buildroot separates version control from the build process it is sensible to disable this behavior. This avoids build errors when building with a git repository higher up in the tree owned by root. In this case the go build system calls `git status --porcelain` which returns with an error: fatal: detected dubious ownership in repository at '/build' Signed-off-by: Stefan Agner Reviewed-by: Christian Stewart Signed-off-by: Arnout Vandecappelle --- package/pkg-golang.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk index cdc67b32c0..da9c9a21ac 100644 --- a/package/pkg-golang.mk +++ b/package/pkg-golang.mk @@ -45,7 +45,8 @@ $(2)_BUILD_OPTS += \ -modcacherw \ -tags "$$($(2)_TAGS)" \ -trimpath \ - -p $$(PARALLEL_JOBS) + -p $$(PARALLEL_JOBS) \ + -buildvcs=false # Target packages need the Go compiler on the host at download time (for # vendoring), and at build and install time. From 854314d15361dc3b69b97ee29d483ee920b9098f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 13 Feb 2023 19:11:20 +0100 Subject: [PATCH 0929/5754] package/pipewire: compress-offload needs kernel >= 5.7 SND_AUDIOCODEC_A{LAC,PE} are only available since kernel 5.7 and https://github.com/torvalds/linux/commit/0f546d6f0292fb624b4cf0cc70096ddb9ea070e6 resulting in the following build failure since bump to version 0.3.65 in commit 247e2d0eb1e60f483044d58bed58c5ed321528f7 and https://git.buildroot.net/buildroot/commit/?id=247e2d0eb1e60f483044d58bed58c5ed321528f7: ../spa/plugins/alsa/alsa-compress-offload-sink.c:183:11: error: 'SND_AUDIOCODEC_ALAC' undeclared here (not in a function); did you mean 'SND_AUDIOCODEC_AAC'? 183 | { SND_AUDIOCODEC_ALAC, }, | ^~~~~~~~~~~~~~~~~~~ | SND_AUDIOCODEC_AAC Moreover, flac_d is also only available since kernel 5.5 and https://github.com/torvalds/linux/commit/d2522335c92c090bf58531a2b696d7fe80ab2a7a Take this opportunity to make compress offload an explicit option rather than automatic based on the availability of tinycompress. The relationship between them is not obvious. Fixes: - http://autobuild.buildroot.org/results/9ecd9aca5edc3756154da59573157954f06e6537 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/pipewire/Config.in | 12 ++++++++++++ package/pipewire/pipewire.mk | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/package/pipewire/Config.in b/package/pipewire/Config.in index f038291e87..4929e5d3d1 100644 --- a/package/pipewire/Config.in +++ b/package/pipewire/Config.in @@ -15,6 +15,18 @@ config BR2_PACKAGE_PIPEWIRE if BR2_PACKAGE_PIPEWIRE +config BR2_PACKAGE_PIPEWIRE_COMPRESS_OFFLOAD + bool "pipewire Compress-Offload" + depends on !BR2_STATIC_LIBS # tinycompress + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_7 + select BR2_PACKAGE_TINYCOMPRESS + help + Enable ALSA Compress-Offload support + +comment "pipewire Compress-Offload needs a toolchain w/ dynamic library, headers >= 5.7" + depends on BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_7 + config BR2_PACKAGE_PIPEWIRE_EXAMPLES bool "pipewire examples" help diff --git a/package/pipewire/pipewire.mk b/package/pipewire/pipewire.mk index 976d7783b9..ecf4a035ec 100644 --- a/package/pipewire/pipewire.mk +++ b/package/pipewire/pipewire.mk @@ -215,7 +215,7 @@ else PIPEWIRE_CONF_OPTS += -Dsdl2=disabled endif -ifeq ($(BR2_PACKAGE_TINYCOMPRESS),y) +ifeq ($(BR2_PACKAGE_PIPEWIRE_COMPRESS_OFFLOAD),y) PIPEWIRE_CONF_OPTS += -Dcompress-offload=enabled PIPEWIRE_DEPENDENCIES += tinycompress else From c77e31e0b360fffbd893807ccfbc4f35bf2558d1 Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Wed, 15 Feb 2023 22:28:58 +0100 Subject: [PATCH 0930/5754] docs/manual: add 'menuconfig' to out-of-tree examples If the examples given for launching an out-of-tree build are executed as-is, this will result in the error message Please configure Buildroot first (e.g. "make menuconfig") Even if "make menuconfig" was run before, it's still not going to work because the out-of-tree build doesn't use the in-tree .config. Therefore, the example really should start with some config option. Since "make menuconfig" is used in most other examples of creating a config, use that here as well. Extend both examples with "menuconfig". Reported-by: AndreiCherniaev Signed-off-by: Arnout Vandecappelle --- docs/manual/common-usage.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/manual/common-usage.txt b/docs/manual/common-usage.txt index 9abd3799dd..bc78f4a871 100644 --- a/docs/manual/common-usage.txt +++ b/docs/manual/common-usage.txt @@ -30,13 +30,13 @@ the Linux kernel. To use it, add +O=+ to the make command line: -------------------- - $ make O=/tmp/build + $ make O=/tmp/build menuconfig -------------------- Or: -------------------- - $ cd /tmp/build; make O=$PWD -C path/to/buildroot + $ cd /tmp/build; make O=$PWD -C path/to/buildroot menuconfig -------------------- All the output files will be located under +/tmp/build+. If the +O+ From 92f545da0b60a0c82f8f0e8b0e69e30268f0e9f3 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Tue, 14 Feb 2023 11:50:33 +0100 Subject: [PATCH 0931/5754] package/rtl8821cu: disable package for s390x architecture s390x doesn't support CONFIG_WIRELESS in Linux so let's disable this package for this architecture. Fixes: http://autobuild.buildroot.net/results/3a74d393cdbc308eab9ec3f0f9e420947669a0ea/ Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/rtl8821cu/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/rtl8821cu/Config.in b/package/rtl8821cu/Config.in index a5a7b9d255..00a41b5196 100644 --- a/package/rtl8821cu/Config.in +++ b/package/rtl8821cu/Config.in @@ -1,8 +1,10 @@ comment "rtl8821cu needs a Linux kernel to be built" + depends on !BR2_s390x depends on !BR2_LINUX_KERNEL config BR2_PACKAGE_RTL8821CU bool "rtl8821cu" + depends on !BR2_s390x depends on BR2_LINUX_KERNEL help rtl8821cu wifi driver From d69ea9664f067e5660e13ddf65c52df46f2eca07 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Tue, 14 Feb 2023 12:08:27 +0100 Subject: [PATCH 0932/5754] package/rtl8812au-aircrack-ng: bump to 2023-02-03 version to fix build failure with Linux 6.1 Fixes: http://autobuild.buildroot.net/results/e128298929fce31374687a566e50b00c150131b8/ 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 bc3a926314..cdf5f3b4e2 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 eed4888da9cfdc0f83ad3335beaf73af33ce0796b0a2637aeec102d47e1eb8f0 rtl8812au-aircrack-ng-e7a4a390ccbdd768411e1b2a8922c47837f76b47.tar.gz +sha256 69891a35724a6c30fcb29d9eba783879e0bee3f5f7847341fce06101a7542f5f rtl8812au-aircrack-ng-d98018d038a5db96066e79f26ed4a72f2fe1774e.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 45a6ce5729..ab3ebe2077 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 = e7a4a390ccbdd768411e1b2a8922c47837f76b47 +RTL8812AU_AIRCRACK_NG_VERSION = d98018d038a5db96066e79f26ed4a72f2fe1774e 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 3b361028e6302ee0b062674f0483845930e94ba7 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Mon, 13 Feb 2023 21:06:04 +0100 Subject: [PATCH 0933/5754] package/flannel: use the github helper Currently, flannel uses an ad-hoc github URL and a version-only tarball name, even though we already had the github helper (introduced in 2013) when flannel was introduced (in 2016). Switch to the github helper, which allows us to get a properly named tarball. Signed-off-by: Yann E. MORIN Cc: Geoff Levand Acked-by: Geoff Levand Signed-off-by: Thomas Petazzoni --- package/flannel/flannel.hash | 2 +- package/flannel/flannel.mk | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/package/flannel/flannel.hash b/package/flannel/flannel.hash index 6a0223a20f..bafc453097 100644 --- a/package/flannel/flannel.hash +++ b/package/flannel/flannel.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 e17164db3b158d13ce5e40bb7b233790cb186762d929fa4f626baf586d4d63ca v0.14.0.tar.gz +sha256 e17164db3b158d13ce5e40bb7b233790cb186762d929fa4f626baf586d4d63ca flannel-0.14.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/flannel/flannel.mk b/package/flannel/flannel.mk index 231cf90dfd..b4e2b2f777 100644 --- a/package/flannel/flannel.mk +++ b/package/flannel/flannel.mk @@ -5,8 +5,7 @@ ################################################################################ FLANNEL_VERSION = 0.14.0 -FLANNEL_SITE = https://github.com/flannel-io/flannel/archive -FLANNEL_SOURCE = v$(FLANNEL_VERSION).tar.gz +FLANNEL_SITE = $(call github,flannel-io,flannel,v$(FLANNEL_VERSION)) FLANNEL_LICENSE = Apache-2.0 FLANNEL_LICENSE_FILES = LICENSE From 295baf16a181b110eba09007f6ad7ac384914581 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 13 Feb 2023 19:17:54 +0100 Subject: [PATCH 0934/5754] package/open-iscsi: fix libressl build Fix the following libressl build failure raised since the addition of the package in commit 2a571acddd0badaf9636649d98fd095757878348: /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 Signed-off-by: Thomas Petazzoni --- ...01-SHA3-is-not-supported-by-libressl.patch | 144 ++++++++++++++++++ 1 file changed, 144 insertions(+) create mode 100644 package/open-iscsi/0001-SHA3-is-not-supported-by-libressl.patch 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 new file mode 100644 index 0000000000..0423179d93 --- /dev/null +++ b/package/open-iscsi/0001-SHA3-is-not-supported-by-libressl.patch @@ -0,0 +1,144 @@ +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 + From f16b97eab1859395ddd74f557d33ef8a1f2447d6 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Sat, 11 Feb 2023 15:46:23 +0100 Subject: [PATCH 0935/5754] package/davinci-bootcount: bump to version 2.0.0 - stm32mp1: support for STM32 TAMP_BKP21R bootcount register - tab formatting - gitignore: added autoscan files - updated documentation - i2c_eeprom: bootcount does not use two uint16s - am33xx: declare registers as 'volatile' - src/am33xx: do not close fd, it seems to prevent reliably writing register - configure.ac: update version, homepage - Added EEPROM read/write for non-TI AM335x platforms Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- package/davinci-bootcount/davinci-bootcount.hash | 2 +- package/davinci-bootcount/davinci-bootcount.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/davinci-bootcount/davinci-bootcount.hash b/package/davinci-bootcount/davinci-bootcount.hash index ef4bca2b7d..53435b1d1d 100644 --- a/package/davinci-bootcount/davinci-bootcount.hash +++ b/package/davinci-bootcount/davinci-bootcount.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 de7843cf1245a739b6d18d4db478893e50c2de0ee19bbce96dc323065d28c3e4 davinci-bootcount-0973689c7556a953d2b468e4d8d46758c6d467b4.tar.gz +sha256 12b5aa83736efb2fefd22cd4d9f305a25c68dfaa10401d5efb17e55a5163934e davinci-bootcount-2.0.0.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/davinci-bootcount/davinci-bootcount.mk b/package/davinci-bootcount/davinci-bootcount.mk index 385d96d5a2..695d39688a 100644 --- a/package/davinci-bootcount/davinci-bootcount.mk +++ b/package/davinci-bootcount/davinci-bootcount.mk @@ -4,8 +4,8 @@ # ################################################################################ -DAVINCI_BOOTCOUNT_VERSION = 0973689c7556a953d2b468e4d8d46758c6d467b4 -DAVINCI_BOOTCOUNT_SITE = $(call github,VoltServer,uboot-davinci-bootcount,$(DAVINCI_BOOTCOUNT_VERSION)) +DAVINCI_BOOTCOUNT_VERSION = 2.0.0 +DAVINCI_BOOTCOUNT_SITE = $(call github,VoltServer,uboot-davinci-bootcount,v$(DAVINCI_BOOTCOUNT_VERSION)) DAVINCI_BOOTCOUNT_LICENSE = GPL-3.0 DAVINCI_BOOTCOUNT_LICENSE_FILES = COPYING From a7bd0fdb88a15b15d4b41bdc82a37cf35ab2b268 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 8 Feb 2023 20:31:33 +0100 Subject: [PATCH 0936/5754] package/dmalloc: convert existing patch to git format We're going to add more patches, so let's cleanup our historical baggage... Signed-off-by: Yann E. MORIN Cc: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0001-configure-fix-build-on-mips.patch | 90 +++++++++++++++++++ package/dmalloc/0001-mips.patch | 45 ---------- 2 files changed, 90 insertions(+), 45 deletions(-) create mode 100644 package/dmalloc/0001-configure-fix-build-on-mips.patch delete mode 100644 package/dmalloc/0001-mips.patch diff --git a/package/dmalloc/0001-configure-fix-build-on-mips.patch b/package/dmalloc/0001-configure-fix-build-on-mips.patch new file mode 100644 index 0000000000..9b1525d0d1 --- /dev/null +++ b/package/dmalloc/0001-configure-fix-build-on-mips.patch @@ -0,0 +1,90 @@ +From af6adb3f5f05be4faa88a5aa83296c388c8085e7 Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Wed, 8 Feb 2023 12:30:10 +0100 +Subject: [PATCH] configure: fix build on mips + +This patch is a historical baggage that Buildroot has carried for ages +(since 2006), and the reason for it are notentirely clear. + +Since dmalloc is pretty tricky, and as this patch has not been +identified as causing issues, we keep it; we just add the configure.ac +patchlet to match the one in configure. + +As for the title, the original patch was named dmalloc-mips.patch, so +presumably it fixes some mips issue; let's title the commit that way. + +[Fabrice: Updated for 5.6.5] +Signed-off-by: Fabrice Fontaine +[yann.morin.1998@free.fr: make it a git-formatted patch] +Signed-off-by: Yann E. MORIN +--- + configure | 4 ++-- + configure.ac | 2 +- + return.h | 16 +++------------- + 3 files changed, 6 insertions(+), 16 deletions(-) + +diff --git a/configure b/configure +index d52a1e8..c18dfb2 100755 +--- a/configure ++++ b/configure +@@ -5413,8 +5413,8 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking return.h macros work" >&5 + $as_echo_n "checking return.h macros work... " >&6; } + if test "$cross_compiling" = yes; then : +- $as_echo "#define RETURN_MACROS_WORK 0" >>confdefs.h +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++ $as_echo "#define RETURN_MACROS_WORK 1" >>confdefs.h ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: assume yes (cross-compiling)" >&5 + $as_echo "no" >&6; } + + else +diff --git a/configure.ac b/configure.ac +index a5295f1..9740fdc 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -705,7 +705,7 @@ int main() + ])], + [ AC_DEFINE(RETURN_MACROS_WORK, 1) AC_MSG_RESULT([yes]) ], + [ AC_DEFINE(RETURN_MACROS_WORK, 0) AC_MSG_RESULT([no]) ], +-[ AC_DEFINE(RETURN_MACROS_WORK, 0) AC_MSG_RESULT([no]) ] ++[ AC_DEFINE(RETURN_MACROS_WORK, 1) AC_MSG_RESULT([assume yes (cross-compiling)]) ] + ) + + ############################################################################## +diff --git a/return.h b/return.h +index 9d3f5f1..d916c7a 100644 +--- a/return.h ++++ b/return.h +@@ -117,26 +117,16 @@ + /*************************************/ + + /* +- * For DEC Mips machines running Ultrix ++ * For Mips machines running Linux + */ + #if __mips + +-/* +- * I have no idea how to get inline assembly with the default cc. +- * Anyone know how? +- */ +- +-#if 0 +- + /* + * NOTE: we assume here that file is global. + * +- * $31 is the frame pointer. $2 looks to be the return address but maybe +- * not consistently. ++ * $31 is the return address. + */ +-#define GET_RET_ADDR(file) asm("sw $2, file") +- +-#endif ++#define GET_RET_ADDR(file) asm("sw $31, %0" : "=m" (file)) + + #endif /* __mips */ + +-- +2.25.1 + diff --git a/package/dmalloc/0001-mips.patch b/package/dmalloc/0001-mips.patch deleted file mode 100644 index 3150d030ec..0000000000 --- a/package/dmalloc/0001-mips.patch +++ /dev/null @@ -1,45 +0,0 @@ -[Fabrice: Updated for 5.6.5] -Signed-off-by: Fabrice Fontaine ---- a/configure -+++ b/configure -@@ -7107,7 +7107,7 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking return.h macros work" >&5 - $as_echo_n "checking return.h macros work... " >&6; } - if test "$cross_compiling" = yes; then : -- $as_echo "#define RETURN_MACROS_WORK 0" >>confdefs.h -+ $as_echo "#define RETURN_MACROS_WORK 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - ---- a/return.h -+++ b/return.h -@@ -106,26 +106,16 @@ - /*************************************/ - - /* -- * For DEC Mips machines running Ultrix -+ * For Mips machines running Linux - */ - #if __mips - - /* -- * I have no idea how to get inline assembly with the default cc. -- * Anyone know how? -- */ -- --#if 0 -- --/* - * NOTE: we assume here that file is global. - * -- * $31 is the frame pointer. $2 looks to be the return address but maybe -- * not consistently. -+ * $31 is the return address. - */ --#define GET_RET_ADDR(file) asm("sw $2, file") -- --#endif -+#define GET_RET_ADDR(file) asm("sw $31, %0" : "=m" (file)) - - #endif /* __mips */ - From b259dac22a4179494e9947c485b6b171d8fef52e Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 8 Feb 2023 20:31:34 +0100 Subject: [PATCH 0937/5754] package/dmalloc: use actual patches rather than sed-ing Our dmalloc packaging is very old and carries historical baggage and idiosyncracies that we have long stopped doing in the rest ofthe code base. Drop our post-patch hooks that seds the configure and Makefile.in files, and add patches (that could be upstreamed one day). We provide the results in the environment, like would be done with actual autoconf cache variables (ac_cv_*). Note: those are the result of cleaning up for further patches that did not manifest because it was too complex to add proper SSP support to dmalloc (instead, we're going to forcibly disable it in the following commit). Note-2: those patches have not been submitted upstream, as it's mostly dead: even though there's been some commit activities recently-ish, there has been no review or comments or the many PR pending for many years now. Note-3: we patch both configure and configure.ac, rather than autoreconf, for two reasons: 1. the both are in the upstream git tree, so submitting these patches would require patching both, and 2. dmalloc does not autoreconf nicely out of the box, and it was deemed too much hassle to fix that in addition. Signed-off-by: Yann E. MORIN Cc: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...onfigure-allow-overriding-some-tests.patch | 80 +++++++++++++++++++ ...-configure-detected-or-user-supplied.patch | 50 ++++++++++++ ...ure-use-LD-instead-of-hard-coding-ld.patch | 67 ++++++++++++++++ package/dmalloc/dmalloc.mk | 17 ++-- 4 files changed, 202 insertions(+), 12 deletions(-) create mode 100644 package/dmalloc/0003-configure-allow-overriding-some-tests.patch create mode 100644 package/dmalloc/0004-Makefile-use-the-configure-detected-or-user-supplied.patch create mode 100644 package/dmalloc/0005-configure-use-LD-instead-of-hard-coding-ld.patch diff --git a/package/dmalloc/0003-configure-allow-overriding-some-tests.patch b/package/dmalloc/0003-configure-allow-overriding-some-tests.patch new file mode 100644 index 0000000000..3003e8cbe4 --- /dev/null +++ b/package/dmalloc/0003-configure-allow-overriding-some-tests.patch @@ -0,0 +1,80 @@ +From 9d57d4353c82110c609f36f91986277343d4ee45 Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Wed, 8 Feb 2023 13:26:56 +0100 +Subject: [PATCH] configure: allow overriding some tests + +Some tests use AC_RUN_IFELSE, so they do not work for cross-compilation. + +Allow the user to provide these results from the environment. + +Signed-off-by: Yann E. MORIN +--- + configure | 6 +++--- + configure.ac | 6 +++--- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/configure b/configure +index c18dfb2..d165962 100755 +--- a/configure ++++ b/configure +@@ -4540,7 +4540,7 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking strdup macro" >&5 + $as_echo_n "checking strdup macro... " >&6; } + if test "$cross_compiling" = yes; then : +- ac_cv_strdup_macro=no ++ ac_cv_strdup_macro="${ac_cv_strdup_macro-no}" + + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -4578,7 +4578,7 @@ $as_echo "$ac_cv_strdup_macro" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking strndup macro" >&5 + $as_echo_n "checking strndup macro... " >&6; } + if test "$cross_compiling" = yes; then : +- ac_cv_strndup_macro=no ++ ac_cv_strndup_macro="${ac_cv_strndup_macro-no}" + + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -4753,7 +4753,7 @@ done + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking basic-block size" >&5 + $as_echo_n "checking basic-block size... " >&6; } +-ac_cv_page_size=0 ++ac_cv_page_size="${ac_cv_page_size-0}" + if test $ac_cv_page_size = 0; then + if test "$cross_compiling" = yes; then : + ac_cv_page_size=0 +diff --git a/configure.ac b/configure.ac +index 9740fdc..51bdf4d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -292,7 +292,7 @@ int main() { return 1; } + ]])], + [ac_cv_strdup_macro=yes], + [ac_cv_strdup_macro=no], +-[ac_cv_strdup_macro=no] ++[ac_cv_strdup_macro="${ac_cv_strdup_macro-no}"] + ) + AC_MSG_RESULT([$ac_cv_strdup_macro]) + +@@ -316,7 +316,7 @@ int main() { return 1; } + ]])], + [ac_cv_strndup_macro=yes], + [ac_cv_strndup_macro=no], +-[ac_cv_strndup_macro=no] ++[ac_cv_strndup_macro="${ac_cv_strndup_macro-no}"] + ) + AC_MSG_RESULT([$ac_cv_strndup_macro]) + +@@ -390,7 +390,7 @@ AC_MSG_RESULT([$ac_cv_use_mmap]) + # + AC_CHECK_FUNCS(getpagesize) + AC_MSG_CHECKING([basic-block size]) +-ac_cv_page_size=0 ++ac_cv_page_size="${ac_cv_page_size-0}" + if test $ac_cv_page_size = 0; then + AC_RUN_IFELSE([AC_LANG_SOURCE([ + #if HAVE_UNISTD_H +-- +2.25.1 + diff --git a/package/dmalloc/0004-Makefile-use-the-configure-detected-or-user-supplied.patch b/package/dmalloc/0004-Makefile-use-the-configure-detected-or-user-supplied.patch new file mode 100644 index 0000000000..394e7ca34e --- /dev/null +++ b/package/dmalloc/0004-Makefile-use-the-configure-detected-or-user-supplied.patch @@ -0,0 +1,50 @@ +From c958fd5cd7d5ff03c0a023608b53b74997c514b3 Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Wed, 8 Feb 2023 13:43:55 +0100 +Subject: [PATCH] Makefile: use the configure-detected or user-supplied ar + program + +Signed-off-by: Yann E. MORIN +--- + Makefile.in | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 86d3cca..089ac99 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -303,11 +303,11 @@ $(LIB_SL) : $(LIBRARY) + mv $@.t $@ + + $(LIBRARY) : $(OBJS) $(NORMAL_OBJS) +- ar cr $@ $? ++ $(AR) cr $@ $? + @RANLIB@ $@ + + $(LIB_TH) : $(OBJS) $(THREAD_OBJS) +- ar cr $@ $? ++ $(AR) cr $@ $? + @RANLIB@ $@ + + $(LIB_TH_SL) : $(LIB_TH) +@@ -316,7 +316,7 @@ $(LIB_TH_SL) : $(LIB_TH) + mv $@.t $@ + + $(LIB_CXX) : $(OBJS) $(NORMAL_OBJS) $(CXX_OBJS) +- ar cr $@ $? ++ $(AR) cr $@ $? + @RANLIB@ $@ + + $(LIB_CXX_SL) : $(LIB_CXX) +@@ -325,7 +325,7 @@ $(LIB_CXX_SL) : $(LIB_CXX) + mv $@.t $@ + + $(LIB_TH_CXX) : $(OBJS) $(THREAD_OBJS) $(CXX_OBJS) +- ar cr $@ $? ++ $(AR) cr $@ $? + @RANLIB@ $@ + + $(LIB_TH_CXX_SL) : $(LIB_TH_CXX) +-- +2.25.1 + diff --git a/package/dmalloc/0005-configure-use-LD-instead-of-hard-coding-ld.patch b/package/dmalloc/0005-configure-use-LD-instead-of-hard-coding-ld.patch new file mode 100644 index 0000000000..3ba6ee3dc7 --- /dev/null +++ b/package/dmalloc/0005-configure-use-LD-instead-of-hard-coding-ld.patch @@ -0,0 +1,67 @@ +From d77e5f3d45b0cbae850e3a6e23d52edc137be803 Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Wed, 8 Feb 2023 13:52:05 +0100 +Subject: [PATCH] configure: use ${LD} instead of hard-coding 'ld' + +When doing cross-compilation, we do not want to use the native tools to +test, but the target tools. + +Note that the weird quoting is inherited from a legacy patch in +Buildroot, which dates back ages (at least 2006), and as it has not been +identified as breaking things, we keep it as-is... Meh... + +Signed-off-by: Yann E. MORIN +--- + configure | 12 ++++++------ + configure.ac | 12 ++++++------ + 2 files changed, 12 insertions(+), 12 deletions(-) + +diff --git a/configure b/configure +index 810636e..30a7ea3 100755 +--- a/configure ++++ b/configure +@@ -4377,12 +4377,12 @@ if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_shared_link_args='# Could not configure shlib linking' + enable_shlib=no + fi +- elif (ld -shared --whole-archive -soname conftest.so -o conftest.so.t conftest.a) 2>&5; then +- ac_cv_shared_link_args='ld -shared --whole-archive -soname $@ -o $@.t' +- elif (ld -shared -o conftest.so.t -all -soname conftest.so.t -none -lc -all conftest.a) 2>&5; then +- ac_cv_shared_link_args='ld -shared -o $@.t -all -soname $@ -none -lc -all' +- elif (ld -G -o conftest.so.t conftest.a) 2>&5; then +- ac_cv_shared_link_args='ld -G -o $@.t' ++ elif (${LD-ld} -shared --whole-archive -soname conftest.so -o conftest.so.t conftest.a) 2>&5; then ++ ac_cv_shared_link_args="${LD-ld}"' -shared --whole-archive -soname $@ -o $@.t' ++ elif (${LD-ld} -shared -o conftest.so.t -all -soname conftest.so.t -none -lc -all conftest.a) 2>&5; then ++ ac_cv_shared_link_args="${LD-ld}"' -shared -o $@.t -all -soname $@ -none -lc -all' ++ elif (${LD-ld} -G -o conftest.so.t conftest.a) 2>&5; then ++ ac_cv_shared_link_args="${LD-ld}"' -G -o $@.t' + else + # oh well, toss an error + ac_cv_shared_link_args='# Could not configure shlib linking' +diff --git a/configure.ac b/configure.ac +index 51bdf4d..0d80a78 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -169,12 +169,12 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([ int foo(int val) { return val + 1; } ])],[ + ac_cv_shared_link_args='# Could not configure shlib linking' + enable_shlib=no + fi +- elif (ld -shared --whole-archive -soname conftest.so -o conftest.so.t conftest.a) 2>&5; then +- ac_cv_shared_link_args='ld -shared --whole-archive -soname $@ -o $@.t' +- elif (ld -shared -o conftest.so.t -all -soname conftest.so.t -none -lc -all conftest.a) 2>&5; then +- ac_cv_shared_link_args='ld -shared -o $@.t -all -soname $@ -none -lc -all' +- elif (ld -G -o conftest.so.t conftest.a) 2>&5; then +- ac_cv_shared_link_args='ld -G -o $@.t' ++ elif (${LD-ld} -shared --whole-archive -soname conftest.so -o conftest.so.t conftest.a) 2>&5; then ++ ac_cv_shared_link_args="${LD-ld}"' -shared --whole-archive -soname $@ -o $@.t' ++ elif (${LD-ld} -shared -o conftest.so.t -all -soname conftest.so.t -none -lc -all conftest.a) 2>&5; then ++ ac_cv_shared_link_args="${LD-ld}"' -shared -o $@.t -all -soname $@ -none -lc -all' ++ elif (${LD-ld} -G -o conftest.so.t conftest.a) 2>&5; then ++ ac_cv_shared_link_args="${LD-ld}"' -G -o $@.t' + else + # oh well, toss an error + ac_cv_shared_link_args='# Could not configure shlib linking' +-- +2.25.1 + diff --git a/package/dmalloc/dmalloc.mk b/package/dmalloc/dmalloc.mk index 81ac467277..6b90f810b2 100644 --- a/package/dmalloc/dmalloc.mk +++ b/package/dmalloc/dmalloc.mk @@ -44,18 +44,11 @@ ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_63261),y) DMALLOC_CFLAGS += -O0 endif -DMALLOC_CONF_ENV = CFLAGS="$(DMALLOC_CFLAGS)" - -define DMALLOC_POST_PATCH - $(SED) 's/^ac_cv_page_size=0$$/ac_cv_page_size=12/' $(@D)/configure - $(SED) 's/ac_cv_strdup_macro=no$$/ac_cv_strdup_macro=yes/' $(@D)/configure - $(SED) 's/ac_cv_strndup_macro=no$$/ac_cv_strndup_macro=yes/' $(@D)/configure - $(SED) 's/(ld -/($${LD-ld} -/' $(@D)/configure - $(SED) 's/'\''ld -/"$${LD-ld}"'\'' -/' $(@D)/configure - $(SED) 's/ar cr/$$(AR) cr/' $(@D)/Makefile.in -endef - -DMALLOC_POST_PATCH_HOOKS += DMALLOC_POST_PATCH +DMALLOC_CONF_ENV = \ + CFLAGS="$(DMALLOC_CFLAGS)" \ + ac_cv_page_size=12 \ + ac_cv_strdup_macro=yes \ + ac_cv_strndup_macro=yes # both DESTDIR and PREFIX are ignored.. define DMALLOC_INSTALL_STAGING_CMDS From 3481674ee36fe9fa695e2e6c255bf02b5ab380b0 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 8 Feb 2023 20:31:35 +0100 Subject: [PATCH 0938/5754] package/dmalloc: don't use SSP dmalloc directly calls into $(LD) to generate a shared library our of the static one. To detect what command it should run, ./configure tries various incantations of ld with various command line options until one does not fail. One of those is (basically): $(LD) --whole-archive -o contest.o.t contest.a This makes ./configure conclude what the command to link a shared library in the Makefile should be, and thus stores that in a variable: shlinkargs='$(LD) --whole-archive -o $@' ... which is then AC_SUBST()ed into Makefile.in with a rule like: $(SHLIB): $(LIBRARY) @shlinkargs@ $(LIRARY) which once substiuted, gives: $(SHLIB): $(LIBRARY) $(LD) --whole-archive -o $@ $(LIRARY) However, when SSP is enabled, the __stack_chk_fail_local and co symbols are provided by additional libraries or object files, and that is the responsibility of gcc to pass those when linking. But as dmalloc directly calls ld, it misses those. Changing dmalloc to use $(CC) is not trivial, however. First, we can't pass LD=$(TARGET_CC), otherwise the whole package explodes [0]: indeed --whole-archive is unknown to gcc, so it must be passed as -Wl,--whole archive instead. So we'd need to add a new test that uses $(CC), like so: $(CC) -Wl,--whole-archive -o contest.o.t contest.a However, in that case, gcc does pass additional libs/objs (like, for eample, the SSP ones) to the linker. But then those are also included in the whole-archive section. This causes the linker to add all the symbols form those libs/objs, even those not needed for SSP; on some archs, like PPC, that may require floating point symbols (__muldiv3 et al.) which are in another library, and thus the linker can't find them. The proper solution wouild be to add -Wl,--no-whole-archive, but that would have to be added _after_ the library we want to link, i.e.e we should be able to evntually run: $(CC) -Wl,--whole-archive -o $@ $(LIRARY) -Wl,--no-whole-archive That would require that we introduce a new variable that is added _after_ the $(LIBRARY), e.g. @shlinkargs_post@ or so... This is a bigger endeavour than we want to pursue... Since dmalloc is a debugging utility, it is not supposed to go into production builds, and during debugging, it would not be surprising that it needs to poke around arrays to debug them. So, we go the easier route: disable SSP altogether. [0] with lots of nice colors, but that's not the point, is it? Signed-off-by: Yann E. MORIN Cc: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/dmalloc/dmalloc.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/dmalloc/dmalloc.mk b/package/dmalloc/dmalloc.mk index 6b90f810b2..5bd6691725 100644 --- a/package/dmalloc/dmalloc.mk +++ b/package/dmalloc/dmalloc.mk @@ -14,6 +14,13 @@ DMALLOC_LICENSE_FILES = LICENSE.txt DMALLOC_INSTALL_STAGING = YES DMALLOC_CFLAGS = $(TARGET_CFLAGS) +# dmalloc uses $(LD) to link, and thus misses the object files or libs that +# are needed to provide the __stack_chk_fail_local and co. symbols. Changing +# to use $(CC) is really more complex that we'd like. Since dmalloc is +# involved in debugging memory allocation, it is not expected to be a +# production library, so we do not care that much that it has SSP. +DMALLOC_CFLAGS += -fno-stack-protector + ifeq ($(BR2_STATIC_LIBS),y) DMALLOC_CONF_OPTS += --disable-shlib else From 8984b7581a7d534c9170061913b4840ed33d87c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Hundeb=C3=B8ll?= Date: Thu, 5 Jan 2023 13:59:56 +0100 Subject: [PATCH 0939/5754] package/python-apispec: new package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit apispec is a dependency of to-be-added python-flask-smorest. Signed-off-by: Martin Hundebøll Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 +++ package/Config.in | 1 + package/python-apispec/Config.in | 9 +++++++++ package/python-apispec/python-apispec.hash | 5 +++++ package/python-apispec/python-apispec.mk | 14 ++++++++++++++ 5 files changed, 32 insertions(+) create mode 100644 package/python-apispec/Config.in create mode 100644 package/python-apispec/python-apispec.hash create mode 100644 package/python-apispec/python-apispec.mk diff --git a/DEVELOPERS b/DEVELOPERS index 72a56deb4c..949eef8327 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1965,6 +1965,9 @@ F: package/rpi-firmware/ F: package/tzdata/ F: package/zic/ +N: Martin Hundebøll +F: package/python-apispec/ + N: Martin Kepplinger F: package/tslib/ F: package/x11r7/xdriver_xf86-input-tslib/ diff --git a/package/Config.in b/package/Config.in index fff2fb7a93..de40f2d529 100644 --- a/package/Config.in +++ b/package/Config.in @@ -958,6 +958,7 @@ menu "External python modules" source "package/python-alembic/Config.in" source "package/python-alsaaudio/Config.in" source "package/python-ansicolors/Config.in" + source "package/python-apispec/Config.in" source "package/python-appdirs/Config.in" source "package/python-argh/Config.in" source "package/python-argon2-cffi/Config.in" diff --git a/package/python-apispec/Config.in b/package/python-apispec/Config.in new file mode 100644 index 0000000000..7a322c9969 --- /dev/null +++ b/package/python-apispec/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_PYTHON_APISPEC + bool "python-apispec" + select BR2_PACKAGE_PYTHON_PACKAGING # runtime + help + A pluggable API specification generator. Currently supports + the OpenAPI Specification (f.k.a. the Swagger + specification). + + https://github.com/marshmallow-code/apispec diff --git a/package/python-apispec/python-apispec.hash b/package/python-apispec/python-apispec.hash new file mode 100644 index 0000000000..9d653cc8e8 --- /dev/null +++ b/package/python-apispec/python-apispec.hash @@ -0,0 +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 +# Locally computed sha256 checksums +sha256 a452afcef750956a8396f7e7a6f913a117d28ef99a13170c29dc74c3b7a95f29 LICENSE diff --git a/package/python-apispec/python-apispec.mk b/package/python-apispec/python-apispec.mk new file mode 100644 index 0000000000..4674ce0c3d --- /dev/null +++ b/package/python-apispec/python-apispec.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-apispec +# +################################################################################ + +PYTHON_APISPEC_VERSION = 6.0.2 +PYTHON_APISPEC_SOURCE = apispec-$(PYTHON_APISPEC_VERSION).tar.gz +PYTHON_APISPEC_SITE = https://files.pythonhosted.org/packages/a7/2a/b42c17e0d653341b8f5916999892cd2d8489de127dac6118ae44531674f5 +PYTHON_APISPEC_SETUP_TYPE = setuptools +PYTHON_APISPEC_LICENSE = MIT +PYTHON_APISPEC_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From 8c41d4836999fa691c5952bd476182bf93647e7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Hundeb=C3=B8ll?= Date: Thu, 5 Jan 2023 13:59:57 +0100 Subject: [PATCH 0940/5754] package/python-webargs: new package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit webargs is a dependency of to-be-added python-flask-smorest. Signed-off-by: Martin Hundebøll Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-webargs/Config.in | 11 +++++++++++ package/python-webargs/python-webargs.hash | 5 +++++ package/python-webargs/python-webargs.mk | 14 ++++++++++++++ 5 files changed, 32 insertions(+) create mode 100644 package/python-webargs/Config.in create mode 100644 package/python-webargs/python-webargs.hash create mode 100644 package/python-webargs/python-webargs.mk diff --git a/DEVELOPERS b/DEVELOPERS index 949eef8327..7335e70d15 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1967,6 +1967,7 @@ F: package/zic/ N: Martin Hundebøll F: package/python-apispec/ +F: package/python-webargs/ N: Martin Kepplinger F: package/tslib/ diff --git a/package/Config.in b/package/Config.in index de40f2d529..747fac54bf 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1341,6 +1341,7 @@ menu "External python modules" source "package/python-wcwidth/Config.in" source "package/python-weasyprint/Config.in" source "package/python-web2py/Config.in" + source "package/python-webargs/Config.in" source "package/python-webencodings/Config.in" source "package/python-webob/Config.in" source "package/python-webpy/Config.in" diff --git a/package/python-webargs/Config.in b/package/python-webargs/Config.in new file mode 100644 index 0000000000..f2332d3b70 --- /dev/null +++ b/package/python-webargs/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_PYTHON_WEBARGS + bool "python-webargs" + select BR2_PACKAGE_PYTHON_MARSHMALLOW # runtime + select BR2_PACKAGE_PYTHON_PACKAGING # runtime + help + Declarative parsing and validation of HTTP request objects, + with built-in support for popular web frameworks, including + Flask, Django, Bottle, Tornado, Pyramid, Falcon, and + aiohttp. + + https://github.com/marshmallow-code/webargs diff --git a/package/python-webargs/python-webargs.hash b/package/python-webargs/python-webargs.hash new file mode 100644 index 0000000000..619b584807 --- /dev/null +++ b/package/python-webargs/python-webargs.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/webargs/json +md5 9fff29294a5db748eca791da2b93e370 webargs-8.2.0.tar.gz +sha256 99d68940c452e07726485a15fef43f12f8ae6c0c5b391bcba76065d4527fb85d webargs-8.2.0.tar.gz +# Locally computed sha256 checksums +sha256 5973e5dcc20b65e4eb4b4acdf273bb78a18522914ab626f496f1b070f7e6294d LICENSE diff --git a/package/python-webargs/python-webargs.mk b/package/python-webargs/python-webargs.mk new file mode 100644 index 0000000000..e048d8a4ac --- /dev/null +++ b/package/python-webargs/python-webargs.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-webargs +# +################################################################################ + +PYTHON_WEBARGS_VERSION = 8.2.0 +PYTHON_WEBARGS_SOURCE = webargs-$(PYTHON_WEBARGS_VERSION).tar.gz +PYTHON_WEBARGS_SITE = https://files.pythonhosted.org/packages/4b/7d/fece8e6547b3edde8953b1c84a63da02e1a88efcb9d7d485e4d1b25d9c47 +PYTHON_WEBARGS_SETUP_TYPE = setuptools +PYTHON_WEBARGS_LICENSE = MIT +PYTHON_WEBARGS_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From 9c3e7014105eb69db7d9c9f662ab0a5054f35797 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Hundeb=C3=B8ll?= Date: Thu, 5 Jan 2023 13:59:58 +0100 Subject: [PATCH 0941/5754] package/python-marshmallow: new package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit marshmallow is a dependency of to-be-added python-flask-smorest. Signed-off-by: Martin Hundebøll Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-marshmallow/Config.in | 8 ++++++++ package/python-marshmallow/python-marshmallow.hash | 6 ++++++ package/python-marshmallow/python-marshmallow.mk | 14 ++++++++++++++ 5 files changed, 30 insertions(+) create mode 100644 package/python-marshmallow/Config.in create mode 100644 package/python-marshmallow/python-marshmallow.hash create mode 100644 package/python-marshmallow/python-marshmallow.mk diff --git a/DEVELOPERS b/DEVELOPERS index 7335e70d15..2b05714e9c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1967,6 +1967,7 @@ F: package/zic/ N: Martin Hundebøll F: package/python-apispec/ +F: package/python-marshmallow/ F: package/python-webargs/ N: Martin Kepplinger diff --git a/package/Config.in b/package/Config.in index 747fac54bf..ece35f12c8 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1129,6 +1129,7 @@ menu "External python modules" source "package/python-markdown/Config.in" source "package/python-markdown2/Config.in" source "package/python-markupsafe/Config.in" + source "package/python-marshmallow/Config.in" source "package/python-matplotlib/Config.in" source "package/python-mbstrdecoder/Config.in" source "package/python-memory-profiler/Config.in" diff --git a/package/python-marshmallow/Config.in b/package/python-marshmallow/Config.in new file mode 100644 index 0000000000..cc1b42f465 --- /dev/null +++ b/package/python-marshmallow/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_MARSHMALLOW + bool "python-marshmallow" + select BR2_PACKAGE_PYTHON_PACKAGING # runtime + help + A lightweight library for converting complex datatypes to + and from native Python datatypes. + + https://github.com/marshmallow-code/marshmallow diff --git a/package/python-marshmallow/python-marshmallow.hash b/package/python-marshmallow/python-marshmallow.hash new file mode 100644 index 0000000000..dc277d16e5 --- /dev/null +++ b/package/python-marshmallow/python-marshmallow.hash @@ -0,0 +1,6 @@ +# md5, sha256 from https://pypi.org/pypi/marshmallow/json +md5 3cf5c42917509a199c3105466435c425 marshmallow-3.19.0.tar.gz +sha256 90032c0fd650ce94b6ec6dc8dfeb0e3ff50c144586462c389b81a07205bedb78 marshmallow-3.19.0.tar.gz +# Locally computed sha256 checksums +sha256 759dc79c383ad79340c6e41f712e80407fe0d2cb3cbaad1ed98aa9c3e28a602c LICENSE +sha256 f982e6fd97ba00973e94605b972ff04894b22c4fa937b868828b32ae8f0a7c2e docs/license.rst diff --git a/package/python-marshmallow/python-marshmallow.mk b/package/python-marshmallow/python-marshmallow.mk new file mode 100644 index 0000000000..6427296508 --- /dev/null +++ b/package/python-marshmallow/python-marshmallow.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-marshmallow +# +################################################################################ + +PYTHON_MARSHMALLOW_VERSION = 3.19.0 +PYTHON_MARSHMALLOW_SOURCE = marshmallow-$(PYTHON_MARSHMALLOW_VERSION).tar.gz +PYTHON_MARSHMALLOW_SITE = https://files.pythonhosted.org/packages/5e/59/dd465e5ab0ccb879c410f88c75189a19fd437b12cd9a03b31579aef58709 +PYTHON_MARSHMALLOW_SETUP_TYPE = setuptools +PYTHON_MARSHMALLOW_LICENSE = MIT +PYTHON_MARSHMALLOW_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From 3e9f0dc59a5c4310139040f88189d10ad0b76906 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Hundeb=C3=B8ll?= Date: Thu, 5 Jan 2023 13:59:59 +0100 Subject: [PATCH 0942/5754] package/python-marshmallow-sqlalchemy: new package Signed-off-by: Martin Hundeboll Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-marshmallow-sqlalchemy/Config.in | 10 ++++++++++ .../python-marshmallow-sqlalchemy.hash | 5 +++++ .../python-marshmallow-sqlalchemy.mk | 14 ++++++++++++++ 5 files changed, 31 insertions(+) create mode 100644 package/python-marshmallow-sqlalchemy/Config.in create mode 100644 package/python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.hash create mode 100644 package/python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.mk diff --git a/DEVELOPERS b/DEVELOPERS index 2b05714e9c..bcf377d3d4 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1968,6 +1968,7 @@ F: package/zic/ N: Martin Hundebøll F: package/python-apispec/ F: package/python-marshmallow/ +F: package/python-marshmallow-sqlalchemy/ F: package/python-webargs/ N: Martin Kepplinger diff --git a/package/Config.in b/package/Config.in index ece35f12c8..3807050eeb 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1130,6 +1130,7 @@ menu "External python modules" source "package/python-markdown2/Config.in" source "package/python-markupsafe/Config.in" source "package/python-marshmallow/Config.in" + source "package/python-marshmallow-sqlalchemy/Config.in" source "package/python-matplotlib/Config.in" source "package/python-mbstrdecoder/Config.in" source "package/python-memory-profiler/Config.in" diff --git a/package/python-marshmallow-sqlalchemy/Config.in b/package/python-marshmallow-sqlalchemy/Config.in new file mode 100644 index 0000000000..f48d27edd6 --- /dev/null +++ b/package/python-marshmallow-sqlalchemy/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_PYTHON_MARSHMALLOW_SQLALCHEMY + bool "python-marshmallow-sqlalchemy" + select BR2_PACKAGE_PYTHON_MARSHMALLOW # runtime + select BR2_PACKAGE_PYTHON_PACKAGING # runtime + select BR2_PACKAGE_PYTHON_SQLALCHEMY # runtime + help + SQLAlchemy integration with the marshmallow + (de)serialization library. + + https://github.com/marshmallow-code/marshmallow-sqlalchemy diff --git a/package/python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.hash b/package/python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.hash new file mode 100644 index 0000000000..6b847de94d --- /dev/null +++ b/package/python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.hash @@ -0,0 +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 +# 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 new file mode 100644 index 0000000000..293ea29be6 --- /dev/null +++ b/package/python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-marshmallow-sqlalchemy +# +################################################################################ + +PYTHON_MARSHMALLOW_SQLALCHEMY_VERSION = 0.28.1 +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_SETUP_TYPE = setuptools +PYTHON_MARSHMALLOW_SQLALCHEMY_LICENSE = MIT +PYTHON_MARSHMALLOW_SQLALCHEMY_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From d00e437922fb1b611f35c3138b9fbf7bcff62757 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Hundeb=C3=B8ll?= Date: Thu, 5 Jan 2023 14:00:00 +0100 Subject: [PATCH 0943/5754] package/python-flask-smorest: new package 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 --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-flask-smorest/Config.in | 11 +++++++++++ .../python-flask-smorest/python-flask-smorest.hash | 5 +++++ .../python-flask-smorest/python-flask-smorest.mk | 14 ++++++++++++++ 5 files changed, 32 insertions(+) create mode 100644 package/python-flask-smorest/Config.in create mode 100644 package/python-flask-smorest/python-flask-smorest.hash create mode 100644 package/python-flask-smorest/python-flask-smorest.mk diff --git a/DEVELOPERS b/DEVELOPERS index bcf377d3d4..f8451c7fec 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1967,6 +1967,7 @@ F: package/zic/ N: Martin Hundebøll F: package/python-apispec/ +F: package/python-flask-smorest/ F: package/python-marshmallow/ F: package/python-marshmallow-sqlalchemy/ F: package/python-webargs/ diff --git a/package/Config.in b/package/Config.in index 3807050eeb..0af4adffa5 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1058,6 +1058,7 @@ menu "External python modules" source "package/python-flask-expects-json/Config.in" source "package/python-flask-jsonrpc/Config.in" source "package/python-flask-login/Config.in" + source "package/python-flask-smorest/Config.in" source "package/python-flask-sqlalchemy/Config.in" source "package/python-flask-wtf/Config.in" source "package/python-flatbuffers/Config.in" diff --git a/package/python-flask-smorest/Config.in b/package/python-flask-smorest/Config.in new file mode 100644 index 0000000000..a8ccfbd9f7 --- /dev/null +++ b/package/python-flask-smorest/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_PYTHON_FLASK_SMOREST + bool "python-flask-smorest" + select BR2_PACKAGE_PYTHON_APISPEC # runtime + select BR2_PACKAGE_PYTHON_FLASK # runtime + select BR2_PACKAGE_PYTHON_MARSHMALLOW # runtime + select BR2_PACKAGE_PYTHON_WEBARGS # runtime + select BR2_PACKAGE_PYTHON_WERKZEUG # runtime + help + Flask/Marshmallow-based REST API framework. + + https://github.com/marshmallow-code/flask-smorest diff --git a/package/python-flask-smorest/python-flask-smorest.hash b/package/python-flask-smorest/python-flask-smorest.hash new file mode 100644 index 0000000000..5abe0c5033 --- /dev/null +++ b/package/python-flask-smorest/python-flask-smorest.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/flask-smorest/json +md5 1dad52f26c59ca2dcaf0c5d109879605 flask-smorest-0.40.0.tar.gz +sha256 9b46b4937ccf78702d99fed8cfd1cd5c37608ddefd65ff16a86d1ad5c7f7d8c0 flask-smorest-0.40.0.tar.gz +# Locally computed sha256 checksums +sha256 40999ea1d9c1b8202fa44f8e6849a557e22df892481e067abf999879064b9521 LICENSE diff --git a/package/python-flask-smorest/python-flask-smorest.mk b/package/python-flask-smorest/python-flask-smorest.mk new file mode 100644 index 0000000000..069d9244dd --- /dev/null +++ b/package/python-flask-smorest/python-flask-smorest.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-flask-smorest +# +################################################################################ + +PYTHON_FLASK_SMOREST_VERSION = 0.40.0 +PYTHON_FLASK_SMOREST_SOURCE = flask-smorest-$(PYTHON_FLASK_SMOREST_VERSION).tar.gz +PYTHON_FLASK_SMOREST_SITE = https://files.pythonhosted.org/packages/e6/b5/1b81ea4f7e377cf8a653aa10c249656a1c73de7a3695b2544d7a713ea3c2 +PYTHON_FLASK_SMOREST_SETUP_TYPE = setuptools +PYTHON_FLASK_SMOREST_LICENSE = MIT +PYTHON_FLASK_SMOREST_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From 5336566668bd2ac9cd458a051eb6e8105d4b4544 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Fri, 6 Jan 2023 22:08:25 +0100 Subject: [PATCH 0944/5754] package/dotconf: new package Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 +++ package/Config.in | 1 + package/dotconf/Config.in | 6 ++++++ package/dotconf/dotconf.hash | 3 +++ package/dotconf/dotconf.mk | 15 +++++++++++++++ 5 files changed, 28 insertions(+) create mode 100644 package/dotconf/Config.in create mode 100644 package/dotconf/dotconf.hash create mode 100644 package/dotconf/dotconf.mk diff --git a/DEVELOPERS b/DEVELOPERS index f8451c7fec..b9d54feb46 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2297,6 +2297,9 @@ F: package/wireguard-linux-compat/ F: package/wireguard-tools/ F: support/testing/tests/package/test_docker_compose.py +N: Peter Seiderer +F: package/dotconf/ + N: Peter Thompson F: package/sdl2_gfx/ F: package/sdl2_image/ diff --git a/package/Config.in b/package/Config.in index 0af4adffa5..b2808cc6f8 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2019,6 +2019,7 @@ menu "Other" source "package/cracklib/Config.in" source "package/dawgdic/Config.in" source "package/ding-libs/Config.in" + source "package/dotconf/Config.in" source "package/double-conversion/Config.in" source "package/eigen/Config.in" source "package/elfutils/Config.in" diff --git a/package/dotconf/Config.in b/package/dotconf/Config.in new file mode 100644 index 0000000000..21a74fa065 --- /dev/null +++ b/package/dotconf/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_DOTCONF + bool "dotconf" + help + Configuration file parser. + + https://github.com/williamh/dotconf diff --git a/package/dotconf/dotconf.hash b/package/dotconf/dotconf.hash new file mode 100644 index 0000000000..3233ea62c8 --- /dev/null +++ b/package/dotconf/dotconf.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 7f1ecf40de1ad002a065a321582ed34f8c14242309c3547ad59710ae3c805653 dotconf-1.3.tar.gz +sha256 a50cc98d5044a7bbddabe61fc0ec42aa671c73bf414d0c6b50da83ea8ae041c6 COPYING diff --git a/package/dotconf/dotconf.mk b/package/dotconf/dotconf.mk new file mode 100644 index 0000000000..26e78b3c7a --- /dev/null +++ b/package/dotconf/dotconf.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# dotconf +# +################################################################################ + +DOTCONF_VERSION = 1.3 +DOTCONF_SITE = $(call github,williamh,dotconf,v$(DOTCONF_VERSION)) +DOTCONF_LICENSE = LGPL-2.1 +DOTCONF_LICENSE_FILES = COPYING +DOTCONF_INSTALL_STAGING = YES +# dotconf source code is released without configure script +DOTCONF_AUTORECONF = YES + +$(eval $(autotools-package)) From 9f4f8c5f8993c6d7c2ef730ac211ef84ac9ae26d Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Fri, 6 Jan 2023 22:08:26 +0100 Subject: [PATCH 0945/5754] package/speechd: new package Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/speechd/Config.in | 20 ++++++++++++++++++++ package/speechd/speechd.hash | 5 +++++ package/speechd/speechd.mk | 34 ++++++++++++++++++++++++++++++++++ 5 files changed, 61 insertions(+) create mode 100644 package/speechd/Config.in create mode 100644 package/speechd/speechd.hash create mode 100644 package/speechd/speechd.mk diff --git a/DEVELOPERS b/DEVELOPERS index b9d54feb46..319ea9f4dc 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2299,6 +2299,7 @@ F: support/testing/tests/package/test_docker_compose.py N: Peter Seiderer F: package/dotconf/ +F: package/speechd/ N: Peter Thompson F: package/sdl2_gfx/ diff --git a/package/Config.in b/package/Config.in index b2808cc6f8..e9746862b4 100644 --- a/package/Config.in +++ b/package/Config.in @@ -51,6 +51,7 @@ menu "Audio and video applications" source "package/pipewire-media-session/Config.in" source "package/pulseaudio/Config.in" source "package/sox/Config.in" + source "package/speechd/Config.in" source "package/squeezelite/Config.in" source "package/tinycompress/Config.in" source "package/tovid/Config.in" diff --git a/package/speechd/Config.in b/package/speechd/Config.in new file mode 100644 index 0000000000..8fdc452d19 --- /dev/null +++ b/package/speechd/Config.in @@ -0,0 +1,20 @@ +config BR2_PACKAGE_SPEECHD + bool "speechd" + depends on BR2_USE_WCHAR # libglib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 + depends on BR2_USE_MMU # libglib2 + depends on !BR2_STATIC_LIBS + select BR2_PACKAGE_DOTCONF + select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_LIBSNDFILE + help + Speech Dispatcher project provides a high-level device + independent layer for access to speech synthesis through + a simple, stable and well documented interface. + + https://freebsoft.org/speechd + +comment "speechd needs a toolchain w/ wchar, threads, dynamic library" + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + BR2_STATIC_LIBS diff --git a/package/speechd/speechd.hash b/package/speechd/speechd.hash new file mode 100644 index 0000000000..4eb4cd09d2 --- /dev/null +++ b/package/speechd/speechd.hash @@ -0,0 +1,5 @@ +# Locally calculated +sha256 628d4446894b47f0df099123924c1070180b5b5b09c5b637ebe80d8578fba92f speechd-0.11.4.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 new file mode 100644 index 0000000000..0d43e4b6fb --- /dev/null +++ b/package/speechd/speechd.mk @@ -0,0 +1,34 @@ +################################################################################ +# +# speechd +# +################################################################################ + +SPEECHD_VERSION = 0.11.4 +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 +SPEECHD_INSTALL_STAGING = YES +# speechd source code is released without configure script +SPEECHD_AUTORECONF = YES +SPEECHD_DEPENDENCIES = host-pkgconf dotconf libglib2 libsndfile + +# fix missing config.rpath (needed for autoreconf) in the codebase +define SPEECHD_TOUCH_CONFIG_RPATH + touch $(@D)/config.rpath +endef +SPEECHD_PRE_CONFIGURE_HOOKS += SPEECHD_TOUCH_CONFIG_RPATH + +ifeq ($(BR2_PACKAGE_LIBTOOL),y) +SPEECHD_DEPENDENCIES += libtool +SPEECHD_CONF_OPTS += --with-libltdl +else +SPEECHD_CONF_OPTS += --without-libltdl +endif + +define SPEECHD_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 644 $(@D)/speech-dispatcherd.service \ + $(TARGET_DIR)/usr/lib/systemd/system/speech-dispatcherd.service +endef + +$(eval $(autotools-package)) From 4ced0a528ddbffcc130997aaeee7598c82c6cd49 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Fri, 6 Jan 2023 22:08:27 +0100 Subject: [PATCH 0946/5754] package/qt5/qt5speech: new package Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/qt5/Config.in | 1 + package/qt5/qt5speech/Config.in | 12 ++++++++++++ package/qt5/qt5speech/qt5speech.hash | 7 +++++++ package/qt5/qt5speech/qt5speech.mk | 23 +++++++++++++++++++++++ 5 files changed, 44 insertions(+) create mode 100644 package/qt5/qt5speech/Config.in create mode 100644 package/qt5/qt5speech/qt5speech.hash create mode 100644 package/qt5/qt5speech/qt5speech.mk diff --git a/DEVELOPERS b/DEVELOPERS index 319ea9f4dc..a429f81cc9 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2299,6 +2299,7 @@ F: support/testing/tests/package/test_docker_compose.py N: Peter Seiderer F: package/dotconf/ +F: package/qt5/qt5speech/ F: package/speechd/ N: Peter Thompson diff --git a/package/qt5/Config.in b/package/qt5/Config.in index 6dc9cfa148..f1b16ff39b 100644 --- a/package/qt5/Config.in +++ b/package/qt5/Config.in @@ -59,6 +59,7 @@ source "package/qt5/qt5scxml/Config.in" source "package/qt5/qt5sensors/Config.in" source "package/qt5/qt5serialbus/Config.in" source "package/qt5/qt5serialport/Config.in" +source "package/qt5/qt5speech/Config.in" source "package/qt5/qt5svg/Config.in" source "package/qt5/qt5tools/Config.in" source "package/qt5/qt5virtualkeyboard/Config.in" diff --git a/package/qt5/qt5speech/Config.in b/package/qt5/qt5speech/Config.in new file mode 100644 index 0000000000..cebd06057e --- /dev/null +++ b/package/qt5/qt5speech/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_QT5SPEECH + bool "qt5speech" + help + Qt is a cross-platform application and UI framework for + developers using C++. + + Qt Speech enables support for accessibility features such as + text-to-speech. + + For output optional enable flite or speechd. + + https://doc.qt.io/qt-5/qtspeech-index.html diff --git a/package/qt5/qt5speech/qt5speech.hash b/package/qt5/qt5speech/qt5speech.hash new file mode 100644 index 0000000000..595aac9f22 --- /dev/null +++ b/package/qt5/qt5speech/qt5speech.hash @@ -0,0 +1,7 @@ +# Locally calculated +sha256 6d0794ab9d5286d04fbac2db44c00ed3306e569c876f84cfd91ac0e79c834b1e qtspeech-d32f4a479d38a11f547598004b975f4356424a16.tar.bz2 + +# Hashes for license files: +sha256 6c3f3c31b93985f1b93bfbb35fb609d37281697d0efc220c9f91cf4b59eaabde LICENSE.GPLv2 +sha256 75d800e60c8d58c2e7f0338e8552ea6123a9ce7e5dd8e1cdf2095e013b737488 LICENSE.LGPLv3 +sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/package/qt5/qt5speech/qt5speech.mk b/package/qt5/qt5speech/qt5speech.mk new file mode 100644 index 0000000000..8cf6fe19c1 --- /dev/null +++ b/package/qt5/qt5speech/qt5speech.mk @@ -0,0 +1,23 @@ +################################################################################ +# +# qt5speech +# +################################################################################ + +QT5SPEECH_VERSION = d32f4a479d38a11f547598004b975f4356424a16 +QT5SPEECH_SITE = $(QT5_SITE)/qtspeech/-/archive/$(QT5SPEECH_VERSION) +QT5SPEECH_SOURCE = qtspeech-$(QT5SPEECH_VERSION).tar.bz2 +QT5SPEECH_INSTALL_STAGING = YES +QT5SPEECH_LICENSE = GPL-2.0+ or LGPL-3.0, GFDL-1.3 (docs) +QT5SPEECH_LICENSE_FILES = LICENSE.GPLv2 LICENSE.LGPLv3 LICENSE.FDL +QT5SPEECH_SYNC_QT_HEADERS = YES + +ifeq ($(BR2_PACKAGE_FLITE),y) +QT5SPEECH_DEPENDENCIES += flite +endif + +ifeq ($(BR2_PACKAGE_SPEECHD),y) +QT5SPEECH_DEPENDENCIES += speechd +endif + +$(eval $(qmake-package)) From a850f632b9f76b8526f807468548c570b1dc2bd6 Mon Sep 17 00:00:00 2001 From: Nasser Afshin Date: Sat, 29 Oct 2022 11:32:29 +0330 Subject: [PATCH 0947/5754] package/python-pycrate: new package Signed-off-by: Nasser Afshin Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 +++ package/Config.in | 1 + package/python-pycrate/Config.in | 6 ++++++ package/python-pycrate/python-pycrate.hash | 5 +++++ package/python-pycrate/python-pycrate.mk | 20 ++++++++++++++++++++ 5 files changed, 35 insertions(+) create mode 100644 package/python-pycrate/Config.in create mode 100644 package/python-pycrate/python-pycrate.hash create mode 100644 package/python-pycrate/python-pycrate.mk diff --git a/DEVELOPERS b/DEVELOPERS index a429f81cc9..3d9c51a094 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2092,6 +2092,9 @@ N: Murat Demirten F: package/jpeg-turbo/ F: package/libgeotiff/ +N: Nasser Afshin +F: package/python-pycrate/ + N: Nathaniel Roach F: package/bandwidthd/ F: package/libgudev/ diff --git a/package/Config.in b/package/Config.in index e9746862b4..523cf7cbdf 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1196,6 +1196,7 @@ menu "External python modules" source "package/python-pycairo/Config.in" source "package/python-pycares/Config.in" source "package/python-pycparser/Config.in" + source "package/python-pycrate/Config.in" source "package/python-pycryptodomex/Config.in" source "package/python-pycups/Config.in" source "package/python-pydal/Config.in" diff --git a/package/python-pycrate/Config.in b/package/python-pycrate/Config.in new file mode 100644 index 0000000000..193a973f7e --- /dev/null +++ b/package/python-pycrate/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_PYCRATE + bool "python-pycrate" + help + A software suite to handle various data formats. + + https://github.com/P1sec/pycrate/ diff --git a/package/python-pycrate/python-pycrate.hash b/package/python-pycrate/python-pycrate.hash new file mode 100644 index 0000000000..e37fd6743a --- /dev/null +++ b/package/python-pycrate/python-pycrate.hash @@ -0,0 +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 +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 license.txt diff --git a/package/python-pycrate/python-pycrate.mk b/package/python-pycrate/python-pycrate.mk new file mode 100644 index 0000000000..6779433556 --- /dev/null +++ b/package/python-pycrate/python-pycrate.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# python-pycrate +# +################################################################################ + +PYTHON_PYCRATE_VERSION = 0.5.5 +PYTHON_PYCRATE_SOURCE = pycrate-$(PYTHON_PYCRATE_VERSION).tar.gz +PYTHON_PYCRATE_SITE = https://files.pythonhosted.org/packages/25/8f/b3d7e0b541aa04b2f0f7aa694a6946b572bfa2e2627cf1f12b5416d633df +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+ +PYTHON_PYCRATE_LICENSE_FILES = license.txt + +define PYTHON_PYCRATE_ADD_LICENSE_FILE + cp $(PYTHON_PYCRATE_DL_DIR)/license.txt $(@D) +endef +PYTHON_PYCRATE_POST_EXTRACT_HOOKS += PYTHON_PYCRATE_ADD_LICENSE_FILE + +$(eval $(python-package)) From c5b597d5d839486e82a80f1c59c2a91a5af87c06 Mon Sep 17 00:00:00 2001 From: Michael Nosthoff Date: Tue, 25 Oct 2022 21:01:09 +0200 Subject: [PATCH 0948/5754] package/catch2: new package Catch2 is a modern C++ unit testing framework which is increasing in popularity. This package is staging only and allows to build tests to be run on the target. - https://github.com/catchorg/Catch2 Signed-off-by: Michael Nosthoff Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/catch2/Config.in | 28 ++++++++++++++++++++++++++++ package/catch2/catch2.hash | 3 +++ package/catch2/catch2.mk | 22 ++++++++++++++++++++++ 5 files changed, 55 insertions(+) create mode 100644 package/catch2/Config.in create mode 100644 package/catch2/catch2.hash create mode 100644 package/catch2/catch2.mk diff --git a/DEVELOPERS b/DEVELOPERS index 3d9c51a094..7894b10e38 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2035,6 +2035,7 @@ F: package/sdl2/ N: Michael Nosthoff F: package/boost/ +F: package/catch2/ F: package/fmt/ F: package/grpc/ F: package/gtest/ diff --git a/package/Config.in b/package/Config.in index 523cf7cbdf..6c5238a9b0 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2012,6 +2012,7 @@ menu "Other" source "package/boost/Config.in" source "package/c-capnproto/Config.in" source "package/capnproto/Config.in" + source "package/catch2/Config.in" source "package/cctz/Config.in" source "package/cereal/Config.in" source "package/clang/Config.in" diff --git a/package/catch2/Config.in b/package/catch2/Config.in new file mode 100644 index 0000000000..2f53d197b2 --- /dev/null +++ b/package/catch2/Config.in @@ -0,0 +1,28 @@ +config BR2_PACKAGE_CATCH2 + bool "catch2" + depends on BR2_USE_WCHAR + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 + depends on BR2_USE_MMU # fork() + help + Catch2 is mainly a unit testing framework for C++, but it + also provides basic micro-benchmarking features, and simple + BDD macros. + + Catch2's main advantage is that using it is both simple and + natural. Tests autoregister themselves and do not have to + be named with valid identifiers, assertions look like + normal C++ code, and sections provide a nice way to share + set-up and tear-down code in tests. + + This package allows running testsuites on the target which + might be advantageous in certain cases. + + https://github.com/catchorg/Catch2 + +comment "catch2 needs a toolchain w/ C++, wchar, threads, gcc >= 4.9" + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/catch2/catch2.hash b/package/catch2/catch2.hash new file mode 100644 index 0000000000..664164fd76 --- /dev/null +++ b/package/catch2/catch2.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 2106bccfec18c8ce673623d56780220e38527dd8f283ccba26aa4b8758737d0e catch2-3.1.1.tar.gz +sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE.txt diff --git a/package/catch2/catch2.mk b/package/catch2/catch2.mk new file mode 100644 index 0000000000..ab62cc943b --- /dev/null +++ b/package/catch2/catch2.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# catch2 +# +################################################################################ + +CATCH2_VERSION = 3.1.1 +CATCH2_SITE = $(call github,catchorg,Catch2,v$(CATCH2_VERSION)) +CATCH2_INSTALL_STAGING = YES +CATCH2_INSTALL_TARGET = NO +CATCH2_LICENSE = BSL-1.0 +CATCH2_LICENSE_FILES = LICENSE.txt +CATCH2_SUPPORTS_IN_SOURCE_BUILD = NO + +# We force building a static library only as building a dynamic +# library is not really supported officially: +# https://github.com/catchorg/Catch2/blob/devel/docs/faq.md#can-i-compile-catch2-into-a-dynamic-library +CATCH2_CONF_OPTS = \ + -DCATCH_INSTALL_DOCS=OFF \ + -DBUILD_SHARED_LIBS=OFF + +$(eval $(cmake-package)) From c5357f650d7e58043a5b8ab820972984eb07fef4 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 30 Oct 2022 18:56:31 +0100 Subject: [PATCH 0949/5754] package/openipmi: add libexecinfo optional dependency Add libexecinfo optional dependency as upstream rejected the patch to add --with-execinfo=no Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...igure.ac-add-without-execinfo-option.patch | 55 ------------------- package/openipmi/openipmi.mk | 6 +- 2 files changed, 5 insertions(+), 56 deletions(-) delete mode 100644 package/openipmi/0002-configure.ac-add-without-execinfo-option.patch diff --git a/package/openipmi/0002-configure.ac-add-without-execinfo-option.patch b/package/openipmi/0002-configure.ac-add-without-execinfo-option.patch deleted file mode 100644 index e1838a06f4..0000000000 --- a/package/openipmi/0002-configure.ac-add-without-execinfo-option.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 388033e3d0129510c3884333bc428cefeb75e0b8 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 3 Jan 2022 23:27:21 +0100 -Subject: [PATCH] configure.ac: add --without-execinfo option - -Add an option to allow the user to disable execinfo to avoid the -following build failure on musl with -https://github.com/mikroskeem/libexecinfo: - -/home/buildroot/autobuild/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-musl/10.3.0/../../../../x86_64-buildroot-linux-musl/bin/ld: /home/buildroot/autobuild/instance-3/output-1/build/openipmi-2.0.28/utils/.libs/libOpenIPMIutils.so: undefined reference to `backtrace' - -Fixes: - - http://autobuild.buildroot.org/results/dcc33c5cca97d538231647a94212450f043974b3 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://sourceforge.net/p/openipmi/patches/36] ---- - configure.ac | 14 +++++++++++++- - 1 file changed, 13 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 607864b9..f369166f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -77,6 +77,16 @@ AC_ARG_WITH(poptlibs, - POPTLIBS="$withval" - ) - -+tryexecinfo=yes -+AC_ARG_WITH(execinfo, -+[ --with-execinfo[[=yes|no]] Look for execinfo.], -+ if test "x$withval" = "xyes"; then -+ tryexecinfo=yes -+ elif test "x$withval" = "xno"; then -+ tryexecinfo=no -+ fi, -+) -+ - # If UCD SNMP requires OpenSSL, this tells where to find the crypto lib - tryopenssl=yes - AC_ARG_WITH(openssl, -@@ -275,7 +285,9 @@ AM_PROG_CC_C_O - AC_PROG_LIBTOOL - AC_STDC_HEADERS - --AC_CHECK_HEADERS(execinfo.h) -+if test "x$tryexecinfo" != "xno"; then -+ AC_CHECK_HEADERS(execinfo.h) -+fi - AC_CHECK_HEADERS([netinet/ether.h]) - AC_CHECK_HEADERS([sys/ethernet.h]) - --- -2.34.1 - diff --git a/package/openipmi/openipmi.mk b/package/openipmi/openipmi.mk index b3a4d90d4b..81492ec131 100644 --- a/package/openipmi/openipmi.mk +++ b/package/openipmi/openipmi.mk @@ -15,7 +15,6 @@ OPENIPMI_INSTALL_STAGING = YES OPENIPMI_AUTORECONF = YES OPENIPMI_CONF_ENV = ac_cv_path_pkgprog="$(PKG_CONFIG_HOST_BINARY)" OPENIPMI_CONF_OPTS = \ - --with-execinfo=no \ --with-glib=no \ --with-tcl=no \ --with-perl=no \ @@ -26,6 +25,11 @@ ifeq ($(BR2_PACKAGE_GDBM),y) OPENIPMI_DEPENDENCIES += gdbm endif +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +OPENIPMI_DEPENDENCIES += libexecinfo +OPENIPMI_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -lexecinfo" +endif + ifeq ($(BR2_PACKAGE_OPENSSL),y) OPENIPMI_DEPENDENCIES += openssl OPENIPMI_CONF_OPTS += --with-openssl=yes From c674014c1744dd6db3dd8717efca51fe7ceb1038 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 30 Oct 2022 18:56:32 +0100 Subject: [PATCH 0950/5754] package/openipmi: bump to version 2.0.33 Drop patch (already in version) and so also drop autoreconf Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...01-Avoid-searching-host-library-path.patch | 53 ------------------- package/openipmi/openipmi.hash | 6 +-- package/openipmi/openipmi.mk | 4 +- 3 files changed, 4 insertions(+), 59 deletions(-) delete mode 100644 package/openipmi/0001-Avoid-searching-host-library-path.patch diff --git a/package/openipmi/0001-Avoid-searching-host-library-path.patch b/package/openipmi/0001-Avoid-searching-host-library-path.patch deleted file mode 100644 index 15b4510f67..0000000000 --- a/package/openipmi/0001-Avoid-searching-host-library-path.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Wed, 22 Jul 2015 07:04:33 +0300 -Subject: [PATCH] Avoid searching host library path - -The $(libdir) variable points to the location of the directory on the target -system, /usr/lib by default. When cross compiling this directory contains the -host libraries which may be different than target libraries. Don't use -$(libdir) in the library search path. - -Signed-off-by: Baruch Siach -Signed-off-by: Joel Stanley -[Fabrice: refresh patch for 2.0.32] -Signed-off-by: Fabrice Fontaine -[Upstream status: https://sourceforge.net/p/openipmi/patches/35] ---- - cmdlang/Makefile.am | 3 +-- - unix/Makefile.am | 6 ++---- - 2 files changed, 3 insertions(+), 6 deletions(-) - -diff --git a/cmdlang/Makefile.am b/cmdlang/Makefile.am -index 264ee12be79f..0b3843784656 100644 ---- a/cmdlang/Makefile.am -+++ b/cmdlang/Makefile.am -@@ -15,7 +15,7 @@ libOpenIPMIcmdlang_la_SOURCES = cmdlang.c cmd_domain.c cmd_entity.c cmd_mc.c \ - $(top_builddir)/utils/libOpenIPMIutils.la \ - $(top_builddir)/lib/libOpenIPMI.la - libOpenIPMIcmdlang_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ -- -L$(libdir) -no-undefined -+ -no-undefined - - bin_PROGRAMS = openipmish - -diff --git a/unix/Makefile.am b/unix/Makefile.am -index 5128839dad13..bd0f897ba8d6 100644 ---- a/unix/Makefile.am -+++ b/unix/Makefile.am -@@ -10,12 +10,12 @@ lib_LTLIBRARIES = libOpenIPMIposix.la libOpenIPMIpthread.la - libOpenIPMIpthread_la_LIBADD = -lpthread $(GDBM_LIB) \ - $(top_builddir)/utils/libOpenIPMIutils.la $(RT_LIB) - libOpenIPMIpthread_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ -- -L$(libdir) -no-undefined -+ -no-undefined - - libOpenIPMIposix_la_SOURCES = posix_os_hnd.c selector.c - libOpenIPMIposix_la_LIBADD = $(top_builddir)/utils/libOpenIPMIutils.la \ - $(GDBM_LIB) $(RT_LIB) - libOpenIPMIposix_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ -- -L$(libdir) -no-undefined -+ -no-undefined - - noinst_HEADERS = heap.h - diff --git a/package/openipmi/openipmi.hash b/package/openipmi/openipmi.hash index eded076ade..fc3cf1a520 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 73d7dce4312b006983b11367e4a43d4ec52cf888 OpenIPMI-2.0.32.tar.gz -md5 532404c9df7d0e8bde975b95b9e6775b OpenIPMI-2.0.32.tar.gz +sha1 4387f227aad92756e296d1c9421e83231d355dbd OpenIPMI-2.0.33.tar.gz +md5 923d2914dbbc3307712f8c58401bab0f OpenIPMI-2.0.33.tar.gz # Locally computed -sha256 f6d0fd4c0a74b05f80907229d0b270f54ca23294bcc11979f8b8d12766786945 OpenIPMI-2.0.32.tar.gz +sha256 fb53e9ea5e2681cf8af7cda024b1a0044c675f84116ca27ae9616c8b7ad95b49 OpenIPMI-2.0.33.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 81492ec131..ccf86f93cd 100644 --- a/package/openipmi/openipmi.mk +++ b/package/openipmi/openipmi.mk @@ -4,15 +4,13 @@ # ################################################################################ -OPENIPMI_VERSION = 2.0.32 +OPENIPMI_VERSION = 2.0.33 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 OPENIPMI_LICENSE_FILES = COPYING.LIB COPYING COPYING.BSD OPENIPMI_DEPENDENCIES = popt ncurses readline host-pkgconf OPENIPMI_INSTALL_STAGING = YES -# Patching Makefile.am -OPENIPMI_AUTORECONF = YES OPENIPMI_CONF_ENV = ac_cv_path_pkgprog="$(PKG_CONFIG_HOST_BINARY)" OPENIPMI_CONF_OPTS = \ --with-glib=no \ From 4336a86a0c414db7fbb3ff61d66e38bd916bb04e Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 17 Feb 2023 16:25:01 +0100 Subject: [PATCH 0951/5754] package/python-apispec: fix formatting in hash file Fixes: package/python-apispec/python-apispec.hash:2: separation does not match expectation (http://nightly.buildroot.org/#adding-packages-hash) Signed-off-by: Thomas Petazzoni --- package/python-apispec/python-apispec.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-apispec/python-apispec.hash b/package/python-apispec/python-apispec.hash index 9d653cc8e8..f2861f920a 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 +md5 b4e90006a26215e2e0a6fe2629d12c10 apispec-6.0.2.tar.gz sha256 e76d80b739edef4be213092a6384ad7fd933ba7d64f6d5a0aff8d4da1bef7887 apispec-6.0.2.tar.gz # Locally computed sha256 checksums sha256 a452afcef750956a8396f7e7a6f913a117d28ef99a13170c29dc74c3b7a95f29 LICENSE From 41cca5274a8afce269f9b2bdc9e113e073e28abb Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 18 Feb 2023 12:14:21 +0100 Subject: [PATCH 0952/5754] package/python-flask-smorest: fix formatting in hash file Fixes: package/python-flask-smorest/python-flask-smorest.hash:5: separation does not match expectation (http://nightly.buildroot.org/#adding-packages-hash) Signed-off-by: Thomas Petazzoni --- package/python-flask-smorest/python-flask-smorest.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-flask-smorest/python-flask-smorest.hash b/package/python-flask-smorest/python-flask-smorest.hash index 5abe0c5033..941535c503 100644 --- a/package/python-flask-smorest/python-flask-smorest.hash +++ b/package/python-flask-smorest/python-flask-smorest.hash @@ -2,4 +2,4 @@ md5 1dad52f26c59ca2dcaf0c5d109879605 flask-smorest-0.40.0.tar.gz sha256 9b46b4937ccf78702d99fed8cfd1cd5c37608ddefd65ff16a86d1ad5c7f7d8c0 flask-smorest-0.40.0.tar.gz # Locally computed sha256 checksums -sha256 40999ea1d9c1b8202fa44f8e6849a557e22df892481e067abf999879064b9521 LICENSE +sha256 40999ea1d9c1b8202fa44f8e6849a557e22df892481e067abf999879064b9521 LICENSE From b6085c00d0feece6f3ba635e7847ea653bc5fac3 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 18 Feb 2023 12:15:05 +0100 Subject: [PATCH 0953/5754] package/python-webargs: fix formatting in hash file Fixes: package/python-webargs/python-webargs.hash:2: separation does not match expectation (http://nightly.buildroot.org/#adding-packages-hash) Signed-off-by: Thomas Petazzoni --- package/python-webargs/python-webargs.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-webargs/python-webargs.hash b/package/python-webargs/python-webargs.hash index 619b584807..10bb3651f0 100644 --- a/package/python-webargs/python-webargs.hash +++ b/package/python-webargs/python-webargs.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/webargs/json -md5 9fff29294a5db748eca791da2b93e370 webargs-8.2.0.tar.gz +md5 9fff29294a5db748eca791da2b93e370 webargs-8.2.0.tar.gz sha256 99d68940c452e07726485a15fef43f12f8ae6c0c5b391bcba76065d4527fb85d webargs-8.2.0.tar.gz # Locally computed sha256 checksums sha256 5973e5dcc20b65e4eb4b4acdf273bb78a18522914ab626f496f1b070f7e6294d LICENSE From be235c048f004617851d7ef752ee5f4dc2373e28 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 16 Feb 2023 19:20:36 +0100 Subject: [PATCH 0954/5754] package/python3: bump version to 3.11.2 Changelog: https://docs.python.org/release/3.11.2/whatsnew/changelog.html#python-3-11-2 Updated license hash due to copyright year bump: https://github.com/python/cpython/commit/07d1f99e8faefcf24dab2113fb0df27202fa6f71 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/python3/python3.hash | 4 ++-- package/python3/python3.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python3/python3.hash b/package/python3/python3.hash index 7f079865d9..f235347efb 100644 --- a/package/python3/python3.hash +++ b/package/python3/python3.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 85879192f2cffd56cb16c092905949ebf3e5e394b7f764723529637901dfb58f Python-3.11.1.tar.xz -sha256 d4a223f033419313218c9b8444167e91e87a5bebdb43fb8490df441df5220a8b LICENSE +sha256 29e4b8f5f1658542a8c13e2dd277358c9c48f2b2f7318652ef1675e402b9d2af Python-3.11.2.tar.xz +sha256 3b2f81fe21d181c499c59a256c8e1968455d6689d269aa85373bfb6af41da3bf LICENSE diff --git a/package/python3/python3.mk b/package/python3/python3.mk index fb6dbf2e64..56fe95cd07 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).1 +PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).2 PYTHON3_SOURCE = Python-$(PYTHON3_VERSION).tar.xz PYTHON3_SITE = https://python.org/ftp/python/$(PYTHON3_VERSION) PYTHON3_LICENSE = Python-2.0, others From 66b1926764582a628b0b6b68a3aebe4b9790ab12 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 16 Feb 2023 19:24:10 +0100 Subject: [PATCH 0955/5754] package/php: security bump version to 8.2.3 Changelog: https://www.php.net/ChangeLog-8.php#8.2.3 Fixes CVE-2023-0567, CVE-2023-0568 & CVE-2023-0662. 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 869cb9b94f..41aa326156 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 bdc4aa38e652bac86039601840bae01c0c3653972eaa6f9f93d5f71953a7ee33 php-8.2.2.tar.xz +sha256 b9b566686e351125d67568a33291650eb8dfa26614d205d70d82e6e92613d457 php-8.2.3.tar.xz # License file sha256 080d0d0cca64181ef8bf1df9fba0c6f0c485f78f79540c479a45b593bb3b33b5 LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index 9ce153f4fa..bd7d5a8c3c 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.2.2 +PHP_VERSION = 8.2.3 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From 9fc69996bcd190e693b1af95cc44fda89028d049 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 16 Feb 2023 19:28:00 +0100 Subject: [PATCH 0956/5754] package/clamav: security bump version to 0.103.8 Release notes: https://blog.clamav.net/2023/02/clamav-01038-01052-and-101-patch.html Fixes CVE-2023-20032 & CVE-2023-20052. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- 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 60439400ee..27f9b16a39 100644 --- a/package/clamav/clamav.hash +++ b/package/clamav/clamav.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 1e34c31f600cb3b5bd1bf76690590cdeebe9409b330959b1c0f77d421bb17e50 clamav-0.103.7.tar.gz +sha256 6f49da6ee927936de13d359e559d3944248e3a257d40b80b6c99ebe6fe8c8c3f clamav-0.103.8.tar.gz sha256 0c4fd2fa9733fc9122503797648710851e4ee6d9e4969dd33fcbd8c63cd2f584 COPYING sha256 d72a145c90918184a05ef65a04c9e6f7466faa59bc1b82c8f6a8ddc7ddcb9bed COPYING.bzip2 sha256 dfb818a0d41411c6fb1c193c68b73018ceadd1994bda41ad541cbff292894bc6 COPYING.file diff --git a/package/clamav/clamav.mk b/package/clamav/clamav.mk index dfdc416601..0f0491bf0d 100644 --- a/package/clamav/clamav.mk +++ b/package/clamav/clamav.mk @@ -4,7 +4,7 @@ # ################################################################################ -CLAMAV_VERSION = 0.103.7 +CLAMAV_VERSION = 0.103.8 CLAMAV_SITE = https://www.clamav.net/downloads/production CLAMAV_LICENSE = GPL-2.0 CLAMAV_LICENSE_FILES = COPYING COPYING.bzip2 COPYING.file COPYING.getopt \ From 05de8e14ce9bf9ea109aa028b34aba559aa18aad Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 16 Feb 2023 19:36:54 +0100 Subject: [PATCH 0957/5754] package/x11r7/xdriver_xf86-video-trident: bump version to 1.4.0 Release notes: https://lists.x.org/archives/xorg-announce/2023-February/003326.html Removed patch which was applied upstream. Switched tarball to xz, updated _SITE. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- .../0001-Remove-ramdac.patch | 56 ------------------- .../xdriver_xf86-video-trident.hash | 5 +- .../xdriver_xf86-video-trident.mk | 6 +- 3 files changed, 6 insertions(+), 61 deletions(-) delete mode 100644 package/x11r7/xdriver_xf86-video-trident/0001-Remove-ramdac.patch diff --git a/package/x11r7/xdriver_xf86-video-trident/0001-Remove-ramdac.patch b/package/x11r7/xdriver_xf86-video-trident/0001-Remove-ramdac.patch deleted file mode 100644 index 38ca9afebf..0000000000 --- a/package/x11r7/xdriver_xf86-video-trident/0001-Remove-ramdac.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 07a5c4732f1c28ffcb873ee04500e3cb813c50b4 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 7 Dec 2021 22:28:04 +0100 -Subject: [PATCH] Remove ramdac - -ramdac drivers have been removed from xserver since version 21.0.99.1 -and -https://gitlab.freedesktop.org/xorg/xserver/-/commit/f0385fb420158ac3bc1c4c325431ffc5c62344bb -resulting in the following build failure: - -In file included from trident_bank.c:37: -trident.h:41:10: fatal error: xf86RamDac.h: No such file or directory - 41 | #include "xf86RamDac.h" - | ^~~~~~~~~~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/c81ac8075af257e8626d9d097270be7a7b4a1496 - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.freedesktop.org/xorg/driver/xf86-video-trident/-/merge_requests/1] ---- - src/trident.h | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/src/trident.h b/src/trident.h -index 5cadf52..c82de4c 100644 ---- a/src/trident.h -+++ b/src/trident.h -@@ -38,7 +38,6 @@ - #include "xaa.h" - #endif - #include "xf86fbman.h" --#include "xf86RamDac.h" - #include "compiler.h" - #include "vgaHW.h" - #include "xf86i2c.h" -@@ -103,7 +102,6 @@ typedef struct { - int useEXA; - int Chipset; - int DACtype; -- int RamDac; - int ChipRev; - int HwBpp; - int BppShift; -@@ -169,7 +167,6 @@ typedef struct { - CARD32 BltScanDirection; - CARD32 DrawFlag; - CARD16 LinePattern; -- RamDacRecPtr RamDacRec; - int CursorOffset; - xf86CursorInfoPtr CursorInfoRec; - xf86Int10InfoPtr Int10; --- -2.33.0 - diff --git a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.hash b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.hash index 321f35d4f0..2ef664487c 100644 --- a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.hash +++ b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.hash @@ -1,4 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2017-January/002762.html -sha256 9e5119d974c3e2221994542d35e3a0b3426a441869ddd6dd08a84f324856ac3f xf86-video-trident-1.3.8.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-February/003326.html +sha256 7f76219ca7d7dc6061aa3c2aa59bc2a63895b8e6217e413ce315949f57b0189b xf86-video-trident-1.4.0.tar.xz +sha512 86f349ccfcf7c704e77a95882f63ac92f55819a3a00388f294777762fed04dde2197dd6124cded9e787af1982fecc43ad4d0af34307845e616a73d5a2ba750b9 xf86-video-trident-1.4.0.tar.xz # Locally calculated sha256 4f065198c49eac1513b915bc4478152c21119f31a97919a6ea8f3e1d10133d15 COPYING diff --git a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk index 20ec4bbc24..53fe150420 100644 --- a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk +++ b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk @@ -4,9 +4,9 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_TRIDENT_VERSION = 1.3.8 -XDRIVER_XF86_VIDEO_TRIDENT_SOURCE = xf86-video-trident-$(XDRIVER_XF86_VIDEO_TRIDENT_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_TRIDENT_SITE = http://xorg.freedesktop.org/releases/individual/driver +XDRIVER_XF86_VIDEO_TRIDENT_VERSION = 1.4.0 +XDRIVER_XF86_VIDEO_TRIDENT_SOURCE = xf86-video-trident-$(XDRIVER_XF86_VIDEO_TRIDENT_VERSION).tar.xz +XDRIVER_XF86_VIDEO_TRIDENT_SITE = https://xorg.freedesktop.org/archive/individual/driver XDRIVER_XF86_VIDEO_TRIDENT_LICENSE = MIT XDRIVER_XF86_VIDEO_TRIDENT_LICENSE_FILES = COPYING XDRIVER_XF86_VIDEO_TRIDENT_DEPENDENCIES = xserver_xorg-server xorgproto From 71c51f1920deda32ea63105163fe84b20a0f9109 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 16 Feb 2023 19:36:55 +0100 Subject: [PATCH 0958/5754] package/xutil_util-macros: bump version to 1.20.0 Release notes: https://lists.x.org/archives/xorg-announce/2023-February/003324.html Updated license hash due to copyright year bump: https://gitlab.freedesktop.org/xorg/util/macros/-/commit/cb147377e9341af05232f95814022abdecf14024 Switched tarball to xz, updated _SITE. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/xutil_util-macros/xutil_util-macros.hash | 8 ++++---- package/xutil_util-macros/xutil_util-macros.mk | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/xutil_util-macros/xutil_util-macros.hash b/package/xutil_util-macros/xutil_util-macros.hash index 30c9916dca..4fcddb7a85 100644 --- a/package/xutil_util-macros/xutil_util-macros.hash +++ b/package/xutil_util-macros/xutil_util-macros.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2021-January/003069.html -sha256 0f812e6e9d2786ba8f54b960ee563c0663ddbe2434bf24ff193f5feab1f31971 util-macros-1.19.3.tar.bz2 -sha512 b9c7398a912c688a782eab5b1e0f6da2df11a430775c5c98fc3269f73a665de6eeb60d300a849e38d345714a6e51f74e9334cb6039767304cca4b93d823a53a2 util-macros-1.19.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-February/003324.html +sha256 0b86b262dbe971edb4ff233bc370dfad9f241d09f078a3f6d5b7f4b8ea4430db util-macros-1.20.0.tar.xz +sha512 76caefb118bf1675d7b2b96e1bbb04eb9a320b02e120839e55a22ef98538ecf00d0e686a67186fc8fdc8492d277ffe3125ae8b7ac61ce4739edc0de3f468d2eb util-macros-1.20.0.tar.xz # Locally computed -sha256 489b630a75e3255485732eae3d50ff4d29d3feb66760bb3acb04f897e4d9e375 COPYING +sha256 7db0516389152a90c20ea910e8839d10204ebc25ccbc71fc7f5809dfb98e80ac COPYING diff --git a/package/xutil_util-macros/xutil_util-macros.mk b/package/xutil_util-macros/xutil_util-macros.mk index b0ce14ee5a..e2e40eb84e 100644 --- a/package/xutil_util-macros/xutil_util-macros.mk +++ b/package/xutil_util-macros/xutil_util-macros.mk @@ -4,9 +4,9 @@ # ################################################################################ -XUTIL_UTIL_MACROS_VERSION = 1.19.3 -XUTIL_UTIL_MACROS_SOURCE = util-macros-$(XUTIL_UTIL_MACROS_VERSION).tar.bz2 -XUTIL_UTIL_MACROS_SITE = http://xorg.freedesktop.org/releases/individual/util +XUTIL_UTIL_MACROS_VERSION = 1.20.0 +XUTIL_UTIL_MACROS_SOURCE = util-macros-$(XUTIL_UTIL_MACROS_VERSION).tar.xz +XUTIL_UTIL_MACROS_SITE = https://xorg.freedesktop.org/archive/individual/util XUTIL_UTIL_MACROS_LICENSE = MIT XUTIL_UTIL_MACROS_LICENSE_FILES = COPYING From 03bab7117d232c9dcd784a74eefc0e48ea51ee53 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 16 Feb 2023 18:40:18 +0100 Subject: [PATCH 0959/5754] package/freerdp: bump to version 2.10.0 https://github.com/FreeRDP/FreeRDP/releases/tag/2.10.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/freerdp/freerdp.hash | 4 ++-- package/freerdp/freerdp.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/freerdp/freerdp.hash b/package/freerdp/freerdp.hash index f6adc05312..55314cfdd3 100644 --- a/package/freerdp/freerdp.hash +++ b/package/freerdp/freerdp.hash @@ -1,5 +1,5 @@ -# From https://pub.freerdp.com/releases/freerdp-2.9.0.tar.gz.sha256 -sha256 fcf71cf5b09c5c2636341ba212f34b8fb728246ea28e08caf6cef8b4a96184b7 freerdp-2.9.0.tar.gz +# From https://pub.freerdp.com/releases/freerdp-2.10.0.tar.gz.sha256 +sha256 a673d3fc21911dd9f196834f2f3a23c3ebc7e5e4deab2f7686fcec879279e2c1 freerdp-2.10.0.tar.gz # Locally calculated sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk index fb0e6920cf..01c511819d 100644 --- a/package/freerdp/freerdp.mk +++ b/package/freerdp/freerdp.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREERDP_VERSION = 2.9.0 +FREERDP_VERSION = 2.10.0 FREERDP_SITE = https://pub.freerdp.com/releases FREERDP_DEPENDENCIES = libglib2 openssl zlib FREERDP_LICENSE = Apache-2.0 From 364511933811d76d4b866fe3aa04adff449cf94b Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 16 Feb 2023 18:41:34 +0100 Subject: [PATCH 0960/5754] package/fluent-bit: fix build with libexecinfo Fix the following build failure with libexecinfo raised since commit d649bcd3805a26cedb30120ebbdcf12f8fbf449f: /home/autobuild/autobuild/instance-9/output-1/host/lib/gcc/mips-buildroot-linux-musl/10.4.0/../../../../mips-buildroot-linux-musl/bin/ld: ../lib/monkey/library/libmonkey.a(mk_utils.c.o): in function `mk_utils_stacktrace': mk_utils.c:(.text+0x1578): undefined reference to `backtrace' Fixes: - http://autobuild.buildroot.org/results/63a6ba9104dfddbd7f6a7debadc0c6ef6e3a21f5 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/fluent-bit/fluent-bit.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk index d618fdf1e2..8ba16399bb 100644 --- a/package/fluent-bit/fluent-bit.mk +++ b/package/fluent-bit/fluent-bit.mk @@ -56,6 +56,11 @@ FLUENT_BIT_CXXFLAGS += -fcommon FLUENT_BIT_CFLAGS += -U_FILE_OFFSET_BITS FLUENT_BIT_CXXFLAGS += -U_FILE_OFFSET_BITS +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +FLUENT_BIT_DEPENDENCIES += libexecinfo +FLUENT_BIT_LDFLAGS += -lexecinfo +endif + ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),) FLUENT_BIT_DEPENDENCIES += musl-fts FLUENT_BIT_LDFLAGS += -lfts From 05c3177493aa8447d5cb568c8c13e0c09eded18b Mon Sep 17 00:00:00 2001 From: Raphael Pavlidis Date: Thu, 16 Feb 2023 19:33:20 +0100 Subject: [PATCH 0961/5754] package/x11r7/xwayland: new package XServer to run X clients under wayland This XServer is required to run the X clients under Wayland compositor, for example weston or wlroots based compositors. Signed-off-by: Raphael Pavlidis Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + package/x11r7/Config.in | 1 + package/x11r7/xwayland/Config.in | 26 ++++++++ package/x11r7/xwayland/xwayland.hash | 6 ++ package/x11r7/xwayland/xwayland.mk | 94 ++++++++++++++++++++++++++++ 5 files changed, 128 insertions(+) create mode 100644 package/x11r7/xwayland/Config.in create mode 100644 package/x11r7/xwayland/xwayland.hash create mode 100644 package/x11r7/xwayland/xwayland.mk diff --git a/DEVELOPERS b/DEVELOPERS index 7894b10e38..a7a0bb14d1 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2426,6 +2426,7 @@ F: support/testing/tests/package/test_python_s3transfer.py N: Raphael Pavlidis F: package/slirp4netns/ F: package/sway/ +F: package/x11r7/xwayland/ N: Refik Tuzakli F: package/freescale-imx/ diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in index 365de34c98..4de8922e0d 100644 --- a/package/x11r7/Config.in +++ b/package/x11r7/Config.in @@ -12,6 +12,7 @@ menuconfig BR2_PACKAGE_XORG7 if BR2_PACKAGE_XORG7 menu "X11R7 Servers" source package/x11r7/xserver_xorg-server/Config.in + source package/x11r7/xwayland/Config.in endmenu menu "X11R7 Libraries" source package/x11r7/libxcb/Config.in diff --git a/package/x11r7/xwayland/Config.in b/package/x11r7/xwayland/Config.in new file mode 100644 index 0000000000..4f14f2cc36 --- /dev/null +++ b/package/x11r7/xwayland/Config.in @@ -0,0 +1,26 @@ +config BR2_PACKAGE_XWAYLAND + bool "xwayland server" + depends on BR2_USE_MMU # fork() + depends on !BR2_STATIC_LIBS # wayland + depends on BR2_TOOLCHAIN_HAS_THREADS # wayland + # We need a SHA1 implementation. If either openssl or + # libgcrypt are already part of the build, we'll use one of + # them, otherwise, use the small libsha1 library. + select BR2_PACKAGE_LIBSHA1 if (!BR2_PACKAGE_OPENSSL && !BR2_PACKAGE_LIBGCRYPT) + select BR2_PACKAGE_PIXMAN + select BR2_PACKAGE_WAYLAND + select BR2_PACKAGE_WAYLAND_PROTOCOLS + select BR2_PACKAGE_XLIB_LIBXCVT + select BR2_PACKAGE_XLIB_LIBXFONT2 + select BR2_PACKAGE_XLIB_LIBXKBFILE + select BR2_PACKAGE_XLIB_LIBXRANDR + select BR2_PACKAGE_XLIB_XTRANS + select BR2_PACKAGE_XORGPROTO + help + X.Org X server to run X clients under wayland + + http://xorg.freedesktop.org + +comment "xwayland needs a toolchain w/ threads, dynamic library" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/x11r7/xwayland/xwayland.hash b/package/x11r7/xwayland/xwayland.hash new file mode 100644 index 0000000000..0c476f3183 --- /dev/null +++ b/package/x11r7/xwayland/xwayland.hash @@ -0,0 +1,6 @@ +# From https://lists.x.org/archives/xorg-announce/2023-February/003322.html +sha256 d11eeee73290b88ea8da42a7d9350dedfaba856ce4ae44e58c045ad9ecaa2f73 xwayland-22.1.8.tar.xz +sha512 f52c6f99d8ef7605bc1c651d5ee5e306c12af30649a2d712b1c4c3cf4c7c80246ae24bd9ac39461d47aafc78f5d659446a459cd6259e05ef3128b204981d114a xwayland-22.1.8.tar.xz + +# Locally calculated +sha256 4cc0447a22635c7b2f1a93fec4aa94f1970fadeb72a063de006b51cf4963a06f COPYING diff --git a/package/x11r7/xwayland/xwayland.mk b/package/x11r7/xwayland/xwayland.mk new file mode 100644 index 0000000000..174b440b07 --- /dev/null +++ b/package/x11r7/xwayland/xwayland.mk @@ -0,0 +1,94 @@ +################################################################################ +# +# xwayland +# +################################################################################ + +XWAYLAND_VERSION = 22.1.8 +XWAYLAND_SOURCE = xwayland-$(XWAYLAND_VERSION).tar.xz +XWAYLAND_SITE = https://xorg.freedesktop.org/archive/individual/xserver +XWAYLAND_LICENSE = MIT +XWAYLAND_LICENSE_FILES = COPYING +XWAYLAND_INSTALL_STAGING = YES +XWAYLAND_DEPENDENCIES = \ + pixman \ + wayland \ + wayland-protocols \ + xlib_libxcvt \ + xlib_libXfont2 \ + xlib_libxkbfile \ + xlib_libXrandr \ + xlib_xtrans \ + xorgproto +XWAYLAND_CONF_OPTS = \ + -Dxwayland_eglstream=false \ + -Dxvfb=false \ + -Ddefault_font_path=/usr/share/fonts/X11/ \ + -Ddtrace=false \ + -Ddocs=false + +ifeq ($(BR2_PACKAGE_LIBDRM)$(BR2_PACKAGE_LIBEPOXY),yy) +XWAYLAND_CONF_OPTS += -Dglamor=true +XWAYLAND_DEPENDENCIES += libdrm libepoxy +else +XWAYLAND_CONF_OPTS += -Dglamor=false +endif + +ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) +XWAYLAND_CONF_OPTS += -Dglx=true +XWAYLAND_DEPENDENCIES += libgl +else +XWAYLAND_CONF_OPTS += -Dglx=false +endif + +ifeq ($(BR2_PACKAGE_XLIB_LIBXDMCP),y) +XWAYLAND_CONF_OPTS += \ + -Dxdmcp=true \ + -Dxdm-auth-1=true +XWAYLAND_DEPENDENCIES += xlib_libXdmcp +else +XWAYLAND_CONF_OPTS += \ + -Dxdmcp=false \ + -Dxdm-auth-1=false +endif + +ifeq ($(BR2_PACKAGE_LIBTIRPC),y) +XWAYLAND_CONF_OPTS += -Dsecure-rpc=true +XWAYLAND_DEPENDENCIES += libtirpc +else +XWAYLAND_CONF_OPTS += -Dsecure-rpc=false +endif + +ifeq ($(BR2_PACKAGE_LIBSELINUX)$(BR2_PACKAGE_AUDIT),yy) +XWAYLAND_CONF_OPTS += -Dxselinux=true +XWAYLAND_DEPENDENCIES += libselinux audit +else +XWAYLAND_CONF_OPTS += -Dxselinux=false +endif + +ifeq ($(BR2_PACKAGE_OPENSSL),y) +XWAYLAND_CONF_OPTS += -Dsha1=libcrypto +XWAYLAND_DEPENDENCIES += openssl +else ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) +XWAYLAND_CONF_OPTS += -Dsha1=libgcrypt +XWAYLAND_DEPENDENCIES += libgcrypt +else +XWAYLAND_CONF_OPTS += -Dsha1=libsha1 +XWAYLAND_DEPENDENCIES += libsha1 +endif + +ifeq ($(BR2_PACKAGE_XLIB_LIBXSHMFENCE)$(BR2_PACKAGE_LIBDRM),yy) +XWAYLAND_CONF_OPTS += -Ddri3=true +XWAYLAND_DEPENDENCIES += xlib_libxshmfence libdrm +else +XWAYLAND_CONF_OPTS += -Ddri3=false +endif + +ifeq ($(BR2_PACKAGE_LIBUNWIND),y) +XWAYLAND_CONF_OPTS += -Dlibunwind=true +XWAYLAND_DEPENDENCIES += libunwind +else +XWAYLAND_CONF_OPTS += -Dlibunwind=false +endif + +$(eval $(meson-package)) From df4f7f8e85274d5bde29171203c7eb95f4903765 Mon Sep 17 00:00:00 2001 From: Raphael Pavlidis Date: Thu, 16 Feb 2023 19:33:21 +0100 Subject: [PATCH 0962/5754] package/weston: add xwayland dependency If the XWayland support is enabled then build the corresponding XServer. Signed-off-by: Raphael Pavlidis Signed-off-by: Peter Korsgaard --- package/weston/Config.in | 10 +++++++++- package/weston/weston.mk | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/package/weston/Config.in b/package/weston/Config.in index 3b4e932b7d..09119edaaa 100644 --- a/package/weston/Config.in +++ b/package/weston/Config.in @@ -109,16 +109,24 @@ comment "X11 (nested) compositor needs X.org enabled" config BR2_PACKAGE_WESTON_XWAYLAND bool "XWayland support" - depends on BR2_PACKAGE_XORG7 depends on BR2_PACKAGE_LIBEPOXY + depends on BR2_PACKAGE_XORG7 # xwayland + depends on BR2_USE_MMU # xwayland + depends on !BR2_STATIC_LIBS # xwayland + depends on BR2_TOOLCHAIN_HAS_THREADS # xwayland select BR2_PACKAGE_CAIRO select BR2_PACKAGE_LIBXCB select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXCURSOR + select BR2_PACKAGE_XWAYLAND comment "XWayland support needs libepoxy and X.org enabled" depends on !BR2_PACKAGE_XORG7 || !BR2_PACKAGE_LIBEPOXY +comment "XWayland support needs a toolchain w/ threads, dynamic library" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + # Weston needs at least one shell; this can be one of the bundled ones, # below, of from a third-party package, which should then select this. config BR2_PACKAGE_WESTON_HAS_SHELL diff --git a/package/weston/weston.mk b/package/weston/weston.mk index 5e71473640..01f84178b2 100644 --- a/package/weston/weston.mk +++ b/package/weston/weston.mk @@ -123,7 +123,7 @@ WESTON_CONF_OPTS += -Dbackend-default=$(call qstrip,$(BR2_PACKAGE_WESTON_DEFAULT ifeq ($(BR2_PACKAGE_WESTON_XWAYLAND),y) WESTON_CONF_OPTS += -Dxwayland=true -WESTON_DEPENDENCIES += cairo libepoxy libxcb xlib_libX11 xlib_libXcursor +WESTON_DEPENDENCIES += cairo libepoxy libxcb xlib_libX11 xlib_libXcursor xwayland else WESTON_CONF_OPTS += -Dxwayland=false endif From 5945a71d87c988cb6b864600dd8dbecae0ef30fd Mon Sep 17 00:00:00 2001 From: Raphael Pavlidis Date: Thu, 16 Feb 2023 19:33:22 +0100 Subject: [PATCH 0963/5754] package/wlroots: add XWayland support The new option enables the XWayland support, so X11 application can be running on a wlroots based compositor. Also, do not enable the XWayland support if the X11 backend is active, as it is unrelated to it. Signed-off-by: Raphael Pavlidis Signed-off-by: Peter Korsgaard --- package/wlroots/Config.in | 19 +++++++++++++++++++ package/wlroots/wlroots.mk | 6 +++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/package/wlroots/Config.in b/package/wlroots/Config.in index 84a4ef846e..b2d3f3c3b1 100644 --- a/package/wlroots/Config.in +++ b/package/wlroots/Config.in @@ -41,4 +41,23 @@ config BR2_PACKAGE_WLROOTS_X11 help Support Wayland sessions nested inside a X11 window +config BR2_PACKAGE_WLROOTS_XWAYLAND + bool "XWayland support" + depends on BR2_PACKAGE_XORG7 # libxcb, xcb-util-wm, xwayland + depends on BR2_USE_MMU # xwayland + depends on !BR2_STATIC_LIBS # xwayland + depends on BR2_TOOLCHAIN_HAS_THREADS # xwayland + select BR2_PACKAGE_LIBXCB + select BR2_PACKAGE_XCB_UTIL_WM + select BR2_PACKAGE_XWAYLAND + help + Support for running X11 applications under wayland + +comment "XWayland support needs X.org enabled" + depends on !BR2_PACKAGE_XORG7 + +comment "XWayland support needs a toolchain w/ threads, dynamic library" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + endif diff --git a/package/wlroots/wlroots.mk b/package/wlroots/wlroots.mk index 4f14d20b11..5b930a51be 100644 --- a/package/wlroots/wlroots.mk +++ b/package/wlroots/wlroots.mk @@ -30,8 +30,12 @@ WLROOTS_BACKENDS = libinput drm ifeq ($(BR2_PACKAGE_WLROOTS_X11),y) WLROOTS_BACKENDS += x11 -WLROOTS_CONF_OPTS += -Dxwayland=enabled WLROOTS_DEPENDENCIES += libxcb xcb-util-wm xcb-util-renderutil xlib_libX11 +endif + +ifeq ($(BR2_PACKAGE_WLROOTS_XWAYLAND),y) +WLROOTS_CONF_OPTS += -Dxwayland=enabled +WLROOTS_DEPENDENCIES += libxcb xcb-util-wm xwayland else WLROOTS_CONF_OPTS += -Dxwayland=disabled endif From 1c9622ae5084473b9eeb15b04673d081f5c9fa11 Mon Sep 17 00:00:00 2001 From: Thomas Devoogdt Date: Thu, 16 Feb 2023 10:41:02 +0100 Subject: [PATCH 0964/5754] package/lighttpd: bump to version 1.4.69 Changelog: - https://www.lighttpd.net/2023/1/3/1.4.68/ - https://www.lighttpd.net/2023/2/10/1.4.69/ In this commit: - rebased patch & dropped server.use-ipv6 option [1] - fix changed meson options [2] [1]: https://git.lighttpd.net/lighttpd/lighttpd1.4/commit/376d20f1617f2c0202fb415e4cc66d3f780db5ca [2]: https://git.lighttpd.net/lighttpd/lighttpd1.4/commit/6b31f76cd9b36b6033607181238fbf41c5b81e07 Signed-off-by: Thomas Devoogdt Signed-off-by: Peter Korsgaard --- ...lt-lighttpd-configuration-file-to-ha.patch | 33 ++++------ package/lighttpd/lighttpd.hash | 4 +- package/lighttpd/lighttpd.mk | 64 +++++++++---------- 3 files changed, 47 insertions(+), 54 deletions(-) diff --git a/package/lighttpd/0001-Modify-the-default-lighttpd-configuration-file-to-ha.patch b/package/lighttpd/0001-Modify-the-default-lighttpd-configuration-file-to-ha.patch index 1a887655b8..2eab2a84e5 100644 --- a/package/lighttpd/0001-Modify-the-default-lighttpd-configuration-file-to-ha.patch +++ b/package/lighttpd/0001-Modify-the-default-lighttpd-configuration-file-to-ha.patch @@ -1,11 +1,11 @@ -From d1de409b0aeb8dffd42673444043caf01437804e Mon Sep 17 00:00:00 2001 +From d9e1c9c4a95797c812dd4906ecbbc532ae459364 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 13 Dec 2021 22:07:17 +0100 Subject: [PATCH] Modify the default lighttpd configuration file to have one a starting conf * Changed the log path to /var/log and logs filenames - * Disable IPv6 + * Disable IPv6 (Dropped since 1.4.68) * Do not setuid to a user that doesn't exist on the system * Change the network backend to writev since linux-sendfile fails on buildroot @@ -13,13 +13,15 @@ Signed-off-by: Maxime Ripard Signed-off-by: Simon Dawson [Gustavo: update for 1.4.37] Signed-off-by: Gustavo Zacarias +[Thomas: update for 1.4.69 - drop server.use-ipv6] +Signed-off-by: Thomas Devoogdt --- doc/config/conf.d/access_log.conf | 2 +- - doc/config/lighttpd.conf | 16 ++++++++-------- - 2 files changed, 9 insertions(+), 9 deletions(-) + doc/config/lighttpd.conf | 14 +++++++------- + 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/config/conf.d/access_log.conf b/doc/config/conf.d/access_log.conf -index e685d43..92cff4f 100644 +index e685d437..92cff4f0 100644 --- a/doc/config/conf.d/access_log.conf +++ b/doc/config/conf.d/access_log.conf @@ -9,7 +9,7 @@ server.modules += ( "mod_accesslog" ) @@ -32,7 +34,7 @@ index e685d43..92cff4f 100644 ## ## The default format produces CLF compatible output. diff --git a/doc/config/lighttpd.conf b/doc/config/lighttpd.conf -index 495d2a1..c3e1446 100644 +index d45a284d..4e926d5a 100644 --- a/doc/config/lighttpd.conf +++ b/doc/config/lighttpd.conf @@ -13,8 +13,8 @@ @@ -46,16 +48,7 @@ index 495d2a1..c3e1446 100644 var.state_dir = "/run" var.home_dir = "/var/lib/lighttpd" var.conf_dir = "/etc/lighttpd" -@@ -90,7 +90,7 @@ server.port = 80 - ## - ## Use IPv6? - ## --server.use-ipv6 = "enable" -+# server.use-ipv6 = "enable" - - ## - ## bind to a specific IP -@@ -101,8 +101,8 @@ server.use-ipv6 = "enable" +@@ -97,8 +97,8 @@ server.port = 80 ## Run as a different username/groupname. ## This requires root permissions during startup. ## @@ -66,7 +59,7 @@ index 495d2a1..c3e1446 100644 ## ## Enable lighttpd to serve requests on sockets received from systemd -@@ -118,7 +118,7 @@ server.groupname = "lighttpd" +@@ -114,7 +114,7 @@ server.groupname = "lighttpd" ## ## Document root ## @@ -75,7 +68,7 @@ index 495d2a1..c3e1446 100644 ## ## The value for the "Server:" response field. -@@ -144,7 +144,7 @@ server.pid-file = state_dir + "/lighttpd.pid" +@@ -140,7 +140,7 @@ server.pid-file = state_dir + "/lighttpd.pid" ## ## Path to the error log file ## @@ -84,7 +77,7 @@ index 495d2a1..c3e1446 100644 ## ## If you want to log to syslog you have to unset the -@@ -192,7 +192,7 @@ include conf_dir + "/conf.d/debug.conf" +@@ -187,7 +187,7 @@ include conf_dir + "/conf.d/debug.conf" ## and write(). Every modern OS provides its own syscall to help network ## servers transfer files as fast as possible ## @@ -94,5 +87,5 @@ index 495d2a1..c3e1446 100644 ## ## As lighttpd is a single-threaded server, its main resource limit is -- -2.34.1 +2.39.0 diff --git a/package/lighttpd/lighttpd.hash b/package/lighttpd/lighttpd.hash index 8353857ad9..29bf5124b6 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.67.sha512sum -sha512 acfde71675d1c54b4e805998d1dabaa291437181bdbca0d6a3a069584c4576d7585d2401f57f8691f23aaf6283a95ac61156789a055a2a7236fd305c1f248627 lighttpd-1.4.67.tar.xz +# From https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.69.sha512sum +sha512 9d174c8e0a192b4eb8218a9f76b0bd42f90030228600bb7bbe35ebb9e7bbaea36ee2732535c5cc6dab171294817837bfa26074ff84a37832dd89f57488b4071f lighttpd-1.4.69.tar.xz # Locally calculated sha256 5c98cad2fbaf5c5e2562bcbab401a7c557c1bb1bac9914ecc63730925052fb13 COPYING diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index d3440040fb..ca2035b6b3 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).67 +LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).69 LIGHTTPD_SOURCE = lighttpd-$(LIGHTTPD_VERSION).tar.xz LIGHTTPD_SITE = http://download.lighttpd.net/lighttpd/releases-$(LIGHTTPD_VERSION_MAJOR).x LIGHTTPD_LICENSE = BSD-3-Clause @@ -13,49 +13,49 @@ LIGHTTPD_LICENSE_FILES = COPYING LIGHTTPD_CPE_ID_VENDOR = lighttpd LIGHTTPD_DEPENDENCIES = host-pkgconf xxhash LIGHTTPD_CONF_OPTS = \ - -Dwith_dbi=false \ - -Dwith_fam=false \ + -Dwith_dbi=disabled \ + -Dwith_fam=disabled \ -Dwith_gnutls=false \ - -Dwith_libev=false \ - -Dwith_libunwind=false \ + -Dwith_libev=disabled \ + -Dwith_libunwind=disabled \ -Dwith_mbedtls=false \ -Dwith_nettle=false \ -Dwith_nss=false \ - -Dwith_pcre=false \ - -Dwith_sasl=false \ + -Dwith_pcre=disabled \ + -Dwith_sasl=disabled \ -Dwith_wolfssl=false \ -Dwith_xattr=false \ - -Dwith_xxhash=true \ + -Dwith_xxhash=enabled \ -Dbuild_extra_warnings=false \ -Dbuild_static=false \ -Dmoduledir=lib/lighttpd ifeq ($(BR2_PACKAGE_LIGHTTPD_BROTLI),y) LIGHTTPD_DEPENDENCIES += brotli -LIGHTTPD_CONF_OPTS += -Dwith_brotli=true +LIGHTTPD_CONF_OPTS += -Dwith_brotli=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_brotli=false +LIGHTTPD_CONF_OPTS += -Dwith_brotli=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_BZIP2),y) LIGHTTPD_DEPENDENCIES += bzip2 -LIGHTTPD_CONF_OPTS += -Dwith_bzip=true +LIGHTTPD_CONF_OPTS += -Dwith_bzip=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_bzip=false +LIGHTTPD_CONF_OPTS += -Dwith_bzip=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_KRB5),y) LIGHTTPD_DEPENDENCIES += libkrb5 -LIGHTTPD_CONF_OPTS += -Dwith_krb5=true +LIGHTTPD_CONF_OPTS += -Dwith_krb5=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_krb5=false +LIGHTTPD_CONF_OPTS += -Dwith_krb5=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_LDAP),y) LIGHTTPD_DEPENDENCIES += openldap -LIGHTTPD_CONF_OPTS += -Dwith_ldap=true +LIGHTTPD_CONF_OPTS += -Dwith_ldap=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_ldap=false +LIGHTTPD_CONF_OPTS += -Dwith_ldap=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_LUA),y) @@ -67,16 +67,16 @@ endif ifeq ($(BR2_PACKAGE_LIGHTTPD_MAXMINDDB),y) LIGHTTPD_DEPENDENCIES += libmaxminddb -LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=true +LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=false +LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_MYSQL),y) LIGHTTPD_DEPENDENCIES += mysql -LIGHTTPD_CONF_OPTS += -Dwith_mysql=true +LIGHTTPD_CONF_OPTS += -Dwith_mysql=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_mysql=false +LIGHTTPD_CONF_OPTS += -Dwith_mysql=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_OPENSSL),y) @@ -88,9 +88,9 @@ endif ifeq ($(BR2_PACKAGE_LIGHTTPD_PAM),y) LIGHTTPD_DEPENDENCIES += linux-pam -LIGHTTPD_CONF_OPTS += -Dwith_pam=true +LIGHTTPD_CONF_OPTS += -Dwith_pam=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_pam=false +LIGHTTPD_CONF_OPTS += -Dwith_pam=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_PCRE),y) @@ -102,36 +102,36 @@ endif ifeq ($(BR2_PACKAGE_LIGHTTPD_PGSQL),y) LIGHTTPD_DEPENDENCIES += postgresql -LIGHTTPD_CONF_OPTS += -Dwith_pgsql=true +LIGHTTPD_CONF_OPTS += -Dwith_pgsql=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_pgsql=false +LIGHTTPD_CONF_OPTS += -Dwith_pgsql=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_WEBDAV),y) LIGHTTPD_DEPENDENCIES += libxml2 sqlite -LIGHTTPD_CONF_OPTS += -Dwith_webdav_props=true +LIGHTTPD_CONF_OPTS += -Dwith_webdav_props=enabled ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y) -LIGHTTPD_CONF_OPTS += -Dwith_webdav_locks=true +LIGHTTPD_CONF_OPTS += -Dwith_webdav_locks=enabled LIGHTTPD_DEPENDENCIES += util-linux else -LIGHTTPD_CONF_OPTS += -Dwith_webdav_locks=false +LIGHTTPD_CONF_OPTS += -Dwith_webdav_locks=disabled endif else -LIGHTTPD_CONF_OPTS += -Dwith_webdav_props=false -Dwith_webdav_locks=false +LIGHTTPD_CONF_OPTS += -Dwith_webdav_props=disabled -Dwith_webdav_locks=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_ZLIB),y) LIGHTTPD_DEPENDENCIES += zlib -LIGHTTPD_CONF_OPTS += -Dwith_zlib=true +LIGHTTPD_CONF_OPTS += -Dwith_zlib=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_zlib=false +LIGHTTPD_CONF_OPTS += -Dwith_zlib=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_ZSTD),y) LIGHTTPD_DEPENDENCIES += zstd -LIGHTTPD_CONF_OPTS += -Dwith_zstd=true +LIGHTTPD_CONF_OPTS += -Dwith_zstd=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_zstd=false +LIGHTTPD_CONF_OPTS += -Dwith_zstd=disabled endif define LIGHTTPD_INSTALL_CONFIG From 5085b61121a55c830b4d1576ab52441dc1491e35 Mon Sep 17 00:00:00 2001 From: Bagas Sanjaya Date: Sat, 18 Feb 2023 15:58:37 +0700 Subject: [PATCH 0965/5754] package/git: security bump to version 2.39.2 Fix two CVEs (CVE-2023-22490 and CVE-2023-23946). For the full release note, see [1]. While at it, also refresh two Buildroot patches introduced when the package was bumped to 2.39.0. [1]: https://lore.kernel.org/git/xmqqr0us5dio.fsf@gitster.g/ Signed-off-by: Bagas Sanjaya Signed-off-by: Peter Korsgaard --- ...compat-util-avoid-redefining-system-function-nam.patch | 8 +++++--- ...compat-util-undefine-system-names-before-redecla.patch | 6 +++--- package/git/git.hash | 2 +- package/git/git.mk | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-) 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 index dbde87940a..24100e1f6e 100644 --- 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 @@ -1,4 +1,4 @@ -From 385f67eb2254edb1fb4cf523e5e3d5a8f123d72c Mon Sep 17 00:00:00 2001 +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 @@ -64,7 +64,7 @@ Signed-off-by: Bagas Sanjaya 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/git-compat-util.h b/git-compat-util.h -index a76d0526f7..e3456bdd0d 100644 +index af05077560..f6882b9b50 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -341,11 +341,12 @@ struct itimerval { @@ -83,7 +83,7 @@ index a76d0526f7..e3456bdd0d 100644 #endif #ifndef NO_LIBGEN_H -@@ -1471,14 +1472,16 @@ int open_nofollow(const char *path, int flags); +@@ -1479,14 +1480,16 @@ int open_nofollow(const char *path, int flags); #endif #ifndef _POSIX_THREAD_SAFE_FUNCTIONS @@ -102,6 +102,8 @@ index a76d0526f7..e3456bdd0d 100644 #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 index 9e3c9b662c..f6207300ee 100644 --- 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 @@ -1,4 +1,4 @@ -From 6d406390b870fdb2cd9d18b12ebfabc12f5096df Mon Sep 17 00:00:00 2001 +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 @@ -29,7 +29,7 @@ Signed-off-by: Bagas Sanjaya 1 file changed, 4 insertions(+) diff --git a/git-compat-util.h b/git-compat-util.h -index e3456bdd0d..211861da0f 100644 +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, @@ -40,7 +40,7 @@ index e3456bdd0d..211861da0f 100644 #define setitimer(which,value,ovalue) git_setitimer(which,value,ovalue) #endif -@@ -1480,6 +1481,9 @@ static inline void git_funlockfile(FILE *fh) +@@ -1488,6 +1489,9 @@ static inline void git_funlockfile(FILE *fh) { ; /* nothing */ } diff --git a/package/git/git.hash b/package/git/git.hash index 75398896e5..b7840cd1eb 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 40a38a0847b30c371b35873b3afcf123885dd41ea3ecbbf510efa97f3ce5c161 git-2.39.1.tar.xz +sha256 475f75f1373b2cd4e438706185175966d5c11f68c4db1e48c26257c43ddcf2d6 git-2.39.2.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 1d728e1964..206d06ffe7 100644 --- a/package/git/git.mk +++ b/package/git/git.mk @@ -4,7 +4,7 @@ # ################################################################################ -GIT_VERSION = 2.39.1 +GIT_VERSION = 2.39.2 GIT_SOURCE = git-$(GIT_VERSION).tar.xz GIT_SITE = $(BR2_KERNEL_MIRROR)/software/scm/git GIT_LICENSE = GPL-2.0, LGPL-2.1+ From 273bec97fc34068281d44e57bc60fbcfed5c8342 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Fri, 17 Feb 2023 14:32:41 +0100 Subject: [PATCH 0966/5754] package/libfuse3: bump to version 3.14.0 Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/libfuse3/libfuse3.hash | 2 +- package/libfuse3/libfuse3.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libfuse3/libfuse3.hash b/package/libfuse3/libfuse3.hash index f697f4ad3f..2d78153c81 100644 --- a/package/libfuse3/libfuse3.hash +++ b/package/libfuse3/libfuse3.hash @@ -1,3 +1,3 @@ # Locally calculated sha256 checksums -sha256 96399b09b91bc717a9e96ffea660d611e6a342547c1abd4d0e858b3dca9d5a13 libfuse3-3.13.1.tar.gz +sha256 b14f7d97abc11a5a70a37955021a7a1d8eb1d3dd5b6abec66af093eae3168c62 libfuse3-3.14.0.tar.gz sha256 b8832d9caaa075bbbd2aef24efa09f8b7ab66a832812d88c602da0c7b4397fad LICENSE diff --git a/package/libfuse3/libfuse3.mk b/package/libfuse3/libfuse3.mk index a2e9775868..8c306ba187 100644 --- a/package/libfuse3/libfuse3.mk +++ b/package/libfuse3/libfuse3.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBFUSE3_VERSION = 3.13.1 +LIBFUSE3_VERSION = 3.14.0 LIBFUSE3_SITE = $(call github,libfuse,libfuse,fuse-$(LIBFUSE3_VERSION)) LIBFUSE3_LICENSE = LGPL-2.1 LIBFUSE3_LICENSE_FILES = LICENSE From 8797f3fb272e9c1a5fe6a1953cacf6e5065a133a Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 19 Feb 2023 15:25:47 +0100 Subject: [PATCH 0967/5754] package/speechd: disable kali support Disable kali support as it is not needed and raises the following build failure without C++ since the addition of the package in commit 9f4f8c5f8993c6d7c2ef730ac211ef84ac9ae26d: CXX sd_kali-kali.o /bin/sh: line 1: no: command not found Fixes: - http://autobuild.buildroot.org/results/2f6c8b3674753d6a9f165117c70e7dad88505505 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/speechd/speechd.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/speechd/speechd.mk b/package/speechd/speechd.mk index 0d43e4b6fb..46c0672f59 100644 --- a/package/speechd/speechd.mk +++ b/package/speechd/speechd.mk @@ -12,6 +12,7 @@ SPEECHD_INSTALL_STAGING = YES # speechd source code is released without configure script SPEECHD_AUTORECONF = YES SPEECHD_DEPENDENCIES = host-pkgconf dotconf libglib2 libsndfile +SPEECHD_CONF_OPTS = --without-kali # fix missing config.rpath (needed for autoreconf) in the codebase define SPEECHD_TOUCH_CONFIG_RPATH From 99d5f1f7d3cd4b1f2041edbddd5d09caacf4848d Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 19 Feb 2023 15:25:48 +0100 Subject: [PATCH 0968/5754] package/speechd: fix build without makeinfo Fix the following build failure without makeinfo raised since the addition of the package in commit 9f4f8c5f8993c6d7c2ef730ac211ef84ac9ae26d: /home/buildroot/autobuild/instance-2/output-1/build/speechd-0.11.4/missing: line 81: makeinfo: command not found Fixes: - http://autobuild.buildroot.org/results/d4f193545eb31864a9bac5a9d05bba39d3c7ff3e Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/speechd/0001-add-disable-doc.patch | 78 ++++++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 package/speechd/0001-add-disable-doc.patch diff --git a/package/speechd/0001-add-disable-doc.patch b/package/speechd/0001-add-disable-doc.patch new file mode 100644 index 0000000000..dd17b10e4f --- /dev/null +++ b/package/speechd/0001-add-disable-doc.patch @@ -0,0 +1,78 @@ +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 + From d7f2d8403ec82f3b1772ec17bf1df8c42987a1f8 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 19 Feb 2023 16:04:26 +0100 Subject: [PATCH 0969/5754] package/gnupg2: fix build failure when host provides an old gpgrt-config gnupg2 uses the libgpg-error library. The libgpg-error library has a long plan to be renamed to "gpgrt" (see [1]). For the transition, it provides two configuration scripts "gpg-error-config" (the old, original one, kept for compatibility) and "gpgrt-config" (which is meant to be the replacement). When both are detected, "gpgrt-config" should be preferred. gnupg2 configure script searches for "gpg-error-config" in the path provided to --with-libgpg-error-prefix=PFX (more specifically, in "PFX/bin"). The logic to find "gpgrt-config" is different: it is searched in paths "$prefix/bin:$PATH". See [2]. On Buildroot, autotools target packages are configured with "--prefix=/usr", which makes the configure script to search in the host "/usr/bin". In some host environment providing such a "/usr/bin/gpgrt-config" script of an older version, host compilation flags are incorrectly added for the target, which leads to compilation failures. The issue can be reproduced in a Buildroot Docker image from [3] in which the libgpg-error-dev package is added. When tested, the libgpg-error-dev package was at version 1.38. In that configuration, gnupg2 configure will output the message: checking for gpgrt-config... /usr/bin/gpgrt-config and the compilation fails with a message: aarch64-buildroot-linux-gnu-gcc: ERROR: unsafe header/library path used in cross-compilation: '-I/usr/include' Note: it was observed that in some other configurations in which the host /usr/bin/gpgrt-config was from libgpg-error version 1.46, the host script was redirecting correctly in the buildroot sysroot. Since gnupg2 searches for "gpgrt-config" with a "AC_PATH_PROG(GPGRT_CONFIG, ...)" macro, this patch fixes this issue by simply forcing the script path in the GPGRT_CONFIG environment variable. See also [4] which discussed the "gpgrt-config" search logic. Fixes: - http://autobuild.buildroot.net/results/423c3ce7317c181e9f2e4a49b76ee9d26167375c/ (and many others) [1] https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=blob;f=README;h=e0b9f16445a96942af0839bcdb9a0b0f8cf31380;hb=885a287a57cf060b4c5b441822c09d23b8dee2bd#l29 [2] https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=blob;f=m4/gpg-error.m4;h=a975e53d07d1b743f51d8aa1767cd8e0d71b4071;hb=c0556edb80518720b0d884251685fe008c8f0429#l68 [3] https://git.buildroot.org/buildroot/tree/support/docker/Dockerfile?id=b6085c00d0feece6f3ba635e7847ea653bc5fac3 [4] https://dev.gnupg.org/T5365 Reported-by: Bagas Sanjaya Tested-by: Bagas Sanjaya Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/gnupg2/gnupg2.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/gnupg2/gnupg2.mk b/package/gnupg2/gnupg2.mk index 5935ce6939..73de185ba7 100644 --- a/package/gnupg2/gnupg2.mk +++ b/package/gnupg2/gnupg2.mk @@ -23,6 +23,10 @@ GNUPG2_CONF_OPTS = \ --with-ksba-prefix=$(STAGING_DIR)/usr \ --with-npth-prefix=$(STAGING_DIR)/usr +# Force the path to "gpgrt-config" (from the libgpg-error package) to +# avoid using the one on host, if present. +GNUPG2_CONF_ENV += GPGRT_CONFIG=$(STAGING_DIR)/usr/bin/gpgrt-config + ifneq ($(BR2_PACKAGE_GNUPG2_GPGV),y) define GNUPG2_REMOVE_GPGV rm -f $(TARGET_DIR)/usr/bin/gpgv From b3a462e85a786401964d522124e4f431d79339e5 Mon Sep 17 00:00:00 2001 From: Michael Nosthoff Date: Sat, 18 Feb 2023 12:24:45 +0100 Subject: [PATCH 0970/5754] package/catch2: bump to version 3.3.1 raise the minimum gcc to 5 as stated in release notes for 3.1.0 [0]. [0] https://github.com/catchorg/Catch2/releases/tag/v3.1.0 Signed-off-by: Michael Nosthoff Signed-off-by: Thomas Petazzoni --- package/catch2/Config.in | 6 +++--- package/catch2/catch2.hash | 2 +- package/catch2/catch2.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/catch2/Config.in b/package/catch2/Config.in index 2f53d197b2..40d2d12434 100644 --- a/package/catch2/Config.in +++ b/package/catch2/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_CATCH2 depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++14 depends on BR2_USE_MMU # fork() help Catch2 is mainly a unit testing framework for C++, but it @@ -21,8 +21,8 @@ config BR2_PACKAGE_CATCH2 https://github.com/catchorg/Catch2 -comment "catch2 needs a toolchain w/ C++, wchar, threads, gcc >= 4.9" +comment "catch2 needs a toolchain w/ C++, wchar, threads, gcc >= 5" depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 diff --git a/package/catch2/catch2.hash b/package/catch2/catch2.hash index 664164fd76..b533792f8f 100644 --- a/package/catch2/catch2.hash +++ b/package/catch2/catch2.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 2106bccfec18c8ce673623d56780220e38527dd8f283ccba26aa4b8758737d0e catch2-3.1.1.tar.gz +sha256 d90351cdc55421f640c553cfc0875a8c834428679444e8062e9187d05b18aace catch2-3.3.1.tar.gz sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE.txt diff --git a/package/catch2/catch2.mk b/package/catch2/catch2.mk index ab62cc943b..6e4af3d670 100644 --- a/package/catch2/catch2.mk +++ b/package/catch2/catch2.mk @@ -4,7 +4,7 @@ # ################################################################################ -CATCH2_VERSION = 3.1.1 +CATCH2_VERSION = 3.3.1 CATCH2_SITE = $(call github,catchorg,Catch2,v$(CATCH2_VERSION)) CATCH2_INSTALL_STAGING = YES CATCH2_INSTALL_TARGET = NO From d782c0682f559d407e64698470b511512a5bdc78 Mon Sep 17 00:00:00 2001 From: Alexander Egorenkov Date: Sat, 18 Feb 2023 14:40:59 +0100 Subject: [PATCH 0971/5754] package/s390-tools: bump to version 2.26.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 a0dde477c3..37b67c5cb1 100644 --- a/package/s390-tools/s390-tools.hash +++ b/package/s390-tools/s390-tools.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 ccb20954e748309a50fd56edd9abd94c6f897081e9a1a33e9d965a56f650990d s390-tools-2.25.0.tar.gz +sha256 da81c55fb11d84923c0ebaed703f557052eb1a273495f60ebe3d20a74627303e s390-tools-2.26.0.tar.gz sha256 cca17a9a944ebec769adee4aebd805c912c357785ff2705a99ffe68563021f75 LICENSE diff --git a/package/s390-tools/s390-tools.mk b/package/s390-tools/s390-tools.mk index cb6278dfb8..8cd5491405 100644 --- a/package/s390-tools/s390-tools.mk +++ b/package/s390-tools/s390-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -S390_TOOLS_VERSION = 2.25.0 +S390_TOOLS_VERSION = 2.26.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 2ecaf26b5e3693cf0145a2d1fcc2e0953884baf4 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 18 Feb 2023 19:02:15 +0100 Subject: [PATCH 0972/5754] package/poke: bump to version 3.0 See: http://www.jemarch.net/poke-3.0-relnotes.html Build tested: https://gitlab.com/kubu93/buildroot/-/pipelines/782116399 Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/poke/poke.hash | 2 +- package/poke/poke.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/poke/poke.hash b/package/poke/poke.hash index 09dc4e8972..e6e436570c 100644 --- a/package/poke/poke.hash +++ b/package/poke/poke.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 841e285917c6738ce982a6930e30ebeadecfb0655a79d9184f16f876a9fe6e47 poke-2.4.tar.gz +sha256 79a9b2f33c9f8c327c499afadaeeabfeecf6ad4988924d2c6c6f317e50317add poke-3.0.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 jitter/COPYING diff --git a/package/poke/poke.mk b/package/poke/poke.mk index d49e628dbf..4a6ff344b2 100644 --- a/package/poke/poke.mk +++ b/package/poke/poke.mk @@ -4,7 +4,7 @@ # ################################################################################ -POKE_VERSION = 2.4 +POKE_VERSION = 3.0 POKE_SITE = $(BR2_GNU_MIRROR)/poke # gnulib license is a mix/mess of public-domain and various GPL and LGPL versions. POKE_LICENSE = GPL-3.0+, GPL-3.0+ (jitter), gnulib license (gnulib) From 7b4937a1709a88f90abbeac48e2e2db33b83d44b Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 19 Feb 2023 17:14:53 +0100 Subject: [PATCH 0973/5754] package/ipmiutil: fix uclibc build without wchar For an unknown reason, wchar_t is incorrectly detected with uclibc resulting in the following build failure: In file included from igetevent.c:136: imb_api.h:150:5: error: unknown type name 'wchar_t' 150 | wchar_t *Buffer; | ^~~~~~~ The build failure can be reproduced even when reverting bump to version 3.1.8. Fixes: - http://autobuild.buildroot.org/results/e9ff3bd08e106dc834968bf5e4296ce8299027f8 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/ipmiutil/ipmiutil.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/ipmiutil/ipmiutil.mk b/package/ipmiutil/ipmiutil.mk index ad9fbfc24c..b48eaa7cb2 100644 --- a/package/ipmiutil/ipmiutil.mk +++ b/package/ipmiutil/ipmiutil.mk @@ -10,6 +10,7 @@ IPMIUTIL_LICENSE = BSD-3-Clause IPMIUTIL_LICENSE_FILES = COPYING IPMIUTIL_MAKE = $(MAKE1) +IPMIUTIL_CONF_ENV = ac_cv_type_wchar_t=$(if $(BR2_USE_WCHAR),yes,no) ifeq ($(BR2_PACKAGE_OPENSSL),y) # tests against distro libcrypto so it might get a false positive when From bd351c4e933e48f380cc8924d1659b220d13b70c Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 20 Feb 2023 09:23:53 +0100 Subject: [PATCH 0974/5754] DEVELOPERS: remove Shyam Saini Shyam's email address at Savoir Faire Linux is bouncing, so drop they from the DEVELOPERS file. Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 --- 1 file changed, 3 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index a7a0bb14d1..2eff5b23ef 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2605,9 +2605,6 @@ F: package/tunctl/ F: package/ubus/ F: package/wolfssl/ -N: Shyam Saini -F: package/cukinia/ - N: Simon Dawson F: boot/at91bootstrap3/ F: package/cppzmq/ From 924ca9414fa962ce767c39b277489a0bdcbfad79 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 19 Feb 2023 18:52:04 +0100 Subject: [PATCH 0975/5754] package/less: fix CVE-2022-46663 In GNU Less before 609, crafted data can result in "less -R" not filtering ANSI escape sequences sent to the terminal. Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...-on-invalid-embedded-escape-sequence.patch | 27 +++++++++++++++++++ package/less/less.mk | 3 +++ 2 files changed, 30 insertions(+) create mode 100644 package/less/0001-End-OSC8-hyperlink-on-invalid-embedded-escape-sequence.patch 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 new file mode 100644 index 0000000000..233f949e24 --- /dev/null +++ b/package/less/0001-End-OSC8-hyperlink-on-invalid-embedded-escape-sequence.patch @@ -0,0 +1,27 @@ +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.mk b/package/less/less.mk index 7d7a6d5fe5..f01f94d6c8 100644 --- a/package/less/less.mk +++ b/package/less/less.mk @@ -11,6 +11,9 @@ 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 14ca6b5fdb6a5e0fa99b04461240772d93076b2e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 19 Feb 2023 20:07:45 +0100 Subject: [PATCH 0976/5754] package/libcurl: bump version to 7.88.0 Changelog: https://curl.se/changes.html#7_88_0 Updated license hash due to copyright year bump: https://github.com/curl/curl/commit/2bc1d775f510196154283374284f98d3eae03544#diff-400d38e5cfee181230373a8b02d38f50271a5bf62c62410382efddb8e8b19e22 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/libcurl/libcurl.hash | 6 +++--- package/libcurl/libcurl.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash index 230ec8d704..714b02acb0 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.87.0.tar.xz.asc +# https://curl.se/download/curl-7.88.0.tar.xz.asc # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 -sha256 ee5f1a1955b0ed413435ef79db28b834ea5f0fb7c8cfb1ce47175cc3bee08fff curl-7.87.0.tar.xz -sha256 321b1a09ebc30410f2e837c072e5521cf7095b757193af4a7dae1086e36ed31a COPYING +sha256 fd17432cf28714a4cf39d89e26b8ace0d8901199fe5d01d75eb0ae3bbfcc731f curl-7.88.0.tar.xz +sha256 b1d7feb949ea5023552029fbe0bf5db4f23c2f85e9b8e51e18536f0ecbf9c524 COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 994b685d34..eb481e4782 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 7.87.0 +LIBCURL_VERSION = 7.88.0 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ From 7852618c23756d8a79809a4e9e9c331a8fb0cf16 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Mon, 20 Feb 2023 10:42:39 +0200 Subject: [PATCH 0977/5754] package/wpewebkit: security bump to version 2.38.5 Bugfix release, fixes zero-day CVE-2023-23529 and includes a few build and behaviour patches as well. Release notes: https://wpewebkit.org/release/wpewebkit-2.38.5.html Accompanying security advisory: https://wpewebkit.org/security/WSA-2023-0002.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 dcd082e045..0fa1018721 100644 --- a/package/wpewebkit/wpewebkit.hash +++ b/package/wpewebkit/wpewebkit.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/wpewebkit-2.38.4.tar.xz.sums -md5 1c947ef5b73049fc6c102c92013009bf wpewebkit-2.38.4.tar.xz -sha1 7fe9a7d98401256b0c9872f1c2b702e56840cbd3 wpewebkit-2.38.4.tar.xz -sha256 8c1bc113ef151fb0be2640824d323bc755dc97295ab7a1bc05e7ec589937a07b wpewebkit-2.38.4.tar.xz +# 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 # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index b9c2fef395..48e5c2f8cd 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -WPEWEBKIT_VERSION = 2.38.4 +WPEWEBKIT_VERSION = 2.38.5 WPEWEBKIT_SITE = http://www.wpewebkit.org/releases WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz WPEWEBKIT_INSTALL_STAGING = YES From d37b3916a1ce75085da8232db95cfd354137e540 Mon Sep 17 00:00:00 2001 From: Marcus Folkesson Date: Mon, 20 Feb 2023 08:25:13 +0100 Subject: [PATCH 0978/5754] package/libostree: bump to version 2023.1 Signed-off-by: Marcus Folkesson Signed-off-by: Peter Korsgaard --- 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 ed31109fdb..63dfe98d80 100644 --- a/package/libostree/libostree.hash +++ b/package/libostree/libostree.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8be2a9261c94e8b9ec4113380ffc480f8598245fb321a009bad4fae4b822411f libostree-2022.7.tar.xz +sha256 dd792b167693a1971c9f6e3168013d906ac035100ff6c719a3b322eb44b96f55 libostree-2023.1.tar.xz sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/libostree/libostree.mk b/package/libostree/libostree.mk index 8e8ec63213..4b17fcf391 100644 --- a/package/libostree/libostree.mk +++ b/package/libostree/libostree.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOSTREE_VERSION = 2022.7 +LIBOSTREE_VERSION = 2023.1 LIBOSTREE_SOURCE = libostree-$(LIBOSTREE_VERSION).tar.xz LIBOSTREE_SITE = https://github.com/ostreedev/ostree/releases/download/v$(LIBOSTREE_VERSION) From a85ed5d21c14cbe3ec2864206fe792152598e4db Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 20 Feb 2023 14:15:25 +0100 Subject: [PATCH 0979/5754] package/python-django: security bump to version 4.1.7 Fix CVE-2023-23969 and CVE-2023-24580 https://docs.djangoproject.com/en/dev/releases/4.1.6 https://docs.djangoproject.com/en/dev/releases/4.1.7 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- 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 1d3035bb98..cb03b33bfe 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 6b6a47d7478ead15b0a0835841c433dc Django-4.1.5.tar.gz -sha256 ff56ebd7ead0fd5dbe06fe157b0024a7aaea2e0593bb3785fb594cf94dad58ef Django-4.1.5.tar.gz +md5 626f96c63ddfab24bab90d80c87a7aad Django-4.1.7.tar.gz +sha256 44f714b81c5f190d9d2ddad01a532fe502fa01c4cb8faf1d081f4264ed15dcd8 Django-4.1.7.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 e08de68954..e8c91cf51f 100644 --- a/package/python-django/python-django.mk +++ b/package/python-django/python-django.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_DJANGO_VERSION = 4.1.5 +PYTHON_DJANGO_VERSION = 4.1.7 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/41/c8/b3c469353f9d1b7f0e99b45520582b891da02cd87408bc867affa6e039a3 +PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/9f/a7/07939866241b7e8f8d3bf164b7d6ad428163723e29dd472700f8ab0e5fd5 PYTHON_DJANGO_LICENSE = BSD-3-Clause PYTHON_DJANGO_LICENSE_FILES = LICENSE From 67c967c2d16c29f193fde43b3c48edf0911baccd Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 20 Feb 2023 14:21:13 +0100 Subject: [PATCH 0980/5754] package/python-cryptography: security bump to version 39.0.1 Fix CVE-2023-23931: cryptography is a package designed to expose cryptographic primitives and recipes to Python developers. In affected versions `Cipher.update_into` would accept Python objects which implement the buffer protocol, but provide only immutable buffers. This would allow immutable objects (such as `bytes`) to be mutated, thus violating fundamental rules of Python and resulting in corrupted output. This now correctly raises an exception. This issue has been present since `update_into` was originally introduced in cryptography 1.8. https://github.com/pyca/cryptography/security/advisories/GHSA-w7pp-m8wf-vj6r https://cryptography.io/en/latest/changelog/#v39-0-1 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- 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 3f2204eeb1..a23944a06f 100644 --- a/package/python-cryptography/python-cryptography.hash +++ b/package/python-cryptography/python-cryptography.hash @@ -1,5 +1,5 @@ # Locally calculated after vendoring -sha256 2d00e023261719f85caf360ee061d37ee27654a0344d1376441c8a29ea3bac86 cryptography-39.0.0.tar.gz +sha256 531348679f144d118156be5b17ddac750974cdcd9f44bb0a7cfd7ddcfee79c80 cryptography-39.0.1.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 6868ff4633..a130b2d10d 100644 --- a/package/python-cryptography/python-cryptography.mk +++ b/package/python-cryptography/python-cryptography.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CRYPTOGRAPHY_VERSION = 39.0.0 +PYTHON_CRYPTOGRAPHY_VERSION = 39.0.1 PYTHON_CRYPTOGRAPHY_SOURCE = cryptography-$(PYTHON_CRYPTOGRAPHY_VERSION).tar.gz -PYTHON_CRYPTOGRAPHY_SITE = https://files.pythonhosted.org/packages/12/e3/c46c274cf466b24e5d44df5d5cd31a31ff23e57f074a2bb30931a8c9b01a +PYTHON_CRYPTOGRAPHY_SITE = https://files.pythonhosted.org/packages/6a/f5/a729774d087e50fffd1438b3877a91e9281294f985bda0fd15bf99016c78 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 ee13e3fb41dc7c0c001127733b5a599c1e509747 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 20 Feb 2023 11:30:01 +0100 Subject: [PATCH 0981/5754] package/glslsandbox-player: add wayland-protocols optional dependency wayland-protocols is an optional dependency which is enabled by default resulting in the following wayland build failure since the addition of the package in commit f201ca9d0d25b491ec5e1ed4e1d02fd52d027997: checking for wayland_client... yes checking for wayland_egl... yes configure: Wayland EGL support enabled checking for wayland_protocols... no configure: error: Package requirements (wayland-protocols >= 1.12) were not met: Package 'wayland-protocols', required by 'virtual:world', not found Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. Alternatively, you may set the environment variables wayland_protocols_CFLAGS and wayland_protocols_LIBS to avoid the need to call pkg-config. Fixes: - http://autobuild.buildroot.org/results/865af860f9e52fe5311bb0c6a246ff871ae5a989 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/glslsandbox-player/Config.in | 5 ++++- package/glslsandbox-player/glslsandbox-player.mk | 6 ++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/package/glslsandbox-player/Config.in b/package/glslsandbox-player/Config.in index 132705584e..530c158fc3 100644 --- a/package/glslsandbox-player/Config.in +++ b/package/glslsandbox-player/Config.in @@ -111,8 +111,11 @@ endchoice if BR2_PACKAGE_GLSLSANDBOX_PLAYER_WL config BR2_PACKAGE_GLSLSANDBOX_PLAYER_WL_IVI bool "Wayland IVI shell support" -endif +config BR2_PACKAGE_GLSLSANDBOX_PLAYER_WL_XDG + bool "Wayland XDG shell support" + select BR2_PACKAGE_WAYLAND_PROTOCOLS +endif endif comment "glslsandbox-player needs openGL ES and EGL driver" diff --git a/package/glslsandbox-player/glslsandbox-player.mk b/package/glslsandbox-player/glslsandbox-player.mk index f0a9475aa6..241f3475d2 100644 --- a/package/glslsandbox-player/glslsandbox-player.mk +++ b/package/glslsandbox-player/glslsandbox-player.mk @@ -72,6 +72,12 @@ GLSLSANDBOX_PLAYER_CONF_OPTS += --enable-ivi else GLSLSANDBOX_PLAYER_CONF_OPTS += --disable-ivi endif +ifeq ($(BR2_PACKAGE_GLSLSANDBOX_PLAYER_WL_XDG),y) +GLSLSANDBOX_PLAYER_DEPENDENCIES += wayland-protocols +GLSLSANDBOX_PLAYER_CONF_OPTS += --enable-wlxdg +else +GLSLSANDBOX_PLAYER_CONF_OPTS += --disable-wlxdg +endif else ifeq ($(BR2_PACKAGE_GLSLSANDBOX_PLAYER_X11),y) GLSLSANDBOX_PLAYER_DEPENDENCIES += xlib_libX11 GLSLSANDBOX_PLAYER_CONF_OPTS += --with-native-gfx=x11 From 5f1858e859833da272fce70bf445ca1b53ebffe1 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 20 Feb 2023 12:21:47 +0100 Subject: [PATCH 0982/5754] package/rockchip-mali: needs C++ rockchip-mali pre-built libraries needs C++ since the addition of the package in commit 97c74a73e5dee17530647f89b2c7d8692781eb14: readelf -a output/build/rockchip-mali-721653b5b3b525a4f80d15aa7e2f9df7b7e60427/lib/aarch64-linux-gnu/libmali-bifrost-g31-rxp0-gbm.so|grep NEEDED 0x0000000000000001 (NEEDED) Shared library: [libpthread.so.0] 0x0000000000000001 (NEEDED) Shared library: [libdl.so.2] 0x0000000000000001 (NEEDED) Shared library: [librt.so.1] 0x0000000000000001 (NEEDED) Shared library: [libdrm.so.2] 0x0000000000000001 (NEEDED) Shared library: [libm.so.6] 0x0000000000000001 (NEEDED) Shared library: [libstdc++.so.6] 0x0000000000000001 (NEEDED) Shared library: [libgcc_s.so.1] 0x0000000000000001 (NEEDED) Shared library: [libc.so.6] While at it, add a comment when dependencies are not met Fixes: - No autobuilder failures (yet), found when debugging an issue with rockchip-mali and glslsandbox-player Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/rockchip-mali/Config.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/rockchip-mali/Config.in b/package/rockchip-mali/Config.in index d616284911..5a23954af3 100644 --- a/package/rockchip-mali/Config.in +++ b/package/rockchip-mali/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_ROCKCHIP_MALI bool "rockchip-mali" + depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_USES_GLIBC depends on BR2_ARM_EABIHF || BR2_aarch64 # lidbrm. This would normally need a Config.in comment, but @@ -30,3 +31,8 @@ config BR2_PACKAGE_PROVIDES_LIBGBM default "rockchip-mali" endif + +comment "rockchip-mali needs a glibc toolchain w/ C++, threads" + depends on BR2_ARM_EABIHF || BR2_aarch64 + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_USES_GLIBC || !BR2_TOOLCHAIN_HAS_THREADS From b21cd8be3f9469d6bdbbaed951ae7c59efb46a24 Mon Sep 17 00:00:00 2001 From: Thomas Devoogdt Date: Mon, 20 Feb 2023 10:09:21 +0100 Subject: [PATCH 0983/5754] Revert "xorg-server: not available with musl on ARM" This reverts commit 9daafbcb75a7ab593ce8a1f21c6149c8437bc0bc. Fixed since https://gitlab.freedesktop.org/xorg/xserver/-/issues/840 (xserver 1.20.6). Signed-off-by: Thomas Devoogdt Signed-off-by: Peter Korsgaard --- package/x11r7/xserver_xorg-server/Config.in | 5 ----- 1 file changed, 5 deletions(-) diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in index 865917c4ec..b933bd0285 100644 --- a/package/x11r7/xserver_xorg-server/Config.in +++ b/package/x11r7/xserver_xorg-server/Config.in @@ -1,11 +1,6 @@ -comment "xorg-server needs a glibc or uClibc toolchain" - depends on BR2_arm && BR2_TOOLCHAIN_USES_MUSL - config BR2_PACKAGE_XSERVER_XORG_SERVER bool "xorg-server" depends on BR2_USE_MMU # fork() - # xserver uses inb/outb on arm, which aren't available with musl - depends on !(BR2_arm && BR2_TOOLCHAIN_USES_MUSL) # We need a SHA1 implementation. If either openssl or # libgcrypt are already part of the build, we'll use one of # them, otherwise, use the small libsha1 library. From 4c7fcbbe75de5c535e8d5dd7182900b6d09e2b03 Mon Sep 17 00:00:00 2001 From: Thomas Devoogdt Date: Mon, 20 Feb 2023 10:09:23 +0100 Subject: [PATCH 0984/5754] package/webkitgtk: security bump to version 2.38.5 Bugfix release, with many security fixes, including (but not limited to) a patch for CVE-2023-23529. Release notes: https://webkitgtk.org/2023/02/15/webkitgtk2.38.5-released.html Accompanying security advisory: https://webkitgtk.org/security/WSA-2023-0002.html Also raise the minimal GCC version to 8.3, which was already required since webkitgtk-2.36.4. Similar to commit ec1ff802df9a0f17dd2b734ba536a5e206aa5aa4, we do check on >= GCC 8, because we can't check on >= GCC 8.3. https://github.com/WebKit/WebKit/commit/f812c5db1ff22bcbe1070ca4ed613085cd36499b Signed-off-by: Thomas Devoogdt Acked-by: Adrian Perez de Castro Signed-off-by: Peter Korsgaard --- package/webkitgtk/Config.in | 4 ++-- package/webkitgtk/webkitgtk.hash | 8 ++++---- package/webkitgtk/webkitgtk.mk | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/webkitgtk/Config.in b/package/webkitgtk/Config.in index dc5d738dae..976341093e 100644 --- a/package/webkitgtk/Config.in +++ b/package/webkitgtk/Config.in @@ -16,7 +16,7 @@ config BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt -comment "webkitgtk needs libgtk3 and a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 7, host gcc >= 4.9" +comment "webkitgtk needs libgtk3 and a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 8, host gcc >= 4.9" depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS depends on !BR2_BINFMT_FLAT depends on !BR2_PACKAGE_LIBGTK3 || !BR2_INSTALL_LIBSTDCPP || \ @@ -32,7 +32,7 @@ config BR2_PACKAGE_WEBKITGTK 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_GCC_AT_LEAST_7 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 depends on BR2_USE_WCHAR # icu, libsoup depends on BR2_PACKAGE_LIBGTK3 depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash index 34fd19d3de..c771297b5a 100644 --- a/package/webkitgtk/webkitgtk.hash +++ b/package/webkitgtk/webkitgtk.hash @@ -1,7 +1,7 @@ -# From https://webkitgtk.org/releases/webkitgtk-2.38.4.tar.xz.sums -md5 1c9ca83a0ad7e4ca9e933094572cb7d9 webkitgtk-2.38.4.tar.xz -sha1 38b47df2be9bfb97d68fce8c7fa2819966a79036 webkitgtk-2.38.4.tar.xz -sha256 4f47ea29a2d4d5f15eef3dc9e2d6c6f067e8de863a3f64455e1ccf9693cc1d36 webkitgtk-2.38.4.tar.xz +# 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 # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index a6974db926..3263f7fea0 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBKITGTK_VERSION = 2.38.4 +WEBKITGTK_VERSION = 2.38.5 WEBKITGTK_SITE = https://www.webkitgtk.org/releases WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz WEBKITGTK_INSTALL_STAGING = YES From e8c4b360fd40e5b266c851588a81aff102afaec7 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 20 Feb 2023 21:13:02 +0100 Subject: [PATCH 0985/5754] Update for 2023.02-rc1 Signed-off-by: Peter Korsgaard --- CHANGES | 85 ++++++++++++++++++++++++++++++++++++++ Makefile | 4 +- docs/website/download.html | 22 +++++----- docs/website/news.html | 21 ++++++++++ 4 files changed, 119 insertions(+), 13 deletions(-) diff --git a/CHANGES b/CHANGES index 9fd8b31350..21e349f3a8 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,88 @@ +2023.02-rc1, released February 20th, 2023 + + Numerous package updates and many (62) new packages. + + Toolchain: + + - The check for access to "unsafe" (E.G. from the build host) + header files and libraries by the cross compiler is now + unconditionally enabled. + + - Bootlin external toolchains updated to 2022.08 + + - The handling of the CCACHE_* environment variables by the + toolchain wrapper is now more strict, causing the variables + to only be exported when BR2_CCACHE is enabled. + + Infrastructure: + + - Br2-external: Fix make performance issue when many (> 6) + external trees are used together. + + - Legal-info: Stop warning about not saving sources for local + / override packages if _REDISTRIBUTE is set to NO. + + - Go: Ensure our go build and module cache is used, even for the + download step. + + - Cargo: CARGO_HOME (the location where cargo stores it + downloaded artifacts) is now located under DL_DIR rather + than in HOST_DIR/share/cargo, ensuring it is shared between + builds. + + Misc: + + - Erofs: Use fixed timestamp and UUID when BR2_REPRODUCIBLE is + used. + + - Ext2: Year 2038+ compatible inodes are now used by default, + independently of the filesystem size. + + - Linux: Fix build of < 5.6 kernels with host-gcc >= 10. + + A large number of NXP related packages and defconfigs have + been updated as upstream moved the git repositories to Github. + + New defconfigs: i.MX8mn BSH SMM S2 / pro, QEMU ARM EBBR, + Sipeed Lichee rv / rv dock, Starfive Visionfive2, Xilinx Versal + VCK190. + + New packages: catch2, cli11, dotconf, edk2-non-osi, + fluent-bit, fxdiv, hddtemp, highway, imx-vpu-hantro-daemon, + libjxl, libsolv, libunibreak, neon-2-sse, open-iscsi, + opencv4-contrib, perftest, perl-image-exiftool, + python-apispec, python-async-generator, python-cppy, + python-dbus-fast, python-dicttoxml2, python-flask-smorest, + python-h11, python-hkdf, python-magic-wormhole, + python-magic-wormhole-mailbox-server, + python-magic-wormhole-transit-relay, python-marshmallow, + python-munch, python-outcome, python-pycrate, python-pyspnego, + python-reedsolo, python-selenium, python-smbprotocol, + python-sniffio, python-spake2, python-trio, + python-trio-websocket, python-uhid, python-webargs, + python-wsproto, qt5speech, qt6serialbus, rdma-core, reproc, + rtl8723ds-bt, rtl8821cu, sexpect, speechd, sscep, stb, sway, + termcolor, ti-k3-r5-loader, tl-expected, unifdef, + versal-firmware, xwayland, z3 + + Removed packages: docker-proxy, elixir, gummiboot, + python-bunch, python-m2r, sun20i-d1-spl, ucl, + xdriver_xf86-input-keyboard, xdriver_xf86-video-glint, + xdriver_xf86-video-imx-viv, xdriver_xf86-video-tga + + Issues resolved (http://bugs.uclibc.org): + + #14971: Kernel 3.10.108 fail to build in Buildroot 2022.08-rc1 + #14996: Too many directories in BR2_EXTERNAL causes hang during make + #15161: kernel can't support SUBDIR + #15196: Setting BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE does not work + #15226: lsblk: not found + #15271: no start-qemu.sh + #15281: Error compiling GDAL library for RPi-64 if libgdal-dev install.. + #15291: BR2_PACKAGE_GNU_EFI_ARCH_SUPPORTS without location + #15301: Selecting NAND Flash boot media (NAND_BOOT) breaks the uboot.. + #15331: Warning on python-flit-core license when generating legal info + 2022.11.1, released January 18th, 2023 Important / security related fixes. diff --git a/Makefile b/Makefile index 4880b426b5..c97086c09c 100644 --- a/Makefile +++ b/Makefile @@ -90,9 +90,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2023.02-git +export BR2_VERSION := 2023.02-rc1 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1669308000 +BR2_VERSION_EPOCH = 1676923000 # 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 a7efef1ef3..a6b9a9a7c4 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -75,38 +75,38 @@

buildroot-2022.11.1.tar.xzPGP signature

- +
Source code
diff --git a/docs/website/news.html b/docs/website/news.html index 687efeb377..8acf454052 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,27 @@

News

    +
  • +
    +
    +
    +

    2023.02-rc1 released

    +

    20 February 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.02-rc1 + release, and report any problems found to the + mailing list or + bug tracker.

    +
    +
    +
    • +
  • From d77d1c98240bf9c7c9062a67d68b1e548af42e5d Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 20 Feb 2023 14:25:51 +0100 Subject: [PATCH 0986/5754] package/speechd: fix build with help2man Fix the following build failure with help2man raised since the addition of the package in commit 9f4f8c5f8993c6d7c2ef730ac211ef84ac9ae26d: LC_ALL=C help2man -n "speech synthesis daemon" --output=speech-dispatcher.1 ./speech-dispatcher help2man: can't get `--help' info from ./speech-dispatcher Try `--no-discard-stderr' if option outputs to stderr Fixes: - http://autobuild.buildroot.org/results/cc1817efb4a5d54ffd2e7ac2f4fc773535f70972 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/speechd/speechd.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/speechd/speechd.mk b/package/speechd/speechd.mk index 46c0672f59..dee94a6752 100644 --- a/package/speechd/speechd.mk +++ b/package/speechd/speechd.mk @@ -12,6 +12,7 @@ SPEECHD_INSTALL_STAGING = YES # speechd source code is released without configure script SPEECHD_AUTORECONF = YES SPEECHD_DEPENDENCIES = host-pkgconf dotconf libglib2 libsndfile +SPEECHD_CONF_ENV = ac_cv_prog_HELP2MAN="" SPEECHD_CONF_OPTS = --without-kali # fix missing config.rpath (needed for autoreconf) in the codebase From e8e461bba5942b4711b94a57799600fb4eb226c1 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 20 Feb 2023 15:27:46 +0100 Subject: [PATCH 0987/5754] package/libarchive: fix host build Fix the following host build failure raised since commit 9525bc7e64e8f44c31ab9dfd3f516ecb35982429: configure.ac:140: error: possibly undefined macro: AC_MSG_FAILURE If this token and others are legitimate, please use m4_pattern_allow. See the Autoconf documentation. configure.ac:328: error: possibly undefined macro: AC_CHECK_LIB Fixes: - http://autobuild.buildroot.org/results/11868e9bc4916843a7fc76f7b5e4c251f89e33dc Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libarchive/libarchive.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk index cd7c13fbed..2010b6529f 100644 --- a/package/libarchive/libarchive.mk +++ b/package/libarchive/libarchive.mk @@ -140,6 +140,8 @@ endif # The only user of host-libarchive needs zlib support HOST_LIBARCHIVE_DEPENDENCIES = host-zlib +# needed for autoreconf +HOST_LIBARCHIVE_DEPENDENCIES += host-pkgconf HOST_LIBARCHIVE_CONF_OPTS = \ --disable-bsdtar \ --disable-bsdcpio \ From 1e8cce6f2b1936dbda9d63ddf4f41acf59a64113 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 20 Feb 2023 20:21:25 +0100 Subject: [PATCH 0988/5754] package/libarchive: fix uclibc with libiconv build Replace patch added by commit 9525bc7e64e8f44c31ab9dfd3f516ecb35982429 as current patch is not correct, build failures are still raised by uclibc-ng with libiconv on fwup/gvfs/...: configure: error: Requires libarchive. Libarchive must be built with zlib support. [...] Run-time dependency libarchive found: NO (tried cmake) ../output-1/build/gvfs-1.48.1/meson.build:405:2: ERROR: Dependency lookup for libarchive with method 'pkgconfig' failed: Could not generate cargs for libarchive: Package iconv was not found in the pkg-config search path. Perhaps you should add the directory containing `iconv.pc' to the PKG_CONFIG_PATH environment variable Package 'iconv', required by 'libarchive', not found Fixes: - http://autobuild.buildroot.org/results/05a5496495e51da2c9caf7570695cc95e1745e30 - http://autobuild.buildroot.org/results/98dc4b415115cca65b53e4cd986144ef85bf17ad Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...y-add-iconv-to-the-pc-file-if-needed.patch | 44 ------------------- ...o-not-add-iconv-for-Requires.private.patch | 28 ++++++++++++ 2 files changed, 28 insertions(+), 44 deletions(-) delete mode 100644 package/libarchive/0001-Only-add-iconv-to-the-pc-file-if-needed.patch create mode 100644 package/libarchive/0001-autotools-do-not-add-iconv-for-Requires.private.patch diff --git a/package/libarchive/0001-Only-add-iconv-to-the-pc-file-if-needed.patch b/package/libarchive/0001-Only-add-iconv-to-the-pc-file-if-needed.patch deleted file mode 100644 index c93944f789..0000000000 --- a/package/libarchive/0001-Only-add-iconv-to-the-pc-file-if-needed.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 1f35c466aaa9444335a1b854b0b7223b0d2346c2 Mon Sep 17 00:00:00 2001 -From: Peter Pentchev -Date: Thu, 29 Dec 2022 00:04:40 +0200 -Subject: [PATCH] Only add "iconv" to the .pc file if needed (#1825) - -Hi, - -Thanks for writing and maintaining libarchive! - -What do you think about this trivial change that does not add "iconv" to -the pkg-config file's list of required packages unless it is actually -needed? On at least Debian GNU/Linux systems, the iconv(3) function is -part of the system C library and there is no Debian package that -installs an iconv.pc file, so I had to make this change to the Debian -package of libarchive. - -Thanks again, and keep up the great work! - -G'luck, -Peter - -Downloaded from upstream commit: -https://github.com/libarchive/libarchive/commit/1f35c466aaa9444335a1b854b0b7223b0d2346c2 - -Signed-off-by: Bernd Kuhls ---- - configure.ac | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 99bff20d1..e2715cfde 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -378,7 +378,9 @@ if test "x$with_iconv" != "xno"; then - AC_CHECK_HEADERS([localcharset.h]) - am_save_LIBS="$LIBS" - LIBS="${LIBS} ${LIBICONV}" -- LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+ }iconv" -+ if test -n "$LIBICONV"; then -+ LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+ }iconv" -+ fi - AC_CHECK_FUNCS([locale_charset]) - LIBS="${am_save_LIBS}" - if test "x$ac_cv_func_locale_charset" != "xyes"; then 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 new file mode 100644 index 0000000000..91903866ef --- /dev/null +++ b/package/libarchive/0001-autotools-do-not-add-iconv-for-Requires.private.patch @@ -0,0 +1,28 @@ +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 From 474196d6bb410c0a9f5e1c8bb7018594a29a57bb Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 20 Feb 2023 11:03:09 +0100 Subject: [PATCH 0989/5754] support/dependencies/dependencies.sh: require FileHandle perl package for syslinux syslinux needs FileHandle module: Can't locate FileHandle.pm in @INC (you may need to install the FileHandle module) (@INC contains: /home/buildroot/autobuild/instance-0/output-1/host/lib/perl /usr/local/lib64/perl5/5.36 /usr/local/share/perl5/5.36 /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 /usr/share/perl5) at /home/buildroot/autobuild/instance-0/output-1/build/syslinux-6.03/com32/lib/makeerrlist.pl line 8. BEGIN failed--compilation aborted at /home/buildroot/autobuild/instance-0/output-1/build/syslinux-6.03/com32/lib/makeerrlist.pl line 8. /home/buildroot/autobuild/instance-0/output-1/host/bin/i586-buildroot-linux-gnu-gcc -Wp,-MT,errlist.o,-MD,./.errlist.o.d -Os -march=i386 -falign-functions=0 -falign-jumps=0 -falign-labels=0 -ffast-math -fomit-frame-pointer -std=gnu99 -m32 -mpreferred-stack-boundary=2 -fno-stack-protector -fwrapv -freg-struct-return -fPIC -fno-exceptions -fno-asynchronous-unwind-tables -fno-strict-aliasing -falign-functions=0 -falign-jumps=0 -falign-labels=0 -falign-loops=0 -g -D__COM32__ -D__FIRMWARE_BIOS__ -nostdinc -iwithprefix include -I. -I/home/buildroot/autobuild/instance-0/output-1/build/syslinux-6.03/com32/lib/sys -I/home/buildroot/autobuild/instance-0/output-1/build/syslinux-6.03/com32/lib/../include -I/home/buildroot/autobuild/instance-0/output-1/build/syslinux-6.03/com32/include/sys -I/home/buildroot/autobuild/instance-0/output-1/build/syslinux-6.03/core/include -I/home/buildroot/autobuild/instance-0/output-1/build/syslinux-6.03/com32/lib/ -I/home/buildroot/autobuild/instance-0/output-1/bu ild/syslinux-6.03/com32/lib/sys/module -I/home/buildroot/autobuild/instance-0/output-1/build/syslinux-6.03/bios/com32/lib//../.. -W -Wall -Wstrict-prototypes -Wpointer-arith -Wwrite-strings -Wstrict-prototypes -Winline -DDYNAMIC_CRC_TABLE -DPNG_NO_CONSOLE_IO -DPNG_NO_WRITE_SUPPORTED -DPNG_NO_MNG_FEATURES -DPNG_NO_READ_tIME -DPNG_NO_WRITE_tIME -mregparm=3 -DREGPARM=3 -c -o errlist.o errlist.c cc1: fatal error: errlist.c: No such file or directory Fixes: - http://autobuild.buildroot.org/results/de88089888b2ca354b28af3550abf846560da7d5 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- support/dependencies/dependencies.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index 4353e9585e..a692856d31 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -298,6 +298,10 @@ if grep -q -E '^BR2_PACKAGE_(WEBKITGTK|WPEWEBKIT)=y' $BR2_CONFIG ; then required_perl_modules="${required_perl_modules} JSON::PP" fi +if grep -q ^BR2_TARGET_SYSLINUX=y $BR2_CONFIG ; then + required_perl_modules="$required_perl_modules FileHandle" +fi + # This variable will keep the modules that are missing in your system. missing_perl_modules="" From d9c146f0a540536c0ad8df7b31a190c117ad1581 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 20 Feb 2023 10:25:16 +0100 Subject: [PATCH 0990/5754] package/modem-manager: needs dynamic library Commit d769cfc13f6c2544f8bc5b6339d23763319a2383 was incomplete as plugins/meson.build still unconditionally calls shared_module. So add a dependency to dynamic library to avoid the following static build failure raised since bump to version 1.20.2 in commit b95334b71fbdde0f7621b58ed35fa98df9e0966d: [238/417] Linking target plugins/libmm-shared-telit.so FAILED: plugins/libmm-shared-telit.so Building statically could be enabled back through builtin_plugins as soon as https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/commit/1c4da332ee6e0d948f85a63f74cb27e89075c011 lands in a stable release Fixes: - http://autobuild.buildroot.org/results/deb2a752accb021392bb9dc3d06b2b1bf151535c Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/modem-manager/Config.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/modem-manager/Config.in b/package/modem-manager/Config.in index 8489e6fc86..6990996a86 100644 --- a/package/modem-manager/Config.in +++ b/package/modem-manager/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_MODEM_MANAGER depends on BR2_USE_WCHAR # libglib2 and gnutls depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2 depends on BR2_USE_MMU # dbus + depends on !BR2_STATIC_LIBS select BR2_PACKAGE_DBUS select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBGUDEV if BR2_PACKAGE_HAS_UDEV @@ -39,6 +40,7 @@ comment "QRTR support needs a toolchain w/ headers >= 4.15" endif -comment "modemmanager needs a toolchain w/ wchar, threads" - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS +comment "modemmanager needs a toolchain w/ wchar, threads, dynamic library" + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + BR2_STATIC_LIBS depends on BR2_USE_MMU From 1d29799914d5df6fb372284d8c3408809e00d0b4 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 20 Feb 2023 10:17:39 +0100 Subject: [PATCH 0991/5754] package/zabbix: set --with-libpcre2 Set --with-libpcre2 to avoid the following build failure raised since bump to version 6.2.7 in commit 89fa774a191d41ed5d125d87d812ff3478902251: configure: using old pcre library by default checking pkg-config is at least version 0.9.0... yes configure: error: cannot find pkg-config package for libpcre Fixes: - http://autobuild.buildroot.org/results/701b343b3b0d471c75899b61d02bd9d63a272247 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/zabbix/zabbix.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/zabbix/zabbix.mk b/package/zabbix/zabbix.mk index db9efed78b..0d6c579f4c 100644 --- a/package/zabbix/zabbix.mk +++ b/package/zabbix/zabbix.mk @@ -15,6 +15,7 @@ ZABBIX_AUTORECONF = YES ZABBIX_DEPENDENCIES = host-pkgconf pcre2 ZABBIX_CONF_OPTS = \ + --with-libpcre2 \ --without-sqlite3 \ --enable-agent \ --disable-agent2 \ From 92c4589b904cfbc4cd633a92729ecd98a50851ff Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 19 Feb 2023 17:48:20 +0100 Subject: [PATCH 0992/5754] package/libjxl: fix build with libjpeg Building with libjpeg will raise the following build failure on some architectures since the addition of the package in commit e648d399d8bd609697e78f13f7fa76be06d91a57: /tmp/instance-14/output-1/build/libjxl-0.7.0/lib/extras/enc/jpg.cc: In function 'jxl::Status jxl::extras::{anonymous}::EncodeWithLibJpeg(const jxl::extras::PackedImage&, const JxlBasicInfo&, const std::vector&, std::vector, size_t, const string&, std::vector*)': /tmp/instance-14/output-1/build/libjxl-0.7.0/lib/extras/enc/jpg.cc:126:34: error: invalid conversion from 'long unsigned int*' to 'size_t*' {aka 'unsigned int*'} [-fpermissive] 126 | jpeg_mem_dest(&cinfo, &buffer, &size); | ^~~~~ | | | long unsigned int* Upstream advocates to use jpeg-turbo: https://github.com/libjxl/libjxl/issues/1802 Fixes: - http://autobuild.buildroot.org/results/9a2a7c6072876f2562609bf98f32a1ce93631a75 Signed-off-by: Fabrice Fontaine Reviewed-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/libjxl/libjxl.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/libjxl/libjxl.mk b/package/libjxl/libjxl.mk index cc24ba258c..1257928efd 100644 --- a/package/libjxl/libjxl.mk +++ b/package/libjxl/libjxl.mk @@ -30,4 +30,11 @@ LIBJXL_CONF_OPTS = \ -DJPEGXL_ENABLE_SJPEG=OFF \ -DJPEGXL_ENABLE_SKCMS=OFF +ifeq ($(BR2_PACKAGE_JPEG_TURBO),y) +LIBJXL_DEPENDENCIES += jpeg-turbo +LIBJXL_CONF_OPTS += -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=OFF +else +LIBJXL_CONF_OPTS += -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=ON +endif + $(eval $(cmake-package)) From 13b05a9b00bb1eeacefafe7b2a3537988a53dcea Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 19 Feb 2023 17:48:21 +0100 Subject: [PATCH 0993/5754] package/libjxl: disable benchmark and tests Disable benchmark and tests which are enabled by default since the addition of the package in commit e648d399d8bd609697e78f13f7fa76be06d91a57 Signed-off-by: Fabrice Fontaine Reviewed-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/libjxl/libjxl.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/libjxl/libjxl.mk b/package/libjxl/libjxl.mk index 1257928efd..b4dfbecf82 100644 --- a/package/libjxl/libjxl.mk +++ b/package/libjxl/libjxl.mk @@ -23,7 +23,9 @@ endif LIBJXL_CONF_OPTS = \ -DJPEGXL_BUNDLE_LIBPNG=OFF \ -DJPEGXL_BUNDLE_SKCMS=OFF \ + -DJPEGXL_ENABLE_BENCHMARK=OFF \ -DJPEGXL_ENABLE_DOXYGEN=OFF \ + -DJPEGXL_ENABLE_EXAMPLES=OFF \ -DJPEGXL_ENABLE_JNI=OFF \ -DJPEGXL_ENABLE_MANPAGES=OFF \ -DJPEGXL_ENABLE_OPENEXR=OFF \ From ff7c37e57419aeb2fb63ebc21bad9696aaaba2b4 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 19 Feb 2023 17:48:22 +0100 Subject: [PATCH 0994/5754] package/libjxl: security bump to version 0.8.1 Security: Fix OOB read in exif.h https://github.com/libjxl/libjxl/releases/tag/v0.8.1 https://github.com/libjxl/libjxl/releases/tag/v0.8.0 Signed-off-by: Fabrice Fontaine Tested-by: Julien Olivain Reviewed-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- ...entation-fault-when-JPEG-is-disabled.patch | 44 +++++++++++++++++++ package/libjxl/libjxl.hash | 2 +- package/libjxl/libjxl.mk | 2 +- 3 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 package/libjxl/0001-djxl-fix-segmentation-fault-when-JPEG-is-disabled.patch diff --git a/package/libjxl/0001-djxl-fix-segmentation-fault-when-JPEG-is-disabled.patch b/package/libjxl/0001-djxl-fix-segmentation-fault-when-JPEG-is-disabled.patch new file mode 100644 index 0000000000..3d709c956b --- /dev/null +++ b/package/libjxl/0001-djxl-fix-segmentation-fault-when-JPEG-is-disabled.patch @@ -0,0 +1,44 @@ +From 504f35c8204248ae6f97278e8b7c6cc5853a1b94 Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Fri, 10 Feb 2023 21:31:30 +0100 +Subject: [PATCH] djxl: fix segmentation fault when JPEG is disabled + +When libjxl is compiled without JPEG support, by configuring for example +with: + + cmake -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=TRUE ... + +djxl crashes with a segmentation fault at: +https://github.com/libjxl/libjxl/blob/v0.8.1/tools/djxl_main.cc#L367 + +The crash can be reproduced with the sequence: + + gm convert IMAGE:LOGO ref.ppm + cjxl ref.ppm enc.jxl + djxl enc.jxl dec.ppm + +The crash happen because opt_jpeg_quality_id does not get +initialized at: +https://github.com/libjxl/libjxl/blob/v0.8.1/tools/djxl_main.cc#L107 + +This commit fixes the crash by adding a test on opt_jpeg_quality_id. + +Signed-off-by: Julien Olivain +[Retrieved from: +https://github.com/libjxl/libjxl/pull/2178/commits/504f35c8204248ae6f97278e8b7c6cc5853a1b94] +--- + tools/djxl_main.cc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tools/djxl_main.cc b/tools/djxl_main.cc +index b755301fcb..42b889e7ce 100644 +--- a/tools/djxl_main.cc ++++ b/tools/djxl_main.cc +@@ -370,6 +370,7 @@ int main(int argc, const char* argv[]) { + args.color_space = force_colorspace; + } + if (codec == jxl::extras::Codec::kPNM && extension != ".pfm" && ++ args.opt_jpeg_quality_id != -1 && + !cmdline.GetOption(args.opt_jpeg_quality_id)->matched()) { + args.bits_per_sample = 0; + } diff --git a/package/libjxl/libjxl.hash b/package/libjxl/libjxl.hash index e71d32e61d..6b4c9d8d0a 100644 --- a/package/libjxl/libjxl.hash +++ b/package/libjxl/libjxl.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 3114bba1fabb36f6f4adc2632717209aa6f84077bc4e93b420e0d63fa0455c5e libjxl-0.7.0.tar.gz +sha256 60f43921ad3209c9e180563025eda0c0f9b1afac51a2927b9ff59fff3950dc56 libjxl-0.8.1.tar.gz sha256 8405932022a556380c2d8c272eff154a923feb197233f348ce5f7334fb0a5ede LICENSE sha256 91915f8ae056a68a3c5bdf05d9f6f78bb6903e27a8ca3a8434c9e4ac87300575 PATENTS diff --git a/package/libjxl/libjxl.mk b/package/libjxl/libjxl.mk index b4dfbecf82..f603327bf6 100644 --- a/package/libjxl/libjxl.mk +++ b/package/libjxl/libjxl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBJXL_VERSION = 0.7.0 +LIBJXL_VERSION = 0.8.1 LIBJXL_SITE = $(call github,libjxl,libjxl,v$(LIBJXL_VERSION)) LIBJXL_LICENSE = BSD-3-Clause LIBJXL_LICENSE_FILES = LICENSE PATENTS From 06af305874abc1eb4bb98dbd8aabe071fa5d77bc Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 19 Feb 2023 17:56:38 +0100 Subject: [PATCH 0995/5754] package/modsecurity2: disable pcre Disable pcre to avoid the following build failure if pcre-config is found on host raised since bump to version 2.9.7 in commit 42e34cf10f9eb037aa8c48a4fb9e8f521901b983: /home/thomas/autobuild/instance-0/output-1/per-package/modsecurity2/host/bin/../lib/gcc/mips64el-buildroot-linux-gnu/11.3.0/../../../../mips64el-buildroot-linux-gnu/bin/ld: cannot find -lpcre: No such file or directory Fixes: - http://autobuild.buildroot.org/results/f4864f8cc1d07e357f6e5f8302c19ae94e9cf3af Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/modsecurity2/modsecurity2.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/modsecurity2/modsecurity2.mk b/package/modsecurity2/modsecurity2.mk index c251291e64..88bbf3bb29 100644 --- a/package/modsecurity2/modsecurity2.mk +++ b/package/modsecurity2/modsecurity2.mk @@ -21,6 +21,7 @@ MODSECURITY2_CONF_OPTS = \ --with-apxs=$(STAGING_DIR)/usr/bin/apxs \ --without-curl \ --without-lua \ + --without-pcre \ --without-yajl \ --without-ssdeep From b3093e258aba57015d23d40ab478c818128c6a13 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 19 Feb 2023 18:35:36 +0100 Subject: [PATCH 0996/5754] package/nginx-naxsi: fix build with pcre2 Fix the following build failure raised since bump of nginx to version 1.22.1 in commit 722b84eafa5e3d9540e0a80bae0c971a3a778358: /home/buildroot/autobuild/run/instance-2/output-1/build/nginx-naxsi-1.3/naxsi_src/naxsi_runtime.c: In function 'ngx_http_process_basic_rule_buffer': /home/buildroot/autobuild/run/instance-2/output-1/build/nginx-naxsi-1.3/naxsi_src/naxsi_runtime.c:205:61: 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, | ^~ Fixes: - http://autobuild.buildroot.org/results/7fff888bd36710e2d2f5bb39a38597e8c04305ce Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0002-PCRE2-compatibility.patch | 221 ++++++++++++++++++ 1 file changed, 221 insertions(+) create mode 100644 package/nginx-naxsi/0002-PCRE2-compatibility.patch diff --git a/package/nginx-naxsi/0002-PCRE2-compatibility.patch b/package/nginx-naxsi/0002-PCRE2-compatibility.patch new file mode 100644 index 0000000000..aa3df4dff7 --- /dev/null +++ b/package/nginx-naxsi/0002-PCRE2-compatibility.patch @@ -0,0 +1,221 @@ +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; From 54237eec447abd4bd788b0a8ac5d48293c2c4eb5 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 20 Feb 2023 00:23:01 +0100 Subject: [PATCH 0997/5754] package/tmux: fix BR2_SHARED_STATIC_LIBS tmux uses custom --enable-static option to drive whether a static link should be attempted, which is not what the standard libtool directive is about and that we pass in our autotools-package infra. This results in the following build failure with systemd or utf8proc raised since commits 1f618aa388535181c281c85e2b5264532de4ef0f and e279599d255a79c08ef20b97b96eb248689d52a9: checking for utf8proc.h... yes checking for library containing utf8proc_charwidth... no configure: error: "utf8proc not found" In file included from tmux.h:34, from alerts.c:23: compat.h:379:18: error: conflicting types for 'forkpty'; have 'pid_t(int *, char *, struct termios *, struct winsize *)' {aka 'int(int *, char *, struct termios *, struct winsize *)'} 379 | pid_t forkpty(int *, char *, struct termios *, struct winsize *); | ^~~~~~~ Link to (closed) upstream issue: https://github.com/tmux/tmux/issues/3290 Fixes: - http://autobuild.buildroot.org/results/6e8523d8d514bf6d8fc3377d05e5edbe7fc2d5bb - http://autobuild.buildroot.org/results/cba06f3bb6d9be25e91f56c390a70ddf9904832e Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/tmux/tmux.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/tmux/tmux.mk b/package/tmux/tmux.mk index 47ee9b16ca..af06c8570b 100644 --- a/package/tmux/tmux.mk +++ b/package/tmux/tmux.mk @@ -25,6 +25,12 @@ else TMUX_CONF_OPTS += --disable-utf8proc endif +# tmux uses custom --enable-static option, instead of standard libtool +# directive resulting in a build failure with systemd or utf8proc +ifeq ($(BR2_SHARED_STATIC_LIBS),y) +TMUX_CONF_OPTS += --disable-static +endif + # Add /usr/bin/tmux to /etc/shells otherwise some login tools like dropbear # can reject the user connection. See man shells. define TMUX_ADD_TMUX_TO_SHELLS From 555f128feb3bc1e3f8f3bd52315abff5cc308aaa Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 15 Feb 2023 23:59:47 +0100 Subject: [PATCH 0998/5754] package/python-marshmallow: add CPE variables cpe:2.3:a:marshmallow_project:marshmallow is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Amarshmallow_project%3Amarshmallow Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/python-marshmallow/python-marshmallow.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-marshmallow/python-marshmallow.mk b/package/python-marshmallow/python-marshmallow.mk index 6427296508..ba6da6b29c 100644 --- a/package/python-marshmallow/python-marshmallow.mk +++ b/package/python-marshmallow/python-marshmallow.mk @@ -10,5 +10,7 @@ PYTHON_MARSHMALLOW_SITE = https://files.pythonhosted.org/packages/5e/59/dd465e5a PYTHON_MARSHMALLOW_SETUP_TYPE = setuptools PYTHON_MARSHMALLOW_LICENSE = MIT PYTHON_MARSHMALLOW_LICENSE_FILES = LICENSE +PYTHON_MARSHMALLOW_CPE_ID_VENDOR = marshmallow_project +PYTHON_MARSHMALLOW_CPE_ID_PRODUCT = marshmallow $(eval $(python-package)) From 81de6207f1237f17ec3e17e3afaae25474c7aca5 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 16 Feb 2023 00:04:13 +0100 Subject: [PATCH 0999/5754] package/python-webargs: add CPE variables cpe:2.3:a:webargs_project:webargs is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Awebargs_project%3Awebargs Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/python-webargs/python-webargs.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-webargs/python-webargs.mk b/package/python-webargs/python-webargs.mk index e048d8a4ac..ce270842c1 100644 --- a/package/python-webargs/python-webargs.mk +++ b/package/python-webargs/python-webargs.mk @@ -10,5 +10,7 @@ PYTHON_WEBARGS_SITE = https://files.pythonhosted.org/packages/4b/7d/fece8e6547b3 PYTHON_WEBARGS_SETUP_TYPE = setuptools PYTHON_WEBARGS_LICENSE = MIT PYTHON_WEBARGS_LICENSE_FILES = LICENSE +PYTHON_WEBARGS_CPE_ID_VENDOR = webargs_project +PYTHON_WEBARGS_CPE_ID_PRODUCT = webargs $(eval $(python-package)) From c36f6938858d3246ca493dacc925717586e2ea0f Mon Sep 17 00:00:00 2001 From: Heiko Thiery Date: Mon, 13 Feb 2023 13:40:21 +0100 Subject: [PATCH 1000/5754] package/network-manager: add patch to set mobile-broadband-provider-info-database location When building network-manager in cross-compile environment pkg-config returns the wrong path to the mobile-broadband-provider-info database. By adding the option 'mobile_broadband_provider_info_database' to set the correct path to the datafile this can be solved. Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- ...option-to-set-the-mobile-broadband-p.patch | 60 +++++++++++++++++++ package/network-manager/network-manager.mk | 1 + 2 files changed, 61 insertions(+) create mode 100644 package/network-manager/0001-build-meson-add-option-to-set-the-mobile-broadband-p.patch diff --git a/package/network-manager/0001-build-meson-add-option-to-set-the-mobile-broadband-p.patch b/package/network-manager/0001-build-meson-add-option-to-set-the-mobile-broadband-p.patch new file mode 100644 index 0000000000..4336472e45 --- /dev/null +++ b/package/network-manager/0001-build-meson-add-option-to-set-the-mobile-broadband-p.patch @@ -0,0 +1,60 @@ +From 03ba04d4784fa4fc7ec31455070fb5ecf25ade23 Mon Sep 17 00:00:00 2001 +From: Heiko Thiery +Date: Fri, 27 Jan 2023 22:38:42 +0100 +Subject: [PATCH] build: meson: add option to set the + mobile-broadband-provider-info database + +When building network-manager in cross-compile environment meson is not able +to detect the right location of the mobile-broadband-provider-info +database by using the pkg-config module. + +By adding the option 'mobile_broadband_provider_info_database' to set the +correct path to the datafile this can be solved. + +Signed-off-by: Heiko Thiery + +https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1519 +--- + meson.build | 6 +++++- + meson_options.txt | 1 + + 2 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 0adc42f738..84ce52c736 100644 +--- a/meson.build ++++ b/meson.build +@@ -584,7 +584,10 @@ enable_modem_manager = get_option('modem_manager') + if enable_modem_manager + mm_glib_dep = dependency('mm-glib', version: '>= 0.7.991') + +- mobile_broadband_provider_info_database = dependency('mobile-broadband-provider-info').get_pkgconfig_variable('database') ++ mobile_broadband_provider_info_database = get_option('mobile_broadband_provider_info_database') ++ if mobile_broadband_provider_info_database == '' ++ mobile_broadband_provider_info_database = dependency('mobile-broadband-provider-info').get_pkgconfig_variable('database') ++ endif + config_h.set_quoted('MOBILE_BROADBAND_PROVIDER_INFO_DATABASE', mobile_broadband_provider_info_database) + endif + +@@ -1054,6 +1057,7 @@ output += ' jansson: ' + jansson_msg + '\n' + output += ' iptables: ' + config_h.get('IPTABLES_PATH') + '\n' + output += ' nft: ' + config_h.get('NFT_PATH') + '\n' + output += ' modemmanager-1: ' + enable_modem_manager.to_string() + '\n' ++output += ' mobile-broadband-provider-info-database: ' + mobile_broadband_provider_info_database + '\n' + output += ' ofono: ' + enable_ofono.to_string() + '\n' + output += ' concheck: ' + enable_concheck.to_string() + '\n' + output += ' libteamdctl: ' + enable_teamdctl.to_string() + '\n' +diff --git a/meson_options.txt b/meson_options.txt +index 8b1d32e645..4e359f9e92 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -32,6 +32,7 @@ option('ppp', type: 'boolean', value: true, description: 'enable PPP/PPPoE suppo + option('pppd', type: 'string', value: '', description: 'path to pppd binary') + option('pppd_plugin_dir', type: 'string', value: '', description: 'path to the pppd plugins directory') + option('modem_manager', type: 'boolean', value: true, description: 'Enable new ModemManager1 interface support') ++option('mobile_broadband_provider_info_database', type: 'string', value: '', description: 'path to the mobile-broadband-provider-info database') + option('ofono', type: 'boolean', value: false, description: 'Enable oFono support (experimental)') + option('concheck', type: 'boolean', value: true, description: 'enable connectivity checking support') + option('teamdctl', type: 'boolean', value: false, description: 'enable Teamd control support') +-- +2.20.1 + diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index 138ff46e4a..87932c75e4 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -96,6 +96,7 @@ endif ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER),y) NETWORK_MANAGER_DEPENDENCIES += modem-manager mobile-broadband-provider-info NETWORK_MANAGER_CONF_OPTS += -Dmodem_manager=true +NETWORK_MANAGER_CONF_OPTS += -Dmobile_broadband_provider_info_database=/usr/share/mobile-broadband-provider-info/serviceproviders.xml else NETWORK_MANAGER_CONF_OPTS += -Dmodem_manager=false endif From 9cd2e6e090449f9d2f371d24152580c038892f3d Mon Sep 17 00:00:00 2001 From: Maxim Kochetkov Date: Wed, 8 Feb 2023 10:12:26 +0300 Subject: [PATCH 1001/5754] package/postgresql: add lz4 and zstd support PostgreSQL has optional compression support (LZ4 and Zstandard). So enable it if libraries are available. Signed-off-by: Maxim Kochetkov Signed-off-by: Thomas Petazzoni --- package/postgresql/postgresql.mk | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index e90aa794b0..5e3601cb46 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -91,6 +91,20 @@ else POSTGRESQL_CONF_OPTS += --without-libxml endif +ifeq ($(BR2_PACKAGE_ZSTD),y) +POSTGRESQL_DEPENDENCIES += zstd +POSTGRESQL_CONF_OPTS += --with-zstd +else +POSTGRESQL_CONF_OPTS += --without-zstd +endif + +ifeq ($(BR2_PACKAGE_LZ4),y) +POSTGRESQL_DEPENDENCIES += lz4 +POSTGRESQL_CONF_OPTS += --with-lz4 +else +POSTGRESQL_CONF_OPTS += --without-lz4 +endif + # required for postgresql.service Type=notify ifeq ($(BR2_PACKAGE_SYSTEMD),y) POSTGRESQL_DEPENDENCIES += systemd From f2c1e10b8ac3531ab5a48e23c23b702cd24b3f73 Mon Sep 17 00:00:00 2001 From: Konstantin Menyaev Date: Wed, 1 Feb 2023 09:00:01 +0300 Subject: [PATCH 1002/5754] 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 d9ce22c8a7..b4d4aeb276 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 b5c39e35d6..fe6d373ec8 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 1003/5754] 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 4d3942125f..241ca34a04 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 608a0bc3ac..c3eb0b05e6 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 1ef523a419..dfd3b07bea 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 293787792d..0a67e7a3ec 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 42d52d57c4..0fe506bbfd 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 1004/5754] 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 2ec0e60e8d..0f267021f8 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 1005/5754] 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 2eff5b23ef..caa73698f9 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 1006/5754] 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 c6e2981697..b507d1c0d6 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 1007/5754] 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 7a8965be18..db4fa69f71 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 1008/5754] 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 caa73698f9..599cfe6886 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 1009/5754] 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 d00e6342e8..11cfae5e9b 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 d62ce39cfc..bb66de5ec5 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 3eae34642f..0000000000 --- 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 2a260ca64f..1b4b08cecc 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 d14ad3a3e7..814a3c1dd4 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 1010/5754] 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 df86798613..0000000000 --- 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 0000000000..0634460453 --- /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 0000000000..f29b385501 --- /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 3ff468443e..16a9282176 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 ed7f6ca871..56d63a83f9 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 1011/5754] 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 47dd202258..de71703c53 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 5b91c35c0c..e5976a7d3a 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 1012/5754] 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 9177adceda..ad1999a30d 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 e4de997f0e..50c5bcc7fc 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 cf2352a355..1e919d73f2 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 1013/5754] 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 425ad86e08..8b4f3e4e45 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 5193966908..20e7219386 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 97bdc0616c6027fe4b92bfa80dd9e7d43df20505 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 20 Feb 2023 23:31:51 +0100 Subject: [PATCH 1014/5754] package/libmodsecurity: needs dynamic library Commit 9fc652a373034118535397fdd4042ab9f8fd7adf was incomplete as mbedtls can be pulled in libcurl through libssh2 resulting in the following build failure: /home/autobuild/autobuild/instance-4/output-1/host/lib/gcc/powerpc64le-buildroot-linux-musl/11.3.0/../../../../powerpc64le-buildroot-linux-musl/bin/ld: /home/autobuild/autobuild/instance-4/output-1/host/powerpc64le-buildroot-linux-musl/sysroot/usr/lib//libmbedcrypto.a(md5.c.o): in function `mbedtls_md5_init': md5.c:(.text+0x0): multiple definition of `mbedtls_md5_init'; ../../src/.libs/libmodsecurity.a(libmbedtls_la-md5.o):md5.c:(.text+0x0): first defined here Fixes: - http://autobuild.buildroot.org/results/4c235e46188f23d1a48297f4e5942cec7b25959a Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libmodsecurity/Config.in | 14 +++++++------- package/nginx-modsecurity/Config.in | 11 ++++------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/package/libmodsecurity/Config.in b/package/libmodsecurity/Config.in index b15d808759..69bb0494cc 100644 --- a/package/libmodsecurity/Config.in +++ b/package/libmodsecurity/Config.in @@ -2,8 +2,10 @@ config BR2_PACKAGE_LIBMODSECURITY bool "libmodsecurity" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS - # libmodsecurity embeds several mbedtls source files - depends on !(BR2_STATIC_LIBS && BR2_PACKAGE_LIBCURL_MBEDTLS) + # libmodsecurity embeds several mbedtls source files, causing + # various issues when static linking and other dependencies of + # libmodsecurity in turn use mbedtls + depends on !BR2_STATIC_LIBS select BR2_PACKAGE_PCRE2 help Libmodsecurity is one component of the ModSecurity @@ -17,8 +19,6 @@ config BR2_PACKAGE_LIBMODSECURITY https://github.com/SpiderLabs/ModSecurity -comment "libmodsecurity needs a toolchain w/ C++, threads" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS - -comment "libmodsecurity needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS && BR2_PACKAGE_LIBCURL_MBEDTLS +comment "libmodsecurity needs a toolchain w/ C++, threads, dynamic library" + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/nginx-modsecurity/Config.in b/package/nginx-modsecurity/Config.in index 5cbe57a866..0bbf05fad9 100644 --- a/package/nginx-modsecurity/Config.in +++ b/package/nginx-modsecurity/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_NGINX_MODSECURITY depends on BR2_PACKAGE_NGINX_HTTP depends on BR2_INSTALL_LIBSTDCPP # libmodsecurity depends on BR2_TOOLCHAIN_HAS_THREADS # libmodsecurity - depends on !(BR2_STATIC_LIBS && BR2_PACKAGE_LIBCURL_MBEDTLS) # libmodsecurity + depends on !BR2_STATIC_LIBS # libmodsecurity select BR2_PACKAGE_LIBMODSECURITY help The ModSecurity-nginx connector is the connection @@ -12,10 +12,7 @@ config BR2_PACKAGE_NGINX_MODSECURITY https://github.com/SpiderLabs/ModSecurity-nginx -comment "nginx-modsecurity needs a toolchain w/ C++, threads" +comment "nginx-modsecurity needs a toolchain w/ C++, threads, dynamic library" depends on BR2_PACKAGE_NGINX_HTTP - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS - -comment "nginx-modsecurity needs a toolchain w/ dynamic library" - depends on BR2_PACKAGE_NGINX_HTTP - depends on BR2_STATIC_LIBS && BR2_PACKAGE_LIBCURL_MBEDTLS + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS From ceb9c36b921f5237f823c34ab369ef521f3ba12b Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 21 Feb 2023 00:19:02 +0100 Subject: [PATCH 1015/5754] package/fluent-bit: fix build without C++ Commit dedbc69022ba0beaf259463ac8082c86776f7e88 was incomplete resuling in the following build failure since the addition of the package in commit 6a0f7c39bcb48fc13aa2ce3fc4996baf1be66483: -- Check for working CXX compiler: /usr/bin/c++ - broken CMake Error at /home/autobuild/autobuild/instance-15/output-1/per-package/fluent-bit/host/share/cmake-3.22/Modules/CMakeTestCXXCompiler.cmake:62 (message): The C++ compiler "/usr/bin/c++" is not able to compile a simple test program. It fails with the following output: Change Dir: /home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp Run Build Command(s):/home/autobuild/make/make -f Makefile cmTC_bfb29/fast && make[1]: Entering directory '/home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp' /home/autobuild/make/make -f CMakeFiles/cmTC_bfb29.dir/build.make CMakeFiles/cmTC_bfb29.dir/build make[2]: Entering directory '/home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp' Building CXX object CMakeFiles/cmTC_bfb29.dir/testCXXCompiler.cxx.o /usr/bin/c++ --sysroot=/home/autobuild/autobuild/instance-15/output-1/per-package/fluent-bit/host/xtensa-buildroot-linux-uclibc/sysroot -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -mlongcalls -mauto-litpools -O2 -g0 -fcommon -U_FILE_OFFSET_BITS -g -fPIE -o CMakeFiles/cmTC_bfb29.dir/testCXXCompiler.cxx.o -c /home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp/testCXXCompiler.cxx c++: error: unrecognized command-line option '-mlongcalls' c++: error: unrecognized command-line option '-mauto-litpools' make[2]: *** [CMakeFiles/cmTC_bfb29.dir/build.make:78: CMakeFiles/cmTC_bfb29.dir/testCXXCompiler.cxx.o] Error 1 make[2]: Leaving directory '/home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp' make[1]: *** [Makefile:127: cmTC_bfb29/fast] Error 2 make[1]: Leaving directory '/home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp' CMake will not be able to correctly generate this project. Call Stack (most recent call first): lib/msgpack-c/CMakeLists.txt:2 (project) While at it, add missing comment about C++ dependency for wasm Fixes: - http://autobuild.buildroot.org/results/4b0f90d79d6dbbf976acf1da839260b0ee94ddda Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../fluent-bit/0003-fix-build-without-C.patch | 131 ++++++++++++++++++ package/fluent-bit/Config.in | 4 + 2 files changed, 135 insertions(+) create mode 100644 package/fluent-bit/0003-fix-build-without-C.patch diff --git a/package/fluent-bit/0003-fix-build-without-C.patch b/package/fluent-bit/0003-fix-build-without-C.patch new file mode 100644 index 0000000000..3bc5f46de9 --- /dev/null +++ b/package/fluent-bit/0003-fix-build-without-C.patch @@ -0,0 +1,131 @@ +From 014e44808ebaf29b0c25b5a3fa2e35a99a30f628 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 21 Feb 2023 00:09:57 +0100 +Subject: [PATCH] fix build without C++ + +Fix the following build failure without C++: + +-- Check for working CXX compiler: /usr/bin/c++ - broken +CMake Error at /home/autobuild/autobuild/instance-15/output-1/per-package/fluent-bit/host/share/cmake-3.22/Modules/CMakeTestCXXCompiler.cmake:62 (message): + The C++ compiler + + "/usr/bin/c++" + + is not able to compile a simple test program. + + It fails with the following output: + + Change Dir: /home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp + + Run Build Command(s):/home/autobuild/make/make -f Makefile cmTC_bfb29/fast && make[1]: Entering directory '/home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp' + /home/autobuild/make/make -f CMakeFiles/cmTC_bfb29.dir/build.make CMakeFiles/cmTC_bfb29.dir/build + make[2]: Entering directory '/home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp' + Building CXX object CMakeFiles/cmTC_bfb29.dir/testCXXCompiler.cxx.o + /usr/bin/c++ --sysroot=/home/autobuild/autobuild/instance-15/output-1/per-package/fluent-bit/host/xtensa-buildroot-linux-uclibc/sysroot -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -mlongcalls -mauto-litpools -O2 -g0 -fcommon -U_FILE_OFFSET_BITS -g -fPIE -o CMakeFiles/cmTC_bfb29.dir/testCXXCompiler.cxx.o -c /home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp/testCXXCompiler.cxx + c++: error: unrecognized command-line option '-mlongcalls' + c++: error: unrecognized command-line option '-mauto-litpools' + make[2]: *** [CMakeFiles/cmTC_bfb29.dir/build.make:78: CMakeFiles/cmTC_bfb29.dir/testCXXCompiler.cxx.o] Error 1 + make[2]: Leaving directory '/home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp' + make[1]: *** [Makefile:127: cmTC_bfb29/fast] Error 2 + make[1]: Leaving directory '/home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp' + + CMake will not be able to correctly generate this project. +Call Stack (most recent call first): + lib/msgpack-c/CMakeLists.txt:2 (project) + +Fixes: + - http://autobuild.buildroot.org/results/4b0f90d79d6dbbf976acf1da839260b0ee94ddda + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/fluent/fluent-bit/pull/6893] +--- + lib/chunkio/CMakeLists.txt | 2 +- + lib/lwrb/CMakeLists.txt | 2 +- + lib/msgpack-c/CMakeLists.txt | 2 +- + lib/onigmo/CMakeLists.txt | 2 +- + lib/snappy-fef67ac/CMakeLists.txt | 2 +- + lib/tutf8e/CMakeLists.txt | 2 +- + src/stream_processor/CMakeLists.txt | 2 +- + 7 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/lib/chunkio/CMakeLists.txt b/lib/chunkio/CMakeLists.txt +index 233bce35c..8bfe5199d 100644 +--- a/lib/chunkio/CMakeLists.txt ++++ b/lib/chunkio/CMakeLists.txt +@@ -1,5 +1,5 @@ + cmake_minimum_required(VERSION 3.0) +-project(chunk-io) ++project(chunk-io C) + + set(CIO_VERSION_MAJOR 1) + set(CIO_VERSION_MINOR 4) +diff --git a/lib/lwrb/CMakeLists.txt b/lib/lwrb/CMakeLists.txt +index 2fabd6319..031cbc1dd 100644 +--- a/lib/lwrb/CMakeLists.txt ++++ b/lib/lwrb/CMakeLists.txt +@@ -1,7 +1,7 @@ + cmake_minimum_required(VERSION 3.0) + + # Setup project +-project(LwLibPROJECT) ++project(LwLibPROJECT C) + + # ------------------------------------------------- + # This CMakeLists.txt is used only if it is a top-level file. +diff --git a/lib/msgpack-c/CMakeLists.txt b/lib/msgpack-c/CMakeLists.txt +index 810ad609a..ffbbc5ddb 100644 +--- a/lib/msgpack-c/CMakeLists.txt ++++ b/lib/msgpack-c/CMakeLists.txt +@@ -1,5 +1,5 @@ + cmake_minimum_required(VERSION 2.8) +-project(msgpack-c) ++project(msgpack-c C) + + set(src + src/objectc.c +diff --git a/lib/onigmo/CMakeLists.txt b/lib/onigmo/CMakeLists.txt +index 4a3b30d7d..66865130a 100644 +--- a/lib/onigmo/CMakeLists.txt ++++ b/lib/onigmo/CMakeLists.txt +@@ -1,5 +1,5 @@ + cmake_minimum_required(VERSION 3.4) +-project(onigmo) ++project(onigmo C) + + # Onigmo Version + set(ONIGMO_VERSION_MAJOR 6) +diff --git a/lib/snappy-fef67ac/CMakeLists.txt b/lib/snappy-fef67ac/CMakeLists.txt +index 8bb1e9598..ae9225c49 100644 +--- a/lib/snappy-fef67ac/CMakeLists.txt ++++ b/lib/snappy-fef67ac/CMakeLists.txt +@@ -1,5 +1,5 @@ + cmake_minimum_required(VERSION 2.8) +-project(snappy-c) ++project(snappy-c C) + + set(CMAKE_POSITION_INDEPENDENT_CODE ON) + +diff --git a/lib/tutf8e/CMakeLists.txt b/lib/tutf8e/CMakeLists.txt +index 35cbe01ad..a056ef83c 100644 +--- a/lib/tutf8e/CMakeLists.txt ++++ b/lib/tutf8e/CMakeLists.txt +@@ -1,5 +1,5 @@ + cmake_minimum_required(VERSION 2.8) +-project(tutf8e) ++project(tutf8e C) + + # Not supported: -std=c90 (lacks support for inline) + # Supported: -std=gnu90, -std=c99 or -std=gnu99 +diff --git a/src/stream_processor/CMakeLists.txt b/src/stream_processor/CMakeLists.txt +index 8c5d70d13..de2c2fe38 100644 +--- a/src/stream_processor/CMakeLists.txt ++++ b/src/stream_processor/CMakeLists.txt +@@ -1,4 +1,4 @@ +-project(stream-processor) ++project(stream-processor C) + + include_directories(${CMAKE_CURRENT_SOURCE_DIR}) + +-- +2.39.0 + diff --git a/package/fluent-bit/Config.in b/package/fluent-bit/Config.in index f53eacb447..bfdea895b0 100644 --- a/package/fluent-bit/Config.in +++ b/package/fluent-bit/Config.in @@ -30,6 +30,10 @@ config BR2_PACKAGE_FLUENT_BIT_WASM help Support for WASM-based plugins. +comment "wasm runtime support needs a toolchain w/ C++" + depends on BR2_PACKAGE_FLUENT_BIT_WASM_ARCH_SUPPORTS + depends on !BR2_INSTALL_LIBSTDCPP + endif comment "fluent-bit needs a toolchain w/ threads, dynamic library" From 762b3f743dd0687841a2edb64c4b56a522058d5e Mon Sep 17 00:00:00 2001 From: Alexander Egorenkov Date: Sat, 18 Feb 2023 09:29:43 +0000 Subject: [PATCH 1016/5754] package/multipath-tools: fix path to kernel headers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit With change 6b7d47be3b23 ("multipath-tools: Makefiles: simplify code for include dirs") the Makefile variable 'LINUX_HEADERS_INCDIR' has been replaced with 'kernel_incdir'. fpin_handlers.c:355:32: note: each undeclared identifier is reported only once for each function it appears in fpin_handlers.c:360:37: error: ‘ELS_DTAG_LNK_INTEGRITY’ undeclared (first use in this function) 360 | if (dtag == ELS_DTAG_LNK_INTEGRITY) { | ^~~~~~~~~~~~~~~~~~~~~~ make[2]: *** [../Makefile.inc:116: fpin_handlers.o] Error 1 Fixes: http://autobuild.buildroot.net/results/e0f56ef924c13d6b1535fdc350ad8ecc06ea0a58 Signed-off-by: Alexander Egorenkov Signed-off-by: Thomas Petazzoni --- package/multipath-tools/multipath-tools.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/multipath-tools/multipath-tools.mk b/package/multipath-tools/multipath-tools.mk index 90394fae9f..23b3cc9442 100644 --- a/package/multipath-tools/multipath-tools.mk +++ b/package/multipath-tools/multipath-tools.mk @@ -22,7 +22,7 @@ MULTIPATH_TOOLS_CPE_ID_VENDOR = opensvc MULTIPATH_TOOLS_DEPENDENCIES = lvm2 json-c readline udev liburcu libaio host-pkgconf MULTIPATH_TOOLS_MAKE_OPTS = \ - LINUX_HEADERS_INCDIR=$(STAGING_DIR)/usr/include \ + kernel_incdir=$(STAGING_DIR)/usr/include \ LIB="lib" \ RUN="run" \ OPTFLAGS="" \ 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 1017/5754] 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 bfc382cde9..66fe910f16 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 f3e2d42a54..8fbb3069bc 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 1018/5754] 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 d293ad0e60..e3157089a9 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 1019/5754] 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 0000000000..60737159c6 --- /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 eca44b89f0..ca4e2fa0b9 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 73bb97a793..45e8bf1bc2 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 1020/5754] 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 3895c1ffc3..270699d63a 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 138ff46e4a..3001530930 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 1021/5754] 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 ffb4fa846a..f50dd75163 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 2b1aa257ce..a3e0319c10 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 1022/5754] 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 b104b1fbbe..d1344f2744 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 3484e09d22..7781a1070b 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 9d02eab8bcf57495c8c7675021c69fc2e3edd508 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Tue, 7 Feb 2023 23:09:37 +0100 Subject: [PATCH 1023/5754] DEVELOPERS: add Julien Olivain for package/openmpi The package has been orphan since commit ee58353 (2018-12-22). Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 2eff5b23ef..6256576e02 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1691,6 +1691,7 @@ F: package/highway/ F: package/libjxl/ F: package/octave/ F: package/ola/ +F: package/openmpi/ F: package/perftest/ F: package/ptm2human/ F: package/python-distro/ From 5c6e45f7eb4981810883961dd3af37ec0dc9d229 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 21 Feb 2023 14:47:18 +0100 Subject: [PATCH 1024/5754] package/fluent-bit: fix line endings in part of 0003-fix-build-without-C.patch Fixes: http://autobuild.buildroot.net/results/894/894cd923baa25643d9aea21678c4bca105e86b45/ Reported-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../fluent-bit/0003-fix-build-without-C.patch | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/package/fluent-bit/0003-fix-build-without-C.patch b/package/fluent-bit/0003-fix-build-without-C.patch index 3bc5f46de9..0f0b239216 100644 --- a/package/fluent-bit/0003-fix-build-without-C.patch +++ b/package/fluent-bit/0003-fix-build-without-C.patch @@ -1,4 +1,4 @@ -From 014e44808ebaf29b0c25b5a3fa2e35a99a30f628 Mon Sep 17 00:00:00 2001 +From f2aeca6fcc37bf22dd7307cab8fc9db6b53dd652 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 21 Feb 2023 00:09:57 +0100 Subject: [PATCH] fix build without C++ @@ -99,12 +99,12 @@ index 8bb1e9598..ae9225c49 100644 --- a/lib/snappy-fef67ac/CMakeLists.txt +++ b/lib/snappy-fef67ac/CMakeLists.txt @@ -1,5 +1,5 @@ - cmake_minimum_required(VERSION 2.8) --project(snappy-c) -+project(snappy-c C) - - set(CMAKE_POSITION_INDEPENDENT_CODE ON) - + cmake_minimum_required(VERSION 2.8) +-project(snappy-c) ++project(snappy-c C) + + set(CMAKE_POSITION_INDEPENDENT_CODE ON) + diff --git a/lib/tutf8e/CMakeLists.txt b/lib/tutf8e/CMakeLists.txt index 35cbe01ad..a056ef83c 100644 --- a/lib/tutf8e/CMakeLists.txt @@ -127,5 +127,5 @@ index 8c5d70d13..de2c2fe38 100644 include_directories(${CMAKE_CURRENT_SOURCE_DIR}) -- -2.39.0 +2.39.1 From ec7258f3f4ea4442cd1f8c78a066a062a4d0cbd0 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Tue, 7 Feb 2023 23:09:38 +0100 Subject: [PATCH 1025/5754] 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 4413c55f9c..e64eb81c3e 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 a399adc758..745ed7c580 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 8bdc3fa188..f14b55ced5 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 1026/5754] 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 053658fad6..dc92c8bb4e 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 1027/5754] 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 16cfad602c..9b11f026ec 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 97aa8b1c75..6b7d57b40c 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 82187d7db9..d460251f48 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 1028/5754] 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 054278c256..4ba01d12d3 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 6c9d8a2b91..a8b537782c 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 0c39aad687..042b16612e 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 a39e328bb2835cd157ee1622d5117ba252d44733 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 21 Feb 2023 18:28:29 +0100 Subject: [PATCH 1029/5754] package/mutt: fix build failure when host provides an old gpgrt-config As already done for gnupg2 in commit d7f2d8403ec82f3b1772ec17bf1df8c42987a1f8, apply the same fix to mutt to avoid the following build failure: /home/thomas/autobuild/instance-2/output-1/host/bin/i686-buildroot-linux-uclibc-gcc -DPKGDATADIR=\"/usr/share/mutt\" -DSYSCONFDIR=\"/etc\" -DBINDIR=\"/usr/bin\" -DMUTTLOCALEDIR=\"/usr/share/locale\" -DHAVE_CONFIG_H=1 -I. -I. -I. -I/usr/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wall -pedantic -Wno-long-long -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O3 -g0 -c -o txt2c.o txt2c.c i686-buildroot-linux-uclibc-gcc: ERROR: unsafe header/library path used in cross-compilation: '-I/usr/include' Fixes: - http://autobuild.buildroot.org/results/98010be4ef70e58819ea2d17315bdac66a619b23 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/mutt/mutt.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/mutt/mutt.mk b/package/mutt/mutt.mk index 0a98396d88..5cf1b6bad2 100644 --- a/package/mutt/mutt.mk +++ b/package/mutt/mutt.mk @@ -37,6 +37,10 @@ MUTT_DEPENDENCIES += libgpgme MUTT_CONF_OPTS += \ --enable-gpgme \ --with-gpgme-prefix=$(STAGING_DIR)/usr + +# Force the path to "gpgrt-config" (from the libgpg-error package) to +# avoid using the one on host, if present. +MUTT_CONF_ENV += GPGRT_CONFIG=$(STAGING_DIR)/usr/bin/gpgrt-config else MUTT_CONF_OPTS += --disable-gpgme endif From 48d9042e5d2e0bc8bd0efc3a2516b156c4b89190 Mon Sep 17 00:00:00 2001 From: Casey Reeves Date: Thu, 19 Jan 2023 19:50:40 +0100 Subject: [PATCH 1030/5754] 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 a9b9bbcc5a..cb54c6c9d8 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 1164c81410..648f62ed85 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 1031/5754] 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 92b5dd501b..f05f33ccc7 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 d0af2840b1b16dd95b9a468e46b6e275186e5447 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 22 Feb 2023 12:10:59 +0100 Subject: [PATCH 1032/5754] package/freerdp: fix libressl build Fix the following build failure with libressl raised since bump to version 2.10.0 in commit 03bab7117d232c9dcd784a74eefc0e48ea51ee53: /home/thomas/autobuild/instance-3/output-1/build/freerdp-2.10.0/libfreerdp/crypto/crypto.c: In function 'crypto_cert_get_signature_alg': /home/thomas/autobuild/instance-3/output-1/build/freerdp-2.10.0/libfreerdp/crypto/crypto.c:980:8: error: 'NID_sha3_224' undeclared (first use in this function) case NID_sha3_224: ^~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/e96848576ac292799636abe7485c37aa54196a2c Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...e-sha3-and-shake-hashes-for-libressl.patch | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 package/freerdp/0004-Fix-8702-Disable-sha3-and-shake-hashes-for-libressl.patch 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 new file mode 100644 index 0000000000..14f615e2e7 --- /dev/null +++ b/package/freerdp/0004-Fix-8702-Disable-sha3-and-shake-hashes-for-libressl.patch @@ -0,0 +1,38 @@ +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; From cf4c94de51eb5c303a3e9ee62e97baa8b37d7461 Mon Sep 17 00:00:00 2001 From: Marcus Folkesson Date: Wed, 22 Feb 2023 11:39:17 +0100 Subject: [PATCH 1033/5754] package/libcamera-apps: enable LIBAV only if libdrm and ffmpeg is present Since commit 35266e84043f880d7591e52b71a8c5b8d0e4717d, libcamera-apps does enable LIBAV by default which depends on libdrm and ffpmeg. Fixes: - http://autobuild.buildroot.net/results/548f2a3b353ce4693fb60d7fb1e06e02af22991c/ /home/buildroot/autobuild/run/instance-1/output-1/build/libcamera-apps-1.1.1/encoder/libav_encoder.cpp:13:10: fatal error: libdrm/drm_fourcc.h: No such file or directory 13 | #include | ^~~~~~~~~~~~~~~~~~~~~ Signed-off-by: Marcus Folkesson Signed-off-by: Thomas Petazzoni --- package/libcamera-apps/libcamera-apps.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/libcamera-apps/libcamera-apps.mk b/package/libcamera-apps/libcamera-apps.mk index 290ee9a026..fe402ec3f4 100644 --- a/package/libcamera-apps/libcamera-apps.mk +++ b/package/libcamera-apps/libcamera-apps.mk @@ -29,6 +29,13 @@ else LIBCAMERA_APPS_CONF_OPTS += -DENABLE_DRM=0 endif +ifeq ($(BR2_PACKAGE_FFMPEG)$(BR2_PACKAGE_LIBDRM),yy) +LIBCAMERA_APPS_DEPENDENCIES += ffmpeg libdrm +LIBCAMERA_APPS_CONF_OPTS += -DENABLE_LIBAV=1 +else +LIBCAMERA_APPS_CONF_OPTS += -DENABLE_LIBAV=0 +endif + ifeq ($(BR2_PACKAGE_XORG7),y) LIBCAMERA_APPS_DEPENDENCIES += \ $(if $(BR2_PACKAGE_LIBEPOXY),libepoxy) \ From d868d09d3a0c0db2c5112964139e5ecae8b1da51 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 22 Feb 2023 11:32:42 +0100 Subject: [PATCH 1034/5754] boot/at91dataflashboot: disable stack-protector Disable stack-protector to avoid the following build failure: /home/buildroot/autobuild/instance-1/output-1/host/bin/arm-buildroot-linux-gnueabi-ld -T elf32-littlearm.lds -Ttext 0 -n -o DataflashBoot-1.05.out objs/cstartup_ram.o objs/at45.o objs/com.o objs/dataflash.o objs/div0.o objs/init.o objs/main.o objs/stdio.o objs/asm_isr.o objs/jump.o objs/_udivsi3.o objs/_umodsi3.o objs/led.o /home/buildroot/autobuild/instance-1/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: objs/main.o: in function `main': main.c:(.text.startup+0x834): undefined reference to `__stack_chk_guard' Fixes: - http://autobuild.buildroot.org/results/502c54be4978e628724d72ee2a75d4c5e0a6ace8 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- boot/at91dataflashboot/at91dataflashboot.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/boot/at91dataflashboot/at91dataflashboot.mk b/boot/at91dataflashboot/at91dataflashboot.mk index 0ad8b6fc44..c66f27e343 100644 --- a/boot/at91dataflashboot/at91dataflashboot.mk +++ b/boot/at91dataflashboot/at91dataflashboot.mk @@ -12,7 +12,8 @@ AT91DATAFLASHBOOT_INSTALL_TARGET = NO AT91DATAFLASHBOOT_INSTALL_IMAGES = YES define AT91DATAFLASHBOOT_BUILD_CMDS - make -C $(@D) CROSS_COMPILE=$(TARGET_CROSS) + make -C $(@D) CROSS_COMPILE=$(TARGET_CROSS) \ + CFLAGS="$(TARGET_CFLAGS) -fno-stack-protector" endef define AT91DATAFLASHBOOT_INSTALL_IMAGES_CMDS From bd061466f90e3f17d47d4e1641590d60c07a6cac Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 22 Feb 2023 10:54:34 +0100 Subject: [PATCH 1035/5754] boot/opensbi: fix build with empty OPENSBI_PLAT Fix the following build failure when OPENSBI_PLAT is empty raised since commit 9b5b7165deb91bad3cdb1ea0dd8f940eff75f3a9: /usr/bin/install -m 0644 -D /nvmedata/autobuild/instance-4/output-1/build/opensbi-0.9/build/platform//firmware/fw_jump.bin /nvmedata/autobuild/instance-4/output-1/images/fw_jump.bin /usr/bin/install: cannot stat '/nvmedata/autobuild/instance-4/output-1/build/opensbi-0.9/build/platform//firmware/fw_jump.bin': No such file or directory Fixes: - http://autobuild.buildroot.org/results/8033327f090e4a3d84a7fce1f62b14fdf89dbd89 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- boot/opensbi/opensbi.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/boot/opensbi/opensbi.mk b/boot/opensbi/opensbi.mk index 06ec87b2c3..dd113a0bf8 100644 --- a/boot/opensbi/opensbi.mk +++ b/boot/opensbi/opensbi.mk @@ -71,6 +71,7 @@ OPENSBI_INSTALL_IMAGES = YES OPENSBI_FW_IMAGES += payload endif +ifneq ($(OPENSBI_PLAT),) define OPENSBI_INSTALL_IMAGES_CMDS $(foreach f,$(OPENSBI_FW_IMAGES),\ $(INSTALL) -m 0644 -D $(@D)/build/platform/$(OPENSBI_PLAT)/firmware/fw_$(f).bin \ @@ -79,6 +80,7 @@ define OPENSBI_INSTALL_IMAGES_CMDS $(BINARIES_DIR)/fw_$(f).elf ) endef +endif # libsbi.a is not a library meant to be linked in user-space code, but # with bare metal code, which is why we don't install it in From 4655d84ff567e8ecc2665ac0760ef01023aae91d Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 22 Feb 2023 10:44:41 +0100 Subject: [PATCH 1036/5754] package/sudo: fix openssl static build Fix the following build failure with sparc raised since bump to version 1.9.11p2 in commit 9b7f8da96be549a52630cd87b30851d600f163a4 and https://github.com/sudo-project/sudo/commit/9fbbca7b7a4cc60a8aa27d73de54278004a704c0: hecking for X509_STORE_CTX_get0_cert configure:21215: /home/thomas/autobuild/instance-3/output-1/host/bin/sparc-buildroot-linux-uclibc-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -static -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DZLIB_CONST -static conftest.c -L/home/thomas/autobuild/instance-3/output-1/host/bin/../sparc-buildroot-linux-uclibc/sysroot/usr/lib -lssl -lz -pthread -latomic -lcrypto >&5 /home/thomas/autobuild/instance-3/output-1/host/lib/gcc/sparc-buildroot-linux-uclibc/10.4.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: /home/thomas/autobuild/instance-3/output-1/host/bin/../sparc-buildroot-linux-uclibc/sysroot/usr/lib/libcrypto.a(x509cset.o): in function `X509_CRL_up_ref': x509cset.c:(.text+0x108): undefined reference to `__atomic_fetch_add_4' [...] In file included from ./hostcheck.c:38: ../../include/sudo_compat.h:342:41: error: conflicting types for 'ASN1_STRING_data' 342 | # define ASN1_STRING_get0_data(x) ASN1_STRING_data(x) | ^~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/8be59dd94e4916f9457cb435104e36e62a28373b Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...onfigure.ac-fix-openssl-static-build.patch | 49 +++++++++++++++++++ package/sudo/sudo.mk | 2 + 2 files changed, 51 insertions(+) create mode 100644 package/sudo/0001-configure.ac-fix-openssl-static-build.patch diff --git a/package/sudo/0001-configure.ac-fix-openssl-static-build.patch b/package/sudo/0001-configure.ac-fix-openssl-static-build.patch new file mode 100644 index 0000000000..32edd148a0 --- /dev/null +++ b/package/sudo/0001-configure.ac-fix-openssl-static-build.patch @@ -0,0 +1,49 @@ +From 5cfc7e277d0b262a1d12e867c47a36301fb7edb7 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 22 Feb 2023 10:01:25 +0100 +Subject: [PATCH] configure.ac: fix openssl static build + +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. This will fix the following build failure with sparc which +needs -latomic: + +Checking for X509_STORE_CTX_get0_cert +configure:21215: /home/thomas/autobuild/instance-3/output-1/host/bin/sparc-buildroot-linux-uclibc-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -static -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DZLIB_CONST -static conftest.c -L/home/thomas/autobuild/instance-3/output-1/host/bin/../sparc-buildroot-linux-uclibc/sysroot/usr/lib -lssl -lz -pthread -latomic -lcrypto >&5 +/home/thomas/autobuild/instance-3/output-1/host/lib/gcc/sparc-buildroot-linux-uclibc/10.4.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: /home/thomas/autobuild/instance-3/output-1/host/bin/../sparc-buildroot-linux-uclibc/sysroot/usr/lib/libcrypto.a(x509cset.o): in function `X509_CRL_up_ref': +x509cset.c:(.text+0x108): undefined reference to `__atomic_fetch_add_4' + +[...] + +In file included from ./hostcheck.c:38: +../../include/sudo_compat.h:342:41: error: conflicting types for 'ASN1_STRING_data' + 342 | # define ASN1_STRING_get0_data(x) ASN1_STRING_data(x) + | ^~~~~~~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/8be59dd94e4916f9457cb435104e36e62a28373b + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/sudo-project/sudo/pull/244] +--- + configure.ac | 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/package/sudo/sudo.mk b/package/sudo/sudo.mk index c4eaafa6b1..3b5c898917 100644 --- a/package/sudo/sudo.mk +++ b/package/sudo/sudo.mk @@ -13,6 +13,8 @@ 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 +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 SUDO_CONF_OPTS = \ From 51793e0d56eef07d9f68c676f9c84be3f425082b Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 21 Feb 2023 23:47:47 +0100 Subject: [PATCH 1037/5754] package/gcc/gcc-initial: fix typo Fix typo: am internal step -> an internal step Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/gcc/gcc-initial/gcc-initial.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gcc/gcc-initial/gcc-initial.mk b/package/gcc/gcc-initial/gcc-initial.mk index ebd8e8f017..a8ac20c5d8 100644 --- a/package/gcc/gcc-initial/gcc-initial.mk +++ b/package/gcc/gcc-initial/gcc-initial.mk @@ -9,7 +9,7 @@ GCC_INITIAL_SITE = $(GCC_SITE) GCC_INITIAL_SOURCE = $(GCC_SOURCE) # We do not have a 'gcc' package per-se; we only have two incarnations, -# gcc-initial and gcc-final. gcc-initial is just am internal step that +# gcc-initial and gcc-final. gcc-initial is just an internal step that # users should not care about, while gcc-final is the one they shall see. HOST_GCC_INITIAL_DL_SUBDIR = gcc 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 1038/5754] 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 16ccb9dcfb..0426009dd3 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 4317da60bc..0d7533815d 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 293a878ae268cd0561fc3ab81c04b9a438acf921 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Sat, 31 Dec 2022 18:42:08 +0100 Subject: [PATCH 1039/5754] package/wilc-driver: fix build failure due to wrong pointer casts Add local patch pending upstream[0] to fix the bug. [0]: https://github.com/embeddedTS/wilc3000-external-module/pull/3 Fixes: http://autobuild.buildroot.net/results/0a0/0a022d5c053bf8f7a53349b8bae4b2168a9cd134/ Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- .../wilc-driver/0005-Fix-cast-warnings.patch | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 package/wilc-driver/0005-Fix-cast-warnings.patch diff --git a/package/wilc-driver/0005-Fix-cast-warnings.patch b/package/wilc-driver/0005-Fix-cast-warnings.patch new file mode 100644 index 0000000000..713a15e667 --- /dev/null +++ b/package/wilc-driver/0005-Fix-cast-warnings.patch @@ -0,0 +1,43 @@ +From ebd083223883d479b2dd6f8a0da272797f90d236 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Sat, 31 Dec 2022 18:38:33 +0100 +Subject: [PATCH] Fix cast warnings + +Signed-off-by: Giulio Benetti +--- + cfg80211.c | 2 +- + netdev.c | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/cfg80211.c b/cfg80211.c +index 016aa06..2f40c9d 100644 +--- a/cfg80211.c ++++ b/cfg80211.c +@@ -1794,7 +1794,7 @@ static int start_ap(struct wiphy *wiphy, struct net_device *dev, + if (ret != 0) + netdev_err(dev, "Error in setting channel\n"); + +- wilc_wlan_set_bssid(dev, dev->dev_addr, WILC_AP_MODE); ++ wilc_wlan_set_bssid(dev, (u8 *)dev->dev_addr, WILC_AP_MODE); + + return wilc_add_beacon(vif, settings->beacon_interval, + settings->dtim_period, &settings->beacon); +diff --git a/netdev.c b/netdev.c +index 824afea..5a1a51d 100644 +--- a/netdev.c ++++ b/netdev.c +@@ -899,9 +899,9 @@ static int wilc_mac_open(struct net_device *ndev) + vif->idx); + + if (is_valid_ether_addr(ndev->dev_addr)) +- wilc_set_mac_address(vif, ndev->dev_addr); ++ wilc_set_mac_address(vif, (u8 *)ndev->dev_addr); + else +- wilc_get_mac_address(vif, ndev->dev_addr); ++ wilc_get_mac_address(vif, (u8 *)ndev->dev_addr); + netdev_dbg(ndev, "Mac address: %pM\n", ndev->dev_addr); + + if (!is_valid_ether_addr(ndev->dev_addr)) { +-- +2.34.1 + From 8beed8ac56a51d4d6a9dd81b81b8025cb7f8d99b Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Thu, 29 Dec 2022 19:45:20 +0100 Subject: [PATCH 1040/5754] 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 52ef8c9005..0000000000 --- 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 0cb9961345..2d6498f19d 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 d967db90b8..da6fe42e99 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 802cfb90d68f866bc8f61d9c6c3a764abae2580f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 22 Feb 2023 17:05:10 +0100 Subject: [PATCH 1041/5754] package/gnuradio: drop unrecognized volk variables Volk submodule has been removed since version 3.9.0.0 and https://github.com/gnuradio/gnuradio/commit/80c04479da962d048d41165081b026aafdaa0316 orc dependency can also be dropped as it was only used by volk submodule Signed-off-by: Fabrice Fontaine Acked-by: Gwenhael Goavec-merou Signed-off-by: Thomas Petazzoni --- package/gnuradio/gnuradio.mk | 9 --------- 1 file changed, 9 deletions(-) diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk index cc41f1e12b..c2fcba9586 100644 --- a/package/gnuradio/gnuradio.mk +++ b/package/gnuradio/gnuradio.mk @@ -22,9 +22,7 @@ GNURADIO_DEPENDENCIES = \ GNURADIO_CONF_OPTS = \ -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 \ -DENABLE_DEFAULT=OFF \ - -DENABLE_VOLK=ON \ -DENABLE_GNURADIO_RUNTIME=ON \ - -DENABLE_INTERNAL_VOLK=OFF \ -DENABLE_TESTING=OFF \ -DXMLTO_EXECUTABLE=NOTFOUND @@ -36,13 +34,6 @@ ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) GNURADIO_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic endif -ifeq ($(BR2_PACKAGE_ORC),y) -GNURADIO_DEPENDENCIES += orc -GNURADIO_CONF_OPTS += -DENABLE_ORC=ON -else -GNURADIO_CONF_OPTS += -DENABLE_ORC=OFF -endif - ifeq ($(BR2_PACKAGE_GNURADIO_ANALOG),y) GNURADIO_CONF_OPTS += -DENABLE_GR_ANALOG=ON else From 8f4dec2107354ab7d6a3fa4fe6646a2c7c517418 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 22 Feb 2023 17:05:11 +0100 Subject: [PATCH 1042/5754] package/gnuradio: disable examples Examples can be disabled since version 3.9.0.0 and https://github.com/gnuradio/gnuradio/commit/530262c6df3fb9b87a80133dbde5650dbe948c4c Signed-off-by: Fabrice Fontaine Acked-by: Gwenhael Goavec-merou Signed-off-by: Thomas Petazzoni --- package/gnuradio/gnuradio.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk index c2fcba9586..c2e5ec5cad 100644 --- a/package/gnuradio/gnuradio.mk +++ b/package/gnuradio/gnuradio.mk @@ -22,6 +22,7 @@ GNURADIO_DEPENDENCIES = \ GNURADIO_CONF_OPTS = \ -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 \ -DENABLE_DEFAULT=OFF \ + -DENABLE_EXAMPLES=OFF \ -DENABLE_GNURADIO_RUNTIME=ON \ -DENABLE_TESTING=OFF \ -DXMLTO_EXECUTABLE=NOTFOUND From 55dff4a30b7b7a577ac84768466ee88a8c6fa262 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 22 Feb 2023 17:05:12 +0100 Subject: [PATCH 1043/5754] package/gnuradio: add libsndfile optional dependency libsndfile is an optional dependency since version 3.9.0.0 and https://github.com/gnuradio/gnuradio/commit/18f64ba685cfc2533e2d7726aa43c524b007d97b Signed-off-by: Fabrice Fontaine Acked-by: Gwenhael Goavec-merou Signed-off-by: Thomas Petazzoni --- package/gnuradio/gnuradio.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk index c2e5ec5cad..59fb23d89d 100644 --- a/package/gnuradio/gnuradio.mk +++ b/package/gnuradio/gnuradio.mk @@ -55,6 +55,9 @@ endif ifeq ($(BR2_PACKAGE_GNURADIO_BLOCKS),y) GNURADIO_CONF_OPTS += -DENABLE_GR_BLOCKS=ON +ifeq ($(BR2_PACKAGE_LIBSNDFILE),y) +GNURADIO_DEPENDENCIES += libsndfile +endif else GNURADIO_CONF_OPTS += -DENABLE_GR_BLOCKS=OFF endif From 25c8c00b98e37186d23ea6515e944060e59cfa8f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 22 Feb 2023 17:05:13 +0100 Subject: [PATCH 1044/5754] package/gnuradio: add gr-network block support grnet networking block support is available since version version 3.9.0.0 and https://github.com/gnuradio/gnuradio/commit/cc37c3e8cd5eabcb5c9d919e5fffc5d938690140 gr-network is a mandatory dependency of latest gqrx Signed-off-by: Fabrice Fontaine Acked-by: Gwenhael Goavec-merou Signed-off-by: Thomas Petazzoni --- package/gnuradio/Config.in | 6 ++++++ package/gnuradio/gnuradio.mk | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/package/gnuradio/Config.in b/package/gnuradio/Config.in index 1824589263..51237e62b9 100644 --- a/package/gnuradio/Config.in +++ b/package/gnuradio/Config.in @@ -134,6 +134,12 @@ config BR2_PACKAGE_GNURADIO_FILTER help Filter signal processing blocks +config BR2_PACKAGE_GNURADIO_NETWORK + bool "gr-network support" + select BR2_PACKAGE_GNURADIO_BLOCKS + help + TCP and UDP source/sink blocks + config BR2_PACKAGE_GNURADIO_QTGUI bool "gr-qtgui" depends on BR2_PACKAGE_GNURADIO_PYTHON diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk index 59fb23d89d..d9218b533d 100644 --- a/package/gnuradio/gnuradio.mk +++ b/package/gnuradio/gnuradio.mk @@ -106,6 +106,12 @@ else GNURADIO_CONF_OPTS += -DENABLE_GR_FILTER=OFF endif +ifeq ($(BR2_PACKAGE_GNURADIO_NETWORK),y) +GNURADIO_CONF_OPTS += -DENABLE_GR_NETWORK=ON +else +GNURADIO_CONF_OPTS += -DENABLE_GR_NETWORK=OFF +endif + ifeq ($(BR2_PACKAGE_GNURADIO_PYTHON),y) GNURADIO_DEPENDENCIES += python3 python-pybind \ host-python-numpy host-python-packaging From 5893d2d1f19168a12e823d78882d6037b791e276 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 22 Feb 2023 17:05:14 +0100 Subject: [PATCH 1045/5754] package/gqrx: bump to version 2.15.9 This bump will fix the following build failure raised since bump pf gnuradio to version 3.10.4.0 in commit e37c110bead8b7b35cd97915673fa785ccb39f2d: In file included from /home/buildroot/autobuild/instance-2/output-1/build/gqrx-2.14.4/src/applications/gqrx/receiver.cpp:32: /home/buildroot/autobuild/instance-2/output-1/build/gqrx-2.14.4/src/applications/gqrx/receiver.h:34:10: fatal error: gnuradio/blocks/wavfile_sink.h: No such file or directory 34 | #include | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ https://github.com/gqrx-sdr/gqrx/blob/v2.15.9/resources/news.txt Fixes: - http://autobuild.buildroot.org/results/42b5ab2e555063273ea55fd1c09a9be6d8b620e2 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/gqrx/Config.in | 2 ++ package/gqrx/gqrx.hash | 2 +- package/gqrx/gqrx.mk | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/gqrx/Config.in b/package/gqrx/Config.in index 442b28e546..97f0b7de07 100644 --- a/package/gqrx/Config.in +++ b/package/gqrx/Config.in @@ -34,7 +34,9 @@ config BR2_PACKAGE_GQRX select BR2_PACKAGE_GNURADIO_DIGITAL select BR2_PACKAGE_GNURADIO_FFT select BR2_PACKAGE_GNURADIO_FILTER + select BR2_PACKAGE_GNURADIO_NETWORK select BR2_PACKAGE_GR_OSMOSDR + select BR2_PACKAGE_LIBSNDFILE select BR2_PACKAGE_QT5BASE_GUI select BR2_PACKAGE_QT5BASE_WIDGETS select BR2_PACKAGE_QT5SVG diff --git a/package/gqrx/gqrx.hash b/package/gqrx/gqrx.hash index 1991dfea82..567ff947f9 100644 --- a/package/gqrx/gqrx.hash +++ b/package/gqrx/gqrx.hash @@ -1,4 +1,4 @@ # Locally calculated: -sha256 aec35c77ebde9c71a5f973c509eec3d6aa2f18a6e052b180fcd9029d88273e5b gqrx-2.14.4.tar.gz +sha256 4a826b468b2fb38a59cbe1f1b566e62c3114509186a7a25ba27dc92833f3eb44 gqrx-2.15.9.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING sha256 7cc22ce5ee61df62e427ec43b8130de149edee3cafb5af4f18d59b6dc3958faf LICENSE-CTK diff --git a/package/gqrx/gqrx.mk b/package/gqrx/gqrx.mk index 4d464298ca..d2518213b8 100644 --- a/package/gqrx/gqrx.mk +++ b/package/gqrx/gqrx.mk @@ -4,11 +4,11 @@ # ################################################################################ -GQRX_VERSION = 2.14.4 +GQRX_VERSION = 2.15.9 GQRX_SITE = $(call github,csete,gqrx,v$(GQRX_VERSION)) GQRX_LICENSE = GPL-3.0+, Apache-2.0 GQRX_LICENSE_FILES = COPYING LICENSE-CTK -GQRX_DEPENDENCIES = boost gnuradio gr-osmosdr qt5base qt5svg +GQRX_DEPENDENCIES = boost gnuradio gr-osmosdr libsndfile qt5base qt5svg GQRX_CONF_OPTS = -DLINUX_AUDIO_BACKEND=Gr-audio From b5178b092a820e328434490cad47c2ea8342f392 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 22 Feb 2023 19:12:54 +0100 Subject: [PATCH 1046/5754] package/xerces: drop patch Drop patch which is not needed since commit 62cab101356c97432da482e168adaf065de65c4f. This patch is actually raising a build failure since bump to version 3.2.4 in commit d2d8f146a9f0ed3b66c4dd470bb76efdbb630a75 and https://github.com/apache/xerces-c/commit/af1935b567c18c8b2de71d6ea97239be60876335: CMake Error at src/CMakeLists.txt:1271 (add_library): Target "xerces-c" links to target "CURL::libcurl" but the target was not found. Perhaps a find_package() call is missing for an IMPORTED target, or an ALIAS target is missing? Fixes: - http://autobuild.buildroot.org/results/c62856a5eeb34714f26235b2d6f8adc4ea612686 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0001-fix-static-linking-with-curl.patch | 39 ------------------- 1 file changed, 39 deletions(-) delete mode 100644 package/xerces/0001-fix-static-linking-with-curl.patch diff --git a/package/xerces/0001-fix-static-linking-with-curl.patch b/package/xerces/0001-fix-static-linking-with-curl.patch deleted file mode 100644 index db38de79fc..0000000000 --- a/package/xerces/0001-fix-static-linking-with-curl.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 26e3f1440bbc75c704fc93ff43a2abbfbe4c0203 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 11 Oct 2018 22:56:50 +0200 -Subject: [PATCH] fix static linking with curl - -When curl is statically built with openssl support, xerces needs to -link with openssl libraries so use pkg_check_modules to get any -needed dependencies - -Fixes: - - http://autobuild.buildroot.org/results/29ca90fff2c8e38f2edf7240eca3aa3fe7397c45 - -Signed-off-by: Fabrice Fontaine ---- - cmake/XercesNetAccessorSelection.cmake | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/cmake/XercesNetAccessorSelection.cmake b/cmake/XercesNetAccessorSelection.cmake -index 7a63f1f6b..e90fcf034 100644 ---- a/cmake/XercesNetAccessorSelection.cmake -+++ b/cmake/XercesNetAccessorSelection.cmake -@@ -31,7 +31,13 @@ if(network) - - # Requires select() which is UNIX only - if(UNIX) -- find_package(CURL) -+ find_package(PkgConfig) -+ if (PkgConfig_FOUND) -+ pkg_check_modules(CURL libcurl) -+ if (NOT CURL_FOUND) -+ find_package(CURL) -+ endif() -+ endif() - if(CURL_FOUND) - list(APPEND netaccessors curl) - endif() --- -2.17.1 - From f665acb88c7a9a50e6b93a0daefb53ca3bcc2f79 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 22 Feb 2023 19:22:10 +0100 Subject: [PATCH 1047/5754] package/lightning: needs threads threads are mandatory since bump to version 2.2.0 in commit af6f7aa76db5aed1eada0b27bd0375610a2fc728 and https://git.savannah.gnu.org/cgit/lightning.git/commit/?id=d5a7c8e4ad719e84dbb4904c532f906a1ef5a77b: In file included from incr.c:2: ../include/lightning.h:27:10: fatal error: pthread.h: No such file or directory 27 | #include | ^~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/62205869159d4a73c59a9795140fa77e9c3310ae Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/lightning/Config.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/lightning/Config.in b/package/lightning/Config.in index a0542edce9..3cf7c28ae2 100644 --- a/package/lightning/Config.in +++ b/package/lightning/Config.in @@ -1,13 +1,14 @@ -comment "lightning needs a toolchain w/ dynamic library" +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 - depends on BR2_STATIC_LIBS + 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 depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HAS_THREADS help GNU lightning is a library that generates assembly language code at run-time. From 97c40266b1b69e101ce035c8aa73bf2665c5c256 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 1 Jan 2023 15:32:32 +0100 Subject: [PATCH 1048/5754] 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 154b98a541..a446c0cf68 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 58b4ff10a5..d514a2285c 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 1049/5754] 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 599cfe6886..d052e59122 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 6c5238a9b0..7c32305129 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 0000000000..e3580c2cf5 --- /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 0000000000..2e5c4a8168 --- /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 0000000000..d8f913a648 --- /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 0000000000..c5151b4fdb --- /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 1050/5754] 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 8332db4b38..0000000000 --- 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 16f2ba2898..0000000000 --- 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 9a7a1c342a..b87964da12 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 a1c65bef4e..a629bf0dd6 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 f5be4abc574d6f2acfde4e523c73f4cee7ac373e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 22 Feb 2023 23:17:50 +0100 Subject: [PATCH 1051/5754] package/optee-client: fix uclibc build Fix the following uclibc build failure raised since bump to version 3.19.0 in commit 917a961d9c77d5f1aaa47206add9b9ff80e74a82: /tmp/instance-5/output-1/build/optee-client-3.19.0/libteeacl/src/group.c: In function 'teeacl_user_is_member_of': /tmp/instance-5/output-1/build/optee-client-3.19.0/libteeacl/src/group.c:75:12: error: implicit declaration of function 'reallocarray' [-Werror=implicit-function-declaration] 75 | groups = reallocarray(groups, grouplistsize, sizeof(gid_t)); | ^~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/03eba71ab9b87676f2606ecf2a9b5a151fc396bb Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...-use-realloc-instead-of-reallocarray.patch | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 package/optee-client/0002-libteeacl-use-realloc-instead-of-reallocarray.patch 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 new file mode 100644 index 0000000000..88f5a4f87e --- /dev/null +++ b/package/optee-client/0002-libteeacl-use-realloc-instead-of-reallocarray.patch @@ -0,0 +1,34 @@ +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; From efe2734fc58cc6bfcc8fa1b696bba81a9797efb9 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 22 Feb 2023 22:22:35 +0100 Subject: [PATCH 1052/5754] package/netsurf: force libopenssl netsurf raises the following build failure since bump of libressl to version 3.5.2 in commit 8b216927db080b38fdbf1f8b025b6f90a89d4bc2: content/fetchers/about.c: In function 'ns_X509_get_signature_nid': content/fetchers/about.c:548:25: error: dereferencing pointer to incomplete type 'X509 {aka struct x509_st}' return OBJ_obj2nid(cert->cert_info->key->algor->algorithm); ^~ Fixes: - http://autobuild.buildroot.org/results/c225aaac31398ba495921bd4b85e588199822561 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/netsurf/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/netsurf/Config.in b/package/netsurf/Config.in index 4f7d5c2713..394befcf28 100644 --- a/package/netsurf/Config.in +++ b/package/netsurf/Config.in @@ -20,6 +20,7 @@ config BR2_PACKAGE_NETSURF select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_OPENSSL if BR2_PACKAGE_LIBCURL + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL if BR2_PACKAGE_LIBCURL help NetSurf is a compact graphical web browser which aims for HTML5, CSS and JavaScript support. From 02a6b77ed8214d837f7d1d43b10321ec5672fea9 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 22 Feb 2023 23:08:35 +0100 Subject: [PATCH 1053/5754] package/optee-client: fix BR2_PACKAGE_OPTEE_CLIENT_TEEACL Fix typo added by commit 917a961d9c77d5f1aaa47206add9b9ff80e74a82 resulting in the following build failure: -- Checking for module 'uuid' -- Package 'uuid', required by 'virtual:world', not found CMake Error at /tmp/instance-5/output-1/per-package/optee-client/host/share/cmake-3.22/Modules/FindPkgConfig.cmake:603 (message): A required package was not found Call Stack (most recent call first): /tmp/instance-5/output-1/per-package/optee-client/host/share/cmake-3.22/Modules/FindPkgConfig.cmake:825 (_pkg_check_modules_internal) CMakeLists.txt:43 (pkg_check_modules) Fixes: - http://autobuild.buildroot.org/results/e1c6b5c9e841a003037045b2ff7afd9836e7c640 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/optee-client/optee-client.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/optee-client/optee-client.mk b/package/optee-client/optee-client.mk index 311ca191b0..ef113c838f 100644 --- a/package/optee-client/optee-client.mk +++ b/package/optee-client/optee-client.mk @@ -27,7 +27,7 @@ OPTEE_CLIENT_CONF_OPTS += -DCFG_TEE_SUPP_PLUGINS=OFF endif ifeq ($(BR2_PACKAGE_OPTEE_CLIENT_TEEACL),y) -OPTEE_CLIENT_EXT_DEPENDENCIES += host-pkgconf util-linux +OPTEE_CLIENT_DEPENDENCIES += host-pkgconf util-linux OPTEE_CLIENT_CONF_OPTS += -DWITH_TEEACL=ON else OPTEE_CLIENT_CONF_OPTS += -DWITH_TEEACL=OFF From c29f6d63e0adebc8502dd707d3e4050af254d342 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 23 Feb 2023 17:28:47 +0100 Subject: [PATCH 1054/5754] package/efivar: needs threads Add a thread dependency as Upstream quickly closed https://github.com/rhboot/efivar/pull/238 to fix the following build failure without threads raised since bump to version 38 in commit f24029b561fbda0953c7dbd93d2485b03873996d and https://github.com/rhboot/efivar/commit/cff88dd96b9d43e2c5875a24ba6180b196890ded: thread-test.c:14:10: fatal error: pthread.h: No such file or directory 14 | #include | ^~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/f2da14f91dc602a32dd5b2b7bdf3d3aa43afa7f4 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/efibootmgr/Config.in | 5 +++-- package/efivar/Config.in | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/efibootmgr/Config.in b/package/efibootmgr/Config.in index 98ff71c996..5800e6c143 100644 --- a/package/efibootmgr/Config.in +++ b/package/efibootmgr/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_EFIBOOTMGR bool "efibootmgr" depends on BR2_PACKAGE_EFIVAR_ARCH_SUPPORTS # efivar depends on !BR2_STATIC_LIBS # efivar + depends on BR2_TOOLCHAIN_HAS_THREADS # efivar depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 # efivar depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # efivar depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS @@ -15,9 +16,9 @@ config BR2_PACKAGE_EFIBOOTMGR https://github.com/rhboot/efibootmgr -comment "efibootmgr needs a toolchain w/ dynamic library, headers >= 3.12, gcc >= 4.9" +comment "efibootmgr needs a toolchain w/ dynamic library, threads, headers >= 3.12, gcc >= 4.9" depends on BR2_PACKAGE_EFIVAR_ARCH_SUPPORTS - depends on BR2_STATIC_LIBS || \ + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS diff --git a/package/efivar/Config.in b/package/efivar/Config.in index 74f2bb5abb..d4402dbcf7 100644 --- a/package/efivar/Config.in +++ b/package/efivar/Config.in @@ -9,6 +9,7 @@ config BR2_PACKAGE_EFIVAR depends on BR2_PACKAGE_EFIVAR_ARCH_SUPPORTS depends on !BR2_STATIC_LIBS # dlfcn.h depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 # linux/nvme.h + depends on BR2_TOOLCHAIN_HAS_THREADS # linux/nvme.h has been renamed to linux/nvme_ioctl.h since 4.4, # and the efivar source handles that situation. However, some # Sourcery CodeBench toolchains use 4.4 kernel headers but they @@ -22,9 +23,9 @@ config BR2_PACKAGE_EFIVAR https://github.com/rhboot/efivar -comment "efivar needs a toolchain w/ dynamic library, headers >= 3.12, gcc >= 4.9" +comment "efivar needs a toolchain w/ dynamic library, threads, headers >= 3.12, gcc >= 4.9" depends on BR2_PACKAGE_EFIVAR_ARCH_SUPPORTS - depends on BR2_STATIC_LIBS || \ + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS From 93b461bb5e34ec25c9aac3024b41d132736c5dd7 Mon Sep 17 00:00:00 2001 From: Sergey Matyukevich Date: Thu, 23 Feb 2023 19:47:47 +0300 Subject: [PATCH 1055/5754] package/wpa_supplicant: fix builds with missing sha384 hash functions SAE, unlike OWE or DPP, does not explicitly enable support for sha384 hash functions. Possible WPA3 build issue is masked, since all three SAE/OWE/DPP are included. However, there exist other configurations that enable only SAE. For instance, one such build configuration is wpa_supplicant AP mode with mesh support. This change adds upstream patch that includes sha384 and sha256 hash functions to builds with SAE support. Fixes: http://autobuild.buildroot.net/results/f349130985870f4a781cca56c3f551108f81aa3e/ Signed-off-by: Sergey Matyukevich Signed-off-by: Thomas Petazzoni --- ...384-512-KDF-for-SAE-if-SHA384-512-is.patch | 64 +++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 package/wpa_supplicant/0003-Include-HMAC-SHA384-512-KDF-for-SAE-if-SHA384-512-is.patch diff --git a/package/wpa_supplicant/0003-Include-HMAC-SHA384-512-KDF-for-SAE-if-SHA384-512-is.patch b/package/wpa_supplicant/0003-Include-HMAC-SHA384-512-KDF-for-SAE-if-SHA384-512-is.patch new file mode 100644 index 0000000000..98df56e540 --- /dev/null +++ b/package/wpa_supplicant/0003-Include-HMAC-SHA384-512-KDF-for-SAE-if-SHA384-512-is.patch @@ -0,0 +1,64 @@ +From c7f71fb8679c4cdd2607dbaac467a1d5efe9f0f9 Mon Sep 17 00:00:00 2001 +From: Jouni Malinen +Date: Sun, 17 Apr 2022 12:28:41 +0300 +Subject: [PATCH] Include HMAC-SHA384/512 KDF for SAE if SHA384/512 is included + +It was possible to miss the HMAC functions if some other build +configuration parameters ended up setting NEED_SHA384/512=y. + +Upstream: https://w1.fi/cgit/hostap/commit/?id=c7f71fb8679c4cdd2607dbaac467a1d5efe9f0f9 + +Signed-off-by: Jouni Malinen +Signed-off-by: Sergey Matyukevich +--- + wpa_supplicant/Android.mk | 11 +++++++++++ + wpa_supplicant/Makefile | 11 +++++++++++ + 2 files changed, 22 insertions(+) + +diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk +index 0e0ce467c..bcdbd6c90 100644 +--- a/wpa_supplicant/Android.mk ++++ b/wpa_supplicant/Android.mk +@@ -1361,6 +1361,17 @@ endif + endif + endif + ++ifdef CONFIG_SAE ++ifdef NEED_SHA384 ++# Need to add HMAC-SHA384 KDF as well, if SHA384 was enabled. ++NEED_HMAC_SHA384_KDF=y ++endif ++ifdef NEED_SHA512 ++# Need to add HMAC-SHA512 KDF as well, if SHA512 was enabled. ++NEED_HMAC_SHA512_KDF=y ++endif ++endif ++ + SHA256OBJS = # none by default + L_CFLAGS += -DCONFIG_SHA256 + ifneq ($(CONFIG_TLS), openssl) +diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile +index ed49aa972..69c80121c 100644 +--- a/wpa_supplicant/Makefile ++++ b/wpa_supplicant/Makefile +@@ -1475,6 +1475,17 @@ endif + endif + endif + ++ifdef CONFIG_SAE ++ifdef NEED_SHA384 ++# Need to add HMAC-SHA384 KDF as well, if SHA384 was enabled. ++NEED_HMAC_SHA384_KDF=y ++endif ++ifdef NEED_SHA512 ++# Need to add HMAC-SHA512 KDF as well, if SHA512 was enabled. ++NEED_HMAC_SHA512_KDF=y ++endif ++endif ++ + SHA256OBJS = # none by default + CFLAGS += -DCONFIG_SHA256 + ifneq ($(CONFIG_TLS), openssl) +-- +2.39.2 + 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 1056/5754] 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 30b352f8e7..95f7e22760 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 1057/5754] 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 b5106f015e..cb0fe08b87 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 3c63f5dc76..102fe8fd09 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 6455558f6202663f21d8d72e430d73b13d5339cd Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 23 Feb 2023 23:09:47 +0100 Subject: [PATCH 1058/5754] package/gcc: fix GCC_DL_DIR GCC_DL_DIR is empty as gcc is not a "real" package, as a result, the following (silent) error is raised when BR2_CCACHE is set: /home/thomas/autobuild/instance-0/output-1/per-package/host-gcc-initial/host/bin/ccache /usr/bin/gcc -O2 -I/home/thomas/autobuild/instance-0/output-1/per-package/host-gcc-initial/host/include -DBR_CROSS_PATH_SUFFIX='".br_real"' -DBR_CCACHE_HASH=\"` printf '%s\n' --target=aarch64_be-buildroot-linux-gnu --with-sysroot=@HOST_DIR@/aarch64_be-buildroot-linux-gnu/sysroot --enable-__cxa_atexit --with-gnu-ld --disable-libssp --disable-multilib --disable-decimal-float --enable-plugins --enable-lto --with-gmp=@HOST_DIR@ --with-mpc=@HOST_DIR@ --with-mpfr=@HOST_DIR@ --with-bugurl="http://bugs.buildroot.net/" --without-zstd --disable-libquadmath --disable-libquadmath-support --enable-tls --enable-threads --without-isl --without-cloog --with-abi="lp64" --with-cpu=cortex-a53 --enable-languages=c --disable-shared --without-headers --disable-threads --with-newlib --disable-largefile | sha256sum - /gcc-11.3.0.tar.xz package/gcc/11.3.0/0001-or1k-Add-mcmodel-option-to-handle-large-GOTs.patch package/ gcc/11.3.0/0002-or1k-Use-cmodel-large-when-building-crtstuff.patch package/gcc/11.3.0/0003-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch package/gcc/11.3.0/0004-disable-split-stack-for-non-thread-builds.patch package/gcc/11.3.0/0005-rs6000-Improve-.machine.patch package/gcc/11.3.0/0006-rs6000-Do-not-use-rs6000_cpu-for-.machine-ppc-and-pp.patch package/gcc/11.3.0/0007-fixinc-don-t-fix-machine-names-in-__has_include-.-PR.patch | cut -c -64 | tr -d '\n'`\" -DBR_SYSROOT='"aarch64_be-buildroot-linux-gnu/sysroot"' -DBR_ADDITIONAL_CFLAGS='"-Wl,-z,max-page-size=65536", "-Wl,-z,common-page-size=65536", "-fstack-protector-strong",' -DBR_CCACHE -DBR2_RELRO_PARTIAL -s -Wl,--hash-style=both toolchain/toolchain-wrapper.c -o /home/thomas/autobuild/instance-0/output-1/build/host-gcc-initial-11.3.0/toolchain-wrapper sha256sum: /gcc-11.3.0.tar.xz: No such file or directory This patch replaces GCC_DL_DIR by $($(PKG)_DL_DIR) as suggested by Arnout Vandecappelle. Fixes: - Found when investigating: http://autobuild.buildroot.org/results/ae75f5cdd4a1fe97359b99b2bcade258097c86dd Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/gcc/gcc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk index 6dfd93f2a4..25cb4ce8e2 100644 --- a/package/gcc/gcc.mk +++ b/package/gcc/gcc.mk @@ -284,7 +284,7 @@ HOST_GCC_COMMON_MAKE_OPTS = \ gcc_cv_libc_provides_ssp=$(if $(BR2_TOOLCHAIN_HAS_SSP),yes,no) ifeq ($(BR2_CCACHE),y) -HOST_GCC_COMMON_CCACHE_HASH_FILES += $(GCC_DL_DIR)/$(GCC_SOURCE) +HOST_GCC_COMMON_CCACHE_HASH_FILES += $($(PKG)_DL_DIR)/$(GCC_SOURCE) # Cfr. PATCH_BASE_DIRS in .stamp_patched, but we catch both versioned # and unversioned patches unconditionally. Moreover, to facilitate the From 26254066439596b88783b80a3a87f67570c0b0b5 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 23 Feb 2023 15:06:06 +0100 Subject: [PATCH 1059/5754] package/erlang: fix build with libressl >= 3.5.0 Fix the following build failure with libressl >= 3.5.0 raised since bump to version 3.5.2 in commit 8b216927db080b38fdbf1f8b025b6f90a89d4bc2: api_ng.c: In function 'EVP_CIPHER_CTX_copy': api_ng.c:392:28: error: invalid use of incomplete typedef 'EVP_CIPHER_CTX' {aka 'const struct evp_cipher_ctx_st'} 392 | if ((in == NULL) || (in->cipher == NULL)) | ^~ Fixes: - http://autobuild.buildroot.org/results/90f7365d8477d35fca452b7b3f38babba086375e Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...0003-crypto-Fixes-for-LibreSSL-3-5-0.patch | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 package/erlang/0003-crypto-Fixes-for-LibreSSL-3-5-0.patch diff --git a/package/erlang/0003-crypto-Fixes-for-LibreSSL-3-5-0.patch b/package/erlang/0003-crypto-Fixes-for-LibreSSL-3-5-0.patch new file mode 100644 index 0000000000..84c75fef83 --- /dev/null +++ b/package/erlang/0003-crypto-Fixes-for-LibreSSL-3-5-0.patch @@ -0,0 +1,30 @@ +From 8e5170d79e387d7e898d948a78e0c70407a4030c Mon Sep 17 00:00:00 2001 +From: Hans Nilsson +Date: Mon, 14 Feb 2022 15:51:35 +0100 +Subject: [PATCH] crypto: Fixes for LibreSSL 3.5.0 + +[Retrieved (and backported) from: +https://github.com/erlang/otp/commit/8e5170d79e387d7e898d948a78e0c70407a4030c] +Signed-off-by: Fabrice Fontaine +--- + lib/crypto/c_src/openssl_config.h | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/lib/crypto/c_src/openssl_config.h b/lib/crypto/c_src/openssl_config.h +index 6fdd049fb30a..39e4b2d9d7c0 100644 +--- a/lib/crypto/c_src/openssl_config.h ++++ b/lib/crypto/c_src/openssl_config.h +@@ -122,7 +122,14 @@ + # endif + #endif + ++#ifdef HAS_LIBRESSL ++# if LIBRESSL_VERSION_NUMBER >= 0x3050000fL ++# define HAS_EVP_PKEY_CTX ++# define HAVE_EVP_CIPHER_CTX_COPY ++# endif ++#endif ++ + #ifndef HAS_LIBRESSL + # if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION_PLAIN(1,0,0) + # define HAS_EVP_PKEY_CTX From 9b911c8e8fe52914c1578b846914d7399450067b Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 23 Feb 2023 15:17:45 +0100 Subject: [PATCH 1060/5754] package/gerbera: fix build with fmt >= 9.0.0 Fix the following build failure with fmt >= 9.0.0 raised since commit 5c83dc5451fb59ffa5cd40d30c4c532dd25e8333: /tmp/instance-5/output-1/build/gerbera-1.10.0/src/database/sql_database.cc:1688:26: required from here /tmp/instance-5/output-1/host/x86_64-buildroot-linux-gnu/sysroot/usr/include/fmt/format.h:3973:36: error: passing 'const fmt::v9::formatter >, __gnu_cxx::__normal_iterator >, char>, char, void>::formatter_type' {aka 'const fmt::v9::formatter'} as 'this' argument discards qualifiers [-fpermissive] 3973 | out = value_formatter_.format(map(*it), ctx); | ~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/56c46fa7e922360d2c4b4093f8a030cc83726799 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../gerbera/0001-Fix-build-with-fmt-9-0.patch | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 package/gerbera/0001-Fix-build-with-fmt-9-0.patch diff --git a/package/gerbera/0001-Fix-build-with-fmt-9-0.patch b/package/gerbera/0001-Fix-build-with-fmt-9-0.patch new file mode 100644 index 0000000000..63ae8382a3 --- /dev/null +++ b/package/gerbera/0001-Fix-build-with-fmt-9-0.patch @@ -0,0 +1,36 @@ +From d7b8fafbc94405c20753fed569abd8878cccde89 Mon Sep 17 00:00:00 2001 +From: Felix Yan +Date: Fri, 19 Aug 2022 15:22:10 +0300 +Subject: [PATCH] Fix build with fmt 9.0 + +Fixes #2681 + +[Retrieved from: +https://github.com/gerbera/gerbera/commit/d7b8fafbc94405c20753fed569abd8878cccde89] +Signed-off-by: Fabrice Fontaine +--- + src/database/sql_format.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/database/sql_format.h b/src/database/sql_format.h +index 32dc00efa..e4e1909a8 100644 +--- a/src/database/sql_format.h ++++ b/src/database/sql_format.h +@@ -42,7 +42,7 @@ struct SQLIdentifier { + template <> + struct fmt::formatter : formatter { + template +- auto format(const SQLIdentifier& tn, FormatContext& ctx) -> decltype(ctx.out()) ++ auto format(const SQLIdentifier& tn, FormatContext& ctx) const -> decltype(ctx.out()) + { + return format_to(ctx.out(), "{}{}{}", tn.quote_begin, tn.name, tn.quote_end); + } +@@ -61,7 +61,7 @@ struct ColumnUpdate { + template <> + struct fmt::formatter : formatter { + template +- auto format(const ColumnUpdate& a, FormatContext& ctx) -> decltype(ctx.out()) ++ auto format(const ColumnUpdate& a, FormatContext& ctx) const -> decltype(ctx.out()) + { + return format_to(ctx.out(), "{} = {}", a.column, a.value); + } From 7edb4a6a4db7d864c6c1560f3fdc1ef4fbd7f0fd Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 24 Feb 2023 12:43:20 +0100 Subject: [PATCH 1061/5754] package/zabbix: fix build with libressl >= 3.5.0 Fix the following build failure with libressl >= 3.5.0 raised since bump to version 3.5.2 in commit 8b216927db080b38fdbf1f8b025b6f90a89d4bc2: tls.c:113:17: error: static declaration of 'OPENSSL_cleanup' follows non-static declaration 113 | static void OPENSSL_cleanup(void) | ^~~~~~~~~~~~~~~ In file included from /home/thomas/autobuild/instance-3/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/openssl/bio.h:69, from /home/thomas/autobuild/instance-3/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/openssl/evp.h:67, from /home/thomas/autobuild/instance-3/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/openssl/hmac.h:67, from /home/thomas/autobuild/instance-3/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/openssl/ssl.h:150, from ../../../include/zbxcomms.h:65, from tls.c:20: /home/thomas/autobuild/instance-3/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/openssl/crypto.h:565:6: note: previous declaration of 'OPENSSL_cleanup' with type 'void(void)' 565 | void OPENSSL_cleanup(void); | ^~~~~~~~~~~~~~~ In file included from tls.c:20: tls.c: In function 'zbx_log_ciphersuites': ../../../include/zbxcomms.h:222:75: error: invalid use of incomplete typedef 'SSL_CTX' {aka 'struct ssl_ctx_st'} 222 | # define SSL_CTX_get_ciphers(ciphers) ((ciphers)->cipher_list) | ^~ tls.c:1415:31: note: in expansion of macro 'SSL_CTX_get_ciphers' 1415 | cipher_list = SSL_CTX_get_ciphers(ciphers); | ^~~~~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/acdfcb17b39d438ccf5e4621707a10f60577d233 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0002-fix-build-with-libressl-3.5.0.patch | 71 +++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 package/zabbix/0002-fix-build-with-libressl-3.5.0.patch diff --git a/package/zabbix/0002-fix-build-with-libressl-3.5.0.patch b/package/zabbix/0002-fix-build-with-libressl-3.5.0.patch new file mode 100644 index 0000000000..7e32ad5745 --- /dev/null +++ b/package/zabbix/0002-fix-build-with-libressl-3.5.0.patch @@ -0,0 +1,71 @@ +From 5c8511384f1d41f9c2a131604d5cb2dbc1c0aec9 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 24 Feb 2023 12:23:56 +0100 +Subject: [PATCH] fix build with libressl >= 3.5.0 + +Fix the following build failure with libressl >= 3.5.0: + +tls.c:113:17: error: static declaration of 'OPENSSL_cleanup' follows non-static declaration + 113 | static void OPENSSL_cleanup(void) + | ^~~~~~~~~~~~~~~ +In file included from /home/thomas/autobuild/instance-3/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/openssl/bio.h:69, + from /home/thomas/autobuild/instance-3/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/openssl/evp.h:67, + from /home/thomas/autobuild/instance-3/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/openssl/hmac.h:67, + from /home/thomas/autobuild/instance-3/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/openssl/ssl.h:150, + from ../../../include/zbxcomms.h:65, + from tls.c:20: +/home/thomas/autobuild/instance-3/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/openssl/crypto.h:565:6: note: previous declaration of 'OPENSSL_cleanup' with type 'void(void)' + 565 | void OPENSSL_cleanup(void); + | ^~~~~~~~~~~~~~~ +In file included from tls.c:20: +tls.c: In function 'zbx_log_ciphersuites': +../../../include/zbxcomms.h:222:75: error: invalid use of incomplete typedef 'SSL_CTX' {aka 'struct ssl_ctx_st'} + 222 | # define SSL_CTX_get_ciphers(ciphers) ((ciphers)->cipher_list) + | ^~ +tls.c:1415:31: note: in expansion of macro 'SSL_CTX_get_ciphers' + 1415 | cipher_list = SSL_CTX_get_ciphers(ciphers); + | ^~~~~~~~~~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/acdfcb17b39d438ccf5e4621707a10f60577d233 + +Signed-off-by: Fabrice Fontaine +[Upstream status: not sent (no feedback on first patch)] +--- + include/zbxcomms.h | 3 ++- + src/libs/zbxcomms/tls.c | 5 +++-- + 2 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/include/zbxcomms.h b/include/zbxcomms.h +index e7d74dbd0f..d6efa358fe 100644 +--- a/include/zbxcomms.h ++++ b/include/zbxcomms.h +@@ -253,7 +253,8 @@ int zbx_telnet_execute(ZBX_SOCKET socket_fd, const char *command, AGENT_RESULT * + /* TLS BLOCK */ + #if defined(HAVE_GNUTLS) || defined(HAVE_OPENSSL) + +-#if defined(HAVE_OPENSSL) && OPENSSL_VERSION_NUMBER < 0x1010000fL || defined(LIBRESSL_VERSION_NUMBER) ++#if defined(HAVE_OPENSSL) && OPENSSL_VERSION_NUMBER < 0x1010000fL || \ ++ defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x3050000fL + # if !defined(LIBRESSL_VERSION_NUMBER) + # define OPENSSL_INIT_LOAD_SSL_STRINGS 0 + # define OPENSSL_INIT_LOAD_CRYPTO_STRINGS 0 +diff --git a/src/libs/zbxcomms/tls.c b/src/libs/zbxcomms/tls.c +index 54ab0a6ef4..bd4075b3e4 100644 +--- a/src/libs/zbxcomms/tls.c ++++ b/src/libs/zbxcomms/tls.c +@@ -30,8 +30,9 @@ + #include "zbxstr.h" + #include "zbxtime.h" + +-#if defined(HAVE_OPENSSL) && OPENSSL_VERSION_NUMBER < 0x1010000fL || defined(LIBRESSL_VERSION_NUMBER) +-/* for OpenSSL 1.0.1/1.0.2 (before 1.1.0) or LibreSSL */ ++#if defined(HAVE_OPENSSL) && OPENSSL_VERSION_NUMBER < 0x1010000fL || \ ++ defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x300000fL ++/* for OpenSSL 1.0.1/1.0.2 (before 1.1.0) or LibreSSL (before 3.5.0) */ + + /* mutexes for multi-threaded OpenSSL (see "man 3ssl threads" and example in crypto/threads/mttest.c) */ + +-- +2.39.1 + From edc6350d427bdd47552a276d80c6ad055add86af Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 24 Feb 2023 14:40:28 +0100 Subject: [PATCH 1062/5754] package/hawktracer: update URL in Config.in Current website is down: https://github.com/amzn/hawktracer/issues/87 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/hawktracer/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/hawktracer/Config.in b/package/hawktracer/Config.in index 7648707404..bee9c27b7d 100644 --- a/package/hawktracer/Config.in +++ b/package/hawktracer/Config.in @@ -7,7 +7,7 @@ config BR2_PACKAGE_HAWKTRACER profiling tool built in Amazon Video for getting performance metrics from low-end devices. - https://www.hawktracer.org/ + https://hawktracer.github.io/ if BR2_PACKAGE_HAWKTRACER From 45e2aa588d7d10941032c1661b9cf1e6c52b2680 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 24 Feb 2023 17:15:43 +0100 Subject: [PATCH 1063/5754] package/systemd: fix build with -Ofast Update -Ofast workaround as suggested by Yann E. Morin to avoid the following build failure raised since bump to version 252.4 in commit a2c823d1f548d5a0120d27d6c000603192360f7b and https://github.com/systemd/systemd/commit/60f97fee2d2f948c8e8963ea8ff767008cb93cae: ../output-1/build/systemd-252.4/meson.build:397:8: ERROR: Problem encountered: -Ofast, -ffast-math, or -ffinite-math-only is specified in c_args. Fixes: - http://autobuild.buildroot.org/results/8f41c4984b645851724e554c3162b83bc312bee7 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/systemd/systemd.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index cce9162f6d..63467171ed 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -100,7 +100,7 @@ SYSTEMD_CONF_OPTS += \ SYSTEMD_CFLAGS = $(TARGET_CFLAGS) ifeq ($(BR2_OPTIMIZE_FAST),y) -SYSTEMD_CFLAGS += -O3 +SYSTEMD_CFLAGS += -O3 -fno-finite-math-only endif ifeq ($(BR2_nios2),y) From 656aec42d96f1286b4acb3ad0e9c84073db3c6b8 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 24 Feb 2023 17:31:16 +0100 Subject: [PATCH 1064/5754] package/hawktracer: bump to 3c22b3908912e2ec727fd2ddc5dbfe7464e6b4a5 This bump will fix the following build failure with gcc >= 12: /tmp/instance-8/output-1/build/hawktracer-2ec19d71923344148928ef45fce549eda67030a4/hawktracer.cpp: In function 'HT_Thread* ht_thread_create(ht_thread_callback_t, void*)': /tmp/instance-8/output-1/build/hawktracer-2ec19d71923344148928ef45fce549eda67030a4/hawktracer.cpp:1006:28: error: no matching function for call to 'operator new(sizetype, std::thread*)' 1006 | new(&th->th) HT_Thread(); | ^ https://github.com/amzn/hawktracer/compare/e53b07bc812c4cfe8f6253ddb48ac43de8fa74a8...2ec19d71923344148928ef45fce549eda67030a4 Fixes: - http://autobuild.buildroot.org/results/d18a1b2ee6cdcb289567ae90b2d836844427b5f6 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/hawktracer/hawktracer.hash | 2 +- package/hawktracer/hawktracer.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/hawktracer/hawktracer.hash b/package/hawktracer/hawktracer.hash index 47a8b35b6b..29d00e29ec 100644 --- a/package/hawktracer/hawktracer.hash +++ b/package/hawktracer/hawktracer.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 a48e26082fd644222d4a20ecfd5a34700865cf572d41b7eac5b0c8242fef9c5f hawktracer-2ec19d71923344148928ef45fce549eda67030a4.tar.gz +sha256 099f76d5be18ad5d714fded0c6f889f588986cdde2b31f2c0058413698a5f35c hawktracer-3c22b3908912e2ec727fd2ddc5dbfe7464e6b4a5.tar.gz sha256 2f377333e64ad08ad3afec8ed6c2c96ced2a6d7d67443eb2784a931bb7b3fd59 LICENSE diff --git a/package/hawktracer/hawktracer.mk b/package/hawktracer/hawktracer.mk index fd635e350d..462d073755 100644 --- a/package/hawktracer/hawktracer.mk +++ b/package/hawktracer/hawktracer.mk @@ -4,7 +4,7 @@ # ################################################################################ -HAWKTRACER_VERSION = 2ec19d71923344148928ef45fce549eda67030a4 +HAWKTRACER_VERSION = 3c22b3908912e2ec727fd2ddc5dbfe7464e6b4a5 HAWKTRACER_SITE = $(call github,amzn,hawktracer,$(HAWKTRACER_VERSION)) HAWKTRACER_LICENSE = MIT HAWKTRACER_LICENSE_FILES = LICENSE From b5d310772d71f547146684673c7113f208a31b5f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 24 Feb 2023 17:40:53 +0100 Subject: [PATCH 1065/5754] package/intel-gmmlib: needs threads threads are mandatory since version 19.1.1 and https://github.com/intel/gmmlib/commit/9e4aa143fb7e7e87332fcb7c9871040ff4a1a1da resulting in the following build failure since commit cd206d9b808a322a00294b4caad203a892ed4c92: CMake Error at /home/thomas/autobuild/instance-2/output-1/host/share/cmake-3.22/Modules/FindPackageHandleStandardArgs.cmake:230 (message): Could NOT find Threads (missing: Threads_FOUND) Fixes: - http://autobuild.buildroot.org/results/c1120932e8c212820b239ee8cd4a057623a73376 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/intel-gmmlib/Config.in | 6 ++++-- package/intel-mediadriver/Config.in | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/intel-gmmlib/Config.in b/package/intel-gmmlib/Config.in index b6f93f7416..a3d0d2610b 100644 --- a/package/intel-gmmlib/Config.in +++ b/package/intel-gmmlib/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_INTEL_GMMLIB depends on BR2_x86_64 depends on !BR2_STATIC_LIBS depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS help The Intel(R) Graphics Memory Management Library provides device specific and buffer management for the Intel(R) @@ -11,5 +12,6 @@ config BR2_PACKAGE_INTEL_GMMLIB https://github.com/intel/gmmlib -comment "intel-gmmlib needs a toolchain w/ dynamic library, C++" - depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP +comment "intel-gmmlib needs a toolchain w/ dynamic library, C++, threads" + depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/intel-mediadriver/Config.in b/package/intel-mediadriver/Config.in index ad56590008..537e4abd2f 100644 --- a/package/intel-mediadriver/Config.in +++ b/package/intel-mediadriver/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_INTEL_MEDIADRIVER depends on !BR2_STATIC_LIBS # mesa3d, libva depends on BR2_INSTALL_LIBSTDCPP # intel-gmmlib, mesa3d depends on BR2_TOOLCHAIN_HAS_SYNC_1 # mesa3d - depends on BR2_TOOLCHAIN_HAS_THREADS # libva + depends on BR2_TOOLCHAIN_HAS_THREADS # intel-gmmlib, libva depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # mesa3d select BR2_PACKAGE_INTEL_GMMLIB select BR2_PACKAGE_LIBPCIACCESS From 723ecc92979183a08a28176c6bf65c5555a88263 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 24 Feb 2023 17:57:53 +0100 Subject: [PATCH 1066/5754] package/ntpsec: fix CPE ID version CPE ID is wrong since the addition of the package in commit 27b8d0ba8c4004819e092fb81c0f64f284b3aa4a, the correct CPE ID is cpe:2.3:a:ntpsec:ntpsec:1.2.2:*:*:*:*:*:*:*, not cpe:2.3:a:ntpsec:ntpsec:1.2:2:*:*:*:*:*:* Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/ntpsec/ntpsec.mk | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/package/ntpsec/ntpsec.mk b/package/ntpsec/ntpsec.mk index c7fa2f85a8..e612e982ec 100644 --- a/package/ntpsec/ntpsec.mk +++ b/package/ntpsec/ntpsec.mk @@ -4,12 +4,9 @@ # ################################################################################ -NTPSEC_VERSION_MAJOR = 1 -NTPSEC_VERSION_MINOR = 2 -NTPSEC_VERSION_POINT = 2 -NTPSEC_VERSION = $(NTPSEC_VERSION_MAJOR)_$(NTPSEC_VERSION_MINOR)_$(NTPSEC_VERSION_POINT) -NTPSEC_SOURCE = ntpsec-NTPsec_$(NTPSEC_VERSION).tar.bz2 -NTPSEC_SITE = https://gitlab.com/NTPsec/ntpsec/-/archive/NTPsec_$(NTPSEC_VERSION) +NTPSEC_VERSION = 1.2.2 +NTPSEC_SOURCE = ntpsec-NTPsec_$(subst .,_,$(NTPSEC_VERSION)).tar.bz2 +NTPSEC_SITE = https://gitlab.com/NTPsec/ntpsec/-/archive/NTPsec_$(subst .,_,$(NTPSEC_VERSION)) NTPSEC_LICENSE = BSD-2-Clause, NTP, BSD-3-Clause, MIT, CC-BY-4.0 (docs) NTPSEC_LICENSE_FILES = \ LICENSES/BSD-2 \ @@ -20,8 +17,6 @@ NTPSEC_LICENSE_FILES = \ docs/copyright.adoc NTPSEC_CPE_ID_VENDOR = ntpsec -NTPSEC_CPE_ID_VERSION = $(NTPSEC_VERSION_MAJOR).$(NTPSEC_VERSION_MINOR) -NTPSEC_CPE_ID_UPDATE = $(NTPSEC_VERSION_POINT) NTPSEC_DEPENDENCIES = \ host-bison \ From 02b6af266340638d154257bf2634ccc13d47ec69 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 25 Feb 2023 10:22:27 +0100 Subject: [PATCH 1067/5754] utils/genrandconfig: add ti-k3-r5-loader handling Fix the following build failure raised since the addition of the package in commit 0189bcb47c7733c36fcbcb88fbf26f57958db576: make[2]: *** No rule to make target '_defconfig'. Stop. Fixes: - http://autobuild.buildroot.org/results/d7449b2b2f2349af672bfeee832b89a223a7d9cc Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- utils/genrandconfig | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/utils/genrandconfig b/utils/genrandconfig index b3576f8a51..ea8548d42c 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -519,6 +519,11 @@ def fixup_config(sysinfo, configfile): configlines.remove('BR2_TARGET_S500_BOOTLOADER=y\n') configlines.remove('BR2_TARGET_S500_BOOTLOADER_BOARD=""\n') + if 'BR2_TARGET_TI_K3_R5_LOADER=y\n' in configlines and \ + 'BR2_TARGET_TI_K3_R5_LOADER_USE_DEFCONFIG=y\n' in configlines and \ + 'BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG=""\n' in configlines: + return False + if 'BR2_TARGET_UBOOT=y\n' in configlines and \ 'BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y\n' in configlines and \ 'BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y\n' in configlines and \ From 5215f56e5bed387575b35de65b78d815b96ba6f3 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 25 Feb 2023 10:35:27 +0100 Subject: [PATCH 1068/5754] package/postgresql: add host-pkgconf dependency host-pkgconf is mandatory to find lz4 and zstd resulting in the following build failure since commit 9cd2e6e090449f9d2f371d24152580c038892f3d: configure: error: in `/home/autobuild/autobuild/instance-5/output-1/build/postgresql-15.2': configure: error: The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. Alternatively, you may set the environment variables LZ4_CFLAGS and LZ4_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. Fixes: - http://autobuild.buildroot.org/results/8744277ebe9910635ef8fe290c8ba4eee420b538 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/postgresql/postgresql.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index 5e3601cb46..a2aed9a2eb 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -92,14 +92,14 @@ POSTGRESQL_CONF_OPTS += --without-libxml endif ifeq ($(BR2_PACKAGE_ZSTD),y) -POSTGRESQL_DEPENDENCIES += zstd +POSTGRESQL_DEPENDENCIES += host-pkgconf zstd POSTGRESQL_CONF_OPTS += --with-zstd else POSTGRESQL_CONF_OPTS += --without-zstd endif ifeq ($(BR2_PACKAGE_LZ4),y) -POSTGRESQL_DEPENDENCIES += lz4 +POSTGRESQL_DEPENDENCIES += host-pkgconf lz4 POSTGRESQL_CONF_OPTS += --with-lz4 else POSTGRESQL_CONF_OPTS += --without-lz4 From 7243e9394c53c7e0e6e10c3d149a2afa999635ab Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 24 Feb 2023 10:25:35 +0100 Subject: [PATCH 1069/5754] package/xtables-addons: replace XTABLES_ADDONS_DISABLE_GEOIP_HELPERS Replace XTABLES_ADDONS_DISABLE_GEOIP_HELPERS by XTABLES_ADDONS_REMOVE_GEOIP_HELPERS to avoid the following build failure raised since bump to version 3.22 in commit 53f2999edfa5e67923d4d8a102c15fa3200e089c: make[3]: *** No rule to make target '/xt_geoip_query', needed by 'all-am'. Stop. Fixes: - http://autobuild.buildroot.org/results/f2d596b510f027b94a6b1fad10c363922c50cbec Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/xtables-addons/xtables-addons.mk | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/package/xtables-addons/xtables-addons.mk b/package/xtables-addons/xtables-addons.mk index 77dcfd741c..e794538956 100644 --- a/package/xtables-addons/xtables-addons.mk +++ b/package/xtables-addons/xtables-addons.mk @@ -16,12 +16,6 @@ XTABLES_ADDONS_CONF_OPTS = \ --with-xtables="$(STAGING_DIR)/usr" \ --with-xtlibdir="/usr/lib/xtables" -# geoip helpers need perl with modules and unzip so disable -define XTABLES_ADDONS_DISABLE_GEOIP_HELPERS - $(SED) 's/ geoip//' $(@D)/Makefile.in -endef -XTABLES_ADDONS_POST_PATCH_HOOKS += XTABLES_ADDONS_DISABLE_GEOIP_HELPERS - define XTABLES_ADDONS_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LINUX_MAKE_FLAGS) endef @@ -30,6 +24,15 @@ define XTABLES_ADDONS_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LINUX_MAKE_FLAGS) DESTDIR="$(TARGET_DIR)" install endef +# geoip helpers need perl with modules and unzip so remove them +define XTABLES_ADDONS_REMOVE_GEOIP_HELPERS + $(RM) $(TARGET_DIR)/usr/bin/xt_geoip* + $(RM) $(TARGET_DIR)/usr/libexec/xtables-addons/xt_asn* + $(RM) $(TARGET_DIR)/usr/libexec/xtables-addons/xt_geoip* +endef + +XTABLES_ADDONS_POST_INSTALL_TARGET_HOOKS += XTABLES_ADDONS_REMOVE_GEOIP_HELPERS + define XTABLES_ADDONS_LINUX_CONFIG_FIXUPS $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_ADVANCED) $(call KCONFIG_ENABLE_OPT,CONFIG_NF_CONNTRACK) From c8985cf50cca852cc5cc840a605e01713e758d40 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 24 Feb 2023 10:50:45 +0100 Subject: [PATCH 1070/5754] package/asterisk: fix build with libressl Fix the following build failure with libressl by using SSL_is_server which is available since version 2.7.0 and https://github.com/libressl-portable/openbsd/commit/d7ec516916c5eaac29b02d7a8ac6570f63b458f7: iostream.c: In function 'ast_iostream_close': iostream.c:559:41: error: invalid use of incomplete typedef 'SSL' {aka 'struct ssl_st'} 559 | if (!stream->ssl->server) { | ^~ Fixes: - http://autobuild.buildroot.org/results/ce4d62d00bb77ba5b303cacf6be7e350581a62f9 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...n-iostream.c-fix-build-with-libressl.patch | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 package/asterisk/0006-main-iostream.c-fix-build-with-libressl.patch diff --git a/package/asterisk/0006-main-iostream.c-fix-build-with-libressl.patch b/package/asterisk/0006-main-iostream.c-fix-build-with-libressl.patch new file mode 100644 index 0000000000..cdd3aa8cfb --- /dev/null +++ b/package/asterisk/0006-main-iostream.c-fix-build-with-libressl.patch @@ -0,0 +1,38 @@ +From 9569fa20fec49f530170a3042afb99556cf66a2e Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 17 Apr 2022 10:52:42 +0200 +Subject: [PATCH] main/iostream.c: fix build with libressl + +Fix the following build failure with libressl by using SSL_is_server +which is available since version 2.7.0 and +https://github.com/libressl-portable/openbsd/commit/d7ec516916c5eaac29b02d7a8ac6570f63b458f7: + +iostream.c: In function 'ast_iostream_close': +iostream.c:559:41: error: invalid use of incomplete typedef 'SSL' {aka 'struct ssl_st'} + 559 | if (!stream->ssl->server) { + | ^~ + +Fixes: + - http://autobuild.buildroot.org/results/ce4d62d00bb77ba5b303cacf6be7e350581a62f9 + +Signed-off-by: Fabrice Fontaine +--- + main/iostream.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/main/iostream.c b/main/iostream.c +index d060b6d6d4..b8ab80ec91 100644 +--- a/main/iostream.c ++++ b/main/iostream.c +@@ -553,7 +553,7 @@ int ast_iostream_close(struct ast_iostream *stream) + ERR_error_string(sslerr, err), ssl_error_to_string(sslerr, res)); + } + +-#if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10100000L) ++#if !(defined(LIBRESSL_VERSION_NUMBER) && (LIBRESSL_VERSION_NUMBER < 0x2070000L)) && (OPENSSL_VERSION_NUMBER >= 0x10100000L) + if (!SSL_is_server(stream->ssl)) { + #else + if (!stream->ssl->server) { +-- +2.35.1 + From a6b4217312815379a7c52bf5d53752dbe0838645 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 24 Feb 2023 11:10:39 +0100 Subject: [PATCH 1071/5754] package/libblockdev: needs locale locale_t is unconditionally used since version 1.5 and https://github.com/storaged-project/libblockdev/commit/4ed6f0b3a46fc77554dab661c22150829aa75966 resulting in the following build failure since the addition of the package in commit 0c52826291d1884db0f8f35130216065fbc7b574: module.c:33:37: error: unknown type name 'locale_t' 33 | static char *strerror_l(int errnum, locale_t locale UNUSED) | ^~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/ede9eb1f13d56c77005cc448416fb2efa9d16ff0 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libblockdev/Config.in | 6 ++++-- package/udisks/Config.in | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/libblockdev/Config.in b/package/libblockdev/Config.in index 4389fd794c..4f98621bd8 100644 --- a/package/libblockdev/Config.in +++ b/package/libblockdev/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_LIBBLOCKDEV depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_USE_MMU # libglib2 depends on BR2_PACKAGE_HAS_UDEV + depends on BR2_ENABLE_LOCALE select BR2_PACKAGE_KMOD select BR2_PACKAGE_LIBGLIB2 help @@ -66,7 +67,8 @@ config BR2_PACKAGE_LIBBLOCKDEV_SWAP endif -comment "libblockdev needs udev /dev management and a toolchain w/ wchar, threads, dynamic library" +comment "libblockdev needs udev /dev management and a toolchain w/ wchar, threads, dynamic library, locale" depends on BR2_USE_MMU depends on !BR2_PACKAGE_HAS_UDEV || BR2_STATIC_LIBS || \ - !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS + !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_ENABLE_LOCALE diff --git a/package/udisks/Config.in b/package/udisks/Config.in index 253d5cdc6b..b1d02a31b2 100644 --- a/package/udisks/Config.in +++ b/package/udisks/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_UDISKS bool "udisks" - depends on BR2_ENABLE_LOCALE # parted + depends on BR2_ENABLE_LOCALE # libblockdev, parted depends on BR2_PACKAGE_HAS_UDEV depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # polkit -> C++17 depends on BR2_TOOLCHAIN_HAS_THREADS # polkit From 4a99d6611f0de6b1844cdbdc81d0ff25949c2b16 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 24 Feb 2023 11:51:48 +0100 Subject: [PATCH 1072/5754] package/ntpsec: fix build without stack-protector Fix the following build failure without stack-protector raised since the addition of the package in commit 27b8d0ba8c4004819e092fb81c0f64f284b3aa4a: Checking for library ssp : not found Checking for library ssp_nonshared : not found Checking if C compiler supports -fstack-protector-all : yes [...] The configuration failed (complete log in /home/autobuild/autobuild/instance-2/output-1/build/ntpsec-1_2_2/build/config.log) Fixes: - http://autobuild.buildroot.org/results/f38abc6b7f8464836231192cfe078a5b27319a8a - http://autobuild.buildroot.org/results/62be818e2f2eac07b4a2de6f4a8898cc4cc05b1f Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...pt-fix-build-without-stack-protector.patch | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 package/ntpsec/0002-wscript-fix-build-without-stack-protector.patch diff --git a/package/ntpsec/0002-wscript-fix-build-without-stack-protector.patch b/package/ntpsec/0002-wscript-fix-build-without-stack-protector.patch new file mode 100644 index 0000000000..f494bf479c --- /dev/null +++ b/package/ntpsec/0002-wscript-fix-build-without-stack-protector.patch @@ -0,0 +1,50 @@ +From 0a3ce09c14eb9c7e36aa30a4dafe40e56676d678 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 24 Feb 2023 11:33:32 +0100 +Subject: [PATCH] wscript: fix build without stack-protector + +-fstack-protector-all can depends on ssp library availability (e.g. on musl) so +move the test from cc_test_flags to ld_hardening_flags, this will avoid the +following build failure: + +Checking for library ssp : not found +Checking for library ssp_nonshared : not found +Checking if C compiler supports -fstack-protector-all : yes + +[...] + +The configuration failed +(complete log in /home/autobuild/autobuild/instance-2/output-1/build/ntpsec-1_2_2/build/config.log) + +Fixes: + - http://autobuild.buildroot.org/results/f38abc6b7f8464836231192cfe078a5b27319a8a + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/ntpsec/ntpsec/pull/6] +--- + wscript | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/wscript b/wscript +index be396b33b..f301809fc 100644 +--- a/wscript ++++ b/wscript +@@ -298,7 +298,6 @@ def configure(ctx): + ctx.env.LDFLAGS += ["-lssp_nonshared"] + + cc_test_flags = [ +- ('f_stack_protector_all', '-fstack-protector-all'), + ('PIC', '-fPIC'), + ('PIE', '-pie -fPIE'), + # this quiets most of macOS warnings on -fpie +@@ -332,6 +331,7 @@ def configure(ctx): + + # Check which linker flags are supported + ld_hardening_flags = [ ++ ('f_stack_protector_all', '-fstack-protector-all'), + ("z_now", "-Wl,-z,now"), # no deferred symbol resolution + ] + +-- +2.39.1 + From 333580b68037ef756fa637bbfc49f34f1ad5e0ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?= Date: Fri, 24 Feb 2023 11:53:15 +0100 Subject: [PATCH 1073/5754] package/freescale-imx/imx-gpu-g2d: drop BR2_PACKAGE_IMX_GPU_G2D_EXAMPLES MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Arm and aarch64 packages don't contain examples anymore so drop the config option to install them to prevent build failure when selected: >>> imx-gpu-g2d 6.4.3.p4.4-arm Installing to target mkdir -p /home/sszy/br-test-pkg/bootlin-armv7-glibc/target/usr/share/examples/ cp -a /home/sszy/br-test-pkg/bootlin-armv7-glibc/build/imx-gpu-g2d-6.4.3.p4.4-arm/gpu-demos/opt/* /home/sszy/br-test-pkg/bootlin-armv7-glibc/target/usr/share/examples/ cp: cannot stat '/home/sszy/br-test-pkg/bootlin-armv7-glibc/build/imx-gpu-g2d-6.4.3.p4.4-arm/gpu-demos/opt/*': No such file or directory make: *** [package/pkg-generic.mk:384: /home/sszy/br-test-pkg/bootlin-armv7-glibc/build/imx-gpu-g2d-6.4.3.p4.4-arm/.stamp_target_installed] Error 1 Fixes: b84557b588b3 ("package/freescale-imx/imx-gpu-g2d: bump version to 6.4.3.p4.4") Signed-off-by: Sébastien Szymanski Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 6 ++++++ package/freescale-imx/imx-gpu-g2d/Config.in | 9 --------- package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk | 8 -------- 3 files changed, 6 insertions(+), 17 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 7f69462f2e..af1d8cc1dc 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_IMX_GPU_G2D_EXAMPLES + bool "imx-gpu-g2d examples removed" + select BR2_LEGACY + help + The examples are not provided by NXP anymore. + config BR2_KERNEL_HEADERS_6_0 bool "kernel headers version 6.0.x are no longer supported" select BR2_LEGACY diff --git a/package/freescale-imx/imx-gpu-g2d/Config.in b/package/freescale-imx/imx-gpu-g2d/Config.in index aeca087f86..c143b17c47 100644 --- a/package/freescale-imx/imx-gpu-g2d/Config.in +++ b/package/freescale-imx/imx-gpu-g2d/Config.in @@ -18,12 +18,3 @@ config BR2_PACKAGE_IMX_GPU_G2D This library is provided by NXP as-is and doesn't have an upstream. - -if BR2_PACKAGE_IMX_GPU_G2D - -config BR2_PACKAGE_IMX_GPU_G2D_EXAMPLES - bool "install examples" - help - Copy the Vivante G2D examples to the target. - -endif diff --git a/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk b/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk index d94da24d8f..42a1fe70cf 100644 --- a/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk +++ b/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk @@ -26,15 +26,7 @@ define IMX_GPU_G2D_INSTALL_STAGING_CMDS cp -a $(@D)/g2d/usr/* $(STAGING_DIR)/usr endef -ifeq ($(BR2_PACKAGE_IMX_GPU_G2D_EXAMPLES),y) -define IMX_GPU_G2D_INSTALL_EXAMPLES - mkdir -p $(TARGET_DIR)/usr/share/examples/ - cp -a $(@D)/gpu-demos/opt/* $(TARGET_DIR)/usr/share/examples/ -endef -endif - define IMX_GPU_G2D_INSTALL_TARGET_CMDS - $(IMX_GPU_G2D_INSTALL_EXAMPLES) cp -a $(@D)/g2d/usr/lib $(TARGET_DIR)/usr endef From b83a9675cb81d4281594e5a59e7a8805e8561bd8 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 23 Feb 2023 23:59:42 +0100 Subject: [PATCH 1074/5754] support/dependencies/dependencies.sh: require MD5 perl package for netsurf Fix the following build failure: Can't locate object method "hexhash" via package "MD5" at utils/git-testament.pl line 47 Fixes: - http://autobuild.buildroot.org/results/3dddcbbe7f6ecae5a2db6fac11fb659719452f73 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- support/dependencies/dependencies.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index a692856d31..563dbe1595 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -290,6 +290,10 @@ if grep -q ^BR2_PACKAGE_MPV=y $BR2_CONFIG ; then required_perl_modules="$required_perl_modules Math::BigRat" fi +if grep -q ^BR2_PACKAGE_NETSURF=y $BR2_CONFIG ; then + required_perl_modules="$required_perl_modules Digest::MD5" +fi + if grep -q ^BR2_PACKAGE_WHOIS=y $BR2_CONFIG ; then required_perl_modules="$required_perl_modules autodie" fi From 34625d54c9ba4f9e19fdc350fcf0a48a05c98576 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 23 Feb 2023 13:36:44 +0100 Subject: [PATCH 1075/5754] package/lttng-babeltrace: fix popt static build with libiconv Fix the following popt static build failure with libiconv: configure:18149: checking for poptGetContext in -lpopt configure:18172: /home/buildroot/autobuild/instance-2/output-1/host/bin/m68k-buildroot-linux-uclibc-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -static -I/home/buildroot/autobuild/instance-2/output-1/host/bin/../m68k-buildroot-linux-uclibc/sysroot/usr/include/uuid -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -static conftest.c -lpopt -L/home/buildroot/autobuild/instance-2/output-1/host/bin/../m68k-buildroot-linux-uclibc/sysroot/usr/lib -luuid >&5 /home/buildroot/autobuild/instance-2/output-1/host/lib/gcc/m68k-buildroot-linux-uclibc/10.4.0/../../../../m68k-buildroot-linux-uclibc/bin/ld: /home/buildroot/autobuild/instance-2/output-1/host/bin/../m68k-buildroot-linux-uclibc/sysroot/usr/lib/libpopt.a(poptint.o): in function `POPT_fprintf': poptint.c:(.text+0x28a): undefined reference to `libiconv_open' [...] checking for poptGetContext in -lpopt... no configure: error: Cannot find popt. Fixes: - http://autobuild.buildroot.org/results/4f465fe15664b1f9df3f26c331dc550852972f2f Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...2-configure.ac-fix-popt-static-build.patch | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 package/lttng-babeltrace/0002-configure.ac-fix-popt-static-build.patch diff --git a/package/lttng-babeltrace/0002-configure.ac-fix-popt-static-build.patch b/package/lttng-babeltrace/0002-configure.ac-fix-popt-static-build.patch new file mode 100644 index 0000000000..896c67470f --- /dev/null +++ b/package/lttng-babeltrace/0002-configure.ac-fix-popt-static-build.patch @@ -0,0 +1,48 @@ +From 35076fd4592ca23136ff5eacdf8eaebc926e0224 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 23 Feb 2023 13:04:08 +0100 +Subject: [PATCH] configure.ac: fix popt static build + +Fix the following popt static build failure: + +configure:18149: checking for poptGetContext in -lpopt +configure:18172: /home/buildroot/autobuild/instance-2/output-1/host/bin/m68k-buildroot-linux-uclibc-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -static -I/home/buildroot/autobuild/instance-2/output-1/host/bin/../m68k-buildroot-linux-uclibc/sysroot/usr/include/uuid -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -static conftest.c -lpopt -L/home/buildroot/autobuild/instance-2/output-1/host/bin/../m68k-buildroot-linux-uclibc/sysroot/usr/lib -luuid >&5 +/home/buildroot/autobuild/instance-2/output-1/host/lib/gcc/m68k-buildroot-linux-uclibc/10.4.0/../../../../m68k-buildroot-linux-uclibc/bin/ld: /home/buildroot/autobuild/instance-2/output-1/host/bin/../m68k-buildroot-linux-uclibc/sysroot/usr/lib/libpopt.a(poptint.o): in function `POPT_fprintf': +poptint.c:(.text+0x28a): undefined reference to `libiconv_open' + +[...] + +checking for poptGetContext in -lpopt... no +configure: error: Cannot find popt. + +Fixes: + - http://autobuild.buildroot.org/results/4f465fe15664b1f9df3f26c331dc550852972f2f + +Signed-off-by: Fabrice Fontaine +[Upstream status: not upstreamable as popt has been removed with +https://github.com/efficios/babeltrace/commit/916d0d910ad5407bc7826505aa05b277f5739a34] +--- + configure.ac | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index a17c23c3..8f700d3e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -223,8 +223,11 @@ AC_CHECK_LIB([c], [faccessat], + ] + ) + +-AC_CHECK_LIB([popt], [poptGetContext], [], +- [AC_MSG_ERROR([Cannot find popt.])] ++PKG_CHECK_MODULES([POPT], [popt], [LIBS="${POPT_LIBS} ${LIBS}"], ++[ ++ AC_CHECK_LIB([popt], [poptGetContext], [], ++ [AC_MSG_ERROR([Cannot find popt.])]) ++] + ) + + # For Python +-- +2.39.1 + From 21a3097e7e227e8a26075f4f036324706e20d54f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 25 Feb 2023 11:57:15 +0100 Subject: [PATCH 1076/5754] package/zabbix: fix second patch Fix patch added by commit 7edb4a6a4db7d864c6c1560f3fdc1ef4fbd7f0fd: 0x300000fL -> 0x3050000fL Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/zabbix/0002-fix-build-with-libressl-3.5.0.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/zabbix/0002-fix-build-with-libressl-3.5.0.patch b/package/zabbix/0002-fix-build-with-libressl-3.5.0.patch index 7e32ad5745..acb5cfc9a6 100644 --- a/package/zabbix/0002-fix-build-with-libressl-3.5.0.patch +++ b/package/zabbix/0002-fix-build-with-libressl-3.5.0.patch @@ -61,7 +61,7 @@ index 54ab0a6ef4..bd4075b3e4 100644 -#if defined(HAVE_OPENSSL) && OPENSSL_VERSION_NUMBER < 0x1010000fL || defined(LIBRESSL_VERSION_NUMBER) -/* for OpenSSL 1.0.1/1.0.2 (before 1.1.0) or LibreSSL */ +#if defined(HAVE_OPENSSL) && OPENSSL_VERSION_NUMBER < 0x1010000fL || \ -+ defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x300000fL ++ defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x3050000fL +/* for OpenSSL 1.0.1/1.0.2 (before 1.1.0) or LibreSSL (before 3.5.0) */ /* mutexes for multi-threaded OpenSSL (see "man 3ssl threads" and example in crypto/threads/mttest.c) */ From 11ba2c5b8d23e086d589e025b7a31cdd7bae14a5 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 25 Feb 2023 12:12:52 +0100 Subject: [PATCH 1077/5754] package/libsigrokdecode: fix build with python > 3.10 Fix the following build failure with sigrok-cli and python > 3.10: /home/autobuild/autobuild/instance-3/output-1/host/lib/gcc/mips64-buildroot-linux-gnu/11.3.0/../../../../mips64-buildroot-linux-gnu/bin/ld: /home/autobuild/autobuild/instance-3/output-1/host/bin/../mips64-buildroot-linux-gnu/sysroot/usr/lib/libsigrokdecode.so: undefined reference to `PyTuple_SetItem' Fixes: - http://autobuild.buildroot.org/results/435ad19597a1e216a7974bc9ccaf17064d1eccea Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...c-Use-python3-embed-pc-as-a-fallback.patch | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 package/libsigrokdecode/0003-configure-ac-Use-python3-embed-pc-as-a-fallback.patch diff --git a/package/libsigrokdecode/0003-configure-ac-Use-python3-embed-pc-as-a-fallback.patch b/package/libsigrokdecode/0003-configure-ac-Use-python3-embed-pc-as-a-fallback.patch new file mode 100644 index 0000000000..8e9c6f0063 --- /dev/null +++ b/package/libsigrokdecode/0003-configure-ac-Use-python3-embed-pc-as-a-fallback.patch @@ -0,0 +1,30 @@ +From a6a5e2c8b0e9ecf5d69d0c237c8e8b717b82b36f Mon Sep 17 00:00:00 2001 +From: Evangelos Foutras +Date: Thu, 3 Dec 2020 19:17:00 +0200 +Subject: [PATCH] configure.ac: Use python3-embed.pc as a fallback + +This provides some future-proofing against newer Python versions. + +[Retrieved from: +https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=commit;h=a6a5e2c8b0e9ecf5d69d0c237c8e8b717b82b36f] +Signed-off-by: Fabrice Fontaine +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index b8841f8..c1314bb 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -100,7 +100,7 @@ SR_PKG_CHECK_SUMMARY([srd_pkglibs_summary]) + # first, since usually only that variant will add "-lpython3.8". + # https://docs.python.org/3/whatsnew/3.8.html#debug-build-uses-the-same-abi-as-release-build + SR_PKG_CHECK([python3], [SRD_PKGLIBS], +- [python-3.10-embed], [python-3.9-embed], [python-3.8-embed], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2], [python3 >= 3.2]) ++ [python-3.10-embed], [python-3.9-embed], [python-3.8-embed], [python3-embed], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2], [python3 >= 3.2]) + AS_IF([test "x$sr_have_python3" = xno], + [AC_MSG_ERROR([Cannot find Python 3 development headers.])]) + +-- +2.30.2 + From 7e608885a2df51ba77378f210f4c0e8cb59d5b8b Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 25 Feb 2023 13:30:22 +0100 Subject: [PATCH 1078/5754] package/rtty: bump to version 8.1.0 This bump will fix the following build failure with wolfssl raised, at least, since bump of wolfssl to version 5.5.0 in commit 1891419db38e4d85595b2111db448f68eef684b8: /tmp/instance-18/output-1/build/rtty-7.4.0/src/ssl.c:75:5: error: unknown type name 'SSL_CTX' 75 | SSL_CTX *ctx; | ^~~~~~~ https://github.com/zhaojh329/rtty/compare/v7.4.0...v8.1.0 Fixes: - http://autobuild.buildroot.org/results/d045d85890ca97accfcea6c13c94757485d867c2 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/rtty/rtty.hash | 2 +- package/rtty/rtty.mk | 28 ++++++++++++++-------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/package/rtty/rtty.hash b/package/rtty/rtty.hash index b2e9db2436..a6ccb5c2e6 100644 --- a/package/rtty/rtty.hash +++ b/package/rtty/rtty.hash @@ -1,2 +1,2 @@ -sha256 9bc5d30dfa9bd664a62711b6229f47505b83adb364907f24e3a404aad52a4802 rtty-7.4.0.tar.gz +sha256 e634939bae62bf3d52ceebae5df00179629d214634b93464eeb2294406512b30 rtty-8.1.0.tar.gz sha256 99efed4bbc0b62f96f999ef23399e38234fb91651af734fd389a52b033a85b55 LICENSE diff --git a/package/rtty/rtty.mk b/package/rtty/rtty.mk index 4ec220394c..964ec04ec4 100644 --- a/package/rtty/rtty.mk +++ b/package/rtty/rtty.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTTY_VERSION = 7.4.0 +RTTY_VERSION = 8.1.0 RTTY_SITE = https://github.com/zhaojh329/rtty/releases/download/v$(RTTY_VERSION) RTTY_LICENSE = MIT RTTY_LICENSE_FILES = LICENSE @@ -13,26 +13,26 @@ RTTY_DEPENDENCIES = libev ifeq ($(BR2_PACKAGE_MBEDTLS),y) RTTY_DEPENDENCIES += mbedtls RTTY_CONF_OPTS += \ - -DRTTY_SSL_SUPPORT=ON \ - -DRTTY_USE_MBEDTLS=ON \ - -DRTTY_USE_OPENSSL=OFF \ - -DRTTY_USE_WOLFSSL=OFF + -DSSL_SUPPORT=ON \ + -DUSE_MBEDTLS=ON \ + -DUSE_OPENSSL=OFF \ + -DUSE_WOLFSSL=OFF else ifeq ($(BR2_PACKAGE_OPENSSL),y) RTTY_DEPENDENCIES += host-pkgconf openssl RTTY_CONF_OPTS += \ - -DRTTY_SSL_SUPPORT=ON \ - -DRTTY_USE_MBEDTLS=OFF \ - -DRTTY_USE_OPENSSL=ON \ - -DRTTY_USE_WOLFSSL=OFF + -DSSL_SUPPORT=ON \ + -DUSE_MBEDTLS=OFF \ + -DUSE_OPENSSL=ON \ + -DUSE_WOLFSSL=OFF else ifeq ($(BR2_PACKAGE_WOLFSSL),y) RTTY_DEPENDENCIES += wolfssl RTTY_CONF_OPTS += \ - -DRTTY_SSL_SUPPORT=ON \ - -DRTTY_USE_MBEDTLS=OFF \ - -DRTTY_USE_OPENSSL=OFF \ - -DRTTY_USE_WOLFSSL=ON + -DSSL_SUPPORT=ON \ + -DUSE_MBEDTLS=OFF \ + -DUSE_OPENSSL=OFF \ + -DUSE_WOLFSSL=ON else -RTTY_CONF_OPTS += -DRTTY_SSL_SUPPORT=OFF +RTTY_CONF_OPTS += -DSSL_SUPPORT=OFF endif $(eval $(cmake-package)) From 6ec2a9d4383b3370da39d70805b7c7854cefeded Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 25 Feb 2023 15:14:12 +0100 Subject: [PATCH 1079/5754] package/lirc-tools: fix python build Fix the following build failure raised since bump to version 0.10.2 in commit 58cc3977e83487bdaa1df232cf7adf6383d49cd7: In file included from /home/thomas/autobuild/instance-3/output-1/per-package/lirc-tools/host/bin/../sparc-buildroot-linux-uclibc/sysroot/usr/include/python3.11/Python.h:38, from lirc/_client.c:1: /home/thomas/autobuild/instance-3/output-1/per-package/lirc-tools/host/bin/../sparc-buildroot-linux-uclibc/sysroot/usr/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/85359d3f678b49e46821a1c10da5f14edfb5e6d0 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/lirc-tools/lirc-tools.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/lirc-tools/lirc-tools.mk b/package/lirc-tools/lirc-tools.mk index 5263330741..a3ad6bd5a0 100644 --- a/package/lirc-tools/lirc-tools.mk +++ b/package/lirc-tools/lirc-tools.mk @@ -48,7 +48,9 @@ endif ifeq ($(BR2_PACKAGE_PYTHON3),y) LIRC_TOOLS_DEPENDENCIES += python3 host-python-setuptools -LIRC_TOOLS_MAKE_ENV += SETUPTOOLS_ENV='$(PKG_PYTHON_SETUPTOOLS_ENV)' +LIRC_TOOLS_MAKE_ENV += \ + CC="$(TARGET_CC)" \ + SETUPTOOLS_ENV='$(PKG_PYTHON_SETUPTOOLS_ENV)' endif define LIRC_TOOLS_INSTALL_INIT_SYSV From cc5a6c4af7e7809fccdb72b7140b33dacbbd1a94 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 25 Feb 2023 15:49:04 +0100 Subject: [PATCH 1080/5754] package/python-numpy: needs C++ C++ is mandatory since at least version 1.23.0 and https://github.com/numpy/numpy/commit/c91a7d0c5691c9d78bd75284777fda73f225155d resulting in the following build failure since bump to version 1.23.4 in commit 32d8e23b977a5bba1f23e3821709c6aa9ff3bc55: RuntimeError: Broken toolchain: cannot link a simple C++ program. note: A compiler with support for C++11 language features is required. Fixes: - http://autobuild.buildroot.org/results/2d048d9b669ad60f37eeb2162b0a4f9fb425be1e Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/piglit/Config.in | 6 ++++-- package/python-numpy/Config.in | 6 ++++-- package/python-zlmdb/Config.in | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/package/piglit/Config.in b/package/piglit/Config.in index 736fd95d71..5e957a555a 100644 --- a/package/piglit/Config.in +++ b/package/piglit/Config.in @@ -6,6 +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_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy select BR2_PACKAGE_LIBDRM if BR2_PACKAGE_HAS_LIBGL select BR2_PACKAGE_LIBPNG @@ -31,5 +32,6 @@ config BR2_PACKAGE_PIGLIT https://piglit.freedesktop.org -comment "piglit needs glibc or musl" - depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) +comment "piglit needs a glibc or musl toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP || \ + !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) diff --git a/package/python-numpy/Config.in b/package/python-numpy/Config.in index a65164d9d5..132c3f7a82 100644 --- a/package/python-numpy/Config.in +++ b/package/python-numpy/Config.in @@ -16,6 +16,7 @@ config BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS config BR2_PACKAGE_PYTHON_NUMPY bool "python-numpy" depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS + 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 help @@ -27,6 +28,7 @@ config BR2_PACKAGE_PYTHON_NUMPY http://www.numpy.org/ -comment "python-numpy needs glibc or musl" +comment "python-numpy needs a glibc or musl toolchain w/ C++" depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS - depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) + depends on !BR2_INSTALL_LIBSTDCPP || \ + !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) diff --git a/package/python-zlmdb/Config.in b/package/python-zlmdb/Config.in index ac4ee05442..8eba2d7946 100644 --- a/package/python-zlmdb/Config.in +++ b/package/python-zlmdb/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_ZLMDB bool "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 select BR2_PACKAGE_PYTHON_CBOR2 # runtime select BR2_PACKAGE_PYTHON_CFFI # runtime @@ -17,6 +18,7 @@ config BR2_PACKAGE_PYTHON_ZLMDB https://github.com/crossbario/zlmdb -comment "python-zlmdb needs glibc or musl" +comment "python-zlmdb needs a glibc or musl toolchain w/ C++" depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS - depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) + depends on !BR2_INSTALL_LIBSTDCPP || \ + !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) From 5e1a50e4e67b6a650f9d13729ee955e8332de951 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 25 Feb 2023 17:01:23 +0100 Subject: [PATCH 1081/5754] utils/genrandconfig: add lpc32xxcdl handling Fix the following build failure raised since the addition of the package in commit 20695936ad63f602662bc4c6124a26312c46ff52: make[2]: *** /tmp/instance-0/output-1/build/lpc32xxcdl-2.11/csps/lpc32xx/bsps//source: No such file or directory. Stop. Fixes: - http://autobuild.buildroot.org/results/72c9a4080318b1b247ca3517c95c689dff1068d2 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- utils/genrandconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/utils/genrandconfig b/utils/genrandconfig index ea8548d42c..6ec398851a 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -492,6 +492,10 @@ def fixup_config(sysinfo, configfile): configlines.remove('BR2_TARGET_BAREBOX_USE_DEFCONFIG=y\n') configlines.remove('BR2_TARGET_BAREBOX_BOARD_DEFCONFIG=""\n') + if 'BR2_TARGET_LPC32XXCDL=y\n' in configlines and \ + 'BR2_TARGET_LPC32XXCDL_BOARDNAME=""\n' in configlines: + return False + if 'BR2_TARGET_OPTEE_OS=y\n' in configlines and \ 'BR2_TARGET_OPTEE_OS_CUSTOM_TARBALL=y\n' in configlines and \ 'BR2_TARGET_OPTEE_OS_CUSTOM_TARBALL_LOCATION=""\n' in configlines: From 0b9dda434f9b0fa48c817fe29f949fea0abc53ac Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 25 Feb 2023 18:28:06 +0100 Subject: [PATCH 1082/5754] package/pistache: fix libressl build Fix the following libressl build failure which is probably raised since the addition of the package in commit 65d891efc2fb069f9cf707f47302776f7076b80c: ../src/server/listener.cc: In member function 'void Pistache::Tcp::Listener::setupSSLAuth(const std::string&, const std::string&, int (*)(int, void*))': ../src/server/listener.cc:582:29: error: 'SSL_verify_cb' was not declared in this scope; did you mean 'RSA_verify'? 582 | (SSL_verify_cb)cb | ^~~~~~~~~~~~~ | RSA_verify Fixes: - http://autobuild.buildroot.org/results/066fc078980e5216f38411eee455088e15fa1101 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...erver-listener.cc-fix-libressl-build.patch | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 package/pistache/0002-src-server-listener.cc-fix-libressl-build.patch diff --git a/package/pistache/0002-src-server-listener.cc-fix-libressl-build.patch b/package/pistache/0002-src-server-listener.cc-fix-libressl-build.patch new file mode 100644 index 0000000000..f2fe2183ae --- /dev/null +++ b/package/pistache/0002-src-server-listener.cc-fix-libressl-build.patch @@ -0,0 +1,38 @@ +From 656bff21c1d20b25058da9dbc27d28ad2ac7ae6e Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 25 Feb 2023 18:09:39 +0100 +Subject: [PATCH] src/server/listener.cc: fix libressl build + +Fix the following libressl build failure: + +../src/server/listener.cc: In member function 'void Pistache::Tcp::Listener::setupSSLAuth(const std::string&, const std::string&, int (*)(int, void*))': +../src/server/listener.cc:582:29: error: 'SSL_verify_cb' was not declared in this scope; did you mean 'RSA_verify'? + 582 | (SSL_verify_cb)cb + | ^~~~~~~~~~~~~ + | RSA_verify + +Fixes: + - http://autobuild.buildroot.org/results/066fc078980e5216f38411eee455088e15fa1101 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/pistacheio/pistache/pull/1124] +--- + src/server/listener.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/server/listener.cc b/src/server/listener.cc +index 38d2661..c09cb36 100644 +--- a/src/server/listener.cc ++++ b/src/server/listener.cc +@@ -609,7 +609,7 @@ namespace Pistache::Tcp + SSL_CTX_set_verify(GetSSLContext(ssl_ctx_), + SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT | SSL_VERIFY_CLIENT_ONCE, + /* Callback type did change in 1.0.1 */ +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + (int (*)(int, X509_STORE_CTX*))cb + #else + (SSL_verify_cb)cb +-- +2.39.1 + From a34ac4453553a5d86b91e038db3acf0e7eb6931f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 26 Feb 2023 18:23:28 +0100 Subject: [PATCH 1083/5754] package/uccp420wlan: drop package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit uccp420wlan is not maintained anymore (no commit since 2017) and fails to build with any "recent" kernel (e.g. >= 4.7 which includes https://github.com/torvalds/linux/commit/57fbcce37be7c1d2622b56587c10ade00e96afa3 or https://github.com/torvalds/linux/commit/8552a434b6a05cc38006733afe6a239ad4d600a2): /home/thomas/autobuild/instance-1/output-1/build/uccp420wlan-6.9.1/./src/tx.c: In function ‘uccp420wlan_tx_free_buff_req’: /home/thomas/autobuild/instance-1/output-1/build/uccp420wlan-6.9.1/./src/tx.c:1142:49: error: ‘IEEE80211_BAND_2GHZ’ undeclared (first use in this function); did you mean ‘IEEE80211_CHAN_2GHZ’? 1142 | if (ets_band == IEEE80211_BAND_2GHZ) | ^~~~~~~~~~~~~~~~~~~ | IEEE80211_CHAN_2GHZ [...] /home/thomas/autobuild/instance-1/output-1/build/uccp420wlan-6.9.1/./src/core.c:428:29: error: implicit declaration of function ‘ieee80211_csa_is_complete’; did you mean ‘ieee80211_scan_completed’? [-Werror=implicit-function-declaration] 428 | if (ieee80211_csa_is_complete(uvif->vif)) | ^~~~~~~~~~~~~~~~~~~~~~~~~ | ieee80211_scan_completed Fixes: - http://autobuild.buildroot.org/results/7cd7151e390b8f7a0df3e647fe4cd5d6319a830b Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 7 +++++++ package/Config.in | 1 - package/uccp420wlan/Config.in | 16 ---------------- package/uccp420wlan/uccp420wlan.hash | 4 ---- package/uccp420wlan/uccp420wlan.mk | 18 ------------------ 5 files changed, 7 insertions(+), 39 deletions(-) delete mode 100644 package/uccp420wlan/Config.in delete mode 100644 package/uccp420wlan/uccp420wlan.hash delete mode 100644 package/uccp420wlan/uccp420wlan.mk diff --git a/Config.in.legacy b/Config.in.legacy index af1d8cc1dc..381e1e3a8c 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_UCCP420WLAN + bool "uccp420wlan removed" + select BR2_LEGACY + help + The uccp420wlan package is unmaintained and doesn't build + with any "recent" kernel (e.g. >= 4.7). + config BR2_PACKAGE_IMX_GPU_G2D_EXAMPLES bool "imx-gpu-g2d examples removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index 6c5238a9b0..3ace25c665 100644 --- a/package/Config.in +++ b/package/Config.in @@ -621,7 +621,6 @@ endmenu source "package/triggerhappy/Config.in" source "package/uboot-tools/Config.in" source "package/ubus/Config.in" - source "package/uccp420wlan/Config.in" source "package/udev/Config.in" source "package/udev-gentoo-scripts/Config.in" source "package/udisks/Config.in" diff --git a/package/uccp420wlan/Config.in b/package/uccp420wlan/Config.in deleted file mode 100644 index ef6a9db865..0000000000 --- a/package/uccp420wlan/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_UCCP420WLAN - bool "uccp420wlan" - depends on BR2_LINUX_KERNEL - help - SoftMAC (mac80211) based WiFi driver for Imagination's - Explorer RPU uccp420. This supports Dual Band WiFi with - 2.4GHz - 2x2 b/g/n 40MHz, 5GHz - 2x2 a/n/11ac 80MHz modes - - Used in creator ci40 board. - - This module needs a Linux kernel >= v4.2. - - https://github.com/CreatorDev/uccp420wlan - -comment "uccp420wlan needs a Linux kernel >= 4.2 to be built" - depends on !BR2_LINUX_KERNEL diff --git a/package/uccp420wlan/uccp420wlan.hash b/package/uccp420wlan/uccp420wlan.hash deleted file mode 100644 index 905fa4299d..0000000000 --- a/package/uccp420wlan/uccp420wlan.hash +++ /dev/null @@ -1,4 +0,0 @@ -# locally computed hash -sha256 1d4de62fc842dbab739708cf0d9ebce270fcdf63c1c13ac676cbc253acdaa3bb uccp420wlan-6.9.1.tar.gz -sha256 af8067302947c01fd9eee72befa54c7e3ef8a48fecde7fd71277f2290b2bf0f7 COPYING -sha256 9ac431585fddfe624b08cf7464876a5e96061047ff26a9e926da3d89d21a2a73 firmware/LICENSE.imagination diff --git a/package/uccp420wlan/uccp420wlan.mk b/package/uccp420wlan/uccp420wlan.mk deleted file mode 100644 index 7256b92774..0000000000 --- a/package/uccp420wlan/uccp420wlan.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# uccp420wlan -# -################################################################################ - -UCCP420WLAN_VERSION = 6.9.1 -UCCP420WLAN_SITE = $(call github,CreatorDev,uccp420wlan,v$(UCCP420WLAN_VERSION)) -UCCP420WLAN_LICENSE = GPL-2.0 (kernel module), proprietary (firmware blob) -UCCP420WLAN_LICENSE_FILES = COPYING firmware/LICENSE.imagination - -define UCCP420WLAN_INSTALL_TARGET_CMDS - mkdir -p $(TARGET_DIR)/lib/firmware/img/uccp420wlan - cp $(@D)/firmware/*.ldr $(TARGET_DIR)/lib/firmware/img/uccp420wlan -endef - -$(eval $(kernel-module)) -$(eval $(generic-package)) From 93f5ba38533edb66e9446086266da6f9be904a80 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 26 Feb 2023 13:07:32 +0100 Subject: [PATCH 1084/5754] package/gdal: fix build without NPTL Fix the following build failure without NPTL raised since the addition of the package in commit 1e64fa2956171cdc9d6e6c8896b4b589ce573513: /tmp/instance-7/output-1/build/gdal-3.5.2/port/cpl_multiproc.cpp: In function 'CPLSpinLock* CPLCreateSpinLock()': /tmp/instance-7/output-1/build/gdal-3.5.2/port/cpl_multiproc.cpp:2265:9: error: 'pthread_spin_init' was not declared in this scope; did you mean 'pthread_cond_init'? 2265 | pthread_spin_init(&(psSpin->spin), PTHREAD_PROCESS_PRIVATE) == 0 ) | ^~~~~~~~~~~~~~~~~ | pthread_cond_init Fixes: - http://autobuild.buildroot.org/results/aa2a88990a07e551c40efb0c2180768add600c4f Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- .../0001-fix-uclibc-build-without-NPTL.patch | 102 ++++++++++++++++++ 1 file changed, 102 insertions(+) create mode 100644 package/gdal/0001-fix-uclibc-build-without-NPTL.patch diff --git a/package/gdal/0001-fix-uclibc-build-without-NPTL.patch b/package/gdal/0001-fix-uclibc-build-without-NPTL.patch new file mode 100644 index 0000000000..6ecbfc7f95 --- /dev/null +++ b/package/gdal/0001-fix-uclibc-build-without-NPTL.patch @@ -0,0 +1,102 @@ +From 0d3ee8a7661dcd85a9d7b636124af32de8d1b2f1 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 26 Feb 2023 11:31:23 +0100 +Subject: [PATCH] fix uclibc build without NPTL + +Check for pthread_spin_lock instead of pthread_spin_lock_t to avoid the +following uclibc build failure: + +/tmp/instance-7/output-1/build/gdal-3.5.2/port/cpl_multiproc.cpp: In function 'CPLSpinLock* CPLCreateSpinLock()': +/tmp/instance-7/output-1/build/gdal-3.5.2/port/cpl_multiproc.cpp:2265:9: error: 'pthread_spin_init' was not declared in this scope; did you mean 'pthread_cond_init'? + 2265 | pthread_spin_init(&(psSpin->spin), PTHREAD_PROCESS_PRIVATE) == 0 ) + | ^~~~~~~~~~~~~~~~~ + | pthread_cond_init +/tmp/instance-7/output-1/build/gdal-3.5.2/port/cpl_multiproc.cpp: In function 'int CPLAcquireSpinLock(CPLSpinLock*)': +/tmp/instance-7/output-1/build/gdal-3.5.2/port/cpl_multiproc.cpp:2283:12: error: 'pthread_spin_lock' was not declared in this scope; did you mean 'pthread_spinlock_t'? + 2283 | return pthread_spin_lock( &(psSpin->spin) ) == 0; + | ^~~~~~~~~~~~~~~~~ + | pthread_spinlock_t + +Fixes: + - http://autobuild.buildroot.org/results/aa2a88990a07e551c40efb0c2180768add600c4f + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/OSGeo/gdal/pull/7318] +--- + cmake/helpers/configure.cmake | 4 ++-- + cmake/template/cpl_config.h.in | 4 ++-- + port/cpl_config.h.in | 4 ++-- + port/cpl_multiproc.cpp | 4 ++-- + 4 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/cmake/helpers/configure.cmake b/cmake/helpers/configure.cmake +index 08549df434..62a4f636ba 100644 +--- a/cmake/helpers/configure.cmake ++++ b/cmake/helpers/configure.cmake +@@ -110,9 +110,9 @@ else () + " + #define _GNU_SOURCE + #include +- int main() { pthread_spinlock_t spin; return 1; } ++ int main() { pthread_spinlock_t spin; return pthread_spin_lock(&spin); } + " +- HAVE_PTHREAD_SPINLOCK) ++ HAVE_PTHREAD_SPIN_LOCK) + + check_c_source_compiles( + " +diff --git a/cmake/template/cpl_config.h.in b/cmake/template/cpl_config.h.in +index cfa7da94aa..d1fd80bda9 100644 +--- a/cmake/template/cpl_config.h.in ++++ b/cmake/template/cpl_config.h.in +@@ -61,8 +61,8 @@ + /* Define to 1 if you have the `PTHREAD_MUTEX_ADAPTIVE_NP' constant. */ + #cmakedefine HAVE_PTHREAD_MUTEX_ADAPTIVE_NP 1 + +-/* Define to 1 if you have the `pthread_spinlock_t' type. */ +-#cmakedefine HAVE_PTHREAD_SPINLOCK 1 ++/* Define to 1 if you have the `pthread_spin_lock' function. */ ++#cmakedefine HAVE_PTHREAD_SPIN_LOCK 1 + + /* Define to 1 if you have the `pthread_atfork' function. */ + #cmakedefine HAVE_PTHREAD_ATFORK 1 +diff --git a/port/cpl_config.h.in b/port/cpl_config.h.in +index ea28efb3f0..09a48f242d 100644 +--- a/port/cpl_config.h.in ++++ b/port/cpl_config.h.in +@@ -51,8 +51,8 @@ + /* Define to 1 if you have the `PTHREAD_MUTEX_ADAPTIVE_NP' constant. */ + #undef HAVE_PTHREAD_MUTEX_ADAPTIVE_NP + +-/* Define to 1 if you have the `pthread_spinlock_t' type. */ +-#undef HAVE_PTHREAD_SPINLOCK ++/* Define to 1 if you have the `pthread_spin_lock' function. */ ++#undef HAVE_PTHREAD_SPIN_LOCK + + /* Define to 1 if you have the 5 args `mremap' function. */ + #undef HAVE_5ARGS_MREMAP +diff --git a/port/cpl_multiproc.cpp b/port/cpl_multiproc.cpp +index 7f5bcd9127..474ff5bb29 100644 +--- a/port/cpl_multiproc.cpp ++++ b/port/cpl_multiproc.cpp +@@ -2232,7 +2232,7 @@ void CPLCleanupTLS() + /* CPLCreateSpinLock() */ + /************************************************************************/ + +-#if defined(HAVE_PTHREAD_SPINLOCK) ++#if defined(HAVE_PTHREAD_SPIN_LOCK) + #define HAVE_SPINLOCK_IMPL + + struct _CPLSpinLock +@@ -2310,7 +2310,7 @@ void CPLDestroySpinLock(CPLSpinLock *psSpin) + pthread_spin_destroy(&(psSpin->spin)); + free(psSpin); + } +-#endif // HAVE_PTHREAD_SPINLOCK ++#endif // HAVE_PTHREAD_SPIN_LOCK + + #endif // def CPL_MULTIPROC_PTHREAD + +-- +2.39.1 + From daf01a38be705ada7ce3e083f096d424ead5544c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 26 Feb 2023 13:23:36 +0100 Subject: [PATCH 1085/5754] package/x11r7/xwayland: xlib_libxshmfence is mandatory xlib_libxshmfence is mandatory, not optional, since the addition of the package in commit 05c3177493aa8447d5cb568c8c13e0c09eded18b: ../miext/sync/misyncshm.c:36:10: fatal error: X11/xshmfence.h: No such file or directory 36 | #include | ^~~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/cccc8f97d452ed2adbcbc4624f159a00287a3d38 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/weston/Config.in | 4 ++++ package/wlroots/Config.in | 4 ++++ package/x11r7/xwayland/Config.in | 5 +++++ package/x11r7/xwayland/xwayland.mk | 5 +++-- 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/package/weston/Config.in b/package/weston/Config.in index 09119edaaa..d5dbf27bbd 100644 --- a/package/weston/Config.in +++ b/package/weston/Config.in @@ -114,6 +114,8 @@ config BR2_PACKAGE_WESTON_XWAYLAND depends on BR2_USE_MMU # xwayland depends on !BR2_STATIC_LIBS # xwayland depends on BR2_TOOLCHAIN_HAS_THREADS # xwayland + depends on !BR2_RISCV_32 # xwayland -> xlib_libxshmfence + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # xwayland -> xlib_libxshmfence select BR2_PACKAGE_CAIRO select BR2_PACKAGE_LIBXCB select BR2_PACKAGE_XLIB_LIBX11 @@ -125,6 +127,8 @@ comment "XWayland support needs libepoxy and X.org enabled" comment "XWayland support needs a toolchain w/ threads, dynamic library" depends on BR2_USE_MMU + depends on !BR2_RISCV_32 + depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS # Weston needs at least one shell; this can be one of the bundled ones, diff --git a/package/wlroots/Config.in b/package/wlroots/Config.in index b2d3f3c3b1..fb23e9069c 100644 --- a/package/wlroots/Config.in +++ b/package/wlroots/Config.in @@ -47,6 +47,8 @@ config BR2_PACKAGE_WLROOTS_XWAYLAND depends on BR2_USE_MMU # xwayland depends on !BR2_STATIC_LIBS # xwayland depends on BR2_TOOLCHAIN_HAS_THREADS # xwayland + depends on !BR2_RISCV_32 # xwayland -> xlib_libxshmfence + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # xwayland -> xlib_libxshmfence select BR2_PACKAGE_LIBXCB select BR2_PACKAGE_XCB_UTIL_WM select BR2_PACKAGE_XWAYLAND @@ -58,6 +60,8 @@ comment "XWayland support needs X.org enabled" comment "XWayland support needs a toolchain w/ threads, dynamic library" depends on BR2_USE_MMU + depends on !BR2_RISCV_32 + depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS endif diff --git a/package/x11r7/xwayland/Config.in b/package/x11r7/xwayland/Config.in index 4f14f2cc36..241ab73ad3 100644 --- a/package/x11r7/xwayland/Config.in +++ b/package/x11r7/xwayland/Config.in @@ -6,6 +6,8 @@ config BR2_PACKAGE_XWAYLAND # We need a SHA1 implementation. If either openssl or # libgcrypt are already part of the build, we'll use one of # them, otherwise, use the small libsha1 library. + depends on !BR2_RISCV_32 # xlib_libxshmfence + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # xlib_libxshmfence select BR2_PACKAGE_LIBSHA1 if (!BR2_PACKAGE_OPENSSL && !BR2_PACKAGE_LIBGCRYPT) select BR2_PACKAGE_PIXMAN select BR2_PACKAGE_WAYLAND @@ -14,6 +16,7 @@ config BR2_PACKAGE_XWAYLAND select BR2_PACKAGE_XLIB_LIBXFONT2 select BR2_PACKAGE_XLIB_LIBXKBFILE select BR2_PACKAGE_XLIB_LIBXRANDR + select BR2_PACKAGE_XLIB_LIBXSHMFENCE select BR2_PACKAGE_XLIB_XTRANS select BR2_PACKAGE_XORGPROTO help @@ -23,4 +26,6 @@ config BR2_PACKAGE_XWAYLAND comment "xwayland needs a toolchain w/ threads, dynamic library" depends on BR2_USE_MMU + depends on !BR2_RISCV_32 + depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/x11r7/xwayland/xwayland.mk b/package/x11r7/xwayland/xwayland.mk index 174b440b07..7aef1156d3 100644 --- a/package/x11r7/xwayland/xwayland.mk +++ b/package/x11r7/xwayland/xwayland.mk @@ -18,6 +18,7 @@ XWAYLAND_DEPENDENCIES = \ xlib_libXfont2 \ xlib_libxkbfile \ xlib_libXrandr \ + xlib_libxshmfence \ xlib_xtrans \ xorgproto XWAYLAND_CONF_OPTS = \ @@ -77,9 +78,9 @@ XWAYLAND_CONF_OPTS += -Dsha1=libsha1 XWAYLAND_DEPENDENCIES += libsha1 endif -ifeq ($(BR2_PACKAGE_XLIB_LIBXSHMFENCE)$(BR2_PACKAGE_LIBDRM),yy) +ifeq ($(BR2_PACKAGE_LIBDRM),y) XWAYLAND_CONF_OPTS += -Ddri3=true -XWAYLAND_DEPENDENCIES += xlib_libxshmfence libdrm +XWAYLAND_DEPENDENCIES += libdrm else XWAYLAND_CONF_OPTS += -Ddri3=false endif From da5d2adf572f9b89b6ea82f9548bd4dfba7482ab Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 26 Feb 2023 14:10:48 +0100 Subject: [PATCH 1086/5754] package/python-werkzeug: security bump to version 2.2.3 Fix CVE-2023-23934 and CVE-2023-25577 https://github.com/pallets/werkzeug/security/advisories/GHSA-px8h-6qxv-m22q https://github.com/pallets/werkzeug/security/advisories/GHSA-xg9f-g7g7-2323 https://werkzeug.palletsprojects.com/en/2.2.x/changes/#version-2-2-3 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/python-werkzeug/python-werkzeug.hash | 6 +++--- package/python-werkzeug/python-werkzeug.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-werkzeug/python-werkzeug.hash b/package/python-werkzeug/python-werkzeug.hash index 13b95bc448..0b60a40066 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 9d7e50c5bb3a9fc12823b5faf374b90e Werkzeug-2.2.2.tar.gz -sha256 7ea2d48322cc7c0f8b3a215ed73eabd7b5d75d0b50e31ab006286ccff9e00b8f Werkzeug-2.2.2.tar.gz +# 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 # 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 3ebae3c165..0dd27d145f 100644 --- a/package/python-werkzeug/python-werkzeug.mk +++ b/package/python-werkzeug/python-werkzeug.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_WERKZEUG_VERSION = 2.2.2 +PYTHON_WERKZEUG_VERSION = 2.2.3 PYTHON_WERKZEUG_SOURCE = Werkzeug-$(PYTHON_WERKZEUG_VERSION).tar.gz -PYTHON_WERKZEUG_SITE = https://files.pythonhosted.org/packages/f8/c1/1c8e539f040acd80f844c69a5ef8e2fccdf8b442dabb969e497b55d544e1 +PYTHON_WERKZEUG_SITE = https://files.pythonhosted.org/packages/02/3c/baaebf3235c87d61d6593467056d5a8fba7c75ac838b8d100a5e64eba7a0 PYTHON_WERKZEUG_SETUP_TYPE = setuptools PYTHON_WERKZEUG_LICENSE = BSD-3-Clause PYTHON_WERKZEUG_LICENSE_FILES = LICENSE.rst From 7abc9a0554cc1c1bbc1ad4273622024020fa2c7e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 26 Feb 2023 14:20:26 +0100 Subject: [PATCH 1087/5754] package/bind: security bump to version 9.16.38 - Fix CVE-2022-3094, CVE-2022-3736 and CVE-2022-3924 - Update hash of COPYRIGHT (year updated with https://gitlab.isc.org/isc-projects/bind9/-/commit/1a5d707f52282117c9912a27dcc89f2ec412577a) https://downloads.isc.org/isc/bind9/9.16.38/doc/arm/html/notes.html Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/bind/bind.hash | 6 +++--- package/bind/bind.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/bind/bind.hash b/package/bind/bind.hash index d41a9bbc5e..32804b5ce0 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.33/bind-9.16.33.tar.xz.asc +# Verified from https://ftp.isc.org/isc/bind9/9.16.38/bind-9.16.38.tar.xz.asc # with key AADBBA5074F1402F7B69D56BC5B4EE931A9F9DFD -sha256 ec4fbea4b2e368d1824971509e33fa159224ad14b436034c6bcd46104c328d91 bind-9.16.33.tar.xz -sha256 daf6f1eddf5983ed664a2d125b619e56e2e93917c19d0d41c7586ea153ba2155 COPYRIGHT +sha256 8df44c9d9a84a28ab8b49d55f3c33b624b90ef8f6a8b9ee6a4c33cc17c14c50f bind-9.16.38.tar.xz +sha256 13491a682dc0f5ee2273cebd3949e2be62f9470fe659419a03a308d4f444773b COPYRIGHT diff --git a/package/bind/bind.mk b/package/bind/bind.mk index 2f83a6276e..70987a9823 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -4,7 +4,7 @@ # ################################################################################ -BIND_VERSION = 9.16.33 +BIND_VERSION = 9.16.38 BIND_SOURCE= bind-$(BIND_VERSION).tar.xz BIND_SITE = https://ftp.isc.org/isc/bind9/$(BIND_VERSION) # bind does not support parallel builds. From a86d44a3eb009d3deb5b558f7ccb0870eb877c6a Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 26 Feb 2023 14:27:47 +0100 Subject: [PATCH 1088/5754] package/python-m2crypto: fix CVE-2020-25657 A flaw was found in all released versions of m2crypto, where they are vulnerable to Bleichenbacher timing attacks in the RSA decryption API via the timed processing of valid PKCS#1 v1.5 Ciphertext. The highest threat from this vulnerability is to confidentiality. Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...he-RSA-decryption-API-CVE-2020-25657.patch | 174 ++++++++++++++++++ package/python-m2crypto/python-m2crypto.mk | 3 + 2 files changed, 177 insertions(+) create mode 100644 package/python-m2crypto/0001-Mitigate-the-Bleichenbacher-timing-attacks-in-the-RSA-decryption-API-CVE-2020-25657.patch diff --git a/package/python-m2crypto/0001-Mitigate-the-Bleichenbacher-timing-attacks-in-the-RSA-decryption-API-CVE-2020-25657.patch b/package/python-m2crypto/0001-Mitigate-the-Bleichenbacher-timing-attacks-in-the-RSA-decryption-API-CVE-2020-25657.patch new file mode 100644 index 0000000000..68200b7d9b --- /dev/null +++ b/package/python-m2crypto/0001-Mitigate-the-Bleichenbacher-timing-attacks-in-the-RSA-decryption-API-CVE-2020-25657.patch @@ -0,0 +1,174 @@ +From 84c53958def0f510e92119fca14d74f94215827a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= +Date: Tue, 28 Jun 2022 21:17:01 +0200 +Subject: [PATCH] Mitigate the Bleichenbacher timing attacks in the RSA + decryption API (CVE-2020-25657) + +Fixes #282 + +[Retrieved from: +https://gitlab.com/m2crypto/m2crypto/-/commit/84c53958def0f510e92119fca14d74f94215827a] +Signed-off-by: Fabrice Fontaine +--- + src/SWIG/_m2crypto_wrap.c | 20 ++++++++++++-------- + src/SWIG/_rsa.i | 20 ++++++++++++-------- + tests/test_rsa.py | 15 +++++++-------- + 3 files changed, 31 insertions(+), 24 deletions(-) + +diff --git a/src/SWIG/_m2crypto_wrap.c b/src/SWIG/_m2crypto_wrap.c +index aba9eb6d..a9f30da9 100644 +--- a/src/SWIG/_m2crypto_wrap.c ++++ b/src/SWIG/_m2crypto_wrap.c +@@ -7040,9 +7040,10 @@ PyObject *rsa_private_encrypt(RSA *rsa, PyObject *from, int padding) { + tlen = RSA_private_encrypt(flen, (unsigned char *)fbuf, + (unsigned char *)tbuf, rsa, padding); + if (tlen == -1) { +- m2_PyErr_Msg(_rsa_err); ++ ERR_clear_error(); ++ PyErr_Clear(); + PyMem_Free(tbuf); +- return NULL; ++ Py_RETURN_NONE; + } + + ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen); +@@ -7070,9 +7071,10 @@ PyObject *rsa_public_decrypt(RSA *rsa, PyObject *from, int padding) { + tlen = RSA_public_decrypt(flen, (unsigned char *)fbuf, + (unsigned char *)tbuf, rsa, padding); + if (tlen == -1) { +- m2_PyErr_Msg(_rsa_err); ++ ERR_clear_error(); ++ PyErr_Clear(); + PyMem_Free(tbuf); +- return NULL; ++ Py_RETURN_NONE; + } + + ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen); +@@ -7097,9 +7099,10 @@ PyObject *rsa_public_encrypt(RSA *rsa, PyObject *from, int padding) { + tlen = RSA_public_encrypt(flen, (unsigned char *)fbuf, + (unsigned char *)tbuf, rsa, padding); + if (tlen == -1) { +- m2_PyErr_Msg(_rsa_err); ++ ERR_clear_error(); ++ PyErr_Clear(); + PyMem_Free(tbuf); +- return NULL; ++ Py_RETURN_NONE; + } + + ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen); +@@ -7124,9 +7127,10 @@ PyObject *rsa_private_decrypt(RSA *rsa, PyObject *from, int padding) { + tlen = RSA_private_decrypt(flen, (unsigned char *)fbuf, + (unsigned char *)tbuf, rsa, padding); + if (tlen == -1) { +- m2_PyErr_Msg(_rsa_err); ++ ERR_clear_error(); ++ PyErr_Clear(); + PyMem_Free(tbuf); +- return NULL; ++ Py_RETURN_NONE; + } + ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen); + +diff --git a/src/SWIG/_rsa.i b/src/SWIG/_rsa.i +index bc714e01..1377b8be 100644 +--- a/src/SWIG/_rsa.i ++++ b/src/SWIG/_rsa.i +@@ -239,9 +239,10 @@ PyObject *rsa_private_encrypt(RSA *rsa, PyObject *from, int padding) { + tlen = RSA_private_encrypt(flen, (unsigned char *)fbuf, + (unsigned char *)tbuf, rsa, padding); + if (tlen == -1) { +- m2_PyErr_Msg(_rsa_err); ++ ERR_clear_error(); ++ PyErr_Clear(); + PyMem_Free(tbuf); +- return NULL; ++ Py_RETURN_NONE; + } + + ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen); +@@ -269,9 +270,10 @@ PyObject *rsa_public_decrypt(RSA *rsa, PyObject *from, int padding) { + tlen = RSA_public_decrypt(flen, (unsigned char *)fbuf, + (unsigned char *)tbuf, rsa, padding); + if (tlen == -1) { +- m2_PyErr_Msg(_rsa_err); ++ ERR_clear_error(); ++ PyErr_Clear(); + PyMem_Free(tbuf); +- return NULL; ++ Py_RETURN_NONE; + } + + ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen); +@@ -296,9 +298,10 @@ PyObject *rsa_public_encrypt(RSA *rsa, PyObject *from, int padding) { + tlen = RSA_public_encrypt(flen, (unsigned char *)fbuf, + (unsigned char *)tbuf, rsa, padding); + if (tlen == -1) { +- m2_PyErr_Msg(_rsa_err); ++ ERR_clear_error(); ++ PyErr_Clear(); + PyMem_Free(tbuf); +- return NULL; ++ Py_RETURN_NONE; + } + + ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen); +@@ -323,9 +326,10 @@ PyObject *rsa_private_decrypt(RSA *rsa, PyObject *from, int padding) { + tlen = RSA_private_decrypt(flen, (unsigned char *)fbuf, + (unsigned char *)tbuf, rsa, padding); + if (tlen == -1) { +- m2_PyErr_Msg(_rsa_err); ++ ERR_clear_error(); ++ PyErr_Clear(); + PyMem_Free(tbuf); +- return NULL; ++ Py_RETURN_NONE; + } + ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen); + +diff --git a/tests/test_rsa.py b/tests/test_rsa.py +index 7bb3af75..5e75d681 100644 +--- a/tests/test_rsa.py ++++ b/tests/test_rsa.py +@@ -109,8 +109,9 @@ class RSATestCase(unittest.TestCase): + # The other paddings. + for padding in self.s_padding_nok: + p = getattr(RSA, padding) +- with self.assertRaises(RSA.RSAError): +- priv.private_encrypt(self.data, p) ++ # Exception disabled as a part of mitigation against CVE-2020-25657 ++ # with self.assertRaises(RSA.RSAError): ++ priv.private_encrypt(self.data, p) + # Type-check the data to be encrypted. + with self.assertRaises(TypeError): + priv.private_encrypt(self.gen_callback, RSA.pkcs1_padding) +@@ -127,10 +128,12 @@ class RSATestCase(unittest.TestCase): + self.assertEqual(ptxt, self.data) + + # no_padding +- with six.assertRaisesRegex(self, RSA.RSAError, 'data too small'): +- priv.public_encrypt(self.data, RSA.no_padding) ++ # Exception disabled as a part of mitigation against CVE-2020-25657 ++ # with six.assertRaisesRegex(self, RSA.RSAError, 'data too small'): ++ priv.public_encrypt(self.data, RSA.no_padding) + + # Type-check the data to be encrypted. ++ # Exception disabled as a part of mitigation against CVE-2020-25657 + with self.assertRaises(TypeError): + priv.public_encrypt(self.gen_callback, RSA.pkcs1_padding) + +@@ -146,10 +149,6 @@ class RSATestCase(unittest.TestCase): + b'\000\000\000\003\001\000\001') # aka 65537 aka 0xf4 + with self.assertRaises(RSA.RSAError): + setattr(rsa, 'e', '\000\000\000\003\001\000\001') +- with self.assertRaises(RSA.RSAError): +- rsa.private_encrypt(1) +- with self.assertRaises(RSA.RSAError): +- rsa.private_decrypt(1) + assert rsa.check_key() + + def test_loadpub_bad(self): +-- +GitLab + diff --git a/package/python-m2crypto/python-m2crypto.mk b/package/python-m2crypto/python-m2crypto.mk index 02ad76d3f4..3c28fa3b0d 100644 --- a/package/python-m2crypto/python-m2crypto.mk +++ b/package/python-m2crypto/python-m2crypto.mk @@ -15,4 +15,7 @@ PYTHON_M2CRYPTO_CPE_ID_PRODUCT = m2crypto PYTHON_M2CRYPTO_DEPENDENCIES = openssl host-swig PYTHON_M2CRYPTO_BUILD_OPTS = --openssl=$(STAGING_DIR)/usr +# 0001-Mitigate-the-Bleichenbacher-timing-attacks-in-the-RSA-decryption-API-CVE-2020-25657.patch +PYTHON_M2CRYPTO_IGNORE_CVES += CVE-2020-25657 + $(eval $(python-package)) From af9e64f120dc6a060e98bb0915c8b6b34d644896 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 26 Feb 2023 14:33:57 +0100 Subject: [PATCH 1089/5754] package/haproxy: security bump to version 2.6.9 Fix CVE-2023-25725 https://www.mail-archive.com/haproxy@formilux.org/msg43229.html https://www.mail-archive.com/haproxy@formilux.org/msg43224.html Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- 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 2cd8ff1806..f5540ee44a 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.5.tar.gz.sha256 -sha256 ce9e19ebfcdd43e51af8a6090f1df8d512d972ddf742fa648a643bbb19056605 haproxy-2.6.5.tar.gz +# From: http://www.haproxy.org/download/2.6/src/haproxy-2.6.9.tar.gz.sha256 +sha256 f01a1c5f465dc1b5cd175d0b28b98beb4dfe82b5b5b63ddcc68d1df433641701 haproxy-2.6.9.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 c37508f63b..012c1dfdb6 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).5 +HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).9 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 d7ae47f0c68607a90e6a65cbfff5bfb3007b019d Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 26 Feb 2023 14:39:46 +0100 Subject: [PATCH 1090/5754] package/tiff: fix CVE-2022-48281 processCropSelections in tools/tiffcrop.c in LibTIFF through 4.5.0 has a heap-based buffer overflow (e.g., "WRITE of size 307203") via a crafted TIFF image. Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...rect-simple-copy-paste-error-Fix-488.patch | 28 +++++++++++++++++++ package/tiff/tiff.mk | 3 ++ 2 files changed, 31 insertions(+) create mode 100644 package/tiff/0001-tiffcrop-Correct-simple-copy-paste-error-Fix-488.patch 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 new file mode 100644 index 0000000000..73c0d10ffc --- /dev/null +++ b/package/tiff/0001-tiffcrop-Correct-simple-copy-paste-error-Fix-488.patch @@ -0,0 +1,28 @@ +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.mk b/package/tiff/tiff.mk index e7de51ea1e..f9754a4b49 100644 --- a/package/tiff/tiff.mk +++ b/package/tiff/tiff.mk @@ -12,6 +12,9 @@ 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 441b859a1e3a5b2a6bbbc8990f67c33913aa2385 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 26 Feb 2023 16:44:21 +0100 Subject: [PATCH 1091/5754] package/proxychains-ng: set -fPIC Set -fPIC to avoid the following build failure with some architectures such as mips or aarch64 raised since bump to version 4.14 in commit 35953d1e61aa8581be09c9dca39365955b10590e and https://github.com/rofl0r/proxychains-ng/commit/35a674bdbc294730429a1007c9e7ce01e65b49b5: checking what's the option to use in linker to set library name ... cannot find an option to set library name Fixes: - http://autobuild.buildroot.org/results/8ed1481e29321ed3da40251f700cb3bd66f62c94 - http://autobuild.buildroot.org/results/fd01df6eb9a37257894740d44a33eece9123355a Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/proxychains-ng/proxychains-ng.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/proxychains-ng/proxychains-ng.mk b/package/proxychains-ng/proxychains-ng.mk index c4d487c7db..beb8909088 100644 --- a/package/proxychains-ng/proxychains-ng.mk +++ b/package/proxychains-ng/proxychains-ng.mk @@ -13,7 +13,8 @@ PROXYCHAINS_NG_CPE_ID_VENDOR = proxychains-ng_project define PROXYCHAINS_NG_CONFIGURE_CMDS cd $(@D) && \ - $(TARGET_CONFIGURE_OPTS) ./configure --prefix=/usr --sysconfdir=/etc + $(TARGET_CONFIGURE_OPTS) CPPFLAGS="$(TARGET_CPPFLAGS) -fPIC" \ + ./configure --prefix=/usr --sysconfdir=/etc endef define PROXYCHAINS_NG_BUILD_CMDS From 159df6a531676021607ea26309b994c68e5e501d Mon Sep 17 00:00:00 2001 From: Lang Daniel Date: Mon, 27 Feb 2023 08:46:13 +0000 Subject: [PATCH 1092/5754] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.1.x series Signed-off-by: Daniel Lang 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 11dc5cce07..5cbef197ab 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.1.11" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.1.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 52eb534b40..f45b244e6b 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 581b0560077863c5116512c0b5fd93b97814092c80e6ebebabe88101949af7a1 linux-6.1.11.tar.xz +sha256 a27076011efec7ad11e9ed0644f512c34cab4c5ed5ba42cfe71c83fabebe810d linux-6.1.14.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 e7ed24f2690bf0e11158ccfa8ddc5c0e8a4816d83c4055d205218853da9c5dad linux-5.15.93.tar.xz -sha256 d807f97812e566410cd13b3170009e0d7552748d4f22d608ffd4dbd7f85bf9c6 linux-5.10.167.tar.xz -sha256 8dd0ea7f1db4c1e89d485255798e3c3dfb9be63c0f2af369912a1a37b75f36a8 linux-5.4.231.tar.xz +sha256 348d974c143fdef8517ec703fdaa24bade12a49047848be92cb9e3253b19ef98 linux-5.15.96.tar.xz +sha256 a2b51876befb8cc35724ed62820845f2b387d471a6cf46e8eedd0b6cb595825f linux-5.10.170.tar.xz +sha256 5a1e5754b4f2a4fe73b119d810ecda2ce07ecfb6f6cbbd16547c9ecd30b97627 linux-5.4.233.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 a35bcde16b13aa423a1822675775a1b0abf17f5392454febabd8c3757187959a linux-4.14.305.tar.xz -sha256 489fb9368bd7ab808264dea1a4acdf607f057bf1ba19f647a17aa18d08f313f9 linux-4.19.272.tar.xz +sha256 4e1c1555c306874e0477d1af282d04a4efb285121456ab3f79519c92e406b701 linux-4.14.307.tar.xz +sha256 64a265a193c9e3e14d1397278e2348386ef6d6043af76d693c0fbbafed345ca8 linux-4.19.274.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 18c179ec8d..ae40520c51 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.305" if BR2_KERNEL_HEADERS_4_14 - default "4.19.272" if BR2_KERNEL_HEADERS_4_19 - default "5.4.231" if BR2_KERNEL_HEADERS_5_4 - default "5.10.167" if BR2_KERNEL_HEADERS_5_10 - default "5.15.93" if BR2_KERNEL_HEADERS_5_15 - default "6.1.11" if BR2_KERNEL_HEADERS_6_1 + 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 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 9d74f85c97d21461a5a23b27eb682c1157875bdb Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 26 Feb 2023 13:06:36 +0100 Subject: [PATCH 1093/5754] package/pcm-tools: needs NPTL pcm-tools needs NPTL since its addition in commit 60eb2cec80e5258a0c43090f539749606744e182: cpucounters.cpp: In constructor 'pcm::TemporalThreadAffinity::TemporalThreadAffinity(pcm::uint32, bool)': cpucounters.cpp:252:9: error: 'pthread_getaffinity_np' was not declared in this scope; did you mean 'sched_getaffinity'? 252 | pthread_getaffinity_np(pthread_self(), set_size, old_affinity); | ^~~~~~~~~~~~~~~~~~~~~~ | sched_getaffinity Fixes: - http://autobuild.buildroot.org/results/8bbf9c36af332bbf5e7c1abcbb594a0b231ef97e Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/pcm-tools/Config.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/pcm-tools/Config.in b/package/pcm-tools/Config.in index ca9719dc5f..6bf05f32d7 100644 --- a/package/pcm-tools/Config.in +++ b/package/pcm-tools/Config.in @@ -1,11 +1,13 @@ -comment "pcm-tools needs a toolchain w/ C++" +comment "pcm-tools needs a toolchain w/ C++, NPTL" depends on BR2_i386 || BR2_x86_64 - depends on !BR2_INSTALL_LIBSTDCPP + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_HAS_THREADS_NPTL config BR2_PACKAGE_PCM_TOOLS bool "pcm-tools" depends on BR2_i386 || BR2_x86_64 depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL select BR2_PACKAGE_HWDATA select BR2_PACKAGE_HWDATA_PCI_IDS help From 8280400fbadde09e51ccff312d7a4ef6a386f589 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 26 Feb 2023 11:22:23 +0100 Subject: [PATCH 1094/5754] package/php-xdebug: bump to version 3.2.0 - Use official tarball - This bump will fix the following build failure raised since bump of php to version 8.2.1 in commit 90ab065162a35b8aa2c429903e3d59d4ad2c0d7f: checking Check for supported PHP versions... configure: error: not supported. Need a PHP version >= 7.2.0 and < 8.2.0 (found 8.2.1) https://xdebug.org/announcements/2022-12-08 https://xdebug.org/updates#x_3_2_0 Fixes: - http://autobuild.buildroot.org/results/092a6d388fc6801c109eb46635e8df80d06a803e Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/php-xdebug/php-xdebug.hash | 2 +- package/php-xdebug/php-xdebug.mk | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/php-xdebug/php-xdebug.hash b/package/php-xdebug/php-xdebug.hash index 72bfac67ce..fa92ee82ed 100644 --- a/package/php-xdebug/php-xdebug.hash +++ b/package/php-xdebug/php-xdebug.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7e4f28fc65c8b535de43b6d2ec57429476a6de1d53c4d440a9108ae8d28e01f4 php-xdebug-3.0.4.tar.gz +sha256 7769b20eecdadf5fbe9f582512c10b394fb575b6f7a8c3a3a82db6883e0032b7 xdebug-3.2.0.tgz sha256 ef479ee1a3da3f933e0d046ca8cd0c14601f29b2c0c41cc60c9388546a4e0272 LICENSE diff --git a/package/php-xdebug/php-xdebug.mk b/package/php-xdebug/php-xdebug.mk index 18ebc32592..9429d4afee 100644 --- a/package/php-xdebug/php-xdebug.mk +++ b/package/php-xdebug/php-xdebug.mk @@ -4,8 +4,9 @@ # ################################################################################ -PHP_XDEBUG_VERSION = 3.0.4 -PHP_XDEBUG_SITE = $(call github,xdebug,xdebug,$(PHP_XDEBUG_VERSION)) +PHP_XDEBUG_VERSION = 3.2.0 +PHP_XDEBUG_SOURCE = xdebug-$(PHP_XDEBUG_VERSION).tgz +PHP_XDEBUG_SITE = https://xdebug.org/files PHP_XDEBUG_INSTALL_STAGING = YES PHP_XDEBUG_LICENSE = Xdebug License (PHP-3.0-like) PHP_XDEBUG_LICENSE_FILES = LICENSE From 99d9dc1ad87796be17c4cdc9a1ac72d1b31c111b Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 26 Feb 2023 00:22:17 +0100 Subject: [PATCH 1095/5754] package/flac: drop unrecognized option xmms-plugin has been dropped since version 1.4.2 and https://github.com/xiph/flac/commit/8fbeff238c41464fe220cd23c45861c9302d1172 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/flac/flac.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/flac/flac.mk b/package/flac/flac.mk index ebb4778521..595c2379b0 100644 --- a/package/flac/flac.mk +++ b/package/flac/flac.mk @@ -17,7 +17,6 @@ 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-xmms-plugin \ --disable-stack-smash-protection ifeq ($(BR2_PACKAGE_LIBOGG),y) From ad4982d18e66ec909b0c906768d233fd8d4a1be0 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 25 Feb 2023 23:50:31 +0100 Subject: [PATCH 1096/5754] utils/genrandconfig: add boot-wrapper-aarch64 handling Fix the following build failure raised since the addition of the package in commit 7689b72e00fd4d8c017880004e83a1c79144ab7b: configure: error: Could not find DTB file: /home/autobuild/autobuild/instance-9/output-1/build/linux-6.1.9/arch/arm64/boot/dts/.dtb Fixes: - http://autobuild.buildroot.org/results/44287ccc8cc9767704642919e6d928d1f57b436d Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- utils/genrandconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/utils/genrandconfig b/utils/genrandconfig index 6ec398851a..2b0baedf31 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -492,6 +492,10 @@ def fixup_config(sysinfo, configfile): configlines.remove('BR2_TARGET_BAREBOX_USE_DEFCONFIG=y\n') configlines.remove('BR2_TARGET_BAREBOX_BOARD_DEFCONFIG=""\n') + if 'BR2_TARGET_BOOT_WRAPPER_AARCH64=y\n' in configlines and \ + 'BR2_TARGET_BOOT_WRAPPER_AARCH64_DTS=""\n' in configlines: + return False + if 'BR2_TARGET_LPC32XXCDL=y\n' in configlines and \ 'BR2_TARGET_LPC32XXCDL_BOARDNAME=""\n' in configlines: return False From df83b6fb1404826cc6dbc154c5b4b5cb5a94c1ad Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Sat, 25 Feb 2023 22:03:57 +0100 Subject: [PATCH 1097/5754] package/rtl8723bu: fix module installation At the moment module is build but not installed to target/. To fix this let's bump package to 2023-02-18 version on master branch to fix module installation. Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- package/rtl8723bu/rtl8723bu.hash | 2 +- package/rtl8723bu/rtl8723bu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rtl8723bu/rtl8723bu.hash b/package/rtl8723bu/rtl8723bu.hash index 6a28c34773..bc3b8fc727 100644 --- a/package/rtl8723bu/rtl8723bu.hash +++ b/package/rtl8723bu/rtl8723bu.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 21372b654886c6d100f46636d7807428698bd618e00db1b8b49cfc3037e46d10 rtl8723bu-f1dbe1c8ccc2c5b2cbeb84da6b9f0e547a84a255.tar.gz +sha256 d0db523f256795d8f3284fa2ec03855f231747ede8337e878bc096325b965654 rtl8723bu-92c19318cb54ef96c2cfb4a22b2c98eb512812d8.tar.gz diff --git a/package/rtl8723bu/rtl8723bu.mk b/package/rtl8723bu/rtl8723bu.mk index af1ac9454e..ad9bb9a462 100644 --- a/package/rtl8723bu/rtl8723bu.mk +++ b/package/rtl8723bu/rtl8723bu.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8723BU_VERSION = f1dbe1c8ccc2c5b2cbeb84da6b9f0e547a84a255 +RTL8723BU_VERSION = 92c19318cb54ef96c2cfb4a22b2c98eb512812d8 RTL8723BU_SITE = $(call github,lwfinger,rtl8723bu,$(RTL8723BU_VERSION)) RTL8723BU_LICENSE = GPL-2.0, proprietary (*.bin firmware blobs) From 8c4435190773195fc5d1a97f819e1160f4bd52ca Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 26 Feb 2023 00:14:19 +0100 Subject: [PATCH 1098/5754] boot/mxs-bootlets: fix build without any bootstream Fix the following build failure raised since the addition of the package in commit 2a636d15217cd326b4546e7017538c7a9e9d399c: sed -i 's,[^ *]power_prep.*;,\tpower_prep="/home/autobuild/autobuild/instance-9/output-1/build/mxs-bootlets-10.12.01/power_prep/power_prep";,' /home/autobuild/autobuild/instance-9/output-1/build/mxs-bootlets-10.12.01/ sed: couldn't edit /home/autobuild/autobuild/instance-9/output-1/build/mxs-bootlets-10.12.01/: not a regular file Fixes: - http://autobuild.buildroot.org/results/b4b26f6b02fd1991f46eba5db240e5050b96d333 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- boot/mxs-bootlets/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/boot/mxs-bootlets/Config.in b/boot/mxs-bootlets/Config.in index b3e392afa8..8f9334b610 100644 --- a/boot/mxs-bootlets/Config.in +++ b/boot/mxs-bootlets/Config.in @@ -1,6 +1,8 @@ config BR2_TARGET_MXS_BOOTLETS bool "mxs-bootlets" depends on BR2_arm + depends on BR2_TARGET_BAREBOX || BR2_LINUX_KERNEL || \ + BR2_TARGET_UBOOT help Stage1 bootloaders for Freescale iMX23/iMX28 SoCs From 3aa7821d77386b597c7c63d9bdafa3278df60c36 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 26 Feb 2023 20:53:15 +0100 Subject: [PATCH 1099/5754] package/rtty: fix openssl static build with -latomic Fix the following openssl static build failure with -latomic raised since bump to version 8.1.0 in commit 7e608885a2df51ba77378f210f4c0e8cb59d5b8b: /home/autobuild/autobuild/instance-8/output-1/host/lib/gcc/sparc-buildroot-linux-uclibc/10.4.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: /home/autobuild/autobuild/instance-8/output-1/host/sparc-buildroot-linux-uclibc/sysroot/usr/lib/libssl.a(ssl_cert.o): in function `ssl_cert_free': ssl_cert.c:(.text+0x53c): undefined reference to `__atomic_fetch_sub_4' Fixes: - http://autobuild.buildroot.org/results/f606bb15bf4f88ba29ef0795413e13acc9cd0976 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...keLists.txt-prefer-pkg_check_modules.patch | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 package/rtty/0001-CMakeLists.txt-prefer-pkg_check_modules.patch diff --git a/package/rtty/0001-CMakeLists.txt-prefer-pkg_check_modules.patch b/package/rtty/0001-CMakeLists.txt-prefer-pkg_check_modules.patch new file mode 100644 index 0000000000..3714050445 --- /dev/null +++ b/package/rtty/0001-CMakeLists.txt-prefer-pkg_check_modules.patch @@ -0,0 +1,40 @@ +From 565c003ac412c9b0fa39d208d4a911f4300477c3 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 26 Feb 2023 20:39:11 +0100 +Subject: [PATCH] CMakeLists.txt: prefer pkg_check_modules + +Prefer pkg_check_modules over find_package to avoid the following static +build failure with openssl and -latomic: + +/home/autobuild/autobuild/instance-8/output-1/host/lib/gcc/sparc-buildroot-linux-uclibc/10.4.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: /home/autobuild/autobuild/instance-8/output-1/host/sparc-buildroot-linux-uclibc/sysroot/usr/lib/libssl.a(ssl_cert.o): in function `ssl_cert_free': +ssl_cert.c:(.text+0x53c): undefined reference to `__atomic_fetch_sub_4' + +Fixes: + - http://autobuild.buildroot.org/results/f606bb15bf4f88ba29ef0795413e13acc9cd0976 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/zhaojh329/ssl/pull/4] +--- + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/ssl/CMakeLists.txt b/src/ssl/CMakeLists.txt +index 4868bf7..36488c7 100644 +--- a/src/ssl/CMakeLists.txt ++++ b/src/ssl/CMakeLists.txt +@@ -14,10 +14,10 @@ endif() + + find_package(PkgConfig QUIET) + +-find_package(OpenSSL) ++pkg_check_modules(OPENSSL openssl) + + if (NOT OPENSSL_FOUND) +- pkg_check_modules(OPENSSL openssl) ++ find_package(OpenSSL) + endif() + + find_package(WolfSSL) +-- +2.39.1 + From debec267fc41b1b0ff3e23cbc06d3d4186bd466a Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 27 Feb 2023 17:43:10 +0100 Subject: [PATCH 1100/5754] Update for 2023.02-rc2 Signed-off-by: Peter Korsgaard --- CHANGES | 20 ++++++++++++++++++++ Makefile | 4 ++-- docs/website/download.html | 18 +++++++++--------- docs/website/news.html | 21 +++++++++++++++++++++ 4 files changed, 52 insertions(+), 11 deletions(-) diff --git a/CHANGES b/CHANGES index 21e349f3a8..04b49a94cb 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,23 @@ +2023.02-rc2, released February 27th, 2023 + + Fixes all over the tree. + + Updated/fixed packages: asterisk, at91dataflashboot, bind, + efivar, erlang, flac, fluent-bit, freerdp, gcc, gdal, gerbera, + gnuradio, gqrx, haproxy, hawktracer, imx-gpu-g2d, + intel-gmmlib, libarchive, libblockdev, libcamera-apps, libjxl, + libmodsecurity, libsigrokdecode, lightning, lirc-tools, + lttng-babeltrace, modem-manager, modsecurity2, + multipath-tools, mutt, mxs-bootlets, netsurf, network-manager, + nginx-naxsi, ntpsec, opensbi, optee-client, pcm-tools, + php-xdebug, pistache, postgresql, proxychains-ng, + python-m2crypto, python-numpy, python-webargs, + python-werkzeug, rtl8723bu, rtty, speechd, sudo, systemd, + tiff, tmux, wilc-driver, wpa_supplicant, xerces, + xtables-addons, xwayland, zabbix + + Removed packages: uccp420wlan + 2023.02-rc1, released February 20th, 2023 Numerous package updates and many (62) new packages. diff --git a/Makefile b/Makefile index c97086c09c..8edc90ac50 100644 --- a/Makefile +++ b/Makefile @@ -90,9 +90,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2023.02-rc1 +export BR2_VERSION := 2023.02-rc2 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1676923000 +BR2_VERSION_EPOCH = 1677516000 # 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 a6b9a9a7c4..12f967db14 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -76,37 +76,37 @@

    buildroot-2022.11.1.tar.xz

    -

    Latest release candidate: 2023.02-rc1

    +

    Latest release candidate: 2023.02-rc2

    - +
    - +
    -

    buildroot-2023.02-rc1.tar.gz

    -

    PGP signature

    +

    buildroot-2023.02-rc2.tar.gz

    +

    PGP signature

    - +
    - +
    -

    buildroot-2023.02-rc1.tar.xz

    -

    PGP signature

    +

    buildroot-2023.02-rc2.tar.xz

    +

    PGP signature

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

    News

      +
    • +
      +
      +
      +

      2023.02-rc2 released

      +

      27 February 2023

      +
      +
      +

      2023.02-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.02-rc2 + release candidate, and report any problems found to the + mailing list or + bug tracker.

      +
      +
      +
      • +
    • From eb566be8dc0e3a36270fe76d669fe51379d498f0 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 27 Feb 2023 17:10:39 +0100 Subject: [PATCH 1101/5754] package/libcurl: bump version to 7.88.1 Bugfix release fixing a number of issues introduced in 7.88.0: https://curl.se/changes.html#7_88_1 https://daniel.haxx.se/blog/2023/02/20/7-88-1-the-second-final-one/ 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 714b02acb0..32b3d0b5e2 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.0.tar.xz.asc +# https://curl.se/download/curl-7.88.1.tar.xz.asc # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 -sha256 fd17432cf28714a4cf39d89e26b8ace0d8901199fe5d01d75eb0ae3bbfcc731f curl-7.88.0.tar.xz +sha256 1dae31b2a7c1fe269de99c0c31bb488346aab3459b5ffca909d6938249ae415f curl-7.88.1.tar.xz sha256 b1d7feb949ea5023552029fbe0bf5db4f23c2f85e9b8e51e18536f0ecbf9c524 COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index eb481e4782..1a1594a45e 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 7.88.0 +LIBCURL_VERSION = 7.88.1 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ From cc9acffa8a9263c51a66a54b4f2ff39421365b80 Mon Sep 17 00:00:00 2001 From: Lang Daniel Date: Tue, 28 Feb 2023 09:48:21 +0000 Subject: [PATCH 1102/5754] package/paho-mqtt-c: security bump to version 1.3.12 Contains a fix for a possible race condition that can lead to use after free: https://github.com/eclipse/paho.mqtt.c/commit/911488a9f0fdad31c85ec86712be52587afdbbb8 https://github.com/eclipse/paho.mqtt.c/milestone/19?closed=1 https://github.com/eclipse/paho.mqtt.c/releases/tag/v1.3.12 Signed-off-by: Daniel Lang Signed-off-by: Peter Korsgaard --- package/paho-mqtt-c/paho-mqtt-c.hash | 2 +- package/paho-mqtt-c/paho-mqtt-c.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/paho-mqtt-c/paho-mqtt-c.hash b/package/paho-mqtt-c/paho-mqtt-c.hash index 1949abdf1a..529c538ff2 100644 --- a/package/paho-mqtt-c/paho-mqtt-c.hash +++ b/package/paho-mqtt-c/paho-mqtt-c.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 d7bba3f8b8978802e11e2b1f28e96e6b7f4ed5d8a268af52a4d3b1bcbd1db16b paho-mqtt-c-1.3.11.tar.gz +sha256 6a70a664ed3bbcc1eafdc45a5dc11f3ad70c9bac12a54c2f8cef15c0e7d0a93b paho-mqtt-c-1.3.12.tar.gz sha256 83bbba033dc985487e321b6dfde111772affb73460be48726299fed3da684b1c edl-v10 sha256 0becf16567beb77fa252b7664631dd177c8f9a1889e48995b45379c7130e5303 epl-v20 sha256 bc0f3f447097eb82a29ad6c2f4929572bb548b6bd4c9e38fde1bf131a771b7a0 LICENSE diff --git a/package/paho-mqtt-c/paho-mqtt-c.mk b/package/paho-mqtt-c/paho-mqtt-c.mk index 30daf863ad..8d1fe009a7 100644 --- a/package/paho-mqtt-c/paho-mqtt-c.mk +++ b/package/paho-mqtt-c/paho-mqtt-c.mk @@ -4,7 +4,7 @@ # ################################################################################ -PAHO_MQTT_C_VERSION = 1.3.11 +PAHO_MQTT_C_VERSION = 1.3.12 PAHO_MQTT_C_SITE = $(call github,eclipse,paho.mqtt.c,v$(PAHO_MQTT_C_VERSION)) PAHO_MQTT_C_LICENSE = EPL-2.0 or BSD-3-Clause PAHO_MQTT_C_LICENSE_FILES = epl-v20 edl-v10 LICENSE From 26344644eebca5cde9b02be849d29e38d5885741 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 27 Feb 2023 17:08:22 +0100 Subject: [PATCH 1103/5754] package/libpjsip: fix CVE-2022-235{3, 4}7 https://github.com/pjsip/pjproject/security/advisories/GHSA-9pfh-r8x4-w26w https://github.com/pjsip/pjproject/security/advisories/GHSA-cxwq-5g9x-x7fr Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...ull-request-from-GHSA-9pfh-r8x4-w26w.patch | 99 +++++++++++++++++++ ...ull-request-from-GHSA-cxwq-5g9x-x7fr.patch | 54 ++++++++++ package/libpjsip/libpjsip.mk | 6 ++ 3 files changed, 159 insertions(+) create mode 100644 package/libpjsip/0001-Merge-pull-request-from-GHSA-9pfh-r8x4-w26w.patch create mode 100644 package/libpjsip/0002-Merge-pull-request-from-GHSA-cxwq-5g9x-x7fr.patch 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 new file mode 100644 index 0000000000..01e1878189 --- /dev/null +++ b/package/libpjsip/0001-Merge-pull-request-from-GHSA-9pfh-r8x4-w26w.patch @@ -0,0 +1,99 @@ +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 new file mode 100644 index 0000000000..82249a2076 --- /dev/null +++ b/package/libpjsip/0002-Merge-pull-request-from-GHSA-cxwq-5g9x-x7fr.patch @@ -0,0 +1,54 @@ +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.mk b/package/libpjsip/libpjsip.mk index 5cc0423f5d..24db641446 100644 --- a/package/libpjsip/libpjsip.mk +++ b/package/libpjsip/libpjsip.mk @@ -15,6 +15,12 @@ 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 4be361ada540af523e76ce8e9330d034a7a11a26 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 1 Mar 2023 17:01:34 +0100 Subject: [PATCH 1104/5754] Update for 2022.11.2 Signed-off-by: Peter Korsgaard (cherry picked from commit 71ddf1a0848e7b17c220b759ffae30ea2b13e1a8) [Peter: drop Makefile change] 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 04b49a94cb..6647c0c8e6 100644 --- a/CHANGES +++ b/CHANGES @@ -103,6 +103,42 @@ #15301: Selecting NAND Flash boot media (NAND_BOOT) breaks the uboot.. #15331: Warning on python-flit-core license when generating legal info +2022.11.2, released March 1st, 2023 + + Important / security related fixes. + + Fix make O=..._defconfig builds (regression in 2022.11.1). + + A number of additional/stricter checks have been added to + ./utils/check-package. + + Build host dependencies check extended to check for a number + of specific perl modules to better handle distributions (like + Fedora) with very fine grained perl packages. Also ensure + build host has git >= 2.0.0 when using packages written in + go/rust because the vendoring may need it. + + Defconfigs: ASUS tinker rk3288: Fix boot issue related to TPL + + Updated/fixed packages: afboot-stm32, apache, barebox, c-ares, + elf2flt, freeswitch, fwts, gcc, gdal, git, gitlab-runner, + ipmitool, kodi, libgit2, libks, libopenssl, libressl, live555, + lua, lxc, mariadb, mesa3d-headers, modsecurity2, mongoose, + netopeer2, nodejs, openjdk, openpowerlink, openvpn, opusfile, + postgresql, proftpd, pugixml, python-future, python-idna, qt5, + rtl8192eu, rtl8723ds, sdl2, sofia-sip, ssdp-responder, sudo, + sunxi-mali-utgard, thermald, ti-sgx-km, tmux, uboot, upx, vim, + webkitgtk, wolfssl, wpewebkit, xlib_libXpm, + xserver_xorg-server, xxhash, xz, yajl, zabbix + + Issues resolved (http://bugs.uclibc.org): + + #15271: no start-qemu.sh + #15281: Error compiling GDAL library for RPi-64 if libgdal-dev install.. + #15291: BR2_PACKAGE_GNU_EFI_ARCH_SUPPORTS without location + #15301: Selecting NAND Flash boot media (NAND_BOOT) breaks the uboot.. + #15331: Warning on python-flit-core license when generating legal info + 2022.11.1, released January 18th, 2023 Important / security related fixes. diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile index 9eee9955ec..63806155a8 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2022.11.1' +RELEASE='2022.11.2' ### Change here for more memory/cores ### VM_MEMORY=2048 From 8b5253b1c0db4414dddbe0bc5ce583f5f19717f7 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 1 Mar 2023 21:26:45 +0100 Subject: [PATCH 1105/5754] docs/website: update for 2022.11.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 12f967db14..d39222e694 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -42,37 +42,37 @@

      buildroot-2022.02.9.tar.xz

      -

      Latest stable release: 2022.11.1

      +

      Latest stable release: 2022.11.2

      - +
      - +
      -

      buildroot-2022.11.1.tar.gz

      -

      PGP signature

      +

      buildroot-2022.11.2.tar.gz

      +

      PGP signature

      - +
      - +
      -

      buildroot-2022.11.1.tar.xz

      -

      PGP signature

      +

      buildroot-2022.11.2.tar.xz

      +

      PGP signature

      diff --git a/docs/website/news.html b/docs/website/news.html index 0f8bd26702..9a76b82505 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,25 @@

      News

        +
      • +
        +
        +
        +

        2022.11.2 released

        +

        1 March 2023

        +
        +
        +

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

        +
        +
        +
        • +
      • From e5f9cbd91a4fc4491587bfc097c6d89f1782c1d5 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 1 Mar 2023 21:49:07 +0100 Subject: [PATCH 1106/5754] Update for 2022.02.10 Signed-off-by: Peter Korsgaard (cherry picked from commit 6fbe4b39017b0f05b70d6541ea7df4cd8cf59d0a) [Peter: drop Makefile change] Signed-off-by: Peter Korsgaard --- CHANGES | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/CHANGES b/CHANGES index 6647c0c8e6..a3de4ba1d7 100644 --- a/CHANGES +++ b/CHANGES @@ -721,6 +721,38 @@ #14731: BR2_PACKAGE_IOSTAT #14751: LVM2 Outdated Link +2022.02.10, released March 1st, 2023 + + Important / security related fixes. + + Fix make O=..._defconfig builds (regression in 2022.02.9). + + A number of additional/stricter checks have been added to + ./utils/check-package. + + Build host dependencies check extended to check for a number + of specific perl modules to better handle distributions (like + Fedora) with very fine grained perl packages. Also ensure + build host has git >= 2.0.0 when using packages written in + go/rust because the vendoring may need it. + + Defconfigs: ASUS tinker rk3288: Fix boot issue related to TPL + + Updated/fixed packages: afboot-stm32, apache, barebox, c-ares, + elf2flt, freeswitch, fwts, gcc, git, kodi, libgit2, libks, + libopenssl, live555, lua, lxc, mesa3d-headers, modsecurity2, + netopeer2, openjdk, openpowerlink, openvpn, opusfile, + postgresql, pugixml, python-future, qt5, sdl2, sofia-sip, + ssdp-responder, sudo, sunxi-mali-utgard, ti-sgx-km, tmux, + uboot, upx, vim, webkitgtk, wolfssl, wpewebkit, xlib_libXpm, + xserver_xorg-server, xxhash, xz, yajl, zabbix + + Issues resolved (http://bugs.uclibc.org): + + #15271: no start-qemu.sh + #15291: BR2_PACKAGE_GNU_EFI_ARCH_SUPPORTS without location + #15301: Selecting NAND Flash boot media (NAND_BOOT) breaks the uboot.. + 2022.02.9, released January 18th, 2023 Important / security related fixes. From 61f1601536f86dc90dcd1efc0eb13f58f4a3dbe5 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 1 Mar 2023 22:44:02 +0100 Subject: [PATCH 1107/5754] docs/website: update for 2022.02.10 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 d39222e694..fa9276a86c 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -8,37 +8,37 @@
        Download
        -

        Latest long term support release: 2022.02.9

        +

        Latest long term support release: 2022.02.10

        - +
        - +
        -

        buildroot-2022.02.9.tar.gz

        -

        PGP signature

        +

        buildroot-2022.02.10.tar.gz

        +

        PGP signature

        - +
        - +
        -

        buildroot-2022.02.9.tar.xz

        -

        PGP signature

        +

        buildroot-2022.02.10.tar.xz

        +

        PGP signature

        diff --git a/docs/website/news.html b/docs/website/news.html index 9a76b82505..7486002581 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,25 @@

        News

          +
        • +
          +
          +
          +

          2022.02.10 released

          +

          18 January 2023

          +
          +
          +

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

          +
          +
          +
          • +
        • From f67c896fecade666e44a734b34cbf7b0d08903c0 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Tue, 28 Feb 2023 16:54:56 -0800 Subject: [PATCH 1108/5754] package/qemu: check if qemu-system is enabled when creating symlink Commit c6b9cd9a11fe7fec6bfec2ddbd42c2851dba0011 added a symlink to qemu-system as a post install hook. However, it does not check if qemu-system is actually enabled with BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE. Add the check to make sure we only create the symlink if that is enabled. Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/qemu/qemu.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index 58b4ff10a5..cc8dc42a24 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -488,10 +488,12 @@ define HOST_QEMU_INSTALL_CMDS endef # install symlink to qemu-system +ifeq ($(BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE),y) define HOST_QEMU_POST_INSTALL_SYMLINK ln -sf ./qemu-system-$(HOST_QEMU_ARCH) $(HOST_DIR)/bin/qemu-system endef HOST_QEMU_POST_INSTALL_HOOKS += HOST_QEMU_POST_INSTALL_SYMLINK +endif $(eval $(host-generic-package)) From 783cd8d90d37b5e0b59d6f0bfca6667855b2b9e1 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Tue, 28 Feb 2023 23:16:25 +0100 Subject: [PATCH 1109/5754] package/apr: security bump version to 1.7.2 - remove 0001-cross-compile.patch (superseded by upstream commit [1]) - rename 0002-sys-param-h.patch to 0001-sys-param-h.patch - remove 0003-Merge-r1887279-from-trunk.patch (from upstream [2]) - remove 0004-apr-1.7.0-CVE-2021-35940.patch (superseded by upstream commit [3], remove APR_IGNORE_CVES accordingly) - set new configure option '--disable-sctp' (no libsctp provided by buildroot) - set new 'ac_cv_strerror_r_rc_int' explicitly to no (default for cross compile) - set new 'ac_cv_mmap__dev_zero' explicitly to yes - revert two upstream commits ([4], [5]) to fix apr-util build, fails otherwise because of some path mismatch where to find apr_rules.mk copied to apr-util-1.6.3/build/rules.mk, fixes: Makefile:50: .../build/apr-util-1.6.3/build/rules.mk: No such file or directory For details see [6]. [1] https://github.com/apache/apr/commit/866e1df66be6704a584feaf5c3d241e3d631d03a [2] https://github.com/apache/apr/commit/0a763c5e500f4304b7c534fae0fad430d64982e8 [3] https://github.com/apache/apr/commit/e0be630b681fac7b8b5e2f2e402a8e18a147f966 [4] https://github.com/apache/apr/commit/f82374627b3a6500a7a6cb11e48bcac59bcbb6a1 [5] https://github.com/apache/apr/commit/b6dbbc77da35a7b46754c99f465827f2a583e23c [6] https://downloads.apache.org/apr/CHANGES-APR-1.7 Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- package/apr/0001-cross-compile.patch | 58 --------- ...s-param-h.patch => 0001-sys-param-h.patch} | 0 ...r1872164.-Fix-the-name-of-libtool-wh.patch | 30 +++++ .../apr/0003-Merge-r1887279-from-trunk.patch | 69 ----------- ...Add-the-ability-to-cross-compile-APR.patch | 112 ++++++++++++++++++ .../apr/0004-apr-1.7.0-CVE-2021-35940.patch | 57 --------- package/apr/apr.hash | 4 +- package/apr/apr.mk | 7 +- 8 files changed, 148 insertions(+), 189 deletions(-) delete mode 100644 package/apr/0001-cross-compile.patch rename package/apr/{0002-sys-param-h.patch => 0001-sys-param-h.patch} (100%) create mode 100644 package/apr/0002-Revert-Backport-r1872164.-Fix-the-name-of-libtool-wh.patch delete mode 100644 package/apr/0003-Merge-r1887279-from-trunk.patch create mode 100644 package/apr/0003-Revert-Add-the-ability-to-cross-compile-APR.patch delete mode 100644 package/apr/0004-apr-1.7.0-CVE-2021-35940.patch diff --git a/package/apr/0001-cross-compile.patch b/package/apr/0001-cross-compile.patch deleted file mode 100644 index 559ebb74ba..0000000000 --- a/package/apr/0001-cross-compile.patch +++ /dev/null @@ -1,58 +0,0 @@ -Fix cross-compilation - -Patch was backported from Apache httpd: -http://svn.apache.org/viewvc?view=revision&revision=1327907 -http://svn.apache.org/viewvc?view=revision&revision=1328390 -http://svn.apache.org/viewvc?view=revision&revision=1328714 - -Patch submitted upstream: -https://issues.apache.org/bugzilla/show_bug.cgi?id=57058 - -Signed-off-by: Bernd Kuhls - -diff -uNr apr-1.5.1.org/configure.in apr-1.5.1/configure.in ---- apr-1.5.1.org/configure.in 2014-01-25 16:17:29.000000000 +0100 -+++ apr-1.5.1/configure.in 2014-10-05 11:20:40.080746760 +0200 -@@ -118,6 +118,16 @@ - echo "Configuring APR library" - echo "Platform: $host" - -+dnl In case of cross compilation we set CC_FOR_BUILD to cc unless -+dnl we got already CC_FOR_BUILD from environment. -+if test "x${build_alias}" != "x${host_alias}"; then -+ if test "x${CC_FOR_BUILD}" = "x"; then -+ CC_FOR_BUILD=cc -+ fi -+fi -+AC_SUBST(CC_FOR_BUILD) -+AC_SUBST(CFLAGS_FOR_BUILD) -+ - dnl Some initial steps for configuration. We setup the default directory - dnl and which files are to be configured. - -diff -uNr apr-1.5.1.org/Makefile.in apr-1.5.1/Makefile.in ---- apr-1.5.1.org/Makefile.in 2014-03-17 16:10:26.000000000 +0100 -+++ apr-1.5.1/Makefile.in 2014-10-05 11:22:53.031070519 +0200 -@@ -8,6 +8,8 @@ - # APR (Apache Portable Runtime) library Makefile. - # - CPP = @CPP@ -+CC_FOR_BUILD = @CC_FOR_BUILD@ -+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ - - # get substituted into some targets - APR_MAJOR_VERSION=@APR_MAJOR_VERSION@ -@@ -134,8 +134,13 @@ - $(APR_MKDIR) tools - $(LT_COMPILE) - -+ifdef CC_FOR_BUILD -+tools/gen_test_char@EXEEXT@: tools/gen_test_char.c $(LOCAL_LIBS) -+ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -DCROSS_COMPILE -o $@ $< -+else - tools/gen_test_char@EXEEXT@: $(OBJECTS_gen_test_char) - $(LINK_PROG) $(OBJECTS_gen_test_char) $(ALL_LIBS) -+endif - - include/private/apr_escape_test_char.h: tools/gen_test_char@EXEEXT@ - $(APR_MKDIR) include/private diff --git a/package/apr/0002-sys-param-h.patch b/package/apr/0001-sys-param-h.patch similarity index 100% rename from package/apr/0002-sys-param-h.patch rename to package/apr/0001-sys-param-h.patch diff --git a/package/apr/0002-Revert-Backport-r1872164.-Fix-the-name-of-libtool-wh.patch b/package/apr/0002-Revert-Backport-r1872164.-Fix-the-name-of-libtool-wh.patch new file mode 100644 index 0000000000..f80db1cb6b --- /dev/null +++ b/package/apr/0002-Revert-Backport-r1872164.-Fix-the-name-of-libtool-wh.patch @@ -0,0 +1,30 @@ +From 0aa7e33372b479a26e5f04dfc4801e24573a8737 Mon Sep 17 00:00:00 2001 +From: Graham Leggett +Date: Wed, 1 Jan 2020 10:43:39 +0000 +Subject: [PATCH] Revert: Backport r1872164. Fix the name of libtool when + cross compiling. + +git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.7.x@1872165 13f79535-47bb-0310-9956-ffa450edef68 + +[Revert upstream commit https://github.com/apache/apr/commit/f82374627b3a6500a7a6cb11e48bcac59bcbb6a1] +Signed-off-by: Peter Seiderer +--- + apr-config.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/apr-config.in b/apr-config.in +index bed47ca..4873fc0 100644 +--- a/apr-config.in ++++ b/apr-config.in +@@ -246,7 +246,7 @@ while test $# -gt 0; do + if test "$location" = "installed"; then + echo "${installbuilddir}/libtool" + elif test "$location" = "crosscompile"; then +- echo "$APR_TARGET_DIR/${installbuilddir}/libtool" ++ echo "$APR_TARGET_DIR/${installbuilddir}/build" + else + echo "$APR_BUILD_DIR/libtool" + fi +-- +2.39.2 + diff --git a/package/apr/0003-Merge-r1887279-from-trunk.patch b/package/apr/0003-Merge-r1887279-from-trunk.patch deleted file mode 100644 index 444b9d2b06..0000000000 --- a/package/apr/0003-Merge-r1887279-from-trunk.patch +++ /dev/null @@ -1,69 +0,0 @@ -From a15958a37a06f71c42c690278f9c958b93b7ee20 Mon Sep 17 00:00:00 2001 -From: Yann Ylavic -Date: Thu, 11 Mar 2021 14:10:21 +0000 -Subject: [PATCH] Merge r1887279 from trunk: - -build/apr_common.m4: avoid explicit inclusion of "confdefs.h" - -The failure is observed on `autoconf-2.69d` (soon to be released -as `autoconf-2.70`). There `int64_t` detection fails as: - -$ autoreconf && ./configure -checking whether int64_t and int use fmt %d... no -checking whether int64_t and long use fmt %ld... no -checking whether int64_t and long long use fmt %lld... no -configure: error: could not determine the string function for int64_t -``` - -This happens because `./configure` always stumbles on warning: - -configure:3350: gcc -c -g -O2 -Werror conftest.c >&5 -In file included from conftest.c:31: -confdefs.h:22: error: "__STDC_WANT_IEC_60559_ATTRIBS_EXT__" redefined [-Werror] - 22 | #define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1 - | - -It's triggered by double inclusion of `"confdefs.h"` contents: -explicitly in `APR_TRY_COMPILE_NO_WARNING` macro and implicitly -via `AC_LANG_SOURCE` use. - -To fix it and avoid having to define `main()` declaration the change -uses `AC_LANG_PROGRAM` instead. - -Tested on both `autoconf-2.69` and `autoconf-2.69d`. - - -Github: closes #25 -Submitted by: Sergei Trofimovich -Reviewed by: ylavic - - -git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.7.x@1887485 13f79535-47bb-0310-9956-ffa450edef68 - -[Retrieved from: -https://github.com/apache/apr/commit/0a763c5e500f4304b7c534fae0fad430d64982e8] -Signed-off-by: Fabrice Fontaine ---- - build/apr_common.m4 | 8 ++------ - 1 file changed, 2 insertions(+), 6 deletions(-) - -diff --git a/build/apr_common.m4 b/build/apr_common.m4 -index 297dd32cf75..b67a8608abe 100644 ---- a/build/apr_common.m4 -+++ b/build/apr_common.m4 -@@ -467,13 +467,9 @@ AC_DEFUN([APR_TRY_COMPILE_NO_WARNING], - CFLAGS="$CFLAGS -Werror" - fi - AC_COMPILE_IFELSE( -- [AC_LANG_SOURCE( -- [#include "confdefs.h" -- ] -- [[$1]] -- [int main(int argc, const char *const *argv) {] -+ [AC_LANG_PROGRAM( -+ [[$1]], - [[$2]] -- [ return 0; }] - )], [CFLAGS=$apr_save_CFLAGS - $3], [CFLAGS=$apr_save_CFLAGS - $4]) diff --git a/package/apr/0003-Revert-Add-the-ability-to-cross-compile-APR.patch b/package/apr/0003-Revert-Add-the-ability-to-cross-compile-APR.patch new file mode 100644 index 0000000000..ad250d4427 --- /dev/null +++ b/package/apr/0003-Revert-Add-the-ability-to-cross-compile-APR.patch @@ -0,0 +1,112 @@ +From ed1daed074fba0dabff825e63525d751b6bb7b8d Mon Sep 17 00:00:00 2001 +From: Graham Leggett +Date: Tue, 31 Dec 2019 21:26:02 +0000 +Subject: [PATCH] Revert: Add the ability to cross compile APR. + +git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.7.x@1872147 13f79535-47bb-0310-9956-ffa450edef68 + +[Revert upstream commit https://github.com/apache/apr/commit/b6dbbc77da35a7b46754c99f465827f2a583e23c] +Signed-off-by: Peter Seiderer +--- + CHANGES | 2 -- + apr-config.in | 22 ---------------------- + 2 files changed, 24 deletions(-) + +diff --git a/CHANGES b/CHANGES +index 71b2f0e..e751c90 100644 +--- a/CHANGES ++++ b/CHANGES +@@ -56,8 +56,6 @@ Changes for APR 1.7.1 + *) Don't try to use PROC_PTHREAD by default when cross compiling. + [Yann Ylavic] + +- *) Add the ability to cross compile APR. [Graham Leggett] +- + *) While cross-compiling, the tools/gen_test_char could not + be executed at build time, use AX_PROG_CC_FOR_BUILD to + build native tools/gen_test_char +diff --git a/apr-config.in b/apr-config.in +index 4873fc0..84b4073 100644 +--- a/apr-config.in ++++ b/apr-config.in +@@ -48,14 +48,6 @@ APR_LIBNAME="@APR_LIBNAME@" + # NOTE: the following line is modified during 'make install': alter with care! + location=@APR_CONFIG_LOCATION@ + +-# absolute path, but not installed path - we're cross compiling +-case "$0" in +- "${bindir}/"*) ;; +- "/"*) location=crosscompile; +- APR_TARGET_DIR=${0%${bindir}/apr-${APR_MAJOR_VERSION}-config} ;; +- *) ;; +-esac +- + show_usage() + { + cat << EOF +@@ -101,8 +93,6 @@ fi + + if test "$location" = "installed"; then + LA_FILE="$libdir/lib${APR_LIBNAME}.la" +-elif test "$location" = "crosscompile"; then +- LA_FILE="$APR_TARGET_DIR/$libdir/lib${APR_LIBNAME}.la" + else + LA_FILE="$APR_BUILD_DIR/lib${APR_LIBNAME}.la" + fi +@@ -132,8 +122,6 @@ while test $# -gt 0; do + --includedir) + if test "$location" = "installed"; then + flags="$includedir" +- elif test "$location" = "crosscompile"; then +- flags="$APR_TARGET_DIR/$includedir" + elif test "$location" = "source"; then + flags="$APR_SOURCE_DIR/include" + else +@@ -166,8 +154,6 @@ while test $# -gt 0; do + --includes) + if test "$location" = "installed"; then + flags="$flags -I$includedir $EXTRA_INCLUDES" +- elif test "$location" = "crosscompile"; then +- flags="$flags -I$APR_TARGET_DIR/$includedir $EXTRA_INCLUDES" + elif test "$location" = "source"; then + flags="$flags -I$APR_SOURCE_DIR/include $EXTRA_INCLUDES" + else +@@ -182,8 +168,6 @@ while test $# -gt 0; do + --installbuilddir) + if test "$location" = "installed"; then + echo "${installbuilddir}" +- elif test "$location" = "crosscompile"; then +- echo "$APR_TARGET_DIR/${installbuilddir}" + elif test "$location" = "source"; then + echo "$APR_SOURCE_DIR/build" + else +@@ -200,8 +184,6 @@ while test $# -gt 0; do + if test "$location" = "installed"; then + ### avoid using -L if libdir is a "standard" location like /usr/lib + flags="$flags -L$libdir -l${APR_LIBNAME}" +- elif test "$location" = "crosscompile"; then +- flags="$flags -L$APR_TARGET_DIR/$libdir -l${APR_LIBNAME}" + else + ### this surely can't work since the library is in .libs? + flags="$flags -L$APR_BUILD_DIR -l${APR_LIBNAME}" +@@ -219,8 +201,6 @@ while test $# -gt 0; do + # Since the user is specifying they are linking with libtool, we + # *know* that -R will be recognized by libtool. + flags="$flags -L$libdir -R$libdir -l${APR_LIBNAME}" +- elif test "$location" = "crosscompile"; then +- flags="$flags -L${APR_TARGET_DIR}/$libdir -l${APR_LIBNAME}" + else + flags="$flags $LA_FILE" + fi +@@ -245,8 +225,6 @@ while test $# -gt 0; do + --apr-libtool) + if test "$location" = "installed"; then + echo "${installbuilddir}/libtool" +- elif test "$location" = "crosscompile"; then +- echo "$APR_TARGET_DIR/${installbuilddir}/build" + else + echo "$APR_BUILD_DIR/libtool" + fi +-- +2.39.2 + diff --git a/package/apr/0004-apr-1.7.0-CVE-2021-35940.patch b/package/apr/0004-apr-1.7.0-CVE-2021-35940.patch deleted file mode 100644 index b065a3330a..0000000000 --- a/package/apr/0004-apr-1.7.0-CVE-2021-35940.patch +++ /dev/null @@ -1,57 +0,0 @@ - -SECURITY: CVE-2021-35940 (cve.mitre.org) - -Restore fix for CVE-2017-12613 which was missing in 1.7.x branch, though -was addressed in 1.6.x in 1.6.3 and later via r1807976. - -The fix was merged back to 1.7.x in r1891198. - -Since this was a regression in 1.7.0, a new CVE name has been assigned -to track this, CVE-2021-35940. - -Thanks to Iveta Cesalova for reporting this issue. - -https://svn.apache.org/viewvc?view=revision&revision=1891198 - -[Retrieved from: -https://dist.apache.org/repos/dist/release/apr/patches/apr-1.7.0-CVE-2021-35940.patch] -Signed-off-by: Fabrice Fontaine - -Index: ./time/unix/time.c -=================================================================== ---- ./time/unix/time.c (revision 1891197) -+++ ./time/unix/time.c (revision 1891198) -@@ -142,6 +142,9 @@ - static const int dayoffset[12] = - {306, 337, 0, 31, 61, 92, 122, 153, 184, 214, 245, 275}; - -+ if (xt->tm_mon < 0 || xt->tm_mon >= 12) -+ return APR_EBADDATE; -+ - /* shift new year to 1st March in order to make leap year calc easy */ - - if (xt->tm_mon < 2) -Index: ./time/win32/time.c -=================================================================== ---- ./time/win32/time.c (revision 1891197) -+++ ./time/win32/time.c (revision 1891198) -@@ -54,6 +54,9 @@ - static const int dayoffset[12] = - {0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; - -+ if (tm->wMonth < 1 || tm->wMonth > 12) -+ return APR_EBADDATE; -+ - /* Note; the caller is responsible for filling in detailed tm_usec, - * tm_gmtoff and tm_isdst data when applicable. - */ -@@ -228,6 +231,9 @@ - static const int dayoffset[12] = - {306, 337, 0, 31, 61, 92, 122, 153, 184, 214, 245, 275}; - -+ if (xt->tm_mon < 0 || xt->tm_mon >= 12) -+ return APR_EBADDATE; -+ - /* shift new year to 1st March in order to make leap year calc easy */ - - if (xt->tm_mon < 2) diff --git a/package/apr/apr.hash b/package/apr/apr.hash index d7739d7ed3..96f43d3710 100644 --- a/package/apr/apr.hash +++ b/package/apr/apr.hash @@ -1,4 +1,4 @@ -# From http://archive.apache.org/dist/apr/apr-1.7.0.tar.bz2.sha256 -sha256 e2e148f0b2e99b8e5c6caa09f6d4fb4dd3e83f744aa72a952f94f5a14436f7ea apr-1.7.0.tar.bz2 +# From https://archive.apache.org/dist/apr/apr-1.7.2.tar.bz2.sha256 +sha256 75e77cc86776c030c0a5c408dfbd0bf2a0b75eed5351e52d5439fa1e5509a43e apr-1.7.2.tar.bz2 # Locally calculated sha256 f854aeef66ecd55a126226e82b3f26793fc3b1c584647f6a0edc5639974c38ad LICENSE diff --git a/package/apr/apr.mk b/package/apr/apr.mk index 77217ccbb3..bdc5e915c6 100644 --- a/package/apr/apr.mk +++ b/package/apr/apr.mk @@ -4,7 +4,7 @@ # ################################################################################ -APR_VERSION = 1.7.0 +APR_VERSION = 1.7.2 APR_SOURCE = apr-$(APR_VERSION).tar.bz2 APR_SITE = https://archive.apache.org/dist/apr APR_LICENSE = Apache-2.0 @@ -16,8 +16,7 @@ APR_INSTALL_STAGING = YES # so we need to autoreconf: APR_AUTORECONF = YES -# 0004-apr-1.7.0-CVE-2021-35940.patch -APR_IGNORE_CVES += CVE-2021-35940 +APR_CONF_OPTS = --disable-sctp # avoid apr_hints.m4 by setting apr_preload_done=yes and set # the needed CFLAGS on our own (avoids '-D_REENTRANT' in case @@ -32,6 +31,7 @@ APR_CONF_ENV = \ CFLAGS_FOR_BUILD="$(HOST_CFLAGS)" \ CFLAGS="$(APR_CFLAGS)" \ ac_cv_file__dev_zero=yes \ + ac_cv_mmap__dev_zero=yes \ ac_cv_func_setpgrp_void=yes \ apr_cv_process_shared_works=yes \ apr_cv_mutex_robust_shared=no \ @@ -39,6 +39,7 @@ APR_CONF_ENV = \ ac_cv_sizeof_struct_iovec=8 \ ac_cv_sizeof_pid_t=4 \ ac_cv_struct_rlimit=yes \ + ac_cv_strerror_r_rc_int=no \ ac_cv_o_nonblock_inherited=no \ apr_cv_mutex_recursive=yes \ apr_cv_epoll=yes \ From bc344d70d869fa10e44e098f38eda64a45450b68 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Sun, 5 Mar 2023 00:11:45 +0200 Subject: [PATCH 1110/5754] package/wpebackend-fdo: bump to version 1.14.1 This is a bugfix release which includes important fixes which solve a memory leak and hitting a situation where the output no longer gets updated. Release notes: https://wpewebkit.org/release/wpebackend-fdo-1.14.1.html Signed-off-by: Adrian Perez de Castro Signed-off-by: Peter Korsgaard --- package/wpebackend-fdo/wpebackend-fdo.hash | 8 ++++---- package/wpebackend-fdo/wpebackend-fdo.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/wpebackend-fdo/wpebackend-fdo.hash b/package/wpebackend-fdo/wpebackend-fdo.hash index e2f2c6c89f..d1a344a664 100644 --- a/package/wpebackend-fdo/wpebackend-fdo.hash +++ b/package/wpebackend-fdo/wpebackend-fdo.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/wpebackend-fdo-1.14.0.tar.xz.sums -md5 ea62dfa9ecb366598a837d7446ed48ac wpebackend-fdo-1.14.0.tar.xz -sha1 1500be9212381a404f4a46b22b90a9880ba11c01 wpebackend-fdo-1.14.0.tar.xz -sha256 e75b0cb2c7145448416e8696013d8883f675c66c11ed750e06865efec5809155 wpebackend-fdo-1.14.0.tar.xz +# From https://wpewebkit.org/releases/wpebackend-fdo-1.14.1.tar.xz.sums +md5 2b49218cdd16075b028bbaf5a4f57890 wpebackend-fdo-1.14.1.tar.xz +sha1 a68db2480d29d53d7fa24c69888bacbab6efea11 wpebackend-fdo-1.14.1.tar.xz +sha256 01938dd93c62b3a47b18dd13c70d50490a8b8a6caec23c8550a3dbdbcc6bbb50 wpebackend-fdo-1.14.1.tar.xz # Hashes for license files: sha256 c9f6803371047fad3e72200ec6cd226329a5ee08ac61104c8211c2761fb46825 COPYING diff --git a/package/wpebackend-fdo/wpebackend-fdo.mk b/package/wpebackend-fdo/wpebackend-fdo.mk index afe37b086e..c1e4e05796 100644 --- a/package/wpebackend-fdo/wpebackend-fdo.mk +++ b/package/wpebackend-fdo/wpebackend-fdo.mk @@ -4,7 +4,7 @@ # ################################################################################ -WPEBACKEND_FDO_VERSION = 1.14.0 +WPEBACKEND_FDO_VERSION = 1.14.1 WPEBACKEND_FDO_SITE = https://wpewebkit.org/releases WPEBACKEND_FDO_SOURCE = wpebackend-fdo-$(WPEBACKEND_FDO_VERSION).tar.xz WPEBACKEND_FDO_INSTALL_STAGING = YES From f820a978f835c2d1fb5df73068b4eb7b6809f86a Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 4 Mar 2023 23:25:44 +0100 Subject: [PATCH 1111/5754] package/quickjs: add QUICKJS_CPE_ID_VENDOR cpe:2.3:a:quickjs_project:quickjs is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aquickjs_project%3Aquickjs Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/quickjs/quickjs.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/quickjs/quickjs.mk b/package/quickjs/quickjs.mk index a026eec4f0..ff39209100 100644 --- a/package/quickjs/quickjs.mk +++ b/package/quickjs/quickjs.mk @@ -9,6 +9,7 @@ QUICKJS_SOURCE = quickjs-$(QUICKJS_VERSION).tar.xz QUICKJS_SITE = https://bellard.org/quickjs QUICKJS_LICENSE = MIT QUICKJS_LICENSE_FILES = LICENSE +QUICKJS_CPE_ID_VENDOR = quickjs_project QUICKJS_INSTALL_STAGING = YES ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) From 25c67417160b176776233aad9b0d685643695f8e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 4 Mar 2023 23:31:01 +0100 Subject: [PATCH 1112/5754] package/quazip: add QUAZIP_CPE_ID_VENDOR cpe:2.3:a:quazip_project:quazip is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Aquazip_project%3Aquazip Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/quazip/quazip.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/quazip/quazip.mk b/package/quazip/quazip.mk index f4de2a11a4..70534b63b3 100644 --- a/package/quazip/quazip.mk +++ b/package/quazip/quazip.mk @@ -12,5 +12,6 @@ QUAZIP_DEPENDENCIES = \ qt5base QUAZIP_LICENSE = LGPL-2.1 QUAZIP_LICENSE_FILES = COPYING +QUAZIP_CPE_ID_VENDOR = quazip_project $(eval $(cmake-package)) From d5c6ff24dccb7fec54e7fa43af9f987b95eba1f8 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 4 Mar 2023 23:38:07 +0100 Subject: [PATCH 1113/5754] package/libolm: add CPE variables cpe:2.3:a:matrix:olm is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Amatrix%3Aolm Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libolm/libolm.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/libolm/libolm.mk b/package/libolm/libolm.mk index 607e50702f..6f06686555 100644 --- a/package/libolm/libolm.mk +++ b/package/libolm/libolm.mk @@ -9,6 +9,8 @@ LIBOLM_SOURCE = olm-$(LIBOLM_VERSION).tar.gz LIBOLM_SITE = https://gitlab.matrix.org/matrix-org/olm/-/archive/$(LIBOLM_VERSION) LIBOLM_LICENSE = Apache-2.0 LIBOLM_LICENSE_FILES = LICENSE +LIBOLM_CPE_ID_VENDOR = matrix +LIBOLM_CPE_ID_PRODUCT = olm LIBOLM_INSTALL_STAGING = YES LIBOLM_CONF_OPTS = -DOLM_TESTS=OFF From 0c29b4281d5a1c55739c62438f8d7676d7a16823 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 4 Mar 2023 14:52:58 +0100 Subject: [PATCH 1114/5754] package/exfat: security bump to version 1.4.0 - Fix CVE-2022-29973: relan exFAT 1.3.0 allows local users to obtain sensitive information (data from deleted files in the filesystem) in certain situations involving offsets beyond ValidDataLength. - libfuse3 is supported since https://github.com/relan/exfat/commit/7cbc1544a4f68d8b4d33b187a053fc554405c56e https://github.com/relan/exfat/releases/tag/v1.4.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/exfat/Config.in | 2 +- package/exfat/exfat.hash | 2 +- package/exfat/exfat.mk | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/exfat/Config.in b/package/exfat/Config.in index c0b4eabe11..c0ed2570d9 100644 --- a/package/exfat/Config.in +++ b/package/exfat/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_EXFAT depends on BR2_USE_MMU # libfuse depends on BR2_USE_WCHAR depends on !BR2_STATIC_LIBS # libfuse - select BR2_PACKAGE_LIBFUSE + select BR2_PACKAGE_LIBFUSE3 if !BR2_PACKAGE_LIBFUSE help A full-featured exFAT file system implementation for GNU/Linux and other Unix-like systems as a FUSE module. diff --git a/package/exfat/exfat.hash b/package/exfat/exfat.hash index b40fc7f0e5..c6082a403a 100644 --- a/package/exfat/exfat.hash +++ b/package/exfat/exfat.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 07652136064da5e4d32df5555f88c138ffa4835a23b88a5bae2015f21006e0d3 fuse-exfat-1.3.0.tar.gz +sha256 a1cfedc55e0e7a12c184605aa0f0bf44b24a3fb272449b20b2c8bbe6edb3001e fuse-exfat-1.4.0.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/exfat/exfat.mk b/package/exfat/exfat.mk index c0ef77a113..a8efe5b0ba 100644 --- a/package/exfat/exfat.mk +++ b/package/exfat/exfat.mk @@ -4,10 +4,12 @@ # ################################################################################ -EXFAT_VERSION = 1.3.0 +EXFAT_VERSION = 1.4.0 EXFAT_SITE = https://github.com/relan/exfat/releases/download/v$(EXFAT_VERSION) EXFAT_SOURCE = fuse-exfat-$(EXFAT_VERSION).tar.gz -EXFAT_DEPENDENCIES = libfuse host-pkgconf +EXFAT_DEPENDENCIES = \ + $(if $(BR2_PACKAGE_LIBFUSE3),libfuse3,libfuse) \ + host-pkgconf EXFAT_LICENSE = GPL-2.0+ EXFAT_LICENSE_FILES = COPYING EXFAT_CPE_ID_VENDOR = exfat_project From d7085ab3eaeb05fedefdb862efe78ad85ab80187 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 4 Mar 2023 14:53:41 +0100 Subject: [PATCH 1115/5754] package/exfat-utils: security bump to version 1.4.0 Fix CVE-2022-29973: relan exFAT 1.3.0 allows local users to obtain sensitive information (data from deleted files in the filesystem) in certain situations involving offsets beyond ValidDataLength. https://github.com/relan/exfat/releases/tag/v1.4.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/exfat-utils/exfat-utils.hash | 2 +- package/exfat-utils/exfat-utils.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/exfat-utils/exfat-utils.hash b/package/exfat-utils/exfat-utils.hash index 6c6e09ccf0..b4ed8bc568 100644 --- a/package/exfat-utils/exfat-utils.hash +++ b/package/exfat-utils/exfat-utils.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 dfebd07a7b907e2d603d3a9626e6440bd43ec6c4e8c07ccfc57ce9502b724835 exfat-utils-1.3.0.tar.gz +sha256 241575fa93104406a47e79e53e4d907bae69886f11621f70a45276c62b75bf69 exfat-utils-1.4.0.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/exfat-utils/exfat-utils.mk b/package/exfat-utils/exfat-utils.mk index fa471952f2..c02cefb0c5 100644 --- a/package/exfat-utils/exfat-utils.mk +++ b/package/exfat-utils/exfat-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXFAT_UTILS_VERSION = 1.3.0 +EXFAT_UTILS_VERSION = 1.4.0 EXFAT_UTILS_SITE = https://github.com/relan/exfat/releases/download/v$(EXFAT_UTILS_VERSION) EXFAT_UTILS_LICENSE = GPL-2.0+ EXFAT_UTILS_LICENSE_FILES = COPYING From fd8db3d60c9194c1d27d1bc301f3e0c6b0c81109 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 3 Mar 2023 20:07:26 +0100 Subject: [PATCH 1116/5754] package/libglfw: add wayland dependency Fix added by commit 0bbb12eff3b9f9d9719c48644c2b3d563e80de48 was incomplete resulting in the following build failure: -- Checking for modules 'wayland-client>=0.2.7;wayland-cursor>=0.2.7;wayland-egl>=0.2.7;xkbcommon' -- Package 'wayland-client', required by 'virtual:world', not found -- Package 'wayland-cursor', required by 'virtual:world', not found -- Package 'wayland-egl', required by 'virtual:world', not found CMake Error at /home/autobuild/autobuild/instance-9/output-1/host/share/cmake-3.22/Modules/FindPkgConfig.cmake:603 (message): A required package was not found Fixes: - http://autobuild.buildroot.org/results/9c032902418a4ab0c9aa655eb29eddee0711815d - http://autobuild.buildroot.org/results/7381e114fa5c796c6edbb2c8e3987563bb32b6fa Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libglfw/libglfw.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libglfw/libglfw.mk b/package/libglfw/libglfw.mk index eee8e7b298..f5d254eec3 100644 --- a/package/libglfw/libglfw.mk +++ b/package/libglfw/libglfw.mk @@ -29,7 +29,7 @@ LIBGLFW_DEPENDENCIES += libgles endif ifeq ($(BR2_PACKAGE_WAYLAND),y) -LIBGLFW_DEPENDENCIES += libxkbcommon wayland-protocols +LIBGLFW_DEPENDENCIES += libxkbcommon wayland wayland-protocols # Override pkg-config pkgdatadir variable, it needs the prefix LIBGLFW_CONF_OPTS += \ -DGLFW_USE_WAYLAND=1 \ From 7af75b36aaf5c048a2db3e506cb7ec10d4ba05dc Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 3 Mar 2023 20:06:05 +0100 Subject: [PATCH 1117/5754] package/f2fs-tools: add F2FS_TOOLS_CPE_ID_VENDOR cpe:2.3:a:f2fs-tools_project:f2fs-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%3Af2fs-tools_project%3Af2fs-tools Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/f2fs-tools/f2fs-tools.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/f2fs-tools/f2fs-tools.mk b/package/f2fs-tools/f2fs-tools.mk index 60f1004d77..f94244f2ad 100644 --- a/package/f2fs-tools/f2fs-tools.mk +++ b/package/f2fs-tools/f2fs-tools.mk @@ -14,6 +14,7 @@ F2FS_TOOLS_AUTORECONF = YES F2FS_TOOLS_INSTALL_STAGING = YES F2FS_TOOLS_LICENSE = GPL-2.0 F2FS_TOOLS_LICENSE_FILES = COPYING +F2FS_TOOLS_CPE_ID_VENDOR = f2fs-tools_project ifeq ($(BR2_PACKAGE_LIBSELINUX),y) F2FS_TOOLS_CONF_OPTS += --with-selinux From 7f96255f4a40a5cbc0c37a69126c5a06fe8773b6 Mon Sep 17 00:00:00 2001 From: Sebastian Weyer Date: Fri, 3 Mar 2023 10:37:53 +0100 Subject: [PATCH 1118/5754] package/bash: fix naming of target-finalize-hook When the target-finalize-hook for bash was added in commit 311c9eebc4dcfb764e3a7082706daf68e0603188 in order to write bash into /etc/shells, it was done at the same time as for package/mksh and it was incorrectly copied and MKSH still appeared in the name of the hook. The hook is now correctly named BASH_ADD_BASH_TO_SHELLS Signed-off-by: Sebastian Weyer Signed-off-by: Peter Korsgaard --- package/bash/bash.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/bash/bash.mk b/package/bash/bash.mk index ec5e2d722f..9a73ed8c36 100644 --- a/package/bash/bash.mk +++ b/package/bash/bash.mk @@ -62,10 +62,10 @@ endif # Add /bin/bash to /etc/shells otherwise some login tools like dropbear # can reject the user connection. See man shells. -define BASH_ADD_MKSH_TO_SHELLS +define BASH_ADD_BASH_TO_SHELLS grep -qsE '^/bin/bash$$' $(TARGET_DIR)/etc/shells \ || echo "/bin/bash" >> $(TARGET_DIR)/etc/shells endef -BASH_TARGET_FINALIZE_HOOKS += BASH_ADD_MKSH_TO_SHELLS +BASH_TARGET_FINALIZE_HOOKS += BASH_ADD_BASH_TO_SHELLS $(eval $(autotools-package)) From f931ac28192b59fce36e5e63bb5770b598d26def Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 2 Mar 2023 23:12:17 +0100 Subject: [PATCH 1119/5754] package/gr-osmosdr: drop BR2_PACKAGE_GR_OSMOSDR_PYTHON Drop BR2_PACKAGE_GR_OSMOSDR_PYTHON as disabling python will raise the following build failure if BR2_PACKAGE_GNURADIO_PYTHON is set since bump of gnuradio to version 3.10.4.0 in commit e37c110bead8b7b35cd97915673fa785ccb39f2d and https://github.com/gnuradio/gnuradio/commit/51d3ad973292763a6fc0cf8e971faa3cf89029e9: CMake Error at lib/CMakeLists.txt:51 (add_library): Target "gnuradio-osmosdr" links to target "Python::Module" but the target was not found. Perhaps a find_package() call is missing for an IMPORTED target, or an ALIAS target is missing? No entry in Config.in.legacy is needed as python support in gr-osmosdr will now automatically be enabled if BR2_PACKAGE_GNURADIO_PYTHON is set Fixes: - http://autobuild.buildroot.org/results/49e9f7bf8bfc7008688c1a3bc3744b7d3be3ce18 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/gr-osmosdr/Config.in | 7 ------- package/gr-osmosdr/gr-osmosdr.mk | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/package/gr-osmosdr/Config.in b/package/gr-osmosdr/Config.in index 04fa10be80..d83de75282 100644 --- a/package/gr-osmosdr/Config.in +++ b/package/gr-osmosdr/Config.in @@ -11,13 +11,6 @@ config BR2_PACKAGE_GR_OSMOSDR if BR2_PACKAGE_GR_OSMOSDR -config BR2_PACKAGE_GR_OSMOSDR_PYTHON - bool "python support" - depends on BR2_PACKAGE_GNURADIO_PYTHON - depends on BR2_PACKAGE_PYTHON3 - help - Enable Python support - config BR2_PACKAGE_GR_OSMOSDR_IQFILE bool "IQ File Source support" help diff --git a/package/gr-osmosdr/gr-osmosdr.mk b/package/gr-osmosdr/gr-osmosdr.mk index 89907c1baa..6011a67539 100644 --- a/package/gr-osmosdr/gr-osmosdr.mk +++ b/package/gr-osmosdr/gr-osmosdr.mk @@ -22,7 +22,7 @@ GR_OSMOSDR_CONF_OPTS = \ # compile time. GR_OSMOSDR_INSTALL_STAGING = YES -ifeq ($(BR2_PACKAGE_GR_OSMOSDR_PYTHON),y) +ifeq ($(BR2_PACKAGE_GNURADIO_PYTHON),y) GR_OSMOSDR_CONF_OPTS += -DENABLE_PYTHON=ON GR_OSMOSDR_DEPENDENCIES += python3 else From 90e1a64cb0abff65bc2a3e8ba811c732d820a910 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 2 Mar 2023 18:51:07 +0100 Subject: [PATCH 1120/5754] package/opus: force arm mode instead of Thumb mode Fix the following build failure: /tmp/cckXvlOO.s:352: Error: selected processor does not support `smull r6,ip,r5,r0' in Thumb mode Fixes: - http://autobuild.buildroot.org/results/fdedcc8f68651ec34417d609b40effbac456c80d Signed-off-by: Fabrice Fontaine [Peter: tweak comment] Signed-off-by: Peter Korsgaard --- package/opus/opus.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/opus/opus.mk b/package/opus/opus.mk index 2fa929c7df..d8e0623e15 100644 --- a/package/opus/opus.mk +++ b/package/opus/opus.mk @@ -12,6 +12,13 @@ OPUS_INSTALL_STAGING = YES OPUS_CFLAGS = $(TARGET_CFLAGS) +# opus has ARM assembly optimizations not compatible with thumb1: +# Error: selected processor does not support `smull r6,ip,r5,r0' in Thumb mode +# so force ARM mode +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +OPUS_CFLAGS += -marm +endif + ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y) OPUS_CFLAGS += -O0 endif From b3b2ef030263d275d1bfcdf7db41a5faa93339ca Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 28 Feb 2023 23:07:39 +0100 Subject: [PATCH 1121/5754] package/proftpd: add libidn2 optional dependency libidn2 is an optional dependency which is enabled by default since version 1.3.8 and https://github.com/proftpd/proftpd/commit/5f61ac028e0930e7de9ea2a00864ccb6dc048f64 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/proftpd/proftpd.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/proftpd/proftpd.mk b/package/proftpd/proftpd.mk index 8e7d108c9e..d3b6308185 100644 --- a/package/proftpd/proftpd.mk +++ b/package/proftpd/proftpd.mk @@ -27,6 +27,10 @@ PROFTPD_CONF_OPTS = \ --with-gnu-ld \ --without-openssl-cmdline +ifeq ($(BR2_PACKAGE_LIBIDN2),y) +PROFTPD_DEPENDENCIES += libidn2 +endif + ifeq ($(BR2_PACKAGE_PROFTPD_MOD_CAP),y) PROFTPD_CONF_OPTS += --enable-cap PROFTPD_DEPENDENCIES += libcap From 091655d9ad3a3b3f05be4216b5936b644a596267 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 28 Feb 2023 23:07:40 +0100 Subject: [PATCH 1122/5754] package/proftpd: add pcre2 optional dependency pcre2 is an optional dependency since version 1.3.8 and https://github.com/proftpd/proftpd/commit/e63cf016f574890c4096d587b8b1f55d87ac05d5 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/proftpd/proftpd.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/proftpd/proftpd.mk b/package/proftpd/proftpd.mk index d3b6308185..398155222d 100644 --- a/package/proftpd/proftpd.mk +++ b/package/proftpd/proftpd.mk @@ -31,6 +31,13 @@ ifeq ($(BR2_PACKAGE_LIBIDN2),y) PROFTPD_DEPENDENCIES += libidn2 endif +ifeq ($(BR2_PACKAGE_PCRE2),y) +PROFTPD_CONF_OPTS += --enable-pcre2 +PROFTPD_DEPENDENCIES += pcre2 +else +PROFTPD_CONF_OPTS += --disable-pcre2 +endif + ifeq ($(BR2_PACKAGE_PROFTPD_MOD_CAP),y) PROFTPD_CONF_OPTS += --enable-cap PROFTPD_DEPENDENCIES += libcap From b1312da7650b41d95aecf29fab85fd6a9903c507 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 28 Feb 2023 23:07:41 +0100 Subject: [PATCH 1123/5754] package/proftpd: needs dynamic library proftpd doesn't build statically because it does not use pkg-config to retrieve its dependencies since its addition in commit 5d173ec4122b89857e6d93fc337311b1f87631c9: /tmp/instance-13/output-1/host/lib/gcc/arc-buildroot-linux-uclibc/10.2.0/../../../../arc-buildroot-linux-uclibc/bin/ld: /tmp/instance-13/output-1/host/arc-buildroot-linux-uclibc/sysroot/usr/lib/libidn2.a(libunistring_la-striconveh.o): in function `iconv_carefully_1': buildroot/build/libidn2-2.3.4/unistring/striconveh.c:233: undefined reference to `libiconv' [...] /tmp/instance-5/output-1/host/lib/gcc/arceb-buildroot-linux-uclibc/10.2.0/../../../../arceb-buildroot-linux-uclibc/bin/ld: /tmp/instance-5/output-1/host/arceb-buildroot-linux-uclibc/sysroot/usr/lib/libcrypto.a(bio_lib.o): in function `BIO_free': bio_lib.c:(.text+0x3f2): undefined reference to `__atomic_fetch_sub_4' Fixes: - http://autobuild.buildroot.org/results/09f3f37b63dc68d31b18816b818df86fa3be095c - http://autobuild.buildroot.org/results/2aba5297206e44dc086c3138ace70e85739196f3 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/proftpd/Config.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/proftpd/Config.in b/package/proftpd/Config.in index aed1958b8d..7b9f74895a 100644 --- a/package/proftpd/Config.in +++ b/package/proftpd/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PROFTPD bool "proftpd" depends on BR2_USE_MMU # fork() + depends on !BR2_STATIC_LIBS help ProFTPD, a highly configurable FTP server. @@ -104,3 +105,7 @@ config BR2_PACKAGE_PROFTPD_BUFFER_SIZE 0 uses the default size of 1024. endif + +comment "proftpd needs a toolchain w/ dynamic library" + depends on BR2_USE_MMU + depends on BR2_STATIC_LIBS From 6454358fe16912b17d56db6767cfac8d67c34204 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 28 Feb 2023 23:16:24 +0100 Subject: [PATCH 1124/5754] package/pugixml: drop header-only option Header-only option raises the following build failure with gerbera since commit cc3a4a7b1de7b158354c650d234339e8a969a730: /home/thomas/autobuild/instance-2/output-1/host/lib/gcc/nios2-buildroot-linux-gnu/10.4.0/../../../../nios2-buildroot-linux-gnu/bin/ld: CMakeFiles/gerbera.dir/src/main.cc.o: in function `ConfigGenerator::~ConfigGenerator()': /home/thomas/autobuild/instance-2/output-1/build/gerbera-1.10.0/src/config/config_generator.h:33: undefined reference to `pugi::xml_document::~xml_document()' This build failure can't be fixed by adding a !BR2_PACKAGE_PUGIXML_HEADER_ONLY dependency as it will create the following recursive dependency: package/gerbera/Config.in:1:error: recursive dependency detected! package/gerbera/Config.in:1: symbol BR2_PACKAGE_GERBERA depends on BR2_PACKAGE_PUGIXML_HEADER_ONLY package/pugixml/Config.in:42: symbol BR2_PACKAGE_PUGIXML_HEADER_ONLY depends on BR2_PACKAGE_PUGIXML package/pugixml/Config.in:1: symbol BR2_PACKAGE_PUGIXML is selected by BR2_PACKAGE_GERBERA Moreover, commit 48b2e50eb8df36e3e3ab18692bd9e0dde3b38702 stated that "Compact and header-only modes are not strictly needed for our use case, but we did the work anyway and may be useful for someone else." So dropping header-only seems to be the right approach Fixes: - http://autobuild.buildroot.org/results/800537a1ef5f48d24c20aad7a9c96c56dfdc77f5 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++++ package/pugixml/Config.in | 9 --------- package/pugixml/pugixml.mk | 4 ---- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 381e1e3a8c..a31543d5fa 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_PUGIXML_HEADER_ONLY + bool "pugixml header-only removed" + select BR2_LEGACY + help + The header-only version raises a build failure with gerbera. + config BR2_PACKAGE_UCCP420WLAN bool "uccp420wlan removed" select BR2_LEGACY diff --git a/package/pugixml/Config.in b/package/pugixml/Config.in index 6b7d2e3259..d5a3cb3ebb 100644 --- a/package/pugixml/Config.in +++ b/package/pugixml/Config.in @@ -39,15 +39,6 @@ config BR2_PACKAGE_PUGIXML_COMPACT http://pugixml.org/docs/manual.html#dom.memory.compact -config BR2_PACKAGE_PUGIXML_HEADER_ONLY - bool "Enable header-only version" - help - All source code for pugixml will be included in every - translation unit that includes pugixml.hpp. This is how most - of Boost and STL libraries work. - - http://pugixml.org/docs/manual.html#install.building.header - endif comment "pugixml needs a toolchain w/ C++" diff --git a/package/pugixml/pugixml.mk b/package/pugixml/pugixml.mk index c8d59f0864..415227a40a 100644 --- a/package/pugixml/pugixml.mk +++ b/package/pugixml/pugixml.mk @@ -31,10 +31,6 @@ endif PUGIXML_BUILD_DEFINES += PUGIXML_HAS_LONG_LONG HOST_PUGIXML_BUILD_DEFINES += PUGIXML_HAS_LONG_LONG -ifeq ($(BR2_PACKAGE_PUGIXML_HEADER_ONLY),y) -PUGIXML_BUILD_DEFINES += PUGIXML_HEADER_ONLY -endif - PUGIXML_CONF_OPTS += -DPUGIXML_BUILD_DEFINES="$(subst $(space),;,$(PUGIXML_BUILD_DEFINES))" HOST_PUGIXML_CONF_OPTS += \ From 4789d37cc4c23b15a9fb95de73365b55e9fbd1aa Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Mon, 27 Feb 2023 09:22:30 +0100 Subject: [PATCH 1125/5754] package/rtl8189es: fix build failure on PowerPC64 Add local patches pending upstream[0] to fix conflict of get_ra(). get_ra() is present both in PowerPC64 Linux header and in rtl8189es driver so in the patch we rename all the occurrences to rtl_get_ra(). Fixes: http://autobuild.buildroot.net/results/45efdb0806d0bb2f7d542be80ed02bf2dc080df4/ [0]: https://github.com/jwrdegoede/rtl8189ES_linux/pull/94 Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- .../0001-Fix-build-failure-on-PowerPC64.patch | 113 ++++++++++++++++++ 1 file changed, 113 insertions(+) create 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 new file mode 100644 index 0000000000..8c876f16ee --- /dev/null +++ b/package/rtl8189es/0001-Fix-build-failure-on-PowerPC64.patch @@ -0,0 +1,113 @@ +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 + From cde69c668d6692114845a927c8c5534ed78019db Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Sun, 5 Mar 2023 23:25:58 -0800 Subject: [PATCH 1126/5754] package/rtl8821cu: switch to version 20210916 The author of the 8821cu repository has requested that we switch to a newer major version of the driver located at 8821cu-20210916: https://github.com/morrownr/8821cu-20210118/pull/93#issuecomment-1452675897 Switch to that new repository. Fixes a build issue against PowerPC64. Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/rtl8821cu/rtl8821cu.hash | 2 +- package/rtl8821cu/rtl8821cu.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/rtl8821cu/rtl8821cu.hash b/package/rtl8821cu/rtl8821cu.hash index efb9871472..e2d83adc0f 100644 --- a/package/rtl8821cu/rtl8821cu.hash +++ b/package/rtl8821cu/rtl8821cu.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 09b9fb4160003502d564d0d0d85d6f19b8b6d1627d1a339b3ddfca6a948d84fb rtl8821cu-86cc5ceb7c28b9b997838e1c796847f6c395c382.tar.gz +sha256 1d090da292c3f9322603846467a80278670211fcde3354dcabfe32c449992493 rtl8821cu-69c903b75bde36293c66b25c051916a74dbadf58.tar.gz sha256 af54d00efc57cfce664171ac8be2a20c0f290b1b5c1a67bb2eba7b6380276c4e LICENSE diff --git a/package/rtl8821cu/rtl8821cu.mk b/package/rtl8821cu/rtl8821cu.mk index 97f50d9633..b3e4ad3fc8 100644 --- a/package/rtl8821cu/rtl8821cu.mk +++ b/package/rtl8821cu/rtl8821cu.mk @@ -4,8 +4,8 @@ # ################################################################################ -RTL8821CU_VERSION = 86cc5ceb7c28b9b997838e1c796847f6c395c382 -RTL8821CU_SITE = $(call github,morrownr,8821cu-20210118,$(RTL8821CU_VERSION)) +RTL8821CU_VERSION = 69c903b75bde36293c66b25c051916a74dbadf58 +RTL8821CU_SITE = $(call github,morrownr,8821cu-20210916,$(RTL8821CU_VERSION)) RTL8821CU_LICENSE = GPL-2.0 RTL8821CU_LICENSE_FILES = LICENSE From b3cf07d8db2ae0283bbac7e4a06f363c7bc39e58 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Sun, 5 Mar 2023 23:55:53 +0100 Subject: [PATCH 1127/5754] package/uqmi: fix compile error (gcc false error reporting) Add upstream suggested patch ([1]) to avoid gcc false error reporting. Fixes: - http://autobuild.buildroot.net/results/ce9e2074bb8486d1ee25232b985d47475faefd63 dev.c:217:23: error: storing the address of local variable 'complete' in '*req.complete' [-Werror=dangling-pointer=] 217 | req->complete = &complete; | ~~~~~~~~~~~~~~^~~~~~~~~~~ [1] http://lists.openwrt.org/pipermail/openwrt-devel/2023-March/040633.html Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- ...alse-error-reporting-storing-the-add.patch | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 package/uqmi/0001-uqmi-avoid-gcc-false-error-reporting-storing-the-add.patch diff --git a/package/uqmi/0001-uqmi-avoid-gcc-false-error-reporting-storing-the-add.patch b/package/uqmi/0001-uqmi-avoid-gcc-false-error-reporting-storing-the-add.patch new file mode 100644 index 0000000000..c940925767 --- /dev/null +++ b/package/uqmi/0001-uqmi-avoid-gcc-false-error-reporting-storing-the-add.patch @@ -0,0 +1,54 @@ +From 4c2eb926efb4de24af5a3b1e8c18195198827491 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Sun, 5 Mar 2023 22:08:13 +0100 +Subject: [PATCH] uqmi: avoid gcc false error reporting (storing the address of + local variable 'complete' in '*req.complete') + +Avoid gcc false error reporting (req->complete is later reset to NULL +in case of use of local complete): + + dev.c:217:23: error: storing the address of local variable 'complete' in '*req.complete' [-Werror=dangling-pointer=] + 217 | req->complete = &complete; + | ~~~~~~~~~~~~~~^~~~~~~~~~~ + +Signed-off-by: Peter Seiderer + +[Upstream: http://lists.openwrt.org/pipermail/openwrt-devel/2023-March/040633.html] +Signed-off-by: Peter Seiderer +--- + dev.c | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/dev.c b/dev.c +index bd10207..b8ac273 100644 +--- a/dev.c ++++ b/dev.c +@@ -203,6 +203,15 @@ void qmi_request_cancel(struct qmi_dev *qmi, struct qmi_request *req) + __qmi_request_complete(qmi, req, NULL); + } + ++/* avoid gcc false error reporting: ++ * dev.c:217:23: error: storing the address of local variable ‘complete’ in ‘*req.complete’ [-Werror=dangling-pointer=] ++ * 217 | req->complete = &complete; ++ * | ~~~~~~~~~~~~~~^~~~~~~~~~~ ++ */ ++#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wdangling-pointer" ++#endif + int qmi_request_wait(struct qmi_dev *qmi, struct qmi_request *req) + { + bool complete = false; +@@ -231,6 +240,9 @@ int qmi_request_wait(struct qmi_dev *qmi, struct qmi_request *req) + + return req->ret; + } ++#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) ++#pragma GCC diagnostic pop ++#endif + + struct qmi_connect_request { + struct qmi_request req; +-- +2.39.2 + From 6a17fe68a3f9910b4dab2465bb0b06ed57704459 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 7 Mar 2023 11:04:55 +0200 Subject: [PATCH 1128/5754] libpcap: bump to version 1.10.3 Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- 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 b87d9d04ef..270fd8869d 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.2.tar.gz.sig -sha256 db6d79d4ad03b8b15fb16c42447d093ad3520c0ec0ae3d331104dcfb1ce77560 libpcap-1.10.2.tar.gz +# https://www.tcpdump.org/release/libpcap-1.10.3.tar.gz.sig +sha256 2a8885c403516cf7b0933ed4b14d6caa30e02052489ebd414dc75ac52e7559e6 libpcap-1.10.3.tar.gz # Hash for license file: sha256 8a54594d257e14a5260ac770f1633516cb51e3fc28c40136ce2697014eda7afd LICENSE diff --git a/package/libpcap/libpcap.mk b/package/libpcap/libpcap.mk index 173207de63..d4292ae9a3 100644 --- a/package/libpcap/libpcap.mk +++ b/package/libpcap/libpcap.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBPCAP_VERSION = 1.10.2 +LIBPCAP_VERSION = 1.10.3 LIBPCAP_SITE = https://www.tcpdump.org/release LIBPCAP_LICENSE = BSD-3-Clause LIBPCAP_LICENSE_FILES = LICENSE From f255abdceabc3ebbff795c753f7a33d44e905369 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 2 Mar 2023 18:53:47 +0100 Subject: [PATCH 1129/5754] package/gensio: add libglib2 optional dependency libglib2 is an optional dependency which is enabled by default since version 2.3.0 and https://github.com/cminyard/gensio/commit/866924d69dabe8b8a981e19bd745d5c84e529881 Handle it properly to avoid the following build failure since bump to version 2.5.2 in commit 5bb747f0b783a0d3f1712350ca3277263045b299: sparc64-buildroot-linux-gnu-gcc: ERROR: unsafe header/library path used in cross-compilation: '-I/usr/include/glib-2.0' Fixes: - http://autobuild.buildroot.org/results/3602c5cc2aff668211fd8e6eeab778b3fe287246 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/gensio/gensio.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/gensio/gensio.mk b/package/gensio/gensio.mk index 5538f97b19..dafc0bf5d5 100644 --- a/package/gensio/gensio.mk +++ b/package/gensio/gensio.mk @@ -14,6 +14,13 @@ GENSIO_CONF_OPTS = \ --without-swig \ --without-python +ifeq ($(BR2_PACKAGE_LIBGLIB2),y) +GENSIO_DEPENDENCIES += host-pkgconf libglib2 +GENSIO_CONF_OPTS += --with-glib +else +GENSIO_CONF_OPTS += --without-glib +endif + ifeq ($(BR2_PACKAGE_OPENIPMI),y) GENSIO_DEPENDENCIES += openipmi GENSIO_CONF_OPTS += --with-openipmi From a69ecf0e89b5f88dbd0bcadf9b8aabae10066289 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 2 Mar 2023 18:53:48 +0100 Subject: [PATCH 1130/5754] package/gensio: add alsa-lib optional dependency alsa-lib is an optional dependency which is enabled by default since version 2.5.3 and https://github.com/cminyard/gensio/commit/dc9bad87d47588dcdd92ce118fcc4f41d10b671c Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/gensio/gensio.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/gensio/gensio.mk b/package/gensio/gensio.mk index dafc0bf5d5..89c734eec0 100644 --- a/package/gensio/gensio.mk +++ b/package/gensio/gensio.mk @@ -14,6 +14,13 @@ GENSIO_CONF_OPTS = \ --without-swig \ --without-python +ifeq ($(BR2_PACKAGE_ALSA_LIB_PCM),y) +GENSIO_DEPENDENCIES += alsa-lib +GENSIO_CONF_OPTS += --with-alsa +else +GENSIO_CONF_OPTS += --without-alsa +endif + ifeq ($(BR2_PACKAGE_LIBGLIB2),y) GENSIO_DEPENDENCIES += host-pkgconf libglib2 GENSIO_CONF_OPTS += --with-glib From 847ac3d9c8df70a7f082bd8a6046c1d987cf6eee Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 2 Mar 2023 18:53:49 +0100 Subject: [PATCH 1131/5754] package/gensio: use mdns option mdns option is available since version 2.4.0 and https://github.com/cminyard/gensio/commit/0b56fdd8205dff8f2343d1672e58b6583772f897 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/gensio/gensio.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/gensio/gensio.mk b/package/gensio/gensio.mk index 89c734eec0..3374313c0f 100644 --- a/package/gensio/gensio.mk +++ b/package/gensio/gensio.mk @@ -9,7 +9,6 @@ GENSIO_SITE = http://downloads.sourceforge.net/project/ser2net/ser2net GENSIO_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools) GENSIO_LICENSE_FILES = COPYING.LIB COPYING GENSIO_INSTALL_STAGING = YES -GENSIO_DEPENDENCIES = $(if $(BR2_PACKAGE_AVAHI_LIBAVAHI_CLIENT),avahi) GENSIO_CONF_OPTS = \ --without-swig \ --without-python @@ -21,6 +20,13 @@ else GENSIO_CONF_OPTS += --without-alsa endif +ifeq ($(BR2_PACKAGE_AVAHI_LIBAVAHI_CLIENT),y) +GENSIO_DEPENDENCIES += avahi +GENSIO_CONF_OPTS += --with-mdns +else +GENSIO_CONF_OPTS += --without-mdns +endif + ifeq ($(BR2_PACKAGE_LIBGLIB2),y) GENSIO_DEPENDENCIES += host-pkgconf libglib2 GENSIO_CONF_OPTS += --with-glib From 47cb0c967f7c825e02e66d1df26ff9e893bf5235 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 2 Mar 2023 18:53:50 +0100 Subject: [PATCH 1132/5754] package/gensio: add C++ optional dependency C++ is available since 2.3.0 and https://github.com/cminyard/gensio/commit/3fda483f15a2668f9e2396517cdbf09693e6e3ff Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/gensio/gensio.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/gensio/gensio.mk b/package/gensio/gensio.mk index 3374313c0f..2ba1b950d7 100644 --- a/package/gensio/gensio.mk +++ b/package/gensio/gensio.mk @@ -13,6 +13,12 @@ GENSIO_CONF_OPTS = \ --without-swig \ --without-python +ifeq ($(BR2_INSTALL_LIBSTDCPP),y) +GENSIO_CONF_OPTS += --with-cplusplus +else +GENSIO_CONF_OPTS += --without-cplusplus +endif + ifeq ($(BR2_PACKAGE_ALSA_LIB_PCM),y) GENSIO_DEPENDENCIES += alsa-lib GENSIO_CONF_OPTS += --with-alsa From d97fe11e59122c65df6216a7767f0b004fbd0dec Mon Sep 17 00:00:00 2001 From: Nicola Di Lieto Date: Thu, 2 Mar 2023 10:22:51 +0100 Subject: [PATCH 1133/5754] package/uacme: security bump to version 1.7.4 Includes https://github.com/ndilieto/uacme/commit/fe91f46b620f8c58805fcf48cb4f4a793c8a47a4 Fixes https://github.com/ndilieto/uacme/issues/64 Signed-off-by: Nicola Di Lieto Signed-off-by: Peter Korsgaard --- package/uacme/uacme.hash | 2 +- package/uacme/uacme.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/uacme/uacme.hash b/package/uacme/uacme.hash index 6c71f6b94d..063b0b57ac 100644 --- a/package/uacme/uacme.hash +++ b/package/uacme/uacme.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 0ec8e5bcb8ed2b532572ca4878d30b2a794f607b995348ebc176d566b64d73f9 uacme-1.7.3.tar.gz +sha256 a638fe0878dba8fdda62f89e7a284243edbcd31b92c11b5cfdc7d3efd9547bca uacme-1.7.4.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/uacme/uacme.mk b/package/uacme/uacme.mk index a70ec3a635..9b2360937b 100644 --- a/package/uacme/uacme.mk +++ b/package/uacme/uacme.mk @@ -4,7 +4,7 @@ # ################################################################################ -UACME_VERSION = 1.7.3 +UACME_VERSION = 1.7.4 # Released versions are on branch upstream/latest, tagged as # upstream/X.Y.Z Do not use vX.Y.Z tags from master, as they do not # include .tarball-version From 83e06196ab2193b73b4d7c1decc12bdd654a91e1 Mon Sep 17 00:00:00 2001 From: Lang Daniel Date: Thu, 2 Mar 2023 08:50:35 +0000 Subject: [PATCH 1134/5754] package/pkg-autotools: force cross compiling By default autotools enters cross-compiling mode if --build and --host differ [0]. Depending on the host architecture and how toolchain providers set the triplet it might be the same. This triggers autotools to compile and run a program on the host. If it is executable cross-compiling isn't entered. As pointed out by the autoconf mailing list [1] one can force cross compiling. [0]: https://www.gnu.org/savannah-checkouts/gnu/autoconf/manual/autoconf-2.71/html_node/Hosts-and-Cross_002dCompilation.html [1]: https://lists.gnu.org/archive/html/bug-autoconf/2023-03/msg00001.html Fixes: - http://autobuild.buildroot.net/results/6d4/6d4bc520c12313508d0fadee11d5b88c35a3cba9/ Signed-off-by: Daniel Lang Signed-off-by: Peter Korsgaard --- package/pkg-autotools.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk index 717ff81593..aac80369e0 100644 --- a/package/pkg-autotools.mk +++ b/package/pkg-autotools.mk @@ -195,6 +195,7 @@ define $(2)_CONFIGURE_CMDS --disable-documentation \ --with-xmlto=no \ --with-fop=no \ + cross_compiling=yes \ $$(if $$($$(PKG)_OVERRIDE_SRCDIR),,--disable-dependency-tracking) \ --enable-ipv6 \ $$(NLS_OPTS) \ @@ -229,6 +230,7 @@ define $(2)_CONFIGURE_CMDS --with-xmlto=no \ --with-fop=no \ --disable-nls \ + cross_compiling=no \ $$(if $$($$(PKG)_OVERRIDE_SRCDIR),,--disable-dependency-tracking) \ $$(QUIET) $$($$(PKG)_CONF_OPTS) \ ) From 08a52da2058829216400822e2cd7a1c1c2600eeb Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 26 Feb 2023 20:44:27 +0100 Subject: [PATCH 1135/5754] linux: fix CIP RT kernel on microblaze Fix the following build failure with CIP RT kernel on microblaze raised since bump to version 5.10.83-cip1-rt1 in commit b5778d7b76c098010a4abc339938f2694e8cf57f and https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/commit/?id=32ac92b5a39e2ef91308929bf5ed0804094b4183: arch/microblaze/mm/init.c:71:2: error: #endif without #if 71 | #endif /* CONFIG_HIGHMEM */ | ^~~~~ Fixes: - http://autobuild.buildroot.org/results/27291870cf7539d26e45c45f34322d24a6dbca33 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...-arch-microblaze-mm-init.c-fix-build.patch | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 linux/5.10.162-cip24-rt10/0001-arch-microblaze-mm-init.c-fix-build.patch diff --git a/linux/5.10.162-cip24-rt10/0001-arch-microblaze-mm-init.c-fix-build.patch b/linux/5.10.162-cip24-rt10/0001-arch-microblaze-mm-init.c-fix-build.patch new file mode 100644 index 0000000000..4760d9e4fb --- /dev/null +++ b/linux/5.10.162-cip24-rt10/0001-arch-microblaze-mm-init.c-fix-build.patch @@ -0,0 +1,37 @@ +From 1fc03e1fdc8bb606d1c95e9fa557a9e5f6df17ec Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 25 Feb 2023 17:26:56 +0100 +Subject: [PATCH] arch/microblaze/mm/init.c: fix build + +Fix the following build failure on microblaze raised since +https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/commit/arch/microblaze/mm/init.c?h=v5.10.168-cip27-rt11&id=32ac92b5a39e2ef91308929bf5ed0804094b4183: + +arch/microblaze/mm/init.c:71:2: error: #endif without #if + 71 | #endif /* CONFIG_HIGHMEM */ + | ^~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/27291870cf7539d26e45c45f34322d24a6dbca33 + +Signed-off-by: Fabrice Fontaine +[Upstream status: sent to +Sebastian Andrzej Siewior ] +--- + arch/microblaze/mm/init.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/arch/microblaze/mm/init.c b/arch/microblaze/mm/init.c +index 1f4b5b34e600..a444778e59de 100644 +--- a/arch/microblaze/mm/init.c ++++ b/arch/microblaze/mm/init.c +@@ -49,6 +49,7 @@ unsigned long lowmem_size; + EXPORT_SYMBOL(min_low_pfn); + EXPORT_SYMBOL(max_low_pfn); + ++#ifdef CONFIG_HIGHMEM + static void __init highmem_init(void) + { + pr_debug("%x\n", (u32)PKMAP_BASE); +-- +2.39.1 + From 3f512366d7a0d96c9e4451beb40457ef592d9103 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Wed, 1 Mar 2023 10:46:40 +0100 Subject: [PATCH 1136/5754] package/docker-engine: remove non-existing build tags The seccomp and apparmor build tags have been removed in 23.0.0. Don't use those buildtags anymore. Signed-off-by: Stefan Agner Reviewed-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/docker-engine/docker-engine.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index ca1aa27b0a..0ecb5d2251 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -28,11 +28,9 @@ DOCKER_ENGINE_BUILD_TARGETS = cmd/dockerd cmd/docker-proxy ifeq ($(BR2_PACKAGE_LIBAPPARMOR),y) DOCKER_ENGINE_DEPENDENCIES += libapparmor -DOCKER_ENGINE_TAGS += apparmor endif ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) -DOCKER_ENGINE_TAGS += seccomp DOCKER_ENGINE_DEPENDENCIES += libseccomp endif From 08f5edd921dd0043e10c4b3e9667f173aea9620e Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Wed, 1 Mar 2023 10:46:41 +0100 Subject: [PATCH 1137/5754] package/docker-engine: bump version to v23.0.1 This release contains some fixes and an improved error message. For the full list see: https://github.com/moby/moby/releases/tag/v23.0.1 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 +- package/docker-engine/docker-engine.hash | 2 +- package/docker-engine/docker-engine.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/docker-cli/docker-cli.hash b/package/docker-cli/docker-cli.hash index ff981be963..9b231f03b1 100644 --- a/package/docker-cli/docker-cli.hash +++ b/package/docker-cli/docker-cli.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3379d06cd6177832b91f4796c680b6bf15c7895773448716b4c3c5253f611d1b docker-cli-23.0.0.tar.gz +sha256 37bc1c71a782fc10d35aa6708c1b3c90a71f3947c33665cb0de68df25dc14d94 docker-cli-23.0.1.tar.gz sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE diff --git a/package/docker-cli/docker-cli.mk b/package/docker-cli/docker-cli.mk index d61f47e46e..38d903150c 100644 --- a/package/docker-cli/docker-cli.mk +++ b/package/docker-cli/docker-cli.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CLI_VERSION = 23.0.0 +DOCKER_CLI_VERSION = 23.0.1 DOCKER_CLI_SITE = $(call github,docker,cli,v$(DOCKER_CLI_VERSION)) DOCKER_CLI_LICENSE = Apache-2.0 diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash index 670cbd414b..99ab5e4003 100644 --- a/package/docker-engine/docker-engine.hash +++ b/package/docker-engine/docker-engine.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 94492508260e57eb93399257d53435cd5308ca6330e173ca6e6f3dbf4c6e12f3 docker-engine-23.0.0.tar.gz +sha256 c8e6c0ac5f0c772023e3430f80190e0f86644b6d94cac63118b03561385f7b56 docker-engine-23.0.1.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index 0ecb5d2251..f8d31de0fe 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_ENGINE_VERSION = 23.0.0 +DOCKER_ENGINE_VERSION = 23.0.1 DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 From 63e33bf88dd2138c4caa3dbfd5e1d89518ddd398 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 8 Mar 2023 18:44:02 +0100 Subject: [PATCH 1138/5754] package/pulseaudio: fix build without avahi-client Fix the following build failure without avahi-client raised since commit 7752afbe4bb9fa1def5ba89daf21564ea58af79a (before this commit, avahi was silently disabled): ../output-1/build/pulseaudio-16.1/meson.build:754:2: ERROR: Dependency "avahi-client" not found, tried pkgconfig and cmake Fixes: - http://autobuild.buildroot.org/results/0aea014eb4ed27870af908668d7b138d150f065a Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/pulseaudio/pulseaudio.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pulseaudio/pulseaudio.mk b/package/pulseaudio/pulseaudio.mk index 8c4b99b6ff..89191db541 100644 --- a/package/pulseaudio/pulseaudio.mk +++ b/package/pulseaudio/pulseaudio.mk @@ -25,7 +25,7 @@ PULSEAUDIO_DEPENDENCIES = \ PULSEAUDIO_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) -ifeq ($(BR2_PACKAGE_AVAHI_DAEMON),y) +ifeq ($(BR2_PACKAGE_AVAHI_LIBAVAHI_CLIENT),y) PULSEAUDIO_CONF_OPTS += -Davahi=enabled PULSEAUDIO_DEPENDENCIES += avahi else From 3c4d6288278b46b122ab9c011bbbdf8696281b88 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 8 Mar 2023 18:47:53 +0100 Subject: [PATCH 1139/5754] Revert "package/pkg-autotools: force cross compiling" This reverts commit 83e06196ab2193b73b4d7c1decc12bdd654a91e1 which raises the following build failure with thttpd or wipe: configure: warning: cross_compiling=yes: invalid host type loading site script /dev/null creating cache ./config.cache configure: error: can only configure for one host and one target at a time Fixes: - http://autobuild.buildroot.org/results/e2156c3747b37d0ec2559a67f2f468ad42a20dbc - http://autobuild.buildroot.org/results/a356dd0cd1fb4c9a1b9d6a4cbad4ae2a34dbb562 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/pkg-autotools.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk index aac80369e0..717ff81593 100644 --- a/package/pkg-autotools.mk +++ b/package/pkg-autotools.mk @@ -195,7 +195,6 @@ define $(2)_CONFIGURE_CMDS --disable-documentation \ --with-xmlto=no \ --with-fop=no \ - cross_compiling=yes \ $$(if $$($$(PKG)_OVERRIDE_SRCDIR),,--disable-dependency-tracking) \ --enable-ipv6 \ $$(NLS_OPTS) \ @@ -230,7 +229,6 @@ define $(2)_CONFIGURE_CMDS --with-xmlto=no \ --with-fop=no \ --disable-nls \ - cross_compiling=no \ $$(if $$($$(PKG)_OVERRIDE_SRCDIR),,--disable-dependency-tracking) \ $$(QUIET) $$($$(PKG)_CONF_OPTS) \ ) From 720a68e33be7f46c8b5866d6b8f98b400f83f979 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 8 Mar 2023 19:07:51 +0100 Subject: [PATCH 1140/5754] package/mpv: needs NPTL mpv unconditionally uses pthread_getcpuclockid since version 0.33.0 and https://github.com/mpv-player/mpv/commit/fd3caa264ea0848e7e30db94390063c87e247003 resulting in the following build failure without NPTL since commit e3cf26dda31e6c1720c53e0229d93fe2a5ea18aa: ../common/stats.c: In function 'get_thread_cpu_time_ns': ../common/stats.c:75:9: error: implicit declaration of function 'pthread_getcpuclockid'; did you mean 'pthread_getspecific'? [-Werror=implicit-function-declaration] 75 | if (pthread_getcpuclockid(thread, &id) == 0 && | ^~~~~~~~~~~~~~~~~~~~~ | pthread_getspecific Fixes: - http://autobuild.buildroot.org/results/98cde5cbb0844c6ef483a75cf9a6f3fd3a46c693 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/mpv/Config.in | 6 +++--- package/tovid/Config.in | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/mpv/Config.in b/package/mpv/Config.in index 6811497d73..8efb353c33 100644 --- a/package/mpv/Config.in +++ b/package/mpv/Config.in @@ -8,7 +8,7 @@ config BR2_PACKAGE_MPV bool "mpv" depends on BR2_INSTALL_LIBSTDCPP # libass depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libass - depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C11/stdatomic.h depends on BR2_TOOLCHAIN_HAS_ATOMIC @@ -34,10 +34,10 @@ config BR2_PACKAGE_MPV https://mpv.io/ -comment "mpv needs a toolchain w/ C++, threads, gcc >= 4.9" +comment "mpv needs a toolchain w/ C++, NPTL, gcc >= 4.9" 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 || \ + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/tovid/Config.in b/package/tovid/Config.in index 3dbb0e229e..c263acdd62 100644 --- a/package/tovid/Config.in +++ b/package/tovid/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_TOVID bool "tovid" depends on BR2_USE_MMU # fork() - depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # mpv depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR depends on BR2_PACKAGE_PYTHON3 @@ -29,12 +29,12 @@ config BR2_PACKAGE_TOVID http://tovid.wikia.com/wiki/Installing_tovid -comment "tovid needs a toolchain w/ threads, C++, wchar, gcc >= 4.9" +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 \ + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL \ || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 \ || !BR2_INSTALL_LIBSTDCPP \ || !BR2_USE_WCHAR @@ -45,6 +45,6 @@ comment "tovid depends on 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 || \ + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 depends on !BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC From 46abbffc9702be320e9d71de71ce89457a28c48e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 23 Feb 2023 13:52:42 +0100 Subject: [PATCH 1141/5754] package/mender: force libopenssl mender raises the following build failure with libressl since at least version 3.1.0 (and probably since the addition of the package): vendor/github.com/mendersoftware/openssl/conn.go:103:61: could not determine kind of name for C.X509_V_ERR_DANE_NO_MATCH Fixes: - http://autobuild.buildroot.org/results/2b032d2a4e7cfbb20444c13821003120a4d00abd - http://autobuild.buildroot.org/results/621c057c0b8b627c8140456a2b0af4f95d239dcc Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/mender/Config.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/mender/Config.in b/package/mender/Config.in index cccb46361b..7d768cebec 100644 --- a/package/mender/Config.in +++ b/package/mender/Config.in @@ -4,8 +4,9 @@ config BR2_PACKAGE_MENDER depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_LIBOPENSSL_ENABLE_MD4 if BR2_PACKAGE_LIBOPENSSL - select BR2_PACKAGE_LIBOPENSSL_ENABLE_RMD160 if BR2_PACKAGE_LIBOPENSSL + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_MD4 + select BR2_PACKAGE_LIBOPENSSL_ENABLE_RMD160 help Mender is an open source over-the-air (OTA) software updater for embedded Linux devices. Mender comprises a client From 94962a5af8ddc3221e286e688a9cc69ab25d627f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 23 Feb 2023 11:20:23 +0100 Subject: [PATCH 1142/5754] package/multipath-tools: fix legal-info Commit b535fd2a093eca5e8967a5c8004da55f7295d101 forgot to update hash of README.md (updates not related to license) Fixes: - http://autobuild.buildroot.org/results/21bc3aa3e1b89ace5aebe771b8c34d5bd0cb9c3d Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- 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 3f01408c76..ecaad05e25 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 1e6095ac219062b8ddb2416d2a3cc40560619cd6b3ba609f5602bbd320413be0 README.md +sha256 b8b4369c539d6a61ad2a5a359a1ecdfb9f630a89590216d490314e19bf07aa0c README.md From 50d3883fba99eb5651e5059b5840529a25111ba1 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 8 Mar 2023 22:53:48 +0100 Subject: [PATCH 1143/5754] Update for 2023.02-rc3 Signed-off-by: Peter Korsgaard --- CHANGES | 11 +++++++++++ Makefile | 4 ++-- docs/website/download.html | 18 +++++++++--------- docs/website/news.html | 21 +++++++++++++++++++++ 4 files changed, 43 insertions(+), 11 deletions(-) diff --git a/CHANGES b/CHANGES index a3de4ba1d7..49cf96a853 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,14 @@ +2023.02-rc3, released March 8th, 2023 + + Fixes all over the tree. + + Updated/fixed packages: apr, bash, docker-engine, exfat, + exfat-utils, f2fs-tools, gensio, gr-osmosdr, libcurl, libglfw, + libolm, libpcap, libpjsip, linux, mender, mpv, + multipath-tools, opus, paho-mqtt-c, proftpd, pugixml, + pulseaudio, qemu, quazip, quickjs, rtl8189es, rtl8821cu, + uacme, uqmi, wpebackend-fdo, + 2023.02-rc2, released February 27th, 2023 Fixes all over the tree. diff --git a/Makefile b/Makefile index 8edc90ac50..3972941328 100644 --- a/Makefile +++ b/Makefile @@ -90,9 +90,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2023.02-rc2 +export BR2_VERSION := 2023.02-rc3 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1677516000 +BR2_VERSION_EPOCH = 1678312000 # 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 fa9276a86c..144dae5197 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.02-rc2

          +

          Latest release candidate: 2023.02-rc3

          - +
          - +
          -

          buildroot-2023.02-rc2.tar.gz

          -

          PGP signature

          +

          buildroot-2023.02-rc3.tar.gz

          +

          PGP signature

          - +
          - +
          -

          buildroot-2023.02-rc2.tar.xz

          -

          PGP signature

          +

          buildroot-2023.02-rc3.tar.xz

          +

          PGP signature

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

          News

            +
          • +
            +
            +
            +

            2023.02-rc3 released

            +

            8 March 2023

            +
            +
            +

            2023.02-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.02-rc3 + release candidate, and report any problems found to the + mailing list or + bug tracker.

            +
            +
            +
            • +
          • From 5256ec9ca872518beacf827443fec72146ab7a0c Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 9 Mar 2023 20:25:13 +0100 Subject: [PATCH 1144/5754] package/apache: security bump version to 2.4.56 Release notes: https://lists.apache.org/thread/89vkczkfkdyz65d5q59pcyzrn5ts60s6 Changelog: https://dlcdn.apache.org/httpd/CHANGES_2.4.56 Fixes CVE-2023-25690 & CVE-2023-27522: https://httpd.apache.org/security/vulnerabilities_24.html Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- 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 a1185c5618..36144917fb 100644 --- a/package/apache/apache.hash +++ b/package/apache/apache.hash @@ -1,5 +1,5 @@ -# From https://downloads.apache.org/httpd/httpd-2.4.54.tar.bz2.{sha256,sha512} -sha256 11d6ba19e36c0b93ca62e47e6ffc2d2f2884942694bce0f23f39c71bdc5f69ac httpd-2.4.55.tar.bz2 -sha512 94982f7a1fedac8961fc17b5a22cf763ac28cb27ee6facab2e6a15b249b927773667493fd3f7354fb13fcb34a6f1afc1bdd5cf4b7be030cba1dfb523e40d43fb httpd-2.4.55.tar.bz2 +# 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 # Locally computed sha256 47b8c2b6c3309282a99d4a3001575c790fead690cc14734628c4667d2bbffc43 LICENSE diff --git a/package/apache/apache.mk b/package/apache/apache.mk index 13018a9b1f..80205a6362 100644 --- a/package/apache/apache.mk +++ b/package/apache/apache.mk @@ -4,7 +4,7 @@ # ################################################################################ -APACHE_VERSION = 2.4.55 +APACHE_VERSION = 2.4.56 APACHE_SOURCE = httpd-$(APACHE_VERSION).tar.bz2 APACHE_SITE = https://downloads.apache.org/httpd APACHE_LICENSE = Apache-2.0 From 6a29c4f4118e42420ebb64b7e00cfb4a826216c1 Mon Sep 17 00:00:00 2001 From: Lang Daniel Date: Thu, 9 Mar 2023 07:15:00 +0000 Subject: [PATCH 1145/5754] package/libgpg-error: force cross compiling By default autotools enters cross-compiling mode if --build and --host differ [0]. This should normally be the case as buildroot sets itself as vendor in the toolchain triplet. For libgpg-error the --host flag has to be set to a generic triplet because this information is used to lookup the syscfg. When compiling on aarch64 for aarch64 build and host would be the same, therefore cross-compiling isn't activated, which results in a build failure. Fixes: - http://autobuild.buildroot.net/results/6d4/6d4bc520c12313508d0fadee11d5b88c35a3cba9/ [0]: https://www.gnu.org/savannah-checkouts/gnu/autoconf/manual/autoconf-2.71/html_node/Hosts-and-Cross_002dCompilation.html Signed-off-by: Daniel Lang Signed-off-by: Arnout Vandecappelle --- package/libgpg-error/libgpg-error.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libgpg-error/libgpg-error.mk b/package/libgpg-error/libgpg-error.mk index 3f4a45a7e4..3ab8535a9c 100644 --- a/package/libgpg-error/libgpg-error.mk +++ b/package/libgpg-error/libgpg-error.mk @@ -14,6 +14,7 @@ LIBGPG_ERROR_INSTALL_STAGING = YES LIBGPG_ERROR_CONFIG_SCRIPTS = gpg-error-config LIBGPG_ERROR_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) LIBGPG_ERROR_CONF_OPTS = \ + cross_compiling=yes \ --host=$(BR2_PACKAGE_LIBGPG_ERROR_SYSCFG) \ --enable-install-gpg-error-config \ --disable-tests \ From 6bec87810252d123f768af03e0e2ab53d2b61f03 Mon Sep 17 00:00:00 2001 From: Heiko Thiery Date: Mon, 6 Mar 2023 16:53:09 +0100 Subject: [PATCH 1146/5754] DEVELOPERS: add Heiko Thiery for package/rauc Signed-off-by: Heiko Thiery Signed-off-by: Arnout Vandecappelle --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 6256576e02..9670302a78 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1253,6 +1253,7 @@ F: package/libnetconf2/ F: package/libyang/ F: package/linuxptp/ F: package/netopeer2/ +F: package/rauc/ F: package/sysrepo/ N: Hervé Codina From e8ad4f2d07462d8b022643c663e0fd7e9c7b5201 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Mon, 6 Mar 2023 00:25:04 +0100 Subject: [PATCH 1147/5754] package/bridge-utils: update project URL in Config.in help text The old URL no longer works and shows "No repositories found". Replace it with: https://wiki.linuxfoundation.org/networking/bridge Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle --- package/bridge-utils/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/bridge-utils/Config.in b/package/bridge-utils/Config.in index de5883f063..2d886e2cb0 100644 --- a/package/bridge-utils/Config.in +++ b/package/bridge-utils/Config.in @@ -8,4 +8,4 @@ config BR2_PACKAGE_BRIDGE_UTILS added. Instead use the bridge command from the iproute2 package which supports more features. - https://git.kernel.org/cgit/linux/kernel/git/shemminger/bridge-utils.git/ + https://wiki.linuxfoundation.org/networking/bridge From 95c0a98054a4d8f45617f233130b198cc488e847 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Fri, 3 Mar 2023 23:26:57 +0100 Subject: [PATCH 1148/5754] DEVELOPERS: add Julien Olivain for package/kexec Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 9670302a78..82aeb6fe25 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1689,6 +1689,7 @@ F: package/fluidsynth/ F: package/glslsandbox-player/ F: package/gnupg2/ F: package/highway/ +F: package/kexec/ F: package/libjxl/ F: package/octave/ F: package/ola/ From 33a208e5dac02df473f8325ee93c2e07489f9a62 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Mon, 27 Feb 2023 22:08:23 +0100 Subject: [PATCH 1149/5754] package/speechd: fix gettext version mismatch - fix gettext version mismatch in case of BR2_SYSTEM_ENABLE_NLS and BR2_PACKAGE_PROVIDES_HOST_GETTEXT="host-gettext-gnu" by setting SPEECHD_GETTEXTIZE Fixes: - http://autobuild.buildroot.net/results/283333290c5adb48d0c6e592b3261992537f92d3 Making all in po *** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version 0.19 but the autoconf macros are from gettext version 0.20 Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle --- package/speechd/speechd.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/speechd/speechd.mk b/package/speechd/speechd.mk index dee94a6752..ec62980986 100644 --- a/package/speechd/speechd.mk +++ b/package/speechd/speechd.mk @@ -11,6 +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_DEPENDENCIES = host-pkgconf dotconf libglib2 libsndfile SPEECHD_CONF_ENV = ac_cv_prog_HELP2MAN="" SPEECHD_CONF_OPTS = --without-kali From 1a5686823dbe83be74f819227bfefe4edca35e48 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Mon, 27 Feb 2023 22:42:19 +0100 Subject: [PATCH 1150/5754] package/speechd: fix libltdl enable/disable configure option - libltdl usage is configured by --disable/enable-ltdl (see configure.ac 'AC_ARG_ENABLE([ltdl], [...])') Fixes: configure: WARNING: unrecognized options: [...] --with-libltdl Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle --- package/speechd/speechd.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/speechd/speechd.mk b/package/speechd/speechd.mk index ec62980986..b545863035 100644 --- a/package/speechd/speechd.mk +++ b/package/speechd/speechd.mk @@ -24,9 +24,9 @@ SPEECHD_PRE_CONFIGURE_HOOKS += SPEECHD_TOUCH_CONFIG_RPATH ifeq ($(BR2_PACKAGE_LIBTOOL),y) SPEECHD_DEPENDENCIES += libtool -SPEECHD_CONF_OPTS += --with-libltdl +SPEECHD_CONF_OPTS += --enable-ltdl else -SPEECHD_CONF_OPTS += --without-libltdl +SPEECHD_CONF_OPTS += --disable-ltdl endif define SPEECHD_INSTALL_INIT_SYSTEMD From 9cdccfdaae3395a8f3de0712175b1e60c2e62a2c Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Mon, 27 Feb 2023 22:42:20 +0100 Subject: [PATCH 1151/5754] package/speechd: add default configure options - add default configure options for all optional speechd features/ output modules (disable all with additional library dependencies, enable oss) Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle --- package/speechd/speechd.mk | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/package/speechd/speechd.mk b/package/speechd/speechd.mk index b545863035..5944ea3a28 100644 --- a/package/speechd/speechd.mk +++ b/package/speechd/speechd.mk @@ -14,7 +14,22 @@ SPEECHD_AUTORECONF = YES SPEECHD_GETTEXTIZE = YES SPEECHD_DEPENDENCIES = host-pkgconf dotconf libglib2 libsndfile SPEECHD_CONF_ENV = ac_cv_prog_HELP2MAN="" -SPEECHD_CONF_OPTS = --without-kali +SPEECHD_CONF_OPTS = \ + --disable-python \ + --without-espeak \ + --without-espeak-ng \ + --without-flite \ + --without-ibmtts \ + --without-voxin \ + --without-ivona \ + --without-pico \ + --without-baratinoo \ + --without-kali \ + --without-pulse \ + --without-libao \ + --without-alsa \ + --with-oss \ + --without-nas # fix missing config.rpath (needed for autoreconf) in the codebase define SPEECHD_TOUCH_CONFIG_RPATH From 9b078380384f8ecd74857260d911e267c7a788b3 Mon Sep 17 00:00:00 2001 From: Lang Daniel Date: Fri, 24 Feb 2023 08:42:34 +0000 Subject: [PATCH 1152/5754] package/libsigc2: new package This is the version of libsigc needed for gtkmm3. Signed-off-by: Daniel Lang Signed-off-by: Arnout Vandecappelle --- DEVELOPERS | 1 + package/Config.in | 1 + package/libsigc/Config.in | 2 +- package/libsigc2/Config.in | 17 +++++++++++++++++ package/libsigc2/libsigc2.hash | 5 +++++ package/libsigc2/libsigc2.mk | 19 +++++++++++++++++++ 6 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 package/libsigc2/Config.in create mode 100644 package/libsigc2/libsigc2.hash create mode 100644 package/libsigc2/libsigc2.mk diff --git a/DEVELOPERS b/DEVELOPERS index 82aeb6fe25..2786b1c050 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -642,6 +642,7 @@ F: package/dacapo/ N: Daniel Lang F: package/dbus-cxx/ F: package/libsigc/ +F: package/libsigc2/ F: package/paho-mqtt-cpp/ N: Damien Lanson diff --git a/package/Config.in b/package/Config.in index 3ace25c665..522a22b76a 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2095,6 +2095,7 @@ menu "Other" source "package/libseccomp/Config.in" source "package/libshdata/Config.in" source "package/libsigc/Config.in" + source "package/libsigc2/Config.in" source "package/libsigsegv/Config.in" source "package/libsolv/Config.in" source "package/libspatialindex/Config.in" diff --git a/package/libsigc/Config.in b/package/libsigc/Config.in index 428774a3ab..4bea596579 100644 --- a/package/libsigc/Config.in +++ b/package/libsigc/Config.in @@ -1,5 +1,5 @@ config BR2_PACKAGE_LIBSIGC - bool "libsigc++" + bool "libsigc++ (latest)" depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 depends on BR2_INSTALL_LIBSTDCPP help diff --git a/package/libsigc2/Config.in b/package/libsigc2/Config.in new file mode 100644 index 0000000000..e302e27af0 --- /dev/null +++ b/package/libsigc2/Config.in @@ -0,0 +1,17 @@ +config BR2_PACKAGE_LIBSIGC2 + bool "libsigc++ (2.x.x)" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11 + depends on BR2_INSTALL_LIBSTDCPP + help + libsigc++ implements a typesafe callback system for standard + C++. It allows you to define signals and to connect those + signals to any callback function, either global or a member + function, regardless of whether it is static or virtual. + + This is the last version before the API and ABI change + introduced in 3.0.0 which requires C++17. + + https://libsigcplusplus.github.io/libsigcplusplus/ + +comment "libsigc++ (2.x.x) needs a toolchain w/ C++, gcc >= 4.9" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/libsigc2/libsigc2.hash b/package/libsigc2/libsigc2.hash new file mode 100644 index 0000000000..4811213568 --- /dev/null +++ b/package/libsigc2/libsigc2.hash @@ -0,0 +1,5 @@ +# From https://download.gnome.org/sources/libsigc++/2.12/libsigc++-2.12.0.sha256sum +sha256 1c466d2e64b34f9b118976eb21b138c37ed124d0f61497df2a90ce6c3d9fa3b5 libsigc++-2.12.0.tar.xz + +# Locally calculated +sha256 5bbcbb737e60fe9deba08ecbd00920cfcc3403ba2e534c64fdeea49d6bb87509 COPYING diff --git a/package/libsigc2/libsigc2.mk b/package/libsigc2/libsigc2.mk new file mode 100644 index 0000000000..845d03ba85 --- /dev/null +++ b/package/libsigc2/libsigc2.mk @@ -0,0 +1,19 @@ +################################################################################ +# +# libsigc2 +# +################################################################################ + +LIBSIGC2_VERSION_MAJOR = 2.12 +LIBSIGC2_VERSION = $(LIBSIGC2_VERSION_MAJOR).0 +LIBSIGC2_SOURCE = libsigc++-$(LIBSIGC2_VERSION).tar.xz +LIBSIGC2_SITE = https://download.gnome.org/sources/libsigc++/$(LIBSIGC2_VERSION_MAJOR) +LIBSIGC2_INSTALL_STAGING = YES +LIBSIGC2_LICENSE = LGPL-2.1+ +LIBSIGC2_LICENSE_FILES = COPYING +LIBSIGC2_CONF_OPTS = \ + -Dbuild-examples=false \ + -Dbuild-tests=false \ + -Dvalidation=false + +$(eval $(meson-package)) From 1723771209106d80d9c673c6f8b99bd08c1b0967 Mon Sep 17 00:00:00 2001 From: Lang Daniel Date: Fri, 24 Feb 2023 08:42:44 +0000 Subject: [PATCH 1153/5754] package/glibmm2_66: new package This is the version needed for gtkmm3. Signed-off-by: Daniel Lang Signed-off-by: Arnout Vandecappelle --- DEVELOPERS | 2 ++ package/Config.in | 1 + package/glibmm/Config.in | 2 +- package/glibmm2_66/Config.in | 21 +++++++++++++++++++++ package/glibmm2_66/glibmm2_66.hash | 5 +++++ package/glibmm2_66/glibmm2_66.mk | 23 +++++++++++++++++++++++ 6 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 package/glibmm2_66/Config.in create mode 100644 package/glibmm2_66/glibmm2_66.hash create mode 100644 package/glibmm2_66/glibmm2_66.mk diff --git a/DEVELOPERS b/DEVELOPERS index 2786b1c050..32ab852084 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -641,6 +641,8 @@ F: package/dacapo/ N: Daniel Lang F: package/dbus-cxx/ +F: package/glibmm/ +F: package/glibmm2_66/ F: package/libsigc/ F: package/libsigc2/ F: package/paho-mqtt-cpp/ diff --git a/package/Config.in b/package/Config.in index 522a22b76a..0f0980b57b 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2037,6 +2037,7 @@ menu "Other" source "package/gflags/Config.in" source "package/gli/Config.in" source "package/glibmm/Config.in" + source "package/glibmm2_66/Config.in" source "package/glm/Config.in" source "package/gmp/Config.in" source "package/gobject-introspection/Config.in" diff --git a/package/glibmm/Config.in b/package/glibmm/Config.in index 2dfc861817..b7bed195e9 100644 --- a/package/glibmm/Config.in +++ b/package/glibmm/Config.in @@ -1,5 +1,5 @@ config BR2_PACKAGE_GLIBMM - bool "glibmm" + bool "glibmm (latest)" depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # libsigc depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR # libglib2 diff --git a/package/glibmm2_66/Config.in b/package/glibmm2_66/Config.in new file mode 100644 index 0000000000..628584cae5 --- /dev/null +++ b/package/glibmm2_66/Config.in @@ -0,0 +1,21 @@ +config BR2_PACKAGE_GLIBMM2_66 + bool "glibmm (2.66.x)" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # regex_replace + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_USE_WCHAR # libglib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 + depends on BR2_USE_MMU # libglib2 + select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_LIBSIGC2 + help + The GLibmm package is a set of C++ bindings for GLib. + + This is the last version before the API and ABI change + introduced in 2.68.0 which requires C++17. + + http://www.gtkmm.org/ + +comment "glibmm (2.66.x) needs a toolchain w/ C++, wchar, threads, gcc >= 4.9" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_USE_WCHAR \ + || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/glibmm2_66/glibmm2_66.hash b/package/glibmm2_66/glibmm2_66.hash new file mode 100644 index 0000000000..b7d19b261c --- /dev/null +++ b/package/glibmm2_66/glibmm2_66.hash @@ -0,0 +1,5 @@ +# From https://download.gnome.org/sources/glibmm/2.66/glibmm-2.66.5.sha256sum +sha256 7b384662dd6ec3b86c0570331d32af05db2bd99a791602b767b4a0b2566ec149 glibmm-2.66.5.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 new file mode 100644 index 0000000000..b58c7ca8df --- /dev/null +++ b/package/glibmm2_66/glibmm2_66.mk @@ -0,0 +1,23 @@ +################################################################################ +# +# glibmm2_66 +# +################################################################################ + +GLIBMM2_66_VERSION_MAJOR = 2.66 +GLIBMM2_66_VERSION = $(GLIBMM2_66_VERSION_MAJOR).5 +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 +GLIBMM2_66_SITE = https://download.gnome.org/sources/glibmm/$(GLIBMM2_66_VERSION_MAJOR) +GLIBMM2_66_INSTALL_STAGING = YES +GLIBMM2_66_DEPENDENCIES = libglib2 libsigc2 host-pkgconf +GLIBMM2_66_CONF_OPTS = -Dbuild-examples=false + +GLIBMM2_66_CXXFLAGS = $(TARGET_CXXFLAGS) + +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y) +GLIBMM2_66_CXXFLAGS += -O0 +endif + +$(eval $(meson-package)) From 1a0f75f77b47b603b8abe727a27a0c5b97f00259 Mon Sep 17 00:00:00 2001 From: Lang Daniel Date: Fri, 24 Feb 2023 08:42:52 +0000 Subject: [PATCH 1154/5754] package/atkmm2_28: new package This is the version needed for gtkmm3. Note that 2.28 is indeed the latest version before 2.36. They skipped versions 2.30, 2.32 and 2.34. Signed-off-by: Daniel Lang Signed-off-by: Arnout Vandecappelle --- DEVELOPERS | 2 ++ package/Config.in | 1 + package/atkmm/Config.in | 2 +- package/atkmm2_28/Config.in | 23 +++++++++++++++++++++++ package/atkmm2_28/atkmm2_28.hash | 5 +++++ package/atkmm2_28/atkmm2_28.mk | 16 ++++++++++++++++ 6 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 package/atkmm2_28/Config.in create mode 100644 package/atkmm2_28/atkmm2_28.hash create mode 100644 package/atkmm2_28/atkmm2_28.mk diff --git a/DEVELOPERS b/DEVELOPERS index 32ab852084..c2734f9c59 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -640,6 +640,8 @@ N: Daniel J. Leach F: package/dacapo/ N: Daniel Lang +F: package/atkmm/ +F: package/atkmm2_28/ F: package/dbus-cxx/ F: package/glibmm/ F: package/glibmm2_66/ diff --git a/package/Config.in b/package/Config.in index 0f0980b57b..bc6f98c6e1 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1556,6 +1556,7 @@ menu "Graphics" 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" source "package/bullet/Config.in" source "package/cairo/Config.in" diff --git a/package/atkmm/Config.in b/package/atkmm/Config.in index aa58f8d593..1f370356ea 100644 --- a/package/atkmm/Config.in +++ b/package/atkmm/Config.in @@ -1,5 +1,5 @@ config BR2_PACKAGE_ATKMM - bool "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 diff --git a/package/atkmm2_28/Config.in b/package/atkmm2_28/Config.in new file mode 100644 index 0000000000..2340465b20 --- /dev/null +++ b/package/atkmm2_28/Config.in @@ -0,0 +1,23 @@ +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 + select BR2_PACKAGE_GLIBMM2_66 + select BR2_PACKAGE_LIBSIGC2 + + help + The atkmm package is a set of C++ bindings for Atk. + + This is the last version before the API and ABI change + introduced in 2.36.0 which requires C++17. + + http://www.gtkmm.org/ + +comment "atkmm (2.28.x) needs a toolchain w/ C++, wchar, threads, gcc >= 4.9" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_USE_WCHAR \ + || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/atkmm2_28/atkmm2_28.hash b/package/atkmm2_28/atkmm2_28.hash new file mode 100644 index 0000000000..776c9851b8 --- /dev/null +++ b/package/atkmm2_28/atkmm2_28.hash @@ -0,0 +1,5 @@ +# From https://download.gnome.org/sources/atkmm/2.28/atkmm-2.28.3.sha256sum +sha256 7c2088b486a909be8da2b18304e56c5f90884d1343c8da7367ea5cd3258b9969 atkmm-2.28.3.tar.xz +# locally computed +sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING.tools diff --git a/package/atkmm2_28/atkmm2_28.mk b/package/atkmm2_28/atkmm2_28.mk new file mode 100644 index 0000000000..dc57363cf5 --- /dev/null +++ b/package/atkmm2_28/atkmm2_28.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# atkmm2_28 +# +################################################################################ + +ATKMM2_28_VERSION_MAJOR = 2.28 +ATKMM2_28_VERSION = $(ATKMM2_28_VERSION_MAJOR).3 +ATKMM2_28_SOURCE = atkmm-$(ATKMM2_28_VERSION).tar.xz +ATKMM2_28_SITE = https://download.gnome.org/sources/atkmm/$(ATKMM2_28_VERSION_MAJOR) +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 + +$(eval $(meson-package)) From cd68e89c6c7d3bc3573ff5ae4eeedde4ca63003e Mon Sep 17 00:00:00 2001 From: Lang Daniel Date: Fri, 24 Feb 2023 08:42:58 +0000 Subject: [PATCH 1155/5754] package/cairomm1_14: new package This is the version needed by gtkmm3. Signed-off-by: Daniel Lang Signed-off-by: Arnout Vandecappelle --- DEVELOPERS | 2 ++ package/Config.in | 1 + package/cairomm/Config.in | 2 +- package/cairomm1_14/Config.in | 22 ++++++++++++++++++++++ package/cairomm1_14/cairomm1_14.hash | 3 +++ package/cairomm1_14/cairomm1_14.mk | 16 ++++++++++++++++ 6 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 package/cairomm1_14/Config.in create mode 100644 package/cairomm1_14/cairomm1_14.hash create mode 100644 package/cairomm1_14/cairomm1_14.mk diff --git a/DEVELOPERS b/DEVELOPERS index c2734f9c59..b9156aeaab 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -642,6 +642,8 @@ F: package/dacapo/ N: Daniel Lang F: package/atkmm/ F: package/atkmm2_28/ +F: package/cairomm/ +F: package/cairomm1_14/ F: package/dbus-cxx/ F: package/glibmm/ F: package/glibmm2_66/ diff --git a/package/Config.in b/package/Config.in index bc6f98c6e1..14897df6c8 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1561,6 +1561,7 @@ menu "Graphics" source "package/bullet/Config.in" source "package/cairo/Config.in" source "package/cairomm/Config.in" + source "package/cairomm1_14/Config.in" source "package/chipmunk/Config.in" source "package/exempi/Config.in" source "package/exiv2/Config.in" diff --git a/package/cairomm/Config.in b/package/cairomm/Config.in index dae52f01f7..75f6692b8a 100644 --- a/package/cairomm/Config.in +++ b/package/cairomm/Config.in @@ -1,5 +1,5 @@ config BR2_PACKAGE_CAIROMM - bool "cairomm" + bool "cairomm (latest)" depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # libsigc depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_USE_WCHAR # libglib2 diff --git a/package/cairomm1_14/Config.in b/package/cairomm1_14/Config.in new file mode 100644 index 0000000000..6e767d2428 --- /dev/null +++ b/package/cairomm1_14/Config.in @@ -0,0 +1,22 @@ +config BR2_PACKAGE_CAIROMM1_14 + bool "cairomm (1.14.x)" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11 + depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 + depends on BR2_USE_WCHAR # libglib2 + depends on BR2_USE_MMU # libglib2 + depends on BR2_INSTALL_LIBSTDCPP + select BR2_PACKAGE_CAIRO + select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_LIBSIGC2 + help + The cairomm package is a set of C++ bindings for Cairo. + + This is the last version before the API and ABI change + introduced in 1.16.0 which requires C++17. + + http://www.gtkmm.org/ + +comment "cairomm (1.14.x) needs a toolchain w/ C++, wchar, threads, gcc >= 4.9" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_USE_WCHAR \ + || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP diff --git a/package/cairomm1_14/cairomm1_14.hash b/package/cairomm1_14/cairomm1_14.hash new file mode 100644 index 0000000000..521e7cc546 --- /dev/null +++ b/package/cairomm1_14/cairomm1_14.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 ee12b920b2d47cea1b6e20c367690d726eb22b4ca9fc711db329d03adcc0c8e0 cairomm-1.14.4.tar.gz +sha256 bfe4a52dc4645385f356a8e83cc54216a293e3b6f1cb4f79f5fc0277abf937fd COPYING diff --git a/package/cairomm1_14/cairomm1_14.mk b/package/cairomm1_14/cairomm1_14.mk new file mode 100644 index 0000000000..5d076ddf0a --- /dev/null +++ b/package/cairomm1_14/cairomm1_14.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# cairomm1_14 +# +################################################################################ + +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_INSTALL_STAGING = YES +CAIROMM1_14_DEPENDENCIES = cairo libglib2 libsigc2 host-pkgconf +CAIROMM1_14_CONF_OPTS = -Dbuild-examples=false -Dbuild-tests=false + +$(eval $(meson-package)) From f91661108d85d4bb663fe555be82a246a7e6b027 Mon Sep 17 00:00:00 2001 From: Lang Daniel Date: Fri, 24 Feb 2023 08:43:02 +0000 Subject: [PATCH 1156/5754] package/pangomm2_46: new package This is the version needed by gtkmm3. Signed-off-by: Daniel Lang Signed-off-by: Arnout Vandecappelle --- DEVELOPERS | 2 ++ package/Config.in | 1 + package/pangomm/Config.in | 2 +- package/pangomm2_46/Config.in | 25 +++++++++++++++++++++++++ package/pangomm2_46/pangomm2_46.hash | 5 +++++ package/pangomm2_46/pangomm2_46.mk | 16 ++++++++++++++++ 6 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 package/pangomm2_46/Config.in create mode 100644 package/pangomm2_46/pangomm2_46.hash create mode 100644 package/pangomm2_46/pangomm2_46.mk diff --git a/DEVELOPERS b/DEVELOPERS index b9156aeaab..27466de54a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -650,6 +650,8 @@ F: package/glibmm2_66/ F: package/libsigc/ F: package/libsigc2/ F: package/paho-mqtt-cpp/ +F: package/pangomm/ +F: package/pangomm2_46/ N: Damien Lanson F: package/libvdpau/ diff --git a/package/Config.in b/package/Config.in index 14897df6c8..c7bb52d278 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1635,6 +1635,7 @@ menu "Graphics" source "package/openjpeg/Config.in" source "package/pango/Config.in" source "package/pangomm/Config.in" + source "package/pangomm2_46/Config.in" source "package/pixman/Config.in" source "package/poppler/Config.in" source "package/powervr/Config.in" diff --git a/package/pangomm/Config.in b/package/pangomm/Config.in index c23ac4aaa8..6ddad9e6ef 100644 --- a/package/pangomm/Config.in +++ b/package/pangomm/Config.in @@ -1,5 +1,5 @@ config BR2_PACKAGE_PANGOMM - bool "pangomm" + bool "pangomm (latest)" depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango -> harfbuzz depends on BR2_INSTALL_LIBSTDCPP # glibmm/pango depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # libsigc diff --git a/package/pangomm2_46/Config.in b/package/pangomm2_46/Config.in new file mode 100644 index 0000000000..772b523c83 --- /dev/null +++ b/package/pangomm2_46/Config.in @@ -0,0 +1,25 @@ +config BR2_PACKAGE_PANGOMM2_46 + bool "pangomm (2.46.x)" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango -> harfbuzz + depends on BR2_INSTALL_LIBSTDCPP # glibmm/pango + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11 + depends on BR2_TOOLCHAIN_HAS_THREADS # *mm/pango -> libglib2 + depends on BR2_USE_MMU # *mm/pango -> libglib2 + depends on BR2_USE_WCHAR # *mm/pango -> libglib2 + select BR2_PACKAGE_CAIROMM1_14 + select BR2_PACKAGE_GLIBMM2_66 + select BR2_PACKAGE_PANGO + select BR2_PACKAGE_LIBSIGC2 + help + The pangomm package is a set of C++ bindings for Pango. + + This is the last version before the API and ABI change + introduced in 2.48.0 which requires C++17. + + http://www.gtkmm.org/ + +comment "pangomm (2.46.x) needs a toolchain w/ C++, wchar, threads, gcc >= 4.9" + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_USE_WCHAR \ + || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/pangomm2_46/pangomm2_46.hash b/package/pangomm2_46/pangomm2_46.hash new file mode 100644 index 0000000000..8d05dbc2ff --- /dev/null +++ b/package/pangomm2_46/pangomm2_46.hash @@ -0,0 +1,5 @@ +# From https://download.gnome.org/sources/pangomm/2.46/pangomm-2.46.3.sha256sum +sha256 410fe04d471a608f3f0273d3a17d840241d911ed0ff2c758a9859c66c6f24379 pangomm-2.46.3.tar.xz +# Locally computed +sha256 5bbcbb737e60fe9deba08ecbd00920cfcc3403ba2e534c64fdeea49d6bb87509 COPYING +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING.tools diff --git a/package/pangomm2_46/pangomm2_46.mk b/package/pangomm2_46/pangomm2_46.mk new file mode 100644 index 0000000000..1725158491 --- /dev/null +++ b/package/pangomm2_46/pangomm2_46.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# pangomm2_46 +# +################################################################################ + +PANGOMM2_46_VERSION_MAJOR = 2.46 +PANGOMM2_46_VERSION = $(PANGOMM2_46_VERSION_MAJOR).3 +PANGOMM2_46_SOURCE = pangomm-$(PANGOMM2_46_VERSION).tar.xz +PANGOMM2_46_SITE = https://download.gnome.org/sources/pangomm/$(PANGOMM2_46_VERSION_MAJOR) +PANGOMM2_46_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools) +PANGOMM2_46_LICENSE_FILES = COPYING COPYING.tools +PANGOMM2_46_INSTALL_STAGING = YES +PANGOMM2_46_DEPENDENCIES = glibmm2_66 cairomm1_14 libsigc2 pango host-pkgconf + +$(eval $(meson-package)) From 6e817622b812cf579061abd78f08af029eba72ea Mon Sep 17 00:00:00 2001 From: Lang Daniel Date: Fri, 24 Feb 2023 08:43:23 +0000 Subject: [PATCH 1157/5754] package/gtkmm3: use correct versions of mm packages Many of the C++ wrapper packages had API changes. These changes where never introduced in gtkmm3, meaning that older, but still maintained versions are needed to build gtkmm3. Fixes: - http://autobuild.buildroot.net/results/172/17263ac51f197031106eb7fd595126a2720f0397 Signed-off-by: Daniel Lang Signed-off-by: Arnout Vandecappelle --- DEVELOPERS | 1 + package/gtkmm3/Config.in | 16 ++++++++-------- package/gtkmm3/gtkmm3.mk | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 27466de54a..1dc085b87f 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -647,6 +647,7 @@ F: package/cairomm1_14/ F: package/dbus-cxx/ F: package/glibmm/ F: package/glibmm2_66/ +F: package/gtkmm3/ F: package/libsigc/ F: package/libsigc2/ F: package/paho-mqtt-cpp/ diff --git a/package/gtkmm3/Config.in b/package/gtkmm3/Config.in index 3c1c6f36e8..6b924c856b 100644 --- a/package/gtkmm3/Config.in +++ b/package/gtkmm3/Config.in @@ -1,7 +1,7 @@ -comment "gtkmm3 needs libgtk3 and a toolchain w/ C++, wchar, threads, gcc >= 7" +comment "gtkmm3 needs libgtk3 and a toolchain w/ C++, wchar, threads, gcc >= 4.9" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || !BR2_USE_WCHAR \ + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_USE_WCHAR \ || !BR2_INSTALL_LIBSTDCPP || !BR2_PACKAGE_LIBGTK3 \ || !BR2_TOOLCHAIN_HAS_THREADS @@ -14,16 +14,16 @@ config BR2_PACKAGE_GTKMM3 depends on !BR2_nios2 depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pangomm, libgtk3 -> pango -> harfbuzz depends on BR2_INSTALL_LIBSTDCPP # glibmm, libpangomm -> glibmm/pango - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # libsigc + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11 depends on BR2_TOOLCHAIN_HAS_THREADS # *mm/libgtk3 -> libglib2 depends on BR2_USE_MMU # *mm/libgtk3 -> libglib2 depends on BR2_USE_WCHAR # *mm/libgtk3 -> libglib2 depends on BR2_PACKAGE_LIBGTK3 - select BR2_PACKAGE_ATKMM - select BR2_PACKAGE_CAIROMM - select BR2_PACKAGE_GLIBMM - select BR2_PACKAGE_LIBSIGC - select BR2_PACKAGE_PANGOMM + select BR2_PACKAGE_ATKMM2_28 + select BR2_PACKAGE_CAIROMM1_14 + select BR2_PACKAGE_GLIBMM2_66 + select BR2_PACKAGE_LIBSIGC2 + select BR2_PACKAGE_PANGOMM2_46 help The gtkmm3 package is a set of C++ bindings for GTK 3. diff --git a/package/gtkmm3/gtkmm3.mk b/package/gtkmm3/gtkmm3.mk index d717c08bd8..8bbcf224e6 100644 --- a/package/gtkmm3/gtkmm3.mk +++ b/package/gtkmm3/gtkmm3.mk @@ -11,6 +11,6 @@ GTKMM3_SITE = https://download.gnome.org/sources/gtkmm/$(GTKMM3_VERSION_MAJOR) GTKMM3_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools) GTKMM3_LICENSE_FILES = COPYING COPYING.tools GTKMM3_INSTALL_STAGING = YES -GTKMM3_DEPENDENCIES = atkmm cairomm glibmm libgtk3 libsigc pangomm host-pkgconf +GTKMM3_DEPENDENCIES = atkmm2_28 cairomm1_14 glibmm2_66 libgtk3 libsigc2 pangomm2_46 host-pkgconf $(eval $(autotools-package)) From 0aaadd525f2df02911349ffe1518814fa095bf96 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 23 Feb 2023 23:25:39 +0100 Subject: [PATCH 1158/5754] package/libmad: force arm mode instead of Thumb mode Fix the following build failure: /tmp/ccv8mDeW.s:93: Error: selected processor does not support `smull r6,r7,r3,r1' in Thumb mode Fixes: - http://autobuild.buildroot.org/results/92a3f19b4fa12a7724f9e3d99284da4ad2beecb2 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/libmad/libmad.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/libmad/libmad.mk b/package/libmad/libmad.mk index 33134e26d4..084a533cc0 100644 --- a/package/libmad/libmad.mk +++ b/package/libmad/libmad.mk @@ -31,6 +31,13 @@ LIBMAD_IGNORE_CVES += CVE-2017-8374 # is able to properly behave in the face of a missing C++ compiler. LIBMAD_AUTORECONF = YES +# libmad has some assembly function that is not present in Thumb mode: +# Error: selected processor does not support `smull r6,r7,r3,r1' in Thumb mode +# so, we desactivate Thumb mode +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +LIBMAD_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm" +endif + define LIBMAD_INSTALL_STAGING_PC $(INSTALL) -D package/libmad/mad.pc \ $(STAGING_DIR)/usr/lib/pkgconfig/mad.pc From 53d70dbe40232a7539559f1a4f807b8022737ed8 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 22 Feb 2023 15:35:12 +0100 Subject: [PATCH 1159/5754] package/audit: force arm mode instead of Thumb mode Fix the following build failure: /tmp/ccY5gl3z.s:2145: Error: selected processor does not support `mcr p15,0,r2,c7,c10,5' in Thumb mode Fixes: - http://autobuild.buildroot.org/results/9d18a0d360b2e2f9e87c55daedda62d6ce198bb9 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/audit/audit.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/audit/audit.mk b/package/audit/audit.mk index aa8ef515e6..77e7c24000 100644 --- a/package/audit/audit.mk +++ b/package/audit/audit.mk @@ -15,6 +15,13 @@ AUDIT_INSTALL_STAGING = YES AUDIT_CONF_OPTS = --without-python --without-python3 --disable-zos-remote +# src/libev has some assembly function that is not present in Thumb mode: +# Error: selected processor does not support `mcr p15,0,r3,c7,c10,5' in Thumb mode +# so, we desactivate Thumb mode +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +AUDIT_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm" +endif + ifeq ($(BR2_PACKAGE_LIBCAP_NG),y) AUDIT_DEPENDENCIES += libcap-ng AUDIT_CONF_OPTS += --with-libcap-ng=yes From 964254bfd99a5bb7c405a03bdd165f11ddc36f4a Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 22 Feb 2023 15:37:53 +0100 Subject: [PATCH 1160/5754] package/libev: force arm mode instead of Thumb mode Fix the following build failure: /tmp/ccHc3Awn.s:825: Error: selected processor does not support `mcr p15,0,r3,c7,c10,5' in Thumb mode Fixes: - http://autobuild.buildroot.org/results/1c597c9da724d6cac06b09b1ecd456a28440a3a3 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/libev/libev.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/libev/libev.mk b/package/libev/libev.mk index 9f3c19d46c..cbd5433d76 100644 --- a/package/libev/libev.mk +++ b/package/libev/libev.mk @@ -10,6 +10,13 @@ LIBEV_INSTALL_STAGING = YES LIBEV_LICENSE = BSD-2-Clause or GPL-2.0+ LIBEV_LICENSE_FILES = LICENSE +# libev has some assembly function that is not present in Thumb mode: +# Error: selected processor does not support `mcr p15,0,r3,c7,c10,5' in Thumb mode +# so, we desactivate Thumb mode +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +LIBEV_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm" +endif + # The 'compatibility' event.h header conflicts with libevent # It's completely unnecessary for BR packages so remove it define LIBEV_DISABLE_EVENT_H_INSTALL From cda8dabfeb8f53b1a7dd1341ad9fc7e37bff516e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 22 Feb 2023 20:18:50 +0100 Subject: [PATCH 1161/5754] package/libgcrypt: fix Thumb mode workaround Fix the following build failure: /tmp/ccRqWxnA.s:98: Error: instruction not supported in Thumb16 mode -- `adds ip,fp,r0' Fixes: - http://autobuild.buildroot.org/results/4b96f4e41724e5c9c806a6c7df397a58d1ae1b1e Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- 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 8f4e5ec8c0..9232debb3a 100644 --- a/package/libgcrypt/libgcrypt.mk +++ b/package/libgcrypt/libgcrypt.mk @@ -27,8 +27,8 @@ LIBGCRYPT_CONF_OPTS += --disable-asm endif # Code doesn't build in thumb mode -ifeq ($(BR2_arm),y) -LIBGCRYPT_CONF_ENV += CFLAGS="$(patsubst -mthumb,,$(TARGET_CFLAGS))" +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +LIBGCRYPT_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm" endif $(eval $(autotools-package)) From 562045056b7a25131cc17f58055fd5d6d7bf305c Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 10 Mar 2023 18:14:07 +0100 Subject: [PATCH 1162/5754] package/x11r7/xdriver_xf86-video-qxl: Update broken URL in Config.in helptext Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- package/x11r7/xdriver_xf86-video-qxl/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/x11r7/xdriver_xf86-video-qxl/Config.in b/package/x11r7/xdriver_xf86-video-qxl/Config.in index 40f61fd69f..0c6b13eda2 100644 --- a/package/x11r7/xdriver_xf86-video-qxl/Config.in +++ b/package/x11r7/xdriver_xf86-video-qxl/Config.in @@ -9,4 +9,4 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_QXL help QEMU QXL paravirt video driver - http://www.spice-space.org/page/XorgQXL + https://gitlab.freedesktop.org/xorg/driver/xf86-video-qxl From 331c9ba9e082d0319b822fbd46c0f5a898e69584 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 10 Mar 2023 18:06:11 +0100 Subject: [PATCH 1163/5754] package/php: link with -latomic if needed Fixes: http://autobuild.buildroot.net/results/112/112ec5cb0de6f55a29caf7ec563367afd28eb8a0/ Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- package/php/php.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/php/php.mk b/package/php/php.mk index bd7d5a8c3c..49f02d7f20 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -35,6 +35,10 @@ ifeq ($(BR2_STATIC_LIBS)$(BR2_TOOLCHAIN_HAS_THREADS),yy) PHP_STATIC_LIBS += -lpthread endif +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +PHP_EXTRA_LIBS += -latomic +endif + ifeq ($(call qstrip,$(BR2_TARGET_LOCALTIME)),) PHP_LOCALTIME = UTC else From dfc3b05c05c8fa1a86affdd0a42fa4f6a0bf0171 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 10 Mar 2023 17:59:00 +0100 Subject: [PATCH 1164/5754] package/znc: Fix build with LibreSSL Fixes: http://autobuild.buildroot.net/results/3fe/3fec5c3a21af47b5f4e8adcaf4ce1fff5070e00a/ Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- ...0001-LibreSSL-3.5-opaqued-structures.patch | 27 ++++++++ .../znc/0002-Fix-build-with-libressl.patch | 68 +++++++++++++++++++ ...DH_get0_key-have-existed-since-Libre.patch | 30 ++++++++ 3 files changed, 125 insertions(+) create mode 100644 package/znc/0001-LibreSSL-3.5-opaqued-structures.patch create mode 100644 package/znc/0002-Fix-build-with-libressl.patch create mode 100644 package/znc/0003-DH_set0_pqg-and-DH_get0_key-have-existed-since-Libre.patch diff --git a/package/znc/0001-LibreSSL-3.5-opaqued-structures.patch b/package/znc/0001-LibreSSL-3.5-opaqued-structures.patch new file mode 100644 index 0000000000..d0019e21a4 --- /dev/null +++ b/package/znc/0001-LibreSSL-3.5-opaqued-structures.patch @@ -0,0 +1,27 @@ +From 87f3dac8ba8dea5628b05416bdef454b4ef2d236 Mon Sep 17 00:00:00 2001 +From: Charlie Li +Date: Mon, 14 Mar 2022 17:36:36 -0400 +Subject: [PATCH] LibreSSL 3.5 opaqued structures + +Downloaded from upstream commit +https://github.com/znc/Csocket/commit/87f3dac8ba8dea5628b05416bdef454b4ef2d236 + +Signed-off-by: Bernd Kuhls +(rebased for znc) +--- + Csocket.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Csocket.cc b/Csocket.cc +index 46a3bfd..a30da14 100644 +--- a/third_party/Csocket/Csocket.cc ++++ b/third_party/Csocket/Csocket.cc +@@ -61,7 +61,7 @@ + # define OPENSSL_NO_TLS1_1 /* 1.0.1-pre~: openssl/openssl@637f374ad49d5f6d4f81d87d7cdd226428aa470c */ + # define OPENSSL_NO_TLS1_2 /* 1.0.1-pre~: openssl/openssl@7409d7ad517650db332ae528915a570e4e0ab88b */ + # endif +-# ifndef LIBRESSL_VERSION_NUMBER /* forked from OpenSSL 1.0.1g, sets high version "with the idea of discouraging software from relying on magic numbers for detecting features"(!) */ ++# if !defined(LIBRESSL_VERSION_NUMBER) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x03050000fL) + # if OPENSSL_VERSION_NUMBER >= 0x10100000 + # undef HAVE_ERR_REMOVE_THREAD_STATE /* 1.1.0-pre4: openssl/openssl@8509dcc9f319190c565ab6baad7c88d37a951d1c */ + # undef OPENSSL_NO_SSL2 /* 1.1.0-pre4: openssl/openssl@e80381e1a3309f5d4a783bcaa508a90187a48882 */ diff --git a/package/znc/0002-Fix-build-with-libressl.patch b/package/znc/0002-Fix-build-with-libressl.patch new file mode 100644 index 0000000000..b8d22445fb --- /dev/null +++ b/package/znc/0002-Fix-build-with-libressl.patch @@ -0,0 +1,68 @@ +From dcb5f3df82fcfec48aab356252067dc897fb98cf Mon Sep 17 00:00:00 2001 +From: Alexey Sokolov +Date: Sun, 14 Nov 2021 00:45:01 +0000 +Subject: [PATCH] Fix build with libressl + +It got another feature of openssl implemented, which broke this + +Downloaded from upstream commit +https://github.com/znc/znc/commit/dcb5f3df82fcfec48aab356252067dc897fb98cf + +Signed-off-by: Bernd Kuhls +--- + CMakeLists.txt | 14 ++++++++++++++ + include/znc/zncconfig.h.cmake.in | 1 + + modules/schat.cpp | 3 +-- + 3 files changed, 16 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0913ff2691..1f77f5632b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -82,6 +82,20 @@ endmacro() + tristate_option(OPENSSL "Support SSL") + if(WANT_OPENSSL) + find_package(OpenSSL ${TRISTATE_OPENSSL_REQUIRED}) ++ ++ if(OPENSSL_FOUND) ++ # SSL_SESSION was made opaque in OpenSSL 1.1.0; ++ # LibreSSL gained that function later too. ++ # TODO: maybe remove this check at some point, and stop supporting old ++ # libssl versions ++ function(check_SSL_SESSION_get0_cipher) ++ set(CMAKE_REQUIRED_LIBRARIES ${OPENSSL_LIBRARIES}) ++ set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR}) ++ check_cxx_symbol_exists(SSL_SESSION_get0_cipher openssl/ssl.h ++ HAVE_SSL_SESSION_get0_cipher) ++ endfunction() ++ check_SSL_SESSION_get0_cipher() ++ endif() + endif() + set(HAVE_LIBSSL "${OPENSSL_FOUND}") + +diff --git a/include/znc/zncconfig.h.cmake.in b/include/znc/zncconfig.h.cmake.in +index 5426b828af..7b07b99aec 100644 +--- a/include/znc/zncconfig.h.cmake.in ++++ b/include/znc/zncconfig.h.cmake.in +@@ -31,6 +31,7 @@ + #define HAVE_PTHREAD 1 + #cmakedefine HAVE_THREADED_DNS 1 + #cmakedefine HAVE_LIBSSL 1 ++#cmakedefine HAVE_SSL_SESSION_get0_cipher 1 + #cmakedefine HAVE_IPV6 1 + #cmakedefine HAVE_ZLIB 1 + #cmakedefine HAVE_I18N 1 +diff --git a/modules/schat.cpp b/modules/schat.cpp +index aa7a338dcd..66e67e695c 100644 +--- a/modules/schat.cpp ++++ b/modules/schat.cpp +@@ -25,8 +25,7 @@ + #include + #include + +-#if !defined(OPENSSL_VERSION_NUMBER) || defined(LIBRESSL_VERSION_NUMBER) || \ +- OPENSSL_VERSION_NUMBER < 0x10100007 ++#ifndef HAVE_SSL_SESSION_get0_cipher + /* SSL_SESSION was made opaque in OpenSSL 1.1.0, cipher accessor was added 2 + weeks before the public release. + See openssl/openssl@e92813234318635639dba0168c7ef5568757449b. */ diff --git a/package/znc/0003-DH_set0_pqg-and-DH_get0_key-have-existed-since-Libre.patch b/package/znc/0003-DH_set0_pqg-and-DH_get0_key-have-existed-since-Libre.patch new file mode 100644 index 0000000000..a2946643fc --- /dev/null +++ b/package/znc/0003-DH_set0_pqg-and-DH_get0_key-have-existed-since-Libre.patch @@ -0,0 +1,30 @@ +From 7c8ac8981a8516edaba469641aff4d8ec452ae9e Mon Sep 17 00:00:00 2001 +From: Charlie Li +Date: Mon, 14 Mar 2022 18:32:46 -0400 +Subject: [PATCH] DH_set0_pqg and DH_get0_key have existed since LibreSSL 2.7 + +https://github.com/libressl-portable/openbsd/commit/848e2a019c796b685fc8c5848283b86e48fbe0bf +https://github.com/libressl-portable/openbsd/commit/3789e379353c1d53313a249461b3d735de4ac742 + +Downloaded from upstream commit +https://github.com/znc/znc/commit/7c8ac8981a8516edaba469641aff4d8ec452ae9e + +Signed-off-by: Bernd Kuhls +--- + modules/crypt.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/modules/crypt.cpp b/modules/crypt.cpp +index 7655371b6e..68f7aafcea 100644 +--- a/modules/crypt.cpp ++++ b/modules/crypt.cpp +@@ -68,7 +68,8 @@ class CCryptMod : public CModule { + CString m_sPrivKey; + CString m_sPubKey; + +-#if OPENSSL_VERSION_NUMBER < 0X10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0X10100000L || \ ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x02070000fL) + static int DH_set0_pqg(DH* dh, BIGNUM* p, BIGNUM* q, BIGNUM* g) { + /* If the fields p and g in dh are nullptr, the corresponding input + * parameters MUST be non-nullptr. q may remain nullptr. From 863811974e04b3332c4959c07a20e3e97050835c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 23 Feb 2023 12:19:03 +0100 Subject: [PATCH 1165/5754] package/s6-linux-utils: fix build with glibc < 2.25 Fix the following build failure with glibc < 2.25 raised since bump to version 2.6.0.0 in commit 5aac1d0105a73133fd886acc6c5195ca28f7e17f and https://github.com/skarnet/s6-linux-utils/commit/ad5973028c42d947440cdae5e4f106152c3dda28: src/minutils/rngseed.c:15:24: fatal error: sys/random.h: No such file or directory #include ^ Fixes: - http://autobuild.buildroot.org/results/214bcecfc389cb412b68627c831300478d614a3a Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- ...utils-rngseed.c-fix-build-with-glibc.patch | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 package/s6-linux-utils/0001-src-s6-linux-utils-rngseed.c-fix-build-with-glibc.patch diff --git a/package/s6-linux-utils/0001-src-s6-linux-utils-rngseed.c-fix-build-with-glibc.patch b/package/s6-linux-utils/0001-src-s6-linux-utils-rngseed.c-fix-build-with-glibc.patch new file mode 100644 index 0000000000..2df8a99700 --- /dev/null +++ b/package/s6-linux-utils/0001-src-s6-linux-utils-rngseed.c-fix-build-with-glibc.patch @@ -0,0 +1,39 @@ +From 3ab8bdc1c657f91a2a96f4e6db308d17098de0c4 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 23 Feb 2023 12:09:11 +0100 +Subject: [PATCH] src/s6-linux-utils/rngseed.c: fix build with glibc < + +getrandom and sys/random.h are only available since glibc 2.25 resulting +in the following build failure since version 2.6.0.0 and +https://github.com/skarnet/s6-linux-utils/commit/ad5973028c42d947440cdae5e4f106152c3dda28: + +src/minutils/rngseed.c:15:24: fatal error: sys/random.h: No such file or directory + #include + ^ + +Fixes: + - http://autobuild.buildroot.org/results/214bcecfc389cb412b68627c831300478d614a3a + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/skarnet/s6-linux-utils/pull/2] +--- + src/s6-linux-utils/rngseed.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/minutils/rngseed.c b/src/minutils/rngseed.c +index 2b1772c..223f50a 100644 +--- a/src/minutils/rngseed.c ++++ b/src/minutils/rngseed.c +@@ -12,7 +12,9 @@ + #include + #include + #include ++#ifdef SKALIBS_HASGETRANDOM + #include ++#endif + #include + + #include +-- +2.39.1 + From 37be4bda854d921e4db7f4202c3a99f98c1bfb69 Mon Sep 17 00:00:00 2001 From: Lang Daniel Date: Wed, 15 Feb 2023 09:58:51 +0000 Subject: [PATCH 1166/5754] linux: use -isystem instead of -I in HOSTCC A package might install headers that are incompatible with the kernel's header. One example is the most recent version of pahole (1.24). HOST_CC includes -I$(HOST_DIR)/include which comes before any include logic the kernel might have thus forcing the kernel to prefer headers in HOST_DIR. The logic to substituting -I with -isystem is taken from boot/uboot/uboot.mk. Signed-off-by: Daniel Lang Reviewed-by: Francis Laniel Tested-by: Francis Laniel Signed-off-by: Arnout Vandecappelle --- linux/linux.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/linux.mk b/linux/linux.mk index 7645b5f507..03d89cd204 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -150,7 +150,7 @@ endif # Disable building host tools with -Werror: newer gcc versions can be # extra picky about some code (https://bugs.busybox.net/show_bug.cgi?id=14826) LINUX_MAKE_FLAGS = \ - HOSTCC="$(HOSTCC) $(HOST_CFLAGS) $(HOST_LDFLAGS)" \ + HOSTCC="$(HOSTCC) $(subst -I/,-isystem /,$(subst -I /,-isystem /,$(HOST_CFLAGS))) $(HOST_LDFLAGS)" \ ARCH=$(KERNEL_ARCH) \ INSTALL_MOD_PATH=$(TARGET_DIR) \ CROSS_COMPILE="$(TARGET_CROSS)" \ From 7ff3e631419ef59dd2c8f163cf1a3e534e118079 Mon Sep 17 00:00:00 2001 From: Lang Daniel Date: Wed, 15 Feb 2023 09:58:39 +0000 Subject: [PATCH 1167/5754] package/libbpf: Don't remove bpf.h libbpf >1.0.0 defines libbpf_bpf_link_type_str(enum bpf_link_type) in src/libbpf.h, which is included by host-pahole. bpf_link_type is defined in linux/bpf.h, therefore the comment stating that pahole doesn't need bpf.h is no longer valid. The original reason to remove bpf.h has been solved with the previous commit: the linux build will prefer the internal bpf.h over the one in HOST_DIR (or in /usr/include). So we can safely keep bpf.h. Fixes: - http://autobuild.buildroot.net/results/d126a4b6eca786402dc362c86f8df3addec3d217/ Signed-off-by: Daniel Lang Signed-off-by: Arnout Vandecappelle --- package/libbpf/libbpf.mk | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/package/libbpf/libbpf.mk b/package/libbpf/libbpf.mk index b498136ace..670dbee87e 100644 --- a/package/libbpf/libbpf.mk +++ b/package/libbpf/libbpf.mk @@ -39,26 +39,9 @@ define LIBBPF_INSTALL_TARGET_CMDS -C $(@D)/src install DESTDIR=$(TARGET_DIR) endef -# We need to install_uapi_headers so we have btf.h to compile -# host-pahole. -# Nonetheless, this target adds bpf.h which generates a conflict when -# building the kernel: -# In file included from libbpf_internal.h:17:0, from strset.c:9: -# relo_core.h:10:6: error: nested redefinition of 'enum bpf_core_relo_kind' -# enum bpf_core_relo_kind { -# ^~~~~~~~~~~~~~~~~~ -# relo_core.h:10:6: error: redeclaration of 'enum bpf_core_relo_kind' -# In file included from libbpf_legacy.h:13:0, -# from libbpf_internal.h:16, -# from strset.c:9: -# /home/francis/buildroot/output/host/include/linux/bpf.h:6497:6: note: originally defined here -# enum bpf_core_relo_kind { -# So, better to remove remove it now since we do not need it to build -# host-pahole, the only user of host-libbpf. define HOST_LIBBPF_INSTALL_CMDS $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) \ -C $(@D)/src install install_uapi_headers DESTDIR=$(HOST_DIR) - rm $(HOST_DIR)/include/linux/bpf.h endef $(eval $(generic-package)) From 70d9f17c48f8aaf02e6cd4c17093c00d07eb56c8 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 21 Feb 2023 12:50:01 +0100 Subject: [PATCH 1168/5754] package/pcre2: drop JIT sparc JIT sparc support has been dropped since version 10.41 and https://github.com/PCRE2Project/pcre2/commit/b67d5682019fd192a615a1d5ed254b564f54126b resulting in the following build failure since bump to version 10.42 in commit 64a03682cc1a90a311b2331224deac62f8c8940f: src/pcre2_jit_compile.c:82:2: error: #error Unsupported architecture 82 | #error Unsupported architecture | ^~~~~ Fixes: - http://autobuild.buildroot.org/results/d8246c9e3e54547cdb7d94dcdbf376d292dfd787 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/pcre2/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/pcre2/Config.in b/package/pcre2/Config.in index f06f1914f3..ba4719dd3d 100644 --- a/package/pcre2/Config.in +++ b/package/pcre2/Config.in @@ -29,7 +29,6 @@ config BR2_PACKAGE_PCRE2_JIT_ARCH_SUPPORTS default y if BR2_i386 || BR2_x86_64 default y if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el default y if BR2_powerpc - default y if BR2_sparc config BR2_PACKAGE_PCRE2_JIT bool "enable JIT support" From f1623664253853208773b7318165189b5cf94867 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 21 Feb 2023 14:00:40 +0100 Subject: [PATCH 1169/5754] package/network-manager: fix build with -Dmodem_manager=false Fix the following build failure with -Dmodem_manager=false raised since commit c36f6938858d3246ca493dacc925717586e2ea0f: ../output-1/build/network-manager-1.40.10/meson.build:1060:0: ERROR: Unknown variable "mobile_broadband_provider_info_database". Fixes: - http://autobuild.buildroot.org/results/896879c8e8ce022556ee834216ced2f962ff279c Signed-off-by: Fabrice Fontaine Reviewed-by: John Keeping Signed-off-by: Arnout Vandecappelle --- ...build-failure-with-Dmodem_manager-fa.patch | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 package/network-manager/0002-meson.build-fix-build-failure-with-Dmodem_manager-fa.patch diff --git a/package/network-manager/0002-meson.build-fix-build-failure-with-Dmodem_manager-fa.patch b/package/network-manager/0002-meson.build-fix-build-failure-with-Dmodem_manager-fa.patch new file mode 100644 index 0000000000..648be027e0 --- /dev/null +++ b/package/network-manager/0002-meson.build-fix-build-failure-with-Dmodem_manager-fa.patch @@ -0,0 +1,38 @@ +From 736a2c356c1c4871e8c4e70be622c65c87d3bca8 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 21 Feb 2023 13:03:00 +0100 +Subject: [PATCH] meson.build: fix build failure with -Dmodem_manager=false + +Fix the following build failure with -Dmodem_manager=false raised since +https://gitlab.freedesktop.org/ffontaine/NetworkManager/-/commit/03ba04d4784fa4fc7ec31455070fb5ecf25ade23: + +../output-1/build/network-manager-1.40.10/meson.build:1060:0: ERROR: Unknown variable "mobile_broadband_provider_info_database". + +Fixes: + - http://autobuild.buildroot.org/results/896879c8e8ce022556ee834216ced2f962ff279c + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1544] +--- + meson.build | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 84ce52c736..b79240efc0 100644 +--- a/meson.build ++++ b/meson.build +@@ -1057,7 +1057,9 @@ output += ' jansson: ' + jansson_msg + '\n' + output += ' iptables: ' + config_h.get('IPTABLES_PATH') + '\n' + output += ' nft: ' + config_h.get('NFT_PATH') + '\n' + output += ' modemmanager-1: ' + enable_modem_manager.to_string() + '\n' +-output += ' mobile-broadband-provider-info-database: ' + mobile_broadband_provider_info_database + '\n' ++if enable_modem_manager ++ output += ' mobile-broadband-provider-info-database: ' + mobile_broadband_provider_info_database + '\n' ++endif + output += ' ofono: ' + enable_ofono.to_string() + '\n' + output += ' concheck: ' + enable_concheck.to_string() + '\n' + output += ' libteamdctl: ' + enable_teamdctl.to_string() + '\n' +-- +2.39.0 + From 3279d8b9c45572f9c435ba0b356c2ec7f1fa85f3 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 21 Feb 2023 14:05:54 +0100 Subject: [PATCH 1170/5754] package/rdma-core: needs NPTL rdma-core unconditionally uses pthread_spin_lock since its addition in commit ea47e177f093d7378e8e8e1f50d6f4e3fce0a088 resulting in the following build failure: /home/autobuild/autobuild/instance-9/output-1/host/lib/gcc/sh4-buildroot-linux-uclibc/12.2.0/../../../../sh4-buildroot-linux-uclibc/bin/ld: CMakeFiles/hfi1verbs-rdmav34.dir/verbs.c.o: in function `post_recv': verbs.c:(.text+0xc4): undefined reference to `pthread_spin_lock' Fixes: - http://autobuild.buildroot.org/results/a943e03b79c4cc328b7712046ecff09706045f81 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/rdma-core/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/rdma-core/Config.in b/package/rdma-core/Config.in index 59f5ef63ae..3360e6873d 100644 --- a/package/rdma-core/Config.in +++ b/package/rdma-core/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_RDMA_CORE depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 # iproute2 depends on !BR2_STATIC_LIBS # dlopen() - depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL select BR2_PACKAGE_IPROUTE2 # runtime select BR2_PACKAGE_LIBNL help @@ -13,8 +13,8 @@ config BR2_PACKAGE_RDMA_CORE https://github.com/linux-rdma/rdma-core -comment "rdma-core needs a toolchain w/ headers >= 3.4, threads, dynamic library" +comment "rdma-core needs a toolchain w/ headers >= 3.4, NPTL, dynamic library" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 \ - || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS From 4ec39bad8062878cebd6dc95b712e33209b4e585 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 21 Feb 2023 14:30:41 +0100 Subject: [PATCH 1171/5754] package/ace: fix build with libressl >= 3.5.0 Fix the following build failure with libressl raised since bump to version 3.5.2 in commit 8b216927db080b38fdbf1f8b025b6f90a89d4bc2: /tmp/instance-17/output-1/build/ace-7.0.6/ace/SSL/SSL_Asynch_BIO.cpp:45:19: error: variable 'BIO_METHOD methods_ACE' has initializer but incomplete type 45 | static BIO_METHOD methods_ACE = | ^~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/7f40d6dde03134238151c248fbbd66e4713546cb Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- ...Asynch_BIO.cpp-fix-build-with-libres.patch | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 package/ace/0002-ACE-ace-SSL-SSL_Asynch_BIO.cpp-fix-build-with-libres.patch diff --git a/package/ace/0002-ACE-ace-SSL-SSL_Asynch_BIO.cpp-fix-build-with-libres.patch b/package/ace/0002-ACE-ace-SSL-SSL_Asynch_BIO.cpp-fix-build-with-libres.patch new file mode 100644 index 0000000000..4f9fde5579 --- /dev/null +++ b/package/ace/0002-ACE-ace-SSL-SSL_Asynch_BIO.cpp-fix-build-with-libres.patch @@ -0,0 +1,56 @@ +From 82b139f921ddb549c1bd236030bbc86e314852b3 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 21 Feb 2023 14:20:11 +0100 +Subject: [PATCH] ACE/ace/SSL/SSL_Asynch_BIO.cpp: fix build with libressl >= + 3.5.0 + +Fix the following build failure with libressl >= 3.5.0: + +/tmp/instance-17/output-1/build/ace-7.0.6/ace/SSL/SSL_Asynch_BIO.cpp:45:19: error: variable 'BIO_METHOD methods_ACE' has initializer but incomplete type + 45 | static BIO_METHOD methods_ACE = + | ^~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/7f40d6dde03134238151c248fbbd66e4713546cb + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/DOCGroup/ACE_TAO/pull/2053] +--- + ACE/ace/SSL/SSL_Asynch_BIO.cpp | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/ace/SSL/SSL_Asynch_BIO.cpp b/ace/SSL/SSL_Asynch_BIO.cpp +index 0faa775fc0..5543598873 100644 +--- a/ace/SSL/SSL_Asynch_BIO.cpp ++++ b/ace/SSL/SSL_Asynch_BIO.cpp +@@ -41,7 +41,8 @@ extern "C" + + #define BIO_TYPE_ACE ( 21 | BIO_TYPE_SOURCE_SINK ) + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L) + static BIO_METHOD methods_ACE = + { + BIO_TYPE_ACE, // BIO_TYPE_PROXY_SERVER, +@@ -68,14 +69,15 @@ static BIO_METHOD methods_ACE = + #else + static BIO_METHOD* methods_ACE; + # define BIO_set_num(b, val) +-#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) */ ++#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L) */ + + ACE_BEGIN_VERSIONED_NAMESPACE_DECL + + BIO * + ACE_SSL_make_BIO (void * ssl_asynch_stream) + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L) + BIO * const pBIO = BIO_new (&methods_ACE); + #else + if (!methods_ACE) +-- +2.39.0 + From 1c89f36821b8b37143efcd53558c9fda24788808 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 21 Feb 2023 14:36:08 +0100 Subject: [PATCH 1172/5754] support/dependencies/dependencies.sh: require FileHandle perl package for ace ace needs FileHandle module: Can't locate FileHandle.pm in @INC (you may need to install the FileHandle module) (@INC contains: /home/buildroot/autobuild/instance-0/output-1/host/lib/perl /usr/local/lib64/perl5/5.36 /usr/local/share/perl5/5.36 /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 /usr/share/perl5) at /home/buildroot/autobuild/instance-0/output-1/build/ace-7.0.6/MPC/prj_install.pl line 17. BEGIN failed--compilation aborted at /home/buildroot/autobuild/instance-0/output-1/build/ace-7.0.6/MPC/prj_install.pl line 17. Fixes: - http://autobuild.buildroot.org/results/9dee7c09fd7b41d276df0285a0f3dcae1a71f041 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- support/dependencies/dependencies.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index 563dbe1595..58f44c8723 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -302,7 +302,7 @@ if grep -q -E '^BR2_PACKAGE_(WEBKITGTK|WPEWEBKIT)=y' $BR2_CONFIG ; then required_perl_modules="${required_perl_modules} JSON::PP" fi -if grep -q ^BR2_TARGET_SYSLINUX=y $BR2_CONFIG ; then +if grep -q -E '^BR2_(PACKAGE_ACE|TARGET_SYSLINUX)=y' $BR2_CONFIG ; then required_perl_modules="$required_perl_modules FileHandle" fi From f9fe0cf8f64f8ea48f3ee4af28053d7bea52b61f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 20 Dec 2022 21:20:48 +0100 Subject: [PATCH 1173/5754] package/python-glslang: add new host package Needed for mesa3d 22.3.x. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + package/python-glslang/python-glslang.hash | 3 +++ package/python-glslang/python-glslang.mk | 13 +++++++++++++ 3 files changed, 17 insertions(+) create mode 100644 package/python-glslang/python-glslang.hash create mode 100644 package/python-glslang/python-glslang.mk diff --git a/DEVELOPERS b/DEVELOPERS index 1dc085b87f..7ef8f79a71 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -439,6 +439,7 @@ F: package/pound/ F: package/pure-ftpd/ F: package/python-couchdb/ F: package/python-cssutils/ +F: package/python-glslang/ F: package/python-mwclient/ F: package/python-mwscrape/ F: package/python-mwscrape2slob/ diff --git a/package/python-glslang/python-glslang.hash b/package/python-glslang/python-glslang.hash new file mode 100644 index 0000000000..df9127939e --- /dev/null +++ b/package/python-glslang/python-glslang.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 592c98aeb03b3e81597ddaf83633c4e63068d14b18a766fd11033bad73127162 python-glslang-11.13.0.tar.gz +sha256 adb783e734e906d1f46db5df29991dbde84bdb0ceab502ac2febb44fe3c2b5f4 LICENSE.txt diff --git a/package/python-glslang/python-glslang.mk b/package/python-glslang/python-glslang.mk new file mode 100644 index 0000000000..94f480e30a --- /dev/null +++ b/package/python-glslang/python-glslang.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# python-glslang +# +################################################################################ + +PYTHON_GLSLANG_VERSION = 11.13.0 +PYTHON_GLSLANG_SITE = $(call github,KhronosGroup,glslang,$(PYTHON_GLSLANG_VERSION)) +PYTHON_GLSLANG_LICENSE = BSD-3-Clause +PYTHON_GLSLANG_LICENSE_FILES = LICENSE.txt +PYTHON_GLSLANG_DEPENDENCIES = host-python3 + +$(eval $(host-cmake-package)) From 243c76cfa6990d0743424fe5d1a30dda950166a3 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 20 Dec 2022 21:20:49 +0100 Subject: [PATCH 1174/5754] package/mesa3d: add dependency to host-python-glslang for Vulkan drivers glslangValidator is needed since mesa3d-22.3.0: https://gitlab.freedesktop.org/mesa/mesa/-/commit/9786d9ef2abb45a4e832cf1347581e3ca3aae9f0#3968b0378040deeb22000cfaf80d720905d989fc_0_130 Fixes: http://autobuild.buildroot.net/results/06a/06a429dcdf776ca32de4570f9a408da6a7e7333d/ Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/mesa3d/mesa3d.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index cf2352a355..36b7151510 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -136,6 +136,7 @@ ifeq ($(BR2_PACKAGE_MESA3D_VULKAN_DRIVER),) MESA3D_CONF_OPTS += \ -Dvulkan-drivers= else +MESA3D_DEPENDENCIES += host-python-glslang MESA3D_CONF_OPTS += \ -Dvulkan-drivers=$(subst $(space),$(comma),$(MESA3D_VULKAN_DRIVERS-y)) endif From c95eca4e2cc86be99b8955502b82ba84da7bb775 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 8 Mar 2023 09:50:47 +0100 Subject: [PATCH 1175/5754] 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 d43da13441..12dc864de1 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 df2ec25908..aafda5d48f 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 1176/5754] 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 9fed2c9df2..22c37bf605 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 283c129cef..18a8a9fa42 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 1177/5754] 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 1dbc5c9197..3e609e6e04 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 f19faf0502..723e6d2288 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 1178/5754] 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 7f69462f2e..1d247fe1a0 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 4ba01d12d3..bd83ad415b 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 042b16612e..6d7fbd9850 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 1179/5754] 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 9478fbd459..d49abf1f16 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 cbb574559e..730a91d277 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 1180/5754] 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 cd486caf4c..39b7842f8f 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 1181/5754] 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 39b7842f8f..d99e19c4cd 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 1182/5754] 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 c1be8fad95..623e77e992 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 1183/5754] 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 29cf443a24..b6a29b3cea 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 fd5887141b..66911dddb9 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 1184/5754] 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 d052e59122..7733d5a04e 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 0000000000..b0478dfbb7 --- /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 1185/5754] 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 0000000000..6be66ffee3 --- /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 e834525df5..baf43c66f7 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 c962c8030f..b31f5199e1 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 1186/5754] 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 79624948a5..fb0ee66883 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 1187/5754] 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 fbd1d2d4ba..0000000000 --- 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 fbb3150cb5..20a06aa8fe 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 290ee9a026..ba45ab21ca 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 1188/5754] 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 f91c13d1f6..0000000000 --- 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 7a87ae737a..a147a8afff 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 dd898563e5..786bc211d4 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 1189/5754] 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 faf264f61f..0000000000 --- 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 f13edbbe50..0000000000 --- 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 609085aa5e..846ca7efc3 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 3381344e0a..a35e274bc4 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 1190/5754] 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 29696c35aa..8a3def699b 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 40e05a1a32..bc8f986875 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 fee9fb753b..f59d199558 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 1191/5754] 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 0d40a75497..153ae4131d 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 3604f9836c..575cb75462 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 1192/5754] 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 aba378cab6..c35056f8a2 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 1193/5754] 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 34e17339b9..4e16a53a35 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 ced7009ed3..c1411f6ab7 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 1194/5754] 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 f572fb1e84..b711773af5 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 2d4a11dd9d..20be904d3d 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 1195/5754] 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 7733d5a04e..f6e120d92b 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 0000000000..77e383373e --- /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 0000000000..04c65f5cae --- /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 1196/5754] 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 7565adabde..a1a5577ed3 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 82615e8155..efaa5b6e3e 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 1197/5754] 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 15c75b6dac..b2c89df98a 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 9041c86575..129319d78a 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 1198/5754] 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 f6e120d92b..ff26021d1d 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 0000000000..9aac4c6fd0 --- /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 1199/5754] 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 0000000000..5ffc64cd30 --- /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 03bd887d51..0000000000 --- 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 f6d076a9f7..0000000000 --- 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 adc20648b6..99796dc8c9 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 55157c4d48..d32d2d1d3b 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 5ca0250eb991570f6137a84ceab86d9cb9cd9ac5 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Sat, 11 Mar 2023 19:43:46 +0100 Subject: [PATCH 1200/5754] package/rtl8821cu: fix build failure due to mixed endianness Commit cde69c668d6692114845a927c8c5534ed78019db bumped version where Makefile changed CONFIG_PLATFORM_GENERIC to CONFIG_PLATFORM_AUTODETECT. This way overriding the default platform doesn't work anymore resulting in wrong CFLAGS including endianness macro and leading to a build failure. So let's rename CONFIG_PLATFORM_GENERIC to CONFIG_PLATFORM_AUTODETECT to fix. Fixes: http://autobuild.buildroot.net/results/2a8432646926b3b69383d204673c4113aae9de12 Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- package/rtl8821cu/rtl8821cu.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/rtl8821cu/rtl8821cu.mk b/package/rtl8821cu/rtl8821cu.mk index b3e4ad3fc8..5a93376c20 100644 --- a/package/rtl8821cu/rtl8821cu.mk +++ b/package/rtl8821cu/rtl8821cu.mk @@ -24,7 +24,7 @@ RTL8821CU_USER_EXTRA_CFLAGS = \ -Wno-error RTL8821CU_MODULE_MAKE_OPTS = \ - CONFIG_PLATFORM_GENERIC=n \ + CONFIG_PLATFORM_AUTODETECT=n \ CONFIG_RTL8821CU=m \ KVER=$(LINUX_VERSION_PROBED) \ USER_EXTRA_CFLAGS="$(RTL8821CU_USER_EXTRA_CFLAGS)" From 9f388f0b4ca276bdcddd244454811382d447b383 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Sat, 11 Mar 2023 20:02:19 +0100 Subject: [PATCH 1201/5754] package/rtl8192eu: fix build failure on PowerPC Add local patch pending upstream[0] to fix build failure for conflicting get_ra() on PowerPC architecture. Fixes: http://autobuild.buildroot.net/results/b248203c7affe183dd297075a540389a82cdae8f [0]: package/rtl8192eu/0002-Fix-conflicting-get_ra-on-PowerPC.patch Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- ...02-Fix-conflicting-get_ra-on-PowerPC.patch | 124 ++++++++++++++++++ 1 file changed, 124 insertions(+) create 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 new file mode 100644 index 0000000000..dbc4ddd2e8 --- /dev/null +++ b/package/rtl8192eu/0002-Fix-conflicting-get_ra-on-PowerPC.patch @@ -0,0 +1,124 @@ +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 + From b9a062b354953f3fbfee702bb5b5007598299925 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 12 Mar 2023 10:32:49 +0100 Subject: [PATCH 1202/5754] package/rsync: link with -latomic if needed Fixes: http://autobuild.buildroot.net/results/9eb9a92871622472b8f9eb3797aadd3651fc78a4/ Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/rsync/rsync.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/rsync/rsync.mk b/package/rsync/rsync.mk index d2fa47d39a..3fd2ef257e 100644 --- a/package/rsync/rsync.mk +++ b/package/rsync/rsync.mk @@ -20,6 +20,10 @@ RSYNC_CONF_OPTS = \ --disable-roll-simd \ --disable-md5-asm +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +RSYNC_CONF_ENV += LIBS=-latomic +endif + ifeq ($(BR2_PACKAGE_ACL),y) RSYNC_DEPENDENCIES += acl else From 6219046db6a434d549706e039f221c46464cee21 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Sat, 11 Mar 2023 13:09:25 +0100 Subject: [PATCH 1203/5754] package/uqmi: update patch for fix compile error (gcc false error reporting) Update the patch to to avoid gcc false error reporting (apply pragma ignored only for gcc >= 12.x (as the warning '-Wdangling-pointer' was introduced with gcc-12.x). Fixes: - http://autobuild.buildroot.net/results/df380f921b74527b77290a658de0c57680083afa .../build/uqmi-0a19b5b77140465c29e2afa7d611fe93abc9672f/dev.c:213:32: error: unknown option after '#pragma GCC diagnostic' kind [-Werror=pragmas] 213 | #pragma GCC diagnostic ignored "-Wdangling-pointer" | ^~~~~~~~~~~~~~~~~~~~ Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- ....x-false-error-reporting-storing-th.patch} | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) rename package/uqmi/{0001-uqmi-avoid-gcc-false-error-reporting-storing-the-add.patch => 0001-uqmi-avoid-gcc-12.x-false-error-reporting-storing-th.patch} (71%) diff --git a/package/uqmi/0001-uqmi-avoid-gcc-false-error-reporting-storing-the-add.patch b/package/uqmi/0001-uqmi-avoid-gcc-12.x-false-error-reporting-storing-th.patch similarity index 71% rename from package/uqmi/0001-uqmi-avoid-gcc-false-error-reporting-storing-the-add.patch rename to package/uqmi/0001-uqmi-avoid-gcc-12.x-false-error-reporting-storing-th.patch index c940925767..e2199228b9 100644 --- a/package/uqmi/0001-uqmi-avoid-gcc-false-error-reporting-storing-the-add.patch +++ b/package/uqmi/0001-uqmi-avoid-gcc-12.x-false-error-reporting-storing-th.patch @@ -1,10 +1,10 @@ -From 4c2eb926efb4de24af5a3b1e8c18195198827491 Mon Sep 17 00:00:00 2001 +From 63ab887be90c7fe37d537ea75e60eb95d6d87d3f Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Sun, 5 Mar 2023 22:08:13 +0100 -Subject: [PATCH] uqmi: avoid gcc false error reporting (storing the address of - local variable 'complete' in '*req.complete') +Subject: [PATCH] uqmi: avoid gcc-12.x false error reporting (storing the + address of local variable 'complete' in '*req.complete') -Avoid gcc false error reporting (req->complete is later reset to NULL +Avoid gcc-12.x false error reporting (req->complete is later reset to NULL in case of use of local complete): dev.c:217:23: error: storing the address of local variable 'complete' in '*req.complete' [-Werror=dangling-pointer=] @@ -12,27 +12,30 @@ in case of use of local complete): | ~~~~~~~~~~~~~~^~~~~~~~~~~ Signed-off-by: Peter Seiderer - -[Upstream: http://lists.openwrt.org/pipermail/openwrt-devel/2023-March/040633.html] +[Upstream: http://lists.openwrt.org/pipermail/openwrt-devel/2023-March/040667.html] Signed-off-by: Peter Seiderer +--- +Changes v1 -> v2: + - apply pragma ignored only for gcc >= 12.x (as the warning + '-Wdangling-pointer' was introduced with gcc-12.x) --- dev.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dev.c b/dev.c -index bd10207..b8ac273 100644 +index bd10207..dbd42d4 100644 --- a/dev.c +++ b/dev.c @@ -203,6 +203,15 @@ void qmi_request_cancel(struct qmi_dev *qmi, struct qmi_request *req) __qmi_request_complete(qmi, req, NULL); } -+/* avoid gcc false error reporting: ++/* avoid gcc-12.x false error reporting: + * dev.c:217:23: error: storing the address of local variable ‘complete’ in ‘*req.complete’ [-Werror=dangling-pointer=] + * 217 | req->complete = &complete; + * | ~~~~~~~~~~~~~~^~~~~~~~~~~ + */ -+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) ++#if __GNUC__ >= 12 +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdangling-pointer" +#endif @@ -43,7 +46,7 @@ index bd10207..b8ac273 100644 return req->ret; } -+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) ++#if __GNUC__ >= 12 +#pragma GCC diagnostic pop +#endif From d82fea26623e3934e1e6f82d9f6fce078914419b Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 21 Feb 2023 16:27:22 +0100 Subject: [PATCH 1204/5754] package/janet: needs gcc >= 4.9 janet needs gcc >= 4.9 for stdatomic.h since version 1.26.0 and https://github.com/janet-lang/janet/commit/bfcfd58259911b92ff516bab9216831b34653805 resulting in the following build failure since commit 5c6f32bd255fc97823d464beacfa905a141066ec: src/core/abstract.c:35:23: fatal error: stdatomic.h: No such file or directory Fixes: - http://autobuild.buildroot.org/results/a2b40adb93b751221ba2cdf9a705f86c30499021 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/janet/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/janet/Config.in b/package/janet/Config.in index 0e25ce34e3..7b78c14bf4 100644 --- a/package/janet/Config.in +++ b/package/janet/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_JANET bool "janet" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C11/stdatomic.h help Janet is a functional and imperative programming language. The entire language (core library, interpreter, compiler, @@ -8,3 +9,6 @@ config BR2_PACKAGE_JANET and two headers. https://janet-lang.org/ + +comment "janet needs a toolchain w/ gcc >= 4.9" + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 From 3bac7eb69d8a9141e11076628df78ddffae349ba Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 21 Feb 2023 16:48:45 +0100 Subject: [PATCH 1205/5754] package/janet: fix build without threads Fix the following build failure without threads raised since bump to version 1.26.0 in commit 5c6f32bd255fc97823d464beacfa905a141066ec: ffi.c:(.text+0x9d8): undefined reference to `janet_abstract_threaded' Fixes: - http://autobuild.buildroot.org/results/20108e76990d8af7f47d474eadbbea8562ef6728 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- .../0001-Update-for-more-minimal-builds.patch | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 package/janet/0001-Update-for-more-minimal-builds.patch diff --git a/package/janet/0001-Update-for-more-minimal-builds.patch b/package/janet/0001-Update-for-more-minimal-builds.patch new file mode 100644 index 0000000000..ba36a9beba --- /dev/null +++ b/package/janet/0001-Update-for-more-minimal-builds.patch @@ -0,0 +1,29 @@ +From 746ff5307d309536984b648460e7b5c5dac44453 Mon Sep 17 00:00:00 2001 +From: Calvin Rose +Date: Sun, 12 Feb 2023 12:14:11 -0600 +Subject: [PATCH] Update for more minimal builds. + +[Retrieved (and backported) from: +https://github.com/janet-lang/janet/commit/746ff5307d309536984b648460e7b5c5dac44453] +Signed-off-by: Fabrice Fontaine +--- + src/core/ffi.c | 4 ++++ + src/core/marsh.c | 2 ++ + 2 files changed, 6 insertions(+) + +diff --git a/src/core/ffi.c b/src/core/ffi.c +index 45a498c7..b453f1f6 100644 +--- a/src/core/ffi.c ++++ b/src/core/ffi.c +@@ -1311,7 +1311,11 @@ JANET_CORE_FN(cfun_ffi_jitfn, + size_t alloc_size = ((size_t) bytes.len + FFI_PAGE_MASK) & ~FFI_PAGE_MASK; + + #ifdef JANET_FFI_JIT ++#ifdef JANET_EV + JanetFFIJittedFn *fn = janet_abstract_threaded(&janet_type_ffijit, sizeof(JanetFFIJittedFn)); ++#else ++ JanetFFIJittedFn *fn = janet_abstract(&janet_type_ffijit, sizeof(JanetFFIJittedFn)); ++#endif + fn->function_pointer = NULL; + fn->size = 0; + #ifdef JANET_WINDOWS From b857680ea903feffa4497f4b916e6505e3982378 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 21 Feb 2023 16:11:28 +0100 Subject: [PATCH 1206/5754] package/rtl_433: fix build without threads Fix the following build failure without threads raised since bump to version 22.11 in commit 6f848c068f8ab0cc67fb48582e00221158ddc8cb: In file included from /home/buildroot/autobuild/instance-3/output-1/build/rtl_433-22.11/src/data_tag.c:17: /home/buildroot/autobuild/instance-3/output-1/build/rtl_433-22.11/include/mongoose.h:407:10: fatal error: pthread.h: No such file or directory 407 | #include | ^~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/9f1677fc5a4568be0b9c121060c5d821ac2ae21b Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...r-Fix-mongoose-build-without-threads.patch | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 package/rtl_433/0002-minor-Fix-mongoose-build-without-threads.patch diff --git a/package/rtl_433/0002-minor-Fix-mongoose-build-without-threads.patch b/package/rtl_433/0002-minor-Fix-mongoose-build-without-threads.patch new file mode 100644 index 0000000000..85bc45147a --- /dev/null +++ b/package/rtl_433/0002-minor-Fix-mongoose-build-without-threads.patch @@ -0,0 +1,42 @@ +From 707b51ecbc5598eed2fb67962232bf3fe0e96f81 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 27 Dec 2022 21:30:54 +0100 +Subject: [PATCH] minor: Fix mongoose build without threads (#2291) + +Fix the following build failure without threads: + +In file included from /home/buildroot/autobuild/instance-3/output-1/build/rtl_433-22.11/src/data_tag.c:17: +/home/buildroot/autobuild/instance-3/output-1/build/rtl_433-22.11/include/mongoose.h:407:10: fatal error: pthread.h: No such file or directory + 407 | #include + | ^~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/9f1677fc5a4568be0b9c121060c5d821ac2ae21b + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/merbanan/rtl_433/commit/707b51ecbc5598eed2fb67962232bf3fe0e96f81] +--- + include/mongoose.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/mongoose.h b/include/mongoose.h +index 1173b3fc7..b111ea34e 100644 +--- a/include/mongoose.h ++++ b/include/mongoose.h +@@ -404,7 +404,6 @@ unsigned int sleep(unsigned int seconds); + #include + #include + #include +-#include + #include + #include + #include +@@ -4658,6 +4657,7 @@ size_t mg_fwrite(const void *ptr, size_t size, size_t count, FILE *f); + #endif /* MG_ENABLE_FILESYSTEM */ + + #if MG_ENABLE_THREADS ++#include + /* + * Starts a new detached thread. + * Arguments and semantics are the same as pthead's `pthread_create()`. From 02c8901791d8d65094ecf56d9773babe74dd1845 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 21 Feb 2023 14:56:58 +0100 Subject: [PATCH 1207/5754] package/nut: ensure time_t is defined Ensure time_t is defined to fix the following collectd build failure on musl: src/nut.c:40:2: error: #error "Unable to determine the UPS connection type." 40 | #error "Unable to determine the UPS connection type." | ^~~~~ src/nut.c:46:3: error: unknown type name 'collectd_upsconn_t' 46 | collectd_upsconn_t *conn; | ^~~~~~~~~~~~~~~~~~ libupsclient is an optional dependency of nut plugin since version 5.10.0 of collectd and https://github.com/collectd/collectd/commit/bc2d94024d0250211c1e498db1b43bb4525324da Fixes: - http://autobuild.buildroot.org/results/22b758097e8fb72c68e41329cbc7abc748d81ca6 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...upsclient-h-ensure-time_t-is-defined.patch | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 package/nut/0001-clients-upsclient-h-ensure-time_t-is-defined.patch diff --git a/package/nut/0001-clients-upsclient-h-ensure-time_t-is-defined.patch b/package/nut/0001-clients-upsclient-h-ensure-time_t-is-defined.patch new file mode 100644 index 0000000000..c9fb04b8cd --- /dev/null +++ b/package/nut/0001-clients-upsclient-h-ensure-time_t-is-defined.patch @@ -0,0 +1,35 @@ +From cafd77993ec5e16634b774b65bf6da9b34a21fc5 Mon Sep 17 00:00:00 2001 +From: Jim Klimov +Date: Wed, 31 Aug 2022 11:24:19 +0200 +Subject: [PATCH] clients/upsclient.h: ensure time_t is defined + +[Retrieved from: +https://github.com/networkupstools/nut/commit/cafd77993ec5e16634b774b65bf6da9b34a21fc5] +Signed-off-by: Fabrice Fontaine +--- + clients/upsclient.h | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/clients/upsclient.h b/clients/upsclient.h +index 08574b8f8b..e346d8f519 100644 +--- a/clients/upsclient.h ++++ b/clients/upsclient.h +@@ -41,6 +41,18 @@ + #include + #endif + ++/* Not including NUT timehead.h because this is part of end-user API */ ++#ifdef TIME_WITH_SYS_TIME ++# include ++# include ++#else ++# ifdef HAVE_SYS_TIME_H ++# include ++# else ++# include ++# endif ++#endif ++ + #ifdef __cplusplus + /* *INDENT-OFF* */ + extern "C" { From e93f96b717f31ab26d047c8daac8ae55622396bd Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 12 Mar 2023 15:45:15 +0100 Subject: [PATCH 1208/5754] package/go: security bump to version 1.19.7 go1.19.7 (released 2023-03-07) includes a security fix to the crypto/elliptic package, as well as bug fixes to the linker, the runtime, and the crypto/x509 and syscall packages. 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 8254a91524..89e2fd952f 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://go.dev/dl -sha256 d7f0013f82e6d7f862cc6cb5c8cdb48eef5f2e239b35baa97e2f1a7466043767 go1.19.6.src.tar.gz +sha256 775bdf285ceaba940da8a2fe20122500efd7a0b65dbcee85247854a8d7402633 go1.19.7.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index a9056da47b..a94603f268 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.19.6 +GO_VERSION = 1.19.7 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz From 38c581b05cd8e7967783410b36c14b9b561acd12 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 26 Feb 2023 14:18:38 +0100 Subject: [PATCH 1209/5754] 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 0000000000..b443b0ab36 --- /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 e23f1ce32c..73ea566084 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 1210/5754] 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 9489f25c6a..e881f58510 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 b0112168e1..24c6f3ef27 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 1211/5754] 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 a162bfdc95..b81830a7d2 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 c875814bc7..407ac1a2c6 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 1212/5754] 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 565511120f..8ca3764935 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 e0c9f3cdb9..9467647592 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 76070dc3a9..4059b34556 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 1213/5754] 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 745ed7c580..567ffe4833 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 f14b55ced5..82a4b3eb1c 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 1214/5754] 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 c5151b4fdb..09b580de59 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 1215/5754] 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 f6c2cbe160..06c8f229b7 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 e82b79220d..c4e3679a2e 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 1807ef104904912472191114f274042a9cfc9d20 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 15 Feb 2023 23:49:21 +0100 Subject: [PATCH 1216/5754] package/docker-engine: libseccomp is mandatory libseccomp is mandatory since bump to version 23.0.0 in commit 485b47e025541a58358d8852c600b8e7644b4ec6: https://github.com/moby/moby/pull/42501 Fixes: - https://bugs.buildroot.org/show_bug.cgi?id=15321 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/docker-engine/Config.in | 10 ++++++++-- package/docker-engine/docker-engine.mk | 6 +----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/package/docker-engine/Config.in b/package/docker-engine/Config.in index b5a356eab9..570b2ff681 100644 --- a/package/docker-engine/Config.in +++ b/package/docker-engine/Config.in @@ -5,9 +5,12 @@ config BR2_PACKAGE_DOCKER_ENGINE depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_TOOLCHAIN_USES_UCLIBC # containerd -> runc depends on BR2_USE_MMU # containerd + depends on BR2_PACKAGE_LIBSECCOMP_ARCH_SUPPORTS # libseccomp + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 # libseccomp select BR2_PACKAGE_CGROUPFS_MOUNT if !BR2_PACKAGE_SYSTEMD # runtime dependency select BR2_PACKAGE_CONTAINERD # runtime dependency select BR2_PACKAGE_IPTABLES # runtime dependency + select BR2_PACKAGE_LIBSECCOMP help Docker is a platform to build, ship, and run applications as lightweight containers. @@ -48,8 +51,11 @@ config BR2_PACKAGE_DOCKER_ENGINE_DRIVER_VFS endif -comment "docker-engine needs a glibc or musl toolchain w/ threads" +comment "docker-engine needs a glibc or musl toolchain w/ threads, headers >= 3.17" depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_USES_UCLIBC + depends on BR2_PACKAGE_LIBSECCOMP_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + BR2_TOOLCHAIN_USES_UCLIBC || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 depends on BR2_USE_MMU diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index f8d31de0fe..c61aa491c2 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -10,7 +10,7 @@ DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 DOCKER_ENGINE_LICENSE_FILES = LICENSE -DOCKER_ENGINE_DEPENDENCIES = host-pkgconf +DOCKER_ENGINE_DEPENDENCIES = host-pkgconf libseccomp DOCKER_ENGINE_GOMOD = github.com/docker/docker DOCKER_ENGINE_CPE_ID_VENDOR = docker @@ -30,10 +30,6 @@ ifeq ($(BR2_PACKAGE_LIBAPPARMOR),y) DOCKER_ENGINE_DEPENDENCIES += libapparmor endif -ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) -DOCKER_ENGINE_DEPENDENCIES += libseccomp -endif - ifeq ($(BR2_INIT_SYSTEMD),y) DOCKER_ENGINE_DEPENDENCIES += systemd DOCKER_ENGINE_TAGS += systemd journald From 8cca1e6de1c69a0a5e876116906bb3f6da4a5bd5 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 12 Mar 2023 21:20:41 +0100 Subject: [PATCH 1217/5754] Update for 2023.02 Signed-off-by: Peter Korsgaard --- CHANGES | 18 ++++++++++++++++++ Makefile | 4 ++-- docs/website/download.html | 22 +++++++++++----------- docs/website/news.html | 21 +++++++++++++++++++++ support/misc/Vagrantfile | 2 +- 5 files changed, 53 insertions(+), 14 deletions(-) diff --git a/CHANGES b/CHANGES index 49cf96a853..a03a4876b8 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,21 @@ +2023.02, released March 12th, 2023 + + Fixes all over the tree. + + Updated/fixed packages: ace, apache, audit, bridge-utils, + docker-engine, go, gtkmm3, janet, libbpf, libev, libgcrypt, + libgpg-error, libmad, linux, mesa3d, network-manager, nut, + pcre2, php, rdma-core, rsync, rtl8821cu, rtl_433, + s6-linux-utils, speechd, uqmi, xdriver_xf86-video-qxl, znc + + New packages: atkmm2_28, cairomm1_14, glibmm2_66, libsigc2, + pangomm2_46, python-glslang + + Issues resolved (http://bugs.uclibc.org): + + #15306: glibc build fails in Docker container + #15321: docker-engine now requires libseccomp by default + 2023.02-rc3, released March 8th, 2023 Fixes all over the tree. diff --git a/Makefile b/Makefile index 3972941328..634780b421 100644 --- a/Makefile +++ b/Makefile @@ -90,9 +90,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2023.02-rc3 +export BR2_VERSION := 2023.02 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1678312000 +BR2_VERSION_EPOCH = 1678652000 # 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 144dae5197..5afc507c52 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -8,40 +8,40 @@
            Download
            -

            Latest long term support release: 2022.02.10

            +

            Latest stable / long term support release: 2023.02

            - +
            - +
            -

            buildroot-2022.02.10.tar.gz

            -

            PGP signature

            +

            buildroot-2023.02.tar.gz

            +

            PGP signature

            - +
            - +
            -

            buildroot-2022.02.10.tar.xz

            -

            PGP signature

            +

            buildroot-2023.02.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 fcd67f3924..9fbbe5b0b7 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,27 @@

            News

              +
            • +
              +
              +
              +

              2023.02 released

              +

              12 March 2023

              +
              +
              +

              The stable 2023.02 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.02 release.

              + +

              Notice that this is a long term support release which will be + supported with security and other important fixes until March 2024.

              +
              +
              +
              • +
            • diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile index 63806155a8..a1de170749 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2022.11.2' +RELEASE='2023.02' ### Change here for more memory/cores ### VM_MEMORY=2048 From c53258975a583bdfbb99296274bd5e560db961c2 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 12 Mar 2023 21:59:33 +0100 Subject: [PATCH 1218/5754] 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 9fbbe5b0b7..fec6b414e2 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 1219/5754] 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 634780b421..3498f7226b 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 1220/5754] 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 ff26021d1d..e28b46967c 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 0000000000..12fd6ec9e6 --- /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 1221/5754] 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 4c62da3241..0000000000 --- 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 0000000000..41a2647133 --- /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 0000000000..cb2a507bfd --- /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 0000000000..beb5429dc1 --- /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 839cbb1cc0..918c3db194 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 2e3f998769..5b967d2b95 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 0b2287c7fb..28116b455d 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 1222/5754] 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 49df8313f9..eb28f4d441 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 74290211ce..8ad4215ee1 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 1223/5754] 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 8351d0266e..1cd5f7f314 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 0c81a6cc35..2baa25ec9e 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 1224/5754] 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 2baa25ec9e..4168d6c2db 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 1225/5754] 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 f7c82b086b..3caec5667f 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 6d16d8701f..f4376a9340 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 1226/5754] 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 9aa26418b5..6c3498484f 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 0000000000..2206971421 --- /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 0000000000..5cbe18a89f --- /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 1227/5754] 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 6c3498484f..592c0e6b9c 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 0000000000..51e5138481 --- /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 1228/5754] 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 e9ae5b6e51..b671edad9d 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 9478e75b41..1d2e8038f0 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 1229/5754] 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 c1411f6ab7..562b09012b 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 1230/5754] 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 ad1999a30d..a9ab1de8ea 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 50c5bcc7fc..17dc2e7c00 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 a744334c5b..a09c157b33 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 1231/5754] 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 693d9d0905..d959f968e0 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 3eb3458ee7..0308ab6a28 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 1232/5754] 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 e4e41e4ad3..0ec128f9fd 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 6cc862dce4..51083af144 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 1233/5754] 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 a2c4243790..bdd4c7f3a6 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 462d487ebe..9843ec3502 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 1234/5754] 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 0c7eb5f8a5..a09015619d 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 f9250070d1..e368b25736 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 1235/5754] 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 ec3fe0d777..483320d95c 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 ac342cf3af..5daced7182 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 1236/5754] 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 592c0e6b9c..b49491da7a 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 f8ce83365e..0f8dab3e71 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 0000000000..923d0a7d8a --- /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 0000000000..0c7ca31476 --- /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 0000000000..8eeec6efa8 --- /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 0000000000..a13c08b32e --- /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 0000000000..7028d1dd59 --- /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 1237/5754] 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 b5b76c15c6..cc13bf741d 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 9cdfb44ce0..11f09fe7d1 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 1238/5754] 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 2fd14e6c1a..b05c7802c2 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 e3c94ed2fe..bcda07f893 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 1239/5754] 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 0346019667..d581491bde 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 28a7b7ab48..edba21d401 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 1240/5754] 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 e881f58510..1e7a1cf530 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 1241/5754] 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 270699d63a..895351a537 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 1242/5754] 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 99796dc8c9..31849aa0c5 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 1243/5754] 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 31849aa0c5..8cf31d1610 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 1244/5754] 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 24100e1f6e..0000000000 --- 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 f6207300ee..0000000000 --- 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 b7840cd1eb..edb1595520 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 206d06ffe7..46ffc86151 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 1245/5754] 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 b49491da7a..b6d288c54f 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 1246/5754] 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 0000000000..488c21a4fc --- /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 1247/5754] 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 d8f913a648..4bc3cce037 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 1248/5754] 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 8cd5491405..ec01a18cb0 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 1249/5754] 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 f60f84f9a2..0000000000 --- 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 6dc3d39ced..74c6a3e98f 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 005a5a9f35..9f1916dd66 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 1250/5754] 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 1aff44f7f4..128ca54e3e 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 885821bf98..0cbe22d043 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 1251/5754] 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 405e1c5677..04966a9b06 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 ec934bc972..32887d1b6c 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 1252/5754] 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 7927975bff..f9fb2a2ad0 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 1253/5754] 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 11cfae5e9b..1b7d153833 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 bb66de5ec5..9efca1dcbd 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 1b4b08cecc..d717ccbfef 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 814a3c1dd4..51574c3574 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 1254/5754] 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 4059b34556..7fe6899cdb 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 1255/5754] 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 04966a9b06..4faa3a8b8f 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 7fe6899cdb..37a2e79a7a 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 1256/5754] 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 a03a4876b8..f35a55726e 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 1257/5754] 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 fec6b414e2..05d06c6d96 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 1258/5754] 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 f35a55726e..e184f3f3be 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 1259/5754] 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 05d06c6d96..257678465a 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 1260/5754] 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 f2861f920a..f8a2350eaf 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 4674ce0c3d..744fb76810 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 1261/5754] 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 6b847de94d..db061b623f 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 293ea29be6..8f176feb4d 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 1262/5754] 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 0000000000..b1b58f1e7e --- /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 f8844a60a6..f5c2d2d34c 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 e62c2a79c5..14c36db0db 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 1263/5754] 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 8c876f16ee..0000000000 --- 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 44d73e60f0..64f6158654 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 c2ee77f922..a40f656d3e 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 1264/5754] 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 4f117cfd14..018e5b8a77 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 15a5329a45..2dd9e6097c 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 1265/5754] 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 b76c1bfd7f..ed90c217ec 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 0537da9224..0000000000 --- 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 a1675b999e..8a5b48dd79 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 0b6962ab7b..202d0b92ac 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 1266/5754] 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 7f95e78a6e..ce30e2ba11 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 f75178bc0a..4e7b72b65c 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 1267/5754] 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 7128b560ae..d89caa5de8 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 12c36575df..f5a8e1f070 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 1268/5754] 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 4000beedc1..26bc913b8a 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 e3648bfab9..bb6d4a8d27 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 1269/5754] 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 99aae70263..527414eed5 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 d020228e44..0ef549426e 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 1270/5754] 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 a853497768..c0ce0cc352 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 4425b09d12..2a666cae17 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 1271/5754] 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 32edd148a0..dc91af6119 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 c920b9fe74..720b21d849 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 3b5c898917..e70e8bd31f 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 1272/5754] 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 eb9a5744c6..72f63b242d 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 931859b0ac..9b07bb31d2 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 1273/5754] 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 6f3bca89ad..c83e4653c3 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 318e00940d..309987010f 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 1274/5754] 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 eefb11ec15..2be54431ec 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 b70e327620..26d6bd504d 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 1275/5754] 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 cc805da657..59671621dc 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 efe4f55fb8..ff30c765e3 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 8b5e165135..1cfcc9ffaf 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 1276/5754] 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 107910b6be..8770d55932 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 dc0eb36158..5641254f5d 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 1277/5754] 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 d1594c3989..e7799c7ff7 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 b65d2cfa82..96bd636a4a 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 1278/5754] 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 fbf244e470..0a7b7cc058 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 371b4f0b3e..17f9a4018a 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 1279/5754] 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 e59b6969e6..0f687c7827 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 8b0b15f13b..72fb34fd25 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 1280/5754] 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 f94f5ab10a..c84c46c84c 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 64ce85bead..4f605b8f60 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 1281/5754] 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 15f72eb015..abfcec98f3 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 ac514174c8..82cef822e9 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 1282/5754] 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 231af32baa..c6f11aff1d 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 872540b713..d707249e29 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 1283/5754] 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 f9b68dcb22..4fa7c451f5 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 4c14151960..c44acb80aa 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 1284/5754] 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 2b2f56d8c6..f2026cafb3 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 35857dc127..890a8b02b9 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 1285/5754] 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 4641d2e3a3..1777563190 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 78f885ba08..7896dd0f39 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 1286/5754] 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 001ef65b65..2cd038cb68 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 95ac1d1766..7d3dc2831f 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 1287/5754] 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 eecc87ab2d..6b3947978e 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 4d8fe58701..572954e81a 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 1288/5754] 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 0e9d0572d7..57d07a6711 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 ceb3fbe6ea..6d0747c0df 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 1289/5754] 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 58bc52e3cb..48a576aaec 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 e1691972c3..b35f726f95 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 1290/5754] 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 bb84bb09a5..f053922ac0 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 7a50e3379a..05fe1bef25 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 1291/5754] 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 eed8340ec1..19be26cae0 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 f01f94d6c8..dfbd411863 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 1292/5754] 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 b146472195..963a1fd930 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 3f73b3ecc8..c97e46999c 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 1293/5754] 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 717ff81593..55d95d204e 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 d460251f48..fc873c045a 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 1294/5754] 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 a041d91eb6..8655a79693 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 1295/5754] 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 7e0850422b..15ce9d5927 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 55d95d204e..418cd10945 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 1296/5754] 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 418cd10945..48485567d7 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 1297/5754] 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 a4001f5bbb..03072d5d35 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 1298/5754] 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 cc89bb63d0..f47f34a81a 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 1299/5754] 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 85da5ddae8..f1e731ce2e 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 1300/5754] 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 4f45647dff..42dcb3d416 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 1301/5754] 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 067465cc31..0000000000 --- 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 0000000000..1ce91f01f3 --- /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 a0285277ab..d5019af594 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 1302/5754] 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 9b514bafcd..0000000000 --- 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 4e9ccdc3f7..2cce6cd1ff 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 1303/5754] 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 2731b7b39d..051aec1c19 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 1304/5754] 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 5944ea3a28..ae777c6d30 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 1305/5754] 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 842cf0d035..5cee8e9673 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 1306/5754] 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 48485567d7..f17186dfe4 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 fc873c045a..5d1c1da128 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 1307/5754] 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 146d40e13b..a86e26f69e 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 1308/5754] 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 8655a79693..ad96957f3d 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 1309/5754] 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 db061b623f..d3d1b3876f 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 1310/5754] 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 19048dfe8d..e6347e6f7f 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 1311/5754] 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 042abd69df..e5ff432d40 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 1312/5754] 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 3a4c64e9d2..825e2b7e33 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 1313/5754] 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 e903e92c49..3e73572a80 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 1314/5754] 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 99466d6bae..e7007819d8 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 1315/5754] 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 0000000000..f537331a2c --- /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 0000000000..db16d60ace --- /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 0000000000..8d0be40320 --- /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 0000000000..0b57fb6fd2 --- /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 cc740dd40c..577a90656a 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 1316/5754] 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 fc4b01b2ac..222f78b86c 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 1317/5754] 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 dda63cccec..5431c78152 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 1318/5754] 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 758965d80a..13b7fd5bea 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 1319/5754] 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 b6d288c54f..67c6004ddf 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 8a0b6d5802..451b0eeff5 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 0000000000..797758adce --- /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 1320/5754] 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 180d7eae8a..8b32e9077c 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 d1a622e685..dc75b977af 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 1321/5754] 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 0000000000..4e81f7bfc1 --- /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 1322/5754] 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 67c6004ddf..7c5880c8ee 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 0000000000..9fdcd33596 --- /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 0000000000..a42dbb0ab1 --- /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 1323/5754] 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 4c02ee1dce..9da56f9f68 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 adc124b074..d7c03323b7 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 1324/5754] 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 6c8fddd397..eee2e34cbf 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 b60f1da2e7..9c6b5f9b37 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 1325/5754] 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 99ab5e4003..4b7c026eef 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 c61aa491c2..a27625a38e 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 1326/5754] 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 9b231f03b1..a8ee6c7a34 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 38d903150c..5473edf1ef 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 1327/5754] 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 0122d08789..cdca75b113 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 4c05d36ab3..80c9caf07f 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 1328/5754] 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 16474089d1..65a87f25fa 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 4a0d6ec38b..bc1dd58611 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 1329/5754] 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 4b7c026eef..0dc974ce85 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 a27625a38e..c0f2c73b69 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 1330/5754] 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 a8ee6c7a34..891ccf4b4e 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 5473edf1ef..69c4f76ee6 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 1331/5754] 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 90a7bc2672..54026284da 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 1332/5754] 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 54026284da..836d740788 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 1333/5754] 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 7c5880c8ee..c226259aec 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 0f8dab3e71..760dda6ac1 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 0000000000..0b4dc762bb --- /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 0000000000..bf7bf56a67 --- /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 0000000000..a798e7ca61 --- /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 1334/5754] 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 d0aa5ad860..c2d444c3ce 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 1335/5754] 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 48d95f122f..0000000000 --- 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 e99e9d8ed7..0000000000 --- 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 c490f71548..5ad7bf6ce2 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 96a163e597..5e7e497ff1 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 1336/5754] 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 3313b341f9..f43ec790fd 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 f859d097ff..c2c4b660f8 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 1337/5754] 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 e1efa4debe..55b2661fc0 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 953742de28..aaf379788c 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 1338/5754] 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 89e2fd952f..5488ed9710 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 a94603f268..37554ddf86 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 1339/5754] 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 d53d4dd60d..5910a568db 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 accd92c1d5..8ebe33b372 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 1340/5754] 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 d42d0778f1..fcd8d10ed9 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 c05e28a5d2..0510b4c9ad 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 1341/5754] 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 d9142a9a22..0000000000 --- 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 e7cd3ec918..7f9bceb0c1 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 bd82815cde..c1da50a53c 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 1342/5754] 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 2d8683f09c..b6ae8edcd8 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 46dc3d10cd..c8dbb66d05 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 1343/5754] 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 bc3e60023d..0000000000 --- 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 c439238800..fccb4ea420 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 451021150b..ed82131dd3 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 1344/5754] 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 36f6907fbc..a7b56cf25d 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 789eddfa0a..6c01426658 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 1345/5754] 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 0000000000..58f9747d77 --- /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 2d78153c81..df4df524d0 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 8c306ba187..61523820ad 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 1346/5754] 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 13d5aed71f..bc45b4ab5e 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 323908d94e..082104b6d4 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 1347/5754] 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 5e09f4e6ce..2ba9c8f568 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 1348/5754] 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 0000000000..8612bac07f --- /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 1349/5754] 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 ea1361efc0..dc00a47e1d 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 1350/5754] 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 c2d444c3ce..3e7ad8d402 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 1351/5754] 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 8b622d87a9..7dac198ab8 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 66a8253c62..1cef992e53 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 1352/5754] 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 0a2eb4e5bd..c61937306a 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 1353/5754] 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 1b7d153833..4cb1f0c1cd 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 9efca1dcbd..c5fdd9a862 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 d717ccbfef..40ab7dedc6 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 51574c3574..27eb11f095 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 1354/5754] 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 3de41b1682..0f8f04d676 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 ad1ed7df11..854ed00032 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 1355/5754] 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 56d830e54c..9777c7f213 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 01984402ce..b969b4709e 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 1356/5754] 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 642b57cd8c..2e93fa4bee 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 83b0c3a012..a7b7e583a8 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 2f8c1735da..2fffa1e0e9 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 1357/5754] 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 0fb40e6568..dc606c5de9 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 e5b237197b..64ac625b7f 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 1358/5754] 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 59db559b93..0000000000 --- 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 9b8ac8bfe2..8b2b74395e 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 1359/5754] 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 ebef4e5932..e9ff244a35 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 1360/5754] 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 666c5ac971..5600c8e97e 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 1361/5754] 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 4faa3a8b8f..ae4356f500 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 98a25bd0b2..e3b7d8515f 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 386d085afc..dc4afd71b8 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 e719fdd407..632aaa9f9e 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 1362/5754] 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 ae4356f500..81ca4d8de9 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 e3b7d8515f..27070571c9 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 1363/5754] 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 3498f7226b..95959daab2 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 38aca31fb5..cbb6e555ce 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 e2fb2228b3..ea4340f47c 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 0000000000..da7c36c7e0 --- /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 d2c1556845..87382e07b0 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 27070571c9..758d51ba8b 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 0000000000..f8c17ddc10 --- /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 a0bf88001d..cfa826f57c 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 632aaa9f9e..907ada704f 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 1364/5754] 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 8b1d338bec..ee6d7302df 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 1365/5754] 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 9d97f02f08..634c76e437 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 8adf844e9a..d340882971 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 80a1736b4e..2086237ebb 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 1366/5754] 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 c226259aec..5cd882b579 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 6535e51656..0000000000 --- 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 c43b09faaa..0000000000 --- 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 1367/5754] .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 81ca4d8de9..37214d6424 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 1368/5754] 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 997c413f23..0000000000 --- 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 5f72667284..e748637c72 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 84acc2c76c..42d81144a3 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 59d1f3b5a0..a9569f2910 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 1369/5754] 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 19cf1e29d5..e8eedb8921 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 bb3f59a14d..88f8f60257 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 1370/5754] 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 e2a0b7a7c9..b4b5a5b47d 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 1371/5754] 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 03d89cd204..37797fc4f0 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 1372/5754] 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 50a0986ab2..a8260a7ea3 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 25ecf31146..65a78f5352 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 1373/5754] 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 a8260a7ea3..a38f3a1c5e 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 65a78f5352..74b6a764cd 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 1374/5754] 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 758d51ba8b..9a345522b4 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 1375/5754] 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 549650aca1..0000000000 --- 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 4ce4c6f6d1..453aadae11 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 354f035d33..79e6c76cb4 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 6699840854..6f8b170516 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 1376/5754] 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 634c76e437..186cb60189 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 1377/5754] 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 d99d5e0992..4f694de34b 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 fd69b7ac7a..1142a7442f 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 1378/5754] 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 2bd761edfb..931c5136d4 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 1379/5754] 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 0bfe99d22e..d68978b1cb 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 931c5136d4..6b8eaa81b3 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 1380/5754] 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 88f0413496..57306dd546 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 0000000000..4dc9bfbb0d --- /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 1381/5754] 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 57306dd546..ccd0fb78c9 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 1382/5754] 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 4dc9bfbb0d..cbc33a76d1 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 1383/5754] 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 cbc33a76d1..38024b449e 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 1384/5754] .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 37214d6424..cf58e59198 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 1385/5754] 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 5600c8e97e..264bf5a1ae 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 1386/5754] 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 ccd0fb78c9..763287ca39 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 1387/5754] 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 297c96cc5e..94fccfa856 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 1388/5754] 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 186cb60189..4eaaf32ead 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 1389/5754] 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 9c17bed0c7..a90ca6c8df 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 1390/5754] 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 ec34a41667..a057ddd259 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 da05471e28..efa603f0c0 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 1391/5754] 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 f86352e1ea..43b15c94be 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 1392/5754] 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 b7246f9788..e1d3188658 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 0a71e1a78b..34bdf6cc96 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 1393/5754] 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 763287ca39..fe46d0d4af 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 1394/5754] 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 406a1c861a..8e888baa1c 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 10cc95d90e..185bcd576f 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 1395/5754] 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 06454c5e32..24bc588d85 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 185bcd576f..7bd2173b48 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 1396/5754] 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 238a01923d..0000000000 --- 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 aa3df4dff7..0000000000 --- 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 4712ede2af..a724941b25 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 2dba8ad589..84d167a663 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 1397/5754] 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 60737159c6..0000000000 --- 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 ca4e2fa0b9..abfb1d62e2 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 45e8bf1bc2..e25202fd63 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 1398/5754] 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 0000000000..46961cc9d1 --- /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 1399/5754] 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 ecb716b6fa..0000000000 --- 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 776816892b..0000000000 --- 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 91eb56d930..938711d86c 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 37a06ca848..9973498cf5 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 1400/5754] 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 0475f8882a..abc69d96be 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 658e6e113c..1081db697d 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 1401/5754] 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 60185db736..8676f065f8 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 e5daaa6051..66c08e7921 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 1402/5754] 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 464e075e5c..40269db233 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 1403/5754] 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 ef171c3ad3..377e9f1c59 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 1404/5754] 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 063ef984d8..dc35132ecf 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 1405/5754] 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 caee36158f..1909d3acd0 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 3b6fadf38c..f7487ef329 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 1406/5754] .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 cf58e59198..4847cd82bc 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 1407/5754] 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 806c4f0697..cf58e021ba 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 1408/5754] 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 ba128424a0..3f383e337e 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 1409/5754] 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 ba946e5285..73ba934b69 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 1410/5754] 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 4847cd82bc..02c892c1b3 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 1411/5754] 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 5d32c1af8a..de3b6e69f0 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 bdc9fedeb4..8e059fe8bd 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 1412/5754] 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 02ccf742ac..5524bfc420 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 1413/5754] 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 cd90a5871f..b3a8802452 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 1414/5754] 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 b3a8802452..ef6dbd3c2b 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 1415/5754] 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 5bf8b08966..364fa1469a 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 1416/5754] 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 418fd5c8d3..9ea8693e71 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 1417/5754] 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 f7f2b80a9b..06a1ca22ad 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 367d5d2058..539ded06cd 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 1418/5754] 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 da9c9a21ac..7ba82284f3 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 1419/5754] 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 1553908cf8..0000000000 --- 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 272c2ede37..b42082e2cc 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 1420/5754] 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 0000000000..740d3a6d6a --- /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 8b411a8ffe..59ba5d0045 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 34412d562f..78271b0730 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 1421/5754] 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 0000000000..ac29368727 --- /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 1422/5754] 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 5431c78152..122c7cbbc4 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 1423/5754] 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 760dda6ac1..eaac32a01a 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 0000000000..33e43c1f77 --- /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 0000000000..9a6d0d07be --- /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 0000000000..5cf62b5160 --- /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 0000000000..0c00fa6e2f --- /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 0000000000..162e53072e --- /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 1424/5754] 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 9973498cf5..78c6e10c58 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 1425/5754] 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 02c892c1b3..e11b5b6bb8 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 1426/5754] 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 e11b5b6bb8..f0ad3e88bd 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 db77a73203..fb99057242 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 1427/5754] 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 f0ad3e88bd..2758ad9377 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 aae505f8e5..0000000000 --- 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 0000000000..6075bacb06 --- /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 84511dea32..0000000000 --- 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 e212393011..0000000000 --- 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 31f3649c75..077d7d66e8 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 0395ff234a..07ed7635a6 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 3084aa6cb8..ecd7d5dbfe 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 1428/5754] 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 2758ad9377..5f6538ea74 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 9f266bc2c8..0000000000 --- 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 766efd0ced..72e70ff0ed 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 b6d29110ed..2481171658 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 1429/5754] 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 5cd882b579..d9e95a3d05 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 1430/5754] 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 a2aed9a2eb..e46622c0e7 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 1431/5754] 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 164e11c0e6..135a1451b6 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 1432/5754] 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 87382e07b0..0bea0902c8 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 9a345522b4..83b9750f5a 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 1433/5754] 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 0bea0902c8..9aa117d211 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 1434/5754] 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 0000000000..b0f784b8ba --- /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 1435/5754] 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 b0f784b8ba..c2c2d81260 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 1436/5754] {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 5cbef197ab..690ee9c339 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 f45b244e6b..43c9314a23 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 ae40520c51..e102369395 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 1437/5754] {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 43c9314a23..cab7b30385 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 e102369395..cb614d0eef 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 08e4ccad9e..80b2dbde4d 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 1c39334ddd..8f3905b8d7 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 1438/5754] {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 cab7b30385..e3047886c5 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 cb614d0eef..4a4f1308cb 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 80b2dbde4d..ff0eb93017 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 8f3905b8d7..0fd8841e5b 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 1439/5754] 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 41aa326156..6b1549958f 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 49f02d7f20..7cebc178fe 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 1440/5754] 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 a9ab1de8ea..4685ad6695 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 17dc2e7c00..0de11663f4 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 a09c157b33..09a12b4b7e 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 1441/5754] 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 36144917fb..1f0020f65a 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 80205a6362..320a6ad20e 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 1442/5754] 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 e2a2a251c3..092a640f04 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 33b35b7979..593bbd4276 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 1443/5754] 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 6957e2ed87..37030bdfaa 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 7a01dc4259..cf26a36cc4 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 1444/5754] 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 780c186069..8173876bbd 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 f50010d9fc..dbb0b8f6e4 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 1445/5754] 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 41374a2ff6..9b1d9cb210 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 3dc8cdacde..9e6ee3c878 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 1446/5754] 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 781e089de8..665a710c70 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 f345ba9cf9..ee2d5f5959 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 1447/5754] 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 9261e5fff6..45c862d300 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 99a24ec011..3d21897c6d 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 45c8bd62b0..004619f4f4 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 0ca8f46dc5..c0fa83be8a 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 1448/5754] 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 edb1595520..1efa95ed44 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 46ffc86151..ba86915b36 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 1449/5754] 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 4f56b0c12f..16ab48654c 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 00fe6c1455..755a9c93f1 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 1450/5754] 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 82182ce109..0000000000 --- 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 9b397cac41..0000000000 --- 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 5b7f002499..0000000000 --- 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 9992fb3c4f..579581cfe4 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 fc720fd2f5..c3e06a4e6d 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 1451/5754] 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 56f0237277..acec71000f 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 787537da78..6e7d66f482 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 1452/5754] 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 35d753fc27..cbeebc579d 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 2d42cdcb67..5fe603fc1c 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 1453/5754] 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 951ce4186d..9c1baaa651 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 8b81e66981..8dd689f5d0 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 dbc19c1cec..3247ab08fe 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 2efef7dd86..52029c2ade 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 c9d7ea7c41..b18218cb48 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 136e3e24ca..59e13b503e 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 1454/5754] 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 9608e3d935..0000000000 --- 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 5a5baeacee..0000000000 --- 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 7ba0ef7f18..c79ae1cf45 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 e83fda895f..335f3a41e5 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 1455/5754] 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 366b9d6949..bce780e26e 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 1456/5754] 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 b55b17f258..0000000000 --- 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 c4f6e312eb..5e3037b786 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 4ff2044298..388aa9966a 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 68316e108f..5054ae19e2 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 0000000000..5526cd5125 --- /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 16086e7bf4..ecb86c11ed 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 1457/5754] 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 0fa1018721..d5f628e1ee 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 48e5c2f8cd..7b8ac67d92 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 1458/5754] 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 c771297b5a..3bc521e445 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 3263f7fea0..dd17b46e67 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 1459/5754] 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 e26dcee301..0c7bdf7fa1 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 c01f12d12c..5f2e1e0ed1 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 1460/5754] 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 e548e32626..1a22889851 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 7a679ce4bf..91643e7bea 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 1461/5754] 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 db0ed5bede..f74832ce6a 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 09d1a10ce7..8584735129 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 1462/5754] 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 bac4f8398a..173f359afc 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 7d509331fe..153187f743 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 1463/5754] 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 3e219faad8..604e74b57d 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 93c2328bda..bbcd3aecab 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 1464/5754] 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 90b3a18982..2bbb8af904 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 edac818985..1713f0b4b8 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 1465/5754] 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 21579216df..ed781df686 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 9f16fa3da8..f1566b058e 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 1466/5754] 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 46480445ab..4abdd6ece4 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 8fd3321d9e..7801f9b62c 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 1467/5754] 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 c2c58ab2fe..c3e84a17d2 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 d4b3873af1..0306db42c0 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 1468/5754] 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 6dec625c93..2fdec4e83f 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 9533cdf2b6..cae239094a 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 1469/5754] 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 f37e7bb292..c98d10d79c 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 6b4bd49fde..6f5fc4f7aa 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 1470/5754] 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 6c190d3727..0000000000 --- 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 bd5dcfdbaf..0cdb18ea5d 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 0ae9205c3b..9fdc877db0 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 1471/5754] 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 51ea74a0cb..d4a95c631a 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 6f7168279b..87f162f715 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 1472/5754] 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 128a739c2c..006d4985ef 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 2fc268b0ac..527d101786 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 1473/5754] 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 0000000000..534b2c8f6b --- /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 0000000000..3d90fee56c --- /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 9e8be43f2b..d1ab936181 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 9792630f15..15af076db9 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 1474/5754] 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 1590bc19c5..0000000000 --- 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 a082f23997..d16c36340f 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 0b66b82589..93df1558ff 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 140276dbc4..95b377d844 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 1475/5754] 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 907b9cdd06..03ec1e10c1 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 b5fae7e26e..ae3a249969 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 1476/5754] 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 1bb164fa86..f62ce2bf6c 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 1477/5754] 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 018e5b8a77..95a031b6f2 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 2dd9e6097c..dd35a166e5 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 1478/5754] 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 72f63b242d..7df1048afa 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 9b07bb31d2..2c12e8ef2f 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 1479/5754] 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 e748637c72..14f7da5bf2 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 51f13cf623..f7c60b37a9 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 a9569f2910..97863efc13 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 1480/5754] 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 104c19a40f..0000000000 --- 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 2b21800f02..bdffb0c6aa 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 ddb96a0b33..15438a44b3 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 1481/5754] 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 114ec4235d..730388ded7 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 1482/5754] 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 b1a2891b91..7a5b19952e 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 5e7995f8c8..0c6c9bcb9f 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 1483/5754] 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 d959f968e0..00a4654b12 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 0308ab6a28..74ba6e3603 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 1484/5754] 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 0ec128f9fd..7425c388c2 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 51083af144..c0d30143fa 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 1485/5754] 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 bdd4c7f3a6..4b5779169b 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 9843ec3502..c09d81aa2d 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 1486/5754] 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 81cbab4552..18ec63e07a 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 31f692e03d..b979aaf09f 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 1487/5754] 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 624988215e..e56ecfe656 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 ef9d29d5af..6ac2468f51 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 1488/5754] 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 9f4d933779..bea717a456 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 1489/5754] 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 1a1594a45e..dd715c1bb6 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 1490/5754] .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 5f6538ea74..d1626326a8 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 1491/5754] 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 18a8a9fa42..b41049b0ee 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 1492/5754] 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 167b5edc9d..1c0e4c185d 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 9de7df3ed2..b280f5a52a 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 1493/5754] 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 5488ed9710..ffe42bf395 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 37554ddf86..89c3577982 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 1494/5754] 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 0000000000..4dd17ec069 --- /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 58c5390433..9c05857f22 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 1495/5754] 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 690ee9c339..f6b50a4b58 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 1496/5754] {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 f6b50a4b58..65d3dc53c6 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 e3047886c5..75158437c7 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 4a4f1308cb..e2934b0f64 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 1497/5754] 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 2c12e8ef2f..cf42a8aff8 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 1498/5754] 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 ddf1942c68..5ebecd7330 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 1499/5754] 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 65d6c71079..8bece94911 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 7e463c02b1..cd0bdfa0f0 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 1500/5754] 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 e184f3f3be..c4bf9d0ad9 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 1501/5754] 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 257678465a..4e8a708014 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 1502/5754] 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 cd0bdfa0f0..247ed207d3 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 1503/5754] 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 ff8dc974d8..0000000000 --- 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 8487c07e42..83717f26f3 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 17b131c3ec..98beb7ffef 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 1504/5754] 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 d9e95a3d05..57b67e091e 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 1505/5754] 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 3a52600056..a8b5527e81 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 ac40c57afb..27f20654e7 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 1506/5754] 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 6be66ffee3..0000000000 --- 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 baf43c66f7..4dd6519ca3 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 b31f5199e1..9ddf2374bb 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 1507/5754] 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 63dfe98d80..db99b4b07b 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 4b17fcf391..367a833ac9 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 1508/5754] 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 c83e4653c3..142d15644d 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 309987010f..2f3b405f93 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 1509/5754] 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 15ca840f1f..97aa3b570e 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 5dfba8b7a4..375754180f 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 1510/5754] 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 a405d2611b..c871277801 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 2a91c71c8f..869f8e48dd 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 1511/5754] 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 32b3d0b5e2..8a29e7b977 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 dd715c1bb6..a5313e686f 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 1512/5754] 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 b910cdce13..7fb3badf46 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 3250649e07..19c859e602 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 1513/5754] 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 18785aa0c8..212a032d84 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 1514/5754] 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 b81830a7d2..412d67a328 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 407ac1a2c6..96d8e43ea2 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 1515/5754] 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 218309ed56..adab1ca3e6 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 a5313e686f..0f7ae640f6 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 1516/5754] 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 9e2bb2830c..08cf86b3df 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 7ceb87b047..8afd058643 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 1517/5754] 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 0000000000..1642343d06 --- /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 1518/5754] 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 1642343d06..250c071582 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 1519/5754] 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 1383e680d5..b6f696000b 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 7a21cca52c..8f9f4b2db4 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 1520/5754] 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 c96bf77bce..a5f83c8725 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 73e3c3feb8..4753da299c 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 1521/5754] 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 483320d95c..63a35285d7 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 5daced7182..1253cc5d41 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 1522/5754] 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 88dcb28377..cfe5a7c0c0 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 bfe382b59e..124ff57db0 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 1523/5754] 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 6382b86f1b..2ff56a8b76 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 487d85ee1f..58c0414533 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 1524/5754] 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 cf42a8aff8..e9cb7b67cb 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 1525/5754] 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 270fd8869d..34339c1261 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 d4292ae9a3..a4523f2218 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 1526/5754] 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 c642862fe2..baee824104 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 73de185ba7..f7c7ae847c 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 1527/5754] 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 429df7d5f8..0000000000 --- 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 44282ae3f1..0000000000 --- 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 e33a8523d8..0000000000 --- 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 b03114635c..20fd9392e7 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 e95ea742b3..19224000bb 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 1528/5754] 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 0dc974ce85..092ec989cf 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 c0f2c73b69..f904793aa2 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 1529/5754] 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 891ccf4b4e..e9e9a18cb1 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 69c4f76ee6..522971ac98 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 1530/5754] 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 eee2e34cbf..1a68b74ccb 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 9c6b5f9b37..805ff23964 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 1531/5754] 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 bf730b9047..105249f7f9 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 b43d0f03c8..f261d240b2 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 1532/5754] 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 2c924d5080..4fe6d73139 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 3bced8bb7b..09f611e185 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 1533/5754] 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 aa5438755e..b8df6c88a5 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 1633d3bd41..4db2ccd7d5 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 1534/5754] 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 0074932fba..0000000000 --- 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 28965a0648..e8691607b1 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 077597e7e8..6d84acc23b 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 1535/5754] 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 9195692d52..5b67744a00 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 52d823cbdc..0ac161b327 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 1536/5754] 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 ef927636d9..f7922d7e8f 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 a25f676710..91560c1ed1 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 1537/5754] 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 8f2c678198..1fb0649fb2 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 7556bcc391..43e862f7f9 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 1538/5754] .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 d1626326a8..9363e7f3bb 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 1539/5754] 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 bad101486c..1ab624c33c 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 1540/5754] 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 cf822340da..250ddbbd4d 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 21b6c0ccb3..59b64c358b 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 1541/5754] 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 9363e7f3bb..0db9b2ed4d 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 79216860dd..8259e91fc6 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 484e6722ea..1c4de6a02e 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 0000000000..7eb31e5d07 --- /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 838a8fa6d7..0000000000 --- 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 b338596d7a..0000000000 --- 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 18ec63e07a..20390fb6b4 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 b979aaf09f..2799dbe2f7 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 1542/5754] 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 0db9b2ed4d..3eb6fdf3b5 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 cec0cb18b9..0000000000 --- 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 22ac657a3f..0000000000 --- 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 a9a577a2d9..0000000000 --- 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 7034739815..0000000000 --- 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 27b9572269..0000000000 --- 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 d2c224ccf9..0000000000 --- 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 bd7f434652..0000000000 --- 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 ed297574a8..0000000000 --- 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 0adca20ed0..0000000000 --- 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 5c64210324..0000000000 --- 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 15159af892..0000000000 --- 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 d20e1191bf..0000000000 --- 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 7e3f6e69ac..0000000000 --- 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 a2bc7aefeb..0000000000 --- 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 ded33ffdaf..0000000000 --- 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 cbcc62f982..0000000000 --- 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 8b9ec610f5..8e2033dc98 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 89ff2e4b85..a2e0805c17 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 1543/5754] 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 3eb6fdf3b5..dd57e8062d 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 a13fb91afe..72a2f05bd6 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 9432e4bbd6..cb6b04d069 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 60728aa465..0000000000 --- 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 0000000000..92a4ac904d --- /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 158345a212..0000000000 --- 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 d1e9b3f25f..0000000000 --- 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 7bd8bc2943..a21733ea78 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 e0f548879e..ea9a588aeb 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 093b3aa9ae..70ed270555 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 1544/5754] 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 e2bfe09928..20f13e95f7 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 f5736e7db7..bbbada01da 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 9d1c9a2a76..4012353b0b 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 fbf327032b..8954da18de 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 28999afb7b..caf9390eaa 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 173a2b10ca..c30be0774b 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 1a0227f415..3ed7483fdb 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 ff988dffce..577adc0bc3 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 5f8d4564c8..c4d6a68ef9 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 491be3a7ba..0fa9a654e4 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 b1131ff43d..d8c1535395 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 d10fd161cb..6ec66fab9b 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 152f1a6eb5..d861b5957e 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 15cfdcded9..78e7a9f1a2 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 1545/5754] 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 5784c2585b..e54eafcdf8 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 65d5ff4aee..d14843cb53 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 a9cb12af6a..f66db7d680 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 fbc7489782..ce891f1838 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 02e976f2d4..2b551a81df 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 66faba19f3..451884d0bc 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 f616d76992..9318b69e48 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 d8c7b1a694..b13ee8ea4c 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 1546/5754] 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 f0a24b7043..3efe3aa114 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 a36095c38c..18df044c62 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 9da87e0e38..1f3e86bb27 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 1547/5754] 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 888c0ca918..7dbcee6585 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 39347010b5..ff66f13e14 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 62a1c261a2..affe8b5171 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 b719a6ab2e..f496fd3881 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 1548/5754] 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 0b483f70bf..1ccb528526 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 db1bc2c50f..c893ae1247 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 5467513a0b..1d9579615b 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 2d9e33b625..3af3f2f4ff 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 1549/5754] 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 33de7d6ca0..e2f73c70c4 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 90d0a53002..fac90dfeb6 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 de429ebf15..9d914fdbf2 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 e58711cb11..8c0b178f75 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 e3ff5bd1c1..516366d7b2 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 e4b00c06b5..914de3c72d 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 ce6fb8f385..7a4d5d3364 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 c5705670f8..50dad3c47f 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 f177eabd53..3bcfa23593 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 a4a448c51e..cc6e097efa 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 40cd8fd62f..7b55eb88fd 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 caa90b7af6..d32ce87388 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 de71703c53..6be0623a5a 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 e5976a7d3a..1182ea517a 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 9f4bd97366..37489de7dc 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 1db0dca618..dfc7c2873b 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 81270ca7d2..d0d6331364 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 8475249e51..f67457480c 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 17d9817053..b89320d9c0 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 6b3590a6d6..7b11407954 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 ec78e7c84a..bb7f4218cf 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 4808974c31..d0cfc006d7 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 1dc9636e63..2342f0c836 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 e2699bc44d..84950d2514 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 04919af7d2..d0c340fe78 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 6f8dca4b23..4ae7bd0bc6 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 4673bbbf88..36a9dd4187 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 a9ac03a007..b05c452854 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 167905f637..ed8668b2c9 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 f306c3a51b..763f7054ad 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 ce3397fad5..1aff2dd985 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 fd83ffef37..60a8a819b0 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 3e17fd553d..64ecb17b14 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 ebb5f117b8..02a2e2e456 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 b2a4031bd3..7f051071f1 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 81159e05f3..80b57f2510 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 b80ca10ae5..cdcaeeff9d 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 b20f1c6414..41f9e82814 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 4a04c07ac8..232750db33 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 3bf21b3440..fd96731764 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 c1d3b476b9..1af86d4de0 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 49b33916ee..fa5e116fa0 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 1550/5754] 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 0f1d77e814..3f1163fe1b 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 0c660e9556..d91779610b 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 95c37a8e69..79815b3cba 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 2ae243eba0..c721f21cc0 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 314c067878..5426cb3f6c 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 70e4cdc0bd..f25ad9c666 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 80dfbad357..6ca36c0d32 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 9ca6718c92..49b510f229 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 2268b2e52c..27b5a0f712 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 3e91cfb03a..4c3f358894 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 2c4de82049..4f0c3f4746 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 230977bb94..b9a3e8d681 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 20e725f07a..39853836fb 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 fffdc82d88..3801515329 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 9b0effef15..aa48d490e5 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 3ab7234370..e33c09ab97 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 073a1b2702..c66d3b2cd3 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 59ec30b868..adf7451723 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 9cf978bbbc..4641296596 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 06c77331af..a38ad5c7db 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 1551/5754] 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 c0468517f2..d395ba2d42 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 1f79bad71f..975e28485a 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 845d7516ee..4d7f800acf 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 12b7b266c0..4322e41abd 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 1f3cc4978f..2f439e8e0d 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 6415fcb1de..c050b4bc20 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 1552/5754] 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 449b2a4817..5edb2b9ac2 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 060e1d9b69..58087d4f0d 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 f49fff77de..cc82b1f59a 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 8b258e19c2..b7b048f165 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 9a5652a2d9..abc97a892f 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 f8959facbd..8cd5ea2045 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 d3f489e4f9..c38931f2dd 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 5c644bb3ee..a056c3481d 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 1198dd1eab..4b8a1f7e71 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 0da5f22bae..67d02ab38a 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 7f335ed9e2..3e1669f776 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 afa1fb1aef..3e876797b6 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 3265477050..fe9d164234 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 9d75f79a87..92e46b8997 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 1553/5754] 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 7a66c28b52..7dcb99fe2a 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 dbeae1aa65..8f84e4863f 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 1554/5754] 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 adba659aea..d654c362a9 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 4a9eb3089f..25e25ab93d 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 1555/5754] 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 0580253dd6..12633a41a9 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 849746ece3..ffb724e39c 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 1556/5754] 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 a86ef13225..545d4881f6 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 b4802cf018..6ae5ec8be8 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 1557/5754] 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 0961879637..d3a6a66902 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 0d6c0deffe..614b62fe77 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 1558/5754] 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 07a3eb936c..b0afdc15ac 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 c5e2a857e3..a198fc44c3 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 1559/5754] 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 733c404543..a041f0d440 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 970ec93407..51f6283370 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 1560/5754] 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 5074365aed..749aa0ad62 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 845b612669..154c220aa1 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 1561/5754] 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 40512f3540..577896d38b 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 9530262cf5..cca89145f8 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 1562/5754] 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 5dfe496052..03de906245 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 c0229b57d2..3f535fc1d4 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 1563/5754] 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 acc65348f7..b5a139fdac 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 8dd2777ff9..8c7beeed6e 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 1564/5754] 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 fbc7f7be00..bbf2e37328 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 9652487aae..196b73c83d 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 1565/5754] 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 480886b295..cca2639dc3 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 d1f93ffb5b..381df31fee 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 1566/5754] 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 f289e66153..ce2ec4a3e1 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 6b615a8de5..f81a7b4a88 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 1567/5754] 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 6da1080576..80d4a48c40 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 d499b421fb..7825f4117e 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 1568/5754] 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 7ebc88a0be..c9a3956686 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 e9545abaec..c8b6445829 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 1569/5754] 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 2b88f567a0..1bb3831c91 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 c3c5f388e9..e5bf1e502f 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 1570/5754] 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 a7664efec2..cf52a2348f 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 b864dce23c..8a97c85d68 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 1571/5754] 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 c45ae59ee4..962cb0e16b 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 ba4ab43db2..84f8e39ddd 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 1572/5754] 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 dd57e8062d..476a802770 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 fa3e68596a..0000000000 --- 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 2e2e953676..68131fdb38 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 3f2a63609e..6301a97300 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 1573/5754] 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 476a802770..fa35f2d391 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 ec9e49ebc7..0000000000 --- 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 ed8413b0cd..0000000000 --- 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 0a23c54cce..0000000000 --- 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 a969d61913..0000000000 --- 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 1e7376cbfc..74530c122f 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 e7f5852811..b663279c20 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 1574/5754] 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 fa35f2d391..e80e2a845f 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 b9c296b6b5..0000000000 --- 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 4c695960d1..0000000000 --- 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 661c8749f2..4482ff5991 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 9e5bf61997..03983d5cdc 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 1575/5754] 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 18df044c62..f94c0455bb 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 1f3e86bb27..31b04c9e89 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 1576/5754] 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 8e2033dc98..b9391aed6a 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 a2e0805c17..8aefc401ef 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 1577/5754] 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 f94c0455bb..f562fe193c 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 31b04c9e89..f86438166b 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 1578/5754] 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 e80e2a845f..cd0ccc1abd 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 057d2254bc..4fb95c8b4a 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 92a4ac904d..fcf35b25b2 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 1579/5754] 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 f562fe193c..89efd14222 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 1580/5754] 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 7425c388c2..b4129eb3bf 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 c0d30143fa..6895d60be6 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 1581/5754] 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 4b5779169b..a00748b667 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 c09d81aa2d..eb7703dbb3 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 1582/5754] 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 51b45e5e99..5f687c73b9 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 1583/5754] 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 488c21a4fc..0000000000 --- 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 cdf5f3b4e2..ed75b09816 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 ab3ebe2077..a666757449 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 1584/5754] 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 7b5c60f180..02d9c2d1e0 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 872e4b6a30..1aea741f7e 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 1585/5754] 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 1633ca525d..fd4f3c17c5 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 1586/5754] 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 80b1185b5e..d1813fd7b9 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 1587/5754] 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 3f383e337e..ea988e87ea 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 1588/5754] 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 40269db233..e286f0b7f1 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 1589/5754] 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 73ba934b69..9dbf808da7 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 1590/5754] 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 3c47fdcb49..4ef5612b57 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 1591/5754] 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 f347dc3f2c..0312f42612 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 394c1e9cb9..df0617555d 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 1592/5754] 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 81efa884a7..0000000000 --- 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 db8b5ab39b..0000000000 --- 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 bfb0084bc4..0000000000 --- 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 980b042e33..84bd85eeff 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 13cbc969d3..e6775c47e7 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 1660d2c2b9..f3a200ced3 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 1593/5754] 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 a34d6bb4d5..0000000000 --- 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 b99b01f22e..60cc0a11a2 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 ab54a4b2fc..36de2b9b06 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 bd1d329982..d432ab48cc 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 75554259d0..4316a2c185 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 1594/5754] .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 cd0ccc1abd..b753e1ecfc 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 1595/5754] 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 b753e1ecfc..cdc12c2328 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 e0c738748a..ed3cae82ef 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 a8b5527e81..2e5fa8865f 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 27f20654e7..f7a50d7bc7 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 1596/5754] 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 a558a3e846..60eb8dbb1d 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 36ef3cb527..4d7c4cd0d5 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 1597/5754] 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 cdc12c2328..d42179bc3c 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 bf04bd95fc..0000000000 --- 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 eed9dba005..c6aa514534 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 844ee426d4..a4f87caf1e 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 e34acde534..d2eb76e40a 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 1598/5754] 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 cd0a4e0330..54f53d19de 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 c6d470dc97..5a7932bad2 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 1599/5754] 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 b05c7802c2..9ec92244a7 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 bcda07f893..cd02d8df50 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 1600/5754] 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 d42179bc3c..d5bd3cd4ab 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 5f554a6c24..0000000000 --- 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 c4edd37f1a..0000000000 --- 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 86f848f177..5e6b8d158e 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 3b6d97c42d..dbc77e856f 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 1601/5754] 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 0945e6ed31..530638566c 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 1602/5754] 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 37797fc4f0..8027274c32 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 1603/5754] 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 8027274c32..7c941fa339 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 1604/5754] 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 e9f61227a0..c7fe188a0e 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 236bf4c5d9..882791b917 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 1605/5754] 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 f4d3e32c34..a79cb8f9a3 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 dc29a85429..395134df17 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 1606/5754] 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 576c441154..b24fab5e42 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 1607/5754] 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 a3cb8390b4..cc2c90b5ac 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 a87f21a9bf..cf3ee7a36e 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 1608/5754] 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 d5bd3cd4ab..0d55748263 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 4fdf9afc94..0000000000 --- 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 88f5a4f87e..0000000000 --- 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 c067e26f4e..69016eae11 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 ef113c838f..4b95842efa 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 1609/5754] 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 4da3807bb5..08b3331374 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 7b065b6123..d306ef8269 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 1610/5754] 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 937dd44c8c..c61c434c60 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 bb2b208583..c182bab4cc 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 1611/5754] 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 eaac32a01a..53c2d3b077 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 2070582fbb..0000000000 --- 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 d74a24c8ab..0000000000 --- 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 338a51ada4..0000000000 --- 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 1612/5754] 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 bce780e26e..2a710c30dc 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 1613/5754] 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 fc57a14fd6..08bcb85ae4 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 1614/5754] 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 08bcb85ae4..38e4ea2160 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 1615/5754] 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 0000000000..648040c663 --- /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 dfe50303f7..fd03f062bc 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 38e4ea2160..2b289fcc9f 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 1616/5754] 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 2b289fcc9f..2964c6a512 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 1617/5754] 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 2964c6a512..c66ce6992d 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 1618/5754] 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 6e767d2428..e369aa6f4a 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 521e7cc546..6d58de360a 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 5d076ddf0a..6502d34c5a 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 1619/5754] 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 75f6692b8a..174f3967ab 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 d14a65c2d6..254413af09 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 856c9d67fc..571512878e 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 1620/5754] 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 0000000000..78d206ed79 --- /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 f56c5b93c4..2a1b21d375 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 764e4c3661..9cf80d1cc0 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 f0b019c0ed..e4489f6f88 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 1621/5754] 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 0d55748263..94a32e0531 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 2a710c30dc..7837f5a588 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 57b67e091e..5658dfa14b 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 53c2d3b077..92ef7160d0 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 3a2aefa090..0000000000 --- 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 9a7cfde0af..0000000000 --- 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 9c564c32af..0000000000 --- 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 232b577230..0000000000 --- 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 1622/5754] 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 7837f5a588..debe8428a5 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 92ef7160d0..420ebaa370 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 d9371b879b..0000000000 --- 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 d8cd69ff1f..0000000000 --- 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 2820fb486d..0000000000 --- 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 1f370356ea..571d7e69ad 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 8afd058643..ec63d8ecbc 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 2340465b20..e88073b87a 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 dc57363cf5..b56da61ec0 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 c97c9becd2..8d0d26f159 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 21aed60605..af73d8bd00 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 c75c37fb63..f2888b2f51 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 859925e8d3..608c263e4d 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 82ca68d2da..34b8d49eb3 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 b41049b0ee..d1840ef112 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 1623/5754] 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 94a32e0531..3ac032400b 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 f3e9bff2ba..0000000000 --- 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 1624/5754] 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 d1840ef112..8291b8d356 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 1625/5754] 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 5658dfa14b..efb2907d1b 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 1626/5754] 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 cbeebc579d..1af699dbe3 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 5fe603fc1c..f8d4464cd4 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 1627/5754] 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 beb7639b1f..bf9b8251d7 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 1cc8310312..8b14c899c4 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 1628/5754] 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 828718e713..c88e6840cf 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 c8a22b9ab2..67b25c9100 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 1629/5754] 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 193a973f7e..bbd6873938 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 e37fd6743a..fd41274369 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 6779433556..2f947ab807 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 1630/5754] 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 ea204aee98..01505aa02e 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 01c4cb2ff2..2e30077e20 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 1631/5754] 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 b7d19b261c..19272d2b90 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 b58c7ca8df..7f28342c52 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 1632/5754] 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 6a7a634ced..4ed9d73bac 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 554acaa67d..8e2b4f70fa 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 1633/5754] 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 0000000000..4a194612b4 --- /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 0000000000..d729884805 --- /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 0000000000..90cace7968 --- /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 1634/5754] 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 e370716bd9..30ce6d9c0b 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 68023c9ae2..ebc9f89cf7 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 1635/5754] 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 69db9b4b78..f4b74dc8c1 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 6fce7be996..8ab4d5ac3b 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 a7176ad129..1c4cec6adb 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 1636/5754] 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 1e7a1cf530..88b90c8b39 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 24c6f3ef27..23741ebace 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 1637/5754] 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 237f4454cc..790c9c534a 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 1638/5754] 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 e3157089a9..099934324c 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 609444e787..1eff468935 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 03df0ad9e2..74e6b8431a 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 8fbb3069bc..dbdde892be 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 4f43273a82..1029031182 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 2c813456f4..743dc0479a 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 b24fab5e42..3cd666fb4d 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 0490b9e29e..bf62136345 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 30d8982db3..50b61a8007 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 7bd2ae53b8..96b9dce41c 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 cd8c5a3cb2..5c2e4ba3d4 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 49d84c308b..bf4ce4f704 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 5363018c47..fadb94ad71 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 f77feb9b6d..e52b8a5408 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 575034441a..f9ed35eb95 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 e9438fda1e..8616d689e6 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 4b1c8e22af..e7d1a730df 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 87ef7902af..e9bf26c087 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 5774207f65..28de05345b 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 4b9c53e8de..a9fbf4ce15 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 b3d9d79156..166e5ea5ca 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 6ad03c4c87..0ab7e8e76f 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 50844dc93b..92fe3a11f6 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 f6a5c3d409..cb086ba248 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 7ce5a9d310..001d614c3b 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 f4cc5589e7..83a657dcbd 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 0a1877c44b..124f6f247a 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 1c11bcf77d..d2741d7dfb 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 2331041c2a..eda116afd6 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 b9a0812d52..ca1a429167 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 f354e303e5..03c871282e 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 ee70beb208..6d84844e85 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 b3174a152c..666500d889 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 6bbcca0896..ee18bdb011 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 0f12b7dfe9..f07e352367 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 d5ee371e79..9753ebc951 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 485b497e71..ccc6cce3c1 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 2ba04c0864..7d1a424eef 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 cc505a8540..0d1955291c 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 34b7e2d292..19eb9360df 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 cb78106091..6bfda22775 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 4be1b66edc..80d17d3e5a 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 1639/5754] 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 532fbd467e..88032f05c1 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 922d289b26..82efe10ef9 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 1640/5754] 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 b21023f730..2165c8c601 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 9be00e1b2c..734e8efec6 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 1641/5754] 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 0144e93a3f..58976e657a 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 f7a50d7bc7..d8fcb4a2c6 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 1642/5754] 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 efb2907d1b..37c1f06ec1 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 0000000000..9cfe08ef2c --- /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 1643/5754] 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 3ac032400b..05459362ee 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 56a2d4982c..0000000000 --- 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 6419db90f8..66a3c2d1be 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 b741d5ebc1..3495db96f0 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 1644/5754] 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 0000000000..95f2f86666 --- /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 1645/5754] 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 4a194612b4..0000000000 --- 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 d729884805..0000000000 --- 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 90cace7968..0000000000 --- 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 1646/5754] 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 0000000000..f0ee8cadc1 --- /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 1647/5754] 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 0000000000..4a194612b4 --- /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 0000000000..d729884805 --- /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 0000000000..140b27cae6 --- /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 1648/5754] 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 0000000000..0fa15ad164 --- /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 1649/5754] 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 8cf3aaa3ec..35ad7bede2 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 1650/5754] 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 039e4e3c7e..c243aaae2b 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 8551a5de79..f7782542ec 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 1651/5754] 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 1f333aac30..73df34bde9 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 db9f16bb6a..0fbdc5ae8d 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 1652/5754] 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 44189e6400..b8b16be26f 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 18c79b3b4d..c744ca4069 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 0000000000..c08529c44f --- /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 3098fe3ea4..bc40e32a46 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 a2e0083f7b..14bc627a80 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 db35da130f..b8de21edaa 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 1653/5754] 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 aa75ca63c0..18f0001aef 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 e7f006b023..e29d192b13 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 8505dbca3f..61d91066d4 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 1654/5754] 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 3586389047..fcfd81c554 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 baf16fb802..024d306233 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 1655/5754] 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 b38c6dcf14..215c9192f4 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 7d6ed86f08..cd40905230 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 1656/5754] 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 c252506df5..ac3357d3fa 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 a9388f7ee8..9a0f084128 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 1657/5754] 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 6260f158d8..87c00ec241 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 77e7c24000..252f5865b5 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 1658/5754] 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 0000000000..31c5013d69 --- /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 6ada3fee36..3592540703 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 0cec602f3d..7505474aa4 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 1659/5754] 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 3c3ae97dff..36063a4e13 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 fdb0919f11..c353e1f609 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 ea355f10c8..b80d25a6b9 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 1660/5754] 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 0000000000..adec7d98d0 --- /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 b08c22ed4e..a09e59c270 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 f11b72755a..8fea7cc254 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 1661/5754] 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 c4bf9d0ad9..81533552a7 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 a1de170749..d1b75ed405 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 1662/5754] 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 5afc507c52..3cf415de0e 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 a47514735c..92dd469f51 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 1741/5754] 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 98c5fda6af..4592014d7f 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 425380bf5d..074e282205 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 1742/5754] 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 fef008f84b..e76717e845 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 1743/5754] 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 977b6010b3..68a1799bfc 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 1744/5754] 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 90bc4c82d8..0d61191842 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 5deb64b82e..3be6c6adaf 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 1745/5754] 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 976341093e..23c0bf41db 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 1746/5754] 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 13f67695f5..81cf1afe6b 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 ea82f5e70c..0000000000 --- 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 5d77c164f3..937509c859 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 88bc73b604..d83980d925 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 1747/5754] 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 3ad8cbafe3..55e4d8ea23 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 1748/5754] 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 459a3a40bc..346738f665 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 1749/5754] 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 a39911b757..dc167e3bc1 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 1750/5754] 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 13f67695f5..947f4606aa 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 5526cd5125..0000000000 --- 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 0000000000..0b03fd563c --- /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 ecb86c11ed..93d4803812 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 1751/5754] 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 d06451d792..f5fe2b3807 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 b280f5a52a..434cefd069 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 1752/5754] 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 fb930cbef7..cd148f32e6 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 1753/5754] 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 0000000000..278d75e64a --- /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 1754/5754] 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 202e3c66e8..590877e1d7 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 60a8a819b0..e5e86274fc 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 1755/5754] 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 0000000000..c798f585d6 --- /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 1756/5754] 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 b4a4195751..434778bf55 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 1757/5754] 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 8a29e7b977..12d356118b 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 0f7ae640f6..93e839798b 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 1758/5754] 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 0fd8841e5b..8ca66ab7b6 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 1759/5754] 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 947f4606aa..f2dea0dfd9 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 b8c8a72587..0000000000 --- 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 ca1a429167..6d8a214e05 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 1760/5754] 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 d7b529cafd..05c132641e 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 fb0ee66883..86756ca612 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 1761/5754] 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 6fa5f79c6c..8bedf2ad21 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 1762/5754] {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 abb4bf922f..1967919431 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 fbc166afa2..5b860d4aa1 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 6f9c3b9418..ba7cf49455 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 1763/5754] 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 debe8428a5..ac2e302a6b 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 5b860d4aa1..b8ec77e232 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 ba7cf49455..4a2e1e154d 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 1764/5754] 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 5830cadc93..c236a6dc0b 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 1765/5754] 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 5d21e29d88..68a9ffca71 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 1766/5754] 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 0000000000..16296f619f --- /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 1767/5754] 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 03ec1e10c1..76a5acad6c 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 ae3a249969..1a63a0f348 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 1768/5754] 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 0000000000..c7c4dc7d10 --- /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 84e9099ba9..97e9442cf8 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 1769/5754] 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 420ebaa370..0cf2f3998c 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 0000000000..78f13dfe6b --- /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 0000000000..7b69b97d06 --- /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 0000000000..9e04329eab --- /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 1770/5754] 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 82538cfce8..3c6849487a 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 1771/5754] 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 0000000000..cb0988e631 --- /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 1772/5754] 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 0000000000..8ebb487ec6 --- /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 1773/5754] 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 b81e3d7520..b0875759ff 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 6e094c8b13..2e1eff2f3c 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 7f43a6f66b..75b445d069 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 92dd469f51..28d0b83952 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 1774/5754] {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 1967919431..f288f52601 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 b8ec77e232..4806bf711c 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 4a2e1e154d..51f475f16a 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 1775/5754] 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 e76717e845..7aa5980df7 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 1776/5754] 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 c51a3cd684..ef40b0353a 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 b5070ad74c..9f34e1f5fb 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 4313eecd6d..7b003e4836 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 ebc56b11dd..708926de80 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 6e84f06175..178979f43b 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 1777/5754] 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 f2dea0dfd9..a8338883d0 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 5044942e9f..0000000000 --- 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 cd1b9fa46d..dca1579319 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 666124fa6d..9082d25b78 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 1778/5754] 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 a8338883d0..ea5f6aafd3 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 82a667ab7b..0000000000 --- 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 43fed4c19f..0000000000 --- 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 4888f7e320..f927cd007d 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 716f007a24..eb45175135 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 e33dec3ff6..cb407c78fc 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 dba2d02d7f..817997e925 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 4e93f6ab96..88bc26e0d7 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 dca1579319..b6adf1f127 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 9082d25b78..f478962af8 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 1779/5754] 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 c02495af90..35624f3c72 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 1780/5754] 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 35624f3c72..ac1734109e 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 1781/5754] 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 c7042a054e..808b9c49fa 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 1782/5754] 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 0cf2f3998c..82aa348455 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 0000000000..e1f8f8efdf --- /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 0000000000..40fd43b5fd --- /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 0000000000..4c968323ea --- /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 1783/5754] 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 82aa348455..3da005b5e5 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 0000000000..f6ccd6056d --- /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 0000000000..5bf5dcb749 --- /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 0000000000..f139ea270f --- /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 1784/5754] 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 3da005b5e5..bc78acebda 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 0000000000..2732b8124b --- /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 0000000000..6529e4db41 --- /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 0000000000..8a8ce1ddd9 --- /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 1785/5754] 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 bc78acebda..ad438667d2 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 0000000000..508eb9cf13 --- /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 0000000000..6decd3ca8e --- /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 0000000000..494ce8f454 --- /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 1786/5754] 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 3de49ae574..c217efcfd1 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 1787/5754] .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 ea5f6aafd3..401b24b5d6 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 1788/5754] 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 401b24b5d6..d6d8d886b4 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 241ca34a04..eb9d7396e3 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 c3eb0b05e6..dad846534b 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 dfd3b07bea..a8ea5aff65 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 0a67e7a3ec..3b36289628 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 0fe506bbfd..39d461a87c 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 1789/5754] 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 65a87f25fa..345a7b16ff 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 bc1dd58611..83489a3abf 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 1790/5754] 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 2521238f64..8683b02e3b 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 6c25c9b46f..d73072a439 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 1791/5754] 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 cd8b1db996..5aa2386d36 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 0959b7f838..8078b41157 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 5c602e0448..920677e170 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 1792/5754] 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 12d356118b..18b2dbfd86 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 93e839798b..2be3415cb8 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 1793/5754] 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 c614aee255..eac0ac707f 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 6adf8eb779..85676af081 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 1794/5754] 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 e55e5473d3..b78dd5b4dd 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 6ca72d9240..1609695ebf 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 1795/5754] 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 d6d8d886b4..567e22520c 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 e3467f3068..e03d67d8b0 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 1796/5754] 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 77e383373e..51d43b0572 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 0000000000..ad96a51c40 --- /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 1797/5754] 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 b936777662..8a9281b8e7 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 1798/5754] 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 df3990c6be..f36faa059a 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 1799/5754] 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 c840e5b161..449a2113de 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 c32718fd10..43d0c4bff6 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 1800/5754] 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 537e4abd2f..c59437ec73 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 9ac946269a..dfd0dc105d 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 1801/5754] 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 0000000000..6831bdafd3 --- /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 1802/5754] 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 9e6316e284..f6ba84c9e5 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 1803/5754] 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 567e22520c..10e70f0787 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 b6f8f414a9..8c0b8d663b 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 0000000000..7ddfd1703c --- /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 c2efe291e6..0000000000 --- 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 9cc45a96c1..7b1a4c2c05 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 1804/5754] 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 0000000000..390e78eab5 --- /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 1805/5754] 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 0000000000..6661349aba --- /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 1806/5754] 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 1efa95ed44..91d723ecd1 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 ba86915b36..99646b10dc 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 1807/5754] 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 de0741d609..2f482ca434 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 c49fbc497d..23fbae10a9 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 1808/5754] 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 3e00a1993d..a62fbba630 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 1295358fb9..f1b2ee6c5e 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 1809/5754] 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 81cf1afe6b..963efac992 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 9e79be91a0..0000000000 --- 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 3cf7c28ae2..e42730addb 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 998ae3743b..97b391674c 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 8ab2ca1f9d..4a8c7e5efd 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 1810/5754] 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 8a511c3fe5..bddf3066ba 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 45c412ad12..501d9ee61a 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 1811/5754] 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 d49abf1f16..555d074c5d 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 730a91d277..6514bfe354 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 1812/5754] 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 b0875759ff..1f540b8f4b 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 2e1eff2f3c..ce2f34dc5e 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 75b445d069..5e9280626d 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 28d0b83952..7523bc57d9 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 1813/5754] 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 eb8c21be98..69bfc1475f 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 b08be11538..e5d3de8eb9 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 1814/5754] 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 3ca461bf83..147d9521bb 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 0c7ffe723a..4d6277a799 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 3c6849487a..e2cb42f941 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 c519ede2df..2e82ce5ad2 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 c81ac4a444..420f8257e5 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 1815/5754] 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 53876f828c..02cf486128 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 1816/5754] 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 ee18bdb011..4853cd0897 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 1817/5754] 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 10e70f0787..90a1481e54 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 9fd8bbf2c8..810fe99879 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 ac74286cf6..627c8ac41a 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 1818/5754] 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 90a1481e54..2d838e7ff3 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 e03d67d8b0..dc92c51d43 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 0713bd1b05..747991e3f1 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 c5de2db820..f44b66342d 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 1819/5754] {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 f288f52601..b4d32f6ea3 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 4806bf711c..18ede2d60f 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 51f475f16a..f9a164d78d 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 1820/5754] 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 ffe42bf395..874737ea2d 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 89c3577982..545d2117b7 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 1821/5754] 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 b2e210ee2c..5de076537b 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 dc92c8bb4e..b99877696a 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 5760e4ded1..e367690319 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 1822/5754] 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 da04b89f9b..923560298f 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 1823/5754] 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 67e97c6e5e..c09a033325 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 1824/5754] 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 0000000000..9b5b9966cd --- /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 1825/5754] 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 db3ea7096e..8f856e1cac 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 e9a93b3eda..0ca5bc1817 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 1826/5754] 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 1f540b8f4b..fec806a215 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 ce2f34dc5e..3187791d9b 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 5e9280626d..2af7db1861 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 7523bc57d9..32e9273215 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 d1b75ed405..eaac13e32b 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 1827/5754] 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 32e9273215..1a2af7ccfc 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 1828/5754] 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 3187791d9b..09b2066f05 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 1829/5754] 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 0000000000..b13dd2b03b --- /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 1830/5754] 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 ba220e903e..cc6fe25446 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 fed2aa809f..7bbea9a218 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 1831/5754] 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 c2316d1d4e..14c9bdbb7a 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 0e3d4da191..0000000000 --- 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 b43def6bb7..0000000000 --- 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 8d5ff31f0d..d1f183afff 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 f94244f2ad..a92ab4fe3e 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 1832/5754] 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 80130da5d6..a894aedf11 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 dbaa8ddf70..76b826ceef 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 1833/5754] 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 37b67c5cb1..b7563d8bac 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 ec01a18cb0..187fefea64 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 1834/5754] 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 9ec92244a7..22705cfb16 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 cd02d8df50..3356094cb0 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 1835/5754] 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 14c9bdbb7a..5e1fec9e97 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 58f9747d77..0000000000 --- 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 0000000000..b99b4c23f4 --- /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 df4df524d0..155c29ecd2 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 61523820ad..f1b294f74f 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 1836/5754] 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 7aa5980df7..56316201af 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 ad438667d2..bff090a661 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 0000000000..6e0743e9d8 --- /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 0000000000..afa1d97aed --- /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 0000000000..3b1589125c --- /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 1837/5754] 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 91a1b288c6..6fb34a0dae 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 1838/5754] 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 e76aef0b3a..b6fcad83e2 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 6a6905d75f..c530896fa8 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 1839/5754] 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 ed68164d5f..f443d947a4 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 add16f49db..75199f1a3d 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 1840/5754] 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 56316201af..694dfe0bdd 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 1841/5754] 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 9b11f026ec..2b6cd65a74 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 6b7d57b40c..ac4bc4aba5 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 1842/5754] 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 b2296f42eb..ae5a7a5181 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 1843/5754] 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 8078b41157..16bffb7e57 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 920677e170..7c2506870e 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 1844/5754] 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 fec806a215..83034c4859 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 1845/5754] 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 2af7db1861..0a97d9f822 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 1a2af7ccfc..83c5f48e04 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 1846/5754] 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 0000000000..a69097b412 --- /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 38b669fc6d..16027c9c3a 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 1847/5754] 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 2d54a6901e..d54395c29b 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 d17c8188b5..d09a1bcd1d 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 1848/5754] 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 1ccb528526..ea22c603ac 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 c893ae1247..a8c2502420 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 1849/5754] 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 96e8803cb2..4fe77f1c5b 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 981da5b15d..3bb27f1306 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 1850/5754] 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 baee824104..aa71881f41 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 f7c7ae847c..760af3b05e 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 1851/5754] 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 96f5e6b76c..cfbf9eaf17 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 9232debb3a..4fffe5360e 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 1852/5754] 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 ffe27e9d99..5c445ba0b2 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 3ab8535a9c..60e3da9de1 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 1853/5754] 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 7d02b9e139..a71cec1e38 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 2120ee8e3c..21a0b30d3b 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 1854/5754] 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 37030bdfaa..f3650c5ec5 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 cf26a36cc4..9f7774f719 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 1855/5754] 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 c771e1fd7e..458c1388d3 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 95b0325c94..ec066fbfa2 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 1856/5754] 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 16ab48654c..84979a70fa 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 755a9c93f1..a7dd84f62c 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 1857/5754] 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 6993b756ae..cb36b674fa 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 e417d8d627..503aca8c25 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 1858/5754] {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 b4d32f6ea3..69bf91bbf9 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 18ede2d60f..20e67fc4d1 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 f9a164d78d..00ec22d606 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 1859/5754] 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 b89320d9c0..9ef0d4e758 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 7b11407954..2629cd9147 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 1860/5754] 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 700b9746f1..45728a36f1 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 743b0ec858..3892dbfbdc 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 1861/5754] 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 e21c07ad2c..4f6e68f0a2 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 c6c28d12e8..608fa37be4 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 1862/5754] 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 5e1fec9e97..29d816956a 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 233f949e24..0000000000 --- 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 19be26cae0..8018c9fab1 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 dfbd411863..91ce08f4f0 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 1863/5754] 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 5fc8173905..0f1501d31b 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 728a6ba6cc..c9727c75c9 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 1864/5754] 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 29d816956a..c78168e5ea 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 e983800e27..0000000000 --- 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 ba44aa015c..b2de750c34 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 b97db8ff59..66758a1697 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 1865/5754] 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 0af9472f17..5f056ff5ad 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 6d139730e8..2e7363d828 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 595a59f702..576a163173 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 1866/5754] 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 d8282ff03b..f6a67fc1ed 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 d9a7ed1519..a4d30b5910 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 1867/5754] 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 4dab755e5d..460f63516a 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 e7cecb612d..8f094c133d 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 1868/5754] 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 22c37bf605..4d6c210c62 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 8291b8d356..6655a0d097 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 1869/5754] 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 b0381474ff..5edfc79113 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 3858d62886..894b231445 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 1870/5754] 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 846ca7efc3..905b47fb06 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 a35e274bc4..9f1ef19e7b 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 1871/5754] 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 bb03dcf94a..9ca6b2c7a7 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 d6053508a5..6d418f9739 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 1872/5754] 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 2ff56a8b76..3c3a90d6f3 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 58c0414533..3998a25cdf 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 1873/5754] 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 ca26a38a02..30c45a5a74 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 364fa1469a..d215afccd2 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 1874/5754] 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 0085d5a63f..228b86a90b 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 04f7e34435..b89e1d27bc 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 b04ee7fa2c..6c43e01a44 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 ece5cad93e..bdb7cfd22f 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 1875/5754] 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 6bfc61bcbf..f7b0ecfd52 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 278d75e64a..0000000000 --- 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 f1eed92fb6..80272b70d6 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 7e41442398..feb8547e73 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 1876/5754] 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 bd9c8560d5..1fe856198d 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 a206e2fe34..f07739bc21 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 1877/5754] {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 69bf91bbf9..70591f4a25 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 20e67fc4d1..ee510f836d 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 00ec22d606..5b16e659df 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 1878/5754] 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 00a4654b12..82da96f6b1 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 74ba6e3603..1ccb49a390 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 1879/5754] 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 23fd4e50f3..a82d6f2ed2 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 9f7194e376..5cd00cc354 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 1880/5754] 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 e5fb09b46a..39ded93fb9 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 fbb011c2c2..64c8e0d8e5 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 1881/5754] 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 a5f83c8725..b82a7b29e4 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 4753da299c..3b805cb1fd 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 1882/5754] 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 d726cb94c6..6c2486e260 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 dd4dfbbe38..d1987d427f 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 1883/5754] 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 ff1b9a127f..f8282277a1 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 7f19ece1a3..a3e4d7a9d3 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 1884/5754] 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 4cb1f0c1cd..f6c72f7555 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 c5fdd9a862..78e3631761 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 40ab7dedc6..1ceed7683c 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 27eb11f095..d4566b3142 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 1885/5754] 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 76ad1ba1ce..be13063728 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 226ef2b479..6d10172cdc 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 1886/5754] 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 f06c14b21f..d561cec635 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 1a8a888963..585b3a5f57 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 1887/5754] 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 d6026cf034..c22677cad0 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 27b07226d9..a1e3d23b75 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 1888/5754] 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 9725e0058b..624297aeba 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 77e0c91383..e4424ff577 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 1889/5754] 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 d462abc62b..03a9683a21 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 6dbea6fb7e..d59a16a57d 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 1890/5754] 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 b6f696000b..c4aeabb25d 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 8f9f4b2db4..2c74db3711 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 1891/5754] 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 39af62e085..47b9009ea1 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 9ca064c293..9baa2e7b98 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 1892/5754] 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 f7396cb3d6..9714fd2ea0 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 9c4f0be6c8..f151f0061b 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 1893/5754] 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 1b37e90e73..c01270be50 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 6327a3efe2..8d8cf56889 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 1894/5754] 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 e73a3099a8..88b17f4575 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 a1a4dc9b16..b800426d22 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 1895/5754] 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 c55a17a545..8ed25084d1 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 f55c7fc2c5..1cc7e90b11 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 1896/5754] 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 eb011dddb8..954f4a8938 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 b566bdd066..3790aa4787 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 1897/5754] 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 d514bdfe56..43bb824b6a 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 c02968610f..b69d329cde 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 1898/5754] 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 97d455b87c..577b23a7ab 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 3430e46b51..094a918090 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 1899/5754] 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 f63a64ed1b..4d4907f5dc 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 f96191ade6..ea887a0258 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 1900/5754] 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 e7e86264d2..dc75d098d3 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 b11d75b33d..145e804bd7 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 1901/5754] 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 5457ede44a..4018e95fde 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 1051376808..b11814d114 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 1902/5754] 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 2c0995babf..94af9f87b7 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 5a24c1eced..3e346fd769 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 1903/5754] 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 3589823da4..63b2d9ad5f 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 1904/5754] 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 a7dd84f62c..cac6b80185 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 1905/5754] 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 ee510f836d..d90f6cb2a3 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 1906/5754] 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 ccffd08ee3..d3977154df 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 1907/5754] 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 2b6cd65a74..736122e0ab 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 1908/5754] 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 cb03b33bfe..922f468a67 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 e8c91cf51f..fa58f65797 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 1909/5754] 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 edf891674b..3e1573f2cf 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 4332fc6919..46b8acd673 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 1910/5754] 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 4408782248..6ab4c53e79 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 539ded06cd..fe629ada21 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 1911/5754] 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 cc36b5251d..1c4fe45ac9 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 1912/5754] 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 0000000000..7ecc12e991 --- /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 a798e7ca61..4d56b73938 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 1913/5754] =?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 694dfe0bdd..794c2ebdfe 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 1914/5754] 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 c78168e5ea..4a40bc7fcc 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 671d92c150..0000000000 --- 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 0000000000..0daf75d5ba --- /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 0000000000..6bbbea6ce6 --- /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 86a17448f8..0000000000 --- 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 1d262362d6..0000000000 --- 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 517cfe503a..e8e675667e 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 f9e2f5083e..253b6b26f8 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 1915/5754] 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 0000000000..87df0e4c9a --- /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 1916/5754] 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 b07aad8f18..9e7364d76c 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 279244a5dc..1bb537aeb8 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 1917/5754] 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 a5564fcf3a..430bd3b4b9 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 1918/5754] 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 0000000000..535e1628c9 --- /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 1919/5754] 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 f7b0ecfd52..a89ab984a8 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 80272b70d6..71583d5f67 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 feb8547e73..191fa15eef 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 1920/5754] 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 7eb31e5d07..aa55c09891 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 1921/5754] 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 0000000000..7323ac70df --- /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 1922/5754] 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 a23944a06f..e083014750 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 a130b2d10d..67aa20742d 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 1923/5754] 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 be13063728..45413af27e 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 6d10172cdc..2674947162 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 1924/5754] 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 212a032d84..d03c7d0916 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 1925/5754] 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 d7ec16e800..36a542227a 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 bbcd3aecab..41f4c727f3 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 1926/5754] {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 70591f4a25..315af971db 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 d90f6cb2a3..f49ab52afb 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 5b16e659df..10e33a7306 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 1927/5754] 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 2775427485..48b6432f5d 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 90ba57a883..d6da078c7b 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 1928/5754] 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 2b7181e5d2..faa2e2626e 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 fa856fb36a..1f9891411a 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 1929/5754] 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 70671212ef..65b98d94e2 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 156b066162..fb0b646c51 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 1930/5754] 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 c0f1731676..dd4722480c 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 994b0e19f0..08deb62abe 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 1931/5754] 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 1647f93d9e..4eea644842 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 c54031b102..f20427114b 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 1932/5754] 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 4a40bc7fcc..d0378929ee 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 063bfc536c..0000000000 --- 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 1788b42fc0..0ab661231a 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 d2ac39aca4..086552e09b 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 1933/5754] 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 2ae1e61ed4..c648a85c04 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 1794582dd3..27277163d2 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 1934/5754] 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 051670aa51..6198a46608 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 c94c9ea876..6bf7e33577 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 1935/5754] 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 249bb63a42..f9d1de5e28 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 fd7d0bd93a..2c07846154 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 1936/5754] 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 e10c11904b..0e339ea573 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 c9190ccfee..aac4d76ee2 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 1937/5754] 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 c15a168f60..fcb8fa0a99 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 1938/5754] 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 0000000000..377a85c8fd --- /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 0000000000..159598fd1e --- /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 1939/5754] 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 fcb8fa0a99..85374ae8bb 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 2674947162..d957930455 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 1940/5754] 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 eed28d3fde..6d7d0b4bc2 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 e863b1e506..f7f05c7c41 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 1941/5754] 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 96bd42ac36..c17d3086a1 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 e44deaf621..266678105c 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 1942/5754] 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 a57d7cc737..a3ad6ce38c 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 4d48a3fbc1..9049b36944 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 1943/5754] 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 1bab37244e..9595a73d0e 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 88c9b57a52..001705bb2e 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 1944/5754] 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 7595286499..cc81b05ce5 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 1c5bd50166..8960aaffdb 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 1945/5754] 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 606fd26060..d8b56bf2c8 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 4f9860d25a..769c5a06f4 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 1946/5754] 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 e9d8616ba4..8a4b13099e 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 429595b5d7..9aaf81eb6f 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 1947/5754] 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 cc52013e11..10655f9dd1 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 c707bdafc0..899f505f1c 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 1948/5754] 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 514c90915a..6c96f7dfea 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 2418769808..498f39d14b 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 41ac96fc4f..057cc0f1a4 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 90e94d27cb..a8480caf71 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 81498788be..87e7894f5c 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 83157f5c67..8962db61cf 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 514dd2829f..0770018fde 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 9ec8f800bd..b53b499b28 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 5390d1c126..8b1ead9efb 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 7f8e4b2ea0..fcd2706621 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 3c565450f4..ae2503efcf 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 c867a60233..f8e95d8fcb 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 154d6eb2fd..6aa66d0b34 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 cc15738692..89c5a0d802 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 0648e26dd9..0336c1b237 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 788a76a2b9..1bc03affab 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 439d5d2602..2e21d28546 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 2f055ddab9..bbbdd3d13c 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 ed8d8514db..17b1b3f428 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 4166b2d741..86789dae5a 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 c9b01efc7a..a0c5eea223 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 e3ed2a6f08..3cc0dedaa6 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 cb0387d9e9..81a6a76dfb 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 244c91ffb9..c4fd2e69b9 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 1cef17d4cd..9a97a16cd1 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 90d9e5bbb4..f756f29571 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 9973f1f456..03bcf66ca4 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 deb99aa596..9c74f0c4dc 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 81bb8fc791..9e9e158f80 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 640ce86324..880e49a102 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 893ba5718d..480444e518 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 caca639c25..af7590842c 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 04565f8b0f..3fe94b526f 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 e752803086..38366a8089 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 1b4ebe9d9f..cebdbbba88 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 f5bd941383..57e151383b 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 34873fe3b7..2dea72b831 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 1642b41352..6f404ab2a0 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 c5e8f4e4ae..5a967f70d5 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 4d34998af4..ea295cadfa 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 bc4a9e5b17..bc2164b23f 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 1393d67eae..d144925278 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 c39db36061..95cdaa9f1c 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 78a5bbbf8e..f0ba7fe942 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 ce0899b65a..ace39dcd64 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 b5da83f398..e76626bb96 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 5eb407f4c7..5d2f1dedc1 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 8fa30ea314..93a7973fb7 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 45cf430018..73f38186f2 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 9ded4b6ced..9a4e25bf82 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 92046c8511..63d033b444 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 ac4a71b700..727b82fccf 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 781742420d..2fbdcaf3a1 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 e03da6f1b5..ee90e7a80c 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 f6e8e9aa79..978c634ec5 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 6fcaa5dadc..41179f4c4f 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 107493b267..44ce495ec6 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 e07569d4b4..4e61b45339 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 e8d3fa1605..4d92cdaf9f 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 a254d4a756..144cec5203 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 80261ff312..726e748050 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 6e580fd922..f77a5f004f 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 8b195c9f9b..ac2f343906 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 737cfb5c9b..3d3596a9b6 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 283f6f9f2c..a0200073de 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 e43cd1150f..f13483994b 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 640f56636a..68035e4195 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 a26fbc8948..0b332d20bf 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 1949/5754] 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 08e36da1d0..3a19075ba1 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 b82c15a23a..7c9c814d95 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 1950/5754] 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 794c2ebdfe..188c579010 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 1951/5754] 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 0000000000..090bcbc4a3 --- /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 1952/5754] 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 33ddfeb595..65a9b6afda 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 739c6154d7..d7040f7245 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 1953/5754] 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 2cd038cb68..aae230dac2 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 7d3dc2831f..9532774ae8 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 1954/5754] 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 0000000000..cd9542a9a9 --- /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 1955/5754] 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 c9562fecfa..b7168106d7 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 1956/5754] 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 e9a3992f8e..dce258c0f9 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 9dd88f613f..1456d5600d 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 1957/5754] 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 0000000000..1a276ca2df --- /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 1958/5754] 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 87c00ec241..310b0a0f6a 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 252f5865b5..e77e06bd6b 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 1959/5754] 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 17c70004ba..0e48d4dafd 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 b3a79c431d..99d2c4301c 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 1960/5754] 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 03efa71e6b..546b5f3560 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 fb0b646c51..e3de48c561 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 1961/5754] 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 10655f9dd1..37ad9c7c04 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 899f505f1c..f6e5a5a434 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 1962/5754] 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 dc466241ba..292dba86d0 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 1963/5754] 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 292dba86d0..fd174bc657 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 1964/5754] 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 d0378929ee..2e5c833156 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 406e265cf3..0000000000 --- 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 a48a583cb1..0000000000 --- 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 2a54bf270d..05e9c53902 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 69ac121300..ec7643ce3d 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 1965/5754] 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 546b5f3560..9326b967ed 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 1966/5754] 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 5728ebfe37..d23a81c5ee 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 83dfce6177..649810b0ad 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 1967/5754] 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 9326b967ed..b9333be2a2 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 1968/5754] 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 2e5c833156..dadc8e0978 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 73c0d10ffc..0000000000 --- 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 73732892a5..0fa503a02a 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 f9754a4b49..0006f461a0 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 1969/5754] 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 2b6ee6c08e..0440b14ba5 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 1970/5754] 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 0440b14ba5..35cb3558f9 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 1971/5754] 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 35cb3558f9..80c5e48f96 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 1972/5754] 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 79af8c2ece..42c732b973 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 1973/5754] 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 b5e84389e0..853e8deb06 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 1974/5754] 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 5e6b8d158e..99c4989479 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 1975/5754] 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 99c4989479..de2f0aae20 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 dbc77e856f..980fb141dc 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 1976/5754] 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 1af699dbe3..68757060bf 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 f8d4464cd4..670a81d1c8 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 1977/5754] 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 a7b56cf25d..39758f2b43 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 6c01426658..1576d6a3e1 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 1978/5754] 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 665a710c70..4eccef4806 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 ee2d5f5959..a49580fc7f 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 1979/5754] 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 9b1d9cb210..3cde9cd284 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 9e6ee3c878..38d46a08c9 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 1980/5754] 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 898cbcd60d..f6735cd540 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 a0a9617514..70f4c969d5 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 1981/5754] 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 66c04d261f..44cd928e45 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 8c43f58b76..20fe65afe6 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 1982/5754] 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 4617725571..f7293bd262 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 59c365365b..9734da5020 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 1983/5754] 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 ec5484e667..654c4cc537 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 352cdb106c..353978daa9 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 1984/5754] 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 93df1558ff..2ac28d327b 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 95b377d844..a6708ce94b 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 1985/5754] 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 a7ea4aa997..2926dfb6de 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 87537aa18e..8ef3216007 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 1986/5754] 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 cf1056ecc4..67a44f2c94 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 06642200df..e1353ef0c7 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 1987/5754] 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 5266e5b7a1..1a6d18aea9 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 051aec1c19..24d84c79c3 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 1988/5754] 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 22674650a2..75c3a913dc 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 455faaed12..d2d3087961 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 1989/5754] 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 d89caa5de8..6598f51f53 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 f5a8e1f070..80a986cfa3 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 1990/5754] 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 32804b5ce0..a8c15f2a12 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 70987a9823..f46d1a8a54 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 1991/5754] 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 dadc8e0978..5a7e1e32bc 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 2e1fd8871c..0000000000 --- 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 7267e85987..b5bc571f86 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 cd74784d82..8bedbdffba 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 1992/5754] 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 1a3c9d80df..7174b270ae 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 19a2458982..8bbebc1bf1 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 1993/5754] 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 5a7e1e32bc..373711b6bc 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 8612d268f8..0000000000 --- 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 17bb32e01c..8b1af44758 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 86df8a97a2..27937c4611 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 1994/5754] 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 ff0e9ab278..df160a124d 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 1004437026..2c66434a9a 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 1995/5754] 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 2799dbe2f7..4489c28d2b 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 1996/5754] 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 0000000000..3dd5359bfc --- /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 1a276ca2df..0000000000 --- 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 1997/5754] 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 c1f65c93af..d864850b06 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 a18c36fe78..b7bacd9217 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 1998/5754] 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 b993ebd759..0013a7485a 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 595c2379b0..ab06af826e 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 1999/5754] 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 60eb8dbb1d..ea03526c99 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 4d7c4cd0d5..c6bc0673f6 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 2000/5754] 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 0000000000..07981eff3e --- /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 2001/5754] 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 1c4cec6adb..ecc8eeddce 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 2002/5754] 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 373711b6bc..847f823ed0 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 dbb9b66b5c..07c3f0721c 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 f4b74dc8c1..a3cfa8dacf 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 8ab4d5ac3b..a917331580 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 ecc8eeddce..39433185b4 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 2003/5754] 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 0f8f04d676..382a54abad 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 854ed00032..52f8ec489f 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 2004/5754] 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 a5b665620c..a35970c54f 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 1a5f84ce4d..07dd6ce5b3 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 2005/5754] 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 431bb8c9d3..1edb252c96 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 63af373836..cb111bd405 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 be01f13363..98c8931962 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 1eaa3d6150..9341978d86 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 2006/5754] 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 655fa8392a..3788caa6a3 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 0000000000..179101c97f --- /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 0000000000..bb239cb012 --- /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 0000000000..be0addbd0d --- /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 2007/5754] 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 0000000000..46e09c267e --- /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 2008/5754] 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 0000000000..739a8d774b --- /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 2009/5754] 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 30e8430537..e160068a55 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 2010/5754] 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 63a35285d7..5a4fde42b6 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 1253cc5d41..23b17ab459 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 2011/5754] 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 7a5b19952e..0f5908cf38 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 0c6c9bcb9f..84b58632b6 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 2012/5754] 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 97b391674c..6f7c24d19c 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 4a8c7e5efd..c23ae9745e 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 2013/5754] 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 d0a2a63fab..256513da6b 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 fdad709dde..dad89b2149 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 2014/5754] 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 8ee5e1fc40..cf4da342c1 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 2015/5754] 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 28c6541406..4aab41693d 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 1fc2c5de57..2c1af4cfcc 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 8731a4f0e5..164b60e6ca 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 2016/5754] 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 9eb5d64a9d..0c2e64192d 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 ca1ea48bcb..6c4847831e 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 356e0810b3..9cdf58305b 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 2017/5754] 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 eeb88579fe..62e5ea8667 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 1079917c98..f148d6326d 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 5a6dbc60d5..d35b945b04 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 2018/5754] 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 847f823ed0..278b150cb6 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 b052259e87..175daf9d26 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 2019/5754] 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 967d064f1c..2b12b169a0 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 1cded53765..903d0abd9f 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 d1e81d90fd..718d203319 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 2020/5754] 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 6c490f195b..4ae3f45ff1 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 27cdc9e19e..0d0482458b 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 775bdecd90..ae53f5ce04 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 0767ab1375..105d572a7f 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 2021/5754] 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 0000000000..b3b1f732ab --- /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 2022/5754] 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 f5540ee44a..20048da7ec 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 012c1dfdb6..2b8920efa6 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 2023/5754] 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 5ffb50cd79..4bddb3598d 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 2024/5754] 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 5dd2af2f9c..6e93b65c3e 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 2025/5754] 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 1a8574de92..5d45813b5a 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 04c7d02d2f..36e2685a25 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 2026/5754] 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 0000000000..ffa23a88a7 --- /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 0000000000..4b927b630e --- /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 6e93b65c3e..fe1755683c 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 5d45813b5a..e831d31b8a 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 1ef7ee57d2..e34dd79f6f 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 2027/5754] 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 fe1755683c..a1800e49e2 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 e34dd79f6f..0dd8526b26 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 2028/5754] 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 278b150cb6..7d544a6e61 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 ac2e302a6b..d3a67aba83 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 fcc597e4d9..0000000000 --- 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 1a5fe46575..0000000000 --- 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 bfd531b818..0000000000 --- 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 0d18321ee1..0000000000 --- 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 8609db95b7..0000000000 --- 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 46697cc5c8..0000000000 --- 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 3e29282261..0000000000 --- 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 a1800e49e2..de5ca866e5 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 e831d31b8a..1a24c2f4bd 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 2029/5754] 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 b61a8ef3c6..32116446c3 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 e244bdc45b..3700b6fb80 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 7dfa7cce8d..d03ea472b1 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 e82ca2e1ee..3ed2e20266 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 2030/5754] 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 e9587fae6b..1d73b691e1 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 2031/5754] 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 512b2f857f..53e4a15c4f 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 2032/5754] 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 28228534f8..73368c1a49 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 d957930455..39ead10f55 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 2033/5754] 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 dba442bdd2..998811bc90 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 c4f0cd5c78..b17812619d 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 2034/5754] 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 ce30e2ba11..a4c8fbca5b 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 4e7b72b65c..72b2bbafd8 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 2035/5754] 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 5dca8dd6cf..db6b01f0c9 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 9dc5c719a9..59b593cb36 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 2036/5754] 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 38bc3f4444..7bdd784bf7 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 3623027713..3a625ea0fe 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 2037/5754] 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 7d1b2e8422..e83aa451f3 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 c687891002..9bdf05b85d 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 2038/5754] 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 a35970c54f..f42e92a379 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 07dd6ce5b3..14a8a5ef02 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 2039/5754] 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 b2de750c34..edaa275bbc 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 66758a1697..295dd8983f 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 2040/5754] 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 73ae3d5333..d70172646f 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 2041/5754] 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 7d544a6e61..0f6bdd92fa 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 822fc50367..0000000000 --- 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 2488b611a4..e0ee61d2b6 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 a62488907f..4dc5692d79 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 2042/5754] 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 73368c1a49..d47f758750 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 2043/5754] 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 8bedbdffba..a42be46a7a 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 2044/5754] 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 0f6bdd92fa..a48712460f 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 1c02f45c9d..0000000000 --- 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 45b6fec49c..4676db9e8c 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 d7bb288ea8..eba37be9b7 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 2045/5754] 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 91f704d30c..5dbd760aa1 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 2046/5754] 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 a48712460f..d3e5af4129 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 b5299a2a78..0000000000 --- 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 452c8d5689..28a47c15d1 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 39c9e07644..75214be8c7 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 2047/5754] 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 a16c1aecac..032c8ea2d2 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 f16a527f2e..6d1e70cf26 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 2048/5754] 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 ad7fe62708..5513865603 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 649810b0ad..38682c2755 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 2049/5754] 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 8ca3764935..0790dd7e0e 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 8612bac07f..0000000000 --- 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 9467647592..45952e60f1 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 37a2e79a7a..1e87041610 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 2050/5754] 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 45460d6d12..84c724c044 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 953da1f01c..2a42a0f28e 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 2051/5754] 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 3040dddbbb..0e8a995090 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 bfbd5dc6ed..89abc8d3b2 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 2052/5754] 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 ff7710dc2b..c4658e6f91 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 0ffdf61ddf..07ac7e9743 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 2053/5754] 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 e7862d1738..a5a8f7a65f 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 2054/5754] 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 4fffe5360e..b74838b649 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 2055/5754] 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 3a625ea0fe..99d46d814a 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 2056/5754] 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 462fa9d86b..0000000000 --- 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 1153e02b4d..0a8a13f1eb 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 0120d23b85..dcdbe142b6 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 2057/5754] 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 d3e5af4129..24adeeb70d 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 78cef8b908..0000000000 --- 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 cd8b3bb213..f89283b99a 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 861d45cb76..c691a4f975 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 e57a78be96..82b7464bb4 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 2058/5754] 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 4d56b73938..8b4c14207e 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 2059/5754] 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 d9218b533d..1453b78493 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 2060/5754] 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 8173876bbd..b9dba9e91a 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 dbb0b8f6e4..fd796cfd6a 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 2061/5754] 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 3cde9cd284..e46a0522f8 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 38d46a08c9..4b2f5907ea 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 2062/5754] {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 315af971db..fba0e1244b 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 f49ab52afb..d6371a4906 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 10e33a7306..baeabd94db 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 2063/5754] {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 d6371a4906..a300d7e9f2 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 baeabd94db..e7175faf70 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 ff0eb93017..2479128cab 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 8ca66ab7b6..5bfc4d0723 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 2064/5754] 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 fba0e1244b..359adf3bee 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 2065/5754] 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 b4129eb3bf..81fa5ba027 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 6895d60be6..dc63bb6239 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 2066/5754] 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 0000000000..3cac133864 --- /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 2067/5754] 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 20390fb6b4..05563d00cf 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 4489c28d2b..75938e21a8 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 2068/5754] 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 05563d00cf..cc7eee620f 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 75938e21a8..a14cc63c01 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 2069/5754] 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 1fa3f5096f..313f85f651 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 acd23e7ca8..dad9275537 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 5e5eb71100..b24256fcea 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 2070/5754] 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 6d1c36906d..6eba365ecc 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 fd4f3c17c5..eb5e7ad922 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 2071/5754] 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 3b1589125c..707e143eb3 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 2072/5754] 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 4fe77f1c5b..9fb4aebec1 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 3bb27f1306..6a2a6ae71b 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 2073/5754] 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 24adeeb70d..7f45b6a808 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 fa3057ff08..0000000000 --- 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 c1a10bdd58..f3210c5119 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 e093a5358e..3b5fccc9e2 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 30c3c2fbc0..08706c139f 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 2074/5754] 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 f04c7a848f..3af54a1afd 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 2075/5754] 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 612bc768dd..8525d47ecb 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 3af54a1afd..f06609777d 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 2076/5754] 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 2b0baedf31..0938260c1b 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 2077/5754] 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 0000000000..992cb4d513 --- /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 2078/5754] 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 b716cf5799..7848bb6faf 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 5e957a555a..22d1c7c28e 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 2079/5754] 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 e51b6f1a2a..af929003db 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 b0cfb88816..cdf9adb3fd 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 5f7fe8e24d..29cb00bb8a 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 2080/5754] 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 83717f26f3..d406babe35 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 98beb7ffef..4c4c3ce543 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 2081/5754] 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 fd3e6e6607..0000000000 --- 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 c4064cff66..03ce5a968a 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 5fb8876278..a743d020c0 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 2082/5754] 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 ccd115d6c9..fbdffa03d6 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 1e1f8e6050..50efaa273a 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 2083/5754] 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 c19b3b9558..b1d92ad8e6 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 fe50c768bf..c017c4e099 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 2084/5754] 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 6edeaa9d8b..5b0e77294d 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 f3383a02bf..4f4d86ee10 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 2085/5754] 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 a98ac3525d..f6292d242a 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 f4c20c07ad..2626c22d64 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 2086/5754] 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 f02fd90808..094b9e5da0 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 b4cef6188b..08e81f95a1 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 2087/5754] 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 daf043347f..eaf57623b3 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 d4bfcb44ef..a7fab863a6 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 2088/5754] 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 b87964da12..58261d3b18 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 a629bf0dd6..ccaeadff5e 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 2089/5754] 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 4eccef4806..eab24a7eab 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 a49580fc7f..982ccc8c5d 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 2090/5754] 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 963a1fd930..d40315a3af 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 c97e46999c..6f3b8069e6 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 2091/5754] 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 94dfa2ed6e..22178d0dec 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 9bacfaee58..62a34b2379 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 2092/5754] 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 1cd5f7f314..3a1fa6f5f9 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 4168d6c2db..9f0571402f 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 2093/5754] 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 535e1628c9..f2ac4d2dc3 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 2094/5754] 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 cc103215de..0000000000 --- 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 749c45ddca..0000000000 --- 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 ba8297cda7..0000000000 --- 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 a799cfe253..a2fe98435c 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 aa65d8437d..23f1bd2158 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 2095/5754] {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 359adf3bee..17bf808cdc 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 a300d7e9f2..a4542b94b6 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 e7175faf70..1944d47e4e 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 2096/5754] 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 0000000000..65440c1933 --- /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 2097/5754] 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 54ef963ae4..0000000000 --- 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 73cd34f744..0000000000 --- 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 a5479b0ebc..edbfb44553 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 048dd0b896..054442d569 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 2098/5754] 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 dbc4ddd2e8..0000000000 --- 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 2d6498f19d..8528689670 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 da6fe42e99..9ae29d9940 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 2099/5754] 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 15af076db9..49a65516d6 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 2100/5754] 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 0000000000..3e5f7c6516 --- /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 1e87041610..82800c0430 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 2101/5754] 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 0000000000..499bbb2ae4 --- /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 2102/5754] .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 7f45b6a808..b583c3db6a 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 2103/5754] 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 20a06aa8fe..97fcef7ddf 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 592773eec8..022e6055b5 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 2104/5754] 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 72a2f05bd6..569bde8cd2 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 cb6b04d069..44eba85d75 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 87df0e4c9a..0000000000 --- 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 ea9a588aeb..37fbf0c004 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 70ed270555..7cbc1df40a 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 2105/5754] 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 b583c3db6a..3d8924c4e8 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 d3a67aba83..7184d0a8b9 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 188c579010..e716642c6b 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 bff090a661..9cdbd677ff 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 e0d0beccff..0000000000 --- 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 89d5448473..0000000000 --- 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 251a50ee45..0000000000 --- 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 5da85abe0c..0000000000 --- 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 2106/5754] 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 e716642c6b..2a5aad2be3 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 2107/5754] 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 2a5aad2be3..086e0478eb 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 2108/5754] 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 086e0478eb..c1819954ae 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 0000000000..af5850ae3e --- /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 2109/5754] 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 1af86d4de0..9939c6f73b 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 fa5e116fa0..53153f8f59 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 2110/5754] 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 2a68722663..27a87be190 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 2111/5754] 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 4aa6e44afa..65cabf23ba 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 2112/5754] 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 c1819954ae..3237c90c39 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 9cdbd677ff..c9d5c9ccaa 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 0000000000..3fa57ee10d --- /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 0000000000..b8363ed61b --- /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 0000000000..a0829479a8 --- /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 0000000000..26a6a9a4d9 --- /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 2113/5754] 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 99fe71a91c..4cceb67019 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 2114/5754] 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 867ffe1bb0..41f8444651 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 2115/5754] 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 44cc2013fb..14ccedd48f 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 2116/5754] 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 461be9e5b4..d131ec566e 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 2117/5754] 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 93eac53387..cbd75c0119 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 009b264336..395d2fe47b 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 53e4a15c4f..213c099d07 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 2118/5754] 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 56a0a5dd53..77d5a9269c 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 8107796ae9..96ac5cef61 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 2119/5754] 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 0000000000..d4d2b068f3 --- /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 0000000000..335c18553a --- /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 0000000000..335c18553a --- /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 0000000000..335c18553a --- /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 0000000000..335c18553a --- /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 0000000000..335c18553a --- /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 0000000000..335c18553a --- /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 2120/5754] 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 3237c90c39..95f5305d6c 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 2121/5754] 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 0706c3548d..b55accacf1 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 27d2b99c34..4efc8fa172 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 efa0e16e9a..028236d2ed 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 ba22e29996..0688f64615 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 0028c9f8cb..fa69263be4 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 00c9a04432..0e7978dc58 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 cece8e476b..18c1608fca 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 5de13a176d..95567b2476 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 e4c464b8c7..f829c67122 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 9b8a788cae..9d821672b3 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 2cc8e0f17b..0ce6e4ffb4 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 e41b20fd9b..f73053f388 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 a61994fa53..904d31a983 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 c5c71ddf6c..cbd94fd111 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 d02d693401..42a920582a 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 527e3948b8..4803ef9230 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 bf2126b285..0d0f5dd53d 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 45af81c99f..05a021e8b2 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 5903e6d69c..25c1a74f5c 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 7d81b61407..88777a5cc3 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 f847ec95ab..1732921203 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 e68f66edd8..a8acf3c5a2 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 70cca38ff4..de94bd0375 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 980101c7fb..1b41ab675f 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 984f392dda..3160d37ad7 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 b3e10491fd..d6572be818 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 313895f11b..96cbbfbbad 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 1c11ae5853..f4d52b8a52 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 af18b84e9d..f6ccb9298e 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 559f02e7f6..d43fa8ba65 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 299fab3db0..40bb72e038 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 b8f96cf0c0..01ffd7c215 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 70f23ce407..c718414932 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 d25b2193e7..58461430c7 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 cd96df2007..7d00bd2ab7 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 424891ac2c..4816206d64 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 3072fd7a18..2a39ed18fe 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 58ed752b9b..d603598257 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 e87c9b50a5..a01a336584 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 1cdd8f0386..60d51fa5fe 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 3fefdc874d..49ce71b75e 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 adad3768b2..0000000000 --- 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 58935ceadc..c9d7f3434c 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 63fa1f21c0..aeca1b0381 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 dff3e6c849..aeec4c58b1 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 1d2b70c4f6..038446a9f4 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 54da733e7b..a55fd8ae74 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 fb6650e84a..80c5498518 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 a1dbb40154..353dfc8485 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 6711e9bf70..803c36cf04 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 2122/5754] .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 3d8924c4e8..c75d0f80d2 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 2123/5754] 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 3e7ad8d402..7e006e7a85 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 2124/5754] 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 ff03a05a8e..0038acfcfd 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 2125/5754] 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 d16bee69b1..db481b77b9 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 2126/5754] 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 de3b6e69f0..f48450292d 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 8e059fe8bd..3ab9b19f5f 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 2127/5754] 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 a38f3a1c5e..d817e1dd1c 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 74b6a764cd..88967e70cb 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 2128/5754] 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 95f5305d6c..57c25c4cfd 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 0000000000..6555584c10 --- /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 2129/5754] 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 57c25c4cfd..2cf343f9bc 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 0000000000..1d5f374853 --- /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 2130/5754] 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 2cf343f9bc..9b73b725b6 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 0000000000..4b7ae8180f --- /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 2131/5754] 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 9b73b725b6..0918e9f721 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 0000000000..7776c1608f --- /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 2132/5754] 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 59e13b503e..9d9209706a 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 2133/5754] 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 9d9209706a..ce285bcc60 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 2134/5754] 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 88548bf23e..67a152c6ae 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 1041ba0758..5b618ab54a 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 2135/5754] 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 1c4fe45ac9..1db5c6046d 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 2136/5754] 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 7184d0a8b9..9cf138f429 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 c9d5c9ccaa..e6ed56a811 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 0000000000..89964ab058 --- /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 d0c3bc5218..5a9e6ad233 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 d1e64498a8..0000000000 --- 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 969d1bd17a..0000000000 --- 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 178979f43b..cd3ba3df30 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 747bbcab56..0000000000 --- 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 52169eda4f..0000000000 --- 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 bb56e4516c..4c6a779f0d 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 2137/5754] 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 d649e8934a..300aa3bcd4 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 5a9e6ad233..580ea89520 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 2138/5754] 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 64f6158654..4668c3832c 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 a40f656d3e..e7bc915c79 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 2139/5754] 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 95a031b6f2..377812fba8 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 dd35a166e5..ca8ea15c03 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 2140/5754] 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 b0fa0ff5be..3ca184feaf 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 c169b76a6a..640c5bb1ce 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 a0c74bbe05..8e54ea7d60 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 b6c2135d6f..364a2eded4 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 2141/5754] 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 092ec989cf..b6729ab660 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 f904793aa2..8127689e9e 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 2142/5754] 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 e9e9a18cb1..dd5d598278 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 522971ac98..ddd3e7bf91 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 2143/5754] 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 623e77e992..16fa10f8c9 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 2144/5754] 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 79be596635..c7d62a690b 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 2145/5754] 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 c7d62a690b..6bedee5298 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 2146/5754] 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 0000000000..37a60efdd7 --- /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 2147/5754] 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 3b56fefeca..dc726359a0 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 2148/5754] 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 ccc05ae4d6..6d55d6388d 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 1a9aa05cc9..8c22cfe788 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 2149/5754] 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 9762e7bc6c..72741e413d 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 6eab7790cf..8739caefd4 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 2150/5754] 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 044e601021..bff6244d98 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 97f1da821a..fd9321be60 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 cd32c7fb8f..17c24bc971 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 2151/5754] 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 989eaf3419..6d8f500150 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 618327d09d..63b02a5181 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 2152/5754] 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 4333231c44..a9ea10ef44 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 7ad20d0974..7101e318aa 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 2153/5754] 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 680b70d784..08089456c2 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 2154/5754] 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 c75d0f80d2..52d748fa45 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 0161e6520a..0000000000 --- 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 da03ad4aac..0000000000 --- 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 3c2f6a95a7..96e21bf2df 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 96b099d5b1..e64f6308ec 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 2155/5754] 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 2365e47c7d..7569ee08d1 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 d8e0623e15..15531b521a 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 2156/5754] 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 77d5a9269c..0948bf495e 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 96ac5cef61..d4be2e4e8f 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 2157/5754] 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 4018e95fde..6c6917ed86 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 b11814d114..8256b1a254 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 2158/5754] 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 874737ea2d..6d4c718a40 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 545d2117b7..22b8161e05 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 2159/5754] 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 b6729ab660..3f1b9bd459 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 8127689e9e..7c19e0dc52 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 2160/5754] 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 dd5d598278..2ccf1d98b9 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 ddd3e7bf91..9b657093cb 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 2161/5754] 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 4fe6d73139..fce3477257 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 09f611e185..b2d3e99988 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 2162/5754] 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 52d748fa45..23b0171792 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 93f9440a74..0000000000 --- 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 2e73d2f37b..372f2f50ae 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 55f9a09f55..5aceb15ae1 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 2163/5754] 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 cc64be6cca..249f0e478e 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 fe4eeff38a..982bc758df 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 2164/5754] 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 209ff35b78..e27f87bd50 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 bbbd6f1df2..186702dc83 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 2165/5754] 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 0ccf064217..9cb4285ec3 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 2166/5754] 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 d81560aeb1..1578f3aa74 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 2167/5754] 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 126ddae63a..02a1f69d40 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 2168/5754] 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 f123993c08..0f3dc93a37 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 2169/5754] 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 73604cfc32..5f91243f37 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 2170/5754] 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 670c7213d6..12d96415da 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 4b48059573..a28c28f797 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 d6f69a83c7..c9ecf9acda 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 09b580de59..3352d454a5 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 7a10b7a2b0..f2c620d5ca 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 2171/5754] 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 51e5138481..4a232bc926 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 2172/5754] 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 71b074a587..30794a250b 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 2173/5754] 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 f661519196..0e5009494d 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 2174/5754] 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 007bc9ffa5..06297763c3 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 2175/5754] 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 6c1678a615..f785b1af97 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 2176/5754] 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 178b16be82..e67ab9ff6e 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 2177/5754] 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 bf11c02e5c..ee8e75f885 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 2178/5754] 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 d6541a2480..abd34bca50 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 2179/5754] 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 dbad5f931f..16ea943d41 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 2180/5754] 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 515f1ea304..bd472d3b39 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 2181/5754] 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 6f0c4ca1ed..107f53c6a3 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 2182/5754] 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 cdcaeeff9d..ed447ce61f 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 41f9e82814..b098e10929 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 2183/5754] 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 23b0171792..b88ad4ce90 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 3046ba528b..0000000000 --- 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 46961cc9d1..0000000000 --- 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 fe6c7ef008..d91bc761c9 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 feb5505289..235a71967e 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 2184/5754] 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 0000000000..8ba7f3cf15 --- /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 2185/5754] 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 3352d454a5..9991a57d1d 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 2186/5754] 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 94ee22ddc4..34d4b10e29 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 fb6b9a3280..399bd346ef 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 2187/5754] 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 405a09241c..ae88b672a6 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 20a058baff..9e8ff94156 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 2188/5754] 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 7941df1f2f..2593324bc1 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 0abb3770c7..1103772768 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 2189/5754] 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 81d19c419e..9b2f8ed833 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 6444d0148e..a6f2c3773c 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 2190/5754] 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 2d1d81c62e..ec357a83ce 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 49bfc0b840..0dca997f87 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 2191/5754] 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 6d6e1b606c..861f9d6f35 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 057a3ef173..4754efe41a 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 2192/5754] 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 0b60a40066..07b6f2f40d 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 0dd27d145f..3b7c663437 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 2193/5754] 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 0918e9f721..c3c5a7022d 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 e6ed56a811..c8ed49d773 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 0000000000..3540ca7452 --- /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 0000000000..28416d9fe2 --- /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 0000000000..6af0f811cb --- /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 2194/5754] 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 8a44bf2db4..19b2f0ae7b 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 9b6391750a..37ff0d70a5 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 1b1ffdf034..b0a38488f8 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 2195/5754] 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 484af86179..eae77ff51d 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 35241e78db..34c9559d1c 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 2196/5754] 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 01e4290950..9d21ffab2f 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 97291e1b26..7b4d37ef56 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 2197/5754] 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 84a46bd264..5623d4723c 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 2198/5754] 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 fd874f1f0a..be27a85970 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 15d660e49d..72fade58ed 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 2199/5754] 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 c3c5a7022d..476f092a16 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 0000000000..f7dd64d7f0 --- /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 0000000000..24f51565be --- /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 2200/5754] 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 30c45a5a74..2e4b6ac750 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 d215afccd2..8a39d4b695 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 2201/5754] 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 7e5df98112..9187112cee 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 ec86f468a4..ba0859c93d 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 2202/5754] 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 6bbc2f9c77..55178ba8f8 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 9d9d12bd5f..393f82774d 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 2203/5754] 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 4b415a7da2..72a5bcddcd 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 393f82774d..1819ae71f0 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 2204/5754] 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 72a5bcddcd..3ae72564cc 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 1819ae71f0..9383b20c15 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 2205/5754] 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 476f092a16..3638e4f99c 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 c8ed49d773..3125fdf632 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 0000000000..ee5f09928d --- /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 0000000000..c1ff470b27 --- /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 0000000000..8c6c34ccbc --- /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 2206/5754] 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 3638e4f99c..abea0bbb86 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 3125fdf632..3a7466d575 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 0000000000..6a21aee2b3 --- /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 0000000000..93e58e2535 --- /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 0000000000..ea0e182748 --- /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 2207/5754] 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 abea0bbb86..202a8ba501 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 0000000000..779b956cb3 --- /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 2208/5754] 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 202a8ba501..f7e7c02590 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 0000000000..988200250a --- /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 2209/5754] 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 f7e7c02590..b7c9fa8c27 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 0000000000..24dc5fb90d --- /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 2210/5754] 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 555d074c5d..e6e9c4ec96 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 6514bfe354..b109578a35 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 2211/5754] 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 f6c72f7555..211ac424ed 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 78e3631761..2336887ae6 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 1ceed7683c..7940ce09a5 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 d4566b3142..d2625318fd 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 2212/5754] 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 81fa5ba027..d22732b99f 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 dc63bb6239..58376bde2b 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 2213/5754] {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 17bf808cdc..cd0a6a38f6 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 a4542b94b6..c8e72d31a8 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 1944d47e4e..d886a4659b 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 2214/5754] 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 b7c9fa8c27..1021e5c6ba 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 2215/5754] 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 ee5f09928d..c827291ae4 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 2216/5754] 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 303f1351e0..2f6dba9d3c 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 6e2cc501ef..d6b8b229bd 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 2217/5754] 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 36451f839d..b4e8dcaf54 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 68fbe35b8b..db9c7f42d5 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 2218/5754] 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 b88ad4ce90..dc7770eff9 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 8e79b8d4d3..0000000000 --- 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 6f1bb74ecb..ab1807a287 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 87ec3c19d7..621e43ba79 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 2219/5754] 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 0000000000..6612847be7 --- /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 2220/5754] 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 85ac1e4b64..565a3c1bbb 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 3274b32650..e3cc67dc0e 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 8116ae5972..336544e125 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 2221/5754] 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 336544e125..0757851b72 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 2222/5754] 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 3be6c6adaf..e770d2b924 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 2223/5754] 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 9cf138f429..5c7e13fd5d 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 1021e5c6ba..555d597b00 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 3a7466d575..57d3646566 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 21669c9d55..0000000000 --- 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 c263acdd62..0000000000 --- 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 430ea52c1b..0000000000 --- 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 4c5c60aa7f..0000000000 --- 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 2224/5754] 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 9383b20c15..068de3859e 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 2225/5754] 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 555d597b00..0f306b61f1 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 0000000000..8d20ece3d6 --- /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 2226/5754] 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 0f306b61f1..3c8a6197da 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 0000000000..92a4170265 --- /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 2227/5754] 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 3c8a6197da..405ccd645a 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 0000000000..c250b748ef --- /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 2228/5754] 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 0938260c1b..60922e871c 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 2229/5754] .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 dc7770eff9..a762d8e98b 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 2230/5754] 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 a762d8e98b..a7bf69be39 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 6527bc23a1..ed4590dd55 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 820c2addf1..ea26a31075 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 ef40b0353a..425adea5d8 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 30bddc23de..0000000000 --- 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 0f59fa648e..0000000000 --- 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 7b003e4836..0000000000 --- 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 708926de80..ddba5f2049 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 cd3ba3df30..7a4e0dfca2 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 2231/5754] 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 ffdd826b6f..42bc205523 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 73befeb56e..610467b160 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 2232/5754] 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 83034c4859..bbf8fccca2 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 eaac13e32b..12da353f2e 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 2233/5754] 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 0a97d9f822..32b3d04d63 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 4b17fbd90e..272f92361e 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 acd3ffeee4..a338b15acf 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 2579/5754] 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 080136bc9a..18e337006b 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 2580/5754] 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 f846cc7a87..3a9329ab71 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 0003f342c3..0000000000 --- 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 d55e312bbb..8c8b4d1151 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 9b402767fd..c52a5214a6 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 2581/5754] 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 3a9329ab71..f5c4f807e7 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 91903866ef..0000000000 --- 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 b03bef3de5..02f7d84246 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 2010b6529f..5bcf559a6e 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 2582/5754] 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 0a8a13f1eb..92bac40463 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 dcdbe142b6..42fee82e80 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 2583/5754] 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 98de073bdb..88fd9c2fab 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 24e642b418..994da081b7 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 2584/5754] 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 25b6d018a1..7ba9537dd8 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 01718fa1e0..a1cec90de2 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 2585/5754] 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 2f6dba9d3c..a6ba6b22c6 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 d6b8b229bd..d9b9831fd6 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 2586/5754] 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 84979a70fa..6915e04e46 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 cac6b80185..025f5b4969 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 2587/5754] 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 81f7d8e103..b932941369 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 2588/5754] 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 b932941369..bbabd9de69 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 2589/5754] 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 056fd3a62e..82527e727e 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 dc68de83b3..5511bd12b3 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 2590/5754] 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 5511bd12b3..9591439b01 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 2591/5754] 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 f0a85ee1ca..9f81c0b842 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 2592/5754] 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 ed70b39586..cf7377d2f9 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 89644be9d3..67eb1881db 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 2593/5754] 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 4dc5692d79..cc25f91063 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 2594/5754] 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 cc25f91063..7ee19c8b18 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 2595/5754] 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 7ee19c8b18..43c99413dd 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 2596/5754] 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 66911dddb9..8d9c1b60e3 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 2597/5754] 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 3d21897c6d..fa06f345e9 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 2598/5754] 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 6b71e3819c..1f0d9befa1 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 3118ec62c9..6d52c52a85 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 2599/5754] 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 cb8d48c0ea..6b33d94a85 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 5c9b2caacb..79e1e42291 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 2600/5754] 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 72df6d0278..e34cb193f4 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 657622a962..3ef3aabdbc 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 2601/5754] 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 89293baec6..9993dbe95f 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 0f3687de5f..39e2edb82e 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 2602/5754] 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 b101394869..e602953a3f 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 60c3bd6d5d..3606cca56d 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 6fa5c1c686..add9232d2f 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 2603/5754] 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 6be0623a5a..8f60721163 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 1182ea517a..1ea3975be5 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 2604/5754] 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 0000000000..be815a0a61 --- /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 2605/5754] 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 c66f27e343..cb329a90df 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 2606/5754] 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 0000000000..42872597cd --- /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 2607/5754] 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 f846cc7a87..f612dfae4d 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 ff8f8a6071..ed08ea2d49 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 92e65ed3b7..1d9802c34d 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 2608/5754] {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 58cc9574a0..1501df86e9 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 1236686384..c9a0497d1a 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 98360204f7..d528f88745 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 2609/5754] 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 ce67399c32..3f39aa657a 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 2610/5754] 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 541d7422cf..4f336db737 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 fc66c684a5..d4dd08df36 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 8c375779cb..e085fb2b5d 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 2611/5754] 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 f612dfae4d..0954f22b4b 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 4aa473c244..f9e493a761 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 4df3ea5929..8bd0383683 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 15c191c83d..c2aa538d02 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 6fee99d45a..be8d57affa 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 616bbc891f..96befd53d8 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 3664775906..19c47cca90 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 2612/5754] 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 0000000000..82e693f35f --- /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 2613/5754] 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 6cd0786c3d..b970de48f2 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 2614/5754] 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 56277a0a0a..3e9d42c7c3 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 2615/5754] 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 c13a7201e6..6712291c22 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 2616/5754] 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 0f6cb75e0e..c9117146ea 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 54cddc3914..e12ee34e9f 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 0000000000..504cc3bd2b --- /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 0000000000..01313b394b --- /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 0000000000..9e66b6ebd2 --- /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 2617/5754] 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 23c0bf41db..6835467c46 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 3e9d42c7c3..32f6102797 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 2618/5754] 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 7a8dc557c3..f1d38c7cad 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 6712291c22..bf0b095372 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 2619/5754] 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 0000000000..e68401da78 --- /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 2620/5754] 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 0000000000..e68401da78 --- /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 2621/5754] 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 e68401da78..819d8016ae 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 3562199a82..78f137da3a 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 15094c2d01..df419f81e1 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 2622/5754] 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 45c86f0655..1b69034459 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 2623/5754] 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 f5c4f807e7..429776af25 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 b23b7773d3..d9325b7478 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 2624/5754] 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 d9325b7478..3e08a0ef36 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 2625/5754] 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 fbe37f9ca9..299017f9d2 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 0718f21aad..5a311a95c6 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 5d1c1da128..86b9c1f9d3 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 3e08a0ef36..1decb2310b 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 2626/5754] 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 429776af25..75da7fa923 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 0000000000..adf605203e --- /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 0000000000..30bffea6dc --- /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 0000000000..acb80e6f33 --- /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 0000000000..d4c417375b --- /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 0000000000..e898645982 --- /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 0000000000..27ff834215 --- /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 0000000000..9b494f6b71 --- /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 0000000000..c8a40ab5e5 --- /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 0000000000..553ef2785b --- /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 e8a34e0834..73aac0857e 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 36e2685a25..ebe5647dab 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 2627/5754] 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 73aac0857e..14efb10c76 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 2628/5754] 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 75da7fa923..1d96ae5ca0 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 d32ff09216..d5bf4f08f3 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 9369a14d2c..0000000000 --- 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 2f96d29820..0000000000 --- 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 e04ebd1dd5..0000000000 --- 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 846f7ed293..0000000000 --- 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 33dce4d940..0000000000 --- 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 4b212e2d03..0000000000 --- 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 34ab08a97a..0000000000 --- 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 3d7534a48a..0000000000 --- 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 927bf20de5..0000000000 --- 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 d1813fd7b9..20fd262c93 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 14efb10c76..9ba987222a 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 4b9c5c6b70..ec4cc24137 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 2629/5754] 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 91ce08f4f0..f7211ef112 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 2630/5754] 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 9621ef4d03..3518a2dc85 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 5266281ffc..4a8072dee5 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 2631/5754] 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 1d96ae5ca0..d7fab118a9 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 019df6e237..fc6c4024c6 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 ddc04cacac..0000000000 --- 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 695cc80b94..8ad996914b 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 0000000000..fecdee5449 --- /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 68557c4cb4..04bfb16e35 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 6d15d510e9..54a1afa902 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 8ceaa6983d..78b62a9ff8 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 f4789b9d88..18230cf89b 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 516f1143ce..21f41a2d8f 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 2632/5754] 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 9621ef4d03..3518a2dc85 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 5266281ffc..4a8072dee5 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 2633/5754] 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 569bde8cd2..e017aa8d9c 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 43d0c4bff6..58e51ffc8a 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 44eba85d75..c0bc767dd4 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 aff272d014..4fe6ea46cc 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 2634/5754] 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 be1c40b714..de0ed820a0 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 2635/5754] 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 2ead3421a8..ea9ffb863c 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 2636/5754] 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 9809f1ed84..86e6f2ecf2 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 2637/5754] 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 1aab7f5084..c97f8808c1 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 2638/5754] 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 c26c16b72a..eb0049fd03 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 2639/5754] 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 8eeec6efa8..5e968ce847 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 2640/5754] 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 e327053e8e..028001d7f3 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 2641/5754] 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 2a01daf4ca..ec03adcb60 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 2642/5754] 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 4e8cc287fe..08a0b8ba9a 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 2643/5754] 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 a78b6e6590..6cdbe2009b 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 2644/5754] 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 3ffe9d6880..8b6c718c56 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 2645/5754] 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 cd8ae35234..a99005ba7c 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 2646/5754] 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 3efda26825..d230b11338 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 2647/5754] 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 d077fbb779..5266019562 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 2648/5754] 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 a738d3c76a..77ec100058 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 2649/5754] 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 cc5e2ec9a0..1661fe47b4 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 2650/5754] 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 055fb3049c..6429729a7b 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 2651/5754] 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 1b0f2276dc..4e250eee95 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 2652/5754] 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 2db3932216..4a0d1a7e1c 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 2653/5754] 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 494ce8f454..1a85938311 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 2654/5754] 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 eb0c387af3..0b3561a927 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 4cceb67019..66ef8c3930 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 2655/5754] 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 378c24bc54..e02e30886f 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 987f24658d..3788f1e404 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 2656/5754] 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 ed83e757af..a5bbe11268 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 6a304c0c8c..3452e8b0eb 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 2657/5754] 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 ace0f6d610..7ebf15b6ff 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 d36f82917e..c359ef6032 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 13d611b696..fe3f265941 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 0c1913e227..087ddef877 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 4932e62dd2..016f9739bf 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 3452e8b0eb..55b6fb00e3 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 41f8444651..7abdd7eb0d 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 2658/5754] 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 c9117146ea..0ae5f89d88 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 0000000000..33ceb66931 --- /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 0000000000..bf59e64430 --- /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 2659/5754] 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 d73072a439..b599e320e0 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 2660/5754] 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 8f0af7b2d3..f350b7e72a 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 b599e320e0..0205208946 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 2661/5754] 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 f350b7e72a..902a3da779 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 0205208946..4b737c715c 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 2662/5754] 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 a338b15acf..8c7cc8a8c2 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 2823/5754] 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 0000000000..52b496f054 --- /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 34769eeca8..0cfff26337 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 62f6a0e0b8..db075360cc 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 2824/5754] 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 a057ddd259..6032544d2d 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 efa603f0c0..afb652f3fc 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 2825/5754] 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 09eddc4e68..7e119376e1 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 2826/5754] 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 1f8e7a50d1..adfd7585c4 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 2827/5754] 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 a9ea10ef44..e771d4f463 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 7101e318aa..d3259face5 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 2828/5754] 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 aa71881f41..4b770fa520 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 760af3b05e..d21c1e242d 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 2829/5754] 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 84a762fb36..a3534976b5 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 680364d01d..76135bf0b0 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 2830/5754] 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 705aae9501..10a16b03c5 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 15b1866630..0378566305 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 0000000000..7a89c3f1a4 --- /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 0000000000..4aeadbbbf8 --- /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 0000000000..ab7a242289 --- /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 0000000000..d08be715c3 --- /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 0000000000..dfc5d74242 --- /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 0000000000..473d0de7a3 --- /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 2831/5754] 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 e4a60e7aef..0956243143 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 29be9fa2cd..0000000000 --- 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 49fa9e1e1b..08e8497471 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 9b751e2696..5fc540bc9d 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 2832/5754] 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 998811bc90..f66798699f 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 b17812619d..c8bcb30961 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 2833/5754] 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 3497a3283f..504be12090 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 7497cc4964..07d436cf0b 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 2834/5754] 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 5e5c586762..3c2aa515f8 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 2835/5754] 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 04b34bbd40..596bb21d78 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 2836/5754] 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 a3b3093982..54a4d55a5f 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 2837/5754] 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 16bffb7e57..b4fd3a9646 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 7c2506870e..12c090ba3e 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 2838/5754] 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 cc6fe25446..501d8c12a6 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 7bbea9a218..a3bb2f8dfc 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 2839/5754] 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 e5a047e7d3..35f25c0066 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 1e29e25471..a0c775e37c 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 2840/5754] 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 279f071262..688c86243a 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 f2c94b8231..8332b89605 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 2841/5754] 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 da6ec7f311..0640f883a7 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 ca11a8191f..b951b14aa0 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 2842/5754] {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 32940bc346..d3448ba744 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 40ace29532..0177988c45 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 c7d725aa13..8a25067003 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 2843/5754] 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 e602953a3f..5dbf984735 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 3606cca56d..95133d3de9 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 add9232d2f..8f3d224417 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 2844/5754] 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 1901707f3b..fb278c1124 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 edc0fee286..7b9e320012 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 2845/5754] 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 69761f77df..0a31675ac8 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 c4a486215d..d747f887ce 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 2846/5754] 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 ad9d1c9264..9a41806d1e 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 68a1799bfc..e677c3375a 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 2847/5754] 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 9fb4aebec1..02cc1e6c7a 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 691436926b..836949a917 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 2848/5754] 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 f98c13b59f..0f69d1ba6b 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 2849/5754] 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 c817a3af63..89e3fea956 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 0f69d1ba6b..fb95a6fd67 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 2850/5754] 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 d0d6331364..ce8f68d3b5 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 f67457480c..2038b9016e 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 2851/5754] 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 6a128604b0..ba9932c9e4 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 e55c92b121..2f2cd05a12 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 2852/5754] 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 0cb3917f2d..5d1aad15d1 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 a7045337d0..18be55a17d 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 2853/5754] 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 7e1e856229..c5ede1130a 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 d31df8afa4..20a7cd07ef 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 2854/5754] 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 3ccba06202..a6a529eb6c 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 43d55592fa..de9012e67f 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 2855/5754] 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 10602c8df3..8c8368a1a5 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 afa309aa98..0ffcb8235f 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 2856/5754] 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 abd633f840..3b60189c77 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 9d7f5c4cb9..87e1b7c00e 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 0000000000..d80bb4bdb3 --- /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 0000000000..95131180ef --- /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 0000000000..1f8ade207c --- /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 2857/5754] 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 3b60189c77..2a10bb44cd 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 87e1b7c00e..e5fdf7ad43 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 0000000000..d76cef82e9 --- /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 0000000000..c968c5648f --- /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 0000000000..64be9a18f2 --- /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 2858/5754] 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 8b726eaa57..21f19db890 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 9f81c0b842..dda606a880 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 2859/5754] 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 2a10bb44cd..679aeb89d5 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 0000000000..26304fe98f --- /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 0000000000..5ddbb836ed --- /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 0000000000..052c440093 --- /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 2860/5754] 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 679aeb89d5..c643469f17 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 0000000000..26304fe98f --- /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 0000000000..f6251ea04a --- /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 0000000000..b98a68ff15 --- /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 2861/5754] 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 89e3fea956..084a09848c 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 2862/5754] 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 0000000000..53dd39cf47 --- /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 2863/5754] 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 9b402767fd..3b732dfa71 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 2864/5754] 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 c52a5214a6..1a50b0bf69 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 2865/5754] 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 f42e92a379..574cb48a3c 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 14a8a5ef02..5f3271066f 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 2866/5754] 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 88fe914d4a..356f181e76 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 d2e26b321c..0000000000 --- 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 3acf3c3408..a198e76058 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 7c87b3c9d8..d49b753670 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 2867/5754] 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 c13685e463..f021436b71 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 079445e489..9ad030fbd2 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 2868/5754] 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 21b2d01a9a..a60c4b25a0 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 2869/5754] 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 099934324c..c858572bbf 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 1eff468935..5acfaea777 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 74e6b8431a..1167060308 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 dbdde892be..d6a92a1d68 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 1029031182..7c93ae3e7e 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 743dc0479a..ccbcc8ea4e 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 3cd666fb4d..11a5c98174 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 d6dd8bd1b7..e35f3546fe 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 a6444103c9..a3a09ef775 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 96b9dce41c..e02b8dae2f 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 5c2e4ba3d4..146bbb67de 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 bf4ce4f704..1fdc588998 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 fadb94ad71..35d071010d 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 e52b8a5408..a57347d2a6 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 f9ed35eb95..9fb82a76d2 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 8616d689e6..f314b123a8 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 e7d1a730df..672c416a09 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 e9bf26c087..15dba14cc6 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 28de05345b..39b9c73bcd 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 a9fbf4ce15..698ff68e5e 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 37b980a9bd..4f1030b35f 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 6839f2f0ba..8e68fae3c2 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 896d209675..4bc9534166 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 e23fcd4695..4975a90bc6 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 fa8e2a09d3..1cca03053b 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 83a657dcbd..284982cf2c 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 124f6f247a..e50484f5a3 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 d2741d7dfb..6c14a1ca90 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 eda116afd6..33b9ec0d63 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 6d8a214e05..efbc5fc81d 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 03c871282e..74a67400ea 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 6d84844e85..2a0aea01d7 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 666500d889..52ad87fa7c 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 4853cd0897..39dae4be2a 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 f07e352367..038a9763c3 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 9753ebc951..a8988d4446 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 ccc6cce3c1..8a61155411 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 0d1955291c..9e99d9d2b2 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 19eb9360df..5c6bebd3e3 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 6bfda22775..8dcdced01b 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 80d17d3e5a..c3224576f7 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 2870/5754] 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 9c0e11757b..2cf6cca031 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 86f23d9060..e7e6931a2a 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 2871/5754] 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 23f1bd2158..fbb906503a 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 2872/5754] 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 356f181e76..5303a8f3d8 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 1c2d606e63..0000000000 --- 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 f497756eac..0f024af78c 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 9e2cf454b5..733a0c90ed 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 2873/5754] 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 b236329a84..bd0438ffe1 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 2874/5754] 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 dcb0b3bd70..7491c46512 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 2875/5754] 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 11a3946753..84905d2e0a 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 2876/5754] 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 cb7abd48ea..e5ca6e72ec 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 fc9a7f6f99..699af0b6c4 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 2877/5754] 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 699af0b6c4..a47df74f7b 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 2878/5754] 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 7379675609..f68f38b7a8 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 a47df74f7b..eeb22061fb 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 2879/5754] 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 0000000000..cc731ea967 --- /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 2880/5754] 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 ba44650bd3..0000000000 --- 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 2881/5754] 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 3b732dfa71..a077c89d92 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 2882/5754] 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 14767fb28e..6853b19ccd 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 6511e6f1e0..9e0b672c8d 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 c79ae1cf45..7bcf99e167 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 335f3a41e5..257f0a56df 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 2883/5754] 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 418c3e9e43..3ceab6572b 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 91b1b77476..809ac3dd2d 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 2884/5754] 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 37c4a79d16..57d7543131 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 2885/5754] 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 b99b4c23f4..0000000000 --- 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 0397efc542..e812bb81e8 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 32e35ff32b..a4b1f08266 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 2886/5754] 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 a60c4b25a0..fd8b7db0e7 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 2887/5754] 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 3de067ae54..7536704947 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 2888/5754] 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 7536704947..a1fb9a112c 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 2889/5754] 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 a1fb9a112c..29939ea1fb 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 2890/5754] 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 29939ea1fb..46d04b34c8 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 2891/5754] 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 e5c06b1e0a..f943153de9 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 2137907199..ab002701d7 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 7842662b57..ef82cd3e76 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 0aa7690b08..bc3f676af3 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 ecbbd65197..15795874ae 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 0000000000..24df05de8c --- /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 9b29b76e07..0000000000 --- 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 6ff6f3da0b..088dfb340c 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 f406a1afac..d46bf723b8 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 a261d3100d..ef32eb0696 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 3239a1c1f3..d4052b1191 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 2892/5754] 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 c643469f17..6fd1021e98 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 3788caa6a3..126bc22180 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 0000000000..9d9e087601 --- /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 0000000000..0735df3af2 --- /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 0000000000..0b6d9369cb --- /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 2893/5754] 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 0378566305..3ce869f310 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 2894/5754] 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 bba5eddf3d..4c7a187571 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 bf3b844624..665058d890 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 2895/5754] 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 126bc22180..276a0217ab 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 2896/5754] 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 a16c1e3849..8c6e2add60 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 2897/5754] 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 a2027dad44..76d566045d 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 085e723fe6..dc2b0647a2 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 c858572bbf..7807814aff 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 d6a92a1d68..cfeea623ff 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 2898/5754] 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 0000000000..f9e2d6845d --- /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 c3eef6e071..bd29469242 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 2899/5754] 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 6fd1021e98..f91c4e9a2b 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 3ce869f310..3d16ea37d1 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 0000000000..3957cd79bf --- /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 0000000000..286bdf3615 --- /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 0000000000..c832f38f4b --- /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 0000000000..c96d6087ce --- /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 0000000000..75e7124399 --- /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 2900/5754] 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 9b380ddc28..a8cec60d16 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 0bdc9b93ef..95fe5c9d57 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 2901/5754] 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 5303a8f3d8..d8d3970b3d 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 0a24744669..0000000000 --- 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 88ca8282bf..f3fbba8673 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 a64ebe83ed..1bd2df46b6 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 2902/5754] 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 d8d3970b3d..e652742f25 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 2df7c6b6a7..0000000000 --- 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 1354a4221e..0000000000 --- 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 fe8586357a..0000000000 --- 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 a6b5f27c40..d87e2742d3 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 b794296c6a..b3360d3c3b 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 2903/5754] 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 91d723ecd1..d73778ad85 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 99646b10dc..853ec256a0 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 2904/5754] 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 cbe54d6d1a..df0a51df3a 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 f146a86d0a..0b85246f39 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 2905/5754] {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 d3448ba744..dcfc31ac8b 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 0177988c45..246820827d 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 8a25067003..df22bfc1c1 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 2906/5754] 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 cbe54d6d1a..df0a51df3a 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 f146a86d0a..0b85246f39 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 2907/5754] 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 80c5e48f96..37898284ac 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 2908/5754] 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 37898284ac..c9d4a31ede 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 2909/5754] 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 86513d8072..dddfaf5228 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 2910/5754] 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 6c61e3aaaf..2bea0b97be 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 da8cbe45f9..db7896fadf 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 2911/5754] 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 6c43e01a44..1a0fee3290 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 bdb7cfd22f..5f8fa5b58d 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 2912/5754] {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 246820827d..d236dadad8 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 df22bfc1c1..ba8d0f897c 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 2913/5754] 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 8ba7f3cf15..0000000000 --- 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 e71742c243..506afa8bf3 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 b341d0220d..84166958bb 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 2914/5754] 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 ba9932c9e4..545ce724a5 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 2f2cd05a12..eecec4328c 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 2915/5754] 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 ca4a363182..0000000000 --- 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 b29a0af148..2c130fbbdf 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 6b11532b0e..ebcf9e10d3 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 2916/5754] 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 9ef0d4e758..dcbc504a23 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 2629cd9147..e89aed7d0a 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 2917/5754] 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 0000000000..63b2a7f82f --- /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 5c9ce26628..adccd9475d 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 2918/5754] 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 1ecbf7e9b4..3050229176 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 2919/5754] 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 f91c4e9a2b..241de082eb 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 0000000000..6a18d9a2cb --- /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 0000000000..398d45e2f7 --- /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 0000000000..8dae08a47c --- /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 0000000000..4cf6df2110 --- /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 0000000000..8f60115f8f --- /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 2920/5754] 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 ed17bb14b9..3d7719568f 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 446132846f..4d9acbc3d3 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 2921/5754] 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 211ac424ed..a11a964a90 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 2336887ae6..db31e26a70 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 7940ce09a5..59270e1957 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 d2625318fd..a55bc447f4 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 2922/5754] 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 9a41806d1e..c140a2df07 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 e677c3375a..e1e0fa8c63 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 2923/5754] {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 d236dadad8..fb2bfebd61 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 ba8d0f897c..deb3067b60 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 2924/5754] 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 bc8f986875..f0600af771 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 f59d199558..ac19225937 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 2925/5754] 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 0000000000..3ee42db7b6 --- /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 2926/5754] 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 c475641ab5..78bce76585 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 5cf1b6bad2..c5e4e4a14e 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 2927/5754] 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 39758f2b43..1a7f47edcd 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 1576d6a3e1..5e676d5387 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 2928/5754] 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 3b88b8200f..d122fee86e 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 c61c1d1508..15093f4b7a 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 2929/5754] 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 5ad7bf6ce2..f1346d269b 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 5e7e497ff1..d7709e03ef 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 2930/5754] 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 d000ee9454..3ee83f64c6 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 f0ff9a1480..1a1ba92c66 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 45d6bbeef3..a4cce974de 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 8c7cc8a8c2..aea6779579 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 2931/5754] 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 0000000000..7a17fa5c12 --- /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 2932/5754] 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 26c038e4b6..93dcb49042 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 0c9d66d877..cf85bfa8ce 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 2933/5754] 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 1997c3ba8e..76d599b81e 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 93505f7d85..92563d24bb 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 2934/5754] 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 241de082eb..24ec17a7c2 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 3d16ea37d1..5449884809 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 0000000000..edb01d2f72 --- /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 0000000000..b553a6c2bc --- /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 0000000000..b9c1ee6434 --- /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 2935/5754] 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 24ec17a7c2..db0ea49f90 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 0000000000..5287862cf1 --- /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 0000000000..14ddacfbc8 --- /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 2936/5754] 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 eb9d7396e3..401e83e75e 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 dad846534b..616c8d917d 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 3b36289628..ba398b84be 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 39d461a87c..d1a2fa23ee 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 2937/5754] 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 1853dcebb5..cfa3faeff7 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 d676df57f9..c530492696 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 2938/5754] 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 f943153de9..0cf2ce193a 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 0d6a1a6e01..ba9c8a9344 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 0000000000..f6073add0b --- /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 0000000000..30b410e38a --- /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 0000000000..4308e3170f --- /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 0000000000..b6fec1e6bb --- /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 0000000000..94d6aeefe7 --- /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 0000000000..94431a4ef1 --- /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 0000000000..903d33b7b5 --- /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 0000000000..686a0beafd --- /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 0000000000..19fde07060 --- /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 0000000000..75c3f8e43b --- /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 0000000000..3acec5cc20 --- /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 0000000000..cd249299be --- /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 0000000000..684bb88a9c --- /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 0000000000..680df1f5e9 --- /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 0000000000..d8e5835e18 --- /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 0000000000..1d3d26fb7b --- /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 875884cf5c..6c3a861fb6 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 2939/5754] .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 0cf2ce193a..3a9a6fb58c 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 2940/5754] 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 0000000000..a116fcc491 --- /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 a5569126d4..aee682529c 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 2941/5754] 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 d3b8ad437a..bb2e1f48de 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 2942/5754] 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 bb2e1f48de..063fccf5eb 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 2943/5754] 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 3248e3678d..eea900124c 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 2944/5754] 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 d83de75282..72d3c3f481 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 6011a67539..8491c005d8 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 2945/5754] 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 1a1ba92c66..8c7327356e 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 f4daf56124..0000000000 --- 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 0b222f2659..0000000000 --- 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 eea900124c..28f5a0789c 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 2946/5754] 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 27a5470ca3..e5c838c0af 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 985e7b1710..292e652fb0 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 2947/5754] {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 dcfc31ac8b..de08f755f6 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 fb2bfebd61..066edd9a7d 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 deb3067b60..0c0b365473 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 2948/5754] 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 169fad2807..f5fc8d6868 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 0e8d74cfcd..52e5c50cd2 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 2949/5754] 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 2298534d91..2289442a72 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 fc1d9ed681..04aa612256 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 2950/5754] 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 87cc170617..32b39d6a1b 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 52ac13b7d0..70f449037d 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 2951/5754] 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 e6775c47e7..74b3a654b5 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 26deeefa34..efb46c0feb 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 2952/5754] 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 39aa23a973..012317db3d 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 353f06156e..44edba6007 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 2953/5754] 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 fa8e96959b..70af121d28 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 33b32b5d94..cbc612f4f3 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 2954/5754] 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 d87e2742d3..b6b183c2d1 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 b3360d3c3b..e86fec29f4 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 2955/5754] 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 3ee83f64c6..e623d8b439 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 12da353f2e..75aae858b7 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 2956/5754] 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 a4cce974de..eeb5a142f9 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 aea6779579..8465d932c3 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 2957/5754] 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 e623d8b439..b17193a12c 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 2958/5754] 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 eeb5a142f9..725cf62b2c 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 8465d932c3..aeca36bc68 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 2959/5754] 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 21a0b30d3b..eb63b7c013 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 2960/5754] 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 8018c9fab1..c44e246773 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 f7211ef112..7431d80cc4 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 2961/5754] 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 36f9b9c1e4..007f645f51 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 645cfb7696..a90d1f005e 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 2962/5754] 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 ea03526c99..e7331d5ba0 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 c6bc0673f6..1f4bcaf341 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 2963/5754] 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 a21c767006..f1a853a6f8 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 f0803cab36..6647b77c5a 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 35d003fa33..e7ff155618 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 2964/5754] 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 5edfc79113..93462afa60 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 894b231445..2b4279c308 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 2965/5754] 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 ea26a31075..9353c1ae90 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 9f34e1f5fb..629d9c26ce 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 2bc0b961eb..149ad54fc5 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 a59db73314..9ecc50b1ae 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 b43281c7eb..1c82cd7cf8 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 8bc3687921..9c1dbe8694 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 2966/5754] 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 29bf5124b6..a86ebf2f68 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 ca2035b6b3..bc0dbcbf45 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 2967/5754] 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 0000000000..444896b53f --- /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 2968/5754] 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 c9d4a31ede..fbc273fffc 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 2969/5754] 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 0000000000..52b496f054 --- /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 42c732b973..a76c1ffb5f 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 2970/5754] 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 abd34bca50..5a0f0277b0 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 2971/5754] 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 e652742f25..fea8530518 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 68bfb085f7..0000000000 --- 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 8e51e68ac2..f95dc2e7b0 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 e7a771c6b2..0ffdd98283 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 2972/5754] 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 688c86243a..5f0e06ef30 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 8332b89605..8f8ba4837f 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 2973/5754] 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 b95c0448b0..a3b98b0f8c 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 e9e7c5a278..e859f479bb 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 2974/5754] 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 e8429d203b..c92af7a957 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 5e880d5427..5a3ffab732 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 91f0f826d5..3349bfd4e1 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 2975/5754] 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 3ae72564cc..46e538776d 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 7ba9537dd8..31bbfddfaa 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 a1cec90de2..f8c239d816 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 2976/5754] 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 cf213d8b52..b38bfcff47 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 c42b005abe..5434f69a40 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 2977/5754] 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 db0ea49f90..413054ab84 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 5449884809..41ff89726c 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 0000000000..9c215dc9ce --- /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 0000000000..e09ecda8a9 --- /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 0000000000..f6dd9d0ac3 --- /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 2978/5754] 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 413054ab84..eba7c4aa34 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 41ff89726c..b21a2f8c65 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 0000000000..54fa539dab --- /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 0000000000..24c0697784 --- /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 0000000000..68f7c1c04d --- /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 2979/5754] 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 c7ee2a8db0..c3abd662f3 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 8f3d224417..67573909a3 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 2980/5754] 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 c3abd662f3..6be05ef4b5 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 67573909a3..f86140f17e 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 2981/5754] 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 b876f1948e..0c7ed41c46 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 028236d2ed..cc29f5523f 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 2982/5754] 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 f9fb2a2ad0..98a7520486 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 4a01bb17b2..c32089f551 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 2983/5754] 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 5434f69a40..20b248364d 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 2984/5754] {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 de08f755f6..90ab048055 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 066edd9a7d..d62fc7de09 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 0c0b365473..7e67dfad5c 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 2985/5754] 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 e3b415ad4d..2e993bc887 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 3b4c65d3e3..943ed9b8bc 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 2986/5754] 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 3c2b7d803b..0fb9996d39 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 c7f3a94d9a..6e338a7be3 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 2987/5754] 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 3de3a72e0c..105902303e 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 2988/5754] 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 34d4b10e29..17918ee7bb 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 f49258ecb5..186854a14c 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 2989/5754] 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 ae88b672a6..4c74c7dfb6 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 9e8ff94156..7bd86ff159 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 2990/5754] 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 2593324bc1..e4e84f1cef 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 1103772768..d787c882b3 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 2991/5754] 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 0000000000..c7fdd8be36 --- /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 2992/5754] 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 af929003db..72bf72719c 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 2993/5754] 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 eba7c4aa34..3af43d2d27 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 0000000000..506d10824c --- /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 0000000000..cae025dbdb --- /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 2994/5754] 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 84166958bb..4d2135a3c6 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 2995/5754] 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 0000000000..36bdaa4978 --- /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 6fb34a0dae..8d53ced300 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 4d2135a3c6..87ecad5b52 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 2996/5754] 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 7848bb6faf..1761494c3a 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 29cb00bb8a..a9c9283660 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 2997/5754] 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 9b500f3701..26d0a0c223 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 54cddc3914..42a9ec59d1 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 0000000000..782fe855b4 --- /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 0000000000..9e51e90593 --- /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 0000000000..b965726292 --- /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 2998/5754] 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 a9c9283660..8acba9270a 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 2999/5754] 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 0000000000..478759e0cc --- /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 5524bfc420..4c6017a5f5 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 3000/5754] 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 93681e04af..bb07b2ee6a 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 4c6017a5f5..776fb4d566 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 3001/5754] 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 922f468a67..ee1776b44f 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 fa58f65797..61dfd54dcd 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 3002/5754] 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 35ad7bede2..040767930e 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 3003/5754] 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 0000000000..357c6f2f12 --- /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 2af86ecb18..f4a4c97d2a 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 3004/5754] 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 f5a114c2f3..aa274314eb 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 3005/5754] 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 6e6d787d27..37eb974c46 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 3006/5754] 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 c25002ba70..1cf411b391 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 9af489ef1a..4f5dd40231 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 bd3957d6c2..25d4e836bb 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 3007/5754] 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 0000000000..f7484931e8 --- /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 3008/5754] 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 826a66ebd5..af20cc9bca 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 3009/5754] 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 b17193a12c..260e883973 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 8c7327356e..d017b7e0eb 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 725cf62b2c..46db748c82 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 aeca36bc68..2983d385b2 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 75aae858b7..340d931d1a 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 3010/5754] 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 2983d385b2..1eeb162e10 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 3011/5754] 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 d017b7e0eb..19bd826834 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 3012/5754] 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 061999464e..7a8b17d3f3 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 22cd2c58ed..a8f47254a4 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 3013/5754] 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 95050be88b..5d8c1b0f59 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 4c38e7cba5..53c9ddb6b8 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 3014/5754] 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 33399f5166..bd401c6a80 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 3015/5754] 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 2289442a72..be8af438b3 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 04aa612256..aa5d7f97b5 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 3016/5754] 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 ab3aecdaa3..6bfaf6640f 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 02cc1e6c7a..b8ff7ccc5c 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 836949a917..ede0980629 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 3017/5754] 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 a19453ca88..4062d0cb9a 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 6fe09ad3bd..0000000000 --- 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 3651f5a0d3..0000000000 --- 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 bce8ac0c9a..159a157a49 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 981f8274a9..7e58234d1f 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 3018/5754] 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 3aae4120d2..4a5eadf803 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 d381c9054f..b8eeb9de7c 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 3019/5754] 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 4062d0cb9a..c407581d2c 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 9b94cb7e4f..0000000000 --- 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 99ffe87f46..084de7750a 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 a89f0978af..89054f5f7c 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 3020/5754] 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 7e918c17f6..162d25f795 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 068fbb786b..f92a8ddf4c 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 3021/5754] 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 c3eb49fbe7..be15237f7d 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 c35ad4f5d0..a348fb9d44 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 3022/5754] 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 acca6e1d49..0000000000 --- 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 5babce94b4..0000000000 --- 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 f43e2c8b51..122636913c 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 a70a2e7ae1..84cc373bb7 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 3023/5754] 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 3fbb0b24c8..69e0b92071 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 b79ac04179..e7955a2c07 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 3024/5754] 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 fa92ee82ed..2509e6e2ee 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 9429d4afee..c5a1e10ebc 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 3025/5754] 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 b4d14c5a30..4fa5dfbc16 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 39a422e25d..e825e3146f 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 3026/5754] 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 82d1d14ba3..f2e89b8a92 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 f3567a4305..29deb2af47 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 3027/5754] 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 8f9700bf5c..d3fe0dbec1 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 3028/5754] 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 9bd55cb76a..4b61e40c6d 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 3029/5754] 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 6daf4657dd..648058fcbe 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 3030/5754] 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 aa8b3ac497..0f2269986e 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 a32641e09d..fe7bcbc36e 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 3031/5754] 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 3e73572a80..c6a38f3180 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 cc13bf741d..0b4eb17c99 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 11f09fe7d1..44c980ac95 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 3032/5754] 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 df5e8d723a..23bfda8474 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 e344cc7ad9..da452af8e9 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 3033/5754] 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 df1a408421..28d805f8ec 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 1b26f9e5e2..72b71ce12d 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 84905d2e0a..ea4a5a62e5 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 3034/5754] 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 0000000000..ea4eb66190 --- /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 0000000000..556854a9e2 --- /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 3035/5754] 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 648058fcbe..a7410d61fa 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 0000000000..3d8c4fc94c --- /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 3036/5754] 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 a7410d61fa..a0e2dcca27 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 0000000000..b6264d34df --- /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 3037/5754] 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 a0e2dcca27..d72dce866f 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 0000000000..28a33bab03 --- /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 3038/5754] 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 2e5fa8865f..8e416f98f6 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 d8fcb4a2c6..0d0e8e56dd 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 3039/5754] 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 e6e9c4ec96..c43d3aabbc 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 b109578a35..d2ffaafc43 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 3040/5754] 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 d72dce866f..7fae4841e4 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 2ed37b67b8..e8dbadadf3 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 0000000000..d5d233b7ab --- /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 0000000000..0ab347b3e0 --- /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 0000000000..aacda14789 --- /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 0000000000..fe616490f7 --- /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 0000000000..56c55f9c4d --- /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 0000000000..d06af29397 --- /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 0000000000..48c46e41f7 --- /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 3041/5754] 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 c407581d2c..dd29e06113 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 caa4ed7d78..0000000000 --- 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 a71cec1e38..556f1d3b42 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 eb63b7c013..02d8462212 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 3042/5754] 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 556f1d3b42..5c47db76d5 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 02d8462212..036103b7fc 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 3043/5754] 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 ffdc2a7568..5eadc89753 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 dab5d542eb..f58dbe43de 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 3044/5754] 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 cfd72dd2a6..37276cc93d 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 17df001cef..a059d41cb8 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 3045/5754] 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 39f02ea04a..39ab2b6545 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 91b39f6fa4..d33d3a1b77 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 3046/5754] 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 dd29e06113..f34df29bfc 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 dd17b10e4f..0000000000 --- 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 4eb4cd09d2..0b02a35792 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 ae777c6d30..c68d466116 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 3047/5754] 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 1f0d9befa1..8791899a4a 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 6d52c52a85..43c559ed1b 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 3048/5754] 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 0d0b6ac1b9..1bdb545cbc 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 9da9c30293..7f88c40024 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 3049/5754] 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 7a17fa5c12..0000000000 --- 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 444896b53f..0000000000 --- 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 3050/5754] 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 e7d0d23e49..469360b801 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 3051/5754] 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 0000000000..967bbaf3fe --- /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 0000000000..4c79c3448f --- /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 3052/5754] 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 dc36fa58d6..ea0e5bf8d0 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 8de777dce2..163a5d36fc 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 049f8c2fc2..578bb7a3e2 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 2a27aa5056..06c8993391 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 3053/5754] 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 f34df29bfc..bf8df8cef5 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 f9e493a761..0000000000 --- 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 8bd0383683..0000000000 --- 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 c2aa538d02..0000000000 --- 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 be8d57affa..0000000000 --- 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 96befd53d8..0000000000 --- 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 19c47cca90..0000000000 --- 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 82e693f35f..0000000000 --- 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 74d3085d08..0000000000 --- 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 c576f65cdb..4dc040645e 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 b970de48f2..0def282c02 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 3054/5754] 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 b7563d8bac..a00e95437b 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 187fefea64..c3155a13ff 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 3055/5754] 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 48c46e41f7..cbcbed29de 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 3056/5754] 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 4a13579fca..13edba6d24 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 3057/5754] 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 9c6c2829cf..65e64a02f7 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 3058/5754] 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 60424c0de6..208fa24e27 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 3059/5754] 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 a50f19d7f2..5feb1e5bc2 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 412e31c652..91b99aaa87 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 0b62cf1bed..824d58d1d1 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 3060/5754] 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 90a7d6c1ec..265685eff5 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 3061/5754] 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 1a1c315f73..729c553f8f 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 3062/5754] 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 bf8df8cef5..fde8eceed2 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 729c553f8f..6654d98a00 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 3063/5754] 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 a3cfa8dacf..06e48cdd50 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 a917331580..6841ed5eb1 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 39433185b4..ff5aaee429 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 3064/5754] 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 ed75b09816..bd6c87d56e 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 a666757449..99d63432a4 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 3065/5754] 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 d06af29397..5095d3c3b8 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 3066/5754] 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 fb83fa01d5..2c933929cf 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 3067/5754] 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 0000000000..05d882a07a --- /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 dd6f8dcf5d..d4abfade81 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 3068/5754] 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 0d0e8e56dd..aacfc74b53 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 3069/5754] 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 0000000000..b856b00728 --- /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 3070/5754] 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 ecd339d83d..df72ee4d76 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 c2d02289ad..6790bf0c96 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 3071/5754] 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 60a32022e6..c9b9c8be8d 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 0e344550d3..b86d7e83f0 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 3072/5754] 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 d40315a3af..8010b857f0 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 6f3b8069e6..8fe9e648a7 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 3073/5754] 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 0000000000..670552535a --- /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 36de2b9b06..14403758ac 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 d432ab48cc..9b1baec5bf 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 3074/5754] 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 e8eedb8921..6a3e3465b8 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 88f8f60257..59f1d1e316 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 3075/5754] 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 30ce6d9c0b..7e00990174 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 ebc9f89cf7..7a46d759d3 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 3076/5754] 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 fde8eceed2..4769adf6cd 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 339afbf416..0000000000 --- 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 f2b38a137d..0000000000 --- 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 7827a654ef..0000000000 --- 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 39d29425d3..da41c3979e 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 8bd83aa20d..59eb4c5070 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 3077/5754] 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 6b4c9d8d0a..c8f98d10ea 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 f603327bf6..47c110eb53 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 3078/5754] 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 4769adf6cd..dfeaaf46eb 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 1afb05520d..0000000000 --- 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 de247c2660..f7006ff10e 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 65d68181ee..11b5788b45 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 3079/5754] 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 969e4cd3d7..adc543059b 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 38a1564a63..33cb4bd507 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 3080/5754] 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 dfeaaf46eb..73a00d610c 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 14f615e2e7..0000000000 --- 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 55314cfdd3..02268f55ea 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 01c511819d..6f71ef796f 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 3081/5754] 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 c61937306a..ef518cd238 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 3082/5754] 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 5556eae890..1e60e0f825 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 3083/5754] 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 222f78b86c..4c648a6abb 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 ecaad05e25..158f0faa96 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 23b3cc9442..7071e1fd1b 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 3084/5754] 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 f38d93c04a..665023d87b 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 8dc60b043e..6102c92bd8 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 3085/5754] 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 df472e087d..4060b95e9b 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 a2c3f16129..358ef42b6e 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 3086/5754] 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 0f204bcf79..a7b57459f1 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 3087/5754] 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 39f172a82b..74790a51a0 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 6dc6f970ea..2b7ac04f02 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 3088/5754] 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 9bbc9ea2d2..c8f9a6eb5b 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 3089/5754] 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 c648a85c04..7f79b94d8d 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 27277163d2..326d951a32 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 3090/5754] 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 6198a46608..f6cc1d2413 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 6bf7e33577..5c5efd819c 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 3091/5754] 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 26a25bd9f8..c564d8a342 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 3092/5754] 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 9fca594db5..c57145b835 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 d264e2cdc9..198b36d5fe 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 3093/5754] 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 aae230dac2..8462e19d39 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 9532774ae8..ed3c3f2f93 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 3094/5754] 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 dce258c0f9..83382bfb29 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 1456d5600d..737406c9ab 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 3095/5754] 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 593bbd4276..e520cefee7 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 3096/5754] 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 e520cefee7..ede03d024c 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 3097/5754] 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 14f817942e..0000000000 --- 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 29deb2af47..50807f8c6a 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 3098/5754] 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 02f7d84246..818113585e 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 5bcf559a6e..2db36156b8 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 3099/5754] 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 bed561b562..7f88250418 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 87f6de8510..547f874288 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 322ba0e12a..2df6dd9b11 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 3100/5754] 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 78bce76585..8c4aae3c1c 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 c5e4e4a14e..09f547a091 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 3101/5754] 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 26bc913b8a..024c014bc9 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 bb6d4a8d27..b8b50cb91a 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 3102/5754] 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 2b82a1938b..109ea3d79c 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 97754b63d0..843d58a4ae 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 3103/5754] 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 acf5e45157..968b351b41 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 830b241f74..dfa7a7c694 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 3104/5754] 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 9c42159afb..294104b284 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 3105/5754] 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 1b69034459..f6a1ec7c66 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 3106/5754] 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 98ee3bdc71..41e1da2962 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 22ac0334fd..4f1a80ba8b 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 3107/5754] 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 42bf5967e1..371d20a632 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 7a3d6460e9..dd4cf43c6a 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 3108/5754] 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 0000000000..ef93e0901b --- /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 b6616f0c10..cbd509cfea 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 3109/5754] 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 20048da7ec..74390c2ff5 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 2b8920efa6..63a92090f3 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 3110/5754] 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 4822f9152f..de8f18747a 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 cae1433e39..6058631696 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 3111/5754] 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 f1fa0541a1..adb9f22488 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 843d58a4ae..1943bc7b27 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 3112/5754] 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 8b4c14207e..8d220f88f4 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 3113/5754] 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 6598f51f53..f044f99483 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 80a986cfa3..500bdbb77a 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 3114/5754] 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 20fd262c93..e4ab39a2bd 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 0d41548ed0..070598b385 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 3115/5754] 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 8404675e30..d5e0ef4517 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 c4a6d854c3..0591400709 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 3116/5754] 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 7fae4841e4..e8b78a8d46 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 0000000000..ae94e80a92 --- /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 0000000000..0398f24ceb --- /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 3117/5754] 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 98f822c55c..76b037f436 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 3118/5754] 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 b1752f1c68..d018428d19 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 d27c76e63f..8d03635743 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 3119/5754] 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 0000000000..af69cd3670 --- /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 2e4b6ac750..77c8faccbe 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 8a39d4b695..161521f970 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 3120/5754] 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 b934ab3190..618b5b9278 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 3121/5754] 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 19224000bb..911d16822b 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 3122/5754] 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 80090621bf..7491f4c067 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 3123/5754] 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 12cd2e639b..1a2ad8fea0 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 d01b608d99..2fc2f734c8 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 3124/5754] 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 0000000000..079f960b59 --- /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 32f0fdaa8b..823bc50102 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 3125/5754] 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 73a00d610c..8acd9558eb 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 01d5776596..0000000000 --- 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 05913862f6..0000000000 --- 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 6dead5457c..a35e6bc36c 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 7cc950beb6..a47bfa7e84 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 3126/5754] 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 0ef549426e..7616d3eb0c 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 3127/5754] 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 36436c0b27..bc7dc4443c 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 ecb00077d6..4bc1b69fa0 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 3128/5754] 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 20566345c6..e1fe1ec191 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 73eda5c171..72126adb00 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 3129/5754] 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 8791899a4a..3f601d29ee 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 43c559ed1b..9a9859c133 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 3130/5754] 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 fccb4ea420..b54d0229fc 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 ed82131dd3..3fbff5f4d8 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 3131/5754] 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 3cc64be176..79a51a8230 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 3132/5754] 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 8256b1a254..b0cadf1b1f 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 3133/5754] 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 828dfdd6e1..0c1208c6fe 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 3134/5754] 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 d4be2e4e8f..73547a7537 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 3135/5754] 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 5f8fa5b58d..cfe5e1ee6e 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 3136/5754] 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 80d7495b00..690a5952ba 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 3137/5754] 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 12c090ba3e..619a22c3b3 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 3138/5754] 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 8550a57939..812d2dc017 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 4148180adf..2fb98245a3 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 3139/5754] 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 158f0faa96..06aa5ccc80 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 3140/5754] 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 c0ce0cc352..03c71db8a5 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 2a666cae17..91c041f6f2 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 3141/5754] 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 bca66a7436..c2c5125678 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 95a67f304e..d9f6fba861 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 3142/5754] 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 b29e83773b..635090fae7 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 b463cf9ffe..5a6e7733be 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 3143/5754] 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 4591cb5e48..25d756f72c 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 a6dd15a8d2..5b1dcf44a8 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 a53253228e..c252ede818 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 3144/5754] 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 2281bd5fe5..6aa6d0235d 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 8f09fd72a8..62eda6ec99 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 3145/5754] 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 2e650a1257..941aadf4eb 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 672fb17be8..43e1ad6b61 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 3146/5754] 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 cbd509cfea..63b50e340d 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 3147/5754] 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 20a7cd07ef..9cba243372 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 3148/5754] 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 43c802fa44..42e1afa8c5 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 3149/5754] 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 3946605556..ce0f7e7b77 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 3150/5754] 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 eaf505dc49..377396d986 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 3151/5754] 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 8acd9558eb..f8aaf41af9 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 7a7d959cd2..b7b776ad5d 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 3152/5754] 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 73be230201..35e752ea54 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 ba98337d5d..012c82682c 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 3153/5754] 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 142d15644d..a0028a4e2f 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 2f3b405f93..61900bb957 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 3154/5754] 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 b533792f8f..88a6a06df2 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 6e4af3d670..580ddca5da 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 3155/5754] 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 46e538776d..5befe50122 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 f8c239d816..0cd1f30c16 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 3156/5754] 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 5557f4aee6..67dfe643b2 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 3157/5754] 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 b1763d6c73..f6e7b036bb 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 3158/5754] 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 0000000000..8f188af07c --- /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 3159/5754] 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 63ccd57db7..512e948ca2 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 4ef5612b57..00692fe78a 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 cdd73a672f..e23b2c5fe0 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 434cb3b459..d6aff8b6f7 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 6e96f85f32..3a724acebb 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 11d8ac7ebc..6972a5f8a6 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 34d139125d..d17b5e89aa 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 b3fb275091..c9a05111cb 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 ecc705b17e..103a4ac4aa 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 92abc9cb25..4191936113 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 4dd16fa2b0..0b5f5370e4 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 3160/5754] 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 0000000000..d1e0db6b56 --- /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 3161/5754] 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 94f1c64496..15fe36aef0 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 3162/5754] 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 0000000000..3fa23b215b --- /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 756ac13ec2..7f50f1aa7b 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 32f6102797..71599477f2 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 3163/5754] 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 71599477f2..bb6df3d592 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 3164/5754] 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 fb80841998..fe0ece238e 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 0f60eb8aca..1f2b575b29 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 3165/5754] 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 e770d2b924..ff4cddaf91 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 3166/5754] 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 0000000000..ddc5329299 --- /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 4b536d8117..3773ad293c 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 3167/5754] 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 3773ad293c..94bfc59702 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 3168/5754] 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 0000000000..649ec56042 --- /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 836d740788..707f8663a4 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 4e16a53a35..650f0992de 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 562b09012b..5d30f4884b 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 3169/5754] 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 fb98ba04f0..4c322aeb85 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 3170/5754] 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 f8aaf41af9..0250805be1 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 01e1878189..0000000000 --- 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 82249a2076..0000000000 --- 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 9935575567..2edd97bed4 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 24db641446..f97d547fd7 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 3171/5754] 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 fe629ada21..4e70bd71a3 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 3172/5754] 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 5dbf984735..e70d3fe137 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 95133d3de9..a88ec5909f 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 f86140f17e..2a10f92c2a 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 3173/5754] 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 1c82cd7cf8..9126175977 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 9c1dbe8694..b69ef032f2 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 3174/5754] 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 499bbb2ae4..0000000000 --- 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 f6735cd540..a6d9c7dbdc 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 70f4c969d5..5dfcd1e861 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 3175/5754] 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 97c4729bf9..145c9da017 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 44cd928e45..0ace406286 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 20fe65afe6..7487e3c2bb 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 3176/5754] 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 b9dba9e91a..2fffe8701f 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 fd796cfd6a..9e9d5d698c 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 3177/5754] 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 e46a0522f8..b7b6fe3bbc 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 4b2f5907ea..4f0fa68aa9 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 3178/5754] 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 7036df57a8..e42bb577a8 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 4b17784f93..2933401cbc 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 3179/5754] 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 5c7ba322b2..8cd3356dce 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 0b64cb0d6f..679fd4db98 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 3180/5754] 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 35f25c0066..8b1ae5b4a6 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 a0c775e37c..3bb2c4bffb 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 3181/5754] 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 696e8e1d6c..9c59413eb1 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 3182/5754] 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 0250805be1..72fd5ac404 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 0423179d93..0000000000 --- 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 9fd651cae8..de75cbf1e9 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 e5b965b80d..00370a339a 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 3183/5754] 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 e1083f47f7..48222d089b 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 3184/5754] 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 d9d6244f10..25d017a84f 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 3185/5754] 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 260e883973..4fc069a68d 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 3186/5754] 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 1eeb162e10..56247e90d5 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 3187/5754] 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 4fc069a68d..2d18c32f24 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 3188/5754] 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 56247e90d5..02c176e7cc 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 3189/5754] 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 46db748c82..65d048d450 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 02c176e7cc..a4cb7dd586 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 3190/5754] 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 4b2e4d9cd3..dde33bb9b6 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 ce42aee4e8..840a7283d2 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 3191/5754] 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 72fd5ac404..cb1d333fe3 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 2aa4f4516b..0000000000 --- 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 c31ec90596..0ffeca603a 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 14af07e6d5..fc2995979d 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 3192/5754] 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 04b658e8d8..abf117a572 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 b86e8c128a..e5c576ef2c 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 3193/5754] 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 e258382c53..550b9fffac 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 23734ca7d7..d797b82e65 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 3194/5754] 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 2f482ca434..6ed24b6d3c 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 23fbae10a9..b98da4267a 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 3195/5754] 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 b6b183c2d1..ccc3c2c205 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 e86fec29f4..8e31ca749b 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 3196/5754] 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 36487d998e..6d5f7c3dca 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 b39acb0fcf..3c9efe132f 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 3197/5754] 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 f522c1ef67..36db67191d 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 d6434735cf..8235fac797 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 3198/5754] 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 fc3cf1a520..fdba9518c7 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 ccf86f93cd..1c406879e3 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 3199/5754] 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 7a5fb0e140..c32b856de9 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 3857ab833d..176f6dab3a 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 3200/5754] 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 cb1d333fe3..f7e82ed9e2 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 5d2a5a4efa..0000000000 --- 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 17d34a0823..0000000000 --- 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 3b65ae1d6c..0000000000 --- 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 22c8cdaadf..0000000000 --- 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 2c99236a45..216d07ddbd 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 75d375a2fa..7708ba1e19 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 3201/5754] 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 f7e82ed9e2..95ea697c49 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 5fb13d5eee..002a689601 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 a7d0dfdd00..0000000000 --- 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 dab9b8835d..0000000000 --- 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 78875dde66..c223a14bac 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 7183da6c14..2ebc672d1c 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 3202/5754] {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 90ab048055..7ddcf013f8 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 d62fc7de09..cac7fba207 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 7e67dfad5c..a0bdbe8555 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 3203/5754] {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 cac7fba207..858e615a12 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 a0bdbe8555..ee4e953bf0 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 da6bf5f4c8..d8081f1b9d 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 0f4f5eef2e..556ca7a642 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 3204/5754] 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 7ddcf013f8..8dcc493e2e 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 3205/5754] 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 daf83dda4a..ca80279212 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 858e615a12..bdd27eb600 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 ee4e953bf0..d1023a15e6 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 3206/5754] 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 9f2c8cc1fd..c71f2593d1 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 dddd1a13fd..578a6ab762 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 3207/5754] 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 012317db3d..d2ef168a64 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 44edba6007..435424c5a4 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 3208/5754] 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 70af121d28..fab7ca0eae 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 cbc612f4f3..311ab88b4e 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 3209/5754] 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 95ea697c49..1040dba905 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 50a81a78a4..0000000000 --- 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 4c475ee1ff..0000000000 --- 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 ff2ef55180..0a06595a31 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 b291bd69d9..3d85a59a57 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 3210/5754] 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 1040dba905..2e24f4c27c 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 bd2ef07794..0000000000 --- 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 b49b0e7e3b..729d696d7e 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 d31dcdd5fe..c96dff35fa 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 3211/5754] 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 2e24f4c27c..373b9b1313 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 2a3204fc34..0000000000 --- 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 892aa1da15..0000000000 --- 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 22f894c403..145467c420 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 ac49fe664f..80aa2566b5 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 3212/5754] 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 373b9b1313..b41ab6918e 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 9d54bbf5ef..0000000000 --- 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 9e5401c2b3..6262dab5ae 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 650e3b3b36..28f1e5bc94 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 3213/5754] 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 2d18c32f24..4164bd81f3 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 340d931d1a..a7e3b7456c 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 3214/5754] 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 65d048d450..c1fd38998c 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 6ea27cdacd..1604f08e2f 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 3968/5754] 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 585f4e9380..49b8dba4a9 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 1d42a647ac..250a8810e5 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 3969/5754] 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 046674ac7f..4ba906c95f 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 1604f08e2f..16630b9680 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 3970/5754] 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 49b8dba4a9..a045779c31 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 3971/5754] 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 4ba906c95f..23474159a3 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 16630b9680..e8b10e3a6e 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 3972/5754] 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 64c50dd6f7..742332d552 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 0a89d3a603..a159baa93d 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 3973/5754] 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 4704ac7206..472b9aded2 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 3974/5754] 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 32aaa1cccf..d31d435d79 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 0a1d415dc325ab95f43b750f2ec153db1e9f6ddf Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Fri, 17 Nov 2023 09:17:16 -0700 Subject: [PATCH 3975/5754] package/systemd: bump version to 254.6 Signed-off-by: Adam Duskett Signed-off-by: Yann E. MORIN --- package/systemd/systemd.hash | 2 +- package/systemd/systemd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash index f0c3db60e7..c0f4638803 100644 --- a/package/systemd/systemd.hash +++ b/package/systemd/systemd.hash @@ -1,5 +1,5 @@ # sha256 locally computed -sha256 41873783aa1c680e10d2f2626797a1c2fef8018d69b68c8c77639e140ee7846d systemd-254.5.tar.gz +sha256 1e1e42c597b4f992679aa964a0c5c23d970c58fed47aed65c11878b332dc5b23 systemd-254.6.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 sha256 e5a8645ad94aab24e312dd0c6be2aa54236eb9374480b1b14ea5c61598874fd5 LICENSES/BSD-2-Clause.txt diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index ccc0e14874..4746bda904 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -19,7 +19,7 @@ # - Diff sysusers.d with the previous version # - Diff factory/etc/nsswitch.conf with the previous version # (details are often sprinkled around in README and manpages) -SYSTEMD_VERSION = 254.5 +SYSTEMD_VERSION = 254.6 SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION)) SYSTEMD_LICENSE = \ LGPL-2.1+, \ From 38923639b0aff90d8a179234cd9b3bd6d85d8121 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Fri, 17 Nov 2023 18:54:51 -0700 Subject: [PATCH 3976/5754] 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 17cd3523a6..e8e71b6ab0 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 986a160cbe5c492acfda9bbf2048b1501d570072 Mon Sep 17 00:00:00 2001 From: Saeed Kazemi Date: Fri, 17 Nov 2023 19:32:16 +0100 Subject: [PATCH 3977/5754] package/eza: bump to version 0.16.0 Release notes: https://github.com/eza-community/eza/releases/tag/v0.16.0 Signed-off-by: Saeed Kazemi Signed-off-by: Yann E. MORIN --- package/eza/eza.hash | 2 +- package/eza/eza.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/eza/eza.hash b/package/eza/eza.hash index 39923ceb48..64f46759d7 100644 --- a/package/eza/eza.hash +++ b/package/eza/eza.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 2dac8aa41433eeaa07c4eabdf557b7e134c3fda9ba9edb8ab57959354856e20c eza-0.14.0.tar.gz +sha256 11e6127a615744b52d52d66ebcdf9e5366f62746e8123b3eec00e35a057db988 eza-0.16.0.tar.gz sha256 2762990c7fbba9d550802a2593c1d857dcd52596bb0f9f192a97e9a7ac5f4f9e LICENCE diff --git a/package/eza/eza.mk b/package/eza/eza.mk index a327de0dcc..b11c1a1e7f 100644 --- a/package/eza/eza.mk +++ b/package/eza/eza.mk @@ -4,7 +4,7 @@ # ################################################################################ -EZA_VERSION = 0.14.0 +EZA_VERSION = 0.16.0 EZA_SITE = $(call github,eza-community,eza,v$(EZA_VERSION)) EZA_LICENSE = MIT EZA_LICENSE_FILES = LICENCE From 1cb0853489b8b908c56ff7e770aa940b5ed992ec Mon Sep 17 00:00:00 2001 From: Saeed Kazemi Date: Fri, 17 Nov 2023 19:47:34 +0100 Subject: [PATCH 3978/5754] package/procs: bump to version 0.14.3 Release notes: https://github.com/dalance/procs/releases/tag/v0.14.3 Signed-off-by: Saeed Kazemi Signed-off-by: Yann E. MORIN --- package/procs/procs.hash | 2 +- package/procs/procs.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/procs/procs.hash b/package/procs/procs.hash index 1c2fb5c3d5..19832e3897 100644 --- a/package/procs/procs.hash +++ b/package/procs/procs.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 643b7ba4b769ee9f336d441ecdac779c3d52e5719a15c14bb0acb3609ce1cd99 procs-0.14.0.tar.gz +sha256 2f9fdbcf7324952e22565ded58148fa40387b5a5f8723996620d6c4588925713 procs-0.14.3.tar.gz sha256 feb87a2e0c305de3464cc44077da5393c52d8ca6362d37427157d04ec6f4510d LICENSE diff --git a/package/procs/procs.mk b/package/procs/procs.mk index a074ee1311..8567bf3da3 100644 --- a/package/procs/procs.mk +++ b/package/procs/procs.mk @@ -4,7 +4,7 @@ # ################################################################################ -PROCS_VERSION = 0.14.0 +PROCS_VERSION = 0.14.3 PROCS_SITE = $(call github,dalance,procs,v$(PROCS_VERSION)) PROCS_LICENSE = MIT PROCS_LICENSE_FILES = LICENSE From dbcb9554d561856abefbad5a339b40dd643eb25b Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Thu, 16 Nov 2023 20:33:11 +0100 Subject: [PATCH 3979/5754] package/open62541: bump to version 1.3.8 Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- 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 941aadf4eb..3508cbb146 100644 --- a/package/open62541/open62541.hash +++ b/package/open62541/open62541.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 410603b0e567970d7148c6e9c91ccabeedeb4f32780be859cd2a4aac08cb5b9e open62541-v1.3.7-br1.tar.gz +sha256 41e82d81d2fc9449028dab31fd460df1da29130bcb7388222842e778cf34625c open62541-v1.3.8-br1.tar.gz sha256 fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85 LICENSE diff --git a/package/open62541/open62541.mk b/package/open62541/open62541.mk index 43e1ad6b61..16ef51ed31 100644 --- a/package/open62541/open62541.mk +++ b/package/open62541/open62541.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPEN62541_VERSION = v1.3.7 +OPEN62541_VERSION = v1.3.8 OPEN62541_SITE_METHOD = git OPEN62541_SITE = https://github.com/open62541/open62541.git OPEN62541_GIT_SUBMODULES = YES From 44f138f44087a172c87865563ca6e3392f9e23df Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Wed, 15 Nov 2023 21:31:18 +0100 Subject: [PATCH 3980/5754] package/rtl8723ds: bump to 2023-11-14 version It supports up to Linux 6.7. Signed-off-by: Giulio Benetti Signed-off-by: Yann E. MORIN --- package/rtl8723ds/rtl8723ds.hash | 2 +- package/rtl8723ds/rtl8723ds.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rtl8723ds/rtl8723ds.hash b/package/rtl8723ds/rtl8723ds.hash index e94a7b40ef..f2829d3f04 100644 --- a/package/rtl8723ds/rtl8723ds.hash +++ b/package/rtl8723ds/rtl8723ds.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 672787c3f3d1f795b750cd74de8ca34bb661b8ae60f5aa50fb279ec08ff3f05f rtl8723ds-ec85dc6b9f72bfe413bff464ed01a272e29c8dbe.tar.gz +sha256 4f3006ffc1604854edbd6d25ad468ca57f6bcfd7814e4dab57725f144f00aa94 rtl8723ds-52e593e8c889b68ba58bd51cbdbcad7fe71362e4.tar.gz sha256 cd5c66af63b509ccd75ec85fee41b6e5cbb77cd6bf9392a54900acc0f02be4a6 COPYING diff --git a/package/rtl8723ds/rtl8723ds.mk b/package/rtl8723ds/rtl8723ds.mk index f62ce2bf6c..2536450d80 100644 --- a/package/rtl8723ds/rtl8723ds.mk +++ b/package/rtl8723ds/rtl8723ds.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8723DS_VERSION = ec85dc6b9f72bfe413bff464ed01a272e29c8dbe +RTL8723DS_VERSION = 52e593e8c889b68ba58bd51cbdbcad7fe71362e4 RTL8723DS_SITE = $(call github,lwfinger,rtl8723ds,$(RTL8723DS_VERSION)) RTL8723DS_LICENSE = GPL-2.0 RTL8723DS_LICENSE_FILES = COPYING From 40038a56324cde8cbe9ae8be44f90828498a830f Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Wed, 15 Nov 2023 21:31:17 +0100 Subject: [PATCH 3981/5754] package/rtl8192eu: bump to version 2023-11-13 on branch 5.11.2.1 It supports up to Linux 6.7. Signed-off-by: Giulio Benetti Signed-off-by: Yann E. MORIN --- package/rtl8192eu/rtl8192eu.hash | 2 +- package/rtl8192eu/rtl8192eu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rtl8192eu/rtl8192eu.hash b/package/rtl8192eu/rtl8192eu.hash index 8528689670..e27acba124 100644 --- a/package/rtl8192eu/rtl8192eu.hash +++ b/package/rtl8192eu/rtl8192eu.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 665a8f857b3881554edd6d5e5e6c8f058b8ecfecf921817993e861d48e214d36 rtl8192eu-ac8517206e14f70babbeed68e136ee23c85cba3d.tar.gz +sha256 2326902c27aee022bd1f6e49e8dbf789b08613e660385c23ded8038074d7929b rtl8192eu-a928f08c1dd4f9a1e84d85811a543e974551bc4f.tar.gz diff --git a/package/rtl8192eu/rtl8192eu.mk b/package/rtl8192eu/rtl8192eu.mk index 9ae29d9940..a2fde6fef0 100644 --- a/package/rtl8192eu/rtl8192eu.mk +++ b/package/rtl8192eu/rtl8192eu.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8192EU_VERSION = ac8517206e14f70babbeed68e136ee23c85cba3d +RTL8192EU_VERSION = a928f08c1dd4f9a1e84d85811a543e974551bc4f RTL8192EU_SITE = $(call github,clnhub,rtl8192eu-linux,$(RTL8192EU_VERSION)) RTL8192EU_LICENSE = GPL-2.0 From 00df26337744aadc64b950a9f75ec84ae602c208 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 15 Nov 2023 17:39:02 +0100 Subject: [PATCH 3982/5754] package/lualdap: bump to version 1.4.0 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 97aa3b570e..62d8d20abf 100644 --- a/package/lualdap/lualdap.hash +++ b/package/lualdap/lualdap.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 c1772077ebfd02e082e89583701ef27dd348dc76ae015247f21a2756f5fac0ae lualdap-1.3.1-1.src.rock +sha256 865b915a3ff16b9663b76a77e89ec54a5028ccfe95e85ad704efbaa144a608f8 lualdap-1.4.0-1.src.rock sha256 b9b75da18d1e1147ec47bff508ffdce831da07dc371891b9057cf1c422660af4 lualdap/docs/license.md diff --git a/package/lualdap/lualdap.mk b/package/lualdap/lualdap.mk index 375754180f..a6fc612b79 100644 --- a/package/lualdap/lualdap.mk +++ b/package/lualdap/lualdap.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUALDAP_VERSION = 1.3.1-1 +LUALDAP_VERSION = 1.4.0-1 LUALDAP_SUBDIR = lualdap LUALDAP_LICENSE = MIT LUALDAP_LICENSE_FILES = $(LUALDAP_SUBDIR)/docs/license.md From 3afe877f52e4571500f11a63d000c540d02c6488 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 15 Nov 2023 17:39:03 +0100 Subject: [PATCH 3983/5754] package/lua-testmore: bump to version 0.3.7 diff COPYRIGHT: -Copyright (C) 2009-2021 Francois Perrad. +Copyright (C) 2009-2023 Francois Perrad. Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/lua-testmore/lua-testmore.hash | 4 ++-- package/lua-testmore/lua-testmore.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/lua-testmore/lua-testmore.hash b/package/lua-testmore/lua-testmore.hash index 1f435709f4..634b95c6e6 100644 --- a/package/lua-testmore/lua-testmore.hash +++ b/package/lua-testmore/lua-testmore.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 b3e57955888aba3974d6f5a21219214e2803a38e4623671f7d9d9e0f1851e608 lua-testmore-0.3.6-1.src.rock -sha256 37a3afb014325b98f0ad919cb40bc9d5a948120e5260e75b9d00c198d350da6d lua-TestMore-0.3.6/COPYRIGHT +sha256 acef148e10e312f262d9390c3cdbb9fdd3d5541f0dbeb4c35b8c37fbf95cb52f lua-testmore-0.3.7-1.src.rock +sha256 7cb577fd111373b813a9ec47e43c30cb318b771290e0b60e780b6a710116888d lua-TestMore-0.3.7/COPYRIGHT diff --git a/package/lua-testmore/lua-testmore.mk b/package/lua-testmore/lua-testmore.mk index e3cc7b7bdb..aaf2c13069 100644 --- a/package/lua-testmore/lua-testmore.mk +++ b/package/lua-testmore/lua-testmore.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_TESTMORE_VERSION = 0.3.6-1 +LUA_TESTMORE_VERSION = 0.3.7-1 LUA_TESTMORE_NAME_UPSTREAM = lua-TestMore LUA_TESTMORE_LICENSE = MIT LUA_TESTMORE_LICENSE_FILES = $(LUA_TESTMORE_SUBDIR)/COPYRIGHT From d82a063ae981f434d55735bf63a117847f889208 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 16 Nov 2023 07:12:29 +0100 Subject: [PATCH 3984/5754] 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 4a0ccb2467..046d234d71 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 d9bf682b38..7e667ae1aa 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 6a172ffe6b2aa5c59427696775cfa4c189f99c19 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Tue, 14 Nov 2023 21:40:12 +0100 Subject: [PATCH 3985/5754] package/openblas: bump to version v0.3.25 For change log since v0.3.24, see: https://github.com/xianyi/OpenBLAS/releases/tag/v0.3.25 Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- 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 8e416f98f6..d946ae7296 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.24 -md5 23599a30e4ce887590957d94896789c8 openblas-0.3.24.tar.gz +# From https://github.com/xianyi/OpenBLAS/releases/tag/v0.3.25 +md5 48384e324cd1cdcfbdb0d2e16ca55327 openblas-0.3.25.tar.gz # Locally calculated -sha256 ceadc5065da97bd92404cac7254da66cc6eb192679cf1002098688978d4d5132 openblas-0.3.24.tar.gz +sha256 4c25cb30c4bb23eddca05d7d0a85997b8db6144f5464ba7f8c09ce91e2f35543 openblas-0.3.25.tar.gz sha256 190b5a9c8d9723fe958ad33916bd7346d96fab3c5ea90832bb02d854f620fcff LICENSE diff --git a/package/openblas/openblas.mk b/package/openblas/openblas.mk index aacfc74b53..76833121a9 100644 --- a/package/openblas/openblas.mk +++ b/package/openblas/openblas.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENBLAS_VERSION = 0.3.24 +OPENBLAS_VERSION = 0.3.25 OPENBLAS_SITE = https://github.com/xianyi/OpenBLAS/releases/download/v$(OPENBLAS_VERSION) OPENBLAS_LICENSE = BSD-3-Clause OPENBLAS_LICENSE_FILES = LICENSE From aea790392af5358568a4f1c5d2dd9f1adfb29109 Mon Sep 17 00:00:00 2001 From: Michael Nosthoff Date: Mon, 13 Nov 2023 22:27:06 +0100 Subject: [PATCH 3986/5754] package/libabseil-cpp: bump to version 20230802.1 abseil and other google tools are now subject to "Google's Foundational C++ Support Policy" [0][1]. This currently mandates gcc 7.3.1 and C++14 as minimum versions. Since we don't have guards for patch versions of gcc 7 use gcc 8 as minimum. [0] https://github.com/abseil/abseil-cpp/releases/tag/20230125.0 [1] https://github.com/google/oss-policies-info/blob/b842c39db88e6569dfe2cf98be434b03507cb503/foundational-cxx-support-matrix.md Signed-off-by: Michael Nosthoff Signed-off-by: Yann E. MORIN --- package/collectd/Config.in | 6 +++--- package/falcosecurity-libs/Config.in | 2 +- package/grpc/Config.in | 6 +++--- package/libabseil-cpp/Config.in | 6 +++--- package/libabseil-cpp/libabseil-cpp.hash | 2 +- package/libabseil-cpp/libabseil-cpp.mk | 6 +++--- package/sysdig/Config.in | 6 +++--- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/package/collectd/Config.in b/package/collectd/Config.in index a431da79f1..d3b686771d 100644 --- a/package/collectd/Config.in +++ b/package/collectd/Config.in @@ -683,15 +683,15 @@ config BR2_PACKAGE_COLLECTD_GRPC depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC # grpc depends on BR2_INSTALL_LIBSTDCPP # grpc -> protobuf depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # grpc -> protobuf - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # grpc -> libabseil-cpp + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # grpc -> libabseil-cpp depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS # grpc select BR2_PACKAGE_GRPC help Send/receive values using the gRPC protocol. -comment "grpc needs a toolchain w/ C++, gcc >= 5" +comment "grpc needs a toolchain w/ C++, gcc >= 8" depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_8 depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS # grpc diff --git a/package/falcosecurity-libs/Config.in b/package/falcosecurity-libs/Config.in index f101883384..028a0ed28b 100644 --- a/package/falcosecurity-libs/Config.in +++ b/package/falcosecurity-libs/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_FALCOSECURITY_LIBS depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf depends on BR2_LINUX_KERNEL depends on BR2_INSTALL_LIBSTDCPP # jsoncpp, protobuf, tbb - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # grpc, gtest + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # grpc -> libabseil-cpp depends on BR2_TOOLCHAIN_HAS_THREADS # jq, protobuf, tbb depends on !BR2_STATIC_LIBS # protobuf, tbb depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC # grpc diff --git a/package/grpc/Config.in b/package/grpc/Config.in index db6425819b..afe0ea8450 100644 --- a/package/grpc/Config.in +++ b/package/grpc/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_GRPC depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS # protobuf, re2 depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # libabseil-cpp depends on !BR2_STATIC_LIBS # protobuf, libabseil-cpp depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS @@ -19,9 +19,9 @@ config BR2_PACKAGE_GRPC http://github.com/grpc/grpc -comment "grpc needs a toolchain w/ C++, threads, dynamic library, gcc >= 5" +comment "grpc needs a toolchain w/ C++, threads, dynamic library, gcc >= 8" depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \ - || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 + || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_8 depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS diff --git a/package/libabseil-cpp/Config.in b/package/libabseil-cpp/Config.in index 45f339ff26..7b65ec40d0 100644 --- a/package/libabseil-cpp/Config.in +++ b/package/libabseil-cpp/Config.in @@ -18,7 +18,7 @@ config BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS config BR2_PACKAGE_LIBABSEIL_CPP bool "libabseil-cpp" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # C++14 depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS # uses dlfcn.h depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS @@ -31,7 +31,7 @@ config BR2_PACKAGE_LIBABSEIL_CPP https://github.com/abseil/abseil-cpp -comment "libabseil-cpp needs a toolchain w/ gcc >= 4.9, C++, threads, dynamic library" +comment "libabseil-cpp needs a toolchain w/ gcc >= 8, C++, threads, dynamic library" depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ - BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_8 diff --git a/package/libabseil-cpp/libabseil-cpp.hash b/package/libabseil-cpp/libabseil-cpp.hash index 808bdbab29..c3fc0d85e1 100644 --- a/package/libabseil-cpp/libabseil-cpp.hash +++ b/package/libabseil-cpp/libabseil-cpp.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 91ac87d30cc6d79f9ab974c51874a704de9c2647c40f6932597329a282217ba8 libabseil-cpp-20220623.1.tar.gz +sha256 987ce98f02eefbaf930d6e38ab16aa05737234d7afbab2d5c4ea7adbe50c28ed libabseil-cpp-20230802.1.tar.gz sha256 c79a7fea0e3cac04cd43f20e7b648e5a0ff8fa5344e644b0ee09ca1162b62747 LICENSE diff --git a/package/libabseil-cpp/libabseil-cpp.mk b/package/libabseil-cpp/libabseil-cpp.mk index ceda106b7d..a5dfc8eb19 100644 --- a/package/libabseil-cpp/libabseil-cpp.mk +++ b/package/libabseil-cpp/libabseil-cpp.mk @@ -4,19 +4,19 @@ # ################################################################################ -LIBABSEIL_CPP_VERSION = 20220623.1 +LIBABSEIL_CPP_VERSION = 20230802.1 LIBABSEIL_CPP_SITE = $(call github,abseil,abseil-cpp,$(LIBABSEIL_CPP_VERSION)) LIBABSEIL_CPP_LICENSE = Apache-2.0 LIBABSEIL_CPP_LICENSE_FILES = LICENSE LIBABSEIL_CPP_INSTALL_STAGING = YES LIBABSEIL_CPP_CONF_OPTS = \ - -DCMAKE_CXX_STANDARD=11 \ + -DCMAKE_CXX_STANDARD=14 \ -DABSL_ENABLE_INSTALL=ON \ -DABSL_USE_GOOGLETEST_HEAD=OFF HOST_LIBABSEIL_CPP_CONF_OPTS = \ - -DCMAKE_CXX_STANDARD=11 \ + -DCMAKE_CXX_STANDARD=14 \ -DABSL_ENABLE_INSTALL=ON \ -DABSL_USE_GOOGLETEST_HEAD=OFF diff --git a/package/sysdig/Config.in b/package/sysdig/Config.in index c0a631bd49..3a3670f5cb 100644 --- a/package/sysdig/Config.in +++ b/package/sysdig/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_SYSDIG depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # falcosecurity-libs depends on BR2_LINUX_KERNEL # falcosecurity-libs depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # falcosecurity-libs + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # falcosecurity-libs -> grpc -> libabseil-cpp depends on BR2_TOOLCHAIN_HAS_THREADS # falcosecurity-libs depends on !BR2_STATIC_LIBS # falcosecurity-libs depends on BR2_TOOLCHAIN_USES_GLIBC # falcosecurity-libs @@ -23,12 +23,12 @@ config BR2_PACKAGE_SYSDIG https://github.com/draios/sysdig/wiki -comment "sysdig needs a glibc toolchain w/ C++, threads, gcc >= 5, dynamic library, a Linux kernel, and luajit or lua 5.1 to be built" +comment "sysdig needs a glibc toolchain w/ C++, threads, gcc >= 8, dynamic library, a Linux kernel, and luajit or lua 5.1 to be built" depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC depends on !BR2_LINUX_KERNEL || !BR2_INSTALL_LIBSTDCPP \ || !BR2_TOOLCHAIN_HAS_THREADS \ - || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 || BR2_STATIC_LIBS \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_8 || BR2_STATIC_LIBS \ || !BR2_TOOLCHAIN_USES_GLIBC \ || !BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_1 From b6d4b0170fc181f86116aa3bcc39a538cce25144 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Mon, 13 Nov 2023 21:53:50 +0100 Subject: [PATCH 3987/5754] package/octave: bump package to version 8.4.0 See release note: https://octave.org/news/release/2023/11/05/octave-8.4.0-released.html Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/octave/octave.hash | 4 ++-- package/octave/octave.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/octave/octave.hash b/package/octave/octave.hash index a655f82849..20ee4ddb64 100644 --- a/package/octave/octave.hash +++ b/package/octave/octave.hash @@ -1,5 +1,5 @@ # Locally computed after checking signature -# https://ftp.gnu.org/gnu/octave/octave-8.3.0.tar.lz.sig +# https://ftp.gnu.org/gnu/octave/octave-8.4.0.tar.lz.sig # using key DBD9C84E39FE1AAE99F04446B05F05B75D36644B -sha256 4dbd5da711b20ce640d75471895172b60e0bb9f45b75a0daa5ddf3050488d639 octave-8.3.0.tar.lz +sha256 d5a7e89928528dce8cab7eead700be8a8319a98ec5334cc2ce83d29ac60264c1 octave-8.4.0.tar.lz sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING diff --git a/package/octave/octave.mk b/package/octave/octave.mk index 86f5564c02..cae0de7620 100644 --- a/package/octave/octave.mk +++ b/package/octave/octave.mk @@ -4,7 +4,7 @@ # ################################################################################ -OCTAVE_VERSION = 8.3.0 +OCTAVE_VERSION = 8.4.0 OCTAVE_SITE = https://ftp.gnu.org/gnu/octave OCTAVE_SOURCE = octave-$(OCTAVE_VERSION).tar.lz OCTAVE_LICENSE = GPL-3.0+ From d153e58d13f262f96c6c7c9a2bc0d31b76c8973d 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 3988/5754] 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 --- package/zfs/zfs.hash | 5 ++--- package/zfs/zfs.mk | 3 +-- support/testing/tests/package/test_zfs.py | 4 ++-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/package/zfs/zfs.hash b/package/zfs/zfs.hash index 3a73e5e94f..b02c49234a 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 +# 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 f0461ea9ec..d85956c98b 100644 --- a/package/zfs/zfs.mk +++ b/package/zfs/zfs.mk @@ -4,9 +4,8 @@ # ################################################################################ -ZFS_VERSION = 2.1.12 +ZFS_VERSION = 2.2.0 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 diff --git a/support/testing/tests/package/test_zfs.py b/support/testing/tests/package/test_zfs.py index 1f01ddd768..27dbc2869b 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 da909bf2383a9f47a181d41f285a2e73565cdfc5 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Sat, 11 Nov 2023 20:52:24 +0100 Subject: [PATCH 3989/5754] package/harfbuzz: bump to version 8.3.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 69926f8c6a..fbe890910a 100644 --- a/package/harfbuzz/harfbuzz.hash +++ b/package/harfbuzz/harfbuzz.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e433ad85fbdf57f680be29479b3f964577379aaf319f557eb76569f0ecbc90f3 harfbuzz-8.2.2.tar.xz +sha256 109501eaeb8bde3eadb25fab4164e993fbace29c3d775bcaa1c1e58e2f15f847 harfbuzz-8.3.0.tar.xz sha256 ba8f810f2455c2f08e2d56bb49b72f37fcf68f1f4fade38977cfd7372050ad64 COPYING diff --git a/package/harfbuzz/harfbuzz.mk b/package/harfbuzz/harfbuzz.mk index 0dfe1b2056..4435cbb736 100644 --- a/package/harfbuzz/harfbuzz.mk +++ b/package/harfbuzz/harfbuzz.mk @@ -4,7 +4,7 @@ # ################################################################################ -HARFBUZZ_VERSION = 8.2.2 +HARFBUZZ_VERSION = 8.3.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 b41d4494a64b538ca0df2b3f18d19ae0a2e8a46a Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 10 Nov 2023 19:14:28 -0700 Subject: [PATCH 3990/5754] package/python-logbook: bump to version 1.7.0.post0 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-logbook/python-logbook.hash | 4 ++-- package/python-logbook/python-logbook.mk | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/python-logbook/python-logbook.hash b/package/python-logbook/python-logbook.hash index d77acad76e..8761945de6 100644 --- a/package/python-logbook/python-logbook.hash +++ b/package/python-logbook/python-logbook.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/logbook/json -md5 719970ea22dd274797bb4328161d700f Logbook-1.5.3.tar.gz -sha256 66f454ada0f56eae43066f604a222b09893f98c1adc18df169710761b8f32fe8 Logbook-1.5.3.tar.gz +md5 cbb7e5fb2d6325f42a323b0000127393 Logbook-1.7.0.post0.tar.gz +sha256 a5e8016701ca3beea6a390b0ba1541037f663543ca508ccd36cfdc841639cdd7 Logbook-1.7.0.post0.tar.gz # Locally computed sha256 checksums sha256 2ca266337cc6947578654ab0dd6438de4d01fa78b2e6eb554b09757df1178f98 LICENSE diff --git a/package/python-logbook/python-logbook.mk b/package/python-logbook/python-logbook.mk index 8f02e9b945..e47e78d26e 100644 --- a/package/python-logbook/python-logbook.mk +++ b/package/python-logbook/python-logbook.mk @@ -4,11 +4,12 @@ # ################################################################################ -PYTHON_LOGBOOK_VERSION = 1.5.3 +PYTHON_LOGBOOK_VERSION = 1.7.0.post0 PYTHON_LOGBOOK_SOURCE = Logbook-$(PYTHON_LOGBOOK_VERSION).tar.gz -PYTHON_LOGBOOK_SITE = https://files.pythonhosted.org/packages/2f/d9/16ac346f7c0102835814cc9e5b684aaadea101560bb932a2403bd26b2320 +PYTHON_LOGBOOK_SITE = https://files.pythonhosted.org/packages/cc/98/c1d93c1d7593f58515333a6217aa4ae647d9ee9c1aa2dfdf77b28b7bb7c7 PYTHON_LOGBOOK_SETUP_TYPE = setuptools PYTHON_LOGBOOK_LICENSE = BSD-3-Clause PYTHON_LOGBOOK_LICENSE_FILES = LICENSE +PYTHON_LOGBOOK_DEPENDENCIES = host-python-cython $(eval $(python-package)) From d6d0f73a2eaa4904ee0842a01941b01306d97be6 Mon Sep 17 00:00:00 2001 From: Antoine Coutant Date: Fri, 17 Nov 2023 16:50:33 +0100 Subject: [PATCH 3991/5754] 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 fede99b502..2b1544a5cc 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 a743087593a5fd5b33e2650591cada09929c27a6 Mon Sep 17 00:00:00 2001 From: Kalpesh Panchal Date: Fri, 10 Nov 2023 20:59:59 +0000 Subject: [PATCH 3992/5754] package/memtest86: bump to version 6.20 - bumped package version to 6.20 - as 6.20 prebuilt version is not available on same download site but source code is released at https://github.com/memtest86plus/memtest86plus/releases so updated mk file to download source from git release - prebuilt binary not found in 6.20 package and also README.md does not mention any toolchain limitation for compilation so added source build command depending on 32-bit or 64-bit x86 target. - corrected License file name - installed memtest binaries to image folder like other bootable images(grub , kernel) are copied. - updated config help as per package README.md Signed-off-by: Kalpesh Panchal Signed-off-by: Abhishek Anand Signed-off-by: Brandon Maier [yann.morin.1998@free.fr: - fix check-package errors - fix hash file - better install commands ] Signed-off-by: Yann E. MORIN --- package/memtest86/Config.in | 35 ++++++++++++++++++++++++-------- package/memtest86/memtest86.hash | 4 ++-- package/memtest86/memtest86.mk | 29 +++++++++++++++++++------- 3 files changed, 51 insertions(+), 17 deletions(-) diff --git a/package/memtest86/Config.in b/package/memtest86/Config.in index 79c0161020..c9a8cf749f 100644 --- a/package/memtest86/Config.in +++ b/package/memtest86/Config.in @@ -14,14 +14,33 @@ config BR2_PACKAGE_MEMTEST86 back again and verifies whether the result of the read is the same as what was written to memory. - Memtest86+ will only work on 32-bit or 64-bit x86 targets. - It boots as an i486 program and autodetects hardware. It can - be added to the grub2 boot menu by adding the following - lines to the bottom of /boot/grub/grub.cfg - note the use of - linux16. - - menuentry "Memtest86+" { - linux16 /boot/memtest86+.bin + Memtest86+ will only work on 32-bit or 64-bit x86 targets. It + boots and autodetects hardware. Refer README.md for boot + options. + + It can be loaded and run either directly by a PC BIOS (legacy + or UEFI) or via an intermediate bootloader that supports the + Linux 16-bit, 32-bit, 64-bit, or EFI handover boot protocol. + + It can be added to the grub2 boot menu by adding the following + lines to the bottom of grub.cfg + + Example for legacy BIOS using the Linux 16-bit boot protocol, + with built-in support for USB keyboards or running on a serial + line: + + menuentry "Start Memtest86+ (USB keyboards)" { + linux16 /boot/memtest.bin keyboard=both + } + menuentry "Start Memtest86+ (serial line)" { + linux16 /boot/memtest.bin console=ttyS0,115200 + } + + Or for UEFI BIOS using the Linux 32-bit or 64-bit boot + protocols, using USB keyboard: + + menuentry "Start Memtest86+ (USB keyboards)" { + linux /EFI/BOOT/memtest.efi keyboard=both } Other boot loaders will have similar requirements. diff --git a/package/memtest86/memtest86.hash b/package/memtest86/memtest86.hash index 559ae0ac6c..695e6a234b 100644 --- a/package/memtest86/memtest86.hash +++ b/package/memtest86/memtest86.hash @@ -1,3 +1,3 @@ # locally computed using sha256sum -sha256 142127b7953fbd829b1057fb64a78d3340c2b771484230a7347e94530a0d9039 memtest86+-5.01.tar.gz -sha256 2e15e2174b86640d7fbfcb62b51d9182062d9db71d66a46e5b01d736c68150ea README +sha256 463b2db66128e45c96be76136272e2ee940f1319804b1b88cc2ef04edccd01d8 memtest86-6.20.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/memtest86/memtest86.mk b/package/memtest86/memtest86.mk index eb071cc29d..c0f85755fe 100644 --- a/package/memtest86/memtest86.mk +++ b/package/memtest86/memtest86.mk @@ -4,15 +4,30 @@ # ################################################################################ -MEMTEST86_VERSION = 5.01 -MEMTEST86_SOURCE = memtest86+-$(MEMTEST86_VERSION).tar.gz -MEMTEST86_SITE = http://www.memtest.org/download/$(MEMTEST86_VERSION) +MEMTEST86_VERSION = 6.20 +MEMTEST86_SITE = $(call github,memtest86plus,memtest86plus,v$(MEMTEST86_VERSION)) MEMTEST86_LICENSE = GPL-2.0 -MEMTEST86_LICENSE_FILES = README +MEMTEST86_LICENSE_FILES = LICENSE +MEMTEST86_INSTALL_IMAGES = YES +MEMTEST86_INSTALL_TARGET = NO -# memtest86+ is sensitive to toolchain changes, use the shipped binary version -define MEMTEST86_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 -D $(@D)/precomp.bin $(TARGET_DIR)/boot/memtest86+.bin +ifeq ($(BR2_i386),y) +MEMTEST86_BUILD_DIR = build32 +else +ifeq ($(BR2_x86_64),y) +MEMTEST86_BUILD_DIR = build64 +endif +endif + +define MEMTEST86_BUILD_CMDS + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/$(MEMTEST86_BUILD_DIR) +endef + +define MEMTEST86_INSTALL_IMAGES_CMDS + $(foreach ext, bin efi, \ + $(INSTALL) -m 0755 -D $(@D)/$(MEMTEST86_BUILD_DIR)/memtest.$(ext) \ + $(BINARIES_DIR)/memtest.$(ext) + ) endef $(eval $(generic-package)) From dfe68fc8d5da75516d728d0977ce9265c2f79838 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Sat, 18 Nov 2023 12:45:26 -0700 Subject: [PATCH 3993/5754] 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 72770095d0..50d1360715 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 a7d2810bc9082d168799c051a4f2e5937a9254a1 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 24 Nov 2023 16:25:19 -0700 Subject: [PATCH 3994/5754] package/python-orjson: bump to version 3.9.10 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-orjson/python-orjson.hash | 2 +- package/python-orjson/python-orjson.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-orjson/python-orjson.hash b/package/python-orjson/python-orjson.hash index 773fb14568..0e9b93f311 100644 --- a/package/python-orjson/python-orjson.hash +++ b/package/python-orjson/python-orjson.hash @@ -1,5 +1,5 @@ # Locally calculated after vendoring -sha256 048938fd9153f37eaf7a08b748de94ff87b2488dd3bd9f96c3ae784527a961b3 orjson-3.9.2.tar.gz +sha256 245a1ad9a8f926273787e91f7d7e14b4b357e263a215d8c96dd2039b3cddc238 orjson-3.9.10.tar.gz # Locally computed sha256 checksums sha256 a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2 LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/python-orjson/python-orjson.mk b/package/python-orjson/python-orjson.mk index cf05b26262..a2e8a50468 100644 --- a/package/python-orjson/python-orjson.mk +++ b/package/python-orjson/python-orjson.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ORJSON_VERSION = 3.9.2 +PYTHON_ORJSON_VERSION = 3.9.10 PYTHON_ORJSON_SOURCE = orjson-$(PYTHON_ORJSON_VERSION).tar.gz -PYTHON_ORJSON_SITE = https://files.pythonhosted.org/packages/30/a4/96bcb52da0de9ccfcd99a60719b995c9b9c3aaa3a70701f0790ce856c10d +PYTHON_ORJSON_SITE = https://files.pythonhosted.org/packages/72/75/642688bf5d99131fe8cf603f4ef9f26e4b1c6ed8f7f5c7e6fb31def54fb7 PYTHON_ORJSON_SETUP_TYPE = maturin PYTHON_ORJSON_LICENSE = Apache-2.0 or MIT PYTHON_ORJSON_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT From 0cdce6d53f744252d6799ae63894b93f7f03e2ea Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 24 Nov 2023 16:59:52 -0700 Subject: [PATCH 3995/5754] package/python-mako: bump to version 1.3.0 License hash changed due to year update: https://github.com/sqlalchemy/mako/commit/272f5d8cc97aee829e3b285486f33c9c8e604c74 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-mako/python-mako.hash | 6 +++--- package/python-mako/python-mako.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-mako/python-mako.hash b/package/python-mako/python-mako.hash index a010e8d8f6..03651cf956 100644 --- a/package/python-mako/python-mako.hash +++ b/package/python-mako/python-mako.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/mako/json -md5 651f365616611fcd4f2702a9002e2195 Mako-1.2.4.tar.gz -sha256 d60a3903dc3bb01a18ad6a89cdbe2e4eadc69c0bc8ef1e3773ba53d44c3f7a34 Mako-1.2.4.tar.gz +md5 90da23903468efe9aa88dc88081579ff Mako-1.3.0.tar.gz +sha256 e3a9d388fd00e87043edbe8792f45880ac0114e9c4adc69f6e9bfb2c55e3b11b Mako-1.3.0.tar.gz # Locally computed sha256 checksums -sha256 760f22b3e9ea4a50eb99201bd8dd118869f28108cfb64ccce6d1b305cf9ae9fa LICENSE +sha256 0a326e448dd22f220dd30796677ddbdf3ddaa6427a9744fea9deaa51d9d74fd9 LICENSE diff --git a/package/python-mako/python-mako.mk b/package/python-mako/python-mako.mk index 313fbfcab2..1f7a0b0657 100644 --- a/package/python-mako/python-mako.mk +++ b/package/python-mako/python-mako.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MAKO_VERSION = 1.2.4 +PYTHON_MAKO_VERSION = 1.3.0 PYTHON_MAKO_SOURCE = Mako-$(PYTHON_MAKO_VERSION).tar.gz -PYTHON_MAKO_SITE = https://files.pythonhosted.org/packages/05/5f/2ba6e026d33a0e6ddc1dddf9958677f76f5f80c236bd65309d280b166d3e +PYTHON_MAKO_SITE = https://files.pythonhosted.org/packages/a9/6e/6b41e654bbdcef90c6b9e7f280bf7cbd756dc2560ce76214f5cdbc4ddab5 PYTHON_MAKO_SETUP_TYPE = setuptools PYTHON_MAKO_LICENSE = MIT PYTHON_MAKO_LICENSE_FILES = LICENSE From 134e65f023d6a9e28ceea595fe5e7c66f58837ca Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 24 Nov 2023 21:51:45 -0700 Subject: [PATCH 3996/5754] package/python-outcome: bump to version 1.3.0.post0 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-outcome/python-outcome.hash | 4 ++-- package/python-outcome/python-outcome.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-outcome/python-outcome.hash b/package/python-outcome/python-outcome.hash index 43796e89ac..476da60766 100644 --- a/package/python-outcome/python-outcome.hash +++ b/package/python-outcome/python-outcome.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/outcome/json -md5 58612ee4407901985f85ad3869dd83b8 outcome-1.2.0.tar.gz -sha256 6f82bd3de45da303cf1f771ecafa1633750a358436a8bb60e06a1ceb745d2672 outcome-1.2.0.tar.gz +md5 3a626832ac864c95f6054958d0da3011 outcome-1.3.0.post0.tar.gz +sha256 9dcf02e65f2971b80047b377468e72a268e15c0af3cf1238e6ff14f7f91143b8 outcome-1.3.0.post0.tar.gz # Locally computed sha256 checksums sha256 652c878488d1456361e08c3f8607fd7ba59892a14103d15cce4ff93c85b5cc8b LICENSE sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.APACHE2 diff --git a/package/python-outcome/python-outcome.mk b/package/python-outcome/python-outcome.mk index 27d7fdede3..aa8a6cbf38 100644 --- a/package/python-outcome/python-outcome.mk +++ b/package/python-outcome/python-outcome.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_OUTCOME_VERSION = 1.2.0 +PYTHON_OUTCOME_VERSION = 1.3.0.post0 PYTHON_OUTCOME_SOURCE = outcome-$(PYTHON_OUTCOME_VERSION).tar.gz -PYTHON_OUTCOME_SITE = https://files.pythonhosted.org/packages/dd/91/741e1626e89fdc3664169e16300c59eefa4b23540cc6d6c70450f885098f +PYTHON_OUTCOME_SITE = https://files.pythonhosted.org/packages/98/df/77698abfac98571e65ffeb0c1fba8ffd692ab8458d617a0eed7d9a8d38f2 PYTHON_OUTCOME_SETUP_TYPE = setuptools PYTHON_OUTCOME_LICENSE = Apache-2.0 or MIT PYTHON_OUTCOME_LICENSE_FILES = LICENSE LICENSE.APACHE2 LICENSE.MIT From c4749c6f82a2009ab9b7ae084a60344344b98f11 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 24 Nov 2023 21:56:21 -0700 Subject: [PATCH 3997/5754] package/python-packaging: bump to version 23.2 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- 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 0e339ea573..df75c3505c 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 f7d5c39c6f92cc2dfa1293ba8f6c097c packaging-23.1.tar.gz -sha256 a392980d2b6cffa644431898be54b0045151319d1e7ec34f0cfed48767dd334f packaging-23.1.tar.gz +md5 d54eeff8c7ca86980528f4132f258d54 packaging-23.2.tar.gz +sha256 048fb0e9405036518eaaf48a55953c750c11e1a1b68e0dd1a9d62ed0c092cfc5 packaging-23.2.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 aac4d76ee2..3e0f85c00a 100644 --- a/package/python-packaging/python-packaging.mk +++ b/package/python-packaging/python-packaging.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PACKAGING_VERSION = 23.1 +PYTHON_PACKAGING_VERSION = 23.2 PYTHON_PACKAGING_SOURCE = packaging-$(PYTHON_PACKAGING_VERSION).tar.gz -PYTHON_PACKAGING_SITE = https://files.pythonhosted.org/packages/b9/6c/7c6658d258d7971c5eb0d9b69fa9265879ec9a9158031206d47800ae2213 +PYTHON_PACKAGING_SITE = https://files.pythonhosted.org/packages/fb/2b/9b9c33ffed44ee921d0967086d653047286054117d584f1b1a7c22ceaf7b 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 6c70212a09253eb5fb79c715e7fff7fb786a74ba Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 24 Nov 2023 21:59:13 -0700 Subject: [PATCH 3998/5754] package/python-paramiko: bump to version 3.3.1 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-paramiko/python-paramiko.hash | 4 ++-- package/python-paramiko/python-paramiko.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-paramiko/python-paramiko.hash b/package/python-paramiko/python-paramiko.hash index b327a6b8a9..abc62fc8c2 100644 --- a/package/python-paramiko/python-paramiko.hash +++ b/package/python-paramiko/python-paramiko.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/paramiko/json -md5 3f49814473cc153a7189fec31cfacfab paramiko-2.12.0.tar.gz -sha256 376885c05c5d6aa6e1f4608aac2a6b5b0548b1add40274477324605903d9cd49 paramiko-2.12.0.tar.gz +md5 08b1610e3ba9fa89e13973710cd48e35 paramiko-3.3.1.tar.gz +sha256 6a3777a961ac86dbef375c5f5b8d50014a1a96d0fd7f054a43bc880134b0ff77 paramiko-3.3.1.tar.gz # Locally computed sha256 checksums sha256 5fa25bf5f395fd26e701c2e1de4ca7d162816986dc791c22f8f4226857ad1bb2 LICENSE diff --git a/package/python-paramiko/python-paramiko.mk b/package/python-paramiko/python-paramiko.mk index 621176ed41..512a4630f5 100644 --- a/package/python-paramiko/python-paramiko.mk +++ b/package/python-paramiko/python-paramiko.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PARAMIKO_VERSION = 2.12.0 +PYTHON_PARAMIKO_VERSION = 3.3.1 PYTHON_PARAMIKO_SOURCE = paramiko-$(PYTHON_PARAMIKO_VERSION).tar.gz -PYTHON_PARAMIKO_SITE = https://files.pythonhosted.org/packages/98/75/e78ddbe671a4a59514b59bc6a321263118e4ac3fe88175dd784d1a47a00f +PYTHON_PARAMIKO_SITE = https://files.pythonhosted.org/packages/44/03/158ae1dcb950bd96f04038502238159e116fafb27addf5df1ba35068f2d6 PYTHON_PARAMIKO_SETUP_TYPE = setuptools PYTHON_PARAMIKO_LICENSE = LGPL-2.1+ PYTHON_PARAMIKO_LICENSE_FILES = LICENSE From 31d7d323808083e2b8e25a7fdbee08f5486ee291 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 24 Nov 2023 22:06:25 -0700 Subject: [PATCH 3999/5754] package/python-pathspec: bump to version 0.11.2 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pathspec/python-pathspec.hash | 4 ++-- package/python-pathspec/python-pathspec.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pathspec/python-pathspec.hash b/package/python-pathspec/python-pathspec.hash index 5eb76cb5f9..01177b7428 100644 --- a/package/python-pathspec/python-pathspec.hash +++ b/package/python-pathspec/python-pathspec.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pathspec/json -md5 d89408b52aff020ac768a14c0ef1c7de pathspec-0.10.3.tar.gz -sha256 56200de4077d9d0791465aa9095a01d421861e405b5096955051deefd697d6f6 pathspec-0.10.3.tar.gz +md5 92ebd6d735d261952ff99d64083eeff4 pathspec-0.11.2.tar.gz +sha256 e0d8d0ac2f12da61956eb2306b69f9469b42f4deb0f3cb6ed47b9cce9996ced3 pathspec-0.11.2.tar.gz # Locally computed sha256 checksums sha256 fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85 LICENSE diff --git a/package/python-pathspec/python-pathspec.mk b/package/python-pathspec/python-pathspec.mk index e88bce231f..d32b6a56e1 100644 --- a/package/python-pathspec/python-pathspec.mk +++ b/package/python-pathspec/python-pathspec.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PATHSPEC_VERSION = 0.10.3 +PYTHON_PATHSPEC_VERSION = 0.11.2 PYTHON_PATHSPEC_SOURCE = pathspec-$(PYTHON_PATHSPEC_VERSION).tar.gz -PYTHON_PATHSPEC_SITE = https://files.pythonhosted.org/packages/32/1a/6baf904503c3e943cae9605c9c88a43b964dea5b59785cf956091b341b08 +PYTHON_PATHSPEC_SITE = https://files.pythonhosted.org/packages/a0/2a/bd167cdf116d4f3539caaa4c332752aac0b3a0cc0174cdb302ee68933e81 PYTHON_PATHSPEC_LICENSE = MPL-2.0 PYTHON_PATHSPEC_LICENSE_FILES = LICENSE PYTHON_PATHSPEC_SETUP_TYPE = setuptools From c3f74b50daf957881f242872c501241f915e8d51 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 24 Nov 2023 22:11:54 -0700 Subject: [PATCH 4000/5754] package/python-pathvalidate: bump to version 3.2.0 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pathvalidate/python-pathvalidate.hash | 4 ++-- package/python-pathvalidate/python-pathvalidate.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pathvalidate/python-pathvalidate.hash b/package/python-pathvalidate/python-pathvalidate.hash index 828236304e..4442d82ac1 100644 --- a/package/python-pathvalidate/python-pathvalidate.hash +++ b/package/python-pathvalidate/python-pathvalidate.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pathvalidate/json -md5 541238984572fb21db2da2af1d70a993 pathvalidate-2.5.2.tar.gz -sha256 5ff57d0fabe5ecb7a4f1e4957bfeb5ad8ab5ab4c0fa71f79c6bbc24bd9b7d14d pathvalidate-2.5.2.tar.gz +md5 2a76cbe4e08f58087f418d150a1461b5 pathvalidate-3.2.0.tar.gz +sha256 5e8378cf6712bff67fbe7a8307d99fa8c1a0cb28aa477056f8fc374f0dff24ad pathvalidate-3.2.0.tar.gz # Locally computed sha256 checksums sha256 a93d75bcb0774e2990106380cadad6dcb2de193c55d435ffc56ba345a08b1dc2 LICENSE diff --git a/package/python-pathvalidate/python-pathvalidate.mk b/package/python-pathvalidate/python-pathvalidate.mk index 6ca8c0f2ad..243f541892 100644 --- a/package/python-pathvalidate/python-pathvalidate.mk +++ b/package/python-pathvalidate/python-pathvalidate.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PATHVALIDATE_VERSION = 2.5.2 +PYTHON_PATHVALIDATE_VERSION = 3.2.0 PYTHON_PATHVALIDATE_SOURCE = pathvalidate-$(PYTHON_PATHVALIDATE_VERSION).tar.gz -PYTHON_PATHVALIDATE_SITE = https://files.pythonhosted.org/packages/60/f7/ff244fdd8ed98e98d4f9acecfe74a890e5e3245ce55253ef88db51e94652 +PYTHON_PATHVALIDATE_SITE = https://files.pythonhosted.org/packages/27/93/e2b086c7aba96c70b5e7ef48251702fb95027638fb5a3e787d2efd65783e PYTHON_PATHVALIDATE_SETUP_TYPE = setuptools PYTHON_PATHVALIDATE_LICENSE = MIT PYTHON_PATHVALIDATE_LICENSE_FILES = LICENSE From d59f3d10e84379bea8ac0b77f6946fa6c8176663 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Fri, 24 Nov 2023 13:14:36 -0700 Subject: [PATCH 4001/5754] 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 a48714ea7f..181a2ee6e5 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 47d43fe906c4f0ce5eed14ee1affd846fbae4be2 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 24 Nov 2023 22:14:37 -0700 Subject: [PATCH 4002/5754] package/python-pbr: bump to version 6.0.0 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pbr/python-pbr.hash | 4 ++-- package/python-pbr/python-pbr.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pbr/python-pbr.hash b/package/python-pbr/python-pbr.hash index 4ca503e976..cfeef9419d 100644 --- a/package/python-pbr/python-pbr.hash +++ b/package/python-pbr/python-pbr.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/pbr/json -md5 99ef94dbe5a00054fdcbbaa87268c3cd pbr-5.11.0.tar.gz -sha256 b97bc6695b2aff02144133c2e7399d5885223d42b7912ffaec2ca3898e673bfe pbr-5.11.0.tar.gz +md5 e01bcc0e9154d513ecad3e766f9582d7 pbr-6.0.0.tar.gz +sha256 d1377122a5a00e2f940ee482999518efe16d745d423a670c27773dfbc3c9a7d9 pbr-6.0.0.tar.gz # Locally computed sha256 checksums sha256 5df2a0d87d6c562f0ea11c688ac52532aa28d744cabc7994ff0537f64b3b3320 LICENSE sha256 eb4a8c8791f6caab1cf36df26db2b6f4e2ddda52657b060ff7f02abc63910aef pbr/tests/testpackage/LICENSE.txt diff --git a/package/python-pbr/python-pbr.mk b/package/python-pbr/python-pbr.mk index 99f0101e19..aaea80d389 100644 --- a/package/python-pbr/python-pbr.mk +++ b/package/python-pbr/python-pbr.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PBR_VERSION = 5.11.0 +PYTHON_PBR_VERSION = 6.0.0 PYTHON_PBR_SOURCE = pbr-$(PYTHON_PBR_VERSION).tar.gz -PYTHON_PBR_SITE = https://files.pythonhosted.org/packages/52/fb/630d52aaca8fc7634a0711b6ae12a0e828b6f9264bd8051225025c3ed075 +PYTHON_PBR_SITE = https://files.pythonhosted.org/packages/8d/c2/ee43b3b11bf2b40e56536183fc9f22afbb04e882720332b6276ee2454c24 PYTHON_PBR_SETUP_TYPE = setuptools PYTHON_PBR_LICENSE = Apache-2.0 (module), BSD-3-Clause (test package) PYTHON_PBR_LICENSE_FILES = LICENSE pbr/tests/testpackage/LICENSE.txt From 35744a2c0265d88f1264629f041e1676a0e99f32 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 24 Nov 2023 22:22:11 -0700 Subject: [PATCH 4003/5754] package/python-periphery: bump to version 2.4.1 License hash changed due to year update: https://github.com/vsergeev/python-periphery/commit/c0e6741ee294fb9362ddc4b60088f18bb1c27f8d Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-periphery/python-periphery.hash | 8 +++++--- package/python-periphery/python-periphery.mk | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/package/python-periphery/python-periphery.hash b/package/python-periphery/python-periphery.hash index 24e104d3ad..a758fa7a4d 100644 --- a/package/python-periphery/python-periphery.hash +++ b/package/python-periphery/python-periphery.hash @@ -1,3 +1,5 @@ -# Locally calculated -sha256 385716bdbd11fcf2c5728548c3d42f12ebc0974faa64fa1a98b89b4a44dc004c python-periphery-2.3.0.tar.gz -sha256 76fe342043adfe8d9453c4979aa165476875137e15b0ddea1f4c3f3fa9808361 LICENSE +# md5, sha256 from https://pypi.org/pypi/python-periphery/json +md5 2b2a1037fb4ac15e7b0514ce3659d26c python-periphery-2.4.1.tar.gz +sha256 61d461d736982a6f766e878720ab10a68151e2e8c1086600d9389ac47e40e88a python-periphery-2.4.1.tar.gz +# Locally computed sha256 checksums +sha256 321124461e9f86f4f7bb9f571500bf58ec1b76206b642e505ce17db7f7c88e05 LICENSE diff --git a/package/python-periphery/python-periphery.mk b/package/python-periphery/python-periphery.mk index 2c533fa2c2..7a49f305a5 100644 --- a/package/python-periphery/python-periphery.mk +++ b/package/python-periphery/python-periphery.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_PERIPHERY_VERSION = 2.3.0 -PYTHON_PERIPHERY_SITE = $(call github,vsergeev,python-periphery,v$(PYTHON_PERIPHERY_VERSION)) +PYTHON_PERIPHERY_VERSION = 2.4.1 +PYTHON_PERIPHERY_SITE = https://files.pythonhosted.org/packages/df/f1/1a986ad2bb696033168db2121151e5ff90df033af780ffca47c8bb559f29 PYTHON_PERIPHERY_LICENSE = MIT PYTHON_PERIPHERY_LICENSE_FILES = LICENSE PYTHON_PERIPHERY_SETUP_TYPE = setuptools From 96980b4738c5adada09e39abac4c3087954cf1ce Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 24 Nov 2023 22:29:49 -0700 Subject: [PATCH 4004/5754] package/python-pillow: bump to version 10.1.0 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- 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 c2c5125678..92258a6712 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 93a0585ab0ee9717a7576129bdabdf93 Pillow-10.0.1.tar.gz -sha256 d72967b06be9300fed5cfbc8b5bafceec48bf7cdc7dab66b1d2549035287191d Pillow-10.0.1.tar.gz +md5 a55618c5d2fd64048dd3ea41bc39f7cd Pillow-10.1.0.tar.gz +sha256 e6bf8de6c36ed96c86ea3b6e1d5273c53f46ef518a062464cd7ef5dd2cf92e38 Pillow-10.1.0.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 d9f6fba861..bc94062da8 100644 --- a/package/python-pillow/python-pillow.mk +++ b/package/python-pillow/python-pillow.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_PILLOW_VERSION = 10.0.1 -PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/64/9e/7e638579cce7dc346632f020914141a164a872be813481f058883ee8d421 +PYTHON_PILLOW_VERSION = 10.1.0 +PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/80/d7/c4b258c9098b469c4a4e77b0a99b5f4fd21e359c2e486c977d231f52fc71 PYTHON_PILLOW_SOURCE = Pillow-$(PYTHON_PILLOW_VERSION).tar.gz PYTHON_PILLOW_LICENSE = HPND PYTHON_PILLOW_LICENSE_FILES = LICENSE From 58a920e5fb364543dad9a4b328aa4ddaa3bdfa0b Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 24 Nov 2023 22:34:48 -0700 Subject: [PATCH 4005/5754] package/python-pip: bump to version 23.3.1 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pip/python-pip.hash | 4 ++-- package/python-pip/python-pip.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pip/python-pip.hash b/package/python-pip/python-pip.hash index b41ce47d4c..9518c9d8b8 100644 --- a/package/python-pip/python-pip.hash +++ b/package/python-pip/python-pip.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pip/json -md5 996f58a94fe0b8b82b6795c42bd171ba pip-22.3.1.tar.gz -sha256 65fd48317359f3af8e593943e6ae1506b66325085ea64b706a998c6e83eeaf38 pip-22.3.1.tar.gz +md5 f0c9fba61e9d9badcc9921062e993d84 pip-23.3.1.tar.gz +sha256 1fcaa041308d01f14575f6d0d2ea4b75a3e2871fe4f9c694976f908768e14174 pip-23.3.1.tar.gz # Locally computed sha256 checksums sha256 634300a669d49aeae65b12c6c48c924c51a4cdf3d1ff086dc3456dc8bcaa2104 LICENSE.txt diff --git a/package/python-pip/python-pip.mk b/package/python-pip/python-pip.mk index 040767930e..83a1631a2f 100644 --- a/package/python-pip/python-pip.mk +++ b/package/python-pip/python-pip.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PIP_VERSION = 22.3.1 +PYTHON_PIP_VERSION = 23.3.1 PYTHON_PIP_SOURCE = pip-$(PYTHON_PIP_VERSION).tar.gz -PYTHON_PIP_SITE = https://files.pythonhosted.org/packages/a3/50/c4d2727b99052780aad92c7297465af5fe6eec2dbae490aa9763273ffdc1 +PYTHON_PIP_SITE = https://files.pythonhosted.org/packages/1f/7f/4da15e07ccd11c84c1ccc8f6e24288d5e76c99441bf80e315b33542db951 PYTHON_PIP_SETUP_TYPE = setuptools PYTHON_PIP_LICENSE = MIT PYTHON_PIP_LICENSE_FILES = LICENSE.txt From 90eeb059105d51b7f57e57a9180e7f6156520712 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 24 Nov 2023 22:40:16 -0700 Subject: [PATCH 4006/5754] package/python-portend: bump to version 3.2.0 License hash changed due to notice removal: https://github.com/jaraco/portend/commit/5957d58266e479f124b31f30e4322e798fdf386b Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-portend/python-portend.hash | 6 +++--- package/python-portend/python-portend.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-portend/python-portend.hash b/package/python-portend/python-portend.hash index 6af3b77792..98e196bec8 100644 --- a/package/python-portend/python-portend.hash +++ b/package/python-portend/python-portend.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/portend/json -md5 c37d676837505a6fc8dd33185c6d62a7 portend-3.1.0.tar.gz -sha256 239e3116045ea823f6df87d6168107ad75ccc0590e37242af0cc1e98c5d224e4 portend-3.1.0.tar.gz +md5 0c3a2e8073c384b826f87795766f1e0e portend-3.2.0.tar.gz +sha256 5250a352c19c959d767cac878b829d93e5dc7625a5143399a2a00dc6628ffb72 portend-3.2.0.tar.gz # Locally computed sha256 checksums -sha256 db3f0246b1f9278f15845b99fec478b8b506eb76487993722f8c6e254285faf8 LICENSE +sha256 86da0f01aeae46348a3c3d465195dc1ceccde79f79e87769a64b8da04b2a4741 LICENSE diff --git a/package/python-portend/python-portend.mk b/package/python-portend/python-portend.mk index 4322121e9b..5415198ffb 100644 --- a/package/python-portend/python-portend.mk +++ b/package/python-portend/python-portend.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PORTEND_VERSION = 3.1.0 +PYTHON_PORTEND_VERSION = 3.2.0 PYTHON_PORTEND_SOURCE = portend-$(PYTHON_PORTEND_VERSION).tar.gz -PYTHON_PORTEND_SITE = https://files.pythonhosted.org/packages/6e/0a/42bcc9c97744958ce72d33f526e972379b9e90adede8a151f338818c41d4 +PYTHON_PORTEND_SITE = https://files.pythonhosted.org/packages/8f/fc/bcfc768996b438d6e4bde7a6c8cfd62089847b0f5381a0e0ec2d8ee6b202 PYTHON_PORTEND_LICENSE = MIT PYTHON_PORTEND_LICENSE_FILES = LICENSE PYTHON_PORTEND_SETUP_TYPE = setuptools From 7748d228e66c70d570acea07e4ff749ec3146279 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 24 Nov 2023 22:42:14 -0700 Subject: [PATCH 4007/5754] package/python-prompt-toolkit: bump to version 3.0.41 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-prompt-toolkit/python-prompt-toolkit.hash | 4 ++-- package/python-prompt-toolkit/python-prompt-toolkit.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-prompt-toolkit/python-prompt-toolkit.hash b/package/python-prompt-toolkit/python-prompt-toolkit.hash index 62ba0c3cfe..54130f3ae0 100644 --- a/package/python-prompt-toolkit/python-prompt-toolkit.hash +++ b/package/python-prompt-toolkit/python-prompt-toolkit.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/prompt-toolkit/json -md5 5a2bb559c0bcbc617f507a320c64ba03 prompt_toolkit-3.0.36.tar.gz -sha256 3e163f254bef5a03b146397d7c1963bd3e2812f0964bb9a24e6ec761fd28db63 prompt_toolkit-3.0.36.tar.gz +md5 252a5d200e41d46b65a3076d2bc0a4bd prompt_toolkit-3.0.41.tar.gz +sha256 941367d97fc815548822aa26c2a269fdc4eb21e9ec05fc5d447cf09bad5d75f0 prompt_toolkit-3.0.41.tar.gz # Locally computed sha256 checksums sha256 303574d9bdd85c757d6025017942bf17baeedf2778f62bd7f425d07d880f4c4a LICENSE diff --git a/package/python-prompt-toolkit/python-prompt-toolkit.mk b/package/python-prompt-toolkit/python-prompt-toolkit.mk index 426fa41e0b..db40f6c7eb 100644 --- a/package/python-prompt-toolkit/python-prompt-toolkit.mk +++ b/package/python-prompt-toolkit/python-prompt-toolkit.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PROMPT_TOOLKIT_VERSION = 3.0.36 +PYTHON_PROMPT_TOOLKIT_VERSION = 3.0.41 PYTHON_PROMPT_TOOLKIT_SOURCE = prompt_toolkit-$(PYTHON_PROMPT_TOOLKIT_VERSION).tar.gz -PYTHON_PROMPT_TOOLKIT_SITE = https://files.pythonhosted.org/packages/fb/93/180be2342f89f16543ec4eb3f25083b5b84eba5378f68efff05409fb39a9 +PYTHON_PROMPT_TOOLKIT_SITE = https://files.pythonhosted.org/packages/d9/7b/7d88d94427e1e179e0a62818e68335cf969af5ca38033c0ca02237ab6ee7 PYTHON_PROMPT_TOOLKIT_SETUP_TYPE = setuptools PYTHON_PROMPT_TOOLKIT_LICENSE = BSD-3-Clause PYTHON_PROMPT_TOOLKIT_LICENSE_FILES = LICENSE From 778fddf9e2020bce64df78c7f86edcd4b62e80cb Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 24 Nov 2023 22:48:59 -0700 Subject: [PATCH 4008/5754] package/python-psutil: bump to version 5.9.6 License hash changed due to quote removal: https://github.com/giampaolo/psutil/commit/bea3cf2d16899251b4b5f6b2609db9881645ea2d Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-psutil/python-psutil.hash | 6 +++--- package/python-psutil/python-psutil.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-psutil/python-psutil.hash b/package/python-psutil/python-psutil.hash index 15927562b1..f388118663 100644 --- a/package/python-psutil/python-psutil.hash +++ b/package/python-psutil/python-psutil.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/psutil/json -md5 f72751d05b781757b7cd9bc375d2e351 psutil-5.9.4.tar.gz -sha256 3d7f9739eb435d4b1338944abe23f49584bde5395f27487d2ee25ad9a8774a62 psutil-5.9.4.tar.gz +md5 eec35090e7474e471a12f0dd16c981f9 psutil-5.9.6.tar.gz +sha256 e4b92ddcd7dd4cdd3f900180ea1e104932c7bce234fb88976e2a3b296441225a psutil-5.9.6.tar.gz # Locally computed sha256 checksums -sha256 24c12984500caa07ffdce19eebc06396c5e6d244b573bc6c438f4a6ef8e56c1b LICENSE +sha256 b89c063b3786e28e0c0a38f1931db61fed35e69dd2a2966fbecffee0f46c8d10 LICENSE diff --git a/package/python-psutil/python-psutil.mk b/package/python-psutil/python-psutil.mk index e764d1accc..ece1039a51 100644 --- a/package/python-psutil/python-psutil.mk +++ b/package/python-psutil/python-psutil.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PSUTIL_VERSION = 5.9.4 +PYTHON_PSUTIL_VERSION = 5.9.6 PYTHON_PSUTIL_SOURCE = psutil-$(PYTHON_PSUTIL_VERSION).tar.gz -PYTHON_PSUTIL_SITE = https://files.pythonhosted.org/packages/3d/7d/d05864a69e452f003c0d77e728e155a89a2a26b09e64860ddd70ad64fb26 +PYTHON_PSUTIL_SITE = https://files.pythonhosted.org/packages/2d/01/beb7331fc6c8d1c49dd051e3611379bfe379e915c808e1301506027fce9d PYTHON_PSUTIL_SETUP_TYPE = setuptools PYTHON_PSUTIL_LICENSE = BSD-3-Clause PYTHON_PSUTIL_LICENSE_FILES = LICENSE From 3223987c937c5e7ef2caf0166bb45f4089d89b2f Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 24 Nov 2023 23:01:55 -0700 Subject: [PATCH 4009/5754] package/python-psycopg2: bump to version 2.9.9 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-psycopg2/python-psycopg2.hash | 4 ++-- package/python-psycopg2/python-psycopg2.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-psycopg2/python-psycopg2.hash b/package/python-psycopg2/python-psycopg2.hash index 58f98f9d84..6659c6cef8 100644 --- a/package/python-psycopg2/python-psycopg2.hash +++ b/package/python-psycopg2/python-psycopg2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/psycopg2/json -md5 3cec7285f61690633bb070d4bba259c2 psycopg2-2.9.5.tar.gz -sha256 a5246d2e683a972e2187a8714b5c2cf8156c064629f9a9b1a873c1730d9e245a psycopg2-2.9.5.tar.gz +md5 eae35fa97cdc92b910b706c720a257c7 psycopg2-2.9.9.tar.gz +sha256 d1454bde93fb1e224166811694d600e746430c006fbb031ea06ecc2ea41bf156 psycopg2-2.9.9.tar.gz # Locally computed sha256 checksums sha256 9614b85dfc9a72c5b2ca33144c1d7e1ed3b1c297459d9fb28a6a5762c2e8d71b LICENSE diff --git a/package/python-psycopg2/python-psycopg2.mk b/package/python-psycopg2/python-psycopg2.mk index fa23c2814f..0149b8d185 100644 --- a/package/python-psycopg2/python-psycopg2.mk +++ b/package/python-psycopg2/python-psycopg2.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PSYCOPG2_VERSION = 2.9.5 +PYTHON_PSYCOPG2_VERSION = 2.9.9 PYTHON_PSYCOPG2_SOURCE = psycopg2-$(PYTHON_PSYCOPG2_VERSION).tar.gz -PYTHON_PSYCOPG2_SITE = https://files.pythonhosted.org/packages/89/d6/cd8c46417e0f7a16b4b0fc321f4ab676a59250d08fce5b64921897fb07cc +PYTHON_PSYCOPG2_SITE = https://files.pythonhosted.org/packages/c9/5e/dc6acaf46d78979d6b03458b7a1618a68e152a6776fce95daac5e0f0301b PYTHON_PSYCOPG2_SETUP_TYPE = setuptools PYTHON_PSYCOPG2_LICENSE = LGPL-3.0+ PYTHON_PSYCOPG2_LICENSE_FILES = LICENSE From 0bfd7351e1970d03ba692a3ab0207aee4a527dbd Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 24 Nov 2023 23:34:03 -0700 Subject: [PATCH 4010/5754] package/python-pyasn1-modules: bump to version 0.3.0 Update github url to new repository. License hash changed due to year update: https://github.com/pyasn1/pyasn1-modules/commit/848e7d6a6e8c16d68fb7bedd0715f724ef538b5d Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pyasn1-modules/Config.in | 2 +- package/python-pyasn1-modules/python-pyasn1-modules.hash | 6 +++--- package/python-pyasn1-modules/python-pyasn1-modules.mk | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/python-pyasn1-modules/Config.in b/package/python-pyasn1-modules/Config.in index 6aff4d935b..cb486d33ae 100644 --- a/package/python-pyasn1-modules/Config.in +++ b/package/python-pyasn1-modules/Config.in @@ -4,4 +4,4 @@ config BR2_PACKAGE_PYTHON_PYASN1_MODULES help A collection of ASN.1-based protocols modules. - https://github.com/etingof/pyasn1-modules + https://github.com/pyasn1/pyasn1-modules diff --git a/package/python-pyasn1-modules/python-pyasn1-modules.hash b/package/python-pyasn1-modules/python-pyasn1-modules.hash index 2305596585..6f4bb6faf0 100644 --- a/package/python-pyasn1-modules/python-pyasn1-modules.hash +++ b/package/python-pyasn1-modules/python-pyasn1-modules.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyasn1-modules/json -md5 107e1ece7d0a41d782f69f8a95a4d9bc pyasn1-modules-0.2.8.tar.gz -sha256 905f84c712230b2c592c19470d3ca8d552de726050d1d1716282a1f6146be65e pyasn1-modules-0.2.8.tar.gz +md5 94ee572b06ae09f1903b11333575b091 pyasn1_modules-0.3.0.tar.gz +sha256 5bd01446b736eb9d31512a30d46c1ac3395d676c6f3cafa4c03eb54b9925631c pyasn1_modules-0.3.0.tar.gz # Locally computed sha256 checksums -sha256 22c5cc6922ab5d69fba32d8c5ee4cdd14981508cb53afc0ebd85593847fd95a5 LICENSE.txt +sha256 2aad5fc00f705c4a1addb83eed10a6a75d286a3779f0cf8519d87e62bc4735fd LICENSE.txt diff --git a/package/python-pyasn1-modules/python-pyasn1-modules.mk b/package/python-pyasn1-modules/python-pyasn1-modules.mk index 9933a63aa7..41987028fc 100644 --- a/package/python-pyasn1-modules/python-pyasn1-modules.mk +++ b/package/python-pyasn1-modules/python-pyasn1-modules.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYASN1_MODULES_VERSION = 0.2.8 -PYTHON_PYASN1_MODULES_SOURCE = pyasn1-modules-$(PYTHON_PYASN1_MODULES_VERSION).tar.gz -PYTHON_PYASN1_MODULES_SITE = https://files.pythonhosted.org/packages/88/87/72eb9ccf8a58021c542de2588a867dbefc7556e14b2866d1e40e9e2b587e +PYTHON_PYASN1_MODULES_VERSION = 0.3.0 +PYTHON_PYASN1_MODULES_SOURCE = pyasn1_modules-$(PYTHON_PYASN1_MODULES_VERSION).tar.gz +PYTHON_PYASN1_MODULES_SITE = https://files.pythonhosted.org/packages/3b/e4/7dec823b1b5603c5b3c51e942d5d9e65efd6ff946e713a325ed4146d070f PYTHON_PYASN1_MODULES_SETUP_TYPE = setuptools PYTHON_PYASN1_MODULES_LICENSE = BSD-2-Clause PYTHON_PYASN1_MODULES_LICENSE_FILES = LICENSE.txt From 1f096a04de0bb7319fa9f3b58adcf9cc895bbac5 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 24 Nov 2023 23:41:50 -0700 Subject: [PATCH 4011/5754] package/python-pycairo: bump to version 1.25.1 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pycairo/python-pycairo.hash | 4 ++-- package/python-pycairo/python-pycairo.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pycairo/python-pycairo.hash b/package/python-pycairo/python-pycairo.hash index 98bb7f2802..f44afe6fc4 100644 --- a/package/python-pycairo/python-pycairo.hash +++ b/package/python-pycairo/python-pycairo.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/pycairo/json -md5 7a3729d21659098e1b9a411b62e88966 pycairo-1.23.0.tar.gz -sha256 9b61ac818723adc04367301317eb2e814a83522f07bbd1f409af0dada463c44c pycairo-1.23.0.tar.gz +md5 7669cdc70111d01ba6faecd65d8cdbf6 pycairo-1.25.1.tar.gz +sha256 7e2be4fbc3b4536f16db7a11982cbf713e75069a4d73d44fe5a49b68423f5c0c pycairo-1.25.1.tar.gz # Locally computed sha256 checksums sha256 360b9a526d47c51a7cab7f1ec49ca5893050562d639b742d588934ff84823a72 COPYING sha256 d80c9d084ebfb50ea1ed91bfbc2410d6ce542097a32c43b00781b83adcb8c77f COPYING-LGPL-2.1 diff --git a/package/python-pycairo/python-pycairo.mk b/package/python-pycairo/python-pycairo.mk index f9933df187..eb60293ff8 100644 --- a/package/python-pycairo/python-pycairo.mk +++ b/package/python-pycairo/python-pycairo.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYCAIRO_VERSION = 1.23.0 +PYTHON_PYCAIRO_VERSION = 1.25.1 PYTHON_PYCAIRO_SOURCE = pycairo-$(PYTHON_PYCAIRO_VERSION).tar.gz -PYTHON_PYCAIRO_SITE = https://files.pythonhosted.org/packages/69/ca/9e9fa2e8be0876a9bbf046a1be7ee33e61d4fdfbd1fd25c76c1bdfddf8c4 +PYTHON_PYCAIRO_SITE = https://files.pythonhosted.org/packages/c7/7c/de4d40316ee563e4f15a0f05f28c8458833fbef80c4588b9dd51f39b78ee PYTHON_PYCAIRO_SETUP_TYPE = setuptools PYTHON_PYCAIRO_DEPENDENCIES = cairo PYTHON_PYCAIRO_LICENSE = LGPL-2.1 or MPL-1.1 From bdbaab97701af41f58454800de848c7e70e396b8 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 24 Nov 2023 23:46:31 -0700 Subject: [PATCH 4012/5754] package/python-pycares: bump to version 4.4.0 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pycares/python-pycares.hash | 4 ++-- package/python-pycares/python-pycares.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pycares/python-pycares.hash b/package/python-pycares/python-pycares.hash index 7cdd93dd93..fa24c1ec66 100644 --- a/package/python-pycares/python-pycares.hash +++ b/package/python-pycares/python-pycares.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pycares/json -md5 d11b196cebb45a38caa56e850f4a60d9 pycares-4.3.0.tar.gz -sha256 c542696f6dac978e9d99192384745a65f80a7d9450501151e4a7563e06010d45 pycares-4.3.0.tar.gz +md5 ff4e54e91e32484b189b1e28758ec8c7 pycares-4.4.0.tar.gz +sha256 f47579d508f2f56eddd16ce72045782ad3b1b3b678098699e2b6a1b30733e1c2 pycares-4.4.0.tar.gz # Locally computed sha256 checksums sha256 427bb3a5372024a26e2c290b24382512bcc7ca123431c4dd178dd613beea7eee LICENSE diff --git a/package/python-pycares/python-pycares.mk b/package/python-pycares/python-pycares.mk index b1c7dcef50..fe6916445d 100644 --- a/package/python-pycares/python-pycares.mk +++ b/package/python-pycares/python-pycares.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYCARES_VERSION = 4.3.0 +PYTHON_PYCARES_VERSION = 4.4.0 PYTHON_PYCARES_SOURCE = pycares-$(PYTHON_PYCARES_VERSION).tar.gz -PYTHON_PYCARES_SITE = https://files.pythonhosted.org/packages/01/50/e3015e6e03a3cf64113f509e8b86b71af37169b59ccedfcb182f3d031329 +PYTHON_PYCARES_SITE = https://files.pythonhosted.org/packages/1b/8f/daf60bbc06f4a3cd1cfb0ab807057151287df6f5c78f2e0d298acc9193ac PYTHON_PYCARES_SETUP_TYPE = setuptools PYTHON_PYCARES_LICENSE = MIT PYTHON_PYCARES_LICENSE_FILES = LICENSE From ecc9da527794cf6a1b09e132412350376349d2d5 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 24 Nov 2023 23:56:53 -0700 Subject: [PATCH 4013/5754] package/python-pycrate: bump to version 0.7.0 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pycrate/python-pycrate.hash | 4 ++-- package/python-pycrate/python-pycrate.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pycrate/python-pycrate.hash b/package/python-pycrate/python-pycrate.hash index fd41274369..94ec99b738 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 d51fd27d99481990ff85a1e418b1c938 pycrate-0.6.0.tar.gz -sha256 b49738c02a3f93ba9f76c0dac82b689a5341882814b36c714e9600e9f560daf7 pycrate-0.6.0.tar.gz +md5 bd21fa697ecff7ad93bec4943230d281 pycrate-0.7.0.tar.gz +sha256 c83232f522b5bbc3b3eeaca2cf38ee63cd3c25d0c15f3ba221e6dafa89b9a763 pycrate-0.7.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 2f947ab807..1645eaf52c 100644 --- a/package/python-pycrate/python-pycrate.mk +++ b/package/python-pycrate/python-pycrate.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYCRATE_VERSION = 0.6.0 +PYTHON_PYCRATE_VERSION = 0.7.0 PYTHON_PYCRATE_SOURCE = pycrate-$(PYTHON_PYCRATE_VERSION).tar.gz -PYTHON_PYCRATE_SITE = https://files.pythonhosted.org/packages/fb/7f/5f354100270a5d41350e9806dc9950a33e00a30eb3a7ab5fc9db86326856 +PYTHON_PYCRATE_SITE = https://files.pythonhosted.org/packages/a6/a5/aab94e6bb8b3281cc450dde3961b417bd56abde2401955a9a4904df44c68 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 66f94d372fce75240cceadeb1bdc738297cfb8fc Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sat, 25 Nov 2023 00:02:38 -0700 Subject: [PATCH 4014/5754] package/python-pycryptodomex: bump to version 3.19.0 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- 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 954f4a8938..2b74e03e76 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 3b8d868cef13ea41cb3bfeab66a7707c pycryptodomex-3.18.0.tar.gz -sha256 3e3ecb5fe979e7c1bb0027e518340acf7ee60415d79295e5251d13c68dde576e pycryptodomex-3.18.0.tar.gz +md5 0dc96e1ffb42c955d89c2ce3f3875c9c pycryptodomex-3.19.0.tar.gz +sha256 af83a554b3f077564229865c45af0791be008ac6469ef0098152139e6bd4b5b6 pycryptodomex-3.19.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 d6eb2a9513..0d9855c602 100644 --- a/package/python-pycryptodomex/python-pycryptodomex.mk +++ b/package/python-pycryptodomex/python-pycryptodomex.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYCRYPTODOMEX_VERSION = 3.18.0 +PYTHON_PYCRYPTODOMEX_VERSION = 3.19.0 PYTHON_PYCRYPTODOMEX_SOURCE = pycryptodomex-$(PYTHON_PYCRYPTODOMEX_VERSION).tar.gz -PYTHON_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/40/92/efd675dba957315d705f792b28d900bddc36f39252f6713961b4221ee9af +PYTHON_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/14/c9/09d5df04c9f29ae1b49d0e34c9934646b53bb2131a55e8ed2a0d447c7c53 PYTHON_PYCRYPTODOMEX_SETUP_TYPE = setuptools PYTHON_PYCRYPTODOMEX_LICENSE = \ BSD-2-Clause, \ From 618ad13422197e3ad18893bc034a11d4b4d0f6c6 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sat, 25 Nov 2023 00:07:06 -0700 Subject: [PATCH 4015/5754] package/python-pydal: bump to version 20231114.3 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- 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 8ed25084d1..9f2ab55508 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 47f0425745bcd1bb413aa9208cd06b3c pydal-20230521.1.tar.gz -sha256 10478a61e627c5b8cb7691f7f7ebf7210845485316493d37d740c297fb6d1845 pydal-20230521.1.tar.gz +md5 b2072b7b000223890b56830ca1ab3616 pydal-20231114.3.tar.gz +sha256 c42d16fca9e3bb6d399aefb2434c0e70862ee13c75437852f421920432ee5fb1 pydal-20231114.3.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 1cc7e90b11..245383f244 100644 --- a/package/python-pydal/python-pydal.mk +++ b/package/python-pydal/python-pydal.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYDAL_VERSION = 20230521.1 +PYTHON_PYDAL_VERSION = 20231114.3 PYTHON_PYDAL_SOURCE = pydal-$(PYTHON_PYDAL_VERSION).tar.gz -PYTHON_PYDAL_SITE = https://files.pythonhosted.org/packages/68/b4/15dc227f965cc0525ca7f432368706cc4087ad6d587a5a05b251d133023e +PYTHON_PYDAL_SITE = https://files.pythonhosted.org/packages/0b/3b/86302e165af07bc3d9225aea6ed8f52386270220e4aac1aad0101a48aac1 PYTHON_PYDAL_LICENSE = BSD-3-Clause PYTHON_PYDAL_LICENSE_FILES = LICENSE.txt PYTHON_PYDAL_SETUP_TYPE = setuptools From 20af13d17f404c9d56d7274046358c2242524248 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sat, 25 Nov 2023 01:15:08 -0700 Subject: [PATCH 4016/5754] package/python-pydyf: bump to version 0.8.0 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- 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 4e52429dfe..b2dac04516 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 52a772655c1398e7b60d22e930e13094 pydyf-0.7.0.tar.gz -sha256 a5a88cb06e5beb64a1ef2147ee879b0e5139f5fdb827fda2fcf14a018c7b11e6 pydyf-0.7.0.tar.gz +md5 a3650927d9a84da1dc0aa1d268f21376 pydyf-0.8.0.tar.gz +sha256 b22b1ef016141b54941ad66ed4e036a7bdff39c0b360993b283875c3f854dd9a pydyf-0.8.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 d941a00a9f..e9b7d229c7 100644 --- a/package/python-pydyf/python-pydyf.mk +++ b/package/python-pydyf/python-pydyf.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYDYF_VERSION = 0.7.0 +PYTHON_PYDYF_VERSION = 0.8.0 PYTHON_PYDYF_SOURCE = pydyf-$(PYTHON_PYDYF_VERSION).tar.gz -PYTHON_PYDYF_SITE = https://files.pythonhosted.org/packages/28/ec/b6b327f2a249a83022501b2f57844ca05b2b26e0cadf28648ea5c0f72aa6 +PYTHON_PYDYF_SITE = https://files.pythonhosted.org/packages/18/dc/b607bbc7c15327c5d5ec25681a3707c847906134925d21a26ec6e7416a4a PYTHON_PYDYF_SETUP_TYPE = flit PYTHON_PYDYF_LICENSE = BSD-3-Clause PYTHON_PYDYF_LICENSE_FILES = LICENSE From efb5d3fbd888549cdd2370240bfb2969afed2bb4 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sat, 25 Nov 2023 01:22:08 -0700 Subject: [PATCH 4017/5754] package/python-pyelftools: bump to version 0.30 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pyelftools/python-pyelftools.hash | 4 ++-- package/python-pyelftools/python-pyelftools.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pyelftools/python-pyelftools.hash b/package/python-pyelftools/python-pyelftools.hash index 7cffe2d646..70af8104b9 100644 --- a/package/python-pyelftools/python-pyelftools.hash +++ b/package/python-pyelftools/python-pyelftools.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyelftools/json -md5 2afc97cd239c0dea0cca97d00d3dcb42 pyelftools-0.29.tar.gz -sha256 ec761596aafa16e282a31de188737e5485552469ac63b60cfcccf22263fd24ff pyelftools-0.29.tar.gz +md5 2b4f82fd30436834b9357a5e74b8ceb7 pyelftools-0.30.tar.gz +sha256 2fc92b0d534f8b081f58c7c370967379123d8e00984deb53c209364efd575b40 pyelftools-0.30.tar.gz # Locally computed sha256 checksums sha256 ae18bf4cb82f92af7547259177bc28bc48e4fc732518bcedfe690226288d3445 LICENSE diff --git a/package/python-pyelftools/python-pyelftools.mk b/package/python-pyelftools/python-pyelftools.mk index 7566f24895..0e52c0b885 100644 --- a/package/python-pyelftools/python-pyelftools.mk +++ b/package/python-pyelftools/python-pyelftools.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYELFTOOLS_VERSION = 0.29 +PYTHON_PYELFTOOLS_VERSION = 0.30 PYTHON_PYELFTOOLS_SOURCE = pyelftools-$(PYTHON_PYELFTOOLS_VERSION).tar.gz -PYTHON_PYELFTOOLS_SITE = https://files.pythonhosted.org/packages/0e/35/e76da824595452a5ad07f289ea1737ca0971fc6cc7b6ee9464279be06b5e +PYTHON_PYELFTOOLS_SITE = https://files.pythonhosted.org/packages/84/05/fd41cd647de044d1ffec90ce5aaae935126ac217f8ecb302186655284fc8 PYTHON_PYELFTOOLS_LICENSE = Public domain PYTHON_PYELFTOOLS_LICENSE_FILES = LICENSE PYTHON_PYELFTOOLS_SETUP_TYPE = setuptools From e241419490c80cb0b758dc017ffe8f7b95533890 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sat, 25 Nov 2023 00:34:18 -0700 Subject: [PATCH 4018/5754] utils/scanpypi: add flit package support These packages don't have a setup.py so we instead need to parse their pyproject.toml file. It is possible that such a package does not define a project_urls config item, so ensure we do not choke on it (None.get() would raise). Note that this currently doesn't handle flit package dependency resolution. Signed-off-by: James Hilliard Reviewed-by: Yegor Yefremov [yann.morin.1998@free.fr: - add sentence about the project_urls rewrite - fix flake8 errors ] Signed-off-by: Yann E. MORIN --- utils/scanpypi | 94 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 90 insertions(+), 4 deletions(-) diff --git a/utils/scanpypi b/utils/scanpypi index 3c98bb4bcc..021c99a172 100755 --- a/utils/scanpypi +++ b/utils/scanpypi @@ -43,6 +43,56 @@ except ImportError: liclookup = None +def toml_load(f): + with open(f, 'rb') as fh: + ex = None + + # Try standard library tomllib first + try: + from tomllib import load + return load(fh) + except ImportError: + pass + + # Try regular tomli next + try: + from tomli import load + return load(fh) + except ImportError as e: + ex = e + + # Try pip's vendored tomli + try: + from pip._vendor.tomli import load + try: + return load(fh) + except TypeError: + # Fallback to handle older version + try: + fh.seek(0) + w = io.TextIOWrapper(fh, encoding="utf8", newline="") + return load(w) + finally: + w.detach() + except ImportError: + pass + + # Try regular toml last + try: + from toml import load + fh.seek(0) + w = io.TextIOWrapper(fh, encoding="utf8", newline="") + try: + return load(w) + finally: + w.detach() + except ImportError: + pass + + print('This package needs tomli') + raise ex + + def setup_decorator(func, method): """ Decorator for distutils.core.setup and setuptools.setup. @@ -316,6 +366,35 @@ class BuildrootPackage(): os.chdir(current_dir) sys.path.remove(self.tmp_extract) + def load_pyproject(self): + """ + Loads the corresponding pyproject.toml and store its metadata + """ + current_dir = os.getcwd() + os.chdir(self.tmp_extract) + sys.path.insert(0, self.tmp_extract) + try: + pyproject_data = toml_load('pyproject.toml') + try: + self.setup_metadata = pyproject_data.get('project', {}) + self.metadata_name = self.setup_metadata.get('name', self.real_name) + build_system = pyproject_data.get('build-system', {}) + build_backend = build_system.get('build-backend', None) + if build_backend and build_backend == 'flit_core.buildapi': + self.setup_metadata['method'] = 'flit' + elif build_system.get('backend-path', None): + self.setup_metadata['method'] = 'pep517' + else: + self.setup_metadata['method'] = 'unknown' + except KeyError: + print('ERROR: Could not determine package metadata for {pkg}.\n' + .format(pkg=self.real_name)) + raise + except FileNotFoundError: + raise + os.chdir(current_dir) + sys.path.remove(self.tmp_extract) + def get_requirements(self, pkg_folder): """ Retrieve dependencies from the metadata found in the setup.py script of @@ -620,8 +699,12 @@ class BuildrootPackage(): if help_lines[-1][-1] != '.': help_lines[-1] += '.' - home_page = md_info.get('home_page', None) or \ - md_info.get('project_urls', {}).get('Homepage', None) # noqa: E127 + home_page = md_info.get('home_page', None) + + if not home_page: + project_urls = md_info.get('project_urls', None) + if project_urls: + home_page = project_urls.get('Homepage', None) if home_page: # \t + two spaces is 3 char long @@ -699,9 +782,12 @@ def main(): except ImportError as err: if 'buildutils' in str(err): print('This package needs buildutils') + continue else: - raise - continue + try: + package.load_pyproject() + except Exception: + raise except (AttributeError, KeyError) as error: print('Error: Could not install package {pkg}: {error}'.format( pkg=package.real_name, error=error)) From 0ff5d3df052d9a1594db05360e301c7614ca68f2 Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sun, 1 Oct 2023 00:16:25 +0200 Subject: [PATCH 4019/5754] package/pkg-python.mk: remove $(2)_PYTHON_INTERPRETER variable This is a leftover from python 2/3. Since the interpreter is now always python3, we can simply call it like that - like is done in all the other places where python is called. While we're at it, call python3 explicitly rather than relying on the symlink. Signed-off-by: Arnout Vandecappelle Signed-off-by: Yann E. MORIN --- 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 28ee4cb85f..1fc096efb3 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -325,10 +325,6 @@ $(2)_DOWNLOAD_POST_PROCESS = cargo $(2)_DOWNLOAD_DEPENDENCIES = host-rustc endif # SETUP_TYPE -# Python interpreter to use for building the package. -# -$(2)_PYTHON_INTERPRETER = $$(HOST_DIR)/bin/python - # # Build step. Only define it if not already defined by the package .mk # file. @@ -337,7 +333,7 @@ ifndef $(2)_BUILD_CMDS define $(2)_BUILD_CMDS (cd $$($$(PKG)_BUILDDIR)/; \ $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ - $$($(2)_PYTHON_INTERPRETER) \ + $$(HOST_DIR)/bin/python3 \ $$($$(PKG)_BASE_BUILD_CMD) \ $$($$(PKG)_BASE_BUILD_OPTS) $$($$(PKG)_BUILD_OPTS)) endef @@ -351,7 +347,7 @@ ifndef $(2)_INSTALL_CMDS define $(2)_INSTALL_CMDS (cd $$($$(PKG)_BUILDDIR)/; \ $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ - $$($(2)_PYTHON_INTERPRETER) \ + $$(HOST_DIR)/bin/python3 \ $$($$(PKG)_BASE_INSTALL_CMD) \ $$($$(PKG)_INSTALL_OPTS)) endef @@ -365,7 +361,7 @@ ifndef $(2)_INSTALL_TARGET_CMDS define $(2)_INSTALL_TARGET_CMDS (cd $$($$(PKG)_BUILDDIR)/; \ $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ - $$($(2)_PYTHON_INTERPRETER) \ + $$(HOST_DIR)/bin/python3 \ $$($$(PKG)_BASE_INSTALL_TARGET_CMD) \ $$($$(PKG)_INSTALL_TARGET_OPTS)) endef @@ -379,7 +375,7 @@ ifndef $(2)_INSTALL_STAGING_CMDS define $(2)_INSTALL_STAGING_CMDS (cd $$($$(PKG)_BUILDDIR)/; \ $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ - $$($(2)_PYTHON_INTERPRETER) \ + $$(HOST_DIR)/bin/python3 \ $$($$(PKG)_BASE_INSTALL_STAGING_CMD) \ $$($$(PKG)_INSTALL_STAGING_OPTS)) endef From ba27abf3566a86ecf2f89c7a4bb1d2c6a50eda89 Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sun, 1 Oct 2023 00:16:26 +0200 Subject: [PATCH 4020/5754] package/pkg-python.mk: remove _BASE_BUILD_OPTS variable This variable can just as well be merged into _BASE_BUILD_CMD. This is how it's done for the install opts. And anyway it's only used by distutils and nowhere else. Signed-off-by: Arnout Vandecappelle Signed-off-by: Yann E. MORIN --- package/pkg-python.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index 1fc096efb3..eacf75c165 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -198,8 +198,7 @@ endif ifeq ($$($(2)_SETUP_TYPE),distutils) ifeq ($(4),target) $(2)_BASE_ENV = $$(PKG_PYTHON_DISTUTILS_ENV) -$(2)_BASE_BUILD_CMD = setup.py build -$(2)_BASE_BUILD_OPTS = $$(PKG_PYTHON_DISTUTILS_BUILD_OPTS) +$(2)_BASE_BUILD_CMD = setup.py build $$(PKG_PYTHON_DISTUTILS_BUILD_OPTS) $(2)_BASE_INSTALL_TARGET_CMD = setup.py install --no-compile $$(PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS) $(2)_BASE_INSTALL_STAGING_CMD = setup.py install $$(PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS) else @@ -335,7 +334,7 @@ define $(2)_BUILD_CMDS $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ $$(HOST_DIR)/bin/python3 \ $$($$(PKG)_BASE_BUILD_CMD) \ - $$($$(PKG)_BASE_BUILD_OPTS) $$($$(PKG)_BUILD_OPTS)) + $$($$(PKG)_BUILD_OPTS)) endef endif From aae25fb55e13198cfabbcbd7e561767d337c0407 Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sun, 1 Oct 2023 00:16:27 +0200 Subject: [PATCH 4021/5754] package/pkg-python.mk: split the commands in a target and host section Only define the _CMDS variables that are relevant for the target resp. host variant. Duplicate the _BUILD_CMDS. This will allow us to differentiate part of the _BUILD_CMDS definition in a follow-up patch. Signed-off-by: Arnout Vandecappelle Signed-off-by: Yann E. MORIN --- package/pkg-python.mk | 47 ++++++++++++++++++++++++++++++------------- 1 file changed, 33 insertions(+), 14 deletions(-) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index eacf75c165..c1640d71bb 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -324,6 +324,7 @@ $(2)_DOWNLOAD_POST_PROCESS = cargo $(2)_DOWNLOAD_DEPENDENCIES = host-rustc endif # SETUP_TYPE +ifeq ($(4),target) # # Build step. Only define it if not already defined by the package .mk # file. @@ -338,20 +339,6 @@ define $(2)_BUILD_CMDS endef endif -# -# Host installation step. Only define it if not already defined by the -# package .mk file. -# -ifndef $(2)_INSTALL_CMDS -define $(2)_INSTALL_CMDS - (cd $$($$(PKG)_BUILDDIR)/; \ - $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ - $$(HOST_DIR)/bin/python3 \ - $$($$(PKG)_BASE_INSTALL_CMD) \ - $$($$(PKG)_INSTALL_OPTS)) -endef -endif - # # Target installation step. Only define it if not already defined by # the package .mk file. @@ -380,6 +367,38 @@ define $(2)_INSTALL_STAGING_CMDS endef endif +else # host + +# +# Host build step. Only define it if not already defined by the package .mk +# file. +# +ifndef $(2)_BUILD_CMDS +define $(2)_BUILD_CMDS + (cd $$($$(PKG)_BUILDDIR)/; \ + $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ + $$(HOST_DIR)/bin/python3 \ + $$($$(PKG)_BASE_BUILD_CMD) \ + $$($$(PKG)_BUILD_OPTS)) +endef +endif + +# +# Host installation step. Only define it if not already defined by the +# package .mk file. +# +ifndef $(2)_INSTALL_CMDS +define $(2)_INSTALL_CMDS + (cd $$($$(PKG)_BUILDDIR)/; \ + $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ + $$(HOST_DIR)/bin/python3 \ + $$($$(PKG)_BASE_INSTALL_CMD) \ + $$($$(PKG)_INSTALL_OPTS)) +endef +endif + +endif # host / target + # Call the generic package infrastructure to generate the necessary # make targets $(call inner-generic-package,$(1),$(2),$(3),$(4)) From 9e447e8b2fdf94bed898208f69c2acf7a1856df0 Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sun, 1 Oct 2023 00:16:28 +0200 Subject: [PATCH 4022/5754] package/pkg-python.mk: replace $(_BASE_ENV) with $($(SETUP_TYPE)_ENV) The _BASE_ENV variable is set based on the setup type, and only based on the setup type. Because of this, we have a large conditional tree in inner-python-package which makes things hard to read. Rather than conditions, it's also possible to use indirect variables. Concretely, we can use $(PKG_PYTHON_$($(PKG)_SETUP_TYPE)_ENV) instead of $($(PKG)_BASE_ENV) to dispatch to the right ENV variable. Once we do the same for all other variables that are set in the condition tree, we'll be able to remove the condition tree entirely. Because $($(PKG)_SETUP_TYPE) is lowercase (e.g. 'setuptools' or 'pep517'), while the existing _ENV variables have uppercase names (e.g. PKG_PYTHON_SETUPTOOLS_ENV), we need to convert the setup type to uppercase. Introduce the variable $(PKG)_SETUP_TYPE_UPPER for this. flit was reusing the _BASE_ENV definition from pep517, and flit-bootstrap also didn't have its own _ENV definition yet, so those have to be added. Signed-off-by: Arnout Vandecappelle Signed-off-by: Yann E. MORIN --- package/pkg-python.mk | 52 ++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 28 deletions(-) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index c1640d71bb..8e8955f3c4 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -158,6 +158,18 @@ HOST_PKG_PYTHON_PEP517_INSTALL_OPTS = \ HOST_PKG_PYTHON_PEP517_BOOTSTRAP_INSTALL_OPTS = \ --installdir=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages +# Target flit packages +PKG_PYTHON_FLIT_ENV = \ + $(PKG_PYTHON_PEP517_ENV) + +# Host flit packages +HOST_PKG_PYTHON_FLIT_ENV = \ + $(HOST_PKG_PYTHON_PEP517_ENV) + +# Host flit-bootstrap packages +HOST_PKG_PYTHON_FLIT_BOOTSTRAP_ENV = \ + $(HOST_PKG_PYTHON_PEP517_ENV) + # Target maturin packages PKG_PYTHON_MATURIN_ENV = \ $(PKG_PYTHON_PEP517_ENV) \ @@ -194,54 +206,34 @@ ifndef $(2)_SETUP_TYPE endif endif +$(2)_SETUP_TYPE_UPPER = $$(call UPPERCASE,$$($(2)_SETUP_TYPE)) + # Distutils ifeq ($$($(2)_SETUP_TYPE),distutils) ifeq ($(4),target) -$(2)_BASE_ENV = $$(PKG_PYTHON_DISTUTILS_ENV) $(2)_BASE_BUILD_CMD = setup.py build $$(PKG_PYTHON_DISTUTILS_BUILD_OPTS) $(2)_BASE_INSTALL_TARGET_CMD = setup.py install --no-compile $$(PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS) $(2)_BASE_INSTALL_STAGING_CMD = setup.py install $$(PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS) else -$(2)_BASE_ENV = $$(HOST_PKG_PYTHON_DISTUTILS_ENV) $(2)_BASE_BUILD_CMD = setup.py build $(2)_BASE_INSTALL_CMD = setup.py install $$(HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS) endif # Setuptools else ifneq ($$(filter setuptools setuptools-rust,$$($(2)_SETUP_TYPE)),) ifeq ($(4),target) -ifeq ($$($(2)_SETUP_TYPE),setuptools-rust) -$(2)_BASE_ENV = $$(PKG_PYTHON_SETUPTOOLS_RUST_ENV) -else -$(2)_BASE_ENV = $$(PKG_PYTHON_SETUPTOOLS_ENV) -endif $(2)_BASE_BUILD_CMD = $$(PKG_PYTHON_SETUPTOOLS_CMD) build $(2)_BASE_INSTALL_TARGET_CMD = $$(PKG_PYTHON_SETUPTOOLS_CMD) install --no-compile $$(PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS) $(2)_BASE_INSTALL_STAGING_CMD = $$(PKG_PYTHON_SETUPTOOLS_CMD) install $$(PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS) else -ifeq ($$($(2)_SETUP_TYPE),setuptools-rust) -$(2)_BASE_ENV = $$(HOST_PKG_PYTHON_SETUPTOOLS_RUST_ENV) -else -$(2)_BASE_ENV = $$(HOST_PKG_PYTHON_SETUPTOOLS_ENV) -endif $(2)_BASE_BUILD_CMD = $$(PKG_PYTHON_SETUPTOOLS_CMD) build $(2)_BASE_INSTALL_CMD = $$(PKG_PYTHON_SETUPTOOLS_CMD) install $$(HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS) endif else ifneq ($$(filter flit maturin pep517,$$($(2)_SETUP_TYPE)),) ifeq ($(4),target) -ifeq ($$($(2)_SETUP_TYPE),maturin) -$(2)_BASE_ENV = $$(PKG_PYTHON_MATURIN_ENV) -else -$(2)_BASE_ENV = $$(PKG_PYTHON_PEP517_ENV) -endif $(2)_BASE_BUILD_CMD = -m build -n -w $(2)_BASE_INSTALL_TARGET_CMD = $(TOPDIR)/support/scripts/pyinstaller.py dist/* $$(PKG_PYTHON_PEP517_INSTALL_TARGET_OPTS) $(2)_BASE_INSTALL_STAGING_CMD = $(TOPDIR)/support/scripts/pyinstaller.py dist/* $$(PKG_PYTHON_PEP517_INSTALL_STAGING_OPTS) else -ifeq ($$($(2)_SETUP_TYPE),maturin) -$(2)_BASE_ENV = $$(HOST_PKG_PYTHON_MATURIN_ENV) -else -$(2)_BASE_ENV = $$(HOST_PKG_PYTHON_PEP517_ENV) -endif $(2)_BASE_BUILD_CMD = -m build -n -w $(2)_BASE_INSTALL_CMD = $(TOPDIR)/support/scripts/pyinstaller.py dist/* $$(HOST_PKG_PYTHON_PEP517_INSTALL_OPTS) endif @@ -249,7 +241,6 @@ else ifeq ($$($(2)_SETUP_TYPE),flit-bootstrap) ifeq ($(4),target) $$(error flit-bootstrap setup type only supported for host packages) else -$(2)_BASE_ENV = $$(HOST_PKG_PYTHON_PEP517_ENV) $(2)_BASE_BUILD_CMD = -m flit_core.wheel $(2)_BASE_INSTALL_CMD ?= $(TOPDIR)/support/scripts/pyinstaller.py dist/* $$(HOST_PKG_PYTHON_PEP517_INSTALL_OPTS) endif @@ -332,7 +323,8 @@ ifeq ($(4),target) ifndef $(2)_BUILD_CMDS define $(2)_BUILD_CMDS (cd $$($$(PKG)_BUILDDIR)/; \ - $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ + $$(PKG_PYTHON_$$($$(PKG)_SETUP_TYPE_UPPER)_ENV) \ + $$($$(PKG)_ENV) \ $$(HOST_DIR)/bin/python3 \ $$($$(PKG)_BASE_BUILD_CMD) \ $$($$(PKG)_BUILD_OPTS)) @@ -346,7 +338,8 @@ endif ifndef $(2)_INSTALL_TARGET_CMDS define $(2)_INSTALL_TARGET_CMDS (cd $$($$(PKG)_BUILDDIR)/; \ - $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ + $$(PKG_PYTHON_$$($$(PKG)_SETUP_TYPE_UPPER)_ENV) \ + $$($$(PKG)_ENV) \ $$(HOST_DIR)/bin/python3 \ $$($$(PKG)_BASE_INSTALL_TARGET_CMD) \ $$($$(PKG)_INSTALL_TARGET_OPTS)) @@ -360,7 +353,8 @@ endif ifndef $(2)_INSTALL_STAGING_CMDS define $(2)_INSTALL_STAGING_CMDS (cd $$($$(PKG)_BUILDDIR)/; \ - $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ + $$(PKG_PYTHON_$$($$(PKG)_SETUP_TYPE_UPPER)_ENV) \ + $$($$(PKG)_ENV) \ $$(HOST_DIR)/bin/python3 \ $$($$(PKG)_BASE_INSTALL_STAGING_CMD) \ $$($$(PKG)_INSTALL_STAGING_OPTS)) @@ -376,7 +370,8 @@ else # host ifndef $(2)_BUILD_CMDS define $(2)_BUILD_CMDS (cd $$($$(PKG)_BUILDDIR)/; \ - $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ + $$(HOST_PKG_PYTHON_$$($$(PKG)_SETUP_TYPE_UPPER)_ENV) \ + $$($$(PKG)_ENV) \ $$(HOST_DIR)/bin/python3 \ $$($$(PKG)_BASE_BUILD_CMD) \ $$($$(PKG)_BUILD_OPTS)) @@ -390,7 +385,8 @@ endif ifndef $(2)_INSTALL_CMDS define $(2)_INSTALL_CMDS (cd $$($$(PKG)_BUILDDIR)/; \ - $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ + $$(HOST_PKG_PYTHON_$$($$(PKG)_SETUP_TYPE_UPPER)_ENV) \ + $$($$(PKG)_ENV) \ $$(HOST_DIR)/bin/python3 \ $$($$(PKG)_BASE_INSTALL_CMD) \ $$($$(PKG)_INSTALL_OPTS)) From b28b95d1e4087e7569522565a8327f45f39e11de Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sun, 1 Oct 2023 00:16:29 +0200 Subject: [PATCH 4023/5754] package/pkg-python.mk: replace $(_BASE_BUILD_CMD) with $($(SETUP_TYPE)_BUILD_CMD) The _BASE_BUILD_CMD variable is set based on the setup type, and only based on the setup type. Because of this, we have a large conditional tree in inner-python-package which makes things hard to read. Rather than conditions, it's also possible to use indirect variables. Concretely, we can define PKG_PYTHON_DISTUTILS_BUILD_CMD etc., and use $(PKG_PYTHON_$($(PKG)_SETUP_TYPE)_BUILD_CMD) instead of $($(PKG)_BASE_BUILD_CMD) to dispatch to the right _BUILD_CMD variable. Once we do the same for all other variables that are set in the condition tree, we'll be able to remove the condition tree entirely. setuptools-rust, flit and maturin didn't have their own definition of _BUILD_CMD but were under the setuptools resp. pep517 condition. For these, we have to define new variables that copy the value from PKG_PYTHON_SETUPTOOLS_BUILD_CMD resp. PKG_PYTHON_PEP517_BUILD_CMD. Signed-off-by: Arnout Vandecappelle Signed-off-by: Yann E. MORIN --- package/pkg-python.mk | 50 ++++++++++++++++++++++++++++++++++--------- 1 file changed, 40 insertions(+), 10 deletions(-) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index 8e8955f3c4..5f8ef14262 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -57,7 +57,8 @@ PKG_PYTHON_DISTUTILS_ENV = \ $(PKG_PYTHON_ENV) \ LDSHARED="$(TARGET_CROSS)gcc -shared" -PKG_PYTHON_DISTUTILS_BUILD_OPTS = \ +PKG_PYTHON_DISTUTILS_BUILD_CMD = \ + setup.py build \ --executable=/usr/bin/python PKG_PYTHON_DISTUTILS_INSTALL_OPTS = \ @@ -76,6 +77,9 @@ PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS = \ HOST_PKG_PYTHON_DISTUTILS_ENV = \ $(HOST_PKG_PYTHON_ENV) +HOST_PKG_PYTHON_DISTUTILS_BUILD_CMD = \ + setup.py build \ + HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS = \ --prefix=$(HOST_DIR) @@ -86,6 +90,9 @@ PKG_PYTHON_SETUPTOOLS_ENV = \ PKG_PYTHON_SETUPTOOLS_CMD = \ $(if $(wildcard $($(PKG)_BUILDDIR)/setup.py),setup.py,-c 'from setuptools import setup;setup()') +PKG_PYTHON_SETUPTOOLS_BUILD_CMD = \ + $(PKG_PYTHON_SETUPTOOLS_CMD) build + PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \ --install-headers=/usr/include/python$(PYTHON3_VERSION_MAJOR) \ --prefix=/usr \ @@ -104,6 +111,9 @@ PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS = \ HOST_PKG_PYTHON_SETUPTOOLS_ENV = \ $(HOST_PKG_PYTHON_ENV) +HOST_PKG_PYTHON_SETUPTOOLS_BUILD_CMD = \ + $(PKG_PYTHON_SETUPTOOLS_CMD) build + HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \ --prefix=$(HOST_DIR) \ --root=/ \ @@ -115,16 +125,25 @@ PKG_PYTHON_SETUPTOOLS_RUST_ENV = \ $(PKG_CARGO_ENV) \ PYO3_CROSS_LIB_DIR="$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)" +PKG_PYTHON_SETUPTOOLS_RUST_BUILD_CMD = \ + $(PKG_PYTHON_SETUPTOOLS_BUILD_CMD) + # Host setuptools-rust-based packages HOST_PKG_PYTHON_SETUPTOOLS_RUST_ENV = \ $(HOST_PKG_PYTHON_SETUPTOOLS_ENV) \ $(HOST_PKG_CARGO_ENV) \ PYO3_CROSS_LIB_DIR="$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)" +HOST_PKG_PYTHON_SETUPTOOLS_RUST_BUILD_CMD = \ + $(HOST_PKG_PYTHON_SETUPTOOLS_BUILD_CMD) + # Target pep517-based packages PKG_PYTHON_PEP517_ENV = \ $(PKG_PYTHON_ENV) +PKG_PYTHON_PEP517_BUILD_CMD = \ + -m build -n -w + PKG_PYTHON_PEP517_INSTALL_OPTS = \ --interpreter=/usr/bin/python \ --script-kind=posix @@ -147,6 +166,9 @@ PKG_PYTHON_PEP517_INSTALL_STAGING_OPTS = \ HOST_PKG_PYTHON_PEP517_ENV = \ $(HOST_PKG_PYTHON_ENV) +HOST_PKG_PYTHON_PEP517_BUILD_CMD = \ + -m build -n -w + HOST_PKG_PYTHON_PEP517_INSTALL_OPTS = \ --interpreter=$(HOST_DIR)/bin/python \ --script-kind=posix \ @@ -162,26 +184,41 @@ HOST_PKG_PYTHON_PEP517_BOOTSTRAP_INSTALL_OPTS = \ PKG_PYTHON_FLIT_ENV = \ $(PKG_PYTHON_PEP517_ENV) +PKG_PYTHON_FLIT_BUILD_CMD = \ + $(PKG_PYTHON_PEP517_BUILD_CMD) + # Host flit packages HOST_PKG_PYTHON_FLIT_ENV = \ $(HOST_PKG_PYTHON_PEP517_ENV) +HOST_PKG_PYTHON_FLIT_BUILD_CMD = \ + $(HOST_PKG_PYTHON_PEP517_BUILD_CMD) + # Host flit-bootstrap packages HOST_PKG_PYTHON_FLIT_BOOTSTRAP_ENV = \ $(HOST_PKG_PYTHON_PEP517_ENV) +HOST_PKG_PYTHON_FLIT_BOOTSTRAP_BUILD_CMD = \ + -m flit_core.wheel + # Target maturin packages PKG_PYTHON_MATURIN_ENV = \ $(PKG_PYTHON_PEP517_ENV) \ $(PKG_CARGO_ENV) \ PYO3_CROSS_LIB_DIR="$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)" +PKG_PYTHON_MATURIN_BUILD_CMD = \ + $(PKG_PYTHON_PEP517_BUILD_CMD) + # Host maturin packages HOST_PKG_PYTHON_MATURIN_ENV = \ $(HOST_PKG_PYTHON_PEP517_ENV) \ $(HOST_PKG_CARGO_ENV) \ PYO3_CROSS_LIB_DIR="$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)" +HOST_PKG_PYTHON_MATURIN_BUILD_CMD = \ + $(HOST_PKG_PYTHON_PEP517_BUILD_CMD) + ################################################################################ # inner-python-package -- defines how the configuration, compilation # and installation of a Python package should be done, implements a @@ -211,37 +248,30 @@ $(2)_SETUP_TYPE_UPPER = $$(call UPPERCASE,$$($(2)_SETUP_TYPE)) # Distutils ifeq ($$($(2)_SETUP_TYPE),distutils) ifeq ($(4),target) -$(2)_BASE_BUILD_CMD = setup.py build $$(PKG_PYTHON_DISTUTILS_BUILD_OPTS) $(2)_BASE_INSTALL_TARGET_CMD = setup.py install --no-compile $$(PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS) $(2)_BASE_INSTALL_STAGING_CMD = setup.py install $$(PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS) else -$(2)_BASE_BUILD_CMD = setup.py build $(2)_BASE_INSTALL_CMD = setup.py install $$(HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS) endif # Setuptools else ifneq ($$(filter setuptools setuptools-rust,$$($(2)_SETUP_TYPE)),) ifeq ($(4),target) -$(2)_BASE_BUILD_CMD = $$(PKG_PYTHON_SETUPTOOLS_CMD) build $(2)_BASE_INSTALL_TARGET_CMD = $$(PKG_PYTHON_SETUPTOOLS_CMD) install --no-compile $$(PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS) $(2)_BASE_INSTALL_STAGING_CMD = $$(PKG_PYTHON_SETUPTOOLS_CMD) install $$(PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS) else -$(2)_BASE_BUILD_CMD = $$(PKG_PYTHON_SETUPTOOLS_CMD) build $(2)_BASE_INSTALL_CMD = $$(PKG_PYTHON_SETUPTOOLS_CMD) install $$(HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS) endif else ifneq ($$(filter flit maturin pep517,$$($(2)_SETUP_TYPE)),) ifeq ($(4),target) -$(2)_BASE_BUILD_CMD = -m build -n -w $(2)_BASE_INSTALL_TARGET_CMD = $(TOPDIR)/support/scripts/pyinstaller.py dist/* $$(PKG_PYTHON_PEP517_INSTALL_TARGET_OPTS) $(2)_BASE_INSTALL_STAGING_CMD = $(TOPDIR)/support/scripts/pyinstaller.py dist/* $$(PKG_PYTHON_PEP517_INSTALL_STAGING_OPTS) else -$(2)_BASE_BUILD_CMD = -m build -n -w $(2)_BASE_INSTALL_CMD = $(TOPDIR)/support/scripts/pyinstaller.py dist/* $$(HOST_PKG_PYTHON_PEP517_INSTALL_OPTS) endif else ifeq ($$($(2)_SETUP_TYPE),flit-bootstrap) ifeq ($(4),target) $$(error flit-bootstrap setup type only supported for host packages) else -$(2)_BASE_BUILD_CMD = -m flit_core.wheel $(2)_BASE_INSTALL_CMD ?= $(TOPDIR)/support/scripts/pyinstaller.py dist/* $$(HOST_PKG_PYTHON_PEP517_INSTALL_OPTS) endif else @@ -326,7 +356,7 @@ define $(2)_BUILD_CMDS $$(PKG_PYTHON_$$($$(PKG)_SETUP_TYPE_UPPER)_ENV) \ $$($$(PKG)_ENV) \ $$(HOST_DIR)/bin/python3 \ - $$($$(PKG)_BASE_BUILD_CMD) \ + $$(PKG_PYTHON_$$($$(PKG)_SETUP_TYPE_UPPER)_BUILD_CMD) \ $$($$(PKG)_BUILD_OPTS)) endef endif @@ -373,7 +403,7 @@ define $(2)_BUILD_CMDS $$(HOST_PKG_PYTHON_$$($$(PKG)_SETUP_TYPE_UPPER)_ENV) \ $$($$(PKG)_ENV) \ $$(HOST_DIR)/bin/python3 \ - $$($$(PKG)_BASE_BUILD_CMD) \ + $$(HOST_PKG_PYTHON_$$($$(PKG)_SETUP_TYPE_UPPER)_BUILD_CMD) \ $$($$(PKG)_BUILD_OPTS)) endef endif From 906a9fb98972683c8db3820c073ddaa0a0218212 Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sun, 1 Oct 2023 00:16:30 +0200 Subject: [PATCH 4024/5754] package/python-flit-core: instantiate _INSTALL_CMDS host-python-flit-core is the only package that overrides _BASE_INSTALL_CMD. Since we're going to remove that variable in a follow-up patch, we no longer will be able to do that. Since host-python-flit-core is really a special case, it makes sense to define HOST_PYTHON_FLIT_CORE_INSTALL_CMDS in its entirety. While we're at it, also instantiate HOST_PKG_PYTHON_PEP517_BOOTSTRAP_INSTALL_OPTS directly there. This variable is not used anywhere else, and it's a bit confusing to have it in pkg-python.mk - it looks like a mistake. Signed-off-by: Arnout Vandecappelle Signed-off-by: Yann E. MORIN --- package/pkg-python.mk | 3 --- package/python-flit-core/python-flit-core.mk | 9 +++++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index 5f8ef14262..be9756acc4 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -177,9 +177,6 @@ HOST_PKG_PYTHON_PEP517_INSTALL_OPTS = \ --scripts=$(HOST_DIR)/bin \ --data=$(HOST_DIR) -HOST_PKG_PYTHON_PEP517_BOOTSTRAP_INSTALL_OPTS = \ - --installdir=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages - # Target flit packages PKG_PYTHON_FLIT_ENV = \ $(PKG_PYTHON_PEP517_ENV) diff --git a/package/python-flit-core/python-flit-core.mk b/package/python-flit-core/python-flit-core.mk index ea887a0258..34e58d03ca 100644 --- a/package/python-flit-core/python-flit-core.mk +++ b/package/python-flit-core/python-flit-core.mk @@ -13,7 +13,12 @@ PYTHON_FLIT_CORE_SETUP_TYPE = flit-bootstrap # Use flit built in bootstrap_install for installing host-python-flit-core. # This is due to host-python-installer depending on host-python-flit-core. -# -HOST_PYTHON_FLIT_CORE_BASE_INSTALL_CMD = -m bootstrap_install dist/* $(HOST_PKG_PYTHON_PEP517_BOOTSTRAP_INSTALL_OPTS) +define HOST_PYTHON_FLIT_CORE_INSTALL_CMDS + cd $($(PKG)_BUILDDIR)/; \ + $(HOST_PKG_PYTHON_FLIT_BOOTSTRAP_ENV) \ + $(HOST_DIR)/bin/python3 \ + -m bootstrap_install dist/* \ + --installdir=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages +endef $(eval $(host-python-package)) From fde20964c71202589568d84de0c3bb4c3d6e9b17 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 25 Nov 2023 21:23:13 +0100 Subject: [PATCH 4025/5754] package/jailhouse: move conditional build/install to macro The usual way of having conditional build and installation of parts of a generic-package, is to conditionally define macros that do that build and installation, and unconditionally expand the macros in the _BUILD_CMDS and _INSTALL_CMDS. Do that in jailhouse, which used to use an ad-hoc conditional block directly in _BUILD_CMDS and _INSTALL_CMDS. Signed-off-by: Yann E. MORIN --- package/jailhouse/jailhouse.mk | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/package/jailhouse/jailhouse.mk b/package/jailhouse/jailhouse.mk index 6356c5a7aa..913be765bd 100644 --- a/package/jailhouse/jailhouse.mk +++ b/package/jailhouse/jailhouse.mk @@ -30,11 +30,26 @@ JAILHOUSE_MAKE_OPTS += \ PYTHON_PIP_USABLE="no" endif +ifeq ($(BR2_PACKAGE_JAILHOUSE_HELPER_SCRIPTS),y) +define JAILHOUSE_BUILD_HELPER_SCRIPTS + cd $(@D) && \ + $(PKG_PYTHON_SETUPTOOLS_ENV) \ + $(HOST_DIR)/bin/python setup.py \ + build +endef +define JAILHOUSE_INSTALL_HELPER_SCRIPTS + cd $(@D) && \ + $(PKG_PYTHON_SETUPTOOLS_ENV) \ + $(HOST_DIR)/bin/python setup.py \ + install --no-compile \ + $(PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS) +endef +endif + define JAILHOUSE_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(JAILHOUSE_MAKE_OPTS) -C $(@D) - $(if $(BR2_PACKAGE_JAILHOUSE_HELPER_SCRIPTS), \ - cd $(@D) && $(PKG_PYTHON_SETUPTOOLS_ENV) $(HOST_DIR)/bin/python setup.py build) + $(JAILHOUSE_BUILD_HELPER_SCRIPTS) endef define JAILHOUSE_INSTALL_TARGET_CMDS @@ -47,8 +62,7 @@ define JAILHOUSE_INSTALL_TARGET_CMDS $(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/local/libexec/jailhouse/demos $(INSTALL) -D -m 0755 $(@D)/inmates/demos/*/*.bin $(TARGET_DIR)/usr/local/libexec/jailhouse/demos - $(if $(BR2_PACKAGE_JAILHOUSE_HELPER_SCRIPTS), \ - cd $(@D) && $(PKG_PYTHON_SETUPTOOLS_ENV) $(HOST_DIR)/bin/python setup.py install --no-compile $(PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS)) + $(JAILHOUSE_INSTALL_HELPER_SCRIPTS) endef $(eval $(generic-package)) From 0c54deff255d433db46e6c5ecd14c8e97f1715dd Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sun, 1 Oct 2023 00:16:31 +0200 Subject: [PATCH 4026/5754] package/jailhouse: expand PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS In a follow-up patch, we want to remove this variable. Replace it with its expansion, which is anyway just $(PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS) --root=$(TARGET_DIR) Signed-off-by: Arnout Vandecappelle [yann.morin.1998@free.fr: - fixup after introduction of JAILHOUSE_INSTALL_HELPER_SCRIPTS ] Signed-off-by: Yann E. MORIN --- package/jailhouse/jailhouse.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/jailhouse/jailhouse.mk b/package/jailhouse/jailhouse.mk index 913be765bd..c239e75e76 100644 --- a/package/jailhouse/jailhouse.mk +++ b/package/jailhouse/jailhouse.mk @@ -42,7 +42,8 @@ define JAILHOUSE_INSTALL_HELPER_SCRIPTS $(PKG_PYTHON_SETUPTOOLS_ENV) \ $(HOST_DIR)/bin/python setup.py \ install --no-compile \ - $(PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS) + $(PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS) \ + --root=$(TARGET_DIR)) endef endif From ee9b7ee9ce60476609a66c35f4fa94ba7f61175b Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sun, 1 Oct 2023 00:16:32 +0200 Subject: [PATCH 4027/5754] package/i2c-tools: expand PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS In a follow-up patch, we want to remove this variable. Replace it with its expansion, which is anyway just $(PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS) --root=$(TARGET_DIR) Also remove PKG_PYTHON_SETUPTOOLS_BUILD_OPTS, which is not defined (i.e. empty). Signed-off-by: Arnout Vandecappelle Signed-off-by: Yann E. MORIN --- package/i2c-tools/i2c-tools.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/i2c-tools/i2c-tools.mk b/package/i2c-tools/i2c-tools.mk index adccd9475d..f8d1bcb4b0 100644 --- a/package/i2c-tools/i2c-tools.mk +++ b/package/i2c-tools/i2c-tools.mk @@ -36,15 +36,15 @@ I2C_TOOLS_PYTHON_BASE_ENV = \ define I2C_TOOLS_BUILD_PYSMBUS (cd $(@D)/py-smbus; \ $(I2C_TOOLS_PYTHON_BASE_ENV) \ - $(HOST_DIR)/bin/python setup.py build \ - $(PKG_PYTHON_SETUPTOOLS_BUILD_OPTS)) + $(HOST_DIR)/bin/python setup.py build) endef define I2C_TOOLS_INSTALL_PYSMBUS (cd $(@D)/py-smbus; \ $(I2C_TOOLS_PYTHON_BASE_ENV) \ $(HOST_DIR)/bin/python setup.py install \ - $(PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS)) + $(PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS) \ + --root=$(TARGET_DIR)) endef endif # BR2_PACKAGE_PYTHON3 From 6b915358babe37a721b4f6e032ec884174bd6e0b Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sun, 1 Oct 2023 00:16:33 +0200 Subject: [PATCH 4028/5754] package/pkg-python.mk: replace $(_BASE_INSTALL*_CMD) with $($(SETUP_TYPE)_INSTALL*_CMD) The _BASE_INSTALL*_CMD variables are set based on the setup type, and only based on the setup type. Because of this, we have a large conditional tree in inner-python-package which makes things hard to read. Rather than conditions, it's also possible to use indirect variables. Concretely, we can define PKG_PYTHON_DISTUTILS_INSTALL_TARGET_CMD etc., and use $(PKG_PYTHON_$($(PKG)_SETUP_TYPE)_INSTALL_TARGET_CMD) instead of $($(PKG)_BASE_INSTALL_TARGET_CMD) to dispatch to the right _INSTALL_TARGET_CMD variable. The same applies to _INSTALL_STAGING_CMD and HOST_..._INSTALL_CMD. Since the _INSTALL*_OPTS variables are not (or no longer) used anywhere else, we can fold them into the _INSTALL*_CMD variables. setuptools-rust, flit and maturin didn't have their own definition of _BUILD_CMD but were under the setuptools resp. pep517 condition. For these, we have to define new variables that copy the value from PKG_PYTHON_SETUPTOOLS_BUILD_CMD resp. PKG_PYTHON_PEP517_BUILD_CMD. The condition tree is now empty, except for the error handling. Rework the conditions for the error handling and remove all other conditions. Signed-off-by: Arnout Vandecappelle Signed-off-by: Yann E. MORIN --- package/pkg-python.mk | 101 +++++++++++++++++++++++++----------------- 1 file changed, 60 insertions(+), 41 deletions(-) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index be9756acc4..bda79116c8 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -65,11 +65,13 @@ PKG_PYTHON_DISTUTILS_INSTALL_OPTS = \ --install-headers=/usr/include/python$(PYTHON3_VERSION_MAJOR) \ --prefix=/usr -PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS = \ +PKG_PYTHON_DISTUTILS_INSTALL_TARGET_CMD = \ + setup.py install --no-compile \ $(PKG_PYTHON_DISTUTILS_INSTALL_OPTS) \ --root=$(TARGET_DIR) -PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS = \ +PKG_PYTHON_DISTUTILS_INSTALL_STAGING_CMD = \ + setup.py install \ $(PKG_PYTHON_DISTUTILS_INSTALL_OPTS) \ --root=$(STAGING_DIR) @@ -80,7 +82,8 @@ HOST_PKG_PYTHON_DISTUTILS_ENV = \ HOST_PKG_PYTHON_DISTUTILS_BUILD_CMD = \ setup.py build \ -HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS = \ +HOST_PKG_PYTHON_DISTUTILS_INSTALL_CMD = \ + setup.py install \ --prefix=$(HOST_DIR) # Target setuptools-based packages @@ -99,11 +102,15 @@ PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \ --executable=/usr/bin/python \ --single-version-externally-managed -PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS = \ +PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_CMD = \ + $(PKG_PYTHON_SETUPTOOLS_CMD) \ + install --no-compile \ $(PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS) \ --root=$(TARGET_DIR) -PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS = \ +PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_CMD = \ + $(PKG_PYTHON_SETUPTOOLS_CMD) \ + install \ $(PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS) \ --root=$(STAGING_DIR) @@ -114,7 +121,9 @@ HOST_PKG_PYTHON_SETUPTOOLS_ENV = \ HOST_PKG_PYTHON_SETUPTOOLS_BUILD_CMD = \ $(PKG_PYTHON_SETUPTOOLS_CMD) build -HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \ +HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_CMD = \ + $(PKG_PYTHON_SETUPTOOLS_CMD) \ + install \ --prefix=$(HOST_DIR) \ --root=/ \ --single-version-externally-managed @@ -128,6 +137,12 @@ PKG_PYTHON_SETUPTOOLS_RUST_ENV = \ PKG_PYTHON_SETUPTOOLS_RUST_BUILD_CMD = \ $(PKG_PYTHON_SETUPTOOLS_BUILD_CMD) +PKG_PYTHON_SETUPTOOLS_RUST_INSTALL_TARGET_CMD = \ + $(PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_CMD) + +PKG_PYTHON_SETUPTOOLS_RUST_INSTALL_STAGING_CMD = \ + $(PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_CMD) + # Host setuptools-rust-based packages HOST_PKG_PYTHON_SETUPTOOLS_RUST_ENV = \ $(HOST_PKG_PYTHON_SETUPTOOLS_ENV) \ @@ -137,6 +152,9 @@ HOST_PKG_PYTHON_SETUPTOOLS_RUST_ENV = \ HOST_PKG_PYTHON_SETUPTOOLS_RUST_BUILD_CMD = \ $(HOST_PKG_PYTHON_SETUPTOOLS_BUILD_CMD) +HOST_PKG_PYTHON_SETUPTOOLS_RUST_INSTALL_CMD = \ + $(HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_CMD) + # Target pep517-based packages PKG_PYTHON_PEP517_ENV = \ $(PKG_PYTHON_ENV) @@ -148,14 +166,18 @@ PKG_PYTHON_PEP517_INSTALL_OPTS = \ --interpreter=/usr/bin/python \ --script-kind=posix -PKG_PYTHON_PEP517_INSTALL_TARGET_OPTS = \ +PKG_PYTHON_PEP517_INSTALL_TARGET_CMD = \ + $(TOPDIR)/support/scripts/pyinstaller.py \ + dist/* \ $(PKG_PYTHON_PEP517_INSTALL_OPTS) \ --purelib=$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ --headers=$(TARGET_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ --scripts=$(TARGET_DIR)/usr/bin \ --data=$(TARGET_DIR)/usr -PKG_PYTHON_PEP517_INSTALL_STAGING_OPTS = \ +PKG_PYTHON_PEP517_INSTALL_STAGING_CMD = \ + $(TOPDIR)/support/scripts/pyinstaller.py \ + dist/* \ $(PKG_PYTHON_PEP517_INSTALL_OPTS) \ --purelib=$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ --headers=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ @@ -169,7 +191,9 @@ HOST_PKG_PYTHON_PEP517_ENV = \ HOST_PKG_PYTHON_PEP517_BUILD_CMD = \ -m build -n -w -HOST_PKG_PYTHON_PEP517_INSTALL_OPTS = \ +HOST_PKG_PYTHON_PEP517_INSTALL_CMD = \ + $(TOPDIR)/support/scripts/pyinstaller.py \ + dist/* \ --interpreter=$(HOST_DIR)/bin/python \ --script-kind=posix \ --purelib=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ @@ -184,6 +208,12 @@ PKG_PYTHON_FLIT_ENV = \ PKG_PYTHON_FLIT_BUILD_CMD = \ $(PKG_PYTHON_PEP517_BUILD_CMD) +PKG_PYTHON_FLIT_INSTALL_TARGET_CMD = \ + $(PKG_PYTHON_PEP517_INSTALL_TARGET_CMD) + +PKG_PYTHON_FLIT_INSTALL_STAGING_CMD = \ + $(PKG_PYTHON_PEP517_INSTALL_STAGING_CMD) + # Host flit packages HOST_PKG_PYTHON_FLIT_ENV = \ $(HOST_PKG_PYTHON_PEP517_ENV) @@ -191,6 +221,9 @@ HOST_PKG_PYTHON_FLIT_ENV = \ HOST_PKG_PYTHON_FLIT_BUILD_CMD = \ $(HOST_PKG_PYTHON_PEP517_BUILD_CMD) +HOST_PKG_PYTHON_FLIT_INSTALL_CMD = \ + $(HOST_PKG_PYTHON_PEP517_INSTALL_CMD) + # Host flit-bootstrap packages HOST_PKG_PYTHON_FLIT_BOOTSTRAP_ENV = \ $(HOST_PKG_PYTHON_PEP517_ENV) @@ -198,6 +231,9 @@ HOST_PKG_PYTHON_FLIT_BOOTSTRAP_ENV = \ HOST_PKG_PYTHON_FLIT_BOOTSTRAP_BUILD_CMD = \ -m flit_core.wheel +HOST_PKG_PYTHON_FLIT_BOOTSTRAP_INSTALL_CMD = \ + $(HOST_PKG_PYTHON_PEP517_INSTALL_CMD) + # Target maturin packages PKG_PYTHON_MATURIN_ENV = \ $(PKG_PYTHON_PEP517_ENV) \ @@ -207,6 +243,12 @@ PKG_PYTHON_MATURIN_ENV = \ PKG_PYTHON_MATURIN_BUILD_CMD = \ $(PKG_PYTHON_PEP517_BUILD_CMD) +PKG_PYTHON_MATURIN_INSTALL_TARGET_CMD = \ + $(PKG_PYTHON_PEP517_INSTALL_TARGET_CMD) + +PKG_PYTHON_MATURIN_INSTALL_STAGING_CMD = \ + $(PKG_PYTHON_PEP517_INSTALL_STAGING_CMD) + # Host maturin packages HOST_PKG_PYTHON_MATURIN_ENV = \ $(HOST_PKG_PYTHON_PEP517_ENV) \ @@ -216,6 +258,9 @@ HOST_PKG_PYTHON_MATURIN_ENV = \ HOST_PKG_PYTHON_MATURIN_BUILD_CMD = \ $(HOST_PKG_PYTHON_PEP517_BUILD_CMD) +PKG_PYTHON_MATURIN_INSTALL_CMD = \ + $(PKG_PYTHON_PEP517_INSTALL_CMD) + ################################################################################ # inner-python-package -- defines how the configuration, compilation # and installation of a Python package should be done, implements a @@ -242,37 +287,11 @@ endif $(2)_SETUP_TYPE_UPPER = $$(call UPPERCASE,$$($(2)_SETUP_TYPE)) -# Distutils -ifeq ($$($(2)_SETUP_TYPE),distutils) -ifeq ($(4),target) -$(2)_BASE_INSTALL_TARGET_CMD = setup.py install --no-compile $$(PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS) -$(2)_BASE_INSTALL_STAGING_CMD = setup.py install $$(PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS) -else -$(2)_BASE_INSTALL_CMD = setup.py install $$(HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS) -endif -# Setuptools -else ifneq ($$(filter setuptools setuptools-rust,$$($(2)_SETUP_TYPE)),) -ifeq ($(4),target) -$(2)_BASE_INSTALL_TARGET_CMD = $$(PKG_PYTHON_SETUPTOOLS_CMD) install --no-compile $$(PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS) -$(2)_BASE_INSTALL_STAGING_CMD = $$(PKG_PYTHON_SETUPTOOLS_CMD) install $$(PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS) -else -$(2)_BASE_INSTALL_CMD = $$(PKG_PYTHON_SETUPTOOLS_CMD) install $$(HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS) -endif -else ifneq ($$(filter flit maturin pep517,$$($(2)_SETUP_TYPE)),) -ifeq ($(4),target) -$(2)_BASE_INSTALL_TARGET_CMD = $(TOPDIR)/support/scripts/pyinstaller.py dist/* $$(PKG_PYTHON_PEP517_INSTALL_TARGET_OPTS) -$(2)_BASE_INSTALL_STAGING_CMD = $(TOPDIR)/support/scripts/pyinstaller.py dist/* $$(PKG_PYTHON_PEP517_INSTALL_STAGING_OPTS) -else -$(2)_BASE_INSTALL_CMD = $(TOPDIR)/support/scripts/pyinstaller.py dist/* $$(HOST_PKG_PYTHON_PEP517_INSTALL_OPTS) +ifneq ($$(filter-out distutils setuptools setuptools-rust pep517 flit flit-bootstrap maturin,$$($(2)_SETUP_TYPE)),) +$$(error "Invalid $(2)_SETUP_TYPE. Valid options are 'distutils', 'maturin', 'setuptools', 'setuptools-rust', 'pep517' or 'flit'.") endif -else ifeq ($$($(2)_SETUP_TYPE),flit-bootstrap) -ifeq ($(4),target) +ifeq ($(4)-$$($(2)_SETUP_TYPE),target-flit-bootstrap) $$(error flit-bootstrap setup type only supported for host packages) -else -$(2)_BASE_INSTALL_CMD ?= $(TOPDIR)/support/scripts/pyinstaller.py dist/* $$(HOST_PKG_PYTHON_PEP517_INSTALL_OPTS) -endif -else -$$(error "Invalid $(2)_SETUP_TYPE. Valid options are 'distutils', 'maturin', 'setuptools', 'setuptools-rust', 'pep517' or 'flit'.") endif # We need to vendor the Cargo crates at download time for pyo3 based @@ -368,7 +387,7 @@ define $(2)_INSTALL_TARGET_CMDS $$(PKG_PYTHON_$$($$(PKG)_SETUP_TYPE_UPPER)_ENV) \ $$($$(PKG)_ENV) \ $$(HOST_DIR)/bin/python3 \ - $$($$(PKG)_BASE_INSTALL_TARGET_CMD) \ + $$(PKG_PYTHON_$$($$(PKG)_SETUP_TYPE_UPPER)_INSTALL_TARGET_CMD) \ $$($$(PKG)_INSTALL_TARGET_OPTS)) endef endif @@ -383,7 +402,7 @@ define $(2)_INSTALL_STAGING_CMDS $$(PKG_PYTHON_$$($$(PKG)_SETUP_TYPE_UPPER)_ENV) \ $$($$(PKG)_ENV) \ $$(HOST_DIR)/bin/python3 \ - $$($$(PKG)_BASE_INSTALL_STAGING_CMD) \ + $$(PKG_PYTHON_$$($$(PKG)_SETUP_TYPE_UPPER)_INSTALL_STAGING_CMD) \ $$($$(PKG)_INSTALL_STAGING_OPTS)) endef endif @@ -415,7 +434,7 @@ define $(2)_INSTALL_CMDS $$(HOST_PKG_PYTHON_$$($$(PKG)_SETUP_TYPE_UPPER)_ENV) \ $$($$(PKG)_ENV) \ $$(HOST_DIR)/bin/python3 \ - $$($$(PKG)_BASE_INSTALL_CMD) \ + $$(HOST_PKG_PYTHON_$$($$(PKG)_SETUP_TYPE_UPPER)_INSTALL_CMD) \ $$($$(PKG)_INSTALL_OPTS)) endef endif From bfafe9b3e9c5a5ae7767c534dccca2d14e50b41c Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sun, 1 Oct 2023 00:16:34 +0200 Subject: [PATCH 4029/5754] docs/manual: remove references to PKG_PYTHON_*_OPTS These variables were removed. In addition, the text describing them wasn't terribly useful. Just remove the sentences describing them. Signed-off-by: Arnout Vandecappelle Signed-off-by: Yann E. MORIN --- docs/manual/adding-packages-python.adoc | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/docs/manual/adding-packages-python.adoc b/docs/manual/adding-packages-python.adoc index 500967f235..33dbfc30a5 100644 --- a/docs/manual/adding-packages-python.adoc +++ b/docs/manual/adding-packages-python.adoc @@ -135,25 +135,13 @@ therefore only use a few of them, or none. makes sense to use for distutils/setuptools based packages as flit/pep517 based packages do not pass these options to a +setup.py+ script but instead pass them to +support/scripts/pyinstaller.py+. - For target distutils packages, the +PKG_PYTHON_DISTUTILS_BUILD_OPTS+ - options are already passed automatically by the infrastructure. * +PYTHON_FOO_INSTALL_TARGET_OPTS+, +PYTHON_FOO_INSTALL_STAGING_OPTS+, +HOST_PYTHON_FOO_INSTALL_OPTS+ to specify additional options to pass to the Python +setup.py+ script (for distutils/setuptools packages) or +support/scripts/pyinstaller.py+ (for flit/pep517 packages) during the target installation step, the staging installation step or the - host installation, respectively. Note that the infrastructure is - automatically passing some options, defined in - +PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS+ or - +PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS+ (for target distutils - packages), +HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS+ (for host - distutils packages), +PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS+ or - +PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS+ (for target setuptools - packages), +HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS+ (for host - setuptools packages) and +PKG_PYTHON_PEP517_INSTALL_TARGET_OPTS+ or - +PKG_PYTHON_PEP517_INSTALL_STAGING_OPTS+ (for target flit/pep517 - packages). + host installation, respectively. With the Python infrastructure, all the steps required to build and install the packages are already defined, and they generally work well From 6a94b0b763555f865046bd1dd0be0253cb7e5957 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 23 Nov 2023 22:52:50 +0100 Subject: [PATCH 4030/5754] 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 0000000000..e9b7832837 --- /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 621a549023..c8b0c9694a 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 4031/5754] 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 9a164c8374..93bc46643c 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 4032/5754] 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 0000000000..55321ee2fc --- /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 3a73e5e94f..f0327ce8cc 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 f0461ea9ec..6ea3d22ba5 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 4033/5754] 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 6ea3d22ba5..c7b0ed0407 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 0f26d434278ac641815e0fd856cc771d65f91617 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sat, 25 Nov 2023 01:10:50 -0700 Subject: [PATCH 4034/5754] package/python-annotated-types: new package Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/Config.in | 1 + package/python-annotated-types/Config.in | 6 ++++++ .../python-annotated-types.hash | 5 +++++ .../python-annotated-types.mk | 15 +++++++++++++++ 4 files changed, 27 insertions(+) create mode 100644 package/python-annotated-types/Config.in create mode 100644 package/python-annotated-types/python-annotated-types.hash create mode 100644 package/python-annotated-types/python-annotated-types.mk diff --git a/package/Config.in b/package/Config.in index 5a3410d758..68e6e29a4d 100644 --- a/package/Config.in +++ b/package/Config.in @@ -974,6 +974,7 @@ menu "External python modules" source "package/python-aiozipkin/Config.in" source "package/python-alembic/Config.in" source "package/python-alsaaudio/Config.in" + source "package/python-annotated-types/Config.in" source "package/python-ansicolors/Config.in" source "package/python-apispec/Config.in" source "package/python-appdirs/Config.in" diff --git a/package/python-annotated-types/Config.in b/package/python-annotated-types/Config.in new file mode 100644 index 0000000000..36525a526b --- /dev/null +++ b/package/python-annotated-types/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_ANNOTATED_TYPES + bool "python-annotated-types" + help + Reusable constraint types to use with typing.Annotated. + + https://github.com/annotated-types/annotated-types diff --git a/package/python-annotated-types/python-annotated-types.hash b/package/python-annotated-types/python-annotated-types.hash new file mode 100644 index 0000000000..1663bcb51f --- /dev/null +++ b/package/python-annotated-types/python-annotated-types.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/annotated-types/json +md5 5fe2125b08851f0d05a8efad6456861c annotated_types-0.6.0.tar.gz +sha256 563339e807e53ffd9c267e99fc6d9ea23eb8443c08f112651963e24e22f84a5d annotated_types-0.6.0.tar.gz +# Locally computed sha256 checksums +sha256 fe1049884b1a0d9342901e88e07f32925d24b3121d9972b6a6805fb9824b095d LICENSE diff --git a/package/python-annotated-types/python-annotated-types.mk b/package/python-annotated-types/python-annotated-types.mk new file mode 100644 index 0000000000..8bc617069d --- /dev/null +++ b/package/python-annotated-types/python-annotated-types.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-annotated-types +# +################################################################################ + +PYTHON_ANNOTATED_TYPES_VERSION = 0.6.0 +PYTHON_ANNOTATED_TYPES_SOURCE = annotated_types-$(PYTHON_ANNOTATED_TYPES_VERSION).tar.gz +PYTHON_ANNOTATED_TYPES_SITE = https://files.pythonhosted.org/packages/67/fe/8c7b275824c6d2cd17c93ee85d0ee81c090285b6d52f4876ccc47cf9c3c4 +PYTHON_ANNOTATED_TYPES_SETUP_TYPE = pep517 +PYTHON_ANNOTATED_TYPES_LICENSE = MIT +PYTHON_ANNOTATED_TYPES_LICENSE_FILES = LICENSE +PYTHON_ANNOTATED_TYPES_DEPENDENCIES = host-python-hatchling + +$(eval $(python-package)) From 92fcdbd3e23aa03326d203271d02595409452690 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sat, 25 Nov 2023 01:10:51 -0700 Subject: [PATCH 4035/5754] package/python-pydantic-core: new package Although pydantic-core likely implements a subset of the functionality in pydantic 1.10.8 as we currently package, there will not be any conflict as the modules namespace differ: import pydantic # 1.10.8 import pydantic_core So, we can add pydantic-core, then bump pydantic; we don't need to do both in the same commit. Signed-off-by: James Hilliard [yann.morin.1998@free.fr: add explanations from James about no-conflict] Signed-off-by: Yann E. MORIN --- package/Config.in | 1 + package/python-pydantic-core/Config.in | 8 ++++++++ .../python-pydantic-core.hash | 4 ++++ .../python-pydantic-core/python-pydantic-core.mk | 15 +++++++++++++++ 4 files changed, 28 insertions(+) create mode 100644 package/python-pydantic-core/Config.in create mode 100644 package/python-pydantic-core/python-pydantic-core.hash create mode 100644 package/python-pydantic-core/python-pydantic-core.mk diff --git a/package/Config.in b/package/Config.in index 68e6e29a4d..fcc09b07c4 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1228,6 +1228,7 @@ menu "External python modules" source "package/python-pycups/Config.in" source "package/python-pydal/Config.in" source "package/python-pydantic/Config.in" + source "package/python-pydantic-core/Config.in" source "package/python-pydevmem/Config.in" source "package/python-pydyf/Config.in" source "package/python-pyelftools/Config.in" diff --git a/package/python-pydantic-core/Config.in b/package/python-pydantic-core/Config.in new file mode 100644 index 0000000000..3eeb1844a2 --- /dev/null +++ b/package/python-pydantic-core/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_PYDANTIC_CORE + bool "python-pydantic-core" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS + select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime + help + Core validation logic for pydantic written in rust. + + https://github.com/pydantic/pydantic-core diff --git a/package/python-pydantic-core/python-pydantic-core.hash b/package/python-pydantic-core/python-pydantic-core.hash new file mode 100644 index 0000000000..4927d816be --- /dev/null +++ b/package/python-pydantic-core/python-pydantic-core.hash @@ -0,0 +1,4 @@ +# Locally calculated after vendoring +sha256 b54296f8317e7ffd72726836636aa3a6c8c977d8f73b68253c443c0fe3731064 pydantic_core-2.14.5.tar.gz +# Locally computed sha256 checksums +sha256 2afdd30d54b4d62b6f488a6bcc1546e84ec5061f13f4209c03d012348783795a LICENSE diff --git a/package/python-pydantic-core/python-pydantic-core.mk b/package/python-pydantic-core/python-pydantic-core.mk new file mode 100644 index 0000000000..8b61323ab3 --- /dev/null +++ b/package/python-pydantic-core/python-pydantic-core.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-pydantic-core +# +################################################################################ + +PYTHON_PYDANTIC_CORE_VERSION = 2.14.5 +PYTHON_PYDANTIC_CORE_SOURCE = pydantic_core-$(PYTHON_PYDANTIC_CORE_VERSION).tar.gz +PYTHON_PYDANTIC_CORE_SITE = https://files.pythonhosted.org/packages/64/26/cffb93fe9c6b5a91c497f37fae14a4b073ecbc47fc36a9979c7aa888b245 +PYTHON_PYDANTIC_CORE_SETUP_TYPE = maturin +PYTHON_PYDANTIC_CORE_LICENSE = MIT +PYTHON_PYDANTIC_CORE_LICENSE_FILES = LICENSE +PYTHON_PYDANTIC_CORE_DEPENDENCIES = host-python-typing-extensions + +$(eval $(python-package)) From 05a259ed416d2bef1587a29d35fc117fa81183b2 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sat, 25 Nov 2023 01:10:52 -0700 Subject: [PATCH 4036/5754] package/python-pydantic: bump to version 2.5.2 Add new python-annotated-types runtime dependency. Add new python-pydantic-core runtime dependency. Migrate build backend from setuptools to hatchling. License hash changed due to adding contributors: https://github.com/pydantic/pydantic/commit/7bc9c6525a81680c0dd9df3558ed5f33345a77c2 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-pydantic/Config.in | 5 ++++- package/python-pydantic/python-pydantic.hash | 6 +++--- package/python-pydantic/python-pydantic.mk | 9 ++++++--- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/package/python-pydantic/Config.in b/package/python-pydantic/Config.in index 41ec43adf4..e9cd2e6780 100644 --- a/package/python-pydantic/Config.in +++ b/package/python-pydantic/Config.in @@ -1,8 +1,11 @@ config BR2_PACKAGE_PYTHON_PYDANTIC bool "python-pydantic" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-pydantic-core + select BR2_PACKAGE_PYTHON_ANNOTATED_TYPES # runtime + select BR2_PACKAGE_PYTHON_PYDANTIC_CORE # runtime select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime help Data validation and settings management using python 3.6 type hinting. - https://github.com/samuelcolvin/pydantic + https://github.com/pydantic/pydantic diff --git a/package/python-pydantic/python-pydantic.hash b/package/python-pydantic/python-pydantic.hash index 88b17f4575..0848debc1c 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 f0e286c32f40ec45aba9603742739cd6 pydantic-1.10.8.tar.gz -sha256 1410275520dfa70effadf4c21811d755e7ef9bb1f1d077a21958153a92c8d9ca pydantic-1.10.8.tar.gz +md5 348281a5a27eb5253c7a83927aae64e1 pydantic-2.5.2.tar.gz +sha256 ff177ba64c6faf73d7afa2e8cad38fd456c0dbe01c9954e71038001cd15a6edd pydantic-2.5.2.tar.gz # Locally computed sha256 checksums -sha256 9e3946690ac88b6b73e8f001a0586af13568be8852fd514e4393f39761764387 LICENSE +sha256 a9e186f3ca16b5eef84318e7a701721351a00cb7b8ae3a4394b67b49e3529ef3 LICENSE diff --git a/package/python-pydantic/python-pydantic.mk b/package/python-pydantic/python-pydantic.mk index b800426d22..b5bb7ff853 100644 --- a/package/python-pydantic/python-pydantic.mk +++ b/package/python-pydantic/python-pydantic.mk @@ -4,11 +4,14 @@ # ################################################################################ -PYTHON_PYDANTIC_VERSION = 1.10.8 +PYTHON_PYDANTIC_VERSION = 2.5.2 PYTHON_PYDANTIC_SOURCE = pydantic-$(PYTHON_PYDANTIC_VERSION).tar.gz -PYTHON_PYDANTIC_SITE = https://files.pythonhosted.org/packages/23/65/2aa13873e9e0084ecaec00fbe6c6096b65e1ab99ba66bdbf7e4e7c4cc915 -PYTHON_PYDANTIC_SETUP_TYPE = setuptools +PYTHON_PYDANTIC_SITE = https://files.pythonhosted.org/packages/b7/41/3c8108f79fb7da2d2b17f35744232af4ffcd9e764ebe1e3fd4b26669b325 +PYTHON_PYDANTIC_SETUP_TYPE = pep517 PYTHON_PYDANTIC_LICENSE = MIT PYTHON_PYDANTIC_LICENSE_FILES = LICENSE +PYTHON_PYDANTIC_DEPENDENCIES = \ + host-python-hatchling \ + host-python-hatch-fancy-pypi-readme $(eval $(python-package)) 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 4037/5754] 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 c81fd801ae..21a136eb83 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 4038/5754] 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 91a00aec27..0000000000 --- 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 0000000000..3a6321d7a7 --- /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 7898941271..e1e9d10898 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 a79c13c611..6575ff1afa 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 4039/5754] 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 061ff5a761..3ee7c54ce1 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 4040/5754] 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 044b7207f9..df4d62a0b8 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 4041/5754] 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 0000000000..80c19a3f5f --- /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 0000000000..3d8aa7e4ef --- /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 4042/5754] 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 093c6d4f75..cb61b0de55 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 32c90b6ad7e54e0a750feee33472777a4daef822 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Sun, 26 Nov 2023 20:27:16 +0100 Subject: [PATCH 4043/5754] package/rtl8821cu: bump to version 2023-09-26 With this version we can build with Linux 6.7. Signed-off-by: Giulio Benetti Signed-off-by: Yann E. MORIN --- 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 c98fd6234f..3d7a1be9d1 100644 --- a/package/rtl8821cu/rtl8821cu.hash +++ b/package/rtl8821cu/rtl8821cu.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8e155db366b5a97bc629534131e4fe1e29b455aa0ec9e1f42af23a9b6f610107 rtl8821cu-de36dfeff890086a9f30cd0052715fbaa9554087.tar.gz +sha256 5226fefd72d2dd2b8048a8d836f731139ddcb9a34eab68e9b07acee6ee5d8553 rtl8821cu-eb52ece92607394ecc22e96b41671ec3e5b1fa30.tar.gz sha256 22cdb0a9cf492dbf05c5b27381a5c0e73ae0d4622427b522b0ba92b7495e5fb0 LICENSE diff --git a/package/rtl8821cu/rtl8821cu.mk b/package/rtl8821cu/rtl8821cu.mk index 09fca49eb3..8f344d518f 100644 --- a/package/rtl8821cu/rtl8821cu.mk +++ b/package/rtl8821cu/rtl8821cu.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8821CU_VERSION = de36dfeff890086a9f30cd0052715fbaa9554087 +RTL8821CU_VERSION = eb52ece92607394ecc22e96b41671ec3e5b1fa30 RTL8821CU_SITE = $(call github,morrownr,8821cu-20210916,$(RTL8821CU_VERSION)) RTL8821CU_LICENSE = GPL-2.0 RTL8821CU_LICENSE_FILES = LICENSE From a382a7d55432918d2a1e47ae4cbe7ed50fa17a08 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Sun, 26 Nov 2023 21:12:27 +0100 Subject: [PATCH 4044/5754] package/esp-hosted: bump to version 2023-11-23 Drop local patch applied upstream: https://github.com/espressif/esp-hosted/commit/12b0ca9c46094c86eb76b5f0eaa626f868efaec8 Signed-off-by: Giulio Benetti Signed-off-by: Yann E. MORIN --- ...st-fix-build-failure-when-CONFIG_PM-.patch | 33 ------------------- package/esp-hosted/esp-hosted.hash | 2 +- package/esp-hosted/esp-hosted.mk | 2 +- 3 files changed, 2 insertions(+), 35 deletions(-) delete mode 100644 package/esp-hosted/0001-esp_hosted_ng-host-fix-build-failure-when-CONFIG_PM-.patch diff --git a/package/esp-hosted/0001-esp_hosted_ng-host-fix-build-failure-when-CONFIG_PM-.patch b/package/esp-hosted/0001-esp_hosted_ng-host-fix-build-failure-when-CONFIG_PM-.patch deleted file mode 100644 index abbc64a434..0000000000 --- a/package/esp-hosted/0001-esp_hosted_ng-host-fix-build-failure-when-CONFIG_PM-.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 56920e3ce04aa2eadb529a6787200789bf1c3925 Mon Sep 17 00:00:00 2001 -From: Giulio Benetti -Date: Wed, 9 Aug 2023 23:16:52 +0200 -Subject: [PATCH] esp_hosted_ng: host: fix build failure when CONFIG_PM is not - defined - -wiphy->wowlan is not defined when CONFIG_PM is not enabled so let's -guard the assignment to wiphy->wowlan according to option CONFIG_PM. - -Upstream: https://github.com/espressif/esp-hosted/pull/254 - -Signed-off-by: Giulio Benetti ---- - esp_hosted_ng/host/esp_cfg80211.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/esp_hosted_ng/host/esp_cfg80211.c b/esp_hosted_ng/host/esp_cfg80211.c -index 70fdbb9773..d3c4108c29 100644 ---- a/esp_hosted_ng/host/esp_cfg80211.c -+++ b/esp_hosted_ng/host/esp_cfg80211.c -@@ -638,7 +638,9 @@ int esp_cfg80211_register(struct esp_adapter *adapter) - wiphy->max_scan_ie_len = 1000; - wiphy->max_sched_scan_ssids = 10; - wiphy->signal_type = CFG80211_SIGNAL_TYPE_MBM; -+#ifdef CONFIG_PM - wiphy->wowlan = &esp_wowlan_support; -+#endif - - /* Advertise SAE support */ - wiphy->features |= NL80211_FEATURE_SAE; --- -2.34.1 - diff --git a/package/esp-hosted/esp-hosted.hash b/package/esp-hosted/esp-hosted.hash index c17fe262a1..b129bb42f9 100644 --- a/package/esp-hosted/esp-hosted.hash +++ b/package/esp-hosted/esp-hosted.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3310845b2324bda5774b91bcdd3f47621126f4a0011a0f61e31b0ad4a44db2f5 esp-hosted-11e90f185a5a9922343e73e44032816a0e3ddedb.tar.gz +sha256 6e023c26355643f2aaf6d79d5910f64c49ea638063235d519075629643518a71 esp-hosted-ce3c50a33fa4bc562a1b6cbcee292c1ae0b0a404.tar.gz sha256 ed57d96d27be775b22f9571d3724ef84e0d0b8f24b805ec7f87a32189de19a9c LICENSE diff --git a/package/esp-hosted/esp-hosted.mk b/package/esp-hosted/esp-hosted.mk index 7491c46512..578108c91d 100644 --- a/package/esp-hosted/esp-hosted.mk +++ b/package/esp-hosted/esp-hosted.mk @@ -4,7 +4,7 @@ # ################################################################################ -ESP_HOSTED_VERSION = 11e90f185a5a9922343e73e44032816a0e3ddedb +ESP_HOSTED_VERSION = ce3c50a33fa4bc562a1b6cbcee292c1ae0b0a404 ESP_HOSTED_SITE = $(call github,espressif,esp-hosted,$(ESP_HOSTED_VERSION)) ESP_HOSTED_DEPENDENCIES = linux ESP_HOSTED_LICENSE = GPL-2.0 From 6556bfba4f6e40186cdb7135b6ebde8a9fa9fa9f Mon Sep 17 00:00:00 2001 From: Maxim Kochetkov Date: Thu, 23 Nov 2023 08:43:59 +0300 Subject: [PATCH 4045/5754] package/libgeos: bump version to 3.12.1 Changelog: https://github.com/libgeos/geos/releases/tag/3.12.1 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 bb433117a5..37fe7d6d23 100644 --- a/package/libgeos/libgeos.hash +++ b/package/libgeos/libgeos.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d96db96011259178a35555a0f6d6e75a739e52a495a6b2aa5efb3d75390fbc39 geos-3.12.0.tar.bz2 +sha256 d6ea7e492224b51193e8244fe3ec17c4d44d0777f3c32ca4fb171140549a0d03 geos-3.12.1.tar.bz2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libgeos/libgeos.mk b/package/libgeos/libgeos.mk index 70f8ca3495..491168324f 100644 --- a/package/libgeos/libgeos.mk +++ b/package/libgeos/libgeos.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGEOS_VERSION = 3.12.0 +LIBGEOS_VERSION = 3.12.1 LIBGEOS_SITE = http://download.osgeo.org/geos LIBGEOS_SOURCE = geos-$(LIBGEOS_VERSION).tar.bz2 LIBGEOS_LICENSE = LGPL-2.1 From e056aeeca9cf8c00c6da62c39979ce6c55c92791 Mon Sep 17 00:00:00 2001 From: Maxim Kochetkov Date: Thu, 23 Nov 2023 09:00:19 +0300 Subject: [PATCH 4046/5754] package/osm2pgsql: bump version to 1.10.0 Release-notes: https://github.com/openstreetmap/osm2pgsql/releases/tag/1.10.0 Signed-off-by: Maxim Kochetkov Signed-off-by: Yann E. MORIN --- 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 0b4eb17c99..a93ceb6a7f 100644 --- a/package/osm2pgsql/osm2pgsql.hash +++ b/package/osm2pgsql/osm2pgsql.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 dc30a3ad9a27f944e4169be9a8e07ee09711901536ddc8fcf4a292bd3aec51d9 osm2pgsql-1.9.2.tar.gz +sha256 33849d8edacbca5ab5492fed32ac954de14f92ab6b3028c03ef88bb7ab596d20 osm2pgsql-1.10.0.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/osm2pgsql/osm2pgsql.mk b/package/osm2pgsql/osm2pgsql.mk index 44c980ac95..1565c2142c 100644 --- a/package/osm2pgsql/osm2pgsql.mk +++ b/package/osm2pgsql/osm2pgsql.mk @@ -4,7 +4,7 @@ # ################################################################################ -OSM2PGSQL_VERSION = 1.9.2 +OSM2PGSQL_VERSION = 1.10.0 OSM2PGSQL_SITE = $(call github,openstreetmap,osm2pgsql,$(OSM2PGSQL_VERSION)) OSM2PGSQL_LICENSE = GPL-2.0+ OSM2PGSQL_LICENSE_FILES = COPYING From beafbb83ad58e2f6d446ac03565207cb0128c82d Mon Sep 17 00:00:00 2001 From: Maxim Kochetkov Date: Thu, 23 Nov 2023 09:05:58 +0300 Subject: [PATCH 4047/5754] package/timescaledb: bump version to 2.12.2 Release notes: https://github.com/timescale/timescaledb/blob/2.12.2/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 0f2269986e..ae1d3db1e1 100644 --- a/package/timescaledb/timescaledb.hash +++ b/package/timescaledb/timescaledb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 acca5f6ec5684722374eece92f73d7763bd171075074fd2e6bd0244bda9fbc25 timescaledb-2.11.2.tar.gz +sha256 d24cd29aad411d3e41d543d1a30827c48f8e01a48563650db5fac145ad7a01eb timescaledb-2.12.2.tar.gz sha256 0378e0948feefd85f579319c74d6e2b671194037f550c7176ef26649d94c895b LICENSE diff --git a/package/timescaledb/timescaledb.mk b/package/timescaledb/timescaledb.mk index fe7bcbc36e..adae1c2bae 100644 --- a/package/timescaledb/timescaledb.mk +++ b/package/timescaledb/timescaledb.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIMESCALEDB_VERSION = 2.11.2 +TIMESCALEDB_VERSION = 2.12.2 TIMESCALEDB_SITE = $(call github,timescale,timescaledb,$(TIMESCALEDB_VERSION)) TIMESCALEDB_LICENSE = Apache-2.0 TIMESCALEDB_LICENSE_FILES = LICENSE From 4d549c071dcc7ede701ee91cb39bc4a9a2be7baf Mon Sep 17 00:00:00 2001 From: Maxim Kochetkov Date: Thu, 23 Nov 2023 09:15:00 +0300 Subject: [PATCH 4048/5754] 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 0640f883a7..4fc3bfcff0 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 b951b14aa0..3108fe65e1 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 4049/5754] 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 1b626327ad..8550b61389 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 4050/5754] 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 d755c7a214..fcc9ff0788 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 cc363e9a93484e734313b17962b931b3df6eedaa Mon Sep 17 00:00:00 2001 From: Alexander Egorenkov Date: Mon, 27 Nov 2023 11:59:59 +0000 Subject: [PATCH 4051/5754] package/multipath-tools: bump to version 0.9.7 Change log: - https://github.com/opensvc/multipath-tools/pull/77 Signed-off-by: Alexander Egorenkov Signed-off-by: Yann E. MORIN --- package/multipath-tools/multipath-tools.hash | 2 +- package/multipath-tools/multipath-tools.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/multipath-tools/multipath-tools.hash b/package/multipath-tools/multipath-tools.hash index 06aa5ccc80..0f51c38846 100644 --- a/package/multipath-tools/multipath-tools.hash +++ b/package/multipath-tools/multipath-tools.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 401c6f6e8dc5d3feaaee76280716aee718579ac024ce4f2fae77c798dc7a0f9f multipath-tools-0.9.6.tar.gz +sha256 8f0a7ddc01137d0f90ac3ef5700131dfbd6cf3bbbccdcfa317e8379efa328d59 multipath-tools-0.9.7.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 7071e1fd1b..e62e85e14d 100644 --- a/package/multipath-tools/multipath-tools.mk +++ b/package/multipath-tools/multipath-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -MULTIPATH_TOOLS_VERSION = 0.9.6 +MULTIPATH_TOOLS_VERSION = 0.9.7 MULTIPATH_TOOLS_SITE = $(call github,opensvc,multipath-tools,$(MULTIPATH_TOOLS_VERSION)) MULTIPATH_TOOLS_LICENSE = \ From 0868e3430bd4f6f8b05087c45a29e0df2cb46969 Mon Sep 17 00:00:00 2001 From: Alexander Egorenkov Date: Mon, 27 Nov 2023 11:59:58 +0000 Subject: [PATCH 4052/5754] package/makedumpfile: bump to version 1.7.4 Release notes: - https://github.com/makedumpfile/makedumpfile/releases/tag/1.7.4 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 665023d87b..fdb30de88d 100644 --- a/package/makedumpfile/makedumpfile.hash +++ b/package/makedumpfile/makedumpfile.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 f059dbebf5156a9ab97cd3c1f41ad5df3436c7ab4dd6dbffa234fc4e93cfa2ce makedumpfile-1.7.3.tar.gz +sha256 0554f5de516c51f5756e437dbfc353722b16b20e875241275554b474e89298db makedumpfile-1.7.4.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/makedumpfile/makedumpfile.mk b/package/makedumpfile/makedumpfile.mk index 6102c92bd8..410752682d 100644 --- a/package/makedumpfile/makedumpfile.mk +++ b/package/makedumpfile/makedumpfile.mk @@ -4,7 +4,7 @@ # ################################################################################ -MAKEDUMPFILE_VERSION = 1.7.3 +MAKEDUMPFILE_VERSION = 1.7.4 MAKEDUMPFILE_SITE = https://github.com/makedumpfile/makedumpfile/releases/download/$(MAKEDUMPFILE_VERSION) MAKEDUMPFILE_DEPENDENCIES = bzip2 elfutils xz zlib MAKEDUMPFILE_LICENSE = GPL-2.0 From 9b6c2acf590b2f3402bbe22431bd2e04f9499973 Mon Sep 17 00:00:00 2001 From: Bagas Sanjaya Date: Mon, 27 Nov 2023 20:38:08 +0700 Subject: [PATCH 4053/5754] package/git: bump to version 2.43.0 Bump the package version to 2.43.0. For the full changelog, see the release announcement at [1]. Link: https://lore.kernel.org/git/xmqqzfz8l5or.fsf@gitster.g/ [1] Signed-off-by: Bagas Sanjaya Signed-off-by: Yann E. MORIN --- 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 f3f5915c8d..9cf044cc07 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 8e46fa96bf35a65625d85fde50391e39bc0620d1bb39afb70b96c4a237a1a4f7 git-2.42.1.tar.xz +sha256 5446603e73d911781d259e565750dcd277a42836c8e392cac91cf137aa9b76ec git-2.43.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 cb49986c43..1502968186 100644 --- a/package/git/git.mk +++ b/package/git/git.mk @@ -4,7 +4,7 @@ # ################################################################################ -GIT_VERSION = 2.42.1 +GIT_VERSION = 2.43.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 83b799457f9d48cf5949ba2b6e0f66c20724ba30 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Mon, 27 Nov 2023 18:43:50 +0200 Subject: [PATCH 4054/5754] package/socat: bump to version 1.8.0.0 Update README hash for changed not related to license. Change patch 0001 to git format. socat is now hosted on git. Also, update to apply to current version. Add upstream status to both patches. Signed-off-by: Baruch Siach Signed-off-by: Yann E. MORIN --- .checkpackageignore | 2 -- package/socat/0001-no-documentation.patch | 34 ++++++++++++++----- .../0002-compat-set-NETDB_INTERNAL.patch | 7 ++-- package/socat/socat.hash | 6 ++-- package/socat/socat.mk | 2 +- 5 files changed, 33 insertions(+), 18 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 0663149d01..e9fdf9f01c 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1292,8 +1292,6 @@ 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 diff --git a/package/socat/0001-no-documentation.patch b/package/socat/0001-no-documentation.patch index ce088dfafc..b4c3e1ffde 100644 --- a/package/socat/0001-no-documentation.patch +++ b/package/socat/0001-no-documentation.patch @@ -1,37 +1,53 @@ -socat: disable documentation build/installation +From 01463f5dbe19501948dec26160e0cc3b4e9167b4 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Mon, 27 Nov 2023 18:09:57 +0200 +Subject: [PATCH] socat: disable documentation build/installation The documentation generation process requires a special yold2man program, for which we don't have a package in Buildroot. Since we generally don't care much about documentation of packages, just adjust the package Makefile.in to not build/install its documentation. +Upstream: N/A Signed-off-by: Thomas Petazzoni +[baruch: update for 1.8.0.0; git patch format] +Signed-off-by: Baruch Siach +--- + Makefile.in | 7 ++----- + 1 file changed, 2 insertions(+), 5 deletions(-) -Index: b/Makefile.in -=================================================================== +diff --git a/Makefile.in b/Makefile.in +index c01b1a4a2306..fd89acb06f3c 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -93,7 +93,7 @@ - Config/Makefile.Cygwin-1-5-25 Config/config.Cygwin-1-5-25.h \ - Config/Makefile.MacOSX-10-5 Config/config.MacOSX-10-5.h +@@ -82,7 +82,7 @@ SHFILES = socat-chain.sh socat-mux.sh socat-broker.sh \ + TESTFILES = test.sh socks4echo.sh proxyecho.sh readline-test.sh \ + proxy.sh socks4a-echo.sh -all: progs doc +all: progs scmclean: gitclean -@@ -136,13 +136,11 @@ +@@ -128,7 +128,7 @@ libxio.a: $(XIOOBJS) $(UTLOBJS) strip: progs strip $(PROGS) -install: progs $(srcdir)/doc/socat.1 +install: progs mkdir -p $(DESTDIR)$(BINDEST) - $(INSTALL) -m 755 socat $(DESTDIR)$(BINDEST) + $(INSTALL) -m 755 socat $(DESTDIR)$(BINDEST)/socat1 + ln -sf socat1 $(DESTDIR)$(BINDEST)/socat +@@ -137,9 +137,6 @@ install: progs $(srcdir)/doc/socat.1 + $(INSTALL) -m 755 socat-broker.sh $(DESTDIR)$(BINDEST) $(INSTALL) -m 755 procan $(DESTDIR)$(BINDEST) $(INSTALL) -m 755 filan $(DESTDIR)$(BINDEST) - mkdir -p $(DESTDIR)$(MANDEST)/man1 -- $(INSTALL) -m 644 $(srcdir)/doc/socat.1 $(DESTDIR)$(MANDEST)/man1/ +- $(INSTALL) -m 644 $(srcdir)/doc/socat.1 $(DESTDIR)$(MANDEST)/man1/socat1.1 +- ln -sf socat1.1 $(DESTDIR)$(MANDEST)/man1/socat.1 uninstall: rm -f $(DESTDIR)$(BINDEST)/socat +-- +2.42.0 + diff --git a/package/socat/0002-compat-set-NETDB_INTERNAL.patch b/package/socat/0002-compat-set-NETDB_INTERNAL.patch index da31073ba5..f526664210 100644 --- a/package/socat/0002-compat-set-NETDB_INTERNAL.patch +++ b/package/socat/0002-compat-set-NETDB_INTERNAL.patch @@ -1,4 +1,4 @@ -From e7804d1750652e39c7a5803d360b29b2637a695f Mon Sep 17 00:00:00 2001 +From 4b86f141c7c4725093fb2e12c769fec393727519 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 28 Aug 2016 21:04:01 +0200 Subject: [PATCH] compat: set NETDB_INTERNAL @@ -12,16 +12,17 @@ Based on [2]. [1] https://sourceware.org/git/?p=glibc.git;a=blob;f=resolv/netdb.h;h=3aba530932c7a62a4f23e3193e9186da677f552b;hb=fdfc9260b61d3d72541f18104d24c7bcb0ce5ca2#l74 [2] http://git.alpinelinux.org/cgit/aports/tree/main/socat/netdb-internal.patch?id=5a45173b50892cb634197c30b3506ebff98d3b7d +Upstream: sent to socat@dest-unreach.org Signed-off-by: Romain Naour --- compat.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/compat.h b/compat.h -index 19a929f..4f5ee6d 100644 +index bb7e2d8f1782..72e73c701f64 100644 --- a/compat.h +++ b/compat.h -@@ -666,6 +666,8 @@ typedef int sig_atomic_t; +@@ -851,6 +851,8 @@ typedef unsigned long T_sigset; #if !defined(NETDB_INTERNAL) && defined(h_NETDB_INTERNAL) # define NETDB_INTERNAL h_NETDB_INTERNAL diff --git a/package/socat/socat.hash b/package/socat/socat.hash index 2113e1b3a4..2a14d75303 100644 --- a/package/socat/socat.hash +++ b/package/socat/socat.hash @@ -1,8 +1,8 @@ # From http://www.dest-unreach.org/socat/download.md5sum -md5 a605d3779465f42c07fc507cfbfb08f9 socat-1.7.4.4.tar.bz2 +md5 51f9ecdf5d942d0a3c150ea400eb89ef socat-1.8.0.0.tar.bz2 # From http://www.dest-unreach.org/socat/download.sha256sum -sha256 fbd42bd2f0e54a3af6d01bdf15385384ab82dbc0e4f1a5e153b3e0be1b6380ac socat-1.7.4.4.tar.bz2 +sha256 e1de683dd22ee0e3a6c6bbff269abe18ab0c9d7eb650204f125155b9005faca7 socat-1.8.0.0.tar.bz2 # Locally calculated -sha256 3555c6bc2779ff0f9a7145d1e3cd1d8fde59548bcd3364a23b907de21eec5aa8 README +sha256 de9d702354b2e748ea87eb20d18c3d90ebede5dc6d2fc3c2e0645d139a5181bc README sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 fd9e48ca316a5032069b9521f4f4b4d9b1c60365012bae1e62286bcd5bd2e761 COPYING.OpenSSL diff --git a/package/socat/socat.mk b/package/socat/socat.mk index f958f26522..1e2880c028 100644 --- a/package/socat/socat.mk +++ b/package/socat/socat.mk @@ -4,7 +4,7 @@ # ################################################################################ -SOCAT_VERSION = 1.7.4.4 +SOCAT_VERSION = 1.8.0.0 SOCAT_SOURCE = socat-$(SOCAT_VERSION).tar.bz2 SOCAT_SITE = http://www.dest-unreach.org/socat/download SOCAT_LICENSE = GPL-2.0 with OpenSSL exception From fc7606010e4edde7a34c545fac0fe7f82d4a5e18 Mon Sep 17 00:00:00 2001 From: Michael Nosthoff Date: Mon, 27 Nov 2023 11:14:04 +0100 Subject: [PATCH 4055/5754] package/re2: bump to version 2023.11.01 - libabseil-cpp is now a dependency - required c++ standard is now c++14 [0] --> requires gcc8 - drop fix for gcc <= 5 introduced in 25fd3b0a523805db14682f7c559cc1c9c366ed55 (c++ >= 14 is the default for gcc >= 8) - update gcc required for depending packages qt5webengine & grpc [0] https://github.com/google/re2/wiki/Install/7c2552dd54444695ce5a9e6a01dd8f312b347914 Signed-off-by: Michael Nosthoff Signed-off-by: Yann E. MORIN --- package/grpc/Config.in | 2 +- package/qt5/qt5webengine/Config.in | 6 +++--- package/re2/Config.in | 7 ++++--- package/re2/re2.hash | 2 +- package/re2/re2.mk | 13 +++++-------- 5 files changed, 14 insertions(+), 16 deletions(-) diff --git a/package/grpc/Config.in b/package/grpc/Config.in index afe0ea8450..ef3e1c86cb 100644 --- a/package/grpc/Config.in +++ b/package/grpc/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_GRPC depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS # protobuf, re2 depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # libabseil-cpp + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # libabseil-cpp, re2 depends on !BR2_STATIC_LIBS # protobuf, libabseil-cpp depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS diff --git a/package/qt5/qt5webengine/Config.in b/package/qt5/qt5webengine/Config.in index 542f212dfc..cfa5893f41 100644 --- a/package/qt5/qt5webengine/Config.in +++ b/package/qt5/qt5webengine/Config.in @@ -10,10 +10,10 @@ config BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS depends on !BR2_BINFMT_FLAT # qt5base-icu depends on BR2_USE_MMU # libglib2, qt5base-dbus -comment "qt5webengine needs udev /dev management and a glibc toolchain w/ gcc >= 4.9, host gcc >= 4.9, threads, wchar" +comment "qt5webengine needs udev /dev management and a glibc toolchain w/ gcc >= 8, host gcc >= 4.9, threads, wchar" depends on BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS depends on !BR2_PACKAGE_HAS_UDEV || !BR2_TOOLCHAIN_USES_GLIBC || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_8 || \ !BR2_HOST_GCC_AT_LEAST_4_9 || \ !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR @@ -26,7 +26,7 @@ config BR2_PACKAGE_QT5WEBENGINE depends on BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_USES_GLIBC # execinfo.h, mallinfo depends on BR2_HOST_GCC_AT_LEAST_4_9 # qt5base-icu - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # qt5base-icu + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # re2 depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2, libvpx, qt5base-dbus depends on BR2_USE_WCHAR # libglib2 depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative, qt5base-eglfs diff --git a/package/re2/Config.in b/package/re2/Config.in index 64217e8aa2..0ac0041f6d 100644 --- a/package/re2/Config.in +++ b/package/re2/Config.in @@ -1,8 +1,9 @@ config BR2_PACKAGE_RE2 bool "re2" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # needs C++11 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # C++14 depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_LIBABSEIL_CPP help RE2 is a fast, safe, thread-friendly alternative to backtracking regular expression engines like @@ -11,7 +12,7 @@ config BR2_PACKAGE_RE2 https://github.com/google/re2 -comment "re2 needs a toolchain w/ C++, threads, gcc >= 4.8" +comment "re2 needs a toolchain w/ C++, threads, gcc >= 8" depends on !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + !BR2_TOOLCHAIN_GCC_AT_LEAST_8 diff --git a/package/re2/re2.hash b/package/re2/re2.hash index a39dece7a9..5f590aba6e 100644 --- a/package/re2/re2.hash +++ b/package/re2/re2.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 cbce8b7803e856827201a132862e41af386e7afd9cc6d9a9bc7a4fa4d8ddbdde re2-2023-02-01.tar.gz +sha256 4e6593ac3c71de1c0f322735bc8b0492a72f66ffccfad76e259fa21c41d27d8a re2-2023-11-01.tar.gz sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 LICENSE diff --git a/package/re2/re2.mk b/package/re2/re2.mk index 5587366b1f..b81a64f2e9 100644 --- a/package/re2/re2.mk +++ b/package/re2/re2.mk @@ -4,29 +4,26 @@ # ################################################################################ -RE2_VERSION = 2023-02-01 +RE2_VERSION = 2023-11-01 RE2_SITE = $(call github,google,re2,$(RE2_VERSION)) RE2_LICENSE = BSD-3-Clause RE2_LICENSE_FILES = LICENSE RE2_INSTALL_STAGING = YES - -RE2_MAKE_OPTS = \ - $(TARGET_CONFIGURE_OPTS) \ - CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" +RE2_DEPENDENCIES = libabseil-cpp define RE2_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(RE2_MAKE_OPTS) \ + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ -C $(@D) $(if $(BR2_STATIC_LIBS),static) endef define RE2_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(RE2_MAKE_OPTS) \ + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ DESTDIR="$(STAGING_DIR)" prefix=/usr -C $(@D) \ $(if $(BR2_STATIC_LIBS),static-install,install) endef define RE2_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(RE2_MAKE_OPTS) \ + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ DESTDIR="$(TARGET_DIR)" prefix=/usr -C $(@D) \ $(if $(BR2_STATIC_LIBS),static-install,install) endef 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 4056/5754] 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 195bad449e..bc59d5fad2 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 195bad449e..bc59d5fad2 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 34412fa9e8..6672871125 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 ea02d3f071..74a7b270cd 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 41c7e97e99..2a9814274f 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 9e6b7f5ccf..55095f64a7 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 4057/5754] 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 2a9814274f..a4ae327d2a 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 13ba668a2da3a0dcb386578ce15b00a444101dbe Mon Sep 17 00:00:00 2001 From: Bram Oosterhuis Date: Sat, 4 Nov 2023 23:01:51 +0100 Subject: [PATCH 4058/5754] configs/raspberrypi: bump Linux version to 6.1.61 Linux 6.1 has been marked LTS for a long time now. Time to bump Linux for RaspberryPi's to the latest 6.1.61 Since April 2022 the RaspberryPi defconfigs have compressed kernel module enabled by default. (see [1] and [2]). To load compressed kernel modules kmod and xz packages are needed because busybox doesn't support it. For testing I used RaspberryPi 2, 3(32+64bit) and 4(32+64bit), all with mdev enabled. [1] https://github.com/raspberrypi/linux/commit/c45b4223a4e4a8cfe39edbb4949329ea478fa4e2 [2] https://github.com/raspberrypi/linux/issues/4966 Signed-off-by: Bram Oosterhuis Reviewed-by: Marcus Hoffmann Tested-by: Marcus Hoffmann Signed-off-by: Yann E. MORIN --- configs/raspberrypi0_defconfig | 13 ++++++++++--- configs/raspberrypi0w_defconfig | 13 ++++++++++--- configs/raspberrypi2_defconfig | 13 ++++++++++--- configs/raspberrypi3_64_defconfig | 13 ++++++++++--- configs/raspberrypi3_defconfig | 13 ++++++++++--- configs/raspberrypi3_qt5we_defconfig | 13 ++++++++++--- configs/raspberrypi4_64_defconfig | 13 ++++++++++--- configs/raspberrypi4_defconfig | 13 ++++++++++--- configs/raspberrypi_defconfig | 13 ++++++++++--- configs/raspberrypicm4io_64_defconfig | 13 ++++++++++--- configs/raspberrypicm4io_defconfig | 13 ++++++++++--- configs/raspberrypizero2w_defconfig | 13 ++++++++++--- 12 files changed, 120 insertions(+), 36 deletions(-) diff --git a/configs/raspberrypi0_defconfig b/configs/raspberrypi0_defconfig index 4506e94bce..6bff1ebf81 100644 --- a/configs/raspberrypi0_defconfig +++ b/configs/raspberrypi0_defconfig @@ -2,14 +2,14 @@ BR2_arm=y BR2_arm1176jzf_s=y BR2_ARM_EABIHF=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 BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,17f135b742c4edb340afb365873c3a574f7e16cb)/linux-17f135b742c4edb340afb365873c3a574f7e16cb.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" # Build the DTBs for A/B from the kernel sources: the zero is the same @@ -37,3 +37,10 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi0/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi0/post-image.sh" + +# Enable compressed kernel module support +BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y +BR2_PACKAGE_KMOD_TOOLS=y +BR2_PACKAGE_XZ=y +BR2_PACKAGE_KMOD=y +BR2_PACKAGE_HOST_KMOD_XZ=y diff --git a/configs/raspberrypi0w_defconfig b/configs/raspberrypi0w_defconfig index 7a35794c2d..ac72d49f92 100644 --- a/configs/raspberrypi0w_defconfig +++ b/configs/raspberrypi0w_defconfig @@ -2,14 +2,14 @@ BR2_arm=y BR2_arm1176jzf_s=y BR2_ARM_EABIHF=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 BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,17f135b742c4edb340afb365873c3a574f7e16cb)/linux-17f135b742c4edb340afb365873c3a574f7e16cb.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-zero-w" @@ -32,3 +32,10 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi0w/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi0w/post-image.sh" + +# Enable compressed kernel module support +BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y +BR2_PACKAGE_KMOD_TOOLS=y +BR2_PACKAGE_XZ=y +BR2_PACKAGE_KMOD=y +BR2_PACKAGE_HOST_KMOD_XZ=y diff --git a/configs/raspberrypi2_defconfig b/configs/raspberrypi2_defconfig index 9b484c5588..dee9a0b23f 100644 --- a/configs/raspberrypi2_defconfig +++ b/configs/raspberrypi2_defconfig @@ -7,12 +7,12 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_SYSTEM_DHCP="eth0" -# 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 BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,17f135b742c4edb340afb365873c3a574f7e16cb)/linux-17f135b742c4edb340afb365873c3a574f7e16cb.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" # Build the DTB from the kernel sources @@ -39,3 +39,10 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi2/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi2/post-image.sh" + +# Enable compressed kernel module support +BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y +BR2_PACKAGE_KMOD_TOOLS=y +BR2_PACKAGE_XZ=y +BR2_PACKAGE_KMOD=y +BR2_PACKAGE_HOST_KMOD_XZ=y diff --git a/configs/raspberrypi3_64_defconfig b/configs/raspberrypi3_64_defconfig index 4d838ae0e8..6871dc0fe0 100644 --- a/configs/raspberrypi3_64_defconfig +++ b/configs/raspberrypi3_64_defconfig @@ -6,12 +6,12 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_SYSTEM_DHCP="eth0" -# 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 BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,17f135b742c4edb340afb365873c3a574f7e16cb)/linux-17f135b742c4edb340afb365873c3a574f7e16cb.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi3" # Build the DTB from the kernel sources @@ -37,3 +37,10 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi3-64/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi3-64/post-image.sh" + +# Enable compressed kernel module support +BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y +BR2_PACKAGE_KMOD_TOOLS=y +BR2_PACKAGE_XZ=y +BR2_PACKAGE_KMOD=y +BR2_PACKAGE_HOST_KMOD_XZ=y diff --git a/configs/raspberrypi3_defconfig b/configs/raspberrypi3_defconfig index 0a59ab42a9..f0e7b82191 100644 --- a/configs/raspberrypi3_defconfig +++ b/configs/raspberrypi3_defconfig @@ -6,12 +6,12 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_SYSTEM_DHCP="eth0" -# 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 BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,17f135b742c4edb340afb365873c3a574f7e16cb)/linux-17f135b742c4edb340afb365873c3a574f7e16cb.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" # Build the DTB from the kernel sources @@ -37,3 +37,10 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi3/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi3/post-image.sh" + +# Enable compressed kernel module support +BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y +BR2_PACKAGE_KMOD_TOOLS=y +BR2_PACKAGE_XZ=y +BR2_PACKAGE_KMOD=y +BR2_PACKAGE_HOST_KMOD_XZ=y diff --git a/configs/raspberrypi3_qt5we_defconfig b/configs/raspberrypi3_qt5we_defconfig index 40d0c0f888..532b3ed686 100644 --- a/configs/raspberrypi3_qt5we_defconfig +++ b/configs/raspberrypi3_qt5we_defconfig @@ -7,12 +7,12 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_SYSTEM_DHCP="eth0" -# 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 BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,17f135b742c4edb340afb365873c3a574f7e16cb)/linux-17f135b742c4edb340afb365873c3a574f7e16cb.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" # Build the DTB from the kernel sources @@ -51,3 +51,10 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="400M" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi3/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi3/post-image.sh" + +# Enable compressed kernel module support +BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y +BR2_PACKAGE_KMOD_TOOLS=y +BR2_PACKAGE_XZ=y +BR2_PACKAGE_KMOD=y +BR2_PACKAGE_HOST_KMOD_XZ=y diff --git a/configs/raspberrypi4_64_defconfig b/configs/raspberrypi4_64_defconfig index 5942f7c4e1..453bbe9440 100644 --- a/configs/raspberrypi4_64_defconfig +++ b/configs/raspberrypi4_64_defconfig @@ -6,12 +6,12 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_SYSTEM_DHCP="eth0" -# 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 BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,17f135b742c4edb340afb365873c3a574f7e16cb)/linux-17f135b742c4edb340afb365873c3a574f7e16cb.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" # Build the DTB from the kernel sources @@ -36,3 +36,10 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi4-64/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi4-64/post-image.sh" + +# Enable compressed kernel module support +BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y +BR2_PACKAGE_KMOD_TOOLS=y +BR2_PACKAGE_XZ=y +BR2_PACKAGE_KMOD=y +BR2_PACKAGE_HOST_KMOD_XZ=y diff --git a/configs/raspberrypi4_defconfig b/configs/raspberrypi4_defconfig index 4e5580c140..1ed5d34b56 100644 --- a/configs/raspberrypi4_defconfig +++ b/configs/raspberrypi4_defconfig @@ -6,12 +6,12 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_SYSTEM_DHCP="eth0" -# 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 BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,17f135b742c4edb340afb365873c3a574f7e16cb)/linux-17f135b742c4edb340afb365873c3a574f7e16cb.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" # Build the DTB from the kernel sources @@ -36,3 +36,10 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi4/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi4/post-image.sh" + +# Enable compressed kernel module support +BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y +BR2_PACKAGE_KMOD_TOOLS=y +BR2_PACKAGE_XZ=y +BR2_PACKAGE_KMOD=y +BR2_PACKAGE_HOST_KMOD_XZ=y diff --git a/configs/raspberrypi_defconfig b/configs/raspberrypi_defconfig index cca53f9b37..01b4353b84 100644 --- a/configs/raspberrypi_defconfig +++ b/configs/raspberrypi_defconfig @@ -4,14 +4,14 @@ BR2_ARM_EABIHF=y BR2_SYSTEM_DHCP="eth0" -# 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 BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,17f135b742c4edb340afb365873c3a574f7e16cb)/linux-17f135b742c4edb340afb365873c3a574f7e16cb.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" # Build the DTBs for A/B, A+/B+ and compute module from the kernel sources @@ -38,3 +38,10 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi/post-image.sh" + +# Enable compressed kernel module support +BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y +BR2_PACKAGE_KMOD_TOOLS=y +BR2_PACKAGE_XZ=y +BR2_PACKAGE_KMOD=y +BR2_PACKAGE_HOST_KMOD_XZ=y diff --git a/configs/raspberrypicm4io_64_defconfig b/configs/raspberrypicm4io_64_defconfig index 29cb0472d7..d53711c3a7 100644 --- a/configs/raspberrypicm4io_64_defconfig +++ b/configs/raspberrypicm4io_64_defconfig @@ -6,12 +6,12 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_SYSTEM_DHCP="eth0" -# 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 BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,17f135b742c4edb340afb365873c3a574f7e16cb)/linux-17f135b742c4edb340afb365873c3a574f7e16cb.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" # Build the DTB from the kernel sources @@ -39,3 +39,10 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypicm4io-64/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypicm4io-64/post-image.sh" + +# Enable compressed kernel module support +BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y +BR2_PACKAGE_KMOD_TOOLS=y +BR2_PACKAGE_XZ=y +BR2_PACKAGE_KMOD=y +BR2_PACKAGE_HOST_KMOD_XZ=y diff --git a/configs/raspberrypicm4io_defconfig b/configs/raspberrypicm4io_defconfig index 017aecc0dd..4b50dc9ef9 100644 --- a/configs/raspberrypicm4io_defconfig +++ b/configs/raspberrypicm4io_defconfig @@ -6,12 +6,12 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_SYSTEM_DHCP="eth0" -# 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 BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,17f135b742c4edb340afb365873c3a574f7e16cb)/linux-17f135b742c4edb340afb365873c3a574f7e16cb.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" # Build the DTB from the kernel sources @@ -39,3 +39,10 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypicm4io/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypicm4io/post-image.sh" + +# Enable compressed kernel module support +BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y +BR2_PACKAGE_KMOD_TOOLS=y +BR2_PACKAGE_XZ=y +BR2_PACKAGE_KMOD=y +BR2_PACKAGE_HOST_KMOD_XZ=y diff --git a/configs/raspberrypizero2w_defconfig b/configs/raspberrypizero2w_defconfig index 2ea503ca24..1bf335c076 100644 --- a/configs/raspberrypizero2w_defconfig +++ b/configs/raspberrypizero2w_defconfig @@ -2,14 +2,14 @@ BR2_arm=y BR2_cortex_a53=y BR2_ARM_FPU_NEON_VFPV4=y -# Linux headers same as kernel, 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel, 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6.1=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,17f135b742c4edb340afb365873c3a574f7e16cb)/linux-17f135b742c4edb340afb365873c3a574f7e16cb.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" # Build the DTB from the kernel sources @@ -34,3 +34,10 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypizero2w/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypizero2w/post-image.sh" + +# Enable compressed kernel module support +BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y +BR2_PACKAGE_KMOD_TOOLS=y +BR2_PACKAGE_XZ=y +BR2_PACKAGE_KMOD=y +BR2_PACKAGE_HOST_KMOD_XZ=y From 9d27996289f50f1e3e16748920f5945e1efcffa7 Mon Sep 17 00:00:00 2001 From: Bram Oosterhuis Date: Sat, 4 Nov 2023 23:01:52 +0100 Subject: [PATCH 4059/5754] package/rpi-firmware: bump version to 83dafbc Version 83dafbc will match the with kernel 6.1.61 Signed-off-by: Bram Oosterhuis Reviewed-by: Marcus Hoffmann Tested-by: Marcus Hoffmann Signed-off-by: Yann E. MORIN --- package/rpi-firmware/rpi-firmware.hash | 2 +- package/rpi-firmware/rpi-firmware.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rpi-firmware/rpi-firmware.hash b/package/rpi-firmware/rpi-firmware.hash index ec13115f3b..33e05a2f4a 100644 --- a/package/rpi-firmware/rpi-firmware.hash +++ b/package/rpi-firmware/rpi-firmware.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 33aea2cb9c3be94c3dd6a96fbb3443eee5af1dc5fc9140e1fadc50832983064e rpi-firmware-3f20b832b27cd730deb6419b570f31a98167eef6.tar.gz +sha256 dd43e77ca1a8969cdb7f05dd72a57f90862071d5a93bdd6aea8246aba85689cf rpi-firmware-83dafbc92c0e63f76ca2ecdd42462d56489d1c77.tar.gz sha256 c7283ff51f863d93a275c66e3b4cb08021a5dd4d8c1e7acc47d872fbe52d3d6b boot/LICENCE.broadcom diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk index 53d6d8ca06..37e010d1de 100644 --- a/package/rpi-firmware/rpi-firmware.mk +++ b/package/rpi-firmware/rpi-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -RPI_FIRMWARE_VERSION = 3f20b832b27cd730deb6419b570f31a98167eef6 +RPI_FIRMWARE_VERSION = 83dafbc92c0e63f76ca2ecdd42462d56489d1c77 RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION)) RPI_FIRMWARE_LICENSE = BSD-3-Clause RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom From 07dad085fa4663deeee95fc4e037324b7c3eb37c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 27 Nov 2023 22:25:58 +0100 Subject: [PATCH 4060/5754] 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 49135b1da7..9f3100db7f 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 fcc9ff0788..40d9072571 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 4061/5754] 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 0000000000..a1536a7d2f --- /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 4062/5754] 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 7b78c14bf4..bb4bf462aa 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 4063/5754] 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 e1909291f6..548ed7ad53 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 4064/5754] 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 ef381e5934..40529bd664 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 729e928b4d..d0fc1744c0 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 4065/5754] 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 c223a14bac..bd2072df0b 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 a1a5eac049..05ae69eb32 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 4066/5754] 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 a6d4c5d056..a163bd9ad3 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 019a202952..c1477b1adf 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 4067/5754] 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 8fdb6998c9..4ff64bada2 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 37684e0aa3..b0b4ffe344 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 4068/5754] 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 cad19f930f..78c1ddc6a2 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 fb7767297b..c93a4aacc5 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 4069/5754] 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 0b4dc9543e..b90e40e415 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 4070/5754] {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 d6e563212b..ae734c49a0 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 aa94a4ca91..ed9c6143db 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 81bd9f9380..344acc9cde 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 4071/5754] 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 2165c8c601..667b09221d 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 734e8efec6..735adea01a 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 4072/5754] 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 af4b66d05d..0000000000 --- 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 d3fe0dbec1..724f91123b 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 4073/5754] 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 afe0d8a196..ef406dc8e9 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 4074/5754] 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 0000000000..ddf2943bfa --- /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 4075/5754] 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 4691be63a2..adc61d2546 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 b90e40e415..33ca69b933 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 4076/5754] 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 0663149d01..c172750ba7 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 13f6da4588..96ab780467 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 4077/5754] 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 6ddf44fd0c..d26a997d46 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 4078/5754] 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 06b9cecddc..81e8a6f2e9 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 b89f961d99..42bcd0a928 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 4079/5754] 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 a045779c31..c1b5651b74 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 8e3e745b38..04d24b9a35 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 23474159a3..7cc2ff7ccd 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 e8b10e3a6e..b3dda4c629 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 4080/5754] 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 8988dad5da..fd80316ec5 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 91dd208b0d..719c6768af 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 4081/5754] 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 a8b537782c..6fa81a98a2 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 6d7fbd9850..0fd172b532 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 4082/5754] 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 a198e76058..b22fa5434d 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 d49b753670..b54dbded27 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 4083/5754] 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 9fb386dfa0..177113bb42 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 f41c114fa5..bd34f124c5 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 4084/5754] 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 e794538956..adfedbc874 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 5d4bc471494f256b1d53e6895d780452c895e3d9 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 29 Nov 2023 18:39:01 +0100 Subject: [PATCH 4085/5754] 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 840a31f947..7bdbbb8578 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 e794538956..3111602816 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 84b721c2bf88c3ae8f519680a64b1829427176c2 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 29 Nov 2023 18:39:01 +0100 Subject: [PATCH 4086/5754] 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 840a31f947..7bdbbb8578 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 adfedbc874..efd8bd98ce 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 4087/5754] 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 55321ee2fc..0000000000 --- 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 f0327ce8cc..b02c49234a 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 c7b0ed0407..b35967a3b5 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 1f01ddd768..27dbc2869b 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 4088/5754] 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 b02c49234a..01c86f2bd6 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 b35967a3b5..59cdd31942 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 4089/5754] 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 964ec04ec4..8a40f584de 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 4090/5754] 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 cb61b0de55..5f7e91c9f6 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 4091/5754] 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 51237e62b9..be997e91e2 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 701083b5d3..dd0be6f35e 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 b9ea033f13..be0680084b 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 286a7ebf9d..78ec7c2e41 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 22d1c7c28e..48b7641909 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 aadcb2c360..357be4803c 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 8a9281b8e7..cc0d830f4f 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 132c3f7a82..c27baec3b3 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 0a4acb9699..aa7eefd44d 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 8eba2d7946..007ca72723 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 4316a2c185..2ccfe3ccb8 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 4092/5754] 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 d3c8d923f0..529edd51c8 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 03e66a35eabaed9f258b8670eba2e8fc13dd3eb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fl=C3=A1vio=20Tapaj=C3=B3s?= Date: Wed, 29 Nov 2023 08:02:57 -0300 Subject: [PATCH 4093/5754] package/rsyslog: bump version to 8.2310.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Flávio Tapajós Signed-off-by: Peter Korsgaard --- package/rsyslog/rsyslog.hash | 2 +- package/rsyslog/rsyslog.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rsyslog/rsyslog.hash b/package/rsyslog/rsyslog.hash index 4049590bb8..90df3e054f 100644 --- a/package/rsyslog/rsyslog.hash +++ b/package/rsyslog/rsyslog.hash @@ -1,5 +1,5 @@ # From http://www.rsyslog.com/downloads/download-v8-stable/ -sha256 a6d731e46ad3d64f6ad4b19bbf1bf56ca4760a44a24bb96823189dc2e71f7028 rsyslog-8.2204.1.tar.gz +sha256 20d9ce792bf0a7ed0703dbf0941490f8be655f48b55b4bebdc0827bbb0ddbf11 rsyslog-8.2310.0.tar.gz # Locally calculated sha256 054b3a047d9232376a46b87356b19b0c0c2924cb5e6911ab96a01fc4b515f083 COPYING diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk index 84fd2d2e5e..cf9f2c0e79 100644 --- a/package/rsyslog/rsyslog.mk +++ b/package/rsyslog/rsyslog.mk @@ -4,7 +4,7 @@ # ################################################################################ -RSYSLOG_VERSION = 8.2204.1 +RSYSLOG_VERSION = 8.2310.0 RSYSLOG_SITE = http://rsyslog.com/files/download/rsyslog RSYSLOG_LICENSE = GPL-3.0, LGPL-3.0, Apache-2.0 RSYSLOG_LICENSE_FILES = COPYING COPYING.LESSER COPYING.ASL20 From 6358bb3a9bcf8d4c66893e8df513d18bf0022c35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fl=C3=A1vio=20Tapaj=C3=B3s?= Date: Wed, 29 Nov 2023 08:02:58 -0300 Subject: [PATCH 4094/5754] package/rsyslog: add libdbi-drivers optional dependency MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Needed in order to use omlibdbi module Signed-off-by: Flávio Tapajós Signed-off-by: Peter Korsgaard --- package/rsyslog/rsyslog.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk index cf9f2c0e79..8ea92ea785 100644 --- a/package/rsyslog/rsyslog.mk +++ b/package/rsyslog/rsyslog.mk @@ -151,6 +151,13 @@ RSYSLOG_CONF_OPTS += \ --disable-omjournal endif +ifeq ($(BR2_PACKAGE_LIBDBI_DRIVERS),y) +RSYSLOG_CONF_OPTS += --enable-libdbi +RSYSLOG_DEPENDENCIES += libdbi-drivers +else +RSYSLOG_CONF_OPTS += --disable-libdbi +endif + define RSYSLOG_INSTALL_INIT_SYSTEMD $(INSTALL) -m 0644 -D package/rsyslog/rsyslog.service \ $(TARGET_DIR)/usr/lib/systemd/system/rsyslog.service From e6e16a6d1803956b0c10e0d92608980888d0ebd3 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 2 Dec 2023 09:37:38 +0100 Subject: [PATCH 4095/5754] =?UTF-8?q?DEVELOPERS:=20add=20Fl=C3=A1vio=20Tap?= =?UTF-8?q?aj=C3=B3s=20for=20rsyslog?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 1f26e9bc81..2f3eedf8a0 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1078,6 +1078,7 @@ F: package/python-pymodbus/ N: Flávio Tapajós F: configs/asus_tinker-s_rk3288_defconfig F: board/asus/tinker-s/ +F: package/rsyslog/ N: Florian Fainelli F: package/cpulimit/ From 38c4aa2826ce31bd77140a55b5dca78eb28e53a5 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 1 Dec 2023 22:23:18 +0100 Subject: [PATCH 4096/5754] 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 2edd97bed4..d72e1090e3 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 f97d547fd7..8169e0dcee 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 4097/5754] 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 667b09221d..983b921e27 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 735adea01a..71aef9997b 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 4098/5754] 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 529edd51c8..4c9164d05e 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 4099/5754] 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 e29c7f59de..0bcc47af0a 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 4100/5754] 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 f64ab5ec48..f86cdd3bbf 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 4101/5754] 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 1f26e9bc81..904c7ebf2d 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 4102/5754] 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 168b5db395..9bb3f20a71 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 208fa24e27..8624d2f949 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 4103/5754] 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 f86cdd3bbf..63df8f5c20 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 4104/5754] 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 c68d466116..7d50f88c1d 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 4105/5754] 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 0000000000..fcc1f1e673 --- /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 4106/5754] 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 0000000000..5808d92afe --- /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 0000000000..1138ec3b93 --- /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 0000000000..a81a7d8d4a --- /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 40a2d2d520..e447190e0c 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 7ceebff5b94f6a179e8ef77d467b1af0cc1bc477 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 3 Dec 2023 16:06:46 +0100 Subject: [PATCH 4107/5754] package/elfutils: drop -lfts As spotted by Yann E. Morin in https://patchwork.ozlabs.org/project/buildroot/patch/20231022154133.1619344-1-bernd@kuhls.net, -lfts is not needed since bump to version 0.183 in commit ef92e86e845134868011cb0b801509a0755f855e and https://sourceware.org/git/?p=elfutils.git;a=commitdiff;h=da855fc9cd415c288bfcb9de1f3d5eb329de0557 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/elfutils/elfutils.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/elfutils/elfutils.mk b/package/elfutils/elfutils.mk index 45df971071..24eb168894 100644 --- a/package/elfutils/elfutils.mk +++ b/package/elfutils/elfutils.mk @@ -51,7 +51,6 @@ endif ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),) ELFUTILS_DEPENDENCIES += musl-fts argp-standalone -ELFUTILS_LDFLAGS += -lfts endif ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) From 51cf6a8aa6132385f81c34bbd088924b653b93b8 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 1 Dec 2023 22:06:45 +0100 Subject: [PATCH 4108/5754] 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 4766ce3d9e..c709f903e6 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 af2cd694e3903131d6e2f00646adfa83a89a23e2 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 1 Dec 2023 23:17:15 +0100 Subject: [PATCH 4109/5754] package/duma: bump to version 2.5.21 - Switch site to get latest release - Drop all patches (already in version) - Update hash of COPYING-LGPL, empty lines removed with https://github.com/johnsonjh/duma/commit/cceb1b2d808c36f02dfbfd774bcee0967fcc9392 - Pass $(TARGET_CONFIGURE_OPTS) to install targets to avoid using wrong values since https://github.com/johnsonjh/duma/commit/abdf4074c3dc506308283f5d463b17b4f58521f1 https://github.com/johnsonjh/duma/blob/VERSION_2_5_21/CHANGELOG Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- .checkpackageignore | 4 -- package/duma/0001-fix-cross-compilation.patch | 37 ----------- package/duma/0002-no-tests.patch | 19 ------ package/duma/0003-fix-C++14.patch | 65 ------------------- .../0004-Fix-build-with-latest-glibc.patch | 22 ------- package/duma/Config.in | 2 +- package/duma/duma.hash | 4 +- package/duma/duma.mk | 11 ++-- 8 files changed, 9 insertions(+), 155 deletions(-) delete mode 100644 package/duma/0001-fix-cross-compilation.patch delete mode 100644 package/duma/0002-no-tests.patch delete mode 100644 package/duma/0003-fix-C++14.patch delete mode 100644 package/duma/0004-Fix-build-with-latest-glibc.patch diff --git a/.checkpackageignore b/.checkpackageignore index e9fdf9f01c..8c0190e3b3 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -338,10 +338,6 @@ 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 diff --git a/package/duma/0001-fix-cross-compilation.patch b/package/duma/0001-fix-cross-compilation.patch deleted file mode 100644 index eceaf06bec..0000000000 --- a/package/duma/0001-fix-cross-compilation.patch +++ /dev/null @@ -1,37 +0,0 @@ -Allow cross compilation. Adapted from crosstool-ng. - -Signed-off-by: Baruch Siach - -Index: b/GNUmakefile -=================================================================== ---- a/GNUmakefile -+++ b/GNUmakefile -@@ -93,10 +93,6 @@ - # also define 'WIN32' - - # some defaults: --CC=gcc --CXX=g++ --AR=ar --RANLIB=ranlib - INSTALL=install - RM=rm - RMFORCE=rm -f -@@ -471,7 +467,7 @@ - - createconf$(EXEPOSTFIX): createconf.o - - $(RMFORCE) createconf$(EXEPOSTFIX) -- $(CC) $(CFLAGS) $(DUMA_OPTIONS) createconf.o -o createconf$(EXEPOSTFIX) -+ $(CC_FOR_BUILD) $(HOST_CFLAGS) $(DUMA_OPTIONS) createconf.o -o createconf$(EXEPOSTFIX) - - tstheap$(EXEPOSTFIX): libduma.a tstheap.o - - $(RMFORCE) tstheap$(EXEPOSTFIX) -@@ -532,7 +528,7 @@ - # define rules how to build objects for createconf - # - createconf.o: -- $(CC) $(CFLAGS) $(DUMA_OPTIONS) -c createconf.c -o $@ -+ $(CC_FOR_BUILD) $(HOST_CFLAGS) $(DUMA_OPTIONS) -c createconf.c -o $@ - - - # diff --git a/package/duma/0002-no-tests.patch b/package/duma/0002-no-tests.patch deleted file mode 100644 index 6fe76f725f..0000000000 --- a/package/duma/0002-no-tests.patch +++ /dev/null @@ -1,19 +0,0 @@ -Do not build test programs - -Biulding test programs does not work when we want to do a static link, -because duma.a redefines memcpy and strcpy, so the link fails. - -Signed-off-by: "Yann E. MORIN" - -diff -durN duma-2.5.15.orig/GNUmakefile duma-2.5.15/GNUmakefile ---- duma-2.5.15.orig/GNUmakefile 2014-11-16 14:47:05.874448560 +0100 -+++ duma-2.5.15/GNUmakefile 2014-11-16 14:54:50.792048921 +0100 -@@ -294,7 +294,7 @@ - SO_OBJECTS=dumapp_so.o duma_so.o sem_inc_so.o print_so.o - - # Make all the top-level targets the makefile knows about. --all: libduma.a tstheap$(EXEPOSTFIX) dumatest$(EXEPOSTFIX) thread-test$(EXEPOSTFIX) testmt$(EXEPOSTFIX) dumatestpp$(EXEPOSTFIX) testoperators$(EXEPOSTFIX) $(DUMA_DYN_DEPS) -+all: libduma.a $(DUMA_DYN_DEPS) - - # Perform self tests on the program this makefile builds. - check test: diff --git a/package/duma/0003-fix-C++14.patch b/package/duma/0003-fix-C++14.patch deleted file mode 100644 index d19213ca7a..0000000000 --- a/package/duma/0003-fix-C++14.patch +++ /dev/null @@ -1,65 +0,0 @@ -dumapp: fix for C++14 - -With C++14, the way exceptions are specified has changed (somehow, don't -ask me), thus causing build failures: - - dumapp.cpp: In function ‘void* operator new(std::size_t)’: - dumapp.cpp:192:19: error: declaration of ‘void* operator new(std::size_t) throw (std::bad_alloc)’ has a different exception specifier - void * DUMA_CDECL operator new( DUMA_SIZE_T size ) - ^~~~~~~~ - In file included from dumapp.cpp:39:0: - dumapp.h:91:23: note: from previous declaration ‘void* operator new(std::size_t)’ - void * DUMA_CDECL operator new(DUMA_SIZE_T) throw(std::bad_alloc); - ^~~~~~~~ - -This is most evident with gcc-6.x, since the default C++ standard has -changed from C++11 to C++14, thus exposing these new failures. - -Fix that by guarding the exception handling, a bit like was done -with GRASS GIS (thanks DuckDuckGo): - - https://trac.osgeo.org/grass/changeset?old_path=%2F&old=68817&new_path=%2F&new=68818&sfp_email=&sfph_mail= - -Signed-off-by: "Yann E. MORIN" - ---- -Note: The last commit in DUMA's CVS repo was more than 7 years ago. -I doubt it is still active, so the patch was not sent upstream. :-/ - -diff -durN duma-2.5.15.orig/dumapp.cpp duma-2.5.15/dumapp.cpp ---- duma-2.5.15.orig/dumapp.cpp 2008-08-03 22:46:06.000000000 +0200 -+++ duma-2.5.15/dumapp.cpp 2016-07-10 21:55:22.670386099 +0200 -@@ -190,7 +190,9 @@ - * (11) = (a) ; ASW - */ - void * DUMA_CDECL operator new( DUMA_SIZE_T size ) -+#ifdef DUMA_EXCEPTION_SPECS - throw(std::bad_alloc) -+#endif - { - return duma_new_operator(size, EFA_NEW_ELEM, true DUMA_PARAMS_UK); - } -@@ -254,7 +256,9 @@ - * (21) = (a) ; AAW - */ - void * DUMA_CDECL operator new[]( DUMA_SIZE_T size ) -+#ifdef DUMA_EXCEPTION_SPECS - throw(std::bad_alloc) -+#endif - { - return duma_new_operator(size, EFA_NEW_ARRAY, true DUMA_PARAMS_UK); - } -diff -durN duma-2.5.15.orig/dumapp.h duma-2.5.15/dumapp.h ---- duma-2.5.15.orig/dumapp.h 2009-04-11 14:41:44.000000000 +0200 -+++ duma-2.5.15/dumapp.h 2016-07-10 21:55:22.670386099 +0200 -@@ -35,6 +35,10 @@ - - #include "duma.h" - -+#if __cplusplus < 201103L -+ #define DUMA_EXCEPTION_SPECS 1 -+#endif -+ - /* remove previous macro definitions */ - #include "noduma.h" - diff --git a/package/duma/0004-Fix-build-with-latest-glibc.patch b/package/duma/0004-Fix-build-with-latest-glibc.patch deleted file mode 100644 index 2d73d7ae57..0000000000 --- a/package/duma/0004-Fix-build-with-latest-glibc.patch +++ /dev/null @@ -1,22 +0,0 @@ -Fix build with latest glibc - -Fixes: - - http://autobuild.buildroot.net/results/c7de1a1d01edced2098a804ad87dcb67b5dc6832 - -Signed-off-by: Fabrice Fontaine - -diff -durN duma_2_5_15.orig/print.c duma_2_5_15/print.c ---- duma_2_5_15.orig/print.c 2019-10-28 10:21:14.080149620 +0100 -+++ duma_2_5_15/print.c 2019-10-28 10:22:01.256151561 +0100 -@@ -326,9 +326,9 @@ - if(DUMA_OUTPUT_FILE != NULL) - { - #if defined(WIN32) && !defined(__CYGWIN__) -- fd = _open(DUMA_OUTPUT_FILE, _O_APPEND|_O_CREAT|_O_WRONLY); -+ fd = _open(DUMA_OUTPUT_FILE, _O_APPEND|_O_CREAT|_O_WRONLY, 0600); - #else -- fd = open(DUMA_OUTPUT_FILE, O_APPEND|O_CREAT|O_WRONLY); -+ fd = open(DUMA_OUTPUT_FILE, O_APPEND|O_CREAT|O_WRONLY, 0600); - #endif - if ( fd >= 0 ) - { diff --git a/package/duma/Config.in b/package/duma/Config.in index b1f55faa73..a891996ad1 100644 --- a/package/duma/Config.in +++ b/package/duma/Config.in @@ -14,7 +14,7 @@ config BR2_PACKAGE_DUMA Electric Fence library. Detects buffer overflow and underflow, and also memory leaks. - http://duma.sourceforge.net + https://github.com/johnsonjh/duma if BR2_PACKAGE_DUMA diff --git a/package/duma/duma.hash b/package/duma/duma.hash index ccf171a97c..d6c1685bd1 100644 --- a/package/duma/duma.hash +++ b/package/duma/duma.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 baaf794854e3093ad1bddadbfb8ad4b220a7117d70359ee216bd59e353734e17 duma_2_5_15.tar.gz +sha256 470aa72e7018f0beadb5fbe3c932a62ba1b0594c29158a744c614bfa42133e59 duma-2.5.21.tar.gz sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING-GPL -sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 COPYING-LGPL +sha256 76568dd3f7e12b18900ce0e767b99e59f4956a2e709a33de899508693a6425d4 COPYING-LGPL diff --git a/package/duma/duma.mk b/package/duma/duma.mk index 906db872d5..6bbdf41f4a 100644 --- a/package/duma/duma.mk +++ b/package/duma/duma.mk @@ -4,9 +4,8 @@ # ################################################################################ -DUMA_VERSION = 2.5.15 -DUMA_SOURCE = duma_$(subst .,_,$(DUMA_VERSION)).tar.gz -DUMA_SITE = http://downloads.sourceforge.net/project/duma/duma/$(DUMA_VERSION) +DUMA_VERSION = 2.5.21 +DUMA_SITE = $(call github,johnsonjh,duma,VERSION_$(subst .,_,$(DUMA_VERSION))) DUMA_LICENSE = GPL-2.0+, LGPL-2.1+ DUMA_LICENSE_FILES = COPYING-GPL COPYING-LGPL @@ -25,11 +24,13 @@ define DUMA_BUILD_CMDS endef define DUMA_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) OS=linux prefix=$(STAGING_DIR)/usr install -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ + OS=linux prefix=$(STAGING_DIR)/usr install -C $(@D) endef define DUMA_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) OS=linux prefix=$(TARGET_DIR)/usr install -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ + OS=linux prefix=$(TARGET_DIR)/usr install -C $(@D) endef $(eval $(generic-package)) From a7898055d34950a872b7cb0fe2fff2895b1a9289 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Sat, 2 Dec 2023 02:49:59 +0100 Subject: [PATCH 4110/5754] 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 fe3f265941..1c26b3cc6f 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 a4e713558dfd9a6fd6c0677b4b094adc216b720e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 2 Dec 2023 23:36:33 +0100 Subject: [PATCH 4111/5754] package/leptonica: bump to version 1.83.1 https://github.com/DanBloomberg/leptonica/compare/1.82.0...1.83.1 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/leptonica/leptonica.hash | 2 +- package/leptonica/leptonica.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/leptonica/leptonica.hash b/package/leptonica/leptonica.hash index 1220fbbd6e..6511d6b410 100644 --- a/package/leptonica/leptonica.hash +++ b/package/leptonica/leptonica.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 155302ee914668c27b6fe3ca9ff2da63b245f6d62f3061c8f27563774b8ae2d6 leptonica-1.82.0.tar.gz +sha256 8f18615e0743af7df7f50985c730dfcf0c93548073d1f56621e4156a8b54d3dd leptonica-1.83.1.tar.gz sha256 87829abb5bbb00b55a107365da89e9a33f86c4250169e5a1e5588505be7d5806 leptonica-license.txt diff --git a/package/leptonica/leptonica.mk b/package/leptonica/leptonica.mk index 8791b0c4c2..8eedf2fda9 100644 --- a/package/leptonica/leptonica.mk +++ b/package/leptonica/leptonica.mk @@ -4,8 +4,8 @@ # ################################################################################ -LEPTONICA_VERSION = 1.82.0 -LEPTONICA_SITE = http://www.leptonica.org/source +LEPTONICA_VERSION = 1.83.1 +LEPTONICA_SITE = https://github.com/DanBloomberg/leptonica/releases/download/$(LEPTONICA_VERSION) LEPTONICA_LICENSE = BSD-2-Clause LEPTONICA_LICENSE_FILES = leptonica-license.txt LEPTONICA_CPE_ID_VENDOR = leptonica From c9e5c1e80eff025768e347efbe5eb4d1dfd81ea9 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Mon, 27 Nov 2023 19:51:06 +0100 Subject: [PATCH 4112/5754] package/libnss: bump version to 3.95 Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- 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 50889f8d13..046f0efcca 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_94_RTM/src/SHA256SUMS -sha256 463ae180ee9e5ee9e3ad4f629326657e236780cc865572a930a16520abad9dd8 nss-3.94.tar.gz +# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_95_RTM/src/SHA256SUMS +sha256 469888e41e8a780051ce00edcd914e8a6bd38da88a82cfb84898dd388635822a nss-3.95.tar.gz # Locally calculated sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index e6f4d2f42a..878375e1b6 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSS_VERSION = 3.94 +LIBNSS_VERSION = 3.95 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 748a217c2521c1dd4248fd1b5507388f664e1984 Mon Sep 17 00:00:00 2001 From: Sergey Matyukevich Date: Sat, 2 Dec 2023 15:31:37 +0300 Subject: [PATCH 4113/5754] configs/linksprite_pcduino_defconfig: bump BSP versions Switch to the new Linux LTS release 6.6.3. Switch to the latest U-Boot 2023.10. Signed-off-by: Sergey Matyukevich Signed-off-by: Peter Korsgaard --- configs/linksprite_pcduino_defconfig | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configs/linksprite_pcduino_defconfig b/configs/linksprite_pcduino_defconfig index cf58e021ba..2b215201cb 100644 --- a/configs/linksprite_pcduino_defconfig +++ b/configs/linksprite_pcduino_defconfig @@ -18,16 +18,16 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" # For kernel modules autoloading BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +# Linux headers same as kernel, a 6.6 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.14" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.3" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun4i-a10-pcduino" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun4i-a10-pcduino" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/linksprite/pcduino/linux-extras.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_LINUX_KERNEL_INSTALL_TARGET=y @@ -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="2023.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Linksprite_pcDuino" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y From 9fb563b491ed6eb515b2d9b2cb4654e6c3d8ffb9 Mon Sep 17 00:00:00 2001 From: Sergey Matyukevich Date: Sat, 2 Dec 2023 15:31:38 +0300 Subject: [PATCH 4114/5754] configs/orangepi_pc_plus: bump BSP versions Switch to the new Linux LTS release 6.6.3. Switch to the latest U-Boot 2023.10. Signed-off-by: Sergey Matyukevich Signed-off-by: Peter Korsgaard --- configs/orangepi_pc_plus_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/orangepi_pc_plus_defconfig b/configs/orangepi_pc_plus_defconfig index 9dbf808da7..068eb09636 100644 --- a/configs/orangepi_pc_plus_defconfig +++ b/configs/orangepi_pc_plus_defconfig @@ -2,16 +2,16 @@ 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_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=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="6.1.14" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.3" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-pc-plus" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun8i-h3-orangepi-pc-plus" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-pc-plus/linux-extras.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_LINUX_KERNEL_INSTALL_TARGET=y @@ -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="2023.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_pc_plus" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y From 593c259cde9ac646b70281a71336b6465dd39b37 Mon Sep 17 00:00:00 2001 From: Sergey Matyukevich Date: Sat, 2 Dec 2023 15:31:39 +0300 Subject: [PATCH 4115/5754] configs/orangepi_one_defconfig: bump BSP versions Switch to the new Linux LTS release 6.6.3. Switch to the latest U-Boot 2023.10. Signed-off-by: Sergey Matyukevich Signed-off-by: Peter Korsgaard --- configs/orangepi_one_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/orangepi_one_defconfig b/configs/orangepi_one_defconfig index ea988e87ea..1431619620 100644 --- a/configs/orangepi_one_defconfig +++ b/configs/orangepi_one_defconfig @@ -1,16 +1,16 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=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="6.1.14" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.3" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-one" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun8i-h3-orangepi-one" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_TARGET_ROOTFS_EXT2=y @@ -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="2023.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_one" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y From 8e9681c52e448902c335418b9199cc6d9e23b726 Mon Sep 17 00:00:00 2001 From: Sergey Matyukevich Date: Sat, 2 Dec 2023 15:31:40 +0300 Subject: [PATCH 4116/5754] configs/orangepi_zero: bump BSP versions Switch to the new Linux LTS release 6.6.3. Switch to the latest U-Boot 2023.10. Signed-off-by: Sergey Matyukevich Signed-off-by: Peter Korsgaard --- ...RM-dts-orange-pi-zero-interrupt-triggering-xr819.patch | 8 ++++---- .../0002-ARM-dts-orange-pi-zero-enable-spi-nor.patch | 8 ++++---- .../linux/0003-ARM-dts-orange-pi-zero-enable-spidev.patch | 8 ++++---- .../linux/0004-ARM-dts-orange-pi-zero-enable-uart.patch | 8 ++++---- configs/orangepi_zero_defconfig | 8 ++++---- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/board/orangepi/orangepi-zero/patches/linux/0001-ARM-dts-orange-pi-zero-interrupt-triggering-xr819.patch b/board/orangepi/orangepi-zero/patches/linux/0001-ARM-dts-orange-pi-zero-interrupt-triggering-xr819.patch index 16207afcb1..6a5aa0bb63 100644 --- a/board/orangepi/orangepi-zero/patches/linux/0001-ARM-dts-orange-pi-zero-interrupt-triggering-xr819.patch +++ b/board/orangepi/orangepi-zero/patches/linux/0001-ARM-dts-orange-pi-zero-interrupt-triggering-xr819.patch @@ -13,13 +13,13 @@ This commit specifies XR819 interrupt configuration for the driver. Signed-off-by: Sergey Matyukevich --- - arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 3 +++ + arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts | 3 +++ 1 file changed, 3 insertions(+) -diff --git a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts +diff --git a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts index b7ca916d871d..4e1a9050c6b4 100644 ---- a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts -+++ b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts +--- a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts ++++ b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts @@ -125,6 +125,9 @@ */ xr819: sdio_wifi@1 { diff --git a/board/orangepi/orangepi-zero/patches/linux/0002-ARM-dts-orange-pi-zero-enable-spi-nor.patch b/board/orangepi/orangepi-zero/patches/linux/0002-ARM-dts-orange-pi-zero-enable-spi-nor.patch index e4c52ab911..ff0a1db223 100644 --- a/board/orangepi/orangepi-zero/patches/linux/0002-ARM-dts-orange-pi-zero-enable-spi-nor.patch +++ b/board/orangepi/orangepi-zero/patches/linux/0002-ARM-dts-orange-pi-zero-enable-spi-nor.patch @@ -10,13 +10,13 @@ For more information see: Signed-off-by: Sergey Matyukevich --- - arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 16 ++++++++++++++++ + arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) -diff --git a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts +diff --git a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts index 4e1a9050c6b4..cdf19821b1f3 100644 ---- a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts -+++ b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts +--- a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts ++++ b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts @@ -161,3 +161,19 @@ /* USB VBUS is always on */ status = "okay"; diff --git a/board/orangepi/orangepi-zero/patches/linux/0003-ARM-dts-orange-pi-zero-enable-spidev.patch b/board/orangepi/orangepi-zero/patches/linux/0003-ARM-dts-orange-pi-zero-enable-spidev.patch index ae0ed9ba3b..04d43c344f 100644 --- a/board/orangepi/orangepi-zero/patches/linux/0003-ARM-dts-orange-pi-zero-enable-spidev.patch +++ b/board/orangepi/orangepi-zero/patches/linux/0003-ARM-dts-orange-pi-zero-enable-spidev.patch @@ -8,13 +8,13 @@ This patch enables spidev driver for SPI1. Signed-off-by: Sergey Matyukevich --- - arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 11 +++++++++++ + arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts | 11 +++++++++++ 1 file changed, 11 insertions(+) -diff --git a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts +diff --git a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts index cdf19821b1f3..7242aaecb14f 100644 ---- a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts -+++ b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts +--- a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts ++++ b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts @@ -59,6 +59,7 @@ serial0 = &uart0; /* ethernet0 is the H3 emac, defined in sun8i-h3.dtsi */ diff --git a/board/orangepi/orangepi-zero/patches/linux/0004-ARM-dts-orange-pi-zero-enable-uart.patch b/board/orangepi/orangepi-zero/patches/linux/0004-ARM-dts-orange-pi-zero-enable-uart.patch index 839bc16087..41c23209ce 100644 --- a/board/orangepi/orangepi-zero/patches/linux/0004-ARM-dts-orange-pi-zero-enable-uart.patch +++ b/board/orangepi/orangepi-zero/patches/linux/0004-ARM-dts-orange-pi-zero-enable-uart.patch @@ -7,13 +7,13 @@ Enable uart1 and uart2 on orange-pi-zero board. Signed-off-by: Sergey Kuzminov --- - arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 4 ++-- + arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts +diff --git a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts index f19ed981da9d..03acf166ab70 100644 ---- a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts -+++ b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts +--- a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts ++++ b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts @@ -184,13 +184,13 @@ &uart0 { &uart1 { pinctrl-names = "default"; diff --git a/configs/orangepi_zero_defconfig b/configs/orangepi_zero_defconfig index e286f0b7f1..596805bd47 100644 --- a/configs/orangepi_zero_defconfig +++ b/configs/orangepi_zero_defconfig @@ -8,16 +8,16 @@ 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_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_SYSTEM_DHCP="eth0" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.14" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.3" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-orangepi-zero" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun8i-h2-plus-orangepi-zero" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero/linux-extras.fragment" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_LINUX_KERNEL_INSTALL_TARGET=y @@ -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="2023.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y From 026c8f80ff2294f08d70aa17d38b4be8c0c9d0de Mon Sep 17 00:00:00 2001 From: Sergey Matyukevich Date: Sat, 2 Dec 2023 15:31:41 +0300 Subject: [PATCH 4117/5754] configs/orangepi_zero_plus2: update BSP versions Switch to the new Linux LTS release 6.6.3. Switch to the latest U-Boot 2023.10 and ATF 2.9. Increase ext2 partition size to fit new versions. Signed-off-by: Sergey Matyukevich Signed-off-by: Peter Korsgaard --- configs/orangepi_zero_plus2_defconfig | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configs/orangepi_zero_plus2_defconfig b/configs/orangepi_zero_plus2_defconfig index 377e9f1c59..990e16463f 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_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=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.8" +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.10" 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="6.1.14" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.3" 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" @@ -56,7 +56,7 @@ BR2_PACKAGE_WPA_SUPPLICANT_CLI=y BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi Zero Plus2" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +BR2_TARGET_ROOTFS_EXT2_SIZE="128M" # host tools BR2_PACKAGE_HOST_GENIMAGE=y From ad21d833e0d0876f43e409548481c6030db2d16e Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Sun, 3 Dec 2023 18:58:56 +0200 Subject: [PATCH 4118/5754] package/socat: drop patch 2 As upstream developer mentioned in private communication, the code using NETDB_INTERNAL is now disabled. Remove the patch. Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- .../0002-compat-set-NETDB_INTERNAL.patch | 36 ------------------- 1 file changed, 36 deletions(-) delete mode 100644 package/socat/0002-compat-set-NETDB_INTERNAL.patch diff --git a/package/socat/0002-compat-set-NETDB_INTERNAL.patch b/package/socat/0002-compat-set-NETDB_INTERNAL.patch deleted file mode 100644 index f526664210..0000000000 --- a/package/socat/0002-compat-set-NETDB_INTERNAL.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 4b86f141c7c4725093fb2e12c769fec393727519 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Sun, 28 Aug 2016 21:04:01 +0200 -Subject: [PATCH] compat: set NETDB_INTERNAL - -Musl doesn't provide NETDB_INTERNAL which is defined in resolv/netdb.h -in Glibc [1]. - -Set NETDB_INTERNAL to -1 locally if not already defined. -Based on [2]. - -[1] https://sourceware.org/git/?p=glibc.git;a=blob;f=resolv/netdb.h;h=3aba530932c7a62a4f23e3193e9186da677f552b;hb=fdfc9260b61d3d72541f18104d24c7bcb0ce5ca2#l74 -[2] http://git.alpinelinux.org/cgit/aports/tree/main/socat/netdb-internal.patch?id=5a45173b50892cb634197c30b3506ebff98d3b7d - -Upstream: sent to socat@dest-unreach.org -Signed-off-by: Romain Naour ---- - compat.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/compat.h b/compat.h -index bb7e2d8f1782..72e73c701f64 100644 ---- a/compat.h -+++ b/compat.h -@@ -851,6 +851,8 @@ typedef unsigned long T_sigset; - - #if !defined(NETDB_INTERNAL) && defined(h_NETDB_INTERNAL) - # define NETDB_INTERNAL h_NETDB_INTERNAL -+#elif !defined(NETDB_INTERNAL) -+# define NETDB_INTERNAL (-1) - #endif - - #ifndef INET_ADDRSTRLEN --- -2.5.5 - From 56fd7854342911b737478667a183958119166a18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Wed, 22 Nov 2023 02:41:07 +0100 Subject: [PATCH 4119/5754] Revert "board/raspberrypi: handle dtb overlays for all variants" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 6021f3678b44d43da7057e3135da842cde1ffa05. That change is no more relevant since the genimage.cfg files are generated by the commit e37ee5acdc (board/raspberrypi/post-image.sh: generate genimage config from template if not present), and since the variant-specific files were dropped off by the commit fc5cdeed72 (board/raspberrypi: drop variant-specific genimage files). This removes the very last alive piece of change of the commit 6021f3678b (board/raspberrypi: handle dtb overlays for all variants); the commit is fully reverted now. Signed-off-by: Gaël PORTAY Signed-off-by: Peter Korsgaard --- board/raspberrypi/post-build.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/board/raspberrypi/post-build.sh b/board/raspberrypi/post-build.sh index 0bd7bc3d17..73026e5922 100755 --- a/board/raspberrypi/post-build.sh +++ b/board/raspberrypi/post-build.sh @@ -14,6 +14,3 @@ elif [ -d ${TARGET_DIR}/etc/systemd ]; then ln -sf /lib/systemd/system/getty@.service \ "${TARGET_DIR}/etc/systemd/system/getty.target.wants/getty@tty1.service" fi - -# ensure overlays exists for genimage -mkdir -p "${BINARIES_DIR}/rpi-firmware/overlays" From f1de35e2a0ea2496a920d0b28b5986ffb50f0640 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Wed, 22 Nov 2023 02:41:08 +0100 Subject: [PATCH 4120/5754] Revert "Fix rasberry Pi 64bit firmware overlay inclusion" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 51d6d6c580432435f2b2f95ed35e22a5ecbe9dcb. That change is no more relevant since the genimage.cfg files are generated by the commit e37ee5acdc (board/raspberrypi/post-image.sh: generate genimage config from template if not present), and since the variant-specific files were dropped off by the commit fc5cdeed72 (board/raspberrypi: drop variant-specific genimage files). This removes the very last alive piece of change of the commit 51d6d6c580 (Fix rasberry Pi 64bit firmware overlay inclusion); the commit is fully reverted now. Signed-off-by: Gaël PORTAY Signed-off-by: Peter Korsgaard --- package/rpi-firmware/rpi-firmware.mk | 6 ------ 1 file changed, 6 deletions(-) diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk index 37e010d1de..11177aee02 100644 --- a/package/rpi-firmware/rpi-firmware.mk +++ b/package/rpi-firmware/rpi-firmware.mk @@ -59,12 +59,6 @@ define RPI_FIRMWARE_INSTALL_DTB_OVERLAYS $(INSTALL) -D -m 0644 $(@D)/boot/overlays/overlay_map.dtb $(BINARIES_DIR)/rpi-firmware/overlays/ touch $(BINARIES_DIR)/rpi-firmware/overlays/README endef -else -# Still create the directory, so a genimage.cfg can include it independently of -# whether _INSTALL_DTB_OVERLAYS is selected or not. -define RPI_FIRMWARE_INSTALL_DTB_OVERLAYS - $(INSTALL) -d $(BINARIES_DIR)/rpi-firmware/overlays -endef endif # Install prebuilt libraries if RPI_USERLAND not enabled From a9d03feed642a860c11122a0b0ab32365201fc40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Wed, 22 Nov 2023 02:06:10 +0100 Subject: [PATCH 4121/5754] board/raspberrypi/readme.txt: add pi0w hint MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Gaël PORTAY Signed-off-by: Peter Korsgaard --- board/raspberrypi/readme.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/board/raspberrypi/readme.txt b/board/raspberrypi/readme.txt index c81fd801ae..ebcf8da588 100644 --- a/board/raspberrypi/readme.txt +++ b/board/raspberrypi/readme.txt @@ -28,6 +28,10 @@ For model Zero (model A+ in smaller form factor): $ make raspberrypi0_defconfig +or for model Zero W (model Zero with wireless LAN and Bluetooth): + + $ make raspberrypi0w_defconfig + For model Zero 2 W (model B3 in smaller form factor): $ make raspberrypizero2w_defconfig From 302199957705ae9b63741ce8a571b706bcc577e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= Date: Tue, 7 Nov 2023 14:16:26 +0100 Subject: [PATCH 4122/5754] package/linux-firmware: add RTL8851/RTL8852 firmware MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add firmware files for RTL8851 and RTL8852 cards used by the rtlbt driver. Signed-off-by: Jan Čermák Signed-off-by: Peter Korsgaard --- package/linux-firmware/linux-firmware.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index c2cf0fec19..96905dd909 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -90,7 +90,12 @@ LINUX_FIRMWARE_FILES += \ rtl_bt/rtl8821c_config.bin rtl_bt/rtl8821c_fw.bin \ rtl_bt/rtl8822b_config.bin rtl_bt/rtl8822b_fw.bin \ rtl_bt/rtl8822cs_config.bin rtl_bt/rtl8822cs_fw.bin \ - rtl_bt/rtl8822cu_config.bin rtl_bt/rtl8822cu_fw.bin + rtl_bt/rtl8822cu_config.bin rtl_bt/rtl8822cu_fw.bin \ + rtl_bt/rtl8851bu_fw.bin rtl_bt/rtl8851bu_config.bin \ + rtl_bt/rtl8852au_fw.bin rtl_bt/rtl8852au_config.bin \ + rtl_bt/rtl8852bu_fw.bin rtl_bt/rtl8852bu_config.bin \ + rtl_bt/rtl8852cu_fw.bin rtl_bt/rtl8852cu_config.bin \ + rtl_bt/rtl8852cu_fw_v2.bin LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.rtlwifi_firmware.txt endif From c8a5a97e6740e31ef62e1be9f7c640dde79db6d4 Mon Sep 17 00:00:00 2001 From: Francis Laniel Date: Mon, 20 Nov 2023 14:54:43 +0100 Subject: [PATCH 4123/5754] package/tbb: bump to version 2021.11.0. Signed-off-by: Francis Laniel Signed-off-by: Peter Korsgaard --- package/tbb/tbb.hash | 2 +- package/tbb/tbb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tbb/tbb.hash b/package/tbb/tbb.hash index 085d54109a..4d2cb10da8 100644 --- a/package/tbb/tbb.hash +++ b/package/tbb/tbb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 487023a955e5a3cc6d3a0d5f89179f9b6c0ae7222613a7185b0227ba0c83700b tbb-2021.10.0.tar.gz +sha256 782ce0cab62df9ea125cdea253a50534862b563f1d85d4cda7ad4e77550ac363 tbb-2021.11.0.tar.gz sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE.txt diff --git a/package/tbb/tbb.mk b/package/tbb/tbb.mk index 75cca5e99d..1b0afbb889 100644 --- a/package/tbb/tbb.mk +++ b/package/tbb/tbb.mk @@ -4,7 +4,7 @@ # ################################################################################ -TBB_VERSION = 2021.10.0 +TBB_VERSION = 2021.11.0 TBB_SITE = $(call github,01org,tbb,v$(TBB_VERSION)) TBB_INSTALL_STAGING = YES TBB_LICENSE = Apache-2.0 From b47b2065b249b3f50f3164d8a8114b108f596559 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 3 Dec 2023 18:42:04 +0100 Subject: [PATCH 4124/5754] 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 63df8f5c20..b72f127a1d 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 029099025f81baaa6b8296bada22878751fa5025 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 21 Nov 2023 23:07:06 +0100 Subject: [PATCH 4125/5754] package/libblockdev: drop unrecognized options The following options were wrongly kept when bumping to version 3.0.3 in commit 18420d9b6b424492741cba495cc2e7a28a409e8b: - dmraid (dropped since https://github.com/storaged-project/libblockdev/commit/d174944a85169efae3bac0b6e76498e3d0c6c240) - bcache and kbd (dropped since https://github.com/storaged-project/libblockdev/commit/c1ff1c87e31fb2820a5694637eb221f590eb9451) - python2 (dropped since https://github.com/storaged-project/libblockdev/commit/8fc33b834529d3d18a73112e4c77ea0a5d26d62c) - vdo (dropped since https://github.com/storaged-project/libblockdev/commit/e51faac2a952da33925e3ccab0f4f0fdf3986cd3) Signed-off-by: Fabrice Fontaine Reviewed-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- package/libblockdev/libblockdev.mk | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/package/libblockdev/libblockdev.mk b/package/libblockdev/libblockdev.mk index 3bbc221cc5..e0fca2b95c 100644 --- a/package/libblockdev/libblockdev.mk +++ b/package/libblockdev/libblockdev.mk @@ -16,20 +16,15 @@ LIBBLOCKDEV_AUTORECONF = YES LIBBLOCKDEV_CONF_OPTS = \ --disable-introspection \ --with-loop \ - --without-bcache \ --without-btrfs \ --without-dm \ - --without-dmraid \ --without-escrow \ - --without-kbd \ --without-lvm_dbus \ --without-mpath \ --without-nvdimm \ - --without-python2 \ --without-python3 \ --without-s390 \ - --without-tools \ - --without-vdo + --without-tools ifeq ($(BR2_PACKAGE_LIBBLOCKDEV_CRYPTO),y) LIBBLOCKDEV_DEPENDENCIES += cryptsetup keyutils From b7ff789e0e5e5e40bbf4bd0145100a842df16ccc Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Thu, 26 Oct 2023 12:50:34 +0100 Subject: [PATCH 4126/5754] configs/zynqmp_kria_kr260_defconfig: new defconfig This patch adds support for Xilinx Kria KR260 starter kit. KR260 features can be found here: https://www.xilinx.com/products/som/kria/kr260-robotics-starter-kit.html While the Kria SOM is based on a ZynqMP SoC, there are some key boot config differences from the other ZynqMP evaluation boards. 1. There are no boot switches on Kria SOMs. The boot mode is thus hard configured for QSPI flash. A pre-programmed boot.bin comes with every Starter Kit. U-Boot can then find the Linux kernel and file system on the SD card. Optional instructions for updating the boot.bin in the QSPI flash can be found in the readme.txt file and the link below. https://xilinx-wiki.atlassian.net/wiki/spaces/A/pages/1641152513/Kria+K26+SOM 2. Kria SOMs use UART1 for the console instead of UART0. For this reason, Kria Starter Kits will use a separate extlinux.conf file from other ZynqMP evaluation boards. 3. The KR260 has a USB to SD card bridge, so the Linux kernel and file system are found on /dev/sda1 and /dev/sda2. Signed-off-by: Neal Frager [Peter: fix kr260.sh shellcheck warnings, similar to kv260.sh] Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + board/zynqmp/kria/kr260/kr260.sh | 16 + board/zynqmp/kria/kr260/pm_cfg_obj.c | 496 +++++++++++++++++++++++++++ board/zynqmp/kria/readme.txt | 29 +- configs/zynqmp_kria_kr260_defconfig | 42 +++ 5 files changed, 578 insertions(+), 6 deletions(-) create mode 100755 board/zynqmp/kria/kr260/kr260.sh create mode 100644 board/zynqmp/kria/kr260/pm_cfg_obj.c create mode 100644 configs/zynqmp_kria_kr260_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index 2f3eedf8a0..0500c5f7ce 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2212,6 +2212,7 @@ F: board/zynqmp/ F: configs/versal_vck190_defconfig F: configs/zynq_zc702_defconfig F: configs/zynq_zc706_defconfig +F: configs/zynqmp_kria_kr260_defconfig F: configs/zynqmp_kria_kv260_defconfig F: configs/zynqmp_zcu102_defconfig F: configs/zynqmp_zcu106_defconfig diff --git a/board/zynqmp/kria/kr260/kr260.sh b/board/zynqmp/kria/kr260/kr260.sh new file mode 100755 index 0000000000..ac49fa5ee4 --- /dev/null +++ b/board/zynqmp/kria/kr260/kr260.sh @@ -0,0 +1,16 @@ +#!/bin/sh + +# This is a temporary work around for generating kr260 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 kr260 carrier board +# drivers are missing. +# This will be removed when u-boot can build the kr260 u-boot.itb natively. + +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-kr-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/kria/kr260/pm_cfg_obj.c b/board/zynqmp/kria/kr260/pm_cfg_obj.c new file mode 100644 index 0000000000..9692a30d37 --- /dev/null +++ b/board/zynqmp/kria/kr260/pm_cfg_obj.c @@ -0,0 +1,496 @@ +/****************************************************************************** +* Copyright (c) 2017 - 2021 Xilinx, Inc. All rights reserved. +* SPDX-License-Identifier: MIT +******************************************************************************/ + +#include "xil_types.h" +#include "pm_defs.h" + +#define PM_CONFIG_MASTER_SECTION_ID 0x101U +#define PM_CONFIG_SLAVE_SECTION_ID 0x102U +#define PM_CONFIG_PREALLOC_SECTION_ID 0x103U +#define PM_CONFIG_POWER_SECTION_ID 0x104U +#define PM_CONFIG_RESET_SECTION_ID 0x105U +#define PM_CONFIG_SHUTDOWN_SECTION_ID 0x106U +#define PM_CONFIG_SET_CONFIG_SECTION_ID 0x107U +#define PM_CONFIG_GPO_SECTION_ID 0x108U + +#define PM_SLAVE_FLAG_IS_SHAREABLE 0x1U +#define PM_MASTER_USING_SLAVE_MASK 0x2U + +#define PM_CONFIG_GPO1_MIO_PIN_34_MAP (1U << 10U) +#define PM_CONFIG_GPO1_MIO_PIN_35_MAP (1U << 11U) +#define PM_CONFIG_GPO1_MIO_PIN_36_MAP (1U << 12U) +#define PM_CONFIG_GPO1_MIO_PIN_37_MAP (1U << 13U) + +#define PM_CONFIG_GPO1_BIT_2_MASK (1U << 2U) +#define PM_CONFIG_GPO1_BIT_3_MASK (1U << 3U) +#define PM_CONFIG_GPO1_BIT_4_MASK (1U << 4U) +#define PM_CONFIG_GPO1_BIT_5_MASK (1U << 5U) + +#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 + + + +#if defined (__ICCARM__) +#pragma language=save +#pragma language=extended +#endif +#if defined (__GNUC__) + const u32 XPm_ConfigObject[] __attribute__((used, section(".sys_cfg_data"))) = +#elif defined (__ICCARM__) +#pragma location = ".sys_cfg_data" +__root const u32 XPm_ConfigObject[] = +#endif +{ + /**********************************************************************/ + /* HEADER */ + 2, /* Number of remaining words in the header */ + 8, /* Number of sections included in config object */ + PM_CONFIG_OBJECT_TYPE_BASE, /* Type of config object as base */ + /**********************************************************************/ + /* MASTER SECTION */ + PM_CONFIG_MASTER_SECTION_ID, /* Master SectionID */ + 3U, /* No. of Masters*/ + + NODE_APU, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ + + NODE_RPU_0, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ + + NODE_RPU_1, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Wake permissions */ + + + /**********************************************************************/ + /* SLAVE SECTION */ + + + PM_CONFIG_SLAVE_SECTION_ID, /* Section ID */ + 35, /* Number of slaves */ + + NODE_OCM_BANK_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 */ + + NODE_OCM_BANK_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_OCM_BANK_2, + 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_OCM_BANK_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_TCM_0_A, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_TCM_0_B, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_TCM_1_A, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TCM_1_B, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_L2, + 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_GPU_PP_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 */ + + NODE_GPU_PP_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_USB_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 */ + + NODE_USB_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_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 */ + + NODE_TTC_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_TTC_2, + 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_TTC_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_ETH_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 */ + + NODE_ETH_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_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_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_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_DP, + 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_GDMA, + 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_ADMA, + 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_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 */ + + NODE_GPIO, + 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_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 */ + + NODE_DDR, + 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_IPI_APU, + 0U, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask */ + + NODE_IPI_RPU_0, + 0U, + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_IPI_RPU_1, + 0U, + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU, + 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_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_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 */ + + + /**********************************************************************/ + /* PREALLOC SECTION */ + + PM_CONFIG_PREALLOC_SECTION_ID, /* Preallaoc SectionID */ + 3U, /* No. of Masters*/ + +/* Prealloc for psu_cortexa53_0 */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, + 10, + NODE_DDR, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_L2, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_2, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_3, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_I2C_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_QSPI, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_PL, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_APU, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + /* Prealloc for psu_cortexr5_0 */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, + 3, + NODE_TCM_0_A, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_TCM_0_B, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_RPU_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + /* Prealloc for psu_cortexr5_1 */ + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + 3, + NODE_TCM_1_A, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_TCM_1_B, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_RPU_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + + /**********************************************************************/ + /* POWER SECTION */ + + PM_CONFIG_POWER_SECTION_ID, /* Power Section ID */ + 4U, /* Number of power nodes */ + + NODE_APU, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_RPU, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_FPD, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_PLD, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + + /**********************************************************************/ + /* RESET SECTION */ + + PM_CONFIG_RESET_SECTION_ID, /* Reset Section ID */ + 120U, /* Number of resets */ + + XILPM_RESET_PCIE_CFG, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PCIE_BRIDGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PCIE_CTRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SWDT_CRF, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GDMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU_PP1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU_PP0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SATA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU3_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU2_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU1_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU0_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APU_L2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DDR, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APM_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SOFT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_QSPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_UART0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_UART1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SPI0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SPI1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SDIO0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SDIO1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_CAN0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_CAN1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_I2C0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_I2C1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SWDT_CRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_NAND, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ADMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IOU_CC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TIMESTAMP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_R50, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_R51, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_AMBA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_OCM, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_PGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APM_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RTC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SYSMON, 0, + XILPM_RESET_AFI_FM6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_LPD_SWDT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_FPD, PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, + XILPM_RESET_RPU_DBG1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_DBG0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DBG_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DBG_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_VPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IOPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_7, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_8, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_9, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_10, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_11, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_12, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_13, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_14, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_15, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_16, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_17, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_18, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_19, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_20, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_21, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_22, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_23, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_24, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_25, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_26, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_27, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_28, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_29, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_30, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_31, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_LS, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PS_ONLY, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_92, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_93, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_94, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_95, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + + /**********************************************************************/ + /* SET CONFIG SECTION */ + PM_CONFIG_SET_CONFIG_SECTION_ID, /* Set Config Section ID */ + 0U, /* Permissions to load base config object */ + 0U, /* Permissions to load overlay config object */ + + /**********************************************************************/ + /* SHUTDOWN SECTION */ + + PM_CONFIG_SHUTDOWN_SECTION_ID, /* Shutdown Section ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* System Shutdown/Restart Permission */ + + /**********************************************************************/ + /* GPO SECTION */ + PM_CONFIG_GPO_SECTION_ID, /* GPO Section ID */ + PM_CONFIG_GPO1_MIO_PIN_35_MAP | + 0, /* State of GPO pins */ +}; +#if defined (__ICCARM__) +#pragma language=restore +#endif + diff --git a/board/zynqmp/kria/readme.txt b/board/zynqmp/kria/readme.txt index bea1430482..dc6915f081 100644 --- a/board/zynqmp/kria/readme.txt +++ b/board/zynqmp/kria/readme.txt @@ -3,14 +3,17 @@ Xilinx Kria SOM Starter Kits - ZynqMP SoC ************************************************** This document describes the Buildroot support for the Kria -KV260 starter kit by Xilinx, based on Kria SOM including the +KV260 and KR260 starter kits by Xilinx, based on Kria SOM including the Zynq UltraScale+ MPSoC (aka ZynqMP). It has been tested with -the KV260 production board. +the KV260 and KR260 production boards. -Evaluation board features can be found here with the link below. +Evaluation board features can be found here with the links below. KV260: -https://www.xilinx.com/products/boards-and-kits/kv260.html +https://www.xilinx.com/products/som/kria/kv260-vision-starter-kit.html + +KR260: +https://www.xilinx.com/products/som/kria/kr260-robotics-starter-kit.html How to build it =============== @@ -65,7 +68,7 @@ in that the boot.bin and u-boot.itb files need to be flashed into the QSPI boot flash such that U-Boot can then load all of the remaining images from the SD card. -In addition, the KV260 Starter Kit QSPI comes pre-flashed with +In addition, the KV260 and KR260 Starter Kits QSPI comes pre-flashed with a utility designed to make updating the QSPI flash memory easier. @@ -76,8 +79,9 @@ https://xilinx-wiki.atlassian.net/wiki/spaces/A/pages/1641152513/Kria+K26+SOM#Bo Additionally, it is possible to use u-boot for updating the QSPI with new boot.bin and u-boot.itb images with the u-boot -commands below: +commands below. +KV260 Flashing Instructions: Flashing u-boot.itb: $ sf probe $ fatload mmc 1 0x1000000 u-boot.itb @@ -90,5 +94,18 @@ Flashing boot.bin: $ sf erase 0x200000 +$filesize $ sf write 0x1000000 0x200000 $filesize +KR260 Flashing Instructions: +Flashing u-boot.itb: + $ sf probe + $ fatload usb 0 0x1000000 u-boot.itb + $ sf erase 0xf80000 +$filesize + $ sf write 0x1000000 0xf80000 $filesize + +Flashing boot.bin: + $ sf probe + $ fatload usb 0 0x1000000 boot.bin + $ sf erase 0x200000 +$filesize + $ sf write 0x1000000 0x200000 $filesize + It is possible to boot the Buildroot generated SD card image without updating the QSPI boot.bin image, so this is an optional step. diff --git a/configs/zynqmp_kria_kr260_defconfig b/configs/zynqmp_kria_kr260_defconfig new file mode 100644 index 0000000000..2089c3f355 --- /dev/null +++ b/configs/zynqmp_kria_kr260_defconfig @@ -0,0 +1,42 @@ +BR2_aarch64=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh board/zynqmp/kria/kr260/kr260.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS1,115200 sda2 ${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_v6.1_LTS_2023.2)/xlnx_rebase_v6.1_LTS_2023.2.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-kr-g-revB" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.8_2023.2)/xlnx_rebase_v2.8_2023.2.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_v2023.01_2023.2)/xlnx_rebase_v2023.01_2023.2.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/soc-prebuilt-firmware/raw/xilinx_v2023.2/kr260-kria/pmufw.elf" +BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/kria/kr260/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/patches" From 075a65a4e1dd0ede3002fa47a2b6cafcea75edb9 Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Thu, 16 Nov 2023 12:23:22 +0000 Subject: [PATCH 4127/5754] configs/zynqmp_zcu102_defconfig: bump to xilinx-v2023.2 This patch bumps the zynqmp_zcu102_defconfig to xilinx-v2023.2 which includes the following updates: - Linux v6.1.30 with additional bug fixes - U-Boot v2023.01 with additional bug fixes - ATF v2.8 with additional bug fixes - PMUFW xilinx_v2023.2 Signed-off-by: Neal Frager Signed-off-by: Peter Korsgaard --- configs/zynqmp_zcu102_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig index 18230cf89b..c920093d8d 100644 --- a/configs/zynqmp_zcu102_defconfig +++ b/configs/zynqmp_zcu102_defconfig @@ -5,7 +5,7 @@ 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_v6.1_LTS_2023.1)/xlnx_rebase_v6.1_LTS_2023.1.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.1_LTS_2023.2)/xlnx_rebase_v6.1_LTS_2023.2.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu102-rev1.0" @@ -15,13 +15,13 @@ 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.8_2023.1)/xlnx_rebase_v2.8_2023.1.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.8_2023.2)/xlnx_rebase_v2.8_2023.2.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_v2023.01_2023.1)/xlnx_rebase_v2023.01_2023.1.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2023.01_2023.2)/xlnx_rebase_v2023.01_2023.2.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 @@ -30,7 +30,7 @@ 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/soc-prebuilt-firmware/raw/xilinx_v2023.1/zcu102-zynqmp/pmufw.elf" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/soc-prebuilt-firmware/raw/xilinx_v2023.2/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 From 2d194122d1e3ede39f37a7000e73def0b7d89e9c Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Thu, 16 Nov 2023 12:23:23 +0000 Subject: [PATCH 4128/5754] configs/zynqmp_zcu106_defconfig: bump to xilinx-v2023.2 This patch bumps the zynqmp_zcu106_defconfig to xilinx-v2023.2 which includes the following updates: - Linux v6.1.30 with additional bug fixes - U-Boot v2023.01 with additional bug fixes - ATF v2.8 with additional bug fixes - PMUFW xilinx_v2023.2 Signed-off-by: Neal Frager Signed-off-by: Peter Korsgaard --- configs/zynqmp_zcu106_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig index 21f41a2d8f..011c7f0fae 100644 --- a/configs/zynqmp_zcu106_defconfig +++ b/configs/zynqmp_zcu106_defconfig @@ -5,7 +5,7 @@ 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_v6.1_LTS_2023.1)/xlnx_rebase_v6.1_LTS_2023.1.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.1_LTS_2023.2)/xlnx_rebase_v6.1_LTS_2023.2.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA" @@ -15,13 +15,13 @@ 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.8_2023.1)/xlnx_rebase_v2.8_2023.1.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.8_2023.2)/xlnx_rebase_v2.8_2023.2.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_v2023.01_2023.1)/xlnx_rebase_v2023.01_2023.1.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2023.01_2023.2)/xlnx_rebase_v2023.01_2023.2.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 @@ -30,7 +30,7 @@ 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/soc-prebuilt-firmware/raw/xilinx_v2023.1/zcu106-zynqmp/pmufw.elf" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/soc-prebuilt-firmware/raw/xilinx_v2023.2/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 43a9d03a7ba8478fcbe8e6d7a9b7117eb76cfe9a Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Thu, 16 Nov 2023 12:23:24 +0000 Subject: [PATCH 4129/5754] configs/zynqmp_kria_kv260_defconfig: bump to xilinx-v2023.2 This patch bumps the zynqmp_kria_kv260_defconfig to xilinx-v2023.2 which includes the following updates: - Linux v6.1.30 with additional bug fixes - U-Boot v2023.01 with additional bug fixes - ATF v2.8 with additional bug fixes - PMUFW xilinx_v2023.2 Signed-off-by: Neal Frager Signed-off-by: Peter Korsgaard --- configs/zynqmp_kria_kv260_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/zynqmp_kria_kv260_defconfig b/configs/zynqmp_kria_kv260_defconfig index 78b62a9ff8..a3a157267c 100644 --- a/configs/zynqmp_kria_kv260_defconfig +++ b/configs/zynqmp_kria_kv260_defconfig @@ -5,7 +5,7 @@ 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_v6.1_LTS_2023.1)/xlnx_rebase_v6.1_LTS_2023.1.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.1_LTS_2023.2)/xlnx_rebase_v6.1_LTS_2023.2.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" @@ -15,14 +15,14 @@ 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.8_2023.1)/xlnx_rebase_v2.8_2023.1.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.8_2023.2)/xlnx_rebase_v2.8_2023.2.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_v2023.01_2023.1)/xlnx_rebase_v2023.01_2023.1.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2023.01_2023.2)/xlnx_rebase_v2023.01_2023.2.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" @@ -32,7 +32,7 @@ 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/soc-prebuilt-firmware/raw/xilinx_v2023.1/kv260-kria/pmufw.elf" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/soc-prebuilt-firmware/raw/xilinx_v2023.2/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 From eadde4d23c3c35d6b1a3fe4e3d294e8167f34252 Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Thu, 16 Nov 2023 12:36:51 +0000 Subject: [PATCH 4130/5754] configs/versal_vck190_defconfig: bump to xilinx-v2023.2 This patch bumps the versal_vck190_defconfig to xilinx-v2023.2 which includes the following updates: - Linux v6.1.30 with additional bug fixes - U-Boot v2023.01 with additional bug fixes - ATF v2.8 with additional bug fixes - PLM xilinx_v2023.2 - PSMFW xilinx_v2023.2 Signed-off-by: Neal Frager Signed-off-by: Peter Korsgaard --- configs/versal_vck190_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/versal_vck190_defconfig b/configs/versal_vck190_defconfig index e30bb35b74..8561b6641a 100644 --- a/configs/versal_vck190_defconfig +++ b/configs/versal_vck190_defconfig @@ -6,7 +6,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/versal/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="ttyAMA0,115200 mmcblk0p2" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.1_LTS_2023.1)/xlnx_rebase_v6.1_LTS_2023.1.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.1_LTS_2023.2)/xlnx_rebase_v6.1_LTS_2023.2.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/versal-vck190-rev1.1" @@ -16,7 +16,7 @@ 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.8_2023.1)/xlnx_rebase_v2.8_2023.1.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.8_2023.2)/xlnx_rebase_v2.8_2023.2.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="versal" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y @@ -24,7 +24,7 @@ BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=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_v2023.01_2023.1)/xlnx_rebase_v2023.01_2023.1.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2023.01_2023.2)/xlnx_rebase_v2023.01_2023.2.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_versal_virt" BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=versal-vck190-rev1.1" BR2_TARGET_UBOOT_NEEDS_DTC=y @@ -33,7 +33,7 @@ BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_FORMAT_REMAKE_ELF=y BR2_TARGET_UBOOT_FORMAT_DTB=y BR2_PACKAGE_VERSAL_FIRMWARE=y -BR2_PACKAGE_VERSAL_FIRMWARE_VERSION="xilinx_v2023.1" +BR2_PACKAGE_VERSAL_FIRMWARE_VERSION="xilinx_v2023.2" BR2_PACKAGE_VERSAL_FIRMWARE_BOARD="vck190" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y From 790d554474c5a999d2996dc532bc042631ef16f2 Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Thu, 16 Nov 2023 13:01:31 +0000 Subject: [PATCH 4131/5754] configs/zynq_qmtech_defconfig: deprecate board The zynq_qmtech_defconfig has not been maintained for 3 years, and is now using a very out of date u-boot and Linux kernel. Since there are 4 other zynq7000 defconfigs available in buildroot and Julien no longer has a functional board, drop the defconfig. Signed-off-by: Neal Frager Acked-by: Julien Olivain [Peter: reword commit message] Signed-off-by: Peter Korsgaard --- .checkpackageignore | 1 - DEVELOPERS | 2 - ...0001-DTS-for-QMTech-Zynq-starter-kit.patch | 418 ------------------ board/qmtech/zynq/readme.txt | 76 ---- configs/zynq_qmtech_defconfig | 33 -- 5 files changed, 530 deletions(-) delete mode 100644 board/qmtech/zynq/patches/linux/0001-DTS-for-QMTech-Zynq-starter-kit.patch delete mode 100644 board/qmtech/zynq/readme.txt delete mode 100644 configs/zynq_qmtech_defconfig diff --git a/.checkpackageignore b/.checkpackageignore index 8c0190e3b3..399d6b6689 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -76,7 +76,6 @@ board/qemu/microblazebe-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch board/qemu/microblazeel-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.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 diff --git a/DEVELOPERS b/DEVELOPERS index 0500c5f7ce..b40eab1bf9 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1708,14 +1708,12 @@ F: configs/ts7680_defconfig F: package/paho-mqtt-c N: Julien Olivain -F: board/qmtech/zynq/ F: board/spike/ F: board/technexion/imx8mmpico/ F: board/technexion/imx8mpico/ F: configs/imx8mmpico_defconfig F: configs/imx8mpico_defconfig F: configs/spike_riscv64_defconfig -F: configs/zynq_qmtech_defconfig F: package/fluid-soundfont/ F: package/fluidsynth/ F: package/glslsandbox-player/ diff --git a/board/qmtech/zynq/patches/linux/0001-DTS-for-QMTech-Zynq-starter-kit.patch b/board/qmtech/zynq/patches/linux/0001-DTS-for-QMTech-Zynq-starter-kit.patch deleted file mode 100644 index 86d8e387de..0000000000 --- a/board/qmtech/zynq/patches/linux/0001-DTS-for-QMTech-Zynq-starter-kit.patch +++ /dev/null @@ -1,418 +0,0 @@ -From 22d955122ac0f7ac74ab74aadebf6b8edaf0bbbd Mon Sep 17 00:00:00 2001 -From: Julien Olivain -Date: Sun, 15 Dec 2019 18:45:40 +0100 -Subject: [PATCH] DTS for QMTech Zynq starter kit - -Signed-off-by: Martin Chabot -Signed-off-by: Julien Olivain ---- - arch/arm/boot/dts/zynq-qmtech.dts | 397 ++++++++++++++++++++++++++++++ - 1 file changed, 397 insertions(+) - create mode 100644 arch/arm/boot/dts/zynq-qmtech.dts - -diff --git a/arch/arm/boot/dts/zynq-qmtech.dts b/arch/arm/boot/dts/zynq-qmtech.dts -new file mode 100644 -index 000000000000..c6081dc0080e ---- /dev/null -+++ b/arch/arm/boot/dts/zynq-qmtech.dts -@@ -0,0 +1,397 @@ -+// SPDX-License-Identifier: GPL-2.0+ -+/* -+ * Copyright (C) 2011 - 2015 Xilinx -+ * Copyright (C) 2012 National Instruments Corp. -+ * Copyright (C) 2019 Martin Chabot -+ */ -+ -+/* Derived from: -+ * https://github.com/Xilinx/linux-xlnx/blob/xilinx-v2019.2.01/arch/arm/boot/dts/zynq-zc702.dts -+ */ -+ -+/dts-v1/; -+#include "zynq-7000.dtsi" -+ -+/ { -+ model = "QMTECH XC7Z010 Starter Kit"; -+ compatible = "xlnx,zynq-qmtech", "xlnx,zynq-zc702", "xlnx,zynq-7000"; -+ -+ aliases { -+ ethernet0 = &gem0; -+ i2c0 = &i2c0; -+ serial0 = &uart1; -+ spi0 = &qspi; -+ mmc0 = &sdhci0; -+ }; -+ -+ memory@0 { -+ device_type = "memory"; -+ reg = <0x0 0x20000000>; -+ }; -+ -+ chosen { -+ bootargs = ""; -+ stdout-path = "serial0:115200n8"; -+ }; -+ -+ leds { -+ compatible = "gpio-leds"; -+ -+ ds23 { -+ label = "ds23"; -+ gpios = <&gpio0 10 0>; -+ linux,default-trigger = "heartbeat"; -+ }; -+ }; -+ -+}; -+ -+&amba { -+ ocm: sram@fffc0000 { -+ compatible = "mmio-sram"; -+ reg = <0xfffc0000 0x10000>; -+ }; -+}; -+ -+&clkc { -+ ps-clk-frequency = <33333333>; -+}; -+ -+&gem0 { -+ status = "okay"; -+ phy-mode = "rgmii-id"; -+ phy-handle = <ðernet_phy>; -+ -+ ethernet_phy: ethernet-phy@0 { -+ reg = <0>; -+ device_type = "ethernet-phy"; -+ }; -+}; -+ -+&gpio0 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_gpio0_default>; -+}; -+ -+&i2c0 { -+ status = "disabled"; -+ clock-frequency = <400000>; -+ pinctrl-names = "default", "gpio"; -+ pinctrl-0 = <&pinctrl_i2c0_default>; -+ pinctrl-1 = <&pinctrl_i2c0_gpio>; -+ scl-gpios = <&gpio0 50 0>; -+ sda-gpios = <&gpio0 51 0>; -+ -+ i2c-mux@74 { -+ compatible = "nxp,pca9548"; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ reg = <0x74>; -+ -+ i2c@0 { -+ #address-cells = <1>; -+ #size-cells = <0>; -+ reg = <0>; -+ si570: clock-generator@5d { -+ #clock-cells = <0>; -+ compatible = "silabs,si570"; -+ temperature-stability = <50>; -+ reg = <0x5d>; -+ factory-fout = <156250000>; -+ clock-frequency = <148500000>; -+ }; -+ }; -+ -+ i2c@1 { -+ #address-cells = <1>; -+ #size-cells = <0>; -+ reg = <1>; -+ adv7511: hdmi-tx@39 { -+ compatible = "adi,adv7511"; -+ reg = <0x39>; -+ adi,input-depth = <8>; -+ adi,input-colorspace = "yuv422"; -+ adi,input-clock = "1x"; -+ adi,input-style = <3>; -+ adi,input-justification = "right"; -+ }; -+ }; -+ -+ i2c@2 { -+ #address-cells = <1>; -+ #size-cells = <0>; -+ reg = <2>; -+ eeprom@54 { -+ compatible = "atmel,24c08"; -+ reg = <0x54>; -+ }; -+ }; -+ -+ i2c@3 { -+ #address-cells = <1>; -+ #size-cells = <0>; -+ reg = <3>; -+ gpio@21 { -+ compatible = "ti,tca6416"; -+ reg = <0x21>; -+ gpio-controller; -+ #gpio-cells = <2>; -+ }; -+ }; -+ -+ i2c@4 { -+ #address-cells = <1>; -+ #size-cells = <0>; -+ reg = <4>; -+ rtc@51 { -+ compatible = "nxp,pcf8563"; -+ reg = <0x51>; -+ }; -+ }; -+ -+ i2c@7 { -+ #address-cells = <1>; -+ #size-cells = <0>; -+ reg = <7>; -+ hwmon@52 { -+ compatible = "ti,ucd9248"; -+ reg = <52>; -+ }; -+ hwmon@53 { -+ compatible = "ti,ucd9248"; -+ reg = <53>; -+ }; -+ hwmon@54 { -+ compatible = "ti,ucd9248"; -+ reg = <54>; -+ }; -+ }; -+ }; -+}; -+ -+&pinctrl0 { -+ pinctrl_can0_default: can0-default { -+ mux { -+ function = "can0"; -+ groups = "can0_9_grp"; -+ }; -+ -+ conf { -+ groups = "can0_9_grp"; -+ slew-rate = <0>; -+ io-standard = <1>; -+ }; -+ -+ conf-rx { -+ pins = "MIO46"; -+ bias-high-impedance; -+ }; -+ -+ conf-tx { -+ pins = "MIO47"; -+ bias-disable; -+ }; -+ }; -+ -+ pinctrl_gem0_default: gem0-default { -+ mux { -+ function = "ethernet0"; -+ groups = "ethernet0_0_grp"; -+ }; -+ -+ conf { -+ groups = "ethernet0_0_grp"; -+ slew-rate = <0>; -+ io-standard = <4>; -+ }; -+ -+ conf-rx { -+ pins = "MIO22", "MIO23", "MIO24", "MIO25", "MIO26", "MIO27"; -+ bias-high-impedance; -+ low-power-disable; -+ }; -+ -+ conf-tx { -+ pins = "MIO16", "MIO17", "MIO18", "MIO19", "MIO20", "MIO21"; -+ bias-disable; -+ low-power-enable; -+ }; -+ -+ mux-mdio { -+ function = "mdio0"; -+ groups = "mdio0_0_grp"; -+ }; -+ -+ conf-mdio { -+ groups = "mdio0_0_grp"; -+ slew-rate = <0>; -+ io-standard = <1>; -+ bias-disable; -+ }; -+ }; -+ -+ pinctrl_gpio0_default: gpio0-default { -+ mux { -+ function = "gpio0"; -+ groups = "gpio0_7_grp", "gpio0_8_grp", "gpio0_9_grp", -+ "gpio0_10_grp", "gpio0_11_grp", "gpio0_12_grp", -+ "gpio0_13_grp", "gpio0_14_grp"; -+ }; -+ -+ conf { -+ groups = "gpio0_7_grp", "gpio0_8_grp", "gpio0_9_grp", -+ "gpio0_10_grp", "gpio0_11_grp", "gpio0_12_grp", -+ "gpio0_13_grp", "gpio0_14_grp"; -+ slew-rate = <0>; -+ io-standard = <1>; -+ }; -+ -+ conf-pull-up { -+ pins = "MIO9", "MIO10", "MIO11", "MIO12", "MIO13", "MIO14"; -+ bias-pull-up; -+ }; -+ -+ conf-pull-none { -+ pins = "MIO7", "MIO8"; -+ bias-disable; -+ }; -+ }; -+ -+ pinctrl_i2c0_default: i2c0-default { -+ mux { -+ groups = "i2c0_10_grp"; -+ function = "i2c0"; -+ }; -+ -+ conf { -+ groups = "i2c0_10_grp"; -+ bias-pull-up; -+ slew-rate = <0>; -+ io-standard = <1>; -+ }; -+ }; -+ -+ pinctrl_i2c0_gpio: i2c0-gpio { -+ mux { -+ groups = "gpio0_50_grp", "gpio0_51_grp"; -+ function = "gpio0"; -+ }; -+ -+ conf { -+ groups = "gpio0_50_grp", "gpio0_51_grp"; -+ slew-rate = <0>; -+ io-standard = <1>; -+ }; -+ }; -+ -+ pinctrl_sdhci0_default: sdhci0-default { -+ mux { -+ groups = "sdio0_2_grp"; -+ function = "sdio0"; -+ }; -+ -+ conf { -+ groups = "sdio0_2_grp"; -+ slew-rate = <0>; -+ io-standard = <1>; -+ bias-disable; -+ }; -+ -+ mux-cd { -+ groups = "gpio0_0_grp"; -+ function = "sdio0_cd"; -+ }; -+ -+ conf-cd { -+ groups = "gpio0_0_grp"; -+ bias-high-impedance; -+ bias-pull-up; -+ slew-rate = <0>; -+ io-standard = <1>; -+ }; -+ -+ mux-wp { -+ groups = "gpio0_15_grp"; -+ function = "sdio0_wp"; -+ }; -+ -+ conf-wp { -+ groups = "gpio0_15_grp"; -+ bias-high-impedance; -+ bias-pull-up; -+ slew-rate = <0>; -+ io-standard = <1>; -+ }; -+ }; -+ -+ pinctrl_uart1_default: uart1-default { -+ mux { -+ groups = "uart1_10_grp"; -+ function = "uart1"; -+ }; -+ -+ conf { -+ groups = "uart1_10_grp"; -+ slew-rate = <0>; -+ io-standard = <1>; -+ }; -+ -+ conf-rx { -+ pins = "MIO25"; -+ bias-high-impedance; -+ }; -+ -+ conf-tx { -+ pins = "MIO24"; -+ bias-disable; -+ }; -+ }; -+}; -+ -+&qspi { -+ u-boot,dm-pre-reloc; -+ status = "disabled"; -+ is-dual = <0>; -+ num-cs = <1>; -+ flash@0 { -+ compatible = "n25q128a11"; -+ reg = <0x0>; -+ spi-tx-bus-width = <1>; -+ spi-rx-bus-width = <4>; -+ spi-max-frequency = <50000000>; -+ #address-cells = <1>; -+ #size-cells = <1>; -+ partition@qspi-fsbl-uboot { -+ label = "qspi-fsbl-uboot"; -+ reg = <0x0 0x100000>; -+ }; -+ partition@qspi-linux { -+ label = "qspi-linux"; -+ reg = <0x100000 0x500000>; -+ }; -+ partition@qspi-device-tree { -+ label = "qspi-device-tree"; -+ reg = <0x600000 0x20000>; -+ }; -+ partition@qspi-rootfs { -+ label = "qspi-rootfs"; -+ reg = <0x620000 0x5E0000>; -+ }; -+ partition@qspi-bitstream { -+ label = "qspi-bitstream"; -+ reg = <0xC00000 0x400000>; -+ }; -+ }; -+}; -+ -+&sdhci0 { -+ u-boot,dm-pre-reloc; -+ status = "okay"; -+}; -+ -+&uart1 { -+ u-boot,dm-pre-reloc; -+ status = "okay"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_uart1_default>; -+}; --- -2.23.0 - diff --git a/board/qmtech/zynq/readme.txt b/board/qmtech/zynq/readme.txt deleted file mode 100644 index 5fb95bb90b..0000000000 --- a/board/qmtech/zynq/readme.txt +++ /dev/null @@ -1,76 +0,0 @@ -******************************* -QMTECH Zynq XC7Z010 Starter Kit -******************************* - -This file documents the Buildroot support for the QMTECH [1] Zynq -XC7Z010 Starter Kit [2]. It is a low cost (~55$) Zynq based -development board. The board user manual is available at -[3]. Additional files are available on Github [4]. - - -Build -===== - -First, configure Buildroot for the QMTECH Zynq board: - - make zynq_qmtech_defconfig - -Build all components: - - make - -You will find in output/images/ the following files: - - boot.bin - - boot.vfat - - devicetree.dtb - - rootfs.cpio - - rootfs.cpio.gz - - rootfs.cpio.uboot - - rootfs.tar - - sdcard.img - - u-boot.bin - - u-boot.img - - uImage - - zynq-qmtech.dtb - - -Create a bootable micro SD card -=============================== - -To determine the device associated to the micro 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 micro 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! *** - - -Boot the QMTECH Zynq board -========================== - -To boot your newly created system: -- put a mini USB cable into the J4 Debug USB Port and connect using a - terminal emulator at 115200 bps, 8n1, -- put the prepared micro SD card in the J2 micro SD card slot, -- plug the 5V power supply on the JP4 barrel jack. - -Enjoy! - - -[1]. QMTECH: - http://www.chinaqmtech.com/ - -[2]. QMTECH Zynq XC7Z010 Starter Kit Product Page: - http://www.chinaqmtech.com/xilinx_zynq_soc - -[3]. QMTECH Zynq XC7Z010 Starter Kit Hardware User Manual: - http://www.chinaqmtech.com/filedownload/32552 - -[4]. QMTECH Github: - https://github.com/ChinaQMTECH/ZYNQ_STARTER_KIT diff --git a/configs/zynq_qmtech_defconfig b/configs/zynq_qmtech_defconfig deleted file mode 100644 index f536b80f57..0000000000 --- a/configs/zynq_qmtech_defconfig +++ /dev/null @@ -1,33 +0,0 @@ -BR2_arm=y -BR2_cortex_a9=y -BR2_ARM_ENABLE_NEON=y -BR2_ARM_ENABLE_VFP=y -BR2_GLOBAL_PATCH_DIR="board/qmtech/zynq/patches" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y -BR2_TARGET_GENERIC_GETTY_PORT="ttyPS0" -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,xilinx-v2019.2.01)/linux-xilinx-v2019.2.01.tar.gz" -BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" -BR2_LINUX_KERNEL_UIMAGE=y -BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="zynq-qmtech" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y -BR2_TARGET_ROOTFS_EXT2=y -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,jolivain,u-boot-xlnx,xilinx-v2019.2.qmtech.1)/uboot-xilinx-v2019.2.qmtech.1.tar.gz" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="zynq_qmtech" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_OPENSSL=y -BR2_TARGET_UBOOT_FORMAT_IMG=y -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y From d20329ed76082553368241aa4b38f4dabf45bc76 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 3 Dec 2023 19:44:00 +0100 Subject: [PATCH 4132/5754] 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 03ce5a968a..fd73cca4f3 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 78e4703eee..7f3755892a 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 8e871ac18bcedb268d11059a8e5be40da442295f Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Tue, 21 Nov 2023 19:03:39 +0100 Subject: [PATCH 4133/5754] package/rdma-core: bump to version v49.0 For change log, see: https://github.com/linux-rdma/rdma-core/releases/tag/v49.0 Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- 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 f0f2448a8f..fc1d319123 100644 --- a/package/rdma-core/rdma-core.hash +++ b/package/rdma-core/rdma-core.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 e78abaa3ed16771bc6c40b538fe27082429363b86b6ce47636bb57a59238b2be rdma-core-48.0.tar.gz +sha256 1ea2c2678d48be0b179871e9ae8c58ceab11a0c5b69315a332ff51dd607180b7 rdma-core-49.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 41f10d44f6..5f8989b3bd 100644 --- a/package/rdma-core/rdma-core.mk +++ b/package/rdma-core/rdma-core.mk @@ -4,7 +4,7 @@ # ################################################################################ -RDMA_CORE_VERSION = 48.0 +RDMA_CORE_VERSION = 49.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 3503d48897bd841f26e2a20bf750dc8174d0fa85 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 11 Nov 2023 12:37:31 +0100 Subject: [PATCH 4134/5754] support/misc/gitlab-ci.yml.in: print error log if the runtime test fail When an error occurs, the gitlab-ci job log doesn't contain any useful information than the name of the failing test: FAIL: test_run (tests.package.test_python_paho_mqtt.TestPythonPahoMQTT) In order to encourage contributors to investigate issues reported by gitlab-ci, we want to print the last lines of the log file (build or runtime). Unfortunately, gitlab-ci job log completely strips lines ending with CRCRLF [1][2]. We have to take a look at the gitlab-ci raw log to see the complete log [3]. To workaround this issue, remove crlf from qemu serial stdio log while printing in the gitlab-ci job log (we don't want to change the log file generated by support/testing/run-tests and saved as artefacts). [1] https://gitlab.com/gitlab-org/gitlab/-/issues/218771 [2] https://gitlab.com/kubu93/buildroot/-/jobs/5492937691 [3] https://gitlab.com/kubu93/buildroot/-/jobs/5492937691/raw Cc: Peter Korsgaard Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- support/misc/gitlab-ci.yml.in | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/support/misc/gitlab-ci.yml.in b/support/misc/gitlab-ci.yml.in index 4d9acbc3d3..db206432aa 100644 --- a/support/misc/gitlab-ci.yml.in +++ b/support/misc/gitlab-ci.yml.in @@ -103,7 +103,16 @@ before_script: 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} + - | + ./support/testing/run-tests -o test-output/ -d test-dl/ -k --timeout-multiplier 10 ${TEST_CASE_NAME} || { + echo 'Failed runtime test last output' + if [ -f test-output/*-run.log ]; then + tail -200 test-output/*-run.log | sed 's/\r\r$//' + else + tail -200 test-output/*-build.log + fi + exit 1 + } retry: max: 2 when: From df812ace329b2ba78df11b42be33f618dc61f5c8 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 3 Dec 2023 23:23:56 +0100 Subject: [PATCH 4135/5754] 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 c9b693c9cb..a6ef69b1af 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 2f563950b2..6fb4b60f2b 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 4136/5754] 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 e685cc3367..b14b488837 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 416833f4ef..d6f1e4114d 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 4137/5754] 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 c1b5651b74..f927b7df65 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 04d24b9a35..e422e97214 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 7cc2ff7ccd..e673fa655b 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 b3dda4c629..6db4712d19 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 250a8810e5..61eb743659 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 From 1ed291ae978006600b4e41130207d09b0271ed14 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 4 Dec 2023 09:39:10 +0100 Subject: [PATCH 4138/5754] docs/website/news.html: add 2023.11 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 6db4712d19..78ae18ffc4 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -20,7 +20,8 @@

                                                2023.11 released

                                                The stable 2023.11 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.11 release.

                                                From 955fd5a15529fda2af6f8844d9fc541c4b8a79be Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 4 Dec 2023 14:06:08 +0100 Subject: [PATCH 4139/5754] Update for 2023.08.4 Signed-off-by: Peter Korsgaard (cherry picked from commit 5abe7bd726493acd0b9ea4600b7a33ccfaefce2f) [Peter: drop Makefile/Vagrantfile changes] Signed-off-by: Peter Korsgaard --- CHANGES | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/CHANGES b/CHANGES index f927b7df65..bcd4102297 100644 --- a/CHANGES +++ b/CHANGES @@ -118,6 +118,24 @@ #15826: nodejs modules with native extensions fail to install #15835: Incompatibility between network-manager and libcurl 8.4 +2023.08.4, released December 4th, 2023 + + Important / security related fixes. + + Defconfigs: Raspberrypi: Fix DT overlay for autoproving of + bluetooth driver, Toradex apalis i.mx6: Add download hashes + for Linux and U-Boot. + + Updated/fixed packages: gcc, erlang, exfatprogs, gsl, + imagemagick, intel-microcode, libde265, libmemcached, + libpjsip, libxml2, mariadb, memcached, motion, netsnmp, perl, + postgresql, putty, rtty, samba4, speechd, squid, vim, vlc, + xenomai, xtables-addons, zfs + + Issues resolved (http://bugs.uclibc.org): + + #15856: Using BR2_CONFIG= on a different file-system... + 2023.08.3, released November 14th, 2023 Important / security related fixes. From 46e2e2549bb27f83fc3eefa949969f137e4b3230 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 4 Dec 2023 14:41:23 +0100 Subject: [PATCH 4140/5754] docs/website: Update for 2023.08.4 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 78ae18ffc4..4eff3f4ddf 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,28 @@

                                                News

                                                  +
                                                • +
                                                  +
                                                  +
                                                  +

                                                  2023.08.4 released, 2023.08.x series EOL

                                                  +

                                                  4 December 2023

                                                  +
                                                  +
                                                  +

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

                                                  + +

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

                                                  +
                                                  +
                                                  +
                                                  • +
                                                • From 49d2965482f5048c503b6733540109c61ebc20e4 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 4 Dec 2023 14:53:52 +0100 Subject: [PATCH 4141/5754] Update for 2023.02.8 Signed-off-by: Peter Korsgaard (cherry picked from commit e6252e5b6d7b3ed645c3001dec3b5845852727d7) [Peter: drop Makefile/Vagrantfile changes] Signed-off-by: Peter Korsgaard --- CHANGES | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/CHANGES b/CHANGES index bcd4102297..7b67711ca9 100644 --- a/CHANGES +++ b/CHANGES @@ -509,6 +509,23 @@ #15376: Libiconv config #15461: QtVirtualKeyboard segfaults +2023.02.8, released December 4th, 2023 + + Important / security related fixes. + + Defconfigs: Raspberrypi: Fix DT overlay for autoproving of + bluetooth driver, Toradex apalis i.mx6: Add download hashes + for Linux and U-Boot. + + Updated/fixed packages: exfatprogs, gcc, imagemagick, + intel-microcode, libpjsip, libxml2, mariadb, memcached, + motion, netsnmp, perl, postgresql, rtty, samba4, speech, + squid, vim, vlc, xenomai, xtables-addons, zfs + + Issues resolved (http://bugs.uclibc.org): + + #15856: Using BR2_CONFIG= on a different file-system... + 2023.02.7, released November 14th, 2023 Important / security related fixes. From 0c68824f25b6e053466995c4c3665095ecdabe08 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 4 Dec 2023 15:05:34 +0100 Subject: [PATCH 4142/5754] docs/website: Update for 2023.02.8 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 e673fa655b..70f89b93ec 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -8,37 +8,37 @@
                                                  Download
                                                  -

                                                  Latest long term support release: 2023.02.7

                                                  +

                                                  Latest long term support release: 2023.02.8

                                                  - +
                                                  - +
                                                  -

                                                  buildroot-2023.02.7.tar.gz

                                                  -

                                                  PGP signature

                                                  +

                                                  buildroot-2023.02.8.tar.gz

                                                  +

                                                  PGP signature

                                                  - +
                                                  - +
                                                  -

                                                  buildroot-2023.02.7.tar.xz

                                                  -

                                                  PGP signature

                                                  +

                                                  buildroot-2023.02.8.tar.xz

                                                  +

                                                  PGP signature

                                                  diff --git a/docs/website/news.html b/docs/website/news.html index 4eff3f4ddf..58299062d5 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,25 @@

                                                  News

                                                    +
                                                  • +
                                                    +
                                                    +
                                                    +

                                                    2023.02.8 released

                                                    +

                                                    4 December 2023

                                                    +
                                                    +
                                                    +

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

                                                    +
                                                    +
                                                    +
                                                    • +
                                                  • From 8d2526701b86e8efdcb8ac85b1b3d6421ed87b71 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 4 Dec 2023 15:25:25 +0100 Subject: [PATCH 4143/5754] Kickoff 2024.02 cycle Signed-off-by: Peter Korsgaard --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e422e97214..ac625152c6 100644 --- a/Makefile +++ b/Makefile @@ -90,7 +90,7 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2023.11 +export BR2_VERSION := 2024.02-git # Actual time the release is cut (for reproducible builds) BR2_VERSION_EPOCH = 1701677000 From 0a54c46054b618f191e5474c8e4961462b97056e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 4 Dec 2023 22:15:34 +0100 Subject: [PATCH 4144/5754] package/php: security bump version to 8.2.13 "This is a security release" according to the upstream release notes: https://news-web.php.net/php.announce/369 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 0f77f0082f..8ad3823960 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 e1526e400bce9f9f9f774603cfac6b72b5e8f89fa66971ebc3cc4e5964083132 php-8.2.12.tar.xz +sha256 2629bba10117bf78912068a230c68a8fd09b7740267bd8ebd3cfce91515d454b php-8.2.13.tar.xz # License file sha256 080d0d0cca64181ef8bf1df9fba0c6f0c485f78f79540c479a45b593bb3b33b5 LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index add46584c6..aaad741de7 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.2.12 +PHP_VERSION = 8.2.13 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From 41f49d2067db9c0b895efb0b0c9ae0c481920640 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 4 Dec 2023 22:16:52 +0100 Subject: [PATCH 4145/5754] package/sofia-sip: bump version to 1.13.17 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 6799a941be..f4ce8d832d 100644 --- a/package/sofia-sip/sofia-sip.hash +++ b/package/sofia-sip/sofia-sip.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 125a9653bea1fc1cb275e4aec3445aa2deadf1fe3f1adffae9559d2349bfab36 sofia-sip-1.13.16.tar.gz +sha256 daca3d961b6aa2974ad5d3be69ed011726c3e4d511b2a0d4cb6d878821a2de7a sofia-sip-1.13.17.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 c829625cb0..a64716483f 100644 --- a/package/sofia-sip/sofia-sip.mk +++ b/package/sofia-sip/sofia-sip.mk @@ -4,7 +4,7 @@ # ################################################################################ -SOFIA_SIP_VERSION = 1.13.16 +SOFIA_SIP_VERSION = 1.13.17 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 363b28ca4f4a4f840474e05c340d0f8ebd3ac190 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 4 Dec 2023 22:12:32 +0100 Subject: [PATCH 4146/5754] package/ethtool: bump version to 6.6 Switch back to upstream-provided tarball after upstream fixed the inclusion of header files needed for older kernels: https://git.kernel.org/pub/scm/network/ethtool/ethtool.git/commit/?id=988279e051e7a51d0b9e54a7366602ba2879d114 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/ethtool/ethtool.hash | 3 ++- package/ethtool/ethtool.mk | 9 +++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/package/ethtool/ethtool.hash b/package/ethtool/ethtool.hash index 812e4dd8d1..a37c800015 100644 --- a/package/ethtool/ethtool.hash +++ b/package/ethtool/ethtool.hash @@ -1,4 +1,5 @@ +# From https://www.kernel.org/pub/software/network/ethtool/sha256sums.asc +sha256 833a8493cb9cd5809ab59743092d9a38742c282290800e9626407511bbcebf9e ethtool-6.6.tar.xz # Locally calculated -sha256 b1f5fa66f71c3bab9daeacbd77e010b52c47df0a711b216847f78405f3299189 ethtool-6.5.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 5d632934396f90c82dfebe3c9512648bbb6333b406113d0cd331b0e0aa2d34a1 LICENSE diff --git a/package/ethtool/ethtool.mk b/package/ethtool/ethtool.mk index ee710e0021..c9c2856612 100644 --- a/package/ethtool/ethtool.mk +++ b/package/ethtool/ethtool.mk @@ -4,12 +4,9 @@ # ################################################################################ -ETHTOOL_VERSION = 6.5 -ETHTOOL_SITE = https://git.kernel.org/pub/scm/network/ethtool/ethtool.git/snapshot -# needed only for autoreconf -ETHTOOL_DEPENDENCIES = host-pkgconf -# GIT version, shipped without configure -ETHTOOL_AUTORECONF = YES +ETHTOOL_VERSION = 6.6 +ETHTOOL_SOURCE = ethtool-$(ETHTOOL_VERSION).tar.xz +ETHTOOL_SITE = $(BR2_KERNEL_MIRROR)/software/network/ethtool ETHTOOL_LICENSE = GPL-2.0 ETHTOOL_LICENSE_FILES = LICENSE COPYING ETHTOOL_CPE_ID_VENDOR = kernel From 402c9fcb5ef1d6c2f9209bbe5853c6f6c48b503b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 4 Dec 2023 22:12:06 +0100 Subject: [PATCH 4147/5754] package/sqlite: bump version to 3.44.2 Changelog: https://sqlite.org/releaselog/3_44_2.html https://sqlite.org/changes.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 ffeb1ff89c..38cff902d7 100644 --- a/package/sqlite/sqlite.hash +++ b/package/sqlite/sqlite.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 39116c94e76630f22d54cd82c3cea308565f1715f716d1b2527f1c9c969ba4d9 sqlite-autoconf-3430100.tar.gz +sha256 1c6719a148bc41cf0f2bbbe3926d7ce3f5ca09d878f1246fcc20767b175bb407 sqlite-autoconf-3440200.tar.gz sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 tea/license.terms diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index f69097f3b7..99b1c4aa71 100644 --- a/package/sqlite/sqlite.mk +++ b/package/sqlite/sqlite.mk @@ -4,8 +4,8 @@ # ################################################################################ -SQLITE_VERSION = 3.43.1 -SQLITE_TAR_VERSION = 3430100 +SQLITE_VERSION = 3.44.2 +SQLITE_TAR_VERSION = 3440200 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_TAR_VERSION).tar.gz SQLITE_SITE = https://www.sqlite.org/2023 SQLITE_LICENSE = Public domain From 0ee24b86d83001ac90f99bb2f1bcccb487c7e6aa Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 4 Dec 2023 22:10:42 +0100 Subject: [PATCH 4148/5754] package/libdrm: bump version to 2.4.118 Release notes: https://lists.x.org/archives/xorg-announce/2023-November/003433.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- 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 73f3d29f5a..bcbcdccf30 100644 --- a/package/libdrm/libdrm.hash +++ b/package/libdrm/libdrm.hash @@ -1,6 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2023-October/003429.html -sha256 a2888d69e3eb1c8a77adc08a75a60fbae01f0d208d26f034d1a12e362361242b libdrm-2.4.117.tar.xz -sha512 326cf565548fb9d50a321562c13acb2a2f5ad5915ffdc2b08ef812fbac887f5b3d271cb2ce8c483633edddf2c55064d55810ff6697f713c179e2d0c8048eb544 libdrm-2.4.117.tar.xz +# From https://lists.x.org/archives/xorg-announce/2023-November/003433.html +sha256 a777bd85f2b5fc9c57f886c82058300578317cafdbc77d0a769d7e9a9567ab88 libdrm-2.4.118.tar.xz +sha512 2740ec10dfe96b520345c3f6f0d99a30aac95b1f96656bd9cd11269c2a83a9dac423da29d74a3deb55360e3ae2ca4a1de283e1e443667bedd22673f6629c9920 libdrm-2.4.118.tar.xz # Hash for license file sha256 d0a616a9020dc0271e36e6dd4bad174b4e2c2a42636f13785f8e18dd5f85fd83 data/meson.build diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk index b9201e4bd3..0db0c51284 100644 --- a/package/libdrm/libdrm.mk +++ b/package/libdrm/libdrm.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBDRM_VERSION = 2.4.117 +LIBDRM_VERSION = 2.4.118 LIBDRM_SOURCE = libdrm-$(LIBDRM_VERSION).tar.xz LIBDRM_SITE = https://dri.freedesktop.org/libdrm LIBDRM_LICENSE = MIT From 35261f201cfdf4f701e98474239043cac84be28a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 4 Dec 2023 22:13:22 +0100 Subject: [PATCH 4149/5754] package/openvpn: bump version to 2.6.8 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 f4b39bfbc9..6dc470360a 100644 --- a/package/openvpn/openvpn.hash +++ b/package/openvpn/openvpn.hash @@ -1,3 +1,3 @@ # Locally calculated after checking signature -sha256 ee9877340b1d8de47eb5b52712c3366855fa6a4a1955bf950c68577bd2039913 openvpn-2.6.7.tar.gz +sha256 5ede1565c8a6d880100f7f235317a7ee9eea83d5052db5547f13a9e76af7805d openvpn-2.6.8.tar.gz sha256 1fcb78d7e478bb8a9408010bdc91b36e213b1facfad093df3f7ce7e28af19043 COPYRIGHT.GPL diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk index f8fc7e0744..28948a3ab3 100644 --- a/package/openvpn/openvpn.mk +++ b/package/openvpn/openvpn.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENVPN_VERSION = 2.6.7 +OPENVPN_VERSION = 2.6.8 OPENVPN_SITE = https://swupdate.openvpn.net/community/releases OPENVPN_DEPENDENCIES = host-pkgconf libcap-ng OPENVPN_LICENSE = GPL-2.0 From 6cf0f2a7eb249f498c325fb0ae137a8d4c3ef8d8 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 4 Dec 2023 22:15:11 +0100 Subject: [PATCH 4150/5754] package/libgcrypt: bump to version 1.10.3 Release notes: https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=blob;f=NEWS;h=b767dc1170eb479b9a311cca4074c58e4eedaf0b;hb=aa1610866f8e42bdc272584f0a717f32ee050a22 https://dev.gnupg.org/T6817 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/libgcrypt/libgcrypt.hash | 4 ++-- package/libgcrypt/libgcrypt.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libgcrypt/libgcrypt.hash b/package/libgcrypt/libgcrypt.hash index cfbf9eaf17..ffe30e1455 100644 --- a/package/libgcrypt/libgcrypt.hash +++ b/package/libgcrypt/libgcrypt.hash @@ -1,5 +1,5 @@ # 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 +sha1 359e1d01ad2eb9cd2db964ea96ef3712d0c2c649 libgcrypt-1.10.3.tar.bz2 +sha256 8b0870897ac5ac67ded568dcfadf45969cfa8a6beb0fd60af2a9eadc2a3272aa libgcrypt-1.10.3.tar.bz2 # Locally calculated sha256 ca0061fc1381a3ab242310e4b3f56389f28e3d460eb2fd822ed7a21c6f030532 COPYING.LIB diff --git a/package/libgcrypt/libgcrypt.mk b/package/libgcrypt/libgcrypt.mk index b74838b649..2e4bf7448e 100644 --- a/package/libgcrypt/libgcrypt.mk +++ b/package/libgcrypt/libgcrypt.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGCRYPT_VERSION = 1.10.2 +LIBGCRYPT_VERSION = 1.10.3 LIBGCRYPT_SOURCE = libgcrypt-$(LIBGCRYPT_VERSION).tar.bz2 LIBGCRYPT_LICENSE = LGPL-2.1+ LIBGCRYPT_LICENSE_FILES = COPYING.LIB From 5ec5cb8ab75db095576ec8a065a3c9e32267cd58 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 6 Dec 2023 13:59:16 +0100 Subject: [PATCH 4151/5754] docs/website/news.html: add Talos security vulnerabilities info Signed-off-by: Peter Korsgaard --- docs/website/news.html | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/docs/website/news.html b/docs/website/news.html index 58299062d5..366be02c58 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,27 @@

                                                    News

                                                      +
                                                    • +
                                                      +
                                                      +
                                                      +

                                                      Talos security vulnerabilities

                                                      +

                                                      6 December 2023

                                                      +
                                                      +
                                                      +

                                                      Talos has recently published + TALOS-2023-1844 + and + TALOS-2023-1845 + advisories, describing vulnerabilities in the download hash + verification logic of Buildroot. These issues are fixed in the + 2023.02.8, 2023.08.4 and 2023.11 releases. For more details, + see the + announcement.

                                                      +
                                                      +
                                                      +
                                                      • +
                                                    • From b81b82da3e866559af0703184313ac4912e5dd8c Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Wed, 6 Dec 2023 14:12:02 -0800 Subject: [PATCH 4152/5754] package/go: security bump to v1.21.5 Fixes the following CVEs: CVE-2023-39326: net/http: limit chunked data overhead CVE-2023-45285: cmd/go: go get may unexpectedly fallback to insecure git https://go.dev/doc/devel/release#go1.21.5 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 74b18a9b38..34822b7537 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://go.dev/dl -sha256 47b26a83d2b65a3c1c1bcace273b69bee49a7a7b5168a7604ded3d26a37bd787 go1.21.4.src.tar.gz +sha256 285cbbdf4b6e6e62ed58f370f3f6d8c30825d6e56c5853c66d3c23bcdb09db19 go1.21.5.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index 7bd7866a05..f3747b6473 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.21.4 +GO_VERSION = 1.21.5 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz From e7d16c35ae6b219ddb13248ed7d93f99694593df Mon Sep 17 00:00:00 2001 From: Louis Chauvet Date: Fri, 8 Dec 2023 18:42:12 +0100 Subject: [PATCH 4153/5754] boot/arm-trusted-firmware: fix the RPATH of fiptool The arm-trusted-firmware package builds a host tool called "fiptool", which is used during the build process of arm-trusted-firmware itself. This tool links against the OpenSSL host library, and therefore needs to be built with the correct RPATH pointing to $HOST_DIR/lib. This is why commit a957d9a90ade4194dffe3eb2fc0136bc5d077c28 ("boot/arm-trusted-firmware: build fiptool separately with dependency o n host-openssl") added the ARM_TRUSTED_FIRMWARE_BUILD_FIPTOOL variable, which builds the fiptool tool first, with the right variables set, before invoking the full build of TF-A. This ensured that fiptool was built with the correct RPATH. However, more recent versions of TF-A have modified their Makefile machinery, and fiptool is being rebuilt even if it was built before. Unfortunately, this rebuild is no longer done with the right flags, so we end up with a fiptool binary that no longer has the right RPATH, and fiptool fails to find the OpenSSL libraries from $HOST_DIR/lib. In order to fix this, we take a different approach: we do not build fiptool separately first, but we inject the necessary flags through the HOSTCC variable. Indeed, there's no HOST_LDFLAGS or HOST_LDLIBS variable or similar that would allow us to pass the -Wl,-rpath flag that is needed. Shoe-horning this flag into HOSTCC gets the job done, and actually simplifies our arm-trusted-firmware.mk. This patch break the compatibility with version prior to 1.4 (upstream commit 72610c4102990 ("build: Introduce HOSTCC flag")). v1.4 is very old (July 2017), not used anymore in-tree and probably not used anymore outside the tree. Signed-off-by: Louis Chauvet Co-authored-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- .../arm-trusted-firmware/arm-trusted-firmware.mk | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm-trusted-firmware/arm-trusted-firmware.mk index 049beed36a..bed873a182 100644 --- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk @@ -63,7 +63,8 @@ ARM_TRUSTED_FIRMWARE_MAKE_OPTS += \ BUILD_STRING=$(ARM_TRUSTED_FIRMWARE_VERSION) \ $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES)) \ PLAT=$(ARM_TRUSTED_FIRMWARE_PLATFORM) \ - TARGET_BOARD=$(ARM_TRUSTED_FIRMWARE_TARGET_BOARD) + TARGET_BOARD=$(ARM_TRUSTED_FIRMWARE_TARGET_BOARD) \ + HOSTCC="$(HOSTCC) $(HOST_LDFLAGS)" ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_SSP),y) ARM_TRUSTED_FIRMWARE_MAKE_OPTS += \ @@ -147,18 +148,6 @@ ARM_TRUSTED_FIRMWARE_MAKE_TARGETS = all ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP),y) ARM_TRUSTED_FIRMWARE_MAKE_TARGETS += fip ARM_TRUSTED_FIRMWARE_DEPENDENCIES += host-openssl -# fiptool only exists in newer (>= 1.3) versions of ATF, so we build -# it conditionally. We need to explicitly build it as it requires -# OpenSSL, and therefore needs to be passed proper variables to find -# the host OpenSSL. -define ARM_TRUSTED_FIRMWARE_BUILD_FIPTOOL - if test -d $(@D)/tools/fiptool; then \ - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/tools/fiptool \ - $(ARM_TRUSTED_FIRMWARE_MAKE_OPTS) \ - CPPFLAGS="$(HOST_CPPFLAGS)" \ - LDLIBS="$(HOST_LDFLAGS) -lcrypto" ; \ - fi -endef endif ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_RCW),y) @@ -206,7 +195,6 @@ define ARM_TRUSTED_FIRMWARE_BUILD_CMDS $(if $(ARM_TRUSTED_FIRMWARE_CUSTOM_DTS_PATH), cp -f $(ARM_TRUSTED_FIRMWARE_CUSTOM_DTS_PATH) $(@D)/fdts/ ) - $(ARM_TRUSTED_FIRMWARE_BUILD_FIPTOOL) $(ARM_TRUSTED_FIRMWARE_MAKE_ENV) $(MAKE) -C $(@D) \ $(ARM_TRUSTED_FIRMWARE_MAKE_OPTS) \ $(ARM_TRUSTED_FIRMWARE_MAKE_TARGETS) From 0dd599d171df7852ae801173c8212976e50b09e1 Mon Sep 17 00:00:00 2001 From: Antoine Coutant Date: Fri, 8 Dec 2023 14:53:27 +0100 Subject: [PATCH 4154/5754] toolchain/toolchain-external/toolchain-external-arm-arm: bump to version 13.2-rel1 Updated to gcc 13.2, gdb 13, binutils 2.41, glibc 2.38. 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. Tested with qemu_arm_vexpress_defconfig. Release note: https://developer.arm.com/downloads/-/arm-gnu-toolchain-downloads Signed-off-by: Antoine Coutant Signed-off-by: Yann E. MORIN --- .../toolchain-external-arm-arm/Config.in | 8 ++++---- .../toolchain-external-arm-arm.hash | 8 ++++---- .../toolchain-external-arm-arm.mk | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/toolchain/toolchain-external/toolchain-external-arm-arm/Config.in b/toolchain/toolchain-external/toolchain-external-arm-arm/Config.in index 9b314795cb..bee8d61164 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 12.2.rel1" + bool "Arm ARM 13.2.rel1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV7A || BR2_ARM_CPU_ARMV8A depends on BR2_ARM_CPU_HAS_NEON @@ -14,12 +14,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_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HAS_FORTRAN select BR2_TOOLCHAIN_HAS_OPENMP help - Arm toolchain for the ARM architecture. It uses GCC 12.2, - GDB 12, glibc 2.36, Binutils 2.39. It generates code + Arm toolchain for the ARM architecture. It uses GCC 13.2, + GDB 13, glibc 2.38, Binutils 2.41. 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 2c1af4cfcc..e979e5f508 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,4 +1,4 @@ -# 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 +# From https://developer.arm.com/-/media/Files/downloads/gnu/13.2.rel1/binrel/arm-gnu-toolchain-13.2.rel1-x86_64-arm-none-linux-gnueabihf.tar.xz.sha256asc +sha256 df0f4927a67d1fd366ff81e40bd8c385a9324fbdde60437a512d106215f257b3 arm-gnu-toolchain-13.2.rel1-x86_64-arm-none-linux-gnueabihf.tar.xz +# From https://developer.arm.com/-/media/Files/downloads/gnu/13.2.rel1/binrel/arm-gnu-toolchain-13.2.rel1-aarch64-arm-none-linux-gnueabihf.tar.xz.sha256asc +sha256 8ad384bb328bccc44396d85c8f8113b7b8c5e11bcfef322e77cda3ebe7baadb5 arm-gnu-toolchain-13.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 164b60e6ca..5962121af6 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,7 +4,7 @@ # ################################################################################ -TOOLCHAIN_EXTERNAL_ARM_ARM_VERSION = 12.2.rel1 +TOOLCHAIN_EXTERNAL_ARM_ARM_VERSION = 13.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 = arm-gnu-toolchain-$(TOOLCHAIN_EXTERNAL_ARM_ARM_VERSION)-$(HOSTARCH)-arm-none-linux-gnueabihf.tar.xz From 7b4b3c2c78034fb3b16ad9658057f05066dcc4dd Mon Sep 17 00:00:00 2001 From: Antoine Coutant Date: Fri, 8 Dec 2023 14:53:28 +0100 Subject: [PATCH 4155/5754] toolchain/toolchain-external/toolchain-external-arm-aarch64: bump to version 13.2-rel1 Updated to gcc 13.2, gdb 13, binutils 2.41, glibc 2.38. 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. Tested with qemu_aarch64_virt_defconfig. Release note: https://developer.arm.com/downloads/-/arm-gnu-toolchain-downloads Signed-off-by: Antoine Coutant Signed-off-by: Yann E. MORIN --- .../toolchain-external-arm-aarch64/Config.in | 4 ++-- .../toolchain-external-arm-aarch64.hash | 4 ++-- .../toolchain-external-arm-aarch64.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/toolchain/toolchain-external/toolchain-external-arm-aarch64/Config.in b/toolchain/toolchain-external/toolchain-external-arm-aarch64/Config.in index fc62b759e5..2565707def 100644 --- a/toolchain/toolchain-external/toolchain-external-arm-aarch64/Config.in +++ b/toolchain/toolchain-external/toolchain-external-arm-aarch64/Config.in @@ -1,5 +1,5 @@ config BR2_TOOLCHAIN_EXTERNAL_ARM_AARCH64 - bool "Arm AArch64 12.2.rel1" + bool "Arm AArch64 13.2.rel1" depends on BR2_aarch64 depends on BR2_HOSTARCH = "x86_64" depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 @@ -7,7 +7,7 @@ config BR2_TOOLCHAIN_EXTERNAL_ARM_AARCH64 select BR2_TOOLCHAIN_HAS_SSP select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_20 - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 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 6c4847831e..9de90d4b06 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,2 +1,2 @@ -# 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 +# From https://developer.arm.com/-/media/Files/downloads/gnu/13.2.rel1/binrel/arm-gnu-toolchain-13.2.rel1-x86_64-aarch64-none-linux-gnu.tar.xz.sha256asc +sha256 12fcdf13a7430655229b20438a49e8566e26551ba08759922cdaf4695b0d4e23 arm-gnu-toolchain-13.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 9cdf58305b..f9adda8921 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,7 +4,7 @@ # ################################################################################ -TOOLCHAIN_EXTERNAL_ARM_AARCH64_VERSION = 12.2.rel1 +TOOLCHAIN_EXTERNAL_ARM_AARCH64_VERSION = 13.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 = arm-gnu-toolchain-$(TOOLCHAIN_EXTERNAL_ARM_AARCH64_VERSION)-x86_64-aarch64-none-linux-gnu.tar.xz From 50ae5ea963b7ed34b1511d4d2487bef083f5b1a7 Mon Sep 17 00:00:00 2001 From: Antoine Coutant Date: Fri, 8 Dec 2023 14:53:29 +0100 Subject: [PATCH 4156/5754] toolchain/toolchain-external/toolchain-external-arm-aarch64-be: bump to version 13.2-rel1 Updated to gcc 13.2, gdb 13, binutils 2.41, glibc 2.38. 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. Release note: https://developer.arm.com/downloads/-/arm-gnu-toolchain-downloads Signed-off-by: Antoine Coutant Signed-off-by: Yann E. MORIN --- .../toolchain-external-arm-aarch64-be/Config.in | 4 ++-- .../toolchain-external-arm-aarch64-be.hash | 4 ++-- .../toolchain-external-arm-aarch64-be.mk | 2 +- 3 files changed, 5 insertions(+), 5 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 466b1587c3..1cee601a89 100644 --- a/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/Config.in +++ b/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/Config.in @@ -1,5 +1,5 @@ config BR2_TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE - bool "Arm AArch64 BE 12.2.rel1" + bool "Arm AArch64 BE 13.2.rel1" depends on BR2_aarch64_be depends on BR2_HOSTARCH = "x86_64" depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 @@ -7,7 +7,7 @@ config BR2_TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE select BR2_TOOLCHAIN_HAS_SSP select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_20 - select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 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 f148d6326d..a9830c43c3 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,2 +1,2 @@ -# 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 +# From https://developer.arm.com/-/media/Files/downloads/gnu/13.2.rel1/binrel/arm-gnu-toolchain-13.2.rel1-x86_64-aarch64_be-none-linux-gnu.tar.xz.sha256asc +sha256 fe864b2b15127f58867a171cfcd639318609e734fbc8b78bb40258312a21a097 arm-gnu-toolchain-13.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 d35b945b04..7771269b0d 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,7 +4,7 @@ # ################################################################################ -TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_VERSION = 12.2.rel1 +TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_VERSION = 13.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 = arm-gnu-toolchain-$(TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE_VERSION)-x86_64-aarch64_be-none-linux-gnu.tar.xz From 41cc3b3a3f338068924a197745fdc3587218cadc Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 8 Dec 2023 14:13:09 +0100 Subject: [PATCH 4157/5754] package/pkg-python.mk: fix typo Commit 6b915358babe introduced PKG_PYTHON_MATURIN_INSTALL_CMD while it should be HOST_PKG_PYTHON_MATURIN_INSTALL_CMD. Adding any new host python package using maturin setup type will fail during the install step. Fixes: 6b915358babe37a721b4f6e032ec884174bd6e0b Cc: Arnout Vandecappelle Signed-off-by: Romain Naour Signed-off-by: Yann E. MORIN --- package/pkg-python.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index bda79116c8..4bed5a1835 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -258,8 +258,8 @@ HOST_PKG_PYTHON_MATURIN_ENV = \ HOST_PKG_PYTHON_MATURIN_BUILD_CMD = \ $(HOST_PKG_PYTHON_PEP517_BUILD_CMD) -PKG_PYTHON_MATURIN_INSTALL_CMD = \ - $(PKG_PYTHON_PEP517_INSTALL_CMD) +HOST_PKG_PYTHON_MATURIN_INSTALL_CMD = \ + $(HOST_PKG_PYTHON_PEP517_INSTALL_CMD) ################################################################################ # inner-python-package -- defines how the configuration, compilation From 1de7de15712eea44b4962240fbe10de5d8e44827 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 8 Dec 2023 20:13:44 +0100 Subject: [PATCH 4158/5754] package/jack2: bump to version 1.9.22 - Drop patch (already in version) - tools option has been dropped since https://github.com/jackaudio/jack2/commit/564c710eefc760a5683b88b3ecb8a29100d5274e - sndfile is not a dependency since https://github.com/jackaudio/jack2/commit/c69d6097c2acc7fa0558a0b0bef509c526719cb1 - readline is not a dependency since https://github.com/jackaudio/jack2/commit/a0b3e3e4dd2fc22c8d3e34b0030edf3d1fab0fd5 https://github.com/jackaudio/jack2/blob/v1.9.22/ChangeLog.rst Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- .checkpackageignore | 1 - ...U-mode-bit-for-opening-files-in-pyth.patch | 55 ------------------- package/jack2/jack2.hash | 2 +- package/jack2/jack2.mk | 18 +----- 4 files changed, 3 insertions(+), 73 deletions(-) delete mode 100644 package/jack2/0001-Remove-usage-of-U-mode-bit-for-opening-files-in-pyth.patch diff --git a/.checkpackageignore b/.checkpackageignore index de9a8a5d28..68e428daf7 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -592,7 +592,6 @@ package/irrlicht/0001-override-CPPFLAGS-CXXFLAGS-and-CFLAGS-in-Makefile.patch Up package/irrlicht/0002-makefile-override-LDFLAGS-and-remove-obsolete-X11R6-.patch Upstream package/iucode-tool/S00iucode-tool Variables package/iwd/S40iwd Shellcheck Variables -package/jack2/0001-Remove-usage-of-U-mode-bit-for-opening-files-in-pyth.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 diff --git a/package/jack2/0001-Remove-usage-of-U-mode-bit-for-opening-files-in-pyth.patch b/package/jack2/0001-Remove-usage-of-U-mode-bit-for-opening-files-in-pyth.patch deleted file mode 100644 index 9ee5a43e18..0000000000 --- a/package/jack2/0001-Remove-usage-of-U-mode-bit-for-opening-files-in-pyth.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 328c58967dce8be426f9208ba7717ab5afc2c4f3 Mon Sep 17 00:00:00 2001 -From: Daan De Meyer -Date: Mon, 11 Jul 2022 00:56:28 +0200 -Subject: [PATCH] Remove usage of 'U' mode bit for opening files in python - -The 'U' mode bit is removed in python 3.11. It has been -deprecated for a long time. The 'U' mode bit has no effect -so this change doesn't change any behavior. - -See https://docs.python.org/3.11/whatsnew/3.11.html#changes-in-the-python-api - -Signed-off-by: Peter Korsgaard ---- - waflib/ConfigSet.py | 2 +- - waflib/Context.py | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/waflib/ConfigSet.py b/waflib/ConfigSet.py -index b300bb56..84736c9c 100644 ---- a/waflib/ConfigSet.py -+++ b/waflib/ConfigSet.py -@@ -312,7 +312,7 @@ class ConfigSet(object): - :type filename: string - """ - tbl = self.table -- code = Utils.readf(filename, m='rU') -+ code = Utils.readf(filename, m='r') - for m in re_imp.finditer(code): - g = m.group - tbl[g(2)] = eval(g(3)) -diff --git a/waflib/Context.py b/waflib/Context.py -index 9fee3fa1..761b521f 100644 ---- a/waflib/Context.py -+++ b/waflib/Context.py -@@ -266,7 +266,7 @@ class Context(ctx): - cache[node] = True - self.pre_recurse(node) - try: -- function_code = node.read('rU', encoding) -+ function_code = node.read('r', encoding) - exec(compile(function_code, node.abspath(), 'exec'), self.exec_dict) - finally: - self.post_recurse(node) -@@ -662,7 +662,7 @@ def load_module(path, encoding=None): - - module = imp.new_module(WSCRIPT_FILE) - try: -- code = Utils.readf(path, m='rU', encoding=encoding) -+ code = Utils.readf(path, m='r', encoding=encoding) - except EnvironmentError: - raise Errors.WafError('Could not read the file %r' % path) - --- -2.30.2 - diff --git a/package/jack2/jack2.hash b/package/jack2/jack2.hash index c98971ca1c..264e877e92 100644 --- a/package/jack2/jack2.hash +++ b/package/jack2/jack2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8b044a40ba5393b47605a920ba30744fdf8bf77d210eca90d39c8637fe6bc65d jack2-1.9.21.tar.gz +sha256 1e42b9fc4ad7db7befd414d45ab2f8a159c0b30fcd6eee452be662298766a849 jack2-1.9.22.tar.gz sha256 d8c320ffc0030d1b096ae4732b50d2b811cf95e9a9b7377c1127b2563e0a0388 COPYING diff --git a/package/jack2/jack2.mk b/package/jack2/jack2.mk index f7683304a6..de5d15667e 100644 --- a/package/jack2/jack2.mk +++ b/package/jack2/jack2.mk @@ -4,7 +4,7 @@ # ################################################################################ -JACK2_VERSION = 1.9.21 +JACK2_VERSION = 1.9.22 JACK2_SITE = $(call github,jackaudio,jack2,v$(JACK2_VERSION)) JACK2_LICENSE = GPL-2.0+ (jack server), LGPL-2.1+ (jack library) JACK2_LICENSE_FILES = COPYING @@ -12,7 +12,7 @@ JACK2_CPE_ID_VENDOR = jackaudio JACK2_DEPENDENCIES = host-pkgconf alsa-lib JACK2_INSTALL_STAGING = YES -JACK2_CONF_OPTS = --alsa --example-tools=no +JACK2_CONF_OPTS = --alsa ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) JACK2_DEPENDENCIES += libexecinfo @@ -26,13 +26,6 @@ else JACK2_CONF_OPTS += --samplerate=no endif -ifeq ($(BR2_PACKAGE_LIBSNDFILE),y) -JACK2_DEPENDENCIES += libsndfile -JACK2_CONF_OPTS += --sndfile=yes -else -JACK2_CONF_OPTS += --sndfile=no -endif - ifeq ($(BR2_PACKAGE_OPUS),y) JACK2_DEPENDENCIES += opus JACK2_CONF_OPTS += --opus=yes @@ -40,13 +33,6 @@ else JACK2_CONF_OPTS += --opus=no endif -ifeq ($(BR2_PACKAGE_READLINE),y) -JACK2_DEPENDENCIES += readline -JACK2_CONF_OPTS += --readline=yes -else -JACK2_CONF_OPTS += --readline=no -endif - ifeq ($(BR2_PACKAGE_SYSTEMD),y) JACK2_DEPENDENCIES += systemd JACK2_CONF_OPTS += --systemd=yes From 3b6399225faa753f187425834787800cf91724b5 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 8 Dec 2023 23:01:25 +0100 Subject: [PATCH 4159/5754] package/libmaxminddb: bump to version 1.8.0 https://github.com/maxmind/libmaxminddb/blob/1.8.0/Changes.md Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libmaxminddb/libmaxminddb.hash | 2 +- package/libmaxminddb/libmaxminddb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libmaxminddb/libmaxminddb.hash b/package/libmaxminddb/libmaxminddb.hash index 7e56351c0f..23830a6afe 100644 --- a/package/libmaxminddb/libmaxminddb.hash +++ b/package/libmaxminddb/libmaxminddb.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 e8414f0dedcecbc1f6c31cb65cd81650952ab0677a4d8c49cab603b3b8fb083e libmaxminddb-1.7.1.tar.gz +sha256 1107799f77be6aa3b9796ad0eed8ffcc334bf45f8bd18e6a984d8adf3e719c6d libmaxminddb-1.8.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/libmaxminddb/libmaxminddb.mk b/package/libmaxminddb/libmaxminddb.mk index 993b4aec9d..c741f429ed 100644 --- a/package/libmaxminddb/libmaxminddb.mk +++ b/package/libmaxminddb/libmaxminddb.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMAXMINDDB_VERSION = 1.7.1 +LIBMAXMINDDB_VERSION = 1.8.0 LIBMAXMINDDB_SITE = \ https://github.com/maxmind/libmaxminddb/releases/download/$(LIBMAXMINDDB_VERSION) LIBMAXMINDDB_INSTALL_STAGING = YES From 82c025309069ae3f87ef192df19ad67fc1a1271f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 8 Dec 2023 18:21:14 +0100 Subject: [PATCH 4160/5754] package/erlang: fix build without DES Fix the following build failure without DES raised since bump to version 26.0.2 in commit 2cfa86a54882f2831b36a78a0ca642aa3a4bd0a4: cipher.c:51:42: error: 'EVP_des_ede3_cbc' undeclared here (not in a function); did you mean 'SN_des_ede3_cbc'? 51 | {{"des_ede3_cbc"}, "des-ede3-cbc", {&EVP_des_ede3_cbc}, 0, 0}, | ^~~~~~~~~~~~~~~~ | SN_des_ede3_cbc Fixes: - http://autobuild.buildroot.org/results/1aace0ee738f8ec4aa2c9a739fc7535c3b6bf884 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...-openssl_config.h-fix-build-without-.patch | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 package/erlang/0001-lib-crypto-c_src-openssl_config.h-fix-build-without-.patch diff --git a/package/erlang/0001-lib-crypto-c_src-openssl_config.h-fix-build-without-.patch b/package/erlang/0001-lib-crypto-c_src-openssl_config.h-fix-build-without-.patch new file mode 100644 index 0000000000..a17a43a95d --- /dev/null +++ b/package/erlang/0001-lib-crypto-c_src-openssl_config.h-fix-build-without-.patch @@ -0,0 +1,46 @@ +From 8c7d62662cf51902d759be0e8d3bfd96a3524b3c Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 8 Dec 2023 09:00:17 +0100 +Subject: [PATCH] lib/crypto/c_src/openssl_config.h: fix build without DES + +Fix the following build failure without DES raised since version 24.2 +and +https://github.com/erlang/otp/commit/abf7f84c2f77bb07dbdbb8a29b9d41f1f24c5f14: + +cipher.c:51:42: error: 'EVP_des_ede3_cbc' undeclared here (not in a function); did you mean 'SN_des_ede3_cbc'? + 51 | {{"des_ede3_cbc"}, "des-ede3-cbc", {&EVP_des_ede3_cbc}, 0, 0}, + | ^~~~~~~~~~~~~~~~ + | SN_des_ede3_cbc + +Fixes: + - http://autobuild.buildroot.org/results/1aace0ee738f8ec4aa2c9a739fc7535c3b6bf884 + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/erlang/otp/pull/7937 +--- + lib/crypto/c_src/openssl_config.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/crypto/c_src/openssl_config.h b/lib/crypto/c_src/openssl_config.h +index cb63f28369..f3904986c9 100644 +--- a/lib/crypto/c_src/openssl_config.h ++++ b/lib/crypto/c_src/openssl_config.h +@@ -218,7 +218,6 @@ + + #ifndef OPENSSL_NO_DES + # define HAVE_DES +-#endif + + #if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION(0,9,7,'e') + # define HAVE_DES_ede3_cfb +@@ -227,6 +226,7 @@ + #if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION(0,9,7,'e') + # define HAVE_DES_ede3_cbc + #endif ++#endif + + #ifndef OPENSSL_NO_DH + # define HAVE_DH +-- +2.42.0 + From a32e41b09a7b6547a7df8499c47f6ab63798814b Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 7 Dec 2023 20:05:14 +0100 Subject: [PATCH 4161/5754] package/tesseract-ocr: bump to version 5.3.3 Drop patches (already in version) This bump will fix the following build failure raised since bump of leptonica to version 1.83.1 in commit a4e713558dfd9a6fd6c0677b4b094adc216b720e thanks to https://github.com/tesseract-ocr/tesseract/commit/27b1827ccde6014df1231e1cec6263ee108066e9: src/textord/devanagari_processing.cpp: In member function 'bool tesseract::ShiroRekhaSplitter::Split(bool, tesseract::DebugPixa*)': src/textord/devanagari_processing.cpp:130:19: error: invalid use of incomplete type 'struct Pixa' 130 | Box *box = ccs->boxa->box[i]; | ^~ In file included from /home/autobuild/autobuild/instance-5/output-1/host/bin/../s390x-buildroot-linux-gnu/sysroot/usr/include/leptonica/alltypes.h:52, from /home/autobuild/autobuild/instance-5/output-1/host/bin/../s390x-buildroot-linux-gnu/sysroot/usr/include/leptonica/allheaders.h:35, from src/textord/devanagari_processing.h:16, from src/textord/devanagari_processing.cpp:25: /home/autobuild/autobuild/instance-5/output-1/host/bin/../s390x-buildroot-linux-gnu/sysroot/usr/include/leptonica/bmf.h:48:12: note: forward declaration of 'struct Pixa' 48 | struct Pixa *pixa; /*!< pixa of bitmaps for 93 characters */ | ^~~~ https://github.com/tesseract-ocr/tesseract/blob/5.3.3/ChangeLog Fixes: - http://autobuild.buildroot.org/results/46d3ffc8885245ee9a56a528be055b0b27a18245 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- .checkpackageignore | 2 - ...-if-platform-supports-feenableexcept.patch | 42 ------------------- ...configure.ac-fix-build-on-aarch64_be.patch | 32 -------------- package/tesseract-ocr/tesseract-ocr.hash | 2 +- package/tesseract-ocr/tesseract-ocr.mk | 4 +- 5 files changed, 2 insertions(+), 80 deletions(-) delete mode 100644 package/tesseract-ocr/0001-Check-if-platform-supports-feenableexcept.patch delete mode 100644 package/tesseract-ocr/0002-configure.ac-fix-build-on-aarch64_be.patch diff --git a/.checkpackageignore b/.checkpackageignore index 68e428daf7..db7271b629 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1331,8 +1331,6 @@ 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-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 package/tftpd/S80tftpd-hpa Indent Shellcheck Variables package/ti-gfx/0001-newclkapi.patch Upstream diff --git a/package/tesseract-ocr/0001-Check-if-platform-supports-feenableexcept.patch b/package/tesseract-ocr/0001-Check-if-platform-supports-feenableexcept.patch deleted file mode 100644 index 5280f01aba..0000000000 --- a/package/tesseract-ocr/0001-Check-if-platform-supports-feenableexcept.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 52484af83a58664c3cc91b8af07aeeea271f67ef Mon Sep 17 00:00:00 2001 -From: Gilles Talis -Date: Sun, 9 Jan 2022 10:58:36 +0100 -Subject: [PATCH] Check if platform supports feenableexcept - -Signed-off-by: Gilles Talis ---- - configure.ac | 4 ++++ - src/tesseract.cpp | 2 +- - 2 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 9177d64..80cd735 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -188,6 +188,10 @@ case "${host_cpu}" in - - esac - -+# check whether feenableexcept is supported. some C libraries (e.g. uclibc) don't. -+AC_CHECK_FUNC(feenableexcept, [feenableexcept=true], [feenableexcept=false]) -+AM_CONDITIONAL([HAVE_FEENABLEEXCEPT], $feenableexcept) -+ - AX_CHECK_COMPILE_FLAG([-fopenmp-simd], [openmp_simd=true], [openmp_simd=false], [$WERROR]) - AM_CONDITIONAL([OPENMP_SIMD], $openmp_simd) - -diff --git a/src/tesseract.cpp b/src/tesseract.cpp -index 933116e..9154db8 100644 ---- a/src/tesseract.cpp -+++ b/src/tesseract.cpp -@@ -629,7 +629,7 @@ static void PreloadRenderers(tesseract::TessBaseAPI &api, - **********************************************************************/ - - int main(int argc, char **argv) { --#if defined(__USE_GNU) -+#if defined(__USE_GNU) && defined(HAVE_FEENABLEEXCEPT) - // Raise SIGFPE. - # if defined(__clang__) - // clang creates code which causes some FP exceptions, so don't enable those. --- -2.32.0 - diff --git a/package/tesseract-ocr/0002-configure.ac-fix-build-on-aarch64_be.patch b/package/tesseract-ocr/0002-configure.ac-fix-build-on-aarch64_be.patch deleted file mode 100644 index 20b8d5ce76..0000000000 --- a/package/tesseract-ocr/0002-configure.ac-fix-build-on-aarch64_be.patch +++ /dev/null @@ -1,32 +0,0 @@ -From cffb8a36a987cd0d013d73501dd20c553ff69c77 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 21 Aug 2022 10:21:43 +0200 -Subject: [PATCH] configure.ac: fix build on aarch64_be - -Fix the following build failure on aarch64_be: - -/home/buildroot/autobuild/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/aarch64_be-none-linux-gnu/10.3.1/../../../../aarch64_be-none-linux-gnu/bin/ld: ./.libs/libtesseract.so: undefined reference to `tesseract::IntSimdMatrix::intSimdMatrixNEON' - -Fixes: - - http://autobuild.buildroot.org/results/b9246a37fcf6be4fabfc491daddadfb09e0a320a - -Signed-off-by: Fabrice Fontaine -[Retrieved (and backported) from: -https://github.com/tesseract-ocr/tesseract/commit/cffb8a36a987cd0d013d73501dd20c553ff69c77] ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 63579c954f..2b05052395 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -170,7 +170,7 @@ case "${host_cpu}" in - - ;; - -- aarch64) -+ aarch64*) - - # ARMv8 always has NEON and does not need special compiler flags. - AM_CONDITIONAL([HAVE_NEON], true) diff --git a/package/tesseract-ocr/tesseract-ocr.hash b/package/tesseract-ocr/tesseract-ocr.hash index 9e526423d3..45b9def27f 100644 --- a/package/tesseract-ocr/tesseract-ocr.hash +++ b/package/tesseract-ocr/tesseract-ocr.hash @@ -1,5 +1,5 @@ # locally computed -sha256 b5b0e561650ed67feb1e9de38d4746121d302ae4c876c95b99b8b6f9f89d5c58 tesseract-ocr-5.0.1.tar.gz +sha256 dc4329f85f41191b2d813b71b528ba6047745813474e583ccce8795ff2ff5681 tesseract-ocr-5.3.3.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE sha256 daa0c97d651c19fba3b25e81317cd697e9908c8208090c94c3905381c23fc047 eng.traineddata sha256 eac01c1d72540d6090facb7b2f42dd0a2ee8fc57c5be1b20548ae668e2761913 fra.traineddata diff --git a/package/tesseract-ocr/tesseract-ocr.mk b/package/tesseract-ocr/tesseract-ocr.mk index abe3d39ab6..d65111d468 100644 --- a/package/tesseract-ocr/tesseract-ocr.mk +++ b/package/tesseract-ocr/tesseract-ocr.mk @@ -4,15 +4,13 @@ # ################################################################################ -TESSERACT_OCR_VERSION = 5.0.1 +TESSERACT_OCR_VERSION = 5.3.3 TESSERACT_OCR_DATA_VERSION = 4.1.0 TESSERACT_OCR_SITE = $(call github,tesseract-ocr,tesseract,$(TESSERACT_OCR_VERSION)) TESSERACT_OCR_LICENSE = Apache-2.0 TESSERACT_OCR_LICENSE_FILES = LICENSE # Source from github, no configure script provided -# 0001-Check-if-platform-supports-feenableexcept.patch -# 0002-configure.ac-fix-build-on-aarch64_be.patch TESSERACT_OCR_AUTORECONF = YES # cairo, pango and icu are optional dependencies, but only needed for From db93c5a18c1c24523c3718ee49a66bbeb3783b96 Mon Sep 17 00:00:00 2001 From: Yair Ben-Avraham Date: Wed, 6 Dec 2023 09:32:47 +0000 Subject: [PATCH 4162/5754] package/gloox: bump version to 1.0.28 Signed-off-by: Yair Ben-Avraham Signed-off-by: Peter Korsgaard --- package/gloox/gloox.hash | 2 +- package/gloox/gloox.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gloox/gloox.hash b/package/gloox/gloox.hash index 66a3c2d1be..963b798299 100644 --- a/package/gloox/gloox.hash +++ b/package/gloox/gloox.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 0b8b7371439bc58d9e51384b616c964b18b7b41b87af1b7855104380eda86ffb gloox-1.0.27.tar.bz2 +sha256 591bd12c249ede0b50a1ef6b99ac0de8ef9c1ba4fd2e186f97a740215cc5966c gloox-1.0.28.tar.bz2 sha256 40a20c41c8dabb8ba61bea983fa8f2f6989e67fac56bb62c2249053807fd26af LICENSE diff --git a/package/gloox/gloox.mk b/package/gloox/gloox.mk index 3495db96f0..0d24f8008b 100644 --- a/package/gloox/gloox.mk +++ b/package/gloox/gloox.mk @@ -4,7 +4,7 @@ # ################################################################################ -GLOOX_VERSION = 1.0.27 +GLOOX_VERSION = 1.0.28 GLOOX_SOURCE = gloox-$(GLOOX_VERSION).tar.bz2 GLOOX_SITE = https://camaya.net/download GLOOX_LICENSE = GPL-3.0 with OpenSSL exception From b2a544ab4feef6795a5a9d98ca60c1615d4459f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fl=C3=A1vio=20Tapaj=C3=B3s?= Date: Tue, 5 Dec 2023 13:35:41 -0300 Subject: [PATCH 4163/5754] configs/asus_tinker-s_rk3288: bump Linux to 6.1.65 and U-boot to 2023.10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Flávio Tapajós Signed-off-by: Peter Korsgaard --- configs/asus_tinker-s_rk3288_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/asus_tinker-s_rk3288_defconfig b/configs/asus_tinker-s_rk3288_defconfig index 96fc79ee85..7082869881 100644 --- a/configs/asus_tinker-s_rk3288_defconfig +++ b/configs/asus_tinker-s_rk3288_defconfig @@ -10,7 +10,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=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.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="tinker-s-rk3288" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y @@ -23,7 +23,7 @@ BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl-dtb.bin tpl/u-boot-tpl.bin" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.38" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.65" BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x02000000" From 857be240e0c6a6e2904678f40d195770a99e8ae0 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Thu, 7 Dec 2023 13:07:03 +0100 Subject: [PATCH 4164/5754] configs/imx6ullevk_defconfig: bump Linux to 6.6.4 and U-Boot to 2023.10 Let's also enable NXP firmware package to let latest SDMA firmware to be loaded. To achieve this we also need to enable dynamic eudev to let it load the firmware as it is requested early before the rootfs is mounted. Signed-off-by: Giulio Benetti Reviewed-by: Fabio Estevam [Peter: explain why eudev is needed] Signed-off-by: Peter Korsgaard --- configs/imx6ullevk_defconfig | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/configs/imx6ullevk_defconfig b/configs/imx6ullevk_defconfig index b507d1c0d6..662ef0270e 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 6.1 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +# Linux headers same as kernel, a 6.6 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # system BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -12,17 +12,17 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" # 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.6.4" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ull-14x14-evk" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6ull-14x14-evk" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6ull_14x14_evk" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_DTB_IMX=y @@ -36,3 +36,12 @@ BR2_PACKAGE_HOST_MTOOLS=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y + +# NXP firmware package for SDMA Firmware +BR2_PACKAGE_FREESCALE_IMX=y +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6UL=y +BR2_PACKAGE_FIRMWARE_IMX=y + +# For automatic kernel module loading +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y + From 1cb61e5d0a646aef63c95610472f5fdf07c372b1 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Thu, 7 Dec 2023 13:07:04 +0100 Subject: [PATCH 4165/5754] configs/freescale_imx6ullevk_defconfig: bump Linux and U-Boot to lf-6.1.36-2.1.0 Let's also enable NXP firmware package to let latest SDMA firmware to be loaded. To achieve this we also need to enable dynamic eudev to let it to load the firmware as it is requested early before the rootfs is mounted. Signed-off-by: Giulio Benetti [Peter: explain why eudev is needed] Signed-off-by: Peter Korsgaard --- board/freescale/imx6ullevk/linux_sdma.fragment | 1 + configs/freescale_imx6ullevk_defconfig | 11 ++++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 board/freescale/imx6ullevk/linux_sdma.fragment diff --git a/board/freescale/imx6ullevk/linux_sdma.fragment b/board/freescale/imx6ullevk/linux_sdma.fragment new file mode 100644 index 0000000000..6f1c8b4313 --- /dev/null +++ b/board/freescale/imx6ullevk/linux_sdma.fragment @@ -0,0 +1 @@ +CONFIG_IMX_SDMA=m diff --git a/configs/freescale_imx6ullevk_defconfig b/configs/freescale_imx6ullevk_defconfig index db4fa69f71..fd4254edbf 100644 --- a/configs/freescale_imx6ullevk_defconfig +++ b/configs/freescale_imx6ullevk_defconfig @@ -1,21 +1,26 @@ BR2_arm=y BR2_cortex_a7=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -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_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.1.36-2.1.0)/linux-imx-lf-6.1.36-2.1.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/freescale/imx6ullevk/linux_sdma.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ull-14x14-evk" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_FREESCALE_IMX=y +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6UL=y +BR2_PACKAGE_FIRMWARE_IMX=y BR2_TARGET_ROOTFS_EXT2=y 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.15.71-2.2.0)/uboot-imx-lf-5.15.71-2.2.0.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.1.36-2.1.0)/uboot-imx-lf-6.1.36-2.1.0.tar.gz" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMX=y From 6f3261bca9f34061653433d2a0f98d3311494b49 Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Fri, 8 Dec 2023 08:22:12 +0000 Subject: [PATCH 4166/5754] configs/zynqmp_zcu104_defconfig: new defconfig This patch adds support for ZynqMP ZCU104 evaluation board. ZCU104 features can be found here: https://www.xilinx.com/products/boards-and-kits/zcu104.html Signed-off-by: Neal Frager Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + board/zynqmp/readme.txt | 17 +- board/zynqmp/zcu104/pm_cfg_obj.c | 503 +++++++++++++++++++++++++++++++ configs/zynqmp_zcu104_defconfig | 40 +++ 4 files changed, 555 insertions(+), 6 deletions(-) create mode 100644 board/zynqmp/zcu104/pm_cfg_obj.c create mode 100644 configs/zynqmp_zcu104_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index f504ca8d36..ccc4d1bb32 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2213,6 +2213,7 @@ F: configs/zynq_zc706_defconfig F: configs/zynqmp_kria_kr260_defconfig F: configs/zynqmp_kria_kv260_defconfig F: configs/zynqmp_zcu102_defconfig +F: configs/zynqmp_zcu104_defconfig F: configs/zynqmp_zcu106_defconfig F: package/bootgen/ F: package/versal-firmware/ diff --git a/board/zynqmp/readme.txt b/board/zynqmp/readme.txt index dcde422091..3a8a9b03ac 100644 --- a/board/zynqmp/readme.txt +++ b/board/zynqmp/readme.txt @@ -1,9 +1,9 @@ -****************************************** -Xilinx ZCU102 / ZCU106 boards - ZynqMP SoC -****************************************** +*************************************************** +Xilinx ZCU102 / ZCU104 / ZCU106 boards - ZynqMP SoC +*************************************************** -This document describes the Buildroot support for the ZCU102 and -ZCU106 boards by Xilinx, based on the Zynq UltraScale+ MPSoC (aka +This document describes the Buildroot support for the ZCU102, ZCU104 +and ZCU106 boards by Xilinx, based on the Zynq UltraScale+ MPSoC (aka ZynqMP). It has been tested with the ZCU102 and ZCU106 production boards. @@ -12,6 +12,9 @@ Evaluation board features can be found here with the links below. ZCU102: https://www.xilinx.com/products/boards-and-kits/zcu102.html +ZCU104: +https://www.xilinx.com/products/boards-and-kits/zcu104.html + ZCU106: https://www.xilinx.com/products/boards-and-kits/zcu106.html @@ -19,8 +22,10 @@ https://www.xilinx.com/products/boards-and-kits/zcu106.html How to build it =============== -Configure Buildroot: +Configure Buildroot: (use the command for the specific board) + $ make zynqmp_zcu102_defconfig + $ make zynqmp_zcu104_defconfig $ make zynqmp_zcu106_defconfig Compile everything and build the rootfs image: diff --git a/board/zynqmp/zcu104/pm_cfg_obj.c b/board/zynqmp/zcu104/pm_cfg_obj.c new file mode 100644 index 0000000000..bd0b59cfc2 --- /dev/null +++ b/board/zynqmp/zcu104/pm_cfg_obj.c @@ -0,0 +1,503 @@ +/****************************************************************************** +* Copyright (c) 2017 - 2021 Xilinx, Inc. All rights reserved. +* SPDX-License-Identifier: MIT +******************************************************************************/ + +#include "xil_types.h" +#include "pm_defs.h" + +#define PM_CONFIG_MASTER_SECTION_ID 0x101U +#define PM_CONFIG_SLAVE_SECTION_ID 0x102U +#define PM_CONFIG_PREALLOC_SECTION_ID 0x103U +#define PM_CONFIG_POWER_SECTION_ID 0x104U +#define PM_CONFIG_RESET_SECTION_ID 0x105U +#define PM_CONFIG_SHUTDOWN_SECTION_ID 0x106U +#define PM_CONFIG_SET_CONFIG_SECTION_ID 0x107U +#define PM_CONFIG_GPO_SECTION_ID 0x108U + +#define PM_SLAVE_FLAG_IS_SHAREABLE 0x1U +#define PM_MASTER_USING_SLAVE_MASK 0x2U + +#define PM_CONFIG_GPO1_MIO_PIN_34_MAP (1U << 10U) +#define PM_CONFIG_GPO1_MIO_PIN_35_MAP (1U << 11U) +#define PM_CONFIG_GPO1_MIO_PIN_36_MAP (1U << 12U) +#define PM_CONFIG_GPO1_MIO_PIN_37_MAP (1U << 13U) + +#define PM_CONFIG_GPO1_BIT_2_MASK (1U << 2U) +#define PM_CONFIG_GPO1_BIT_3_MASK (1U << 3U) +#define PM_CONFIG_GPO1_BIT_4_MASK (1U << 4U) +#define PM_CONFIG_GPO1_BIT_5_MASK (1U << 5U) + +#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 + + + +#if defined (__ICCARM__) +#pragma language=save +#pragma language=extended +#endif +#if defined (__GNUC__) + const u32 XPm_ConfigObject[] __attribute__((used, section(".sys_cfg_data"))) = +#elif defined (__ICCARM__) +#pragma location = ".sys_cfg_data" +__root const u32 XPm_ConfigObject[] = +#endif +{ + /**********************************************************************/ + /* HEADER */ + 2, /* Number of remaining words in the header */ + 8, /* Number of sections included in config object */ + PM_CONFIG_OBJECT_TYPE_BASE, /* Type of config object as base */ + /**********************************************************************/ + /* MASTER SECTION */ + PM_CONFIG_MASTER_SECTION_ID, /* Master SectionID */ + 3U, /* No. of Masters*/ + + NODE_APU, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ + + NODE_RPU_0, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ + + NODE_RPU_1, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Wake permissions */ + + + /**********************************************************************/ + /* SLAVE SECTION */ + + + PM_CONFIG_SLAVE_SECTION_ID, /* Section ID */ + 36, /* Number of slaves */ + + NODE_OCM_BANK_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 */ + + NODE_OCM_BANK_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_OCM_BANK_2, + 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_OCM_BANK_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_TCM_0_A, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_TCM_0_B, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_TCM_1_A, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TCM_1_B, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_L2, + 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_GPU_PP_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 */ + + NODE_GPU_PP_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_USB_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 */ + + 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 */ + + NODE_TTC_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_TTC_2, + 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_TTC_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_SATA, + 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_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, + 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_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_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_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_DP, + 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_GDMA, + 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_ADMA, + 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_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 */ + + NODE_GPIO, + 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_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_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 */ + + NODE_DDR, + 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_IPI_APU, + 0U, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask */ + + NODE_IPI_RPU_0, + 0U, + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_IPI_RPU_1, + 0U, + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU, + 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_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_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 */ + + + /**********************************************************************/ + /* PREALLOC SECTION */ + + PM_CONFIG_PREALLOC_SECTION_ID, /* Preallaoc SectionID */ + 3U, /* No. of Masters*/ + + /* Prealloc for psu_cortexa53_0 */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, + 11, + NODE_DDR, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_L2, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_2, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_3, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_I2C_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_SD_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_QSPI, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_PL, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_APU, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + /* Prealloc for psu_cortexr5_0 */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, + 3, + NODE_TCM_0_A, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_TCM_0_B, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_RPU_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + /* Prealloc for psu_cortexr5_1 */ + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + 3, + NODE_TCM_1_A, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_TCM_1_B, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_RPU_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + + /**********************************************************************/ + /* POWER SECTION */ + + PM_CONFIG_POWER_SECTION_ID, /* Power Section ID */ + 4U, /* Number of power nodes */ + + NODE_APU, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_RPU, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_FPD, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_PLD, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + + /**********************************************************************/ + /* RESET SECTION */ + + PM_CONFIG_RESET_SECTION_ID, /* Reset Section ID */ + 120U, /* Number of resets */ + + XILPM_RESET_PCIE_CFG, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PCIE_BRIDGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PCIE_CTRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SWDT_CRF, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GDMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU_PP1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU_PP0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SATA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU3_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU2_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU1_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU0_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APU_L2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DDR, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APM_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SOFT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_QSPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_UART0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_UART1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SPI0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SPI1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SDIO0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SDIO1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_CAN0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_CAN1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_I2C0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_I2C1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SWDT_CRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_NAND, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ADMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IOU_CC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TIMESTAMP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_R50, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_R51, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_AMBA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_OCM, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_PGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APM_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RTC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SYSMON, 0, + XILPM_RESET_AFI_FM6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_LPD_SWDT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_FPD, PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, + XILPM_RESET_RPU_DBG1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_DBG0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DBG_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DBG_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_VPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IOPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_7, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_8, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_9, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_10, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_11, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_12, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_13, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_14, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_15, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_16, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_17, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_18, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_19, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_20, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_21, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_22, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_23, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_24, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_25, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_26, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_27, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_28, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_29, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_30, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_31, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_LS, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PS_ONLY, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_92, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_93, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_94, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_95, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + + /**********************************************************************/ + /* SET CONFIG SECTION */ + PM_CONFIG_SET_CONFIG_SECTION_ID, /* Set Config Section ID */ + 0U, /* Permissions to load base config object */ + 0U, /* Permissions to load overlay config object */ + + /**********************************************************************/ + /* SHUTDOWN SECTION */ + + PM_CONFIG_SHUTDOWN_SECTION_ID, /* Shutdown Section ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* System Shutdown/Restart Permission */ + + /**********************************************************************/ + /* GPO SECTION */ + PM_CONFIG_GPO_SECTION_ID, /* GPO Section ID */ + 0, /* State of GPO pins */ +}; +#if defined (__ICCARM__) +#pragma language=restore +#endif diff --git a/configs/zynqmp_zcu104_defconfig b/configs/zynqmp_zcu104_defconfig new file mode 100644 index 0000000000..452f2343c8 --- /dev/null +++ b/configs/zynqmp_zcu104_defconfig @@ -0,0 +1,40 @@ +BR2_aarch64=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_v6.1_LTS_2023.2)/xlnx_rebase_v6.1_LTS_2023.2.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="xilinx" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu104-revC" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.8_2023.2)/xlnx_rebase_v2.8_2023.2.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_v2023.01_2023.2)/xlnx_rebase_v2023.01_2023.2.tar.gz" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-zcu104-revC" +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/soc-prebuilt-firmware/raw/xilinx_v2023.2/zcu104-zynqmp/pmufw.elf" +BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/zcu104/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/patches" From 9675f6150cf01dfe0dc7a862a794b93e4caea840 Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Mon, 4 Dec 2023 10:24:30 +0000 Subject: [PATCH 4167/5754] board/zynq/readme.txt: update doc for zc702 Update the zynq readme.txt to add documentation for the zc702 and correct documentation that was no longer up to date. Signed-off-by: Neal Frager Signed-off-by: Peter Korsgaard --- board/zynq/readme.txt | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/board/zynq/readme.txt b/board/zynq/readme.txt index 162734963a..b2a4cefedd 100644 --- a/board/zynq/readme.txt +++ b/board/zynq/readme.txt @@ -1,7 +1,8 @@ This is the Buildroot support for Zynq boards. Zynq boards are available from Xilinx and some third party vendors, but the build procedure is very similar. -Currently, three boards are natively supported by Buildroot: +Currently, four boards are natively supported by Buildroot: + - Xilinx ZC702 board (zynq_zc702_defconfig) - Xilinx ZC706 board (zynq_zc706_defconfig) - Avnet ZedBoard (zynq_zed_defconfig) - Avnet MicroZed (zynq_microzed_defconfig) @@ -9,6 +10,7 @@ Currently, three boards are natively supported by Buildroot: Steps to create a working system for a Zynq board: 1) Configuration (do one of the following) + make zynq_zc702_defconfig (ZC702) make zynq_zc706_defconfig (ZC706) make zynq_zed_defconfig (Zedboard) make zynq_microzed_defconfig (MicroZed) @@ -31,12 +33,11 @@ kernel_image=myimage modeboot=myboot myboot=... -Note: -The DTB for MicroZed is the same as the one for the Zedboard (zynq-zed.dtb), -and this is the recommended solution, see -https://forums.xilinx.com/t5/Embedded-Linux/Microzed-default-device-tree-dts/td-p/432856. - References: + - ZC702 information including schematics, reference designs, and manuals are + available from + https://www.xilinx.com/products/boards-and-kits/ek-z7-zc702-g.html + - ZC706 information including schematics, reference designs, and manuals are available from http://www.xilinx.com/products/boards-and-kits/ek-z7-zc706-g.html. @@ -52,7 +53,7 @@ the upstream kernel and U-Boot, you simply need to change the following Buildroot options: - Kernel Device Tree file name (BR2_LINUX_KERNEL_INTREE_DTS_NAME) - - U-Boot board defconfig (BR2_TARGET_UBOOT_BOARD_DEFCONFIG) + - U-Boot (BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=") Custom ps7_init_gpl.c/h support: From 4b555579866b55bb23919d7f38fb6b0a248fd07f Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 9 Dec 2023 19:34:49 +0100 Subject: [PATCH 4168/5754] package/gstreamer1: bump to version 1.22.7 Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- 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 65045c1c30..7d62d05fec 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.6.tar.xz.sha256sum -sha256 f500e6cfddff55908f937711fc26a0840de28a1e9ec49621c0b6f1adbd8f818e gstreamer-1.22.6.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.22.7.tar.xz.sha256sum +sha256 01e42c6352a06bdfa4456e64b06ab7d98c5c487a25557c761554631cbda64217 gstreamer-1.22.7.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gstreamer1/gstreamer1.mk b/package/gstreamer1/gstreamer1/gstreamer1.mk index 352567ed52..9ee41392b2 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.mk +++ b/package/gstreamer1/gstreamer1/gstreamer1.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_VERSION = 1.22.6 +GSTREAMER1_VERSION = 1.22.7 GSTREAMER1_SOURCE = gstreamer-$(GSTREAMER1_VERSION).tar.xz GSTREAMER1_SITE = https://gstreamer.freedesktop.org/src/gstreamer GSTREAMER1_INSTALL_STAGING = YES From 839606b8b18b3967fe95fc160cd92677169ee429 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 9 Dec 2023 19:34:50 +0100 Subject: [PATCH 4169/5754] package/gst1-plugins-base: bump to version 1.22.7 Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- 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 a46ce228c4..7c99f47660 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.6.tar.xz.sha256sum -sha256 50f2b4d17c02eefe430bbefa8c5cd134b1be78a53c0f60e951136d96cf49fd4b gst-plugins-base-1.22.6.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.22.7.tar.xz.sha256sum +sha256 62519e0d8f969ebf62a9a7996f2d23efdda330217a635f4a32c0bf1c71577468 gst-plugins-base-1.22.7.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 7fcac012f2..0649a09c07 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.6 +GST1_PLUGINS_BASE_VERSION = 1.22.7 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 0894009b1aa48ec0167517f38bbd7d6fc3e4eb49 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 9 Dec 2023 19:34:51 +0100 Subject: [PATCH 4170/5754] package/gst1-plugins-good: bump to version 1.22.7 Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- 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 1b315ac1cc..8bc8d5b5a6 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.6.tar.xz.sha256sum -sha256 b3b07fe3f1ce7fe93aa9be7217866044548f35c4a7792280eec7e108a32f9817 gst-plugins-good-1.22.6.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.22.7.tar.xz.sha256sum +sha256 b6db0e18e398b52665b7cdce301c34a8750483d5f4fbac1ede9f80b03743cd15 gst-plugins-good-1.22.7.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 4c6188c097..4a84ea01b9 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.6 +GST1_PLUGINS_GOOD_VERSION = 1.22.7 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 22c1b4d3565dc8c2bbebc364a31d7a1bd5e72943 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 9 Dec 2023 19:34:52 +0100 Subject: [PATCH 4171/5754] package/gst1-plugins-bad: security bump to version 1.22.7 Fixes the following security issues: CVE-2023-44429: Heap-based buffer overflow in the AV1 codec parser when handling certain malformed streams before GStreamer 1.22.7. https://gstreamer.freedesktop.org/security/sa-2023-0009.html CVE-2023-44446: Use-after-free (read) in the MXF demuxer when handling certain files before GStreamer 1.22.7. https://gstreamer.freedesktop.org/security/sa-2023-0010.html Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- 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 c6d1f2e009..e6f57393db 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.6.tar.xz.sha256sum -sha256 b4029cd2908a089c55f1d902a565d007495c95b1442d838485dc47fb12df7137 gst-plugins-bad-1.22.6.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.22.7.tar.xz.sha256sum +sha256 c716f8dffa8fac3fb646941af1c6ec72fff05a045131311bf2d049fdc87bce2e gst-plugins-bad-1.22.7.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 983be754e9..a41fb336a9 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.6 +GST1_PLUGINS_BAD_VERSION = 1.22.7 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 5ca7309b810b39c2503386107cb4408e635659bf Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 9 Dec 2023 19:34:53 +0100 Subject: [PATCH 4172/5754] package/gst1-plugins-ugly: bump to version 1.22.7 Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- 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 f55dd7b3a0..7faf0fe689 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.6.tar.xz.sha256sum -sha256 3e31454c98cb2f7f6d2d355eceb933a892fa0f1dc09bc36c9abc930d8e29ca48 gst-plugins-ugly-1.22.6.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.22.7.tar.xz.sha256sum +sha256 520b46bca637189ad86a298ff245b2d89375dbcac8b05d74daea910f81a9e9da gst-plugins-ugly-1.22.7.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 ee3bd1b551..f5df83bed0 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.6 +GST1_PLUGINS_UGLY_VERSION = 1.22.7 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 5072596f6ff2ba7235711d3be39ee386e8a934e8 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 9 Dec 2023 19:34:54 +0100 Subject: [PATCH 4173/5754] package/gst1-devtools: bump to version 1.22.7 Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- 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 9eada91614..e02af776df 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.6.tar.xz.sha256sum -sha256 8928560efaf16137c30285e718708e5d0bab0777eb4ef8127e0274e120d3d86b gst-devtools-1.22.6.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.22.7.tar.xz.sha256sum +sha256 157cf93fb2741cf0c3dea731be3af2ffae703c9f2cd3c0c91b380fbc685eb9f9 gst-devtools-1.22.7.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 8608c2f75b..cc633bad82 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.6 +GST1_DEVTOOLS_VERSION = 1.22.7 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 fcf9f0accf6ee5cf679ba8d4f566cee3d00a1b68 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 9 Dec 2023 19:34:55 +0100 Subject: [PATCH 4174/5754] package/gst1-libav: bump to version 1.22.7 Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- 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 251e924792..3e83e0dddb 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.6.tar.xz.sha256sum -sha256 7789e6408388a25f23cbf948cfc5c6230d735bbcd8b7f37f4a01c9e348a1e3a7 gst-libav-1.22.6.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.22.7.tar.xz.sha256sum +sha256 1525b917141b895fe5cf618fe8867622b2528278a0286e9f727b5f37317daca1 gst-libav-1.22.7.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gst1-libav/gst1-libav.mk b/package/gstreamer1/gst1-libav/gst1-libav.mk index 23d4a29799..88b55cd5c9 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.6 +GST1_LIBAV_VERSION = 1.22.7 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 84d02fa2e8e2f34e2af0b1d308bf1b9ebcbe36a7 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 9 Dec 2023 19:34:56 +0100 Subject: [PATCH 4175/5754] package/gst1-python: bump to version 1.22.7 Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- 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 4495e03945..dfaf785161 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.6.tar.xz.sha256sum -sha256 51de2d6d13b12ce095eac97c0b94ee59c2aeba3712bb7462b78c4d57dde176c5 gst-python-1.22.6.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.22.7.tar.xz.sha256sum +sha256 1ef8df7608012fa469329799c950ec087737a6dabad3003c230658b58c710172 gst-python-1.22.7.tar.xz sha256 ea3ad127610e5ded2210b3a86a46314f2b3b28e438eccffdae19a4d6fbcdb0c2 COPYING diff --git a/package/gstreamer1/gst1-python/gst1-python.mk b/package/gstreamer1/gst1-python/gst1-python.mk index 475f2f2d87..66743abe04 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.6 +GST1_PYTHON_VERSION = 1.22.7 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 ff76ede773e44cdbd5ecfc9c6d8682686def26a9 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 9 Dec 2023 19:34:57 +0100 Subject: [PATCH 4176/5754] package/gst1-rtsp-server: bump to version 1.22.7 Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- 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 521a91ddd7..b97125784f 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.6.tar.xz.sha256sum -sha256 0ae33a8b50443b62f11581a9181e906b41cd3877b2d799dbea72912c3eda4bb3 gst-rtsp-server-1.22.6.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.22.7.tar.xz.sha256sum +sha256 f7fac001e20ad21e36d18397741c4657c5d43571eb1cc3b49f9a93ae127dc88f gst-rtsp-server-1.22.7.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 46d7606b1d..5995e7cc51 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.6 +GST1_RTSP_SERVER_VERSION = 1.22.7 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 5c13e67fa029ebb74172c4f0d0996252e36da007 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 9 Dec 2023 19:34:58 +0100 Subject: [PATCH 4177/5754] package/gst1-vaapi: bump to version 1.22.7 Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- 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 53dbe97ca9..5ccd69c7aa 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.6.tar.xz.sha256sum -sha256 d9ba2fc26bef98c78e982c599f585d46bbb65fe122da89c2d7ab41f468a52c7b gstreamer-vaapi-1.22.6.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.22.7.tar.xz.sha256sum +sha256 0e9fff768b89de6d318b34146e4e781d82b9a0f4025dc541b2c8349c7bcb7f67 gstreamer-vaapi-1.22.7.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 46a5839450..9eea474e88 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.6 +GST1_VAAPI_VERSION = 1.22.7 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 3f1560904f32c1c8760355e589b13d108ceb708d Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 9 Dec 2023 19:34:59 +0100 Subject: [PATCH 4178/5754] package/gst-omx: bump to version 1.22.7 Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- 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 5878991b5b..dc9b369ca0 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.6.tar.xz.sha256sum -sha256 223833c42518ad7eb1923bb4dd3726809f59a66d6e9aaaa69cb29ad0750c8758 gst-omx-1.22.6.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.22.7.tar.xz.sha256sum +sha256 d7a18ec47d40a472bd5cba2015e0be72b732f1699895398cec5cd8e6a3a53b44 gst-omx-1.22.7.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gstreamer1/gst-omx/gst-omx.mk b/package/gstreamer1/gst-omx/gst-omx.mk index 3d2ba90290..6c27989ec6 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.6 +GST_OMX_VERSION = 1.22.7 GST_OMX_SOURCE = gst-omx-$(GST_OMX_VERSION).tar.xz GST_OMX_SITE = https://gstreamer.freedesktop.org/src/gst-omx From cf69c8be4760abedd3f289bbef3495029a7042f4 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 9 Dec 2023 19:35:00 +0100 Subject: [PATCH 4179/5754] package/gstreamer1-editing-services: bump to version 1.22.7 Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- .../gstreamer1-editing-services.hash | 4 ++-- .../gstreamer1-editing-services.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash index 11e93b8b65..c23da20962 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.6.tar.xz.sha256sum -sha256 748d423672c597f876e130804fb984848f5b4b89efd78a506cb17f7646795301 gst-editing-services-1.22.6.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.22.7.tar.xz.sha256sum +sha256 fec56a2c37a253cd048d288d4c7eda6eff191022b09db975e07a2c105d1b521e gst-editing-services-1.22.7.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 bea59f256b..22fa9ea188 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.6 +GSTREAMER1_EDITING_SERVICES_VERSION = 1.22.7 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 241a8b0615ac35951aa6255593d853daac7fd4d1 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 6 Dec 2023 23:44:20 +0100 Subject: [PATCH 4180/5754] support/testing: bump prebuilt kernel to 5.10.202 As reported on the mailing list [1], TestPolkitSystemd and TestPolkitInitd are failing since we bumped the Bootlin toolchain 2023.08 [2]. The issue is caused by expat (XML library) package detecting arc4random_buf() introduced by glibc 2.36 [3]. With arc4random_buf() support enabled, expat hang Polkit while reading its policy files (XML files) due to a lack of entropy on the system. Upgrading the kernel allows to avoid such issue thanks to random_get_entropy_fallback() introduced in 5.10.119 (backpored) [4]. Build the vexpress-v2p-ca9 (armv7) 5.10.202 using the kernel configuration file found in /proc/config.gz but with additional kernel options provided by SYSTEMD_LINUX_CONFIG_FIXUPS. Indeed some kernel options requested by systemd were missing in 5.10.7 kernel. Build the versatile-pb (armv5) kernel using the same kernel configuration as qemu_arm_versatile_defconfig but with additional kernel options like for vexpress-v2p-ca9. While at it, enable IKCONFIG_PROC option to provide the kernel configuration at runtime in /proc/config.gz. Runtime tested: https://gitlab.com/kubu93/buildroot/-/pipelines/1097887826 (tests.package.test_polkit.TestPolkit*) https://gitlab.com/kubu93/buildroot/-/pipelines/1097705399 (tests.init.*) Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/5689309948 (TestPolkitSystemd) https://gitlab.com/buildroot.org/buildroot/-/jobs/5689309947 (TestPolkitInitd) [1] http://lists.busybox.net/pipermail/buildroot/2023-December/680445.html [2] 452365a385ef35e808eb2eb669d1e3227c7399dd [3] https://sourceware.org/git/?p=glibc.git;a=commit;h=6f4e0fcfa2d2b0915816a3a3a1d48b4763a7dee2 [4] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=fdca775081527364621857957655207d83035376 Signed-off-by: Romain Naour Signed-off-by: Yann E. MORIN --- support/testing/infra/emulator.py | 8 ++++---- support/testing/run-tests | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/support/testing/infra/emulator.py b/support/testing/infra/emulator.py index 09f81eca89..624740fcb1 100644 --- a/support/testing/infra/emulator.py +++ b/support/testing/infra/emulator.py @@ -54,16 +54,16 @@ def boot(self, arch, kernel=None, kernel_cmdline=None, options=None): if arch == "armv7": kernel = infra.download(self.downloaddir, - "kernel-vexpress-5.10.7") + "kernel-vexpress-5.10.202") dtb = infra.download(self.downloaddir, - "vexpress-v2p-ca9-5.10.7.dtb") + "vexpress-v2p-ca9-5.10.202.dtb") qemu_cmd += ["-dtb", dtb] qemu_cmd += ["-M", "vexpress-a9"] elif arch == "armv5": kernel = infra.download(self.downloaddir, - "kernel-versatile-5.10.7") + "kernel-versatile-5.10.202") dtb = infra.download(self.downloaddir, - "versatile-pb-5.10.7.dtb") + "versatile-pb-5.10.202.dtb") qemu_cmd += ["-dtb", dtb] qemu_cmd += ["-M", "versatilepb"] qemu_cmd += ["-device", "virtio-rng-pci"] diff --git a/support/testing/run-tests b/support/testing/run-tests index e8c540f370..485811b746 100755 --- a/support/testing/run-tests +++ b/support/testing/run-tests @@ -65,10 +65,10 @@ def main(): BRConfigTest.downloaddir = os.path.abspath(args.download) if args.prepare_only: - emulator_builtin_binaries = ["kernel-vexpress-5.10.7", - "vexpress-v2p-ca9-5.10.7.dtb", - "kernel-versatile-5.10.7", - "versatile-pb-5.10.7.dtb"] + emulator_builtin_binaries = ["kernel-vexpress-5.10.202", + "vexpress-v2p-ca9-5.10.202.dtb", + "kernel-versatile-5.10.202", + "versatile-pb-5.10.202.dtb"] print("Downloading emulator builtin binaries") for binary in emulator_builtin_binaries: infra.download(BRConfigTest.downloaddir, binary) From f6254689f8d6ccc601ee0d7567d76c712ae6764f Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 6 Dec 2023 23:44:21 +0100 Subject: [PATCH 4181/5754] support/testing: InitSystemSystemdBaseOverlayfs: bump kernel to 5.10.202 The prebuilt kernel has been updated to 5.10.202, sync the kernel built by InitSystemSystemdBaseOverlayfs. Signed-off-by: Romain Naour Signed-off-by: Yann E. MORIN --- support/testing/tests/init/test_systemd.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/testing/tests/init/test_systemd.py b/support/testing/tests/init/test_systemd.py index 79061a86d7..7bbc112a56 100644 --- a/support/testing/tests/init/test_systemd.py +++ b/support/testing/tests/init/test_systemd.py @@ -286,7 +286,7 @@ class InitSystemSystemdBaseOverlayfs(): BR2_ROOTFS_OVERLAY="{}" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y - BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.202" BR2_LINUX_KERNEL_DEFCONFIG="vexpress" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{}" BR2_LINUX_KERNEL_DTS_SUPPORT=y From 0c0cd720c5d71c5a8508795761eb168a7b3832cc Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 6 Dec 2023 23:44:22 +0100 Subject: [PATCH 4182/5754] support/testing: TestDtbocfg: bump kernel to 5.10.202 The prebuilt kernel has been updated to 5.10.202, sync the kernel built by TestDtbocfg. Signed-off-by: Romain Naour Signed-off-by: Yann E. MORIN --- support/testing/tests/package/test_dtbocfg.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/testing/tests/package/test_dtbocfg.py b/support/testing/tests/package/test_dtbocfg.py index d25b1692b4..56a1ed4820 100644 --- a/support/testing/tests/package/test_dtbocfg.py +++ b/support/testing/tests/package/test_dtbocfg.py @@ -8,7 +8,7 @@ class TestDtbocfg(infra.basetest.BRTest): """ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y - BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.202" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="vexpress" BR2_PACKAGE_DTBOCFG=y From aaa9438b96f88b1ecbf5eb9a1aebef8010835b8d Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 9 Dec 2023 21:09:15 +0100 Subject: [PATCH 4183/5754] package/libcurl: security bump to version 8.5.0 Fixes the following security issues: - CVE-2023-46218: cookie mixed case PSL bypass This flaw allows a malicious HTTP server to set "super cookies" in curl that are then passed back to more origins than what is otherwise allowed or possible. This allows a site to set cookies that then would get sent to different and unrelated sites and domains. https://curl.se/docs/CVE-2023-46218.html - CVE-2023-46219: HSTS long file name clears contents When saving HSTS data to an excessively long file name, curl could end up removing all contents, making subsequent requests using that file unaware of the HSTS status they should otherwise use. https://curl.se/docs/CVE-2023-46219.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 ecd5d63909..d5c20d29d3 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.4.0.tar.xz.asc +# https://curl.se/download/curl-8.5.0.tar.xz.asc # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 -sha256 16c62a9c4af0f703d28bda6d7bbf37ba47055ad3414d70dec63e2e6336f2a82d curl-8.4.0.tar.xz +sha256 42ab8db9e20d8290a3b633e7fbb3cec15db34df65fd1015ef8ac1e4723750eeb curl-8.5.0.tar.xz sha256 b1d7feb949ea5023552029fbe0bf5db4f23c2f85e9b8e51e18536f0ecbf9c524 COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 2c87821a48..3ecc587a52 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 8.4.0 +LIBCURL_VERSION = 8.5.0 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ From b79fb3c224a5a8e687b0bc91dd221efcf7137ea8 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 10 Dec 2023 20:19:39 +0100 Subject: [PATCH 4184/5754] doc/manual: rsync is not optional rsync is used in the infrastructure, mostly for the per-package infra, and for the override-srcdir mechanism, but also to build the manual. As such, it is not optional but mandatory, and already listed so. Drop the reference to rsync from the list of optional packages. Signed-off-by: Yann E. MORIN Signed-off-by: Peter Korsgaard --- docs/manual/prerequisite.adoc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/manual/prerequisite.adoc b/docs/manual/prerequisite.adoc index 48be489f90..262a5153f5 100644 --- a/docs/manual/prerequisite.adoc +++ b/docs/manual/prerequisite.adoc @@ -69,7 +69,7 @@ development packages typically have a _-dev_ or _-devel_ suffix. In the official tree, most of the package sources are retrieved using +wget+ from _ftp_, _http_ or _https_ locations. A few packages are only available through a version control system. Moreover, Buildroot is -capable of downloading sources via other tools, like +rsync+ or +scp+ +capable of downloading sources via other tools, like +git+ or +scp+ (refer to xref:download-infra[] for more details). If you enable packages using any of these methods, you will need to install the corresponding tool on the host system: @@ -78,7 +78,6 @@ corresponding tool on the host system: ** +cvs+ ** +git+ ** +mercurial+ -** +rsync+ ** +scp+ ** +sftp+ ** +subversion+ From d8e1aca0de4186b8578d128c333c100b89da194a Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Tue, 12 Dec 2023 13:01:50 +0100 Subject: [PATCH 4185/5754] package/open62541: bump to version 1.3.9 Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- 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 3508cbb146..2946b991a4 100644 --- a/package/open62541/open62541.hash +++ b/package/open62541/open62541.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 41e82d81d2fc9449028dab31fd460df1da29130bcb7388222842e778cf34625c open62541-v1.3.8-br1.tar.gz +sha256 8ca1f20dba4fc103893d74d29e41c336ab67a1725512b03eaaf6060658525b43 open62541-v1.3.9-br1.tar.gz sha256 fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85 LICENSE diff --git a/package/open62541/open62541.mk b/package/open62541/open62541.mk index 16ef51ed31..17abd4a379 100644 --- a/package/open62541/open62541.mk +++ b/package/open62541/open62541.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPEN62541_VERSION = v1.3.8 +OPEN62541_VERSION = v1.3.9 OPEN62541_SITE_METHOD = git OPEN62541_SITE = https://github.com/open62541/open62541.git OPEN62541_GIT_SUBMODULES = YES From 36a9ec8921b6b6c0359ca6e4afd529f8473bab89 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 11 Dec 2023 16:25:49 +0100 Subject: [PATCH 4186/5754] package/xserver_xorg-server: security bump to version 21.1.9 Fixes the following security issues: - CVE-2023-5367 X.Org server: OOB write in XIChangeDeviceProperty/RRChangeOutputProperty - CVE-2023-5380: Use-after-free bug in DestroyWindow - CVE-2023-5574: Use-after-free bug in DamageDestroy For details, see the advisory: https://lists.x.org/archives/xorg-announce/2023-October/003430.html 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 092a640f04..ccd7cc74fa 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-March/003377.html -sha256 38aadb735650c8024ee25211c190bf8aad844c5f59632761ab1ef4c4d5aeb152 xorg-server-21.1.8.tar.xz -sha512 6104b3620ed2e1e27d9a8e963388bbe8785a764585b1bc03dbf5d719a92894773dda580d377ca18ceeab353e65a5d23cc947bab84a4012f9dd1eca31cac36937 xorg-server-21.1.8.tar.xz +# From https://lists.x.org/archives/xorg-announce/2023-October/003431.html +sha256 ff697be2011b4c4966b7806929e51b7a08e9d33800d505305d26d9ccde4b533a xorg-server-21.1.9.tar.xz +sha512 9044e1b9222616fb63aea444b75f4ca6582edb7d899018f8ea30359e57edf04b1555e69397ebc4d288f7e36d6b82a54dde3895f11d414573d229e908ac17bfe8 xorg-server-21.1.9.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 ede03d024c..cf0e688c36 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.8 +XSERVER_XORG_SERVER_VERSION = 21.1.9 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 d6f0a8735e1071fa37790ea40d9cf75e59ee06b6 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 11 Dec 2023 16:25:50 +0100 Subject: [PATCH 4187/5754] package/xwayland: security bump to version 23.2.2 Fixes the following security issues: - CVE-2023-5367 X.Org server: OOB write in XIChangeDeviceProperty/RRChangeOutputProperty For details, see the advisory: https://lists.x.org/archives/xorg-announce/2023-October/003430.html Signed-off-by: Peter Korsgaard --- package/x11r7/xwayland/xwayland.hash | 6 +++--- package/x11r7/xwayland/xwayland.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/x11r7/xwayland/xwayland.hash b/package/x11r7/xwayland/xwayland.hash index b62f404d40..12363a66bf 100644 --- a/package/x11r7/xwayland/xwayland.hash +++ b/package/x11r7/xwayland/xwayland.hash @@ -1,6 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2023-March/003376.html -sha256 fb9461f5cb9fea5e07e91882311b0c88b43e8843b017ebac05eb5af69aa34c15 xwayland-23.1.1.tar.xz -sha512 21c386847135c5cb4ac884926b0fbeb6ad21c9ee54752e0cdc8418e31a72872d81032159c1d91b8afb915aaaf65e80454342461d676996b2f3c535a37b0147f0 xwayland-23.1.1.tar.xz +# From https://lists.x.org/archives/xorg-announce/2023-October/003432.html +sha256 9f7c0938d2a41e941ffa04f99c35e5db2bcd3eec034afe8d35d5c810a22eb0a8 xwayland-23.2.2.tar.xz +sha512 f5b319fdace7d7c078544730ecd26afeb63b1a0c779fb097455147945df85af32d9e91501ebdb70209d48e8a3ead3b23be31e9d5118358ac17e699abb4b6ac07 xwayland-23.2.2.tar.xz # Locally calculated sha256 4cc0447a22635c7b2f1a93fec4aa94f1970fadeb72a063de006b51cf4963a06f COPYING diff --git a/package/x11r7/xwayland/xwayland.mk b/package/x11r7/xwayland/xwayland.mk index 8550b61389..8eac602042 100644 --- a/package/x11r7/xwayland/xwayland.mk +++ b/package/x11r7/xwayland/xwayland.mk @@ -4,7 +4,7 @@ # ################################################################################ -XWAYLAND_VERSION = 23.1.1 +XWAYLAND_VERSION = 23.2.2 XWAYLAND_SOURCE = xwayland-$(XWAYLAND_VERSION).tar.xz XWAYLAND_SITE = https://xorg.freedesktop.org/archive/individual/xserver XWAYLAND_LICENSE = MIT From 797de283c7ae9b99e4d2366cf142b2bc8b2f2a84 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 11 Dec 2023 17:45:29 +0100 Subject: [PATCH 4188/5754] package/xwayland: libdrm is required, not optional Fixes: http://autobuild.buildroot.net/results/476/47665d417dbae76bf27e805a5bcb1d8d6ab1f445/ xwayland unconditionally includes xf86drm.h, so libdrm is required and not optional: grep -rs xf86drm.h glamor/glamor_egl.c:#include hw/xwayland/xwayland-glamor.h:#include hw/xwayland/xwayland-glamor-eglstream.c:#include hw/xwayland/xwayland-window.h:#include hw/xwayland/xwayland-drm-lease.c:#include hw/xwayland/xwayland-glamor-gbm.c:#include Signed-off-by: Peter Korsgaard --- package/x11r7/xwayland/Config.in | 1 + package/x11r7/xwayland/xwayland.mk | 13 ++++--------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/package/x11r7/xwayland/Config.in b/package/x11r7/xwayland/Config.in index 241ab73ad3..9ac1928f51 100644 --- a/package/x11r7/xwayland/Config.in +++ b/package/x11r7/xwayland/Config.in @@ -8,6 +8,7 @@ config BR2_PACKAGE_XWAYLAND # them, otherwise, use the small libsha1 library. depends on !BR2_RISCV_32 # xlib_libxshmfence depends on BR2_TOOLCHAIN_HAS_SYNC_4 # xlib_libxshmfence + select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_LIBSHA1 if (!BR2_PACKAGE_OPENSSL && !BR2_PACKAGE_LIBGCRYPT) select BR2_PACKAGE_PIXMAN select BR2_PACKAGE_WAYLAND diff --git a/package/x11r7/xwayland/xwayland.mk b/package/x11r7/xwayland/xwayland.mk index 8eac602042..b0bff19be5 100644 --- a/package/x11r7/xwayland/xwayland.mk +++ b/package/x11r7/xwayland/xwayland.mk @@ -12,6 +12,7 @@ XWAYLAND_LICENSE_FILES = COPYING XWAYLAND_CPE_ID_VENDOR = x.org XWAYLAND_INSTALL_STAGING = YES XWAYLAND_DEPENDENCIES = \ + libdrm \ pixman \ wayland \ wayland-protocols \ @@ -23,15 +24,16 @@ XWAYLAND_DEPENDENCIES = \ xlib_xtrans \ xorgproto XWAYLAND_CONF_OPTS = \ + -Ddri3=true \ -Dxwayland_eglstream=false \ -Dxvfb=false \ -Ddefault_font_path=/usr/share/fonts/X11/ \ -Ddtrace=false \ -Ddocs=false -ifeq ($(BR2_PACKAGE_LIBDRM)$(BR2_PACKAGE_LIBEPOXY),yy) +ifeq ($(BR2_PACKAGE_LIBEPOXY),y) XWAYLAND_CONF_OPTS += -Dglamor=true -XWAYLAND_DEPENDENCIES += libdrm libepoxy +XWAYLAND_DEPENDENCIES += libepoxy else XWAYLAND_CONF_OPTS += -Dglamor=false endif @@ -79,13 +81,6 @@ XWAYLAND_CONF_OPTS += -Dsha1=libsha1 XWAYLAND_DEPENDENCIES += libsha1 endif -ifeq ($(BR2_PACKAGE_LIBDRM),y) -XWAYLAND_CONF_OPTS += -Ddri3=true -XWAYLAND_DEPENDENCIES += libdrm -else -XWAYLAND_CONF_OPTS += -Ddri3=false -endif - ifeq ($(BR2_PACKAGE_LIBUNWIND),y) XWAYLAND_CONF_OPTS += -Dlibunwind=true XWAYLAND_DEPENDENCIES += libunwind From 47e01f7e70aa5dd2d90459903584b9f1147ff9b0 Mon Sep 17 00:00:00 2001 From: Michael Nosthoff Date: Mon, 11 Dec 2023 09:53:48 +0100 Subject: [PATCH 4189/5754] package/json-for-modern-cpp: bump to version 3.11.3 This release fixes some bugs found in the 3.11.2 release. https://github.com/nlohmann/json/releases/tag/v3.11.3 Signed-off-by: Michael Nosthoff Signed-off-by: Peter Korsgaard --- package/json-for-modern-cpp/json-for-modern-cpp.hash | 2 +- package/json-for-modern-cpp/json-for-modern-cpp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/json-for-modern-cpp/json-for-modern-cpp.hash b/package/json-for-modern-cpp/json-for-modern-cpp.hash index 7668f67249..1f0e5efdb8 100644 --- a/package/json-for-modern-cpp/json-for-modern-cpp.hash +++ b/package/json-for-modern-cpp/json-for-modern-cpp.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 d69f9deb6a75e2580465c6c4c5111b89c4dc2fa94e3a85fcd2ffcd9a143d9273 json-3.11.2.tar.gz +sha256 0d8ef5af7f9794e3263480193c491549b2ba6cc74bb018906202ada498a79406 json-3.11.3.tar.gz sha256 86b998c792894ccb911a1cb7994f7a9652894e7a094c0b5e45be2f553f45cf14 LICENSE.MIT diff --git a/package/json-for-modern-cpp/json-for-modern-cpp.mk b/package/json-for-modern-cpp/json-for-modern-cpp.mk index 435644fd53..b89eb32a45 100644 --- a/package/json-for-modern-cpp/json-for-modern-cpp.mk +++ b/package/json-for-modern-cpp/json-for-modern-cpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -JSON_FOR_MODERN_CPP_VERSION = 3.11.2 +JSON_FOR_MODERN_CPP_VERSION = 3.11.3 JSON_FOR_MODERN_CPP_SOURCE = json-$(JSON_FOR_MODERN_CPP_VERSION).tar.gz JSON_FOR_MODERN_CPP_SITE = $(call github,nlohmann,json,v$(JSON_FOR_MODERN_CPP_VERSION)) JSON_FOR_MODERN_CPP_LICENSE = MIT From 5a1e20f37c352bad66549b9e011df53d71e42e89 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 11 Dec 2023 21:58:50 +0100 Subject: [PATCH 4190/5754] package/quickjs: bump to version 2023-12-09 Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/quickjs/quickjs.hash | 2 +- package/quickjs/quickjs.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/quickjs/quickjs.hash b/package/quickjs/quickjs.hash index b6f160800b..916fb6e3a2 100644 --- a/package/quickjs/quickjs.hash +++ b/package/quickjs/quickjs.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a45bface4c3379538dea8533878d694e289330488ea7028b105f72572fe7fe1a quickjs-2021-03-27.tar.xz +sha256 e8afe386f875d0e52310ea91aa48e2b0e04182e821f19147794e3e272f4c8d8c quickjs-2023-12-09.tar.xz sha256 f41baf09eef895d468d18c23055d74f711e4b8b2641cef279b5d71285c07bfe8 LICENSE diff --git a/package/quickjs/quickjs.mk b/package/quickjs/quickjs.mk index ff39209100..091862635e 100644 --- a/package/quickjs/quickjs.mk +++ b/package/quickjs/quickjs.mk @@ -4,7 +4,7 @@ # ################################################################################ -QUICKJS_VERSION = 2021-03-27 +QUICKJS_VERSION = 2023-12-09 QUICKJS_SOURCE = quickjs-$(QUICKJS_VERSION).tar.xz QUICKJS_SITE = https://bellard.org/quickjs QUICKJS_LICENSE = MIT From 564b00d581c9810f4171a434f02adb0cba0da8a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fl=C3=A1vio=20Tapaj=C3=B3s?= Date: Tue, 12 Dec 2023 09:47:35 -0300 Subject: [PATCH 4191/5754] package/rsyslog: bump version to 8.2312.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Flávio Tapajós Signed-off-by: Peter Korsgaard --- package/rsyslog/rsyslog.hash | 2 +- package/rsyslog/rsyslog.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rsyslog/rsyslog.hash b/package/rsyslog/rsyslog.hash index 90df3e054f..9c00365355 100644 --- a/package/rsyslog/rsyslog.hash +++ b/package/rsyslog/rsyslog.hash @@ -1,5 +1,5 @@ # From http://www.rsyslog.com/downloads/download-v8-stable/ -sha256 20d9ce792bf0a7ed0703dbf0941490f8be655f48b55b4bebdc0827bbb0ddbf11 rsyslog-8.2310.0.tar.gz +sha256 774032006128a896437f5913e132aa27dbfb937cd8847e449522d5a12d63d03e rsyslog-8.2312.0.tar.gz # Locally calculated sha256 054b3a047d9232376a46b87356b19b0c0c2924cb5e6911ab96a01fc4b515f083 COPYING diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk index 8ea92ea785..1919863f4f 100644 --- a/package/rsyslog/rsyslog.mk +++ b/package/rsyslog/rsyslog.mk @@ -4,7 +4,7 @@ # ################################################################################ -RSYSLOG_VERSION = 8.2310.0 +RSYSLOG_VERSION = 8.2312.0 RSYSLOG_SITE = http://rsyslog.com/files/download/rsyslog RSYSLOG_LICENSE = GPL-3.0, LGPL-3.0, Apache-2.0 RSYSLOG_LICENSE_FILES = COPYING COPYING.LESSER COPYING.ASL20 From 6f9431c3ad04e56b11bb72f3775cc804fc32918a Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Wed, 13 Dec 2023 13:48:49 +0000 Subject: [PATCH 4192/5754] configs/zynqmp_kria_kd240_defconfig: new defconfig This patch adds support for Xilinx Kria KD240 starter kit. KD240 features can be found here: https://www.xilinx.com/products/som/kria/kd240-drives-starter-kit.html While the Kria SOM is based on a ZynqMP SoC, there are some key boot config differences from the other ZynqMP evaluation boards. 1. There are no boot switches on Kria SOMs. The boot mode is thus hard configured for QSPI flash. A pre-programmed boot.bin comes with every Starter Kit. U-Boot can then find the Linux kernel and file system on the SD card. Optional instructions for updating the boot.bin in the QSPI flash can be found in the readme.txt file and the link below. https://xilinx-wiki.atlassian.net/wiki/spaces/A/pages/1641152513/Kria+K26+SOM 2. Kria SOMs use UART1 for the console instead of UART0. For this reason, Kria Starter Kits will use a separate extlinux.conf file from other ZynqMP evaluation boards. 3. The KD240 has a USB to SD card bridge, so the Linux kernel and file system are found on /dev/sda1 and /dev/sda2. 4. The following patches have been submitted upstream to u-boot. Without these patches, the usb, sd card and ethernet peripherals do not work correctly. https://patchwork.ozlabs.org/project/uboot/patch/20231213134007.2818069-1-neal.frager@amd.com/ https://patchwork.ozlabs.org/project/uboot/patch/20231213134052.2818879-1-neal.frager@amd.com/ Signed-off-by: Neal Frager Reviewed-by: Luca Ceresoli [Peter: add upstream tag, drop patch numbering from patches] Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + board/zynqmp/kria/kd240/kd240.sh | 16 + ...nqmp-Fix-k24-psu_init_gpl.c-clocking.patch | 401 ++++++++++++++ ...ynqmp-Add-output-enable-pins-to-SOMs.patch | 79 +++ board/zynqmp/kria/kd240/pm_cfg_obj.c | 494 ++++++++++++++++++ board/zynqmp/kria/readme.txt | 21 +- configs/zynqmp_kria_kd240_defconfig | 42 ++ 7 files changed, 1046 insertions(+), 8 deletions(-) create mode 100755 board/zynqmp/kria/kd240/kd240.sh create mode 100644 board/zynqmp/kria/kd240/patches/uboot/0001-arm64-zynqmp-Fix-k24-psu_init_gpl.c-clocking.patch create mode 100644 board/zynqmp/kria/kd240/patches/uboot/0002-arm64-zynqmp-Add-output-enable-pins-to-SOMs.patch create mode 100644 board/zynqmp/kria/kd240/pm_cfg_obj.c create mode 100644 configs/zynqmp_kria_kd240_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index ccc4d1bb32..96f3214f94 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2210,6 +2210,7 @@ F: board/zynqmp/ F: configs/versal_vck190_defconfig F: configs/zynq_zc702_defconfig F: configs/zynq_zc706_defconfig +F: configs/zynqmp_kria_kd240_defconfig F: configs/zynqmp_kria_kr260_defconfig F: configs/zynqmp_kria_kv260_defconfig F: configs/zynqmp_zcu102_defconfig diff --git a/board/zynqmp/kria/kd240/kd240.sh b/board/zynqmp/kria/kd240/kd240.sh new file mode 100755 index 0000000000..2203536a52 --- /dev/null +++ b/board/zynqmp/kria/kd240/kd240.sh @@ -0,0 +1,16 @@ +#!/bin/sh + +# This is a temporary work around for generating kd240 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 kd240 carrier board +# drivers are missing. +# This will be removed when u-boot can build the kd240 u-boot.itb natively. + +UBOOT_DIR="$4" + +fdtoverlay -o "${UBOOT_DIR}/fit-dtb.blob" \ + -i "${UBOOT_DIR}/arch/arm/dts/zynqmp-smk-k24-revA.dtb" \ + "${UBOOT_DIR}/arch/arm/dts/zynqmp-sck-kd-g-revA.dtbo" + +"${UBOOT_DIR}/tools/mkimage" -E -f "${UBOOT_DIR}/u-boot.its" \ + -B 0x8 "${BINARIES_DIR}/u-boot.itb" diff --git a/board/zynqmp/kria/kd240/patches/uboot/0001-arm64-zynqmp-Fix-k24-psu_init_gpl.c-clocking.patch b/board/zynqmp/kria/kd240/patches/uboot/0001-arm64-zynqmp-Fix-k24-psu_init_gpl.c-clocking.patch new file mode 100644 index 0000000000..f088b90f52 --- /dev/null +++ b/board/zynqmp/kria/kd240/patches/uboot/0001-arm64-zynqmp-Fix-k24-psu_init_gpl.c-clocking.patch @@ -0,0 +1,401 @@ +From f8cba630d3fccd901164dec7bd9b60442bab8995 Mon Sep 17 00:00:00 2001 +From: Neal Frager +Date: Wed, 13 Dec 2023 12:53:29 +0000 +Subject: [PATCH] arm64: zynqmp: Fix k24 psu_init_gpl.c clocking + +This patch corrects the k24 som clocking configuration such that the serdes +clocks are correctly enabled and the usb0 is configured to use the psgtr +refclk2 for usb3 mode. + +This patch also corrects the configuration of mio pins mio76 and mio77 +which should be configured as gpio pins. + +Signed-off-by: Neal Frager +Upstream: https://patchwork.ozlabs.org/project/uboot/patch/20231213134007.2818069-1-neal.frager@amd.com/ +--- + .../zynqmp/zynqmp-sm-k24-revA/psu_init_gpl.c | 266 +++++++++++++----- + 1 file changed, 200 insertions(+), 66 deletions(-) + +diff --git a/board/xilinx/zynqmp/zynqmp-sm-k24-revA/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-sm-k24-revA/psu_init_gpl.c +index 45102302dc..4c904c6c81 100644 +--- a/board/xilinx/zynqmp/zynqmp-sm-k24-revA/psu_init_gpl.c ++++ b/board/xilinx/zynqmp/zynqmp-sm-k24-revA/psu_init_gpl.c +@@ -72,6 +72,18 @@ static void dpll_prog(int div2, int ddr_pll_fbdiv, int d_lock_dly, + Xil_Out32(((0xFD1A0000U) + 0x0000002C), pll_ctrl_regval); + } + ++static int serdes_illcalib(u32 lane3_protocol, u32 lane3_rate, ++ u32 lane2_protocol, u32 lane2_rate, ++ u32 lane1_protocol, u32 lane1_rate, ++ u32 lane0_protocol, u32 lane0_rate) ++{ ++ Xil_Out32(0xFD409914, 0xF3); ++ Xil_Out32(0xFD409940, 0xF3); ++ Xil_Out32(0xFD409990, 0x20); ++ Xil_Out32(0xFD409924, 0x37); ++ return 1; ++} ++ + static unsigned long psu_pll_init_data(void) + { + psu_mask_write(0xFF5E0034, 0xFE7FEDEFU, 0x7E4B0C62U); +@@ -490,20 +502,20 @@ static unsigned long psu_mio_init_data(void) + psu_mask_write(0xFF18008C, 0x000000FEU, 0x00000000U); + psu_mask_write(0xFF180090, 0x000000FEU, 0x000000C0U); + psu_mask_write(0xFF180094, 0x000000FEU, 0x000000C0U); +- psu_mask_write(0xFF180098, 0x000000FEU, 0x00000000U); +- psu_mask_write(0xFF18009C, 0x000000FEU, 0x00000010U); +- psu_mask_write(0xFF1800A0, 0x000000FEU, 0x00000010U); +- psu_mask_write(0xFF1800A4, 0x000000FEU, 0x00000010U); +- psu_mask_write(0xFF1800A8, 0x000000FEU, 0x00000010U); +- psu_mask_write(0xFF1800AC, 0x000000FEU, 0x00000010U); +- psu_mask_write(0xFF1800B0, 0x000000FEU, 0x00000000U); +- psu_mask_write(0xFF1800B4, 0x000000FEU, 0x00000010U); +- psu_mask_write(0xFF1800B8, 0x000000FEU, 0x00000010U); +- psu_mask_write(0xFF1800BC, 0x000000FEU, 0x00000010U); +- psu_mask_write(0xFF1800C0, 0x000000FEU, 0x00000010U); +- psu_mask_write(0xFF1800C4, 0x000000FEU, 0x00000010U); +- psu_mask_write(0xFF1800C8, 0x000000FEU, 0x00000010U); +- psu_mask_write(0xFF1800CC, 0x000000FEU, 0x00000010U); ++ psu_mask_write(0xFF180098, 0x000000FEU, 0x00000002U); ++ psu_mask_write(0xFF18009C, 0x000000FEU, 0x00000002U); ++ psu_mask_write(0xFF1800A0, 0x000000FEU, 0x00000002U); ++ psu_mask_write(0xFF1800A4, 0x000000FEU, 0x00000002U); ++ psu_mask_write(0xFF1800A8, 0x000000FEU, 0x00000002U); ++ psu_mask_write(0xFF1800AC, 0x000000FEU, 0x00000002U); ++ psu_mask_write(0xFF1800B0, 0x000000FEU, 0x00000002U); ++ psu_mask_write(0xFF1800B4, 0x000000FEU, 0x00000002U); ++ psu_mask_write(0xFF1800B8, 0x000000FEU, 0x00000002U); ++ psu_mask_write(0xFF1800BC, 0x000000FEU, 0x00000002U); ++ psu_mask_write(0xFF1800C0, 0x000000FEU, 0x00000002U); ++ psu_mask_write(0xFF1800C4, 0x000000FEU, 0x00000002U); ++ psu_mask_write(0xFF1800C8, 0x000000FEU, 0x00000080U); ++ psu_mask_write(0xFF1800CC, 0x000000FEU, 0x00000080U); + psu_mask_write(0xFF1800D0, 0x000000FEU, 0x00000004U); + psu_mask_write(0xFF1800D4, 0x000000FEU, 0x00000004U); + psu_mask_write(0xFF1800D8, 0x000000FEU, 0x00000004U); +@@ -528,8 +540,8 @@ static unsigned long psu_mio_init_data(void) + psu_mask_write(0xFF180124, 0x000000FEU, 0x00000002U); + psu_mask_write(0xFF180128, 0x000000FEU, 0x00000002U); + psu_mask_write(0xFF18012C, 0x000000FEU, 0x00000002U); +- psu_mask_write(0xFF180130, 0x000000FEU, 0x000000C0U); +- psu_mask_write(0xFF180134, 0x000000FEU, 0x000000C0U); ++ psu_mask_write(0xFF180130, 0x000000FEU, 0x00000000U); ++ psu_mask_write(0xFF180134, 0x000000FEU, 0x00000000U); + psu_mask_write(0xFF180204, 0xFFFFFFFFU, 0x50000000U); + psu_mask_write(0xFF180208, 0xFFFFFFFFU, 0x00B02020U); + psu_mask_write(0xFF18020C, 0x00003FFFU, 0x00000FC0U); +@@ -539,18 +551,18 @@ static unsigned long psu_mio_init_data(void) + psu_mask_write(0xFF180144, 0x03FFFFFFU, 0x03FFFFFFU); + psu_mask_write(0xFF180148, 0x03FFFFFFU, 0x03FFFFFFU); + psu_mask_write(0xFF18014C, 0x03FFFFFFU, 0x03FFFFFFU); +- psu_mask_write(0xFF180154, 0x03FFFFFFU, 0x00080814U); ++ psu_mask_write(0xFF180154, 0x03FFFFFFU, 0x00FC0814U); + psu_mask_write(0xFF180158, 0x03FFFFFFU, 0x03FFFFFFU); + psu_mask_write(0xFF18015C, 0x03FFFFFFU, 0x00000000U); +- psu_mask_write(0xFF180160, 0x03FFFFFFU, 0x03FFFFFFU); +- psu_mask_write(0xFF180164, 0x03FFFFFFU, 0x03FFFFFFU); +- psu_mask_write(0xFF180168, 0x03FFFFFFU, 0x03F7F7EBU); +- psu_mask_write(0xFF180170, 0x03FFFFFFU, 0x00FC000BU); ++ psu_mask_write(0xFF180160, 0x0387FFFFU, 0x0387FFFFU); ++ psu_mask_write(0xFF180164, 0x03FFFFFFU, 0x03FFF87FU); ++ psu_mask_write(0xFF180168, 0x03FFFFFFU, 0x0303F7EBU); ++ psu_mask_write(0xFF180170, 0x03FFFFFFU, 0x0004400BU); + psu_mask_write(0xFF180174, 0x03FFFFFFU, 0x03FFFFFFU); + psu_mask_write(0xFF180178, 0x03FFFFFFU, 0x00000000U); +- psu_mask_write(0xFF18017C, 0x0357FFFFU, 0x0357FFFFU); +- psu_mask_write(0xFF180180, 0x03FFFFFFU, 0x0357FFFFU); +- psu_mask_write(0xFF180184, 0x03FFFFFFU, 0x0303FFF4U); ++ psu_mask_write(0xFF18017C, 0x03FFFFFFU, 0x03FFFFFFU); ++ psu_mask_write(0xFF180180, 0x03FFFFFFU, 0x03FFFFFFU); ++ psu_mask_write(0xFF180184, 0x03FFFFFFU, 0x03FBBFF4U); + psu_mask_write(0xFF180200, 0x0000000FU, 0x00000000U); + + return 1; +@@ -569,21 +581,16 @@ static unsigned long psu_peripherals_init_data(void) + psu_mask_write(0xFD1A0100, 0x0001807CU, 0x00000000U); + psu_mask_write(0xFF5E0238, 0x001A0000U, 0x00000000U); + psu_mask_write(0xFF5E023C, 0x0093C018U, 0x00000000U); +- psu_mask_write(0xFF5E0230, 0x00000008U, 0x00000000U); ++ psu_mask_write(0xFF5E0230, 0x00000002U, 0x00000000U); + psu_mask_write(0xFF5E0238, 0x00000001U, 0x00000000U); + psu_mask_write(0xFF180390, 0x00000004U, 0x00000004U); + psu_mask_write(0xFF5E023C, 0x00000400U, 0x00000000U); +- psu_mask_write(0xFF5E0238, 0x00000040U, 0x00000000U); +- psu_mask_write(0xFF180310, 0x00008000U, 0x00000000U); +- psu_mask_write(0xFF180320, 0x33840000U, 0x02840000U); +- psu_mask_write(0xFF18031C, 0x7FFE0000U, 0x64500000U); +- psu_mask_write(0xFF180358, 0x00000008U, 0x00000008U); +- psu_mask_write(0xFF180324, 0x03C00000U, 0x00000000U); ++ psu_mask_write(0xFF5E0238, 0x00000080U, 0x00000000U); + psu_mask_write(0xFF5E0238, 0x00000400U, 0x00000000U); + psu_mask_write(0xFF5E0238, 0x00008000U, 0x00000000U); + psu_mask_write(0xFF5E0238, 0x00000010U, 0x00000000U); + psu_mask_write(0xFF5E0238, 0x00007800U, 0x00000000U); +- psu_mask_write(0xFF5E0238, 0x00000004U, 0x00000000U); ++ psu_mask_write(0xFF5E0238, 0x00000006U, 0x00000000U); + psu_mask_write(0xFF5E0238, 0x00040000U, 0x00000000U); + psu_mask_write(0xFF4B0024, 0x000000FFU, 0x000000FFU); + psu_mask_write(0xFFCA5000, 0x00001FFFU, 0x00000000U); +@@ -591,40 +598,26 @@ static unsigned long psu_peripherals_init_data(void) + psu_mask_write(0xFFA60040, 0x80000000U, 0x80000000U); + psu_mask_write(0xFF260020, 0xFFFFFFFFU, 0x05F5DD18U); + psu_mask_write(0xFF260000, 0x00000001U, 0x00000001U); +- psu_mask_write(0xFF5E0250, 0x00000F0FU, 0x00000202U); ++ psu_mask_write(0xFF0A0284, 0x03FFFFFFU, 0x01000000U); ++ psu_mask_write(0xFF0A0288, 0x03FFFFFFU, 0x01000000U); ++ psu_mask_write(0xFF0A0014, 0x03FF03FFU, 0x02FF0100U); + + mask_delay(1); +- psu_mask_write(0xFF5E0250, 0x00000F0FU, 0x00000002U); ++ psu_mask_write(0xFF0A0014, 0x03FF03FFU, 0x02FF0000U); + + mask_delay(5); +- psu_mask_write(0xFF5E0250, 0x00000F0FU, 0x00000202U); ++ psu_mask_write(0xFF0A0014, 0x03FF03FFU, 0x02FF0100U); + + return 1; + } + + static unsigned long psu_serdes_init_data(void) + { +- psu_mask_write(0xFD410000, 0x0000001FU, 0x00000009U); +- psu_mask_write(0xFD410004, 0x0000001FU, 0x00000009U); + psu_mask_write(0xFD410008, 0x0000001FU, 0x00000008U); +- psu_mask_write(0xFD402860, 0x00000080U, 0x00000080U); +- psu_mask_write(0xFD402864, 0x00000081U, 0x00000001U); +- psu_mask_write(0xFD402868, 0x00000082U, 0x00000002U); ++ psu_mask_write(0xFD402868, 0x00000080U, 0x00000080U); + psu_mask_write(0xFD40A094, 0x00000010U, 0x00000010U); + psu_mask_write(0xFD40A368, 0x000000FFU, 0x00000038U); + psu_mask_write(0xFD40A36C, 0x00000007U, 0x00000003U); +- psu_mask_write(0xFD402368, 0x000000FFU, 0x00000058U); +- psu_mask_write(0xFD40236C, 0x00000007U, 0x00000003U); +- psu_mask_write(0xFD406368, 0x000000FFU, 0x00000058U); +- psu_mask_write(0xFD40636C, 0x00000007U, 0x00000003U); +- psu_mask_write(0xFD402370, 0x000000FFU, 0x0000007CU); +- psu_mask_write(0xFD402374, 0x000000FFU, 0x00000033U); +- psu_mask_write(0xFD402378, 0x000000FFU, 0x00000002U); +- psu_mask_write(0xFD40237C, 0x00000033U, 0x00000030U); +- psu_mask_write(0xFD406370, 0x000000FFU, 0x0000007CU); +- psu_mask_write(0xFD406374, 0x000000FFU, 0x00000033U); +- psu_mask_write(0xFD406378, 0x000000FFU, 0x00000002U); +- psu_mask_write(0xFD40637C, 0x00000033U, 0x00000030U); + psu_mask_write(0xFD40A370, 0x000000FFU, 0x000000F4U); + psu_mask_write(0xFD40A374, 0x000000FFU, 0x00000031U); + psu_mask_write(0xFD40A378, 0x000000FFU, 0x00000002U); +@@ -678,18 +671,8 @@ static unsigned long psu_serdes_init_data(void) + psu_mask_write(0xFD409978, 0x00000010U, 0x00000010U); + psu_mask_write(0xFD40D978, 0x00000010U, 0x00000010U); + +- serdes_illcalib(0, 0, 3, 0, 4, 0, 4, 0); +- psu_mask_write(0xFD410010, 0x00000077U, 0x00000044U); ++ serdes_illcalib(0, 0, 3, 0, 0, 0, 0, 0); + psu_mask_write(0xFD410014, 0x00000007U, 0x00000003U); +- psu_mask_write(0xFD400CB4, 0x00000037U, 0x00000037U); +- psu_mask_write(0xFD404CB4, 0x00000037U, 0x00000037U); +- psu_mask_write(0xFD4001D8, 0x00000001U, 0x00000001U); +- psu_mask_write(0xFD4041D8, 0x00000001U, 0x00000001U); +- psu_mask_write(0xFD404CC0, 0x0000001FU, 0x00000000U); +- psu_mask_write(0xFD400CC0, 0x0000001FU, 0x00000000U); +- psu_mask_write(0xFD404048, 0x000000FFU, 0x00000000U); +- psu_mask_write(0xFD400048, 0x000000FFU, 0x00000000U); +- + return 1; + } + +@@ -699,7 +682,7 @@ static unsigned long psu_resetout_init_data(void) + psu_mask_write(0xFF9D0080, 0x00000001U, 0x00000001U); + psu_mask_write(0xFF9D007C, 0x00000001U, 0x00000000U); + psu_mask_write(0xFF5E023C, 0x00000140U, 0x00000000U); +- psu_mask_write(0xFF5E0230, 0x00000008U, 0x00000000U); ++ psu_mask_write(0xFF5E0230, 0x00000002U, 0x00000000U); + psu_mask_write(0xFD1A0100, 0x00010000U, 0x00000000U); + psu_mask_write(0xFD4A0200, 0x00000002U, 0x00000000U); + psu_mask_write(0xFD4A0238, 0x0000000FU, 0x00000000U); +@@ -708,7 +691,6 @@ static unsigned long psu_resetout_init_data(void) + psu_mask_write(0xFE20C11C, 0x00000600U, 0x00000600U); + psu_mask_write(0xFE20C12C, 0x00004000U, 0x00004000U); + psu_mask_write(0xFD480064, 0x00000200U, 0x00000200U); +- mask_poll(0xFD4063E4, 0x00000010U); + mask_poll(0xFD40A3E4, 0x00000010U); + + return 1; +@@ -717,7 +699,7 @@ static unsigned long psu_resetout_init_data(void) + static unsigned long psu_resetin_init_data(void) + { + psu_mask_write(0xFF5E023C, 0x00000540U, 0x00000540U); +- psu_mask_write(0xFF5E0230, 0x00000008U, 0x00000008U); ++ psu_mask_write(0xFF5E0230, 0x00000002U, 0x00000002U); + psu_mask_write(0xFD4A0238, 0x0000000FU, 0x0000000AU); + psu_mask_write(0xFD4A0200, 0x00000002U, 0x00000002U); + psu_mask_write(0xFD1A0100, 0x00010000U, 0x00010000U); +@@ -1034,6 +1016,157 @@ static unsigned long psu_ddr_phybringup_data(void) + return 1; + } + ++static int serdes_enb_coarse_saturation(void) ++{ ++ Xil_Out32(0xFD402094, 0x00000010); ++ Xil_Out32(0xFD406094, 0x00000010); ++ Xil_Out32(0xFD40A094, 0x00000010); ++ Xil_Out32(0xFD40E094, 0x00000010); ++ return 1; ++} ++ ++static int serdes_fixcal_code(void) ++{ ++ int maskstatus = 1; ++ unsigned int rdata = 0; ++ unsigned int match_pmos_code[23]; ++ unsigned int match_nmos_code[23]; ++ unsigned int match_ical_code[7]; ++ unsigned int match_rcal_code[7]; ++ unsigned int p_code = 0; ++ unsigned int n_code = 0; ++ unsigned int i_code = 0; ++ unsigned int r_code = 0; ++ unsigned int repeat_count = 0; ++ unsigned int L3_TM_CALIB_DIG20 = 0; ++ unsigned int L3_TM_CALIB_DIG19 = 0; ++ unsigned int L3_TM_CALIB_DIG18 = 0; ++ unsigned int L3_TM_CALIB_DIG16 = 0; ++ unsigned int L3_TM_CALIB_DIG15 = 0; ++ unsigned int L3_TM_CALIB_DIG14 = 0; ++ int i = 0; ++ ++ rdata = Xil_In32(0xFD40289C); ++ rdata = rdata & ~0x03; ++ rdata = rdata | 0x1; ++ Xil_Out32(0xFD40289C, rdata); ++ int count = 0; ++ do { ++ if (count == 1100000) ++ break; ++ rdata = Xil_In32(0xFD402B1C); ++ count++; ++ } while ((rdata & 0x0000000E) != 0x0000000E); ++ ++ for (i = 0; i < 23; i++) { ++ match_pmos_code[i] = 0; ++ match_nmos_code[i] = 0; ++ } ++ for (i = 0; i < 7; i++) { ++ match_ical_code[i] = 0; ++ match_rcal_code[i] = 0; ++ } ++ ++ do { ++ Xil_Out32(0xFD410010, 0x00000000); ++ Xil_Out32(0xFD410014, 0x00000000); ++ ++ Xil_Out32(0xFD410010, 0x00000001); ++ Xil_Out32(0xFD410014, 0x00000000); ++ ++ maskstatus = mask_poll(0xFD40EF14, 0x2); ++ if (maskstatus == 0) { ++ xil_printf("#SERDES initialization timed out\n\r"); ++ return maskstatus; ++ } ++ ++ p_code = mask_read(0xFD40EF18, 0xFFFFFFFF); ++ n_code = mask_read(0xFD40EF1C, 0xFFFFFFFF); ++ ; ++ i_code = mask_read(0xFD40EF24, 0xFFFFFFFF); ++ r_code = mask_read(0xFD40EF28, 0xFFFFFFFF); ++ ; ++ ++ if (p_code >= 0x26 && p_code <= 0x3C) ++ match_pmos_code[p_code - 0x26] += 1; ++ ++ if (n_code >= 0x26 && n_code <= 0x3C) ++ match_nmos_code[n_code - 0x26] += 1; ++ ++ if (i_code >= 0xC && i_code <= 0x12) ++ match_ical_code[i_code - 0xC] += 1; ++ ++ if (r_code >= 0x6 && r_code <= 0xC) ++ match_rcal_code[r_code - 0x6] += 1; ++ ++ } while (repeat_count++ < 10); ++ ++ for (i = 0; i < 23; i++) { ++ if (match_pmos_code[i] >= match_pmos_code[0]) { ++ match_pmos_code[0] = match_pmos_code[i]; ++ p_code = 0x26 + i; ++ } ++ if (match_nmos_code[i] >= match_nmos_code[0]) { ++ match_nmos_code[0] = match_nmos_code[i]; ++ n_code = 0x26 + i; ++ } ++ } ++ ++ for (i = 0; i < 7; i++) { ++ if (match_ical_code[i] >= match_ical_code[0]) { ++ match_ical_code[0] = match_ical_code[i]; ++ i_code = 0xC + i; ++ } ++ if (match_rcal_code[i] >= match_rcal_code[0]) { ++ match_rcal_code[0] = match_rcal_code[i]; ++ r_code = 0x6 + i; ++ } ++ } ++ ++ L3_TM_CALIB_DIG20 = mask_read(0xFD40EC50, 0xFFFFFFF0); ++ L3_TM_CALIB_DIG20 = L3_TM_CALIB_DIG20 | 0x8 | ((p_code >> 2) & 0x7); ++ ++ L3_TM_CALIB_DIG19 = mask_read(0xFD40EC4C, 0xFFFFFF18); ++ L3_TM_CALIB_DIG19 = L3_TM_CALIB_DIG19 | ((p_code & 0x3) << 6) ++ | 0x20 | 0x4 | ((n_code >> 3) & 0x3); ++ ++ L3_TM_CALIB_DIG18 = mask_read(0xFD40EC48, 0xFFFFFF0F); ++ L3_TM_CALIB_DIG18 = L3_TM_CALIB_DIG18 | ((n_code & 0x7) << 5) | 0x10; ++ ++ L3_TM_CALIB_DIG16 = mask_read(0xFD40EC40, 0xFFFFFFF8); ++ L3_TM_CALIB_DIG16 = L3_TM_CALIB_DIG16 | ((r_code >> 1) & 0x7); ++ ++ L3_TM_CALIB_DIG15 = mask_read(0xFD40EC3C, 0xFFFFFF30); ++ L3_TM_CALIB_DIG15 = L3_TM_CALIB_DIG15 | ((r_code & 0x1) << 7) ++ | 0x40 | 0x8 | ((i_code >> 1) & 0x7); ++ ++ L3_TM_CALIB_DIG14 = mask_read(0xFD40EC38, 0xFFFFFF3F); ++ L3_TM_CALIB_DIG14 = L3_TM_CALIB_DIG14 | ((i_code & 0x1) << 7) | 0x40; ++ ++ Xil_Out32(0xFD40EC50, L3_TM_CALIB_DIG20); ++ Xil_Out32(0xFD40EC4C, L3_TM_CALIB_DIG19); ++ Xil_Out32(0xFD40EC48, L3_TM_CALIB_DIG18); ++ Xil_Out32(0xFD40EC40, L3_TM_CALIB_DIG16); ++ Xil_Out32(0xFD40EC3C, L3_TM_CALIB_DIG15); ++ Xil_Out32(0xFD40EC38, L3_TM_CALIB_DIG14); ++ return maskstatus; ++} ++ ++static int init_serdes(void) ++{ ++ int status = 1; ++ ++ status &= psu_resetin_init_data(); ++ ++ status &= serdes_fixcal_code(); ++ status &= serdes_enb_coarse_saturation(); ++ ++ status &= psu_serdes_init_data(); ++ status &= psu_resetout_init_data(); ++ ++ return status; ++} ++ + static void init_peripheral(void) + { + psu_mask_write(0xFD5F0018, 0x8000001FU, 0x8000001FU); +@@ -1050,6 +1183,7 @@ int psu_init(void) + status &= psu_ddr_init_data(); + status &= psu_ddr_phybringup_data(); + status &= psu_peripherals_init_data(); ++ status &= init_serdes(); + init_peripheral(); + + status &= psu_afi_config(); +-- +2.25.1 + diff --git a/board/zynqmp/kria/kd240/patches/uboot/0002-arm64-zynqmp-Add-output-enable-pins-to-SOMs.patch b/board/zynqmp/kria/kd240/patches/uboot/0002-arm64-zynqmp-Add-output-enable-pins-to-SOMs.patch new file mode 100644 index 0000000000..5566dae891 --- /dev/null +++ b/board/zynqmp/kria/kd240/patches/uboot/0002-arm64-zynqmp-Add-output-enable-pins-to-SOMs.patch @@ -0,0 +1,79 @@ +From bf35bdac2adfa7c65c2992d8dedcc24585561732 Mon Sep 17 00:00:00 2001 +From: Neal Frager +Date: Wed, 13 Dec 2023 13:11:42 +0000 +Subject: [PATCH] arm64: zynqmp: Add output-enable pins to SOMs + +Now that the zynqmp pinctrl driver supports the tri-state registers, make +sure that the pins requiring output-enable are configured appropriately for +SOMs. + +Without it, all tristate setting for MIOs, which are not related to SOM +itself, are using default configuration which is not correct setting. +It means SDs, USBs, ethernet, etc. are not working properly. + +In past it was fixed through calling tristate configuration via bootcmd: +usb_init=mw 0xFF180208 2020 +kv260_gem3=mw 0xFF18020C 0xFC0 && gpio toggle gpio@ff0a000038 && \ + gpio toggle gpio@ff0a000038 + +Signed-off-by: Neal Frager +Upstream: https://patchwork.ozlabs.org/project/uboot/patch/20231213134052.2818879-1-neal.frager@amd.com/ +--- + arch/arm/dts/zynqmp-sck-kd-g-revA.dts | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/arch/arm/dts/zynqmp-sck-kd-g-revA.dts b/arch/arm/dts/zynqmp-sck-kd-g-revA.dts +index 56f3128528..12865392a3 100644 +--- a/arch/arm/dts/zynqmp-sck-kd-g-revA.dts ++++ b/arch/arm/dts/zynqmp-sck-kd-g-revA.dts +@@ -175,6 +175,7 @@ + conf-tx { + pins = "MIO36"; + bias-disable; ++ output-enable; + }; + + mux { +@@ -226,6 +227,7 @@ + conf-bootstrap { + pins = "MIO44", "MIO49"; + bias-disable; ++ output-enable; + low-power-disable; + }; + +@@ -233,6 +235,7 @@ + pins = "MIO38", "MIO39", "MIO40", + "MIO41", "MIO42", "MIO43"; + bias-disable; ++ output-enable; + low-power-enable; + }; + +@@ -241,6 +244,7 @@ + slew-rate = ; + power-source = ; + bias-disable; ++ output-enable; + }; + + mux-mdio { +@@ -271,6 +275,7 @@ + pins = "MIO54", "MIO56", "MIO57", "MIO58", "MIO59", + "MIO60", "MIO61", "MIO62", "MIO63"; + bias-disable; ++ output-enable; + drive-strength = <4>; + slew-rate = ; + }; +@@ -298,6 +303,7 @@ + pins = "MIO66", "MIO68", "MIO69", "MIO70", "MIO71", + "MIO72", "MIO73", "MIO74", "MIO75"; + bias-disable; ++ output-enable; + drive-strength = <4>; + slew-rate = ; + }; +-- +2.25.1 + diff --git a/board/zynqmp/kria/kd240/pm_cfg_obj.c b/board/zynqmp/kria/kd240/pm_cfg_obj.c new file mode 100644 index 0000000000..13061ddcb3 --- /dev/null +++ b/board/zynqmp/kria/kd240/pm_cfg_obj.c @@ -0,0 +1,494 @@ +/****************************************************************************** +* Copyright (c) 2017 - 2021 Xilinx, Inc. All rights reserved. +* SPDX-License-Identifier: MIT +******************************************************************************/ + +#include "xil_types.h" +#include "pm_defs.h" + +#define PM_CONFIG_MASTER_SECTION_ID 0x101U +#define PM_CONFIG_SLAVE_SECTION_ID 0x102U +#define PM_CONFIG_PREALLOC_SECTION_ID 0x103U +#define PM_CONFIG_POWER_SECTION_ID 0x104U +#define PM_CONFIG_RESET_SECTION_ID 0x105U +#define PM_CONFIG_SHUTDOWN_SECTION_ID 0x106U +#define PM_CONFIG_SET_CONFIG_SECTION_ID 0x107U +#define PM_CONFIG_GPO_SECTION_ID 0x108U + +#define PM_SLAVE_FLAG_IS_SHAREABLE 0x1U +#define PM_MASTER_USING_SLAVE_MASK 0x2U + +#define PM_CONFIG_GPO1_MIO_PIN_34_MAP (1U << 10U) +#define PM_CONFIG_GPO1_MIO_PIN_35_MAP (1U << 11U) +#define PM_CONFIG_GPO1_MIO_PIN_36_MAP (1U << 12U) +#define PM_CONFIG_GPO1_MIO_PIN_37_MAP (1U << 13U) + +#define PM_CONFIG_GPO1_BIT_2_MASK (1U << 2U) +#define PM_CONFIG_GPO1_BIT_3_MASK (1U << 3U) +#define PM_CONFIG_GPO1_BIT_4_MASK (1U << 4U) +#define PM_CONFIG_GPO1_BIT_5_MASK (1U << 5U) + +#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 + + + +#if defined (__ICCARM__) +#pragma language=save +#pragma language=extended +#endif +#if defined (__GNUC__) + const u32 XPm_ConfigObject[] __attribute__((used, section(".sys_cfg_data"))) = +#elif defined (__ICCARM__) +#pragma location = ".sys_cfg_data" +__root const u32 XPm_ConfigObject[] = +#endif +{ + /**********************************************************************/ + /* HEADER */ + 2, /* Number of remaining words in the header */ + 8, /* Number of sections included in config object */ + PM_CONFIG_OBJECT_TYPE_BASE, /* Type of config object as base */ + /**********************************************************************/ + /* MASTER SECTION */ + PM_CONFIG_MASTER_SECTION_ID, /* Master SectionID */ + 3U, /* No. of Masters*/ + + NODE_APU, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ + + NODE_RPU_0, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ + + NODE_RPU_1, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Wake permissions */ + + + /**********************************************************************/ + /* SLAVE SECTION */ + + + PM_CONFIG_SLAVE_SECTION_ID, /* Section ID */ + 35, /* Number of slaves */ + + NODE_OCM_BANK_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 */ + + NODE_OCM_BANK_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_OCM_BANK_2, + 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_OCM_BANK_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_TCM_0_A, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_TCM_0_B, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_TCM_1_A, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TCM_1_B, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_L2, + 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_GPU_PP_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 */ + + NODE_GPU_PP_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_USB_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 */ + + 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 */ + + NODE_TTC_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_TTC_2, + 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_TTC_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_ETH_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_UART_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 */ + + 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_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_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_DP, + 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_GDMA, + 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_ADMA, + 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_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 */ + + NODE_GPIO, + 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, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* 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 */ + + NODE_DDR, + 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_IPI_APU, + 0U, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask */ + + NODE_IPI_RPU_0, + 0U, + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_IPI_RPU_1, + 0U, + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU, + 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_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_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 */ + + + /**********************************************************************/ + /* PREALLOC SECTION */ + + PM_CONFIG_PREALLOC_SECTION_ID, /* Preallaoc SectionID */ + 3U, /* No. of Masters*/ + + /* Prealloc for psu_cortexa53_0 */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, + 10, + NODE_DDR, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_L2, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_2, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_3, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_I2C_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_QSPI, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_PL, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_APU, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + /* Prealloc for psu_cortexr5_0 */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, + 3, + NODE_TCM_0_A, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_TCM_0_B, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_RPU_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + /* Prealloc for psu_cortexr5_1 */ + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + 3, + NODE_TCM_1_A, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_TCM_1_B, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_RPU_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + + /**********************************************************************/ + /* POWER SECTION */ + + PM_CONFIG_POWER_SECTION_ID, /* Power Section ID */ + 4U, /* Number of power nodes */ + + NODE_APU, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_RPU, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_FPD, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_PLD, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + + /**********************************************************************/ + /* RESET SECTION */ + + PM_CONFIG_RESET_SECTION_ID, /* Reset Section ID */ + 120U, /* Number of resets */ + + XILPM_RESET_PCIE_CFG, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PCIE_BRIDGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PCIE_CTRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SWDT_CRF, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GDMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU_PP1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU_PP0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SATA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU3_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU2_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU1_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU0_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APU_L2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DDR, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APM_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SOFT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_QSPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_UART0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_UART1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SPI0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SPI1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SDIO0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SDIO1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_CAN0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_CAN1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_I2C0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_I2C1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SWDT_CRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_NAND, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ADMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IOU_CC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TIMESTAMP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_R50, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_R51, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_AMBA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_OCM, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_PGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APM_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RTC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SYSMON, 0, + XILPM_RESET_AFI_FM6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_LPD_SWDT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_FPD, PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, + XILPM_RESET_RPU_DBG1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_DBG0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DBG_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DBG_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_VPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IOPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_7, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_8, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_9, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_10, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_11, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_12, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_13, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_14, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_15, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_16, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_17, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_18, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_19, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_20, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_21, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_22, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_23, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_24, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_25, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_26, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_27, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_28, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_29, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_30, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_31, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_LS, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PS_ONLY, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_92, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_93, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_94, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_95, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + + /**********************************************************************/ + /* SET CONFIG SECTION */ + PM_CONFIG_SET_CONFIG_SECTION_ID, /* Set Config Section ID */ + 0U, /* Permissions to load base config object */ + 0U, /* Permissions to load overlay config object */ + + /**********************************************************************/ + /* SHUTDOWN SECTION */ + + PM_CONFIG_SHUTDOWN_SECTION_ID, /* Shutdown Section ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* System Shutdown/Restart Permission */ + + /**********************************************************************/ + /* GPO SECTION */ + PM_CONFIG_GPO_SECTION_ID, /* GPO Section ID */ + 0, /* State of GPO pins */ +}; +#if defined (__ICCARM__) +#pragma language=restore +#endif diff --git a/board/zynqmp/kria/readme.txt b/board/zynqmp/kria/readme.txt index dc6915f081..96009804b3 100644 --- a/board/zynqmp/kria/readme.txt +++ b/board/zynqmp/kria/readme.txt @@ -2,24 +2,29 @@ Xilinx Kria SOM Starter Kits - ZynqMP SoC ************************************************** -This document describes the Buildroot support for the Kria -KV260 and KR260 starter kits by Xilinx, based on Kria SOM including the +This document describes the Buildroot support for the Kria KD240, +KR260 and KV260 starter kits by Xilinx, based on Kria SOM including the Zynq UltraScale+ MPSoC (aka ZynqMP). It has been tested with -the KV260 and KR260 production boards. +the KD240, KR260 and KV260 production boards. Evaluation board features can be found here with the links below. -KV260: -https://www.xilinx.com/products/som/kria/kv260-vision-starter-kit.html +KD240: +https://www.xilinx.com/products/som/kria/kd240-drives-starter-kit.html KR260: https://www.xilinx.com/products/som/kria/kr260-robotics-starter-kit.html +KV260: +https://www.xilinx.com/products/som/kria/kv260-vision-starter-kit.html + How to build it =============== -Configure Buildroot: +Configure Buildroot: (use the command for the specific board) + $ make zynqmp_kria_kd240_defconfig + $ make zynqmp_kria_kr260_defconfig $ make zynqmp_kria_kv260_defconfig Compile everything and build the rootfs image: @@ -68,7 +73,7 @@ in that the boot.bin and u-boot.itb files need to be flashed into the QSPI boot flash such that U-Boot can then load all of the remaining images from the SD card. -In addition, the KV260 and KR260 Starter Kits QSPI comes pre-flashed with +In addition, the Kria Starter Kits QSPI comes pre-flashed with a utility designed to make updating the QSPI flash memory easier. @@ -94,7 +99,7 @@ Flashing boot.bin: $ sf erase 0x200000 +$filesize $ sf write 0x1000000 0x200000 $filesize -KR260 Flashing Instructions: +KD240 / KR260 Flashing Instructions: Flashing u-boot.itb: $ sf probe $ fatload usb 0 0x1000000 u-boot.itb diff --git a/configs/zynqmp_kria_kd240_defconfig b/configs/zynqmp_kria_kd240_defconfig new file mode 100644 index 0000000000..78302a48c0 --- /dev/null +++ b/configs/zynqmp_kria_kd240_defconfig @@ -0,0 +1,42 @@ +BR2_aarch64=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh board/zynqmp/kria/kd240/kd240.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS1,115200 sda2 ${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_v6.1_LTS_2023.2)/xlnx_rebase_v6.1_LTS_2023.2.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="xilinx" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-smk-k24-revA-sck-kd-g-revA" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.8_2023.2)/xlnx_rebase_v2.8_2023.2.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_v2023.01_2023.2)/xlnx_rebase_v2023.01_2023.2.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-k24-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/soc-prebuilt-firmware/raw/xilinx_v2023.2/kd240-kria/pmufw.elf" +BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/kria/kd240/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/patches board/zynqmp/kria/kd240/patches" From 3b0e7680cf59968f5adac6be8a68d0cdb9dd9e7f Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Mon, 11 Dec 2023 20:14:00 +0100 Subject: [PATCH 4193/5754] package/z3: bump to version 4.12.4 For change log since 4.12.2, see: https://github.com/Z3Prover/z3/blob/z3-4.12.4/RELEASE_NOTES.md#version-4124 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 bddf3066ba..c20bbce2d6 100644 --- a/package/z3/z3.hash +++ b/package/z3/z3.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9f58f3710bd2094085951a75791550f547903d75fe7e2fcb373c5f03fc761b8f z3-4.12.2.tar.gz +sha256 25e9b18d04ee22f1d872dfe0daaf4c39034744525214e34fedd206e25140e96e z3-4.12.4.tar.gz sha256 e617cad2ab9347e3129c2b171e87909332174e17961c5c3412d0799469111337 LICENSE.txt diff --git a/package/z3/z3.mk b/package/z3/z3.mk index 501d9ee61a..f9510ba592 100644 --- a/package/z3/z3.mk +++ b/package/z3/z3.mk @@ -4,7 +4,7 @@ # ################################################################################ -Z3_VERSION = 4.12.2 +Z3_VERSION = 4.12.4 Z3_SITE = $(call github,Z3Prover,z3,z3-$(Z3_VERSION)) Z3_LICENSE = MIT Z3_LICENSE_FILES = LICENSE.txt From e6ae6771287fdf1df2368230264a10f3763139f9 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Thu, 14 Dec 2023 23:12:26 +0100 Subject: [PATCH 4194/5754] DEVELOPERS: fix indentation on 2 entries Substitute spaces with tab on 2 entries for consistency. Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- DEVELOPERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 96f3214f94..311dcd9504 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -74,8 +74,8 @@ F: package/libmbim/ F: package/libqmi/ F: package/modem-manager/ -N: Alessandro Partesotti -F: package/oatpp/ +N: Alessandro Partesotti +F: package/oatpp/ N: Alex Michel F: package/libzenoh-pico/ From ea59fd8827d93689dfc418a8d6413bbc4aad7890 Mon Sep 17 00:00:00 2001 From: Xiangyu Chen Date: Fri, 15 Dec 2023 11:10:19 +0800 Subject: [PATCH 4195/5754] package/crun: bump to version 1.12 Changes: https://github.com/containers/crun/releases/tag/1.12 Also add a patch to fix crun compile without libseccomp libcap issue Signed-off-by: Xiangyu Chen Signed-off-by: Peter Korsgaard --- ...ile-error-without-libseccomp-and-lib.patch | 59 +++++++++++++++++++ package/crun/crun.hash | 2 +- package/crun/crun.mk | 2 +- 3 files changed, 61 insertions(+), 2 deletions(-) create mode 100644 package/crun/0001-libcrun-fix-compile-error-without-libseccomp-and-lib.patch diff --git a/package/crun/0001-libcrun-fix-compile-error-without-libseccomp-and-lib.patch b/package/crun/0001-libcrun-fix-compile-error-without-libseccomp-and-lib.patch new file mode 100644 index 0000000000..81b08d34b7 --- /dev/null +++ b/package/crun/0001-libcrun-fix-compile-error-without-libseccomp-and-lib.patch @@ -0,0 +1,59 @@ +From ea27b1363ef709ce4b169138017b67ef624b127b Mon Sep 17 00:00:00 2001 +From: Xiangyu Chen +Date: Tue, 12 Dec 2023 10:47:42 +0800 +Subject: [PATCH] libcrun: fix compile error without libseccomp and libcap + +Fixed compile error without libseccomp and libcap, running +clang-format to format the code style. + +Upstream: https://github.com/containers/crun/commit/ea27b1363ef709ce4b169138017b67ef624b127b +Signed-off-by: Xiangyu Chen +--- + src/libcrun/container.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/src/libcrun/container.c b/src/libcrun/container.c +index 34649f8..ffcdb24 100644 +--- a/src/libcrun/container.c ++++ b/src/libcrun/container.c +@@ -23,7 +23,9 @@ + #include "container.h" + #include "utils.h" + #include "seccomp.h" +-#include ++#ifdef HAVE_SECCOMP ++# include ++#endif + #include "scheduler.h" + #include "seccomp_notify.h" + #include "custom-handler.h" +@@ -47,7 +49,9 @@ + #include + #include + #include +-#include ++#ifdef HAVE_CAP ++# include ++#endif + #include + #include + #include +@@ -3829,6 +3833,7 @@ populate_array_field (char ***field, char *array[], size_t num_elements) + (*field)[i] = NULL; + } + ++#ifdef HAVE_CAP + static void + populate_capabilities (struct features_info_s *info, char ***capabilities, size_t *num_capabilities) + { +@@ -3876,6 +3881,7 @@ populate_capabilities (struct features_info_s *info, char ***capabilities, size_ + (*capabilities)[index] = NULL; // Terminate the array with NULL + populate_array_field (&(info->linux.capabilities), *capabilities, *num_capabilities); + } ++#endif + + static void + retrieve_mount_options (struct features_info_s **info) +-- +2.34.1 + diff --git a/package/crun/crun.hash b/package/crun/crun.hash index bdffb0c6aa..c461d78d97 100644 --- a/package/crun/crun.hash +++ b/package/crun/crun.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 5b8b5adb1dff7af768b69d2b0b4f2cd785ec931e7aa10138aa29812c46ee09ff crun-1.8.4.tar.gz +sha256 a76982ac076a5c9bf9f85bd8d25b1dc6344e252399a7e9231504357fc019f7cc crun-1.12.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.libcrun diff --git a/package/crun/crun.mk b/package/crun/crun.mk index 15438a44b3..a6088c13a0 100644 --- a/package/crun/crun.mk +++ b/package/crun/crun.mk @@ -4,7 +4,7 @@ # ################################################################################ -CRUN_VERSION = 1.8.4 +CRUN_VERSION = 1.12 CRUN_SITE = https://github.com/containers/crun/releases/download/$(CRUN_VERSION) CRUN_DEPENDENCIES = host-pkgconf yajl From 16fc7372512dd9bd199c394bfa54d74e852cc1b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?= Date: Tue, 12 Dec 2023 14:49:55 +0100 Subject: [PATCH 4196/5754] package/tree: update _SITE URL MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The current TREE_SITE URL doesn't work anymore. Moreover the README states: " The main distribution site for tree is here: http://oldmanprogrammer.net/source.php?dir=projects/tree Backup GIT sites are: https://gitlab.com/OldManProgrammer/unix-tree https://github.com/Old-Man-Programmer/tree Old site for as long as it lasts: http://mama.indstate.edu/users/ice/tree/ ftp://mama.indstate.edu/linux/tree/ " Use http://oldmanprogrammer.net/tar/tree/ for TREE_SITE Signed-off-by: Sébastien Szymanski Signed-off-by: Thomas Petazzoni --- package/tree/Config.in | 2 +- package/tree/tree.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tree/Config.in b/package/tree/Config.in index 234995f109..4821b58960 100644 --- a/package/tree/Config.in +++ b/package/tree/Config.in @@ -7,7 +7,7 @@ config BR2_PACKAGE_TREE dircolors if the LS_COLORS environment variable is set and output is to tty. - http://mama.indstate.edu/users/ice/tree/ + http://oldmanprogrammer.net/source.php?dir=projects/tree comment "tree needs a toolchain w/ wchar" depends on !BR2_USE_WCHAR diff --git a/package/tree/tree.mk b/package/tree/tree.mk index 83a427b74d..479a172a72 100644 --- a/package/tree/tree.mk +++ b/package/tree/tree.mk @@ -6,7 +6,7 @@ TREE_VERSION = 2.1.1 TREE_SOURCE = tree-$(TREE_VERSION).tgz -TREE_SITE = http://mama.indstate.edu/users/ice/tree/src +TREE_SITE = http://oldmanprogrammer.net/tar/tree TREE_LICENSE = GPL-2.0+ TREE_LICENSE_FILES = LICENSE From 7b71ce5018adb99c93e9b7d1fae4c2926c0fe130 Mon Sep 17 00:00:00 2001 From: Thomas Devoogdt Date: Tue, 12 Dec 2023 14:56:34 +0100 Subject: [PATCH 4197/5754] package/mesa3d: add compile patch for linux < 3.5 The kcmp() system call first appeared in linux 3.5, and was also not there before linux 5.12 if CONFIG_CHECKPOINT_RESTORE was not set. See: https://man7.org/linux/man-pages/man2/kcmp.2.html Signed-off-by: Thomas Devoogdt Signed-off-by: Thomas Petazzoni --- ...e_description-fix-unknown-linux-3.5-.patch | 68 +++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 package/mesa3d/0005-util-os_same_file_description-fix-unknown-linux-3.5-.patch diff --git a/package/mesa3d/0005-util-os_same_file_description-fix-unknown-linux-3.5-.patch b/package/mesa3d/0005-util-os_same_file_description-fix-unknown-linux-3.5-.patch new file mode 100644 index 0000000000..c011580f6b --- /dev/null +++ b/package/mesa3d/0005-util-os_same_file_description-fix-unknown-linux-3.5-.patch @@ -0,0 +1,68 @@ +From b60974fac8a2f4c85cbb2ca788fc4ec3e81998f9 Mon Sep 17 00:00:00 2001 +From: Thomas Devoogdt +Date: Tue, 17 Aug 2021 11:54:49 +0200 +Subject: [PATCH] util: os_same_file_description: fix unknown linux < 3.5 + syscall SYS_kcmp +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +https://man7.org/linux/man-pages/man2/kcmp.2.html + +The kcmp() system call first appeared in Linux 3.5. + +But was probably also not supported by all major platforms +at that time. So fallback to the check that is done for windows. + +Signed-off-by: Thomas Devoogdt +Acked-by: Yonggang Luo +Acked-by: Michel Dänzer +Upstream: https://gitlab.freedesktop.org/mesa/mesa/-/commit/3ef514982441ce496aa127611edd26b9867f4b95 +Signed-off-by: Thomas Devoogdt +--- + src/util/os_file.c | 18 ++++++------------ + 1 file changed, 6 insertions(+), 12 deletions(-) + +diff --git a/src/util/os_file.c b/src/util/os_file.c +index 5fb30f2d908..464425a9b87 100644 +--- a/src/util/os_file.c ++++ b/src/util/os_file.c +@@ -202,29 +202,23 @@ os_read_file(const char *filename, size_t *size) + /* copied from */ + #define KCMP_FILE 0 + ++#endif ++ + int + os_same_file_description(int fd1, int fd2) + { ++#ifdef SYS_kcmp + pid_t pid = getpid(); ++#endif + + /* Same file descriptor trivially implies same file description */ + if (fd1 == fd2) + return 0; + ++#ifdef SYS_kcmp + return syscall(SYS_kcmp, pid, pid, KCMP_FILE, fd1, fd2); +-} +- + #else +- +-int +-os_same_file_description(int fd1, int fd2) +-{ +- /* Same file descriptor trivially implies same file description */ +- if (fd1 == fd2) +- return 0; +- + /* Otherwise we can't tell */ + return -1; +-} +- + #endif ++} +-- +2.34.1 + From afa5c2da338a555ba0c11e5e352c987449288c0a Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Tue, 12 Dec 2023 14:23:29 -0700 Subject: [PATCH 4198/5754] package/firewalld: bump version to 2.0.2 Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- package/firewalld/firewalld.hash | 2 +- package/firewalld/firewalld.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/firewalld/firewalld.hash b/package/firewalld/firewalld.hash index 53bfed0347..cbd4c7685b 100644 --- a/package/firewalld/firewalld.hash +++ b/package/firewalld/firewalld.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 61022eec66fa7ea0561924dfe65d17bab5ec512b3559198a05048a32264612d1 firewalld-2.0.1.tar.gz +sha256 1433247299367f707279d50e0759ed27fbcc9bb973b7b2131e8cee96e006d96e firewalld-2.0.2.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/firewalld/firewalld.mk b/package/firewalld/firewalld.mk index 23ba1e6c2a..eae8afc27f 100644 --- a/package/firewalld/firewalld.mk +++ b/package/firewalld/firewalld.mk @@ -4,7 +4,7 @@ # ################################################################################ -FIREWALLD_VERSION = 2.0.1 +FIREWALLD_VERSION = 2.0.2 FIREWALLD_SITE = $(call github,firewalld,firewalld,v$(FIREWALLD_VERSION)) FIREWALLD_LICENSE = GPL-2.0 FIREWALLD_LICENSE_FILES = COPYING From 3ef6884e6d59744d83649170822a4829eed146fc Mon Sep 17 00:00:00 2001 From: Ralf Dragon Date: Tue, 12 Dec 2023 17:01:11 +0100 Subject: [PATCH 4199/5754] python-sip: fix compile error MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since the update of Python to version 3.11 in commit 738500c296c8b1206f20e94ca3e7c5932a6a0486 ("package/python3: bump to version 3.11.0"), python-sip fails to compile with: siplib.c: In function ‘sip_api_get_frame’: siplib.c:13750:22: error: invalid use of undefined type ‘struct _frame’ 13750 | frame = frame->f_back; This is due to a change in the Python C API, which is fixed by a new patch. The patch can't be upstreamed, as SIP 4.x is no longer maintained upstream. Fixes: http://autobuild.buildroot.net/results/7b01739e7514e48c06182bc1804b32497ce2e414/ Signed-off-by: Ralf Dragon [Thomas: improved commit log, reformatted patch using Git] Signed-off-by: Thomas Petazzoni --- ...02-siplib-fix-build-with-python-3.11.patch | 66 +++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 package/python-sip/0002-siplib-fix-build-with-python-3.11.patch diff --git a/package/python-sip/0002-siplib-fix-build-with-python-3.11.patch b/package/python-sip/0002-siplib-fix-build-with-python-3.11.patch new file mode 100644 index 0000000000..17c3e05314 --- /dev/null +++ b/package/python-sip/0002-siplib-fix-build-with-python-3.11.patch @@ -0,0 +1,66 @@ +From e8bbb7844c141b339ef0598decf2a808faa50f5e Mon Sep 17 00:00:00 2001 +From: Ralf Dragon +Date: Sun, 17 Dec 2023 22:55:17 +0100 +Subject: [PATCH] siplib: fix build with python >= 3.11 + +With python 3.11, the PyFrameObject structure members have been +removed from the public C API: + +https://docs.python.org/3.11/whatsnew/3.11.html#whatsnew311-c-api-porting +https://docs.python.org/3.11/whatsnew/3.11.html#pyframeobject-3-11-hiding + +This patch migrates to the opaque PyFrameObject. + +Upstream: Not Applicable, SIP 4.x is no longer maintained +Signed-off-by: Ralf Dragon +--- + siplib/sip.h | 2 +- + siplib/siplib.c | 8 ++++---- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/siplib/sip.h b/siplib/sip.h +index 251b122..b9d8ea2 100644 +--- a/siplib/sip.h ++++ b/siplib/sip.h +@@ -1799,7 +1799,7 @@ typedef struct _sipAPIDef { + int (*api_get_time)(PyObject *, sipTimeDef *); + PyObject *(*api_from_time)(const sipTimeDef *); + int (*api_is_user_type)(const sipWrapperType *); +- struct _frame *(*api_get_frame)(int); ++ PyFrameObject *(*api_get_frame)(int); + int (*api_check_plugin_for_type)(const sipTypeDef *, const char *); + PyObject *(*api_unicode_new)(SIP_SSIZE_T, unsigned, int *, void **); + void (*api_unicode_write)(int, void *, int, unsigned); +diff --git a/siplib/siplib.c b/siplib/siplib.c +index db52b68..a297855 100644 +--- a/siplib/siplib.c ++++ b/siplib/siplib.c +@@ -448,7 +448,7 @@ static PyObject *sip_api_from_datetime(const sipDateDef *date, + static int sip_api_get_time(PyObject *obj, sipTimeDef *time); + static PyObject *sip_api_from_time(const sipTimeDef *time); + static int sip_api_is_user_type(const sipWrapperType *wt); +-static struct _frame *sip_api_get_frame(int); ++static PyFrameObject *sip_api_get_frame(int); + static int sip_api_check_plugin_for_type(const sipTypeDef *td, + const char *name); + static PyObject *sip_api_unicode_new(SIP_SSIZE_T len, unsigned maxchar, +@@ -13741,13 +13741,13 @@ static int sip_api_is_user_type(const sipWrapperType *wt) + /* + * Return a frame from the execution stack. + */ +-static struct _frame *sip_api_get_frame(int depth) ++static PyFrameObject *sip_api_get_frame(int depth) + { +- struct _frame *frame = PyEval_GetFrame(); ++ PyFrameObject *frame = PyEval_GetFrame(); + + while (frame != NULL && depth > 0) + { +- frame = frame->f_back; ++ frame = PyFrame_GetBack(frame); + --depth; + } + +-- +2.43.0 + From 41e2828c4163c7480dd31d6c8c3955c123a0f2e7 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 4 Dec 2023 18:41:19 +0100 Subject: [PATCH 4200/5754] package/perl: bump to version 5.38.2 The README file has seen some cosmetic changes that do not affect the licensing terms. Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/perl/perl.hash | 10 +++++----- package/perl/perl.mk | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/perl/perl.hash b/package/perl/perl.hash index 983b921e27..91abcdeb92 100644 --- a/package/perl/perl.hash +++ b/package/perl/perl.hash @@ -1,7 +1,7 @@ -# 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 +# Hashes from: https://www.cpan.org/src/5.0/perl-5.38.2.tar.xz.{md5,sha1,sha256}.txt +md5 d3957d75042918a23ec0abac4a2b7e0a perl-5.38.2.tar.xz +sha1 af1d5f9e0499f3cfa4736433631aebf7624714da perl-5.38.2.tar.xz +sha256 d91115e90b896520e83d4de6b52f8254ef2b70a8d545ffab33200ea9f1cf29e8 perl-5.38.2.tar.xz # 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 @@ -9,4 +9,4 @@ sha256 584dc54c48dca25e032b676a15bef377c1fed9de318b4fc140292a5dbf326e90 perl-c # Locally calculated sha256 dd90d4f42e4dcadf5a7c09eea0189d93c7b37ae560c91f0f6d5233ed3b9292a2 Artistic sha256 d77d235e41d54594865151f4751e835c5a82322b0e87ace266567c3391a4b912 Copying -sha256 810c97bea10842d2e47bc79e51acdfa1628cfee34fa0d89330f4eb3a44e3def9 README +sha256 9519aaeeac509b3fa8778155a63545b6086f8313546b93fe9958d1c434d476a8 README diff --git a/package/perl/perl.mk b/package/perl/perl.mk index 71aef9997b..9de0425e87 100644 --- a/package/perl/perl.mk +++ b/package/perl/perl.mk @@ -5,8 +5,8 @@ ################################################################################ # When updating the version here, also update utils/scancpan -PERL_VERSION_MAJOR = 36 -PERL_VERSION = 5.$(PERL_VERSION_MAJOR).3 +PERL_VERSION_MAJOR = 38 +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+ From 25564f5e77acf85e3198d8e3ec66d3e1579469e5 Mon Sep 17 00:00:00 2001 From: Marcus Folkesson Date: Mon, 18 Dec 2023 07:59:16 +0100 Subject: [PATCH 4201/5754] package/libostree: bump to version 2023.8 Signed-off-by: Marcus Folkesson Signed-off-by: Peter Korsgaard --- 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 2d8284a99f..d4645c593f 100644 --- a/package/libostree/libostree.hash +++ b/package/libostree/libostree.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 19cda718705f7ac8c018c939c38b1bb8412deaaa04862da98cd9fe9243f073bf libostree-2023.7.tar.xz +sha256 b6fffc267188e40d60755e6d7f2be65831795baa53b0fd9dd6c6809c7e54796d libostree-2023.8.tar.xz sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/libostree/libostree.mk b/package/libostree/libostree.mk index c1bd5886bf..d13f484041 100644 --- a/package/libostree/libostree.mk +++ b/package/libostree/libostree.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOSTREE_VERSION = 2023.7 +LIBOSTREE_VERSION = 2023.8 LIBOSTREE_SOURCE = libostree-$(LIBOSTREE_VERSION).tar.xz LIBOSTREE_SITE = https://github.com/ostreedev/ostree/releases/download/v$(LIBOSTREE_VERSION) From 9f8d62c955268f6d187e44798d60d6c421880bda Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 17 Dec 2023 18:22:23 +0100 Subject: [PATCH 4202/5754] package/tor: security bump version to 0.4.8.10 Release notes: https://gitlab.torproject.org/tpo/core/tor/-/raw/release-0.4.8/ReleaseNotes https://forum.torproject.org/t/security-release-0-4-8-10/10536 Fixes TROVE-2023-007. 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 dafa6d43d8..8cc8eb435f 100644 --- a/package/tor/tor.hash +++ b/package/tor/tor.hash @@ -1,4 +1,4 @@ -# From https://dist.torproject.org/tor-0.4.8.9.tar.gz.sha256sum -sha256 59bb7d8890f6131b4ce5344f3dcea5deb2182b7f4f10ff0cb4e4d81f11b2cf65 tor-0.4.8.9.tar.gz +# From https://dist.torproject.org/tor-0.4.8.10.tar.gz.sha256sum +sha256 e628b4fab70edb4727715b23cf2931375a9f7685ac08f2c59ea498a178463a86 tor-0.4.8.10.tar.gz # Locally computed sha256 47b54ed17e8fdcab3c44729a1789a09b208f9a63a845a7e50def9df729eebad0 LICENSE diff --git a/package/tor/tor.mk b/package/tor/tor.mk index 455ba2b551..12dcf3f07c 100644 --- a/package/tor/tor.mk +++ b/package/tor/tor.mk @@ -4,7 +4,7 @@ # ################################################################################ -TOR_VERSION = 0.4.8.9 +TOR_VERSION = 0.4.8.10 TOR_SITE = https://dist.torproject.org TOR_LICENSE = BSD-3-Clause TOR_LICENSE_FILES = LICENSE From fffb245f66bc5d86623000e8e41d2e0057915100 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 17 Dec 2023 18:18:20 +0100 Subject: [PATCH 4203/5754] package/linux-headers: drop 6.5.x option The 6.5.x series is now EOL upstream, so drop the linux-headers option and add legacy handling for it. Signed-off-by: Bernd Kuhls [Peter: drop option from linux-headers/Config.host.in] 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 312d53943c..4689226290 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_5 + bool "kernel headers version 6.5.x are no longer supported" + select BR2_LEGACY + help + Version 6.5.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + config BR2_PACKAGE_PYTHON_PYXB bool "python-pyxb removed" select BR2_LEGACY diff --git a/linux/linux.hash b/linux/linux.hash index ed9c6143db..9572acda2d 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 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 be2bee8b346f3ccb35879f16c80a323edda571e36190403805c14a9ea24e4a47 linux-5.15.140.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 344acc9cde..b00d5743a3 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_5 - bool "Linux 6.5.x kernel headers" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_5 - config BR2_KERNEL_HEADERS_6_6 bool "Linux 6.6.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6 @@ -418,7 +414,6 @@ config BR2_DEFAULT_KERNEL_HEADERS 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 From 7d8585605ef7eb18bcfc21f18a4e3cb9c0146b5e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 17 Dec 2023 18:18:21 +0100 Subject: [PATCH 4204/5754] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.{1, 6}.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 ae734c49a0..f076ef5b5e 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.6.3" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.6.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 9572acda2d..4bd5261439 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 28edfc3d4f90cd738f2a20f5a2d68510268176d6111f6278d8f495edfd9495a7 linux-6.6.3.tar.xz -sha256 629daa38f3ea67f29610bfbd53f9f38f46834d3654451e9474100490c66dc7e7 linux-6.1.64.tar.xz +sha256 0ce68ec6019019140043263520955ecd04839e55a1baab2fa9155b42bb6fd841 linux-6.6.7.tar.xz +sha256 365ff26a30e206de9b18489f45d38582a0a61b7c5919f8ab89295a47316784e1 linux-6.1.68.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 be2bee8b346f3ccb35879f16c80a323edda571e36190403805c14a9ea24e4a47 linux-5.15.140.tar.xz -sha256 3212e0299d699dd6089505b1428bcb00643fbf19af69806e37fad22bfe12fa8b linux-5.10.202.tar.xz -sha256 7d3eaa0744456ab4b062e6da8764f776b6939b89a1dfccbe11fbeef9c6e864dc linux-5.4.262.tar.xz +sha256 096bb16ec07232f27f6a07998c41b655883a8d0a6bb613d39bf524a9ffd99e02 linux-5.15.143.tar.xz +sha256 ff950750b1060f65c0dde7d4d89238937d80faddf3bcf9ba28189d917daccaee linux-5.10.204.tar.xz +sha256 d39c90dd9297a36aab7246b516f61e21493826004011f161090bce84db21b6b0 linux-5.4.264.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 a8419582886120407f57d39280ef8a9b22aab9725c83c4fe25ecca4712d59346 linux-4.19.300.tar.xz -sha256 39dcdceecad2ca7347e2b2e7e30a189558c0a1700f793822389bb1fd9a40530f linux-4.14.331.tar.xz +sha256 53d33c0042eff3700b7f59bdac06295c98c50056fce72f630438974b46bd73ce linux-4.19.302.tar.xz +sha256 66337a2afdc32e5935294139765c99ef878eedbfe1495f3f3625c23cadcab648 linux-4.14.333.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 b00d5743a3..a3d8247cea 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -408,13 +408,13 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - 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.6.3" if BR2_KERNEL_HEADERS_6_6 + default "4.14.333" if BR2_KERNEL_HEADERS_4_14 + default "4.19.302" if BR2_KERNEL_HEADERS_4_19 + default "5.4.264" if BR2_KERNEL_HEADERS_5_4 + default "5.10.204" if BR2_KERNEL_HEADERS_5_10 + default "5.15.143" if BR2_KERNEL_HEADERS_5_15 + default "6.1.68" if BR2_KERNEL_HEADERS_6_1 + default "6.6.7" 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 faec3ca30e358575f70a036879029f63f7da9b29 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 4 Dec 2023 22:10:13 +0100 Subject: [PATCH 4205/5754] package/exim: bump version to 4.97 Removed patches which are included in this release: https://git.exim.org/exim.git/commitdiff/4e9ed49f8f12eb331b29bd5b6dc3693c520fddc2 https://git.exim.org/exim.git/commitdiff/d8ecc7bf97934a1e2244788c610c958cacd740bd https://git.exim.org/exim.git/commitdiff/158dff9936e36a2d31d037d3988b9353458d6471 https://git.exim.org/exim.git/commitdiff/32da6327e434e986a18b75a84f2d8c687ba14619 Added upstream patch to fix build error. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 4 - ...Fix-regex-n-use-after-free.-Bug-2915.patch | 173 ------------------ .../0006-OpenSSL-fix-non-DANE-build.patch | 28 +++ ...0007-Fix-non-WITH_CONTENT_SCAN-build.patch | 61 ------ ...08-Fix-non-WITH_CONTENT_SCAN-build-2.patch | 139 -------------- ...09-Fix-non-WITH_CONTENT_SCAN-build-3.patch | 49 ----- package/exim/exim.hash | 4 +- package/exim/exim.mk | 2 +- 8 files changed, 31 insertions(+), 429 deletions(-) delete mode 100644 package/exim/0006-Fix-regex-n-use-after-free.-Bug-2915.patch create mode 100644 package/exim/0006-OpenSSL-fix-non-DANE-build.patch delete mode 100644 package/exim/0007-Fix-non-WITH_CONTENT_SCAN-build.patch delete mode 100644 package/exim/0008-Fix-non-WITH_CONTENT_SCAN-build-2.patch delete mode 100644 package/exim/0009-Fix-non-WITH_CONTENT_SCAN-build-3.patch diff --git a/.checkpackageignore b/.checkpackageignore index db7271b629..12a4c35c09 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -389,10 +389,6 @@ 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 diff --git a/package/exim/0006-Fix-regex-n-use-after-free.-Bug-2915.patch b/package/exim/0006-Fix-regex-n-use-after-free.-Bug-2915.patch deleted file mode 100644 index 57fa189b04..0000000000 --- a/package/exim/0006-Fix-regex-n-use-after-free.-Bug-2915.patch +++ /dev/null @@ -1,173 +0,0 @@ -From 4e9ed49f8f12eb331b29bd5b6dc3693c520fddc2 Mon Sep 17 00:00:00 2001 -From: Jeremy Harris -Date: Wed, 31 Aug 2022 15:37:40 +0100 -Subject: [PATCH] Fix $regex use-after-free. Bug 2915 - -[Upstream: https://sources.debian.org/data/main/e/exim4/4.96-9/debian/patches/75_08-Fix-regex-n-use-after-free.-Bug-2915.patch] -[Peter: drop Changelog hunk] -Signed-off-by: Peter Korsgaard ---- - src/exim.c | 4 +--- - src/expand.c | 2 +- - src/functions.h | 1 + - src/globals.c | 2 +- - src/regex.c | 29 ++++++++++++++++++----------- - src/smtp_in.c | 2 ++ - test/confs/4002 | 10 ++++++++++ - test/mail/4002.userx | 7 +++++++ - test/scripts/4000-scanning/4002 | 7 +++++++ - 9 files changed, 53 insertions(+), 17 deletions(-) - ---- a/src/exim.c -+++ b/src/exim.c -@@ -1999,12 +1999,10 @@ - - regex_whitelisted_macro = - regex_must_compile(US"^[A-Za-z0-9_/.-]*$", FALSE, TRUE); - #endif - --for (i = 0; i < REGEX_VARS; i++) regex_vars[i] = NULL; -- - /* If the program is called as "mailq" treat it as equivalent to "exim -bp"; - this seems to be a generally accepted convention, since one finds symbolic - links called "mailq" in standard OS configurations. */ - - if ((namelen == 5 && Ustrcmp(argv[0], "mailq") == 0) || -@@ -6082,11 +6080,11 @@ - callout_address = NULL; - sending_ip_address = NULL; - deliver_localpart_data = deliver_domain_data = - recipient_data = sender_data = NULL; - acl_var_m = NULL; -- for(int i = 0; i < REGEX_VARS; i++) regex_vars[i] = NULL; -+ regex_vars_clear(); - - store_reset(reset_point); - } - - exim_exit(EXIT_SUCCESS); /* Never returns */ ---- a/src/expand.c -+++ b/src/expand.c -@@ -1871,11 +1871,11 @@ - { - tree_node * node = tree_search(router_var, name + 2); - return node ? node->data.ptr : strict_acl_vars ? NULL : US""; - } - --/* Handle $auth variables. */ -+/* Handle $auth, $regex variables. */ - - if (Ustrncmp(name, "auth", 4) == 0) - { - uschar *endptr; - int n = Ustrtoul(name + 4, &endptr, 10); ---- a/src/functions.h -+++ b/src/functions.h -@@ -436,10 +436,11 @@ - extern int regex(const uschar **); - #endif - extern BOOL regex_match(const pcre2_code *, const uschar *, int, uschar **); - extern BOOL regex_match_and_setup(const pcre2_code *, const uschar *, int, int); - extern const pcre2_code *regex_must_compile(const uschar *, BOOL, BOOL); -+extern void regex_vars_clear(void); - extern void retry_add_item(address_item *, uschar *, int); - extern BOOL retry_check_address(const uschar *, host_item *, uschar *, BOOL, - uschar **, uschar **); - extern retry_config *retry_find_config(const uschar *, const uschar *, int, int); - extern BOOL retry_ultimate_address_timeout(uschar *, const uschar *, ---- a/src/globals.c -+++ b/src/globals.c -@@ -1313,11 +1313,11 @@ - #ifndef DISABLE_PIPE_CONNECT - const pcre2_code *regex_EARLY_PIPE = NULL; - #endif - const pcre2_code *regex_ismsgid = NULL; - const pcre2_code *regex_smtp_code = NULL; --const uschar *regex_vars[REGEX_VARS]; -+const uschar *regex_vars[REGEX_VARS] = { 0 };; - #ifdef WHITELIST_D_MACROS - const pcre2_code *regex_whitelisted_macro = NULL; - #endif - #ifdef WITH_CONTENT_SCAN - uschar *regex_match_string = NULL; ---- a/src/regex.c -+++ b/src/regex.c -@@ -94,22 +94,32 @@ - } - pcre2_match_data_free(md); - return FAIL; - } - -+ -+/* reset expansion variables */ -+void -+regex_vars_clear(void) -+{ -+regex_match_string = NULL; -+for (int i = 0; i < REGEX_VARS; i++) regex_vars[i] = NULL; -+} -+ -+ -+ - int --regex(const uschar **listptr) -+regex(const uschar ** listptr) - { - unsigned long mbox_size; --FILE *mbox_file; --pcre_list *re_list_head; --uschar *linebuffer; -+FILE * mbox_file; -+pcre_list * re_list_head; -+uschar * linebuffer; - long f_pos = 0; - int ret = FAIL; - --/* reset expansion variable */ --regex_match_string = NULL; -+regex_vars_clear(); - - if (!mime_stream) /* We are in the DATA ACL */ - { - if (!(mbox_file = spool_mbox(&mbox_size, NULL, NULL))) - { /* error while spooling */ -@@ -167,18 +177,17 @@ - - - int - mime_regex(const uschar **listptr) - { --pcre_list *re_list_head = NULL; --FILE *f; --uschar *mime_subject = NULL; -+pcre_list * re_list_head = NULL; -+FILE * f; -+uschar * mime_subject = NULL; - int mime_subject_len = 0; - int ret; - --/* reset expansion variable */ --regex_match_string = NULL; -+regex_vars_clear(); - - /* precompile our regexes */ - if (!(re_list_head = compile(*listptr))) - return FAIL; /* no regexes -> nothing to do */ - ---- a/src/smtp_in.c -+++ b/src/smtp_in.c -@@ -2155,12 +2155,14 @@ - prdr_requested = FALSE; - #endif - #ifdef SUPPORT_I18N - message_smtputf8 = FALSE; - #endif -+regex_vars_clear(); - body_linecount = body_zerocount = 0; - -+lookup_value = NULL; /* Can be set by ACL */ - sender_rate = sender_rate_limit = sender_rate_period = NULL; - ratelimiters_mail = NULL; /* Updated by ratelimit ACL condition */ - /* Note that ratelimiters_conn persists across resets. */ - - /* Reset message ACL variables */ diff --git a/package/exim/0006-OpenSSL-fix-non-DANE-build.patch b/package/exim/0006-OpenSSL-fix-non-DANE-build.patch new file mode 100644 index 0000000000..8ae63d2226 --- /dev/null +++ b/package/exim/0006-OpenSSL-fix-non-DANE-build.patch @@ -0,0 +1,28 @@ +From 37b849dca4dfd855212a763662825e967a4d77b1 Mon Sep 17 00:00:00 2001 +From: Jeremy Harris +Date: Tue, 7 Nov 2023 15:02:18 +0000 +Subject: [PATCH] OpenSSL: fix non-DANE build + +Upstream: https://git.exim.org/exim.git/commitdiff/37b849dca4dfd855212a763662825e967a4d77b1 + +Signed-off-by: Bernd Kuhls +--- + src/tls-openssl.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/src/tls-openssl.c b/src/src/tls-openssl.c +index ef11de593..851ac77c5 100644 +--- a/src/tls-openssl.c ++++ b/src/tls-openssl.c +@@ -2605,7 +2605,7 @@ if (!(bs = OCSP_response_get1_basic(rsp))) + asking for certificate-status under DANE, so this callback won't run for + that combination. It still will for non-DANE. */ + +-#ifdef EXIM_HAVE_OPENSSL_OCSP_RESP_GET0_SIGNER ++#if defined(EXIM_HAVE_OPENSSL_OCSP_RESP_GET0_SIGNER) && defined(SUPPORT_DANE) + X509 * signer; + + if ( tls_out.dane_verified +-- +2.30.2 + diff --git a/package/exim/0007-Fix-non-WITH_CONTENT_SCAN-build.patch b/package/exim/0007-Fix-non-WITH_CONTENT_SCAN-build.patch deleted file mode 100644 index 9f87f18e00..0000000000 --- a/package/exim/0007-Fix-non-WITH_CONTENT_SCAN-build.patch +++ /dev/null @@ -1,61 +0,0 @@ -From d8ecc7bf97934a1e2244788c610c958cacd740bd Mon Sep 17 00:00:00 2001 -From: Jeremy Harris -Date: Wed, 31 Aug 2022 17:03:37 +0100 -Subject: [PATCH] Fix non-WITH_CONTENT_SCAN build. - -Broken-by: 4e9ed49f8f - -[Upstream: https://sources.debian.org/data/main/e/exim4/4.96-9/debian/patches/75_09-Fix-non-WITH_CONTENT_SCAN-build.patch] -Signed-off-by: Peter Korsgaard ---- - src/exim.c | 11 +++++++++++ - src/regex.c | 10 ---------- - 2 files changed, 11 insertions(+), 10 deletions(-) - ---- a/src/exim.c -+++ b/src/exim.c -@@ -1677,10 +1677,21 @@ - if ((s = expand_string(big_buffer))) printf("%s\n", CS s); - else printf("Failed: %s\n", expand_string_message); - } - - -+/* reset regex expansion variables */ -+void -+regex_vars_clear(void) -+{ -+regex_match_string = NULL; -+for (int i = 0; i < REGEX_VARS; i++) regex_vars[i] = NULL; -+} -+ -+ -+ -+ - - /************************************************* - * Entry point and high-level code * - *************************************************/ - ---- a/src/regex.c -+++ b/src/regex.c -@@ -95,20 +95,10 @@ - pcre2_match_data_free(md); - return FAIL; - } - - --/* reset expansion variables */ --void --regex_vars_clear(void) --{ --regex_match_string = NULL; --for (int i = 0; i < REGEX_VARS; i++) regex_vars[i] = NULL; --} -- -- -- - int - regex(const uschar ** listptr) - { - unsigned long mbox_size; - FILE * mbox_file; diff --git a/package/exim/0008-Fix-non-WITH_CONTENT_SCAN-build-2.patch b/package/exim/0008-Fix-non-WITH_CONTENT_SCAN-build-2.patch deleted file mode 100644 index 43cc1d79a9..0000000000 --- a/package/exim/0008-Fix-non-WITH_CONTENT_SCAN-build-2.patch +++ /dev/null @@ -1,139 +0,0 @@ -From 158dff9936e36a2d31d037d3988b9353458d6471 Mon Sep 17 00:00:00 2001 -From: Jeremy Harris -Date: Wed, 31 Aug 2022 17:17:59 +0100 -Subject: [PATCH] Fix non-WITH_CONTENT_SCAN build (2) - -Broken-by: d8ecc7bf97 - -[Upstream: https://sources.debian.org/data/main/e/exim4/4.96-9/debian/patches/75_10-Fix-non-WITH_CONTENT_SCAN-build-2.patch] -[Peter: drop Changelog hunk] -Signed-off-by: Peter Korsgaard ---- - src/exim.c | 13 +------------ - src/functions.h | 2 +- - src/globals.h | 2 +- - src/regex.c | 10 ++++++++++ - src/smtp_in.c | 2 ++ - 5 files changed, 15 insertions(+), 14 deletions(-) - ---- a/src/exim.c -+++ b/src/exim.c -@@ -1677,21 +1677,10 @@ - if ((s = expand_string(big_buffer))) printf("%s\n", CS s); - else printf("Failed: %s\n", expand_string_message); - } - - --/* reset regex expansion variables */ --void --regex_vars_clear(void) --{ --regex_match_string = NULL; --for (int i = 0; i < REGEX_VARS; i++) regex_vars[i] = NULL; --} -- -- -- -- - - /************************************************* - * Entry point and high-level code * - *************************************************/ - -@@ -6085,17 +6074,17 @@ - deliver_domain_orig = NULL; - deliver_host = deliver_host_address = NULL; - dnslist_domain = dnslist_matched = NULL; - #ifdef WITH_CONTENT_SCAN - malware_name = NULL; -+ regex_vars_clear(); - #endif - callout_address = NULL; - sending_ip_address = NULL; - deliver_localpart_data = deliver_domain_data = - recipient_data = sender_data = NULL; - acl_var_m = NULL; -- regex_vars_clear(); - - store_reset(reset_point); - } - - exim_exit(EXIT_SUCCESS); /* Never returns */ ---- a/src/functions.h -+++ b/src/functions.h -@@ -432,15 +432,15 @@ - extern BOOL receive_msg(BOOL); - extern int_eximarith_t receive_statvfs(BOOL, int *); - extern void receive_swallow_smtp(void); - #ifdef WITH_CONTENT_SCAN - extern int regex(const uschar **); -+extern void regex_vars_clear(void); - #endif - extern BOOL regex_match(const pcre2_code *, const uschar *, int, uschar **); - extern BOOL regex_match_and_setup(const pcre2_code *, const uschar *, int, int); - extern const pcre2_code *regex_must_compile(const uschar *, BOOL, BOOL); --extern void regex_vars_clear(void); - extern void retry_add_item(address_item *, uschar *, int); - extern BOOL retry_check_address(const uschar *, host_item *, uschar *, BOOL, - uschar **, uschar **); - extern retry_config *retry_find_config(const uschar *, const uschar *, int, int); - extern BOOL retry_ultimate_address_timeout(uschar *, const uschar *, ---- a/src/globals.h -+++ b/src/globals.h -@@ -895,16 +895,16 @@ - #ifndef DISABLE_PIPE_CONNECT - extern const pcre2_code *regex_EARLY_PIPE; /* For recognizing PIPE_CONNCT */ - #endif - extern const pcre2_code *regex_ismsgid; /* Compiled r.e. for message ID */ - extern const pcre2_code *regex_smtp_code; /* For recognizing SMTP codes */ --extern const uschar *regex_vars[]; /* $regexN variables */ - #ifdef WHITELIST_D_MACROS - extern const pcre2_code *regex_whitelisted_macro; /* For -D macro values */ - #endif - #ifdef WITH_CONTENT_SCAN - extern uschar *regex_match_string; /* regex that matched a line (regex ACL condition) */ -+extern const uschar *regex_vars[]; - #endif - extern int remote_delivery_count; /* Number of remote addresses */ - extern int remote_max_parallel; /* Maximum parallel delivery */ - extern uschar *remote_sort_domains; /* Remote domain sorting order */ - extern retry_config *retries; /* Chain of retry config information */ ---- a/src/regex.c -+++ b/src/regex.c -@@ -95,10 +95,20 @@ - pcre2_match_data_free(md); - return FAIL; - } - - -+/* reset expansion variables */ -+void -+regex_vars_clear(void) -+{ -+regex_match_string = NULL; -+for (int i = 0; i < REGEX_VARS; i++) regex_vars[i] = NULL; -+} -+ -+ -+ - int - regex(const uschar ** listptr) - { - unsigned long mbox_size; - FILE * mbox_file; ---- a/src/smtp_in.c -+++ b/src/smtp_in.c -@@ -2155,11 +2155,13 @@ - prdr_requested = FALSE; - #endif - #ifdef SUPPORT_I18N - message_smtputf8 = FALSE; - #endif -+#ifdef WITH_CONTENT_SCAN - regex_vars_clear(); -+#endif - body_linecount = body_zerocount = 0; - - lookup_value = NULL; /* Can be set by ACL */ - sender_rate = sender_rate_limit = sender_rate_period = NULL; - ratelimiters_mail = NULL; /* Updated by ratelimit ACL condition */ diff --git a/package/exim/0009-Fix-non-WITH_CONTENT_SCAN-build-3.patch b/package/exim/0009-Fix-non-WITH_CONTENT_SCAN-build-3.patch deleted file mode 100644 index f9675c80d3..0000000000 --- a/package/exim/0009-Fix-non-WITH_CONTENT_SCAN-build-3.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 32da6327e434e986a18b75a84f2d8c687ba14619 Mon Sep 17 00:00:00 2001 -From: Jeremy Harris -Date: Thu, 1 Sep 2022 15:54:35 +0100 -Subject: [PATCH] Fix non-WITH_CONTENT_SCAN build (3) - -Broken-by: d8ecc7bf97 - -[Upstream: https://sources.debian.org/data/main/e/exim4/4.96-9/debian/patches/75_11-Fix-non-WITH_CONTENT_SCAN-build-3.patch] -[Peter: drop Changelog hunk] -Signed-off-by: Peter Korsgaard ---- - src/expand.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/expand.c b/src/expand.c -index 89de56255..831ca2b75 100644 ---- a/src/expand.c -+++ b/src/expand.c -@@ -1869,6 +1869,7 @@ if (Ustrncmp(name, "auth", 4) == 0) - if (!*endptr && n != 0 && n <= AUTH_VARS) - return auth_vars[n-1] ? auth_vars[n-1] : US""; - } -+#ifdef WITH_CONTENT_SCAN - else if (Ustrncmp(name, "regex", 5) == 0) - { - uschar *endptr; -@@ -1876,6 +1877,7 @@ else if (Ustrncmp(name, "regex", 5) == 0) - if (!*endptr && n != 0 && n <= REGEX_VARS) - return regex_vars[n-1] ? regex_vars[n-1] : US""; - } -+#endif - - /* For all other variables, search the table */ - -@@ -8715,9 +8717,11 @@ assert_variable_notin() treats as const, so deconst is safe. */ - for (int i = 0; i < AUTH_VARS; i++) if (auth_vars[i]) - assert_variable_notin(US"auth", US auth_vars[i], &e); - -+#ifdef WITH_CONTENT_SCAN - /* check regex variables. assert_variable_notin() treats as const. */ - for (int i = 0; i < REGEX_VARS; i++) if (regex_vars[i]) - assert_variable_notin(US"regex", US regex_vars[i], &e); -+#endif - - /* check known-name variables */ - for (var_entry * v = var_table; v < var_table + var_table_size; v++) --- -2.35.1 - diff --git a/package/exim/exim.hash b/package/exim/exim.hash index e784bf7521..6336a40427 100644 --- a/package/exim/exim.hash +++ b/package/exim/exim.hash @@ -1,6 +1,6 @@ # From https://ftp.exim.org/pub/exim/exim4/00-sha256sums.txt -sha256 038e327e8d1e93d005bac9bb06fd22aec44d5028930d6dbe8817ad44bbfc1de6 exim-4.96.2.tar.xz +sha256 428150e67c494fa14fe5195d81b972c1b23e651ee4f9f2ff1788250266d31e9c exim-4.97.tar.xz # From https://ftp.exim.org/pub/exim/exim4/00-sha512sums.txt -sha512 dc9f6a114e64ac826489edff88d50a24195b64714428e691c10a7bfb119b3ebb6455bf80cbb34dfd0a4e2e44cbde72effb009357a8e0a6065e512fe32092e3ed exim-4.96.2.tar.xz +sha512 b28cbb49fa7e143dfcc94e004d57cf98a1945013e676cd103c1ee4cf52933d49d378baa13bea2663353dba97745d6b2ab8b7b66cde870788a2d85d7abd716968 exim-4.97.tar.xz # Locally calculated sha256 49240db527b7e55b312a46fc59794fde5dd006422e422257f4f057bfd27b3c8f LICENCE diff --git a/package/exim/exim.mk b/package/exim/exim.mk index 166a4ead54..23d888e6f2 100644 --- a/package/exim/exim.mk +++ b/package/exim/exim.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXIM_VERSION = 4.96.2 +EXIM_VERSION = 4.97 EXIM_SOURCE = exim-$(EXIM_VERSION).tar.xz EXIM_SITE = https://ftp.exim.org/pub/exim/exim4 EXIM_LICENSE = GPL-2.0+ From 973b1eba5a4ee72f040bd471b147267e36be73ad Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 4 Dec 2023 22:11:22 +0100 Subject: [PATCH 4206/5754] package/libopenssl: bump version to 3.2.0 Release notes: https://www.openssl.org/blog/blog/2023/11/23/OpenSSL32/ Removed patch 0001 and added no-docs configure option due to https://github.com/openssl/openssl/commit/956b4c75dc3f8710bf7b4e1cf01b4ef6d5ca2b45 Removed patch 0003 due to https://github.com/openssl/openssl/commit/78634e8ac253a8edf338d329965724dfa8e033ab Removed patch 0006 which is included in this release https://github.com/openssl/openssl/commit/e1b6ecbab41514f45e9c355d01400691f74041c4 Renumbered remaining patches. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 5 ++- ...building-manpages-if-we-re-not-going.patch | 33 ------------------- ...ble-build-do-not-leak-compiler-path.patch} | 0 ...v2-ABI-on-some-ppc64-big-endian-sys.patch} | 0 ...ENSSL_NO_MADVISE-to-disable-call-to-.patch | 27 --------------- ...ch => 0003-Revert-Fix-static-builds.patch} | 0 .../0006-Add-linux-x86-latomic-target.patch | 30 ----------------- package/libopenssl/libopenssl.hash | 4 +-- package/libopenssl/libopenssl.mk | 4 ++- 9 files changed, 7 insertions(+), 96 deletions(-) delete mode 100644 package/libopenssl/0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch rename package/libopenssl/{0002-Reproducible-build-do-not-leak-compiler-path.patch => 0001-Reproducible-build-do-not-leak-compiler-path.patch} (100%) rename package/libopenssl/{0004-Configure-use-ELFv2-ABI-on-some-ppc64-big-endian-sys.patch => 0002-Configure-use-ELFv2-ABI-on-some-ppc64-big-endian-sys.patch} (100%) delete mode 100644 package/libopenssl/0003-Introduce-the-OPENSSL_NO_MADVISE-to-disable-call-to-.patch rename package/libopenssl/{0005-Revert-Fix-static-builds.patch => 0003-Revert-Fix-static-builds.patch} (100%) delete mode 100644 package/libopenssl/0006-Add-linux-x86-latomic-target.patch diff --git a/.checkpackageignore b/.checkpackageignore index 12a4c35c09..962fa705ad 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -700,9 +700,8 @@ package/libnss/0001-Bug-1801182-Allow-overriding-OS_ARCH-OS_TEST-and-OS_.patch U 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/0001-Reproducible-build-do-not-leak-compiler-path.patch Upstream +package/libopenssl/0002-Configure-use-ELFv2-ABI-on-some-ppc64-big-endian-sys.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 deleted file mode 100644 index ed4590dd55..0000000000 --- a/package/libopenssl/0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch +++ /dev/null @@ -1,33 +0,0 @@ -From d8f104bffb0c4acb8c5fcdf49628f7d02ed48f7f Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Sat, 16 May 2015 18:53:51 +0200 -Subject: [PATCH] Dont waste time building manpages if we're not going to use - em. - -Signed-off-by: Ryan Barnett -[Gustavo: update for parallel-build] - -[rebased on openssl-1.1.0h] -Signed-off-by: Peter Seiderer -[rebased on openssl-1.1.1i] -Signed-off-by: Bernd Kuhls ---- - Configurations/unix-Makefile.tmpl | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl -index 40cf2c3..777d9ca 100644 ---- a/Configurations/unix-Makefile.tmpl -+++ b/Configurations/unix-Makefile.tmpl -@@ -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 {- $disabled{fips} ? "" : "install_fips" -} -+install: install_sw install_ssldirs {- $disabled{fips} ? "" : "install_fips" -} - - 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/0001-Reproducible-build-do-not-leak-compiler-path.patch similarity index 100% rename from package/libopenssl/0002-Reproducible-build-do-not-leak-compiler-path.patch rename to package/libopenssl/0001-Reproducible-build-do-not-leak-compiler-path.patch diff --git a/package/libopenssl/0004-Configure-use-ELFv2-ABI-on-some-ppc64-big-endian-sys.patch b/package/libopenssl/0002-Configure-use-ELFv2-ABI-on-some-ppc64-big-endian-sys.patch similarity index 100% rename from package/libopenssl/0004-Configure-use-ELFv2-ABI-on-some-ppc64-big-endian-sys.patch rename to package/libopenssl/0002-Configure-use-ELFv2-ABI-on-some-ppc64-big-endian-sys.patch 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 deleted file mode 100644 index 425adea5d8..0000000000 --- a/package/libopenssl/0003-Introduce-the-OPENSSL_NO_MADVISE-to-disable-call-to-.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 1281ffc7959bd2070563e17a52ee4424196d885c Mon Sep 17 00:00:00 2001 -From: Patrick Havelange -Date: Wed, 23 Jan 2019 12:21:21 +0100 -Subject: [PATCH] Introduce the OPENSSL_NO_MADVISE to disable call to madvise() - -Upstream: https://github.com/openssl/openssl/pull/8089 -Signed-off-by: Patrick Havelange ---- - crypto/mem_sec.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -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 -@@ -557,7 +557,7 @@ static int sh_init(size_t size, int minsize) - if (mlock(sh.arena, sh.arena_size) < 0) - ret = 2; - #endif --#ifdef MADV_DONTDUMP -+#if defined(MADV_DONTDUMP) && !defined(OPENSSL_NO_MADVISE) - if (madvise(sh.arena, sh.arena_size, MADV_DONTDUMP) < 0) - ret = 2; - #endif --- -2.17.1 - diff --git a/package/libopenssl/0005-Revert-Fix-static-builds.patch b/package/libopenssl/0003-Revert-Fix-static-builds.patch similarity index 100% rename from package/libopenssl/0005-Revert-Fix-static-builds.patch rename to package/libopenssl/0003-Revert-Fix-static-builds.patch diff --git a/package/libopenssl/0006-Add-linux-x86-latomic-target.patch b/package/libopenssl/0006-Add-linux-x86-latomic-target.patch deleted file mode 100644 index 9ecc50b1ae..0000000000 --- a/package/libopenssl/0006-Add-linux-x86-latomic-target.patch +++ /dev/null @@ -1,30 +0,0 @@ -From c80a60dca209813c33ab3d2794bc32d84c12d033 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Fri, 28 Jul 2023 17:11:25 +0200 -Subject: [PATCH] Add linux-x86-latomic target - -Upstream: https://github.com/openssl/openssl/pull/21590 - -Signed-off-by: Bernd Kuhls ---- - Configurations/10-main.conf | 4 ++++ - 1 file changed, 4 insertions(+) - -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 -@@ -868,6 +868,10 @@ my %targets = ( - asm_arch => 'x86', - perlasm_scheme => "elf", - }, -+ "linux-x86-latomic" => { -+ inherit_from => [ "linux-x86" ], -+ ex_libs => add(threads("-latomic")), -+ }, - "linux-x86-clang" => { - inherit_from => [ "linux-x86" ], - CC => "clang", --- -2.39.2 - diff --git a/package/libopenssl/libopenssl.hash b/package/libopenssl/libopenssl.hash index 29ced7cddd..9e09e12461 100644 --- a/package/libopenssl/libopenssl.hash +++ b/package/libopenssl/libopenssl.hash @@ -1,5 +1,5 @@ -# From https://www.openssl.org/source/openssl-3.1.4.tar.gz.sha256 -sha256 840af5366ab9b522bde525826be3ef0fb0af81c6a9ebd84caa600fea1731eee3 openssl-3.1.4.tar.gz +# From https://www.openssl.org/source/openssl-3.2.0.tar.gz.sha256 +sha256 14c826f07c7e433706fb5c69fa9e25dab95684844b4c962a2cf1bf183eb4690e openssl-3.2.0.tar.gz # License files sha256 7d5450cb2d142651b8afa315b5f238efc805dad827d91ba367d8516bc9d49e7a LICENSE.txt diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index b8b6ec6bff..928f3379f8 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOPENSSL_VERSION = 3.1.4 +LIBOPENSSL_VERSION = 3.2.0 LIBOPENSSL_SITE = https://www.openssl.org/source LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz LIBOPENSSL_LICENSE = Apache-2.0 @@ -57,6 +57,7 @@ define HOST_LIBOPENSSL_CONFIGURE_CMDS ./config \ --prefix=$(HOST_DIR) \ --openssldir=$(HOST_DIR)/etc/ssl \ + no-docs \ no-tests \ no-fuzz-libfuzzer \ no-fuzz-afl \ @@ -78,6 +79,7 @@ define LIBOPENSSL_CONFIGURE_CMDS $(if $(BR2_PACKAGE_CRYPTODEV_LINUX),enable-devcryptoeng) \ no-rc5 \ enable-camellia \ + no-docs \ no-tests \ no-fuzz-libfuzzer \ no-fuzz-afl \ From 5714126edac88e3adc043a482b262b319a907dd3 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 4 Dec 2023 22:13:00 +0100 Subject: [PATCH 4207/5754] package/libheif: bump version to 1.17.5 Release notes: https://github.com/strukturag/libheif/releases Added configure support for new codec plugins introduced in version 1.17.0: https://github.com/strukturag/libheif/releases/tag/v1.17.0 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libheif/libheif.hash | 2 +- package/libheif/libheif.mk | 30 +++++++++++++++++++++++++++++- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/package/libheif/libheif.hash b/package/libheif/libheif.hash index 50152abde5..6ea3ba6eec 100644 --- a/package/libheif/libheif.hash +++ b/package/libheif/libheif.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 7f97e4205c0bd9f9b8560536c8bd2e841d1c9a6d610401eb3eb87ed9cdfe78ea libheif-1.16.2.tar.gz +sha256 38ab01938ef419dbebb98346dc0b1c8bb503a0449ea61a0e409a988786c2af5b libheif-1.17.5.tar.gz sha256 b2eb4f6588b005bebac44cfb2dfd23f6a16c5ca9b8a619a315158b0215a917a3 COPYING diff --git a/package/libheif/libheif.mk b/package/libheif/libheif.mk index 65e64a02f7..419a864ef3 100644 --- a/package/libheif/libheif.mk +++ b/package/libheif/libheif.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBHEIF_VERSION = 1.16.2 +LIBHEIF_VERSION = 1.17.5 LIBHEIF_SITE = https://github.com/strukturag/libheif/releases/download/v$(LIBHEIF_VERSION) LIBHEIF_LICENSE = LGPL-3.0+ LIBHEIF_LICENSE_FILES = COPYING @@ -30,6 +30,20 @@ else LIBHEIF_CONF_OPTS += -DWITH_DAV1D=OFF endif +ifeq ($(BR2_PACKAGE_FFMPEG),y) +LIBHEIF_CONF_OPTS += -DWITH_FFMPEG_DECODER=ON +LIBHEIF_DEPENDENCIES += ffmpeg +else +LIBHEIF_CONF_OPTS += -DWITH_FFMPEG_DECODER=OFF +endif + +ifeq ($(BR2_PACKAGE_KVAZAAR),y) +LIBHEIF_CONF_OPTS += -DWITH_KVAZAAR=ON +LIBHEIF_DEPENDENCIES += kvazaar +else +LIBHEIF_CONF_OPTS += -DWITH_KVAZAAR=OFF +endif + ifeq ($(BR2_PACKAGE_LIBDE265),y) LIBHEIF_CONF_OPTS += -DWITH_LIBDE265=ON LIBHEIF_DEPENDENCIES += libde265 @@ -37,6 +51,20 @@ else LIBHEIF_CONF_OPTS += -DWITH_LIBDE265=OFF endif +ifeq ($(BR2_PACKAGE_LIBJPEG),y) +LIBHEIF_CONF_OPTS += -DWITH_JPEG_DECODER=ON -DWITH_JPEG_ENCODER=ON +LIBHEIF_DEPENDENCIES += libjpeg +else +LIBHEIF_CONF_OPTS += -DWITH_JPEG_DECODER=OFF -DWITH_JPEG_ENCODER=OFF +endif + +ifeq ($(BR2_PACKAGE_OPENJPEG),y) +LIBHEIF_CONF_OPTS += -DWITH_OpenJPEG_DECODER=ON -DWITH_OpenJPEG_ENCODER=ON +LIBHEIF_DEPENDENCIES += openjpeg +else +LIBHEIF_CONF_OPTS += -DWITH_OpenJPEG_DECODER=OFF -DWITH_OpenJPEG_ENCODER=OFF +endif + ifeq ($(BR2_PACKAGE_X265),y) LIBHEIF_CONF_OPTS += -DWITH_X265=ON LIBHEIF_DEPENDENCIES += x265 From 4221e1068360ca4315593974d7bef79ec9f9c14e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 4 Dec 2023 22:13:59 +0100 Subject: [PATCH 4208/5754] package/gettext-gnu: bump version to 0.22.4 Release notes: https://git.savannah.gnu.org/gitweb/?p=gettext.git;a=commitdiff;h=08f342937a09ce41977e8ceecc23509e4b330490 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/gettext-gnu/gettext-gnu.hash | 2 +- package/gettext-gnu/gettext-gnu.mk | 2 +- package/gettext-tiny/gettext-tiny.hash | 2 +- package/gettext-tiny/gettext-tiny.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/gettext-gnu/gettext-gnu.hash b/package/gettext-gnu/gettext-gnu.hash index f307b4a9fd..7c649843f4 100644 --- a/package/gettext-gnu/gettext-gnu.hash +++ b/package/gettext-gnu/gettext-gnu.hash @@ -1,5 +1,5 @@ # Please keep in sync with package/gettext-tiny/gettext-tiny.hash # Locally calculated -sha256 b838228b3f8823a6c1eddf07297197c4db13f7e1b173b9ef93f3f945a63080b6 gettext-0.22.3.tar.xz +sha256 29217f1816ee2e777fa9a01f9956a14139c0c23cc1b20368f06b2888e8a34116 gettext-0.22.4.tar.xz sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b COPYING sha256 3fe5361f24b7c49ba12911c08f5a33f9cb18871d95d9fb881f5b8a4793e04288 gettext-runtime/intl/COPYING.LIB diff --git a/package/gettext-gnu/gettext-gnu.mk b/package/gettext-gnu/gettext-gnu.mk index 35b79d1926..b7d0cf213c 100644 --- a/package/gettext-gnu/gettext-gnu.mk +++ b/package/gettext-gnu/gettext-gnu.mk @@ -6,7 +6,7 @@ # Please keep in sync with GETTEXT_TINY_ARCHIVE_VERSION in # gettext-tiny/gettext-tiny.mk -GETTEXT_GNU_VERSION = 0.22.3 +GETTEXT_GNU_VERSION = 0.22.4 GETTEXT_GNU_SITE = $(BR2_GNU_MIRROR)/gettext GETTEXT_GNU_SOURCE = gettext-$(GETTEXT_GNU_VERSION).tar.xz GETTEXT_GNU_INSTALL_STAGING = YES diff --git a/package/gettext-tiny/gettext-tiny.hash b/package/gettext-tiny/gettext-tiny.hash index a72b0c35e4..f7ed50b49f 100644 --- a/package/gettext-tiny/gettext-tiny.hash +++ b/package/gettext-tiny/gettext-tiny.hash @@ -3,4 +3,4 @@ sha256 29cc165e27e83d2bb3760118c2368eadab550830d962d758e51bd36eb860f383 gettex sha256 4c938aa3d8fa3c184bba5e87a8a2febc89560627c9d0567536879e3eca1a7b4f LICENSE sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b extra/COPYING # Locally Computed: -sha256 b838228b3f8823a6c1eddf07297197c4db13f7e1b173b9ef93f3f945a63080b6 gettext-0.22.3.tar.xz +sha256 29217f1816ee2e777fa9a01f9956a14139c0c23cc1b20368f06b2888e8a34116 gettext-0.22.4.tar.xz diff --git a/package/gettext-tiny/gettext-tiny.mk b/package/gettext-tiny/gettext-tiny.mk index e4a3625c5a..3fe8a781d9 100644 --- a/package/gettext-tiny/gettext-tiny.mk +++ b/package/gettext-tiny/gettext-tiny.mk @@ -15,7 +15,7 @@ GETTEXT_TINY_PROVIDES = gettext # needed for gettextize # Please keep in sync with package/gettext-gnu/gettext-gnu.mk -GETTEXT_TINY_ARCHIVE_VERSION = 0.22.3 +GETTEXT_TINY_ARCHIVE_VERSION = 0.22.4 GETTEXT_TINY_EXTRA_GETTEXT_FILES = \ gettext-tools/misc/gettextize.in \ From a91ad89fe3e4a28ca5ae2ce6e9bada243aa55456 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 4 Dec 2023 22:14:29 +0100 Subject: [PATCH 4209/5754] package/gnutls: bump version to 3.8.2 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 a6ba6b22c6..6ad363f01d 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.1.tar.xz.sig -sha256 ba8b9e15ae20aba88f44661978f5b5863494316fe7e722ede9d069fe6294829c gnutls-3.8.1.tar.xz +# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8/gnutls-3.8.2.tar.xz.sig +sha256 e765e5016ffa9b9dd243e363a0460d577074444ee2491267db2e96c9c2adef77 gnutls-3.8.2.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 d9b9831fd6..3e9987cdce 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).1 +GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).2 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 e779df7dc9f49ab5643266ab6b53db0ab19bb051 Mon Sep 17 00:00:00 2001 From: Maxim Kochetkov Date: Tue, 5 Dec 2023 08:52:20 +0300 Subject: [PATCH 4210/5754] package/timescaledb: bump version to 2.13.0 Release notes: https://github.com/timescale/timescaledb/blob/2.13.0/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 ae1d3db1e1..b7e4c71774 100644 --- a/package/timescaledb/timescaledb.hash +++ b/package/timescaledb/timescaledb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d24cd29aad411d3e41d543d1a30827c48f8e01a48563650db5fac145ad7a01eb timescaledb-2.12.2.tar.gz +sha256 584a351c7775f0e067eaa0e7277ea88cab9077cc4c455cbbf09a5d9723dce95d timescaledb-2.13.0.tar.gz sha256 0378e0948feefd85f579319c74d6e2b671194037f550c7176ef26649d94c895b LICENSE diff --git a/package/timescaledb/timescaledb.mk b/package/timescaledb/timescaledb.mk index adae1c2bae..34a48ad0c3 100644 --- a/package/timescaledb/timescaledb.mk +++ b/package/timescaledb/timescaledb.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIMESCALEDB_VERSION = 2.12.2 +TIMESCALEDB_VERSION = 2.13.0 TIMESCALEDB_SITE = $(call github,timescale,timescaledb,$(TIMESCALEDB_VERSION)) TIMESCALEDB_LICENSE = Apache-2.0 TIMESCALEDB_LICENSE_FILES = LICENSE From 4a93a8319637ebb8be33c126da28242201d6fa70 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Tue, 5 Dec 2023 16:59:17 -0700 Subject: [PATCH 4211/5754] package/giflib/0002-Fix-CVE-2022-28506.patch: New security patch Signed-off-by: Adam Duskett [yann.morin.1998@free.fr: add GIFLIB_IGNORE_CVES] Signed-off-by: Yann E. MORIN --- package/giflib/0002-Fix-CVE-2022-28506.patch | 34 ++++++++++++++++++++ package/giflib/giflib.mk | 3 ++ 2 files changed, 37 insertions(+) create mode 100644 package/giflib/0002-Fix-CVE-2022-28506.patch diff --git a/package/giflib/0002-Fix-CVE-2022-28506.patch b/package/giflib/0002-Fix-CVE-2022-28506.patch new file mode 100644 index 0000000000..35d5f60a95 --- /dev/null +++ b/package/giflib/0002-Fix-CVE-2022-28506.patch @@ -0,0 +1,34 @@ +From c0cca041fc4fb6748d8dff3675fe7a839253d668 Mon Sep 17 00:00:00 2001 +From: Sandro Mani +Date: Tue, 5 Dec 2023 16:24:32 -0700 +Subject: [PATCH] Fix CVE-2022-28506 + +From: giflib-5.2.1-17.fc39.src.rpm +Fixes https://nvd.nist.gov/vuln/detail/CVE-2022-28506 +Upstream: https://sourceforge.net/p/giflib/bugs/159/ + +Signed-off-by: Sandro Mani +Signed-off-by: Adam Duskett +--- + gif2rgb.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/gif2rgb.c b/gif2rgb.c +index 8d7c0ff..d9a469f 100644 +--- a/gif2rgb.c ++++ b/gif2rgb.c +@@ -294,6 +294,11 @@ static void DumpScreen2RGB(char *FileName, int OneFileFlag, + GifRow = ScreenBuffer[i]; + GifQprintf("\b\b\b\b%-4d", ScreenHeight - i); + for (j = 0, BufferP = Buffer; j < ScreenWidth; j++) { ++ /* Check if color is within color palete */ ++ if (GifRow[j] >= ColorMap->ColorCount) ++ { ++ GIF_EXIT(GifErrorString(D_GIF_ERR_IMAGE_DEFECT)); ++ } + ColorMapEntry = &ColorMap->Colors[GifRow[j]]; + *BufferP++ = ColorMapEntry->Red; + *BufferP++ = ColorMapEntry->Green; +-- +2.43.0 + diff --git a/package/giflib/giflib.mk b/package/giflib/giflib.mk index d47edfaa8b..1207eafa16 100644 --- a/package/giflib/giflib.mk +++ b/package/giflib/giflib.mk @@ -11,6 +11,9 @@ GIFLIB_LICENSE = MIT GIFLIB_LICENSE_FILES = COPYING GIFLIB_CPE_ID_VENDOR = giflib_project +# 0002-Fix-CVE-2022-28506.patch +GIFLIB_IGNORE_CVES = CVE-2022-28506 + ifeq ($(BR2_STATIC_LIBS),y) GIFLIB_BUILD_LIBS = static-lib GIFLIB_INSTALL_LIBS = install-static-lib From 74253ffee576ea809f7eeb380647345a2ff910be Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Tue, 5 Dec 2023 16:59:18 -0700 Subject: [PATCH 4212/5754] package/giflib/0003-Fix-CVE-2023-39742.patch: New security patch Signed-off-by: Adam Duskett [yann.morin.1998@free.fr: extend GIFLIB_IGNORE_CVES] Signed-off-by: Yann E. MORIN --- package/giflib/0003-Fix-CVE-2023-39742.patch | 36 ++++++++++++++++++++ package/giflib/giflib.mk | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 package/giflib/0003-Fix-CVE-2023-39742.patch diff --git a/package/giflib/0003-Fix-CVE-2023-39742.patch b/package/giflib/0003-Fix-CVE-2023-39742.patch new file mode 100644 index 0000000000..2ba01ac8a4 --- /dev/null +++ b/package/giflib/0003-Fix-CVE-2023-39742.patch @@ -0,0 +1,36 @@ +From 4288b993ee9df6550a367fe06ede3c003dc7bbc6 Mon Sep 17 00:00:00 2001 +From: Sandro Mani +Date: Tue, 5 Dec 2023 16:35:40 -0700 +Subject: [PATCH] Fix CVE-2023-39742 + +From: giflib-5.2.1-17.fc39.src.rpm +Fix segmentation faults due to non correct checking for args +Fixes: https://nvd.nist.gov/vuln/detail/CVE-2023-39742 +Upstream: https://sourceforge.net/p/giflib/bugs/166/ + +Signed-off-by: Sandro Mani +Signed-off-by: Adam Duskett +--- + getarg.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/getarg.c b/getarg.c +index d569f6c..51fbe0b 100644 +--- a/getarg.c ++++ b/getarg.c +@@ -307,6 +307,12 @@ GAGetParmeters(void *Parameters[], + int i = 0, ScanRes; + + while (!(ISSPACE(CtrlStrCopy[i]))) { ++ ++ if ((*argv) == argv_end) { ++ GAErrorToken = Option; ++ return CMD_ERR_NumRead; ++ } ++ + switch (CtrlStrCopy[i + 1]) { + case 'd': /* Get signed integers. */ + ScanRes = sscanf(*((*argv)++), "%d", +-- +2.43.0 + diff --git a/package/giflib/giflib.mk b/package/giflib/giflib.mk index 1207eafa16..d91c77e2ee 100644 --- a/package/giflib/giflib.mk +++ b/package/giflib/giflib.mk @@ -13,6 +13,8 @@ GIFLIB_CPE_ID_VENDOR = giflib_project # 0002-Fix-CVE-2022-28506.patch GIFLIB_IGNORE_CVES = CVE-2022-28506 +# 0003-Fix-CVE-2023-39742.patch +GIFLIB_IGNORE_CVES += CVE-2023-39742 ifeq ($(BR2_STATIC_LIBS),y) GIFLIB_BUILD_LIBS = static-lib From df04f179761614f3bccaf208d688ec4e2f64e38d Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Tue, 5 Dec 2023 16:59:19 -0700 Subject: [PATCH 4213/5754] package/giflib/0004-Fix-several-defects-found-by-Coverity-scan.patch: New security patch Signed-off-by: Adam Duskett Signed-off-by: Yann E. MORIN --- ...veral-defects-found-by-Coverity-scan.patch | 61 +++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 package/giflib/0004-Fix-several-defects-found-by-Coverity-scan.patch diff --git a/package/giflib/0004-Fix-several-defects-found-by-Coverity-scan.patch b/package/giflib/0004-Fix-several-defects-found-by-Coverity-scan.patch new file mode 100644 index 0000000000..1719769872 --- /dev/null +++ b/package/giflib/0004-Fix-several-defects-found-by-Coverity-scan.patch @@ -0,0 +1,61 @@ +From a1c48b91cd1cf1e9bf7077709b69f4bfd4c4abc7 Mon Sep 17 00:00:00 2001 +From: Sandro Mani +Date: Tue, 5 Dec 2023 16:38:48 -0700 +Subject: [PATCH] Fix several defects found by Coverity scan + +From: giflib-5.2.1-17.fc39.src.rpm +Upstream: Not submitted + +Signed-off-by: Sandro Mani +Signed-off-by: Adam Duskett +--- + gif2rgb.c | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git a/gif2rgb.c b/gif2rgb.c +index d9a469f..02cea41 100644 +--- a/gif2rgb.c ++++ b/gif2rgb.c +@@ -170,6 +170,8 @@ static void SaveGif(GifByteType *OutputBuffer, + /* Open stdout for the output file: */ + if ((GifFile = EGifOpenFileHandle(1, &Error)) == NULL) { + PrintGifError(Error); ++ free(OutputBuffer); ++ GifFreeMapObject(OutputColorMap); + exit(EXIT_FAILURE); + } + +@@ -179,6 +181,8 @@ static void SaveGif(GifByteType *OutputBuffer, + EGifPutImageDesc(GifFile, + 0, 0, Width, Height, false, NULL) == GIF_ERROR) { + PrintGifError(Error); ++ free(OutputBuffer); ++ GifFreeMapObject(OutputColorMap); + exit(EXIT_FAILURE); + } + +@@ -187,8 +191,11 @@ static void SaveGif(GifByteType *OutputBuffer, + GifFile->Image.Width, GifFile->Image.Height); + + for (i = 0; i < Height; i++) { +- if (EGifPutLine(GifFile, Ptr, Width) == GIF_ERROR) ++ if (EGifPutLine(GifFile, Ptr, Width) == GIF_ERROR) { ++ free(OutputBuffer); ++ GifFreeMapObject(OutputColorMap); + exit(EXIT_FAILURE); ++ } + GifQprintf("\b\b\b\b%-4d", Height - i - 1); + + Ptr += Width; +@@ -196,6 +203,8 @@ static void SaveGif(GifByteType *OutputBuffer, + + if (EGifCloseFile(GifFile, &Error) == GIF_ERROR) { + PrintGifError(Error); ++ free(OutputBuffer); ++ GifFreeMapObject(OutputColorMap); + exit(EXIT_FAILURE); + } + } +-- +2.43.0 + From 6985955a69b87b20e952c3c8cfc48ce2511100be Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 18 Dec 2023 13:50:25 +0100 Subject: [PATCH 4214/5754] package/jq: security bump to version 1.7.1 Fixes the following security issues: CVE-2023-50246: Fix heap buffer overflow in jvp_literal_number_literal https://github.com/jqlang/jq/security/advisories/GHSA-686w-5m7m-54vc CVE-2023-50268: fix stack-buffer-overflow if comparing nan with payload https://github.com/jqlang/jq/security/advisories/GHSA-7hmr-442f-qc8j Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/jq/jq.hash | 2 +- package/jq/jq.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/jq/jq.hash b/package/jq/jq.hash index 6c2db98e87..d4d8656ea0 100644 --- a/package/jq/jq.hash +++ b/package/jq/jq.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 402a0d6975d946e6f4e484d1a84320414a0ff8eb6cf49d2c11d144d4d344db62 jq-1.7.tar.gz +sha256 478c9ca129fd2e3443fe27314b455e211e0d8c60bc8ff7df703873deeee580c2 jq-1.7.1.tar.gz sha256 10e974638a41fadfd72357f2f3a4325e20b856c563365128f72feaa406f8c92d COPYING diff --git a/package/jq/jq.mk b/package/jq/jq.mk index d886459dcc..8c417fad31 100644 --- a/package/jq/jq.mk +++ b/package/jq/jq.mk @@ -4,7 +4,7 @@ # ################################################################################ -JQ_VERSION = 1.7 +JQ_VERSION = 1.7.1 JQ_SITE = https://github.com/jqlang/jq/releases/download/jq-$(JQ_VERSION) JQ_LICENSE = MIT (code), ICU (decNumber), CC-BY-3.0 (documentation) JQ_LICENSE_FILES = COPYING From 3c207c40eb0215cb51a756f94c755e31c72d0734 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 18 Dec 2023 13:28:40 +0100 Subject: [PATCH 4215/5754] package/uclibc: update to 1.0.45 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Git shortlog: Ben Wolsieffer (3): fork: generate stub on no-MMU systems arm: elf-fdpic.h: avoid void pointer subtraction libpthread/nptl: make default stack size configurable Greg Ungerer (1): elf: support ELF binaries in noMMU Marcus Haehnel (3): fnmatch: fix possible access beyond of parameter string getaddrinfo.c: Avoid misleading indentation warning linuxthreads: Avoid unused variable warning Marcus Hähnel (1): setjmp.h: Fix C++ build and avoid duplicate throw declaration Max Filippov (1): daemon.c: make _fork_parent static inline again Paul Iannetta (1): kvx: fix asm syntax Pavel Kozlov (6): setrlimit/getrlimit: fix prlimit64 syscall use for 32-bit CPUs Fix -Warray-parameter warning for __sigsetjmp prlimit: add name redirection and fix incorrect parameters to syscall arc: add acq/rel variants for atomic cmpxchg/xchg arc: remove read ahead in asm strcmp code for ARCHS rlimit: fix 64-bit RLIM64_INFINITY macro Waldemar Brodkorb (8): aarch64: add hwcap header file fcntl.h: declare f_owner_ex for all architectures arm: add hwcap header file lm32: disable ctor/dtor aarch64: disable lazy relocations riscv64: define __NR_riscv_flush_icache if not available depend on __UCLIBC_HAVE_STATX__ bump version for 1.0.45 release Yann Sionneau (9): fstatat64: define it as a wrapper of statx if the kernel does not support fstatat64 syscall fstat: add missing return value statement for the statx wrapping case add support for systems without legacy setrlimit/getrlimit syscalls fstatat: add wrapper that uses statx for non-legacy arch kvx: add support for kv3-2 (Coolidge v2 SoC) kvx: atomic: rework using compiler builtins kvx: align specification of user regs kvx: define that kvx port supports statx syscall kvx: use a custom stat.h header lordrasmus (8): add vsdo support fix file permissions fix getauxval() on aarch64 gcc 11 vdso support missing file c6x compile fix vdso support gettimeofday() only include ldso.h if vdso support is activated vdso support for x86_64 gitignore Signed-off-by: Waldemar Brodkorb Signed-off-by: Yann E. MORIN --- .../0001-aarch64-add-hwcap-header-file.patch | 163 ------------------ ...are-f_owner_ex-for-all-architectures.patch | 85 --------- package/uclibc/uclibc.hash | 4 +- package/uclibc/uclibc.mk | 2 +- 4 files changed, 3 insertions(+), 251 deletions(-) delete mode 100644 package/uclibc/0001-aarch64-add-hwcap-header-file.patch delete mode 100644 package/uclibc/0002-fcntl.h-declare-f_owner_ex-for-all-architectures.patch diff --git a/package/uclibc/0001-aarch64-add-hwcap-header-file.patch b/package/uclibc/0001-aarch64-add-hwcap-header-file.patch deleted file mode 100644 index 058e3242f9..0000000000 --- a/package/uclibc/0001-aarch64-add-hwcap-header-file.patch +++ /dev/null @@ -1,163 +0,0 @@ -From becd0cbc4168534e311f47dda6f67450ad0006b5 Mon Sep 17 00:00:00 2001 -From: Waldemar Brodkorb -Date: Tue, 8 Aug 2023 13:47:27 +0200 -Subject: [PATCH] aarch64: add hwcap header file - -Signed-off-by: Waldemar Brodkorb -Upstream: https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/commit/?id=becd0cbc4168534e311f47dda6f67450ad0006b5 ---- - include/sys/auxv.h | 1 + - libc/sysdeps/linux/aarch64/bits/hwcap.h | 99 +++++++++++++++++++++++++ - libc/sysdeps/linux/common/bits/hwcap.h | 22 ++++++ - 3 files changed, 122 insertions(+) - create mode 100644 libc/sysdeps/linux/aarch64/bits/hwcap.h - create mode 100644 libc/sysdeps/linux/common/bits/hwcap.h - -diff --git a/include/sys/auxv.h b/include/sys/auxv.h -index f35196423..b07026457 100644 ---- a/include/sys/auxv.h -+++ b/include/sys/auxv.h -@@ -20,6 +20,7 @@ - - #include - #include -+#include - - __BEGIN_DECLS - -diff --git a/libc/sysdeps/linux/aarch64/bits/hwcap.h b/libc/sysdeps/linux/aarch64/bits/hwcap.h -new file mode 100644 -index 000000000..20061f5d1 ---- /dev/null -+++ b/libc/sysdeps/linux/aarch64/bits/hwcap.h -@@ -0,0 +1,99 @@ -+/* Defines for bits in AT_HWCAP. AArch64 Linux version. -+ Copyright (C) 2016-2023 Free Software Foundation, Inc. -+ -+ 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 -+ . */ -+ -+#if !defined (_SYS_AUXV_H) -+# error "Never include directly; use instead." -+#endif -+ -+/* The following must match the kernel's and update the -+ list together with sysdeps/unix/sysv/linux/aarch64/dl-procinfo.c. */ -+#define HWCAP_FP (1 << 0) -+#define HWCAP_ASIMD (1 << 1) -+#define HWCAP_EVTSTRM (1 << 2) -+#define HWCAP_AES (1 << 3) -+#define HWCAP_PMULL (1 << 4) -+#define HWCAP_SHA1 (1 << 5) -+#define HWCAP_SHA2 (1 << 6) -+#define HWCAP_CRC32 (1 << 7) -+#define HWCAP_ATOMICS (1 << 8) -+#define HWCAP_FPHP (1 << 9) -+#define HWCAP_ASIMDHP (1 << 10) -+#define HWCAP_CPUID (1 << 11) -+#define HWCAP_ASIMDRDM (1 << 12) -+#define HWCAP_JSCVT (1 << 13) -+#define HWCAP_FCMA (1 << 14) -+#define HWCAP_LRCPC (1 << 15) -+#define HWCAP_DCPOP (1 << 16) -+#define HWCAP_SHA3 (1 << 17) -+#define HWCAP_SM3 (1 << 18) -+#define HWCAP_SM4 (1 << 19) -+#define HWCAP_ASIMDDP (1 << 20) -+#define HWCAP_SHA512 (1 << 21) -+#define HWCAP_SVE (1 << 22) -+#define HWCAP_ASIMDFHM (1 << 23) -+#define HWCAP_DIT (1 << 24) -+#define HWCAP_USCAT (1 << 25) -+#define HWCAP_ILRCPC (1 << 26) -+#define HWCAP_FLAGM (1 << 27) -+#define HWCAP_SSBS (1 << 28) -+#define HWCAP_SB (1 << 29) -+#define HWCAP_PACA (1 << 30) -+#define HWCAP_PACG (1UL << 31) -+ -+#define HWCAP2_DCPODP (1 << 0) -+#define HWCAP2_SVE2 (1 << 1) -+#define HWCAP2_SVEAES (1 << 2) -+#define HWCAP2_SVEPMULL (1 << 3) -+#define HWCAP2_SVEBITPERM (1 << 4) -+#define HWCAP2_SVESHA3 (1 << 5) -+#define HWCAP2_SVESM4 (1 << 6) -+#define HWCAP2_FLAGM2 (1 << 7) -+#define HWCAP2_FRINT (1 << 8) -+#define HWCAP2_SVEI8MM (1 << 9) -+#define HWCAP2_SVEF32MM (1 << 10) -+#define HWCAP2_SVEF64MM (1 << 11) -+#define HWCAP2_SVEBF16 (1 << 12) -+#define HWCAP2_I8MM (1 << 13) -+#define HWCAP2_BF16 (1 << 14) -+#define HWCAP2_DGH (1 << 15) -+#define HWCAP2_RNG (1 << 16) -+#define HWCAP2_BTI (1 << 17) -+#define HWCAP2_MTE (1 << 18) -+#define HWCAP2_ECV (1 << 19) -+#define HWCAP2_AFP (1 << 20) -+#define HWCAP2_RPRES (1 << 21) -+#define HWCAP2_MTE3 (1 << 22) -+#define HWCAP2_SME (1 << 23) -+#define HWCAP2_SME_I16I64 (1 << 24) -+#define HWCAP2_SME_F64F64 (1 << 25) -+#define HWCAP2_SME_I8I32 (1 << 26) -+#define HWCAP2_SME_F16F32 (1 << 27) -+#define HWCAP2_SME_B16F32 (1 << 28) -+#define HWCAP2_SME_F32F32 (1 << 29) -+#define HWCAP2_SME_FA64 (1 << 30) -+#define HWCAP2_WFXT (1UL << 31) -+#define HWCAP2_EBF16 (1UL << 32) -+#define HWCAP2_SVE_EBF16 (1UL << 33) -+#define HWCAP2_CSSC (1UL << 34) -+#define HWCAP2_RPRFM (1UL << 35) -+#define HWCAP2_SVE2P1 (1UL << 36) -+#define HWCAP2_SME2 (1UL << 37) -+#define HWCAP2_SME2P1 (1UL << 38) -+#define HWCAP2_SME_I16I32 (1UL << 39) -+#define HWCAP2_SME_BI32I32 (1UL << 40) -+#define HWCAP2_SME_B16B16 (1UL << 41) -+#define HWCAP2_SME_F16F16 (1UL << 42) -diff --git a/libc/sysdeps/linux/common/bits/hwcap.h b/libc/sysdeps/linux/common/bits/hwcap.h -new file mode 100644 -index 000000000..e7b899df0 ---- /dev/null -+++ b/libc/sysdeps/linux/common/bits/hwcap.h -@@ -0,0 +1,22 @@ -+/* Defines for bits in AT_HWCAP. -+ Copyright (C) 2012-2023 Free Software Foundation, Inc. -+ -+ 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 -+ . */ -+ -+#ifndef _SYS_AUXV_H -+# error "Never include directly; use instead." -+#endif -+ -+/* No bits defined for this architecture. */ --- -2.30.2 - diff --git a/package/uclibc/0002-fcntl.h-declare-f_owner_ex-for-all-architectures.patch b/package/uclibc/0002-fcntl.h-declare-f_owner_ex-for-all-architectures.patch deleted file mode 100644 index da0135a5e3..0000000000 --- a/package/uclibc/0002-fcntl.h-declare-f_owner_ex-for-all-architectures.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 98576ab8de710507419b016fbcfc82ed7c57f9c3 Mon Sep 17 00:00:00 2001 -From: Waldemar Brodkorb -Date: Wed, 9 Aug 2023 10:31:28 +0200 -Subject: [PATCH] fcntl.h: declare f_owner_ex for all architectures - -Signed-off-by: Waldemar Brodkorb -Upstream: https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/commit/?id=98576ab8de710507419b016fbcfc82ed7c57f9c3 ---- - include/fcntl.h | 20 ++++++++++++++++++++ - libc/sysdeps/linux/aarch64/bits/fcntl.h | 21 --------------------- - 2 files changed, 20 insertions(+), 21 deletions(-) - -diff --git a/include/fcntl.h b/include/fcntl.h -index 136f64d70..ce15ceaf6 100644 ---- a/include/fcntl.h -+++ b/include/fcntl.h -@@ -296,6 +296,26 @@ int name_to_handle_at(int dirfd, const char *pathname, - int open_by_handle_at(int mount_fd, struct file_handle *handle, int flags); - #endif - -+#ifdef __USE_GNU -+# define F_SETOWN_EX 15 /* Get owner (thread receiving SIGIO). */ -+# define F_GETOWN_EX 16 /* Set owner (thread receiving SIGIO). */ -+/* Owner types. */ -+enum __pid_type -+ { -+ F_OWNER_TID = 0, /* Kernel thread. */ -+ F_OWNER_PID, /* Process. */ -+ F_OWNER_PGRP, /* Process group. */ -+ F_OWNER_GID = F_OWNER_PGRP /* Alternative, obsolete name. */ -+ }; -+ -+/* Structure to use with F_GETOWN_EX and F_SETOWN_EX. */ -+struct f_owner_ex -+ { -+ enum __pid_type type; /* Owner type of ID. */ -+ __pid_t pid; /* ID of owner. */ -+ }; -+#endif -+ - __END_DECLS - - #endif /* fcntl.h */ -diff --git a/libc/sysdeps/linux/aarch64/bits/fcntl.h b/libc/sysdeps/linux/aarch64/bits/fcntl.h -index c143ba9c9..dbe929351 100644 ---- a/libc/sysdeps/linux/aarch64/bits/fcntl.h -+++ b/libc/sysdeps/linux/aarch64/bits/fcntl.h -@@ -94,8 +94,6 @@ - #ifdef __USE_GNU - # define F_SETSIG 10 /* Set number of signal to be sent. */ - # define F_GETSIG 11 /* Get number of signal to be sent. */ --# define F_SETOWN_EX 15 /* Get owner (thread receiving SIGIO). */ --# define F_GETOWN_EX 16 /* Set owner (thread receiving SIGIO). */ - #endif - - -@@ -170,25 +168,6 @@ struct flock64 - }; - #endif - -- --#ifdef __USE_GNU --/* Owner types. */ --enum __pid_type -- { -- F_OWNER_TID = 0, /* Kernel thread. */ -- F_OWNER_PID, /* Process. */ -- F_OWNER_PGRP, /* Process group. */ -- F_OWNER_GID = F_OWNER_PGRP /* Alternative, obsolete name. */ -- }; -- --/* Structure to use with F_GETOWN_EX and F_SETOWN_EX. */ --struct f_owner_ex -- { -- enum __pid_type type; /* Owner type of ID. */ -- __pid_t pid; /* ID of owner. */ -- }; --#endif -- - /* Define some more compatibility macros to be backward compatible with - BSD systems which did not managed to hide these kernel macros. */ - #ifdef __USE_BSD --- -2.30.2 - diff --git a/package/uclibc/uclibc.hash b/package/uclibc/uclibc.hash index 8d87c04383..ae1f3178d9 100644 --- a/package/uclibc/uclibc.hash +++ b/package/uclibc/uclibc.hash @@ -1,4 +1,4 @@ -# From https://downloads.uclibc-ng.org/releases/1.0.44/uClibc-ng-1.0.44.tar.xz.sha256 -sha256 7df9d987955827382f1c2400da513456becbb6f868bdfd37737265f1cbeec994 uClibc-ng-1.0.44.tar.xz +# From https://downloads.uclibc-ng.org/releases/1.0.44/uClibc-ng-1.0.45.tar.xz.sha256 +sha256 c2f4c6b6e19d7c9c226992a3746efd7ab932040463c15ee0bc8f4132b5777ac4 uClibc-ng-1.0.45.tar.xz # Locally calculated sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING.LIB diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk index 4e7d8de643..88623840bf 100644 --- a/package/uclibc/uclibc.mk +++ b/package/uclibc/uclibc.mk @@ -4,7 +4,7 @@ # ################################################################################ -UCLIBC_VERSION = 1.0.44 +UCLIBC_VERSION = 1.0.45 UCLIBC_SOURCE = uClibc-ng-$(UCLIBC_VERSION).tar.xz UCLIBC_SITE = https://downloads.uclibc-ng.org/releases/$(UCLIBC_VERSION) UCLIBC_LICENSE = LGPL-2.1+ From 96d0d677790e659b822761b50561b0316b4abf43 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 12 Dec 2023 21:59:51 +0100 Subject: [PATCH 4216/5754] package/libldns: fix libressl build Fix the following build failure raised since bump of libressl to version 3.8.2 in commit 21eca49ed5110872407b76ab9337d2877c4cda24: ./keys.c:167:35: error: 'ENGINE_METHOD_ALL' undeclared (first use in this function) 167 | if(!ENGINE_set_default(e, ENGINE_METHOD_ALL)) { | ^~~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/37cc05b78a7004caa1b45d896121f059a4f8ca00 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libldns/libldns.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/package/libldns/libldns.mk b/package/libldns/libldns.mk index 06564e3d9f..d6af6a2b97 100644 --- a/package/libldns/libldns.mk +++ b/package/libldns/libldns.mk @@ -17,7 +17,6 @@ LIBLDNS_CONF_OPTS = \ --with-ssl=$(STAGING_DIR)/usr \ --enable-dane \ --enable-ecdsa \ - --enable-gost \ --enable-sha2 \ --without-examples \ --without-p5-dns-ldns \ @@ -30,6 +29,12 @@ else LIBLDNS_CONF_OPTS += --disable-dane-verify endif +ifeq ($(BR2_PACKAGE_LIBOPENSSL_ENGINES),y) +LIBLDNS_CONF_OPTS += --enable-gost +else +LIBLDNS_CONF_OPTS += --disable-gost +endif + ifeq ($(BR2_STATIC_LIBS),y) LIBLDNS_DEPENDENCIES += host-pkgconf # missing -lz breaks configure, add it using pkgconf From 8c4bb1abb9102140b6f4726915fa7555e21b96b4 Mon Sep 17 00:00:00 2001 From: Xiangyu Chen Date: Wed, 20 Dec 2023 18:27:50 +0800 Subject: [PATCH 4217/5754] package/gawk: bump to version 5.3.0 Changes: https://git.savannah.gnu.org/cgit/gawk.git/tree/ChangeLog?h=gawk-5.3.0 Signed-off-by: Xiangyu Chen Signed-off-by: Peter Korsgaard --- package/gawk/gawk.hash | 4 ++-- package/gawk/gawk.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gawk/gawk.hash b/package/gawk/gawk.hash index 852a815d04..3ff0a90030 100644 --- a/package/gawk/gawk.hash +++ b/package/gawk/gawk.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://ftp.gnu.org/gnu/gawk/gawk-5.2.2.tar.xz.sig +# https://ftp.gnu.org/gnu/gawk/gawk-5.3.0.tar.xz.sig # Primary key fingerprint: D196 7C63 7887 1317 7D86 1ED7 DF59 7815 937E C0D2 -sha256 3c1fce1446b4cbee1cd273bd7ec64bc87d89f61537471cd3e05e33a965a250e9 gawk-5.2.2.tar.xz +sha256 ca9c16d3d11d0ff8c69d79dc0b47267e1329a69b39b799895604ed447d3ca90b gawk-5.3.0.tar.xz # Locally calculated sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/gawk/gawk.mk b/package/gawk/gawk.mk index 62270cea9c..ff1b9920af 100644 --- a/package/gawk/gawk.mk +++ b/package/gawk/gawk.mk @@ -4,7 +4,7 @@ # ################################################################################ -GAWK_VERSION = 5.2.2 +GAWK_VERSION = 5.3.0 GAWK_SOURCE = gawk-$(GAWK_VERSION).tar.xz GAWK_SITE = $(BR2_GNU_MIRROR)/gawk GAWK_DEPENDENCIES = host-gawk From 3c047ea463e27ceaafde76d64406862c3322daa0 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Wed, 20 Dec 2023 01:27:41 -0800 Subject: [PATCH 4218/5754] package/openssh: security bump to version 9.6p1 OpenSSH 9.6 was released on 2023-12-18. This release contains fixes for a newly-discovered weakness in the SSH transport protocol (the "Terrapin" attack), a logic error relating to constrained PKCS#11 keys in ssh-agent(1) and countermeasures for programs that invoke ssh(1) with user or hostnames containing invalid characters. https://www.openssh.com/txt/release-9.6 Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/openssh/openssh.hash | 2 +- package/openssh/openssh.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/openssh/openssh.hash b/package/openssh/openssh.hash index 4060b95e9b..618b13133d 100644 --- a/package/openssh/openssh.hash +++ b/package/openssh/openssh.hash @@ -1,4 +1,4 @@ # From https://www.openssh.com/txt/release-9.4p1 -sha256 3608fd9088db2163ceb3e600c85ab79d0de3d221e59192ea1923e23263866a85 openssh-9.4p1.tar.gz +sha256 910211c07255a8c5ad654391b40ee59800710dd8119dd5362de09385aa7a777c openssh-9.6p1.tar.gz # Locally calculated sha256 05c30446ba738934b3f1efa965b454c122ca26cc4b268e5ae6843f58ccd1b16d LICENCE diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk index 358ef42b6e..ec9e6613b0 100644 --- a/package/openssh/openssh.mk +++ b/package/openssh/openssh.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENSSH_VERSION_MAJOR = 9.4 +OPENSSH_VERSION_MAJOR = 9.6 OPENSSH_VERSION_MINOR = p1 OPENSSH_VERSION = $(OPENSSH_VERSION_MAJOR)$(OPENSSH_VERSION_MINOR) OPENSSH_CPE_ID_VERSION = $(OPENSSH_VERSION_MAJOR) From 85646943ec6fb8eeee760b89b5d31a09da7ea92b Mon Sep 17 00:00:00 2001 From: Michael Nosthoff Date: Wed, 20 Dec 2023 08:55:57 +0100 Subject: [PATCH 4219/5754] package/nmap: fix wording for nc symlink Signed-off-by: Michael Nosthoff Signed-off-by: Peter Korsgaard --- package/nmap/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/nmap/Config.in b/package/nmap/Config.in index fc6312d0fc..6e097a9884 100644 --- a/package/nmap/Config.in +++ b/package/nmap/Config.in @@ -24,7 +24,7 @@ config BR2_PACKAGE_NMAP_NCAT written for the Nmap Project as a much-improved reimplementation of the venerable Netcat. - If symlink to "nc" is installed if neither netcat or + A symlink to "nc" is installed if neither netcat or netcat-openbsd is selected. comment "a symlink from ncat to 'nc' will be installed" From 7951bb0686bc058684abe76324d83dcb2e7883e3 Mon Sep 17 00:00:00 2001 From: Peter Macleod Thompson Date: Tue, 19 Dec 2023 19:08:18 -0700 Subject: [PATCH 4220/5754] package/sdl2_image: bump version to 2.8.1 Signed-off-by: Peter Macleod Thompson [Peter: fix filename in .hash file] Signed-off-by: Peter Korsgaard --- package/sdl2_image/sdl2_image.hash | 2 +- package/sdl2_image/sdl2_image.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/sdl2_image/sdl2_image.hash b/package/sdl2_image/sdl2_image.hash index 55b2661fc0..0c4f11bc82 100644 --- a/package/sdl2_image/sdl2_image.hash +++ b/package/sdl2_image/sdl2_image.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 931c9be5bf1d7c8fae9b7dc157828b7eee874e23c7f24b44ba7eff6b4836312c SDL2_image-2.6.3.tar.gz +sha256 e4cab9a58c347a490c46723c17553b4e12233cd821d3b993a8475a50497f5a3e SDL2_image-2.8.1.tar.gz sha256 1852c8549e3d154687197d46abababd3e8faae035f19991b2ca850fa3a43ad57 LICENSE.txt diff --git a/package/sdl2_image/sdl2_image.mk b/package/sdl2_image/sdl2_image.mk index aaf379788c..ca9d983892 100644 --- a/package/sdl2_image/sdl2_image.mk +++ b/package/sdl2_image/sdl2_image.mk @@ -4,7 +4,7 @@ # ################################################################################ -SDL2_IMAGE_VERSION = 2.6.3 +SDL2_IMAGE_VERSION = 2.8.1 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 620a88f755f81a241e9e64f53d8f611977de5e7a Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Wed, 20 Dec 2023 00:13:24 +0100 Subject: [PATCH 4221/5754] package/libnss: bump to version 3.96.1 Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- 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 046f0efcca..e44f729363 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_95_RTM/src/SHA256SUMS -sha256 469888e41e8a780051ce00edcd914e8a6bd38da88a82cfb84898dd388635822a nss-3.95.tar.gz +# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_96_1_RTM/src/SHA256SUMS +sha256 c51e89f6fbb06163f4302e368eeb672d748b52d583948bdb15ef1b069237a496 nss-3.96.1.tar.gz # Locally calculated sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index 878375e1b6..80f8b53297 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSS_VERSION = 3.95 +LIBNSS_VERSION = 3.96.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 7150660668b343c22f44554553fbaf0931acdce1 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Wed, 20 Dec 2023 00:18:04 +0100 Subject: [PATCH 4222/5754] package/libnvme: bump to version 1.7 Drop local patches that have been upstreamed. Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- ...01-test-handle-POSIX-ioctl-prototype.patch | 70 ------------------- ...eson-make-building-tests-conditional.patch | 46 ------------ package/libnvme/libnvme.hash | 2 +- package/libnvme/libnvme.mk | 2 +- 4 files changed, 2 insertions(+), 118 deletions(-) delete mode 100644 package/libnvme/0001-test-handle-POSIX-ioctl-prototype.patch delete mode 100644 package/libnvme/0002-meson-make-building-tests-conditional.patch diff --git a/package/libnvme/0001-test-handle-POSIX-ioctl-prototype.patch b/package/libnvme/0001-test-handle-POSIX-ioctl-prototype.patch deleted file mode 100644 index 175cdcd7dd..0000000000 --- a/package/libnvme/0001-test-handle-POSIX-ioctl-prototype.patch +++ /dev/null @@ -1,70 +0,0 @@ -From ca47ba3119365eafac0ab25a86cab9d9a1b29bd4 Mon Sep 17 00:00:00 2001 -From: Sam James -Date: Sat, 30 Sep 2023 06:38:53 +0100 -Subject: [PATCH] test: handle POSIX ioctl prototype - -glibc has the following prototype for ioctl: int ioctl(int fd, unsigned long request, ...) -POSIX (inc. musl) has the following for ioctl: int ioctl(int fd, int request, ...) - -Check which prototype is used in to avoid a conflict and conditionally -define the right one for the system. - -Upstream: https://github.com/linux-nvme/libnvme/commit/ca47ba3119365eafac0ab25a86cab9d9a1b29bd4 - -Bug: https://bugs.gentoo.org/914921 -Signed-off-by: Sam James -Signed-off-by: Giulio Benetti ---- - meson.build | 10 ++++++++++ - test/ioctl/mock.c | 6 +++++- - 2 files changed, 15 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 6fcf1da..2c979cc 100644 ---- a/meson.build -+++ b/meson.build -@@ -230,6 +230,16 @@ conf.set( - ), - description: 'Is network address and service translation available' - ) -+conf.set( -+ 'HAVE_GLIBC_IOCTL', -+ cc.compiles( -+ '''#include -+ int ioctl(int fd, unsigned long request, ...); -+ ''', -+ name: 'ioctl has glibc-style prototype' -+ ), -+ description: 'Is ioctl the glibc interface (rather than POSIX)' -+) - - if cc.has_function_attribute('fallthrough') - conf.set('fallthrough', '__attribute__((__fallthrough__))') -diff --git a/test/ioctl/mock.c b/test/ioctl/mock.c -index e917244..5d2ac94 100644 ---- a/test/ioctl/mock.c -+++ b/test/ioctl/mock.c -@@ -114,7 +114,11 @@ void end_mock_cmds(void) - } \ - }) - -+#ifdef HAVE_GLIBC_IOCTL - int ioctl(int fd, unsigned long request, ...) -+#else -+int ioctl(int fd, int request, ...) -+#endif - { - struct mock_cmds *mock_cmds; - bool result64; -@@ -141,7 +145,7 @@ int ioctl(int fd, unsigned long request, ...) - result64 = true; - break; - default: -- fail("unexpected %s %lu", __func__, request); -+ fail("unexpected %s %lu", __func__, (unsigned long) request); - } - check(mock_cmds->remaining_cmds, - "unexpected %s command", mock_cmds->name); --- -2.34.1 - diff --git a/package/libnvme/0002-meson-make-building-tests-conditional.patch b/package/libnvme/0002-meson-make-building-tests-conditional.patch deleted file mode 100644 index 0b6d3681ca..0000000000 --- a/package/libnvme/0002-meson-make-building-tests-conditional.patch +++ /dev/null @@ -1,46 +0,0 @@ -From ff742e792725c316ba6de0800188bf36751bd1d1 Mon Sep 17 00:00:00 2001 -From: Sam James -Date: Sat, 30 Sep 2023 06:43:39 +0100 -Subject: [PATCH] meson: make building tests conditional - -Just like we do for docs. - -Upstream: https://github.com/linux-nvme/libnvme/commit/ff742e792725c316ba6de0800188bf36751bd1d1 - -Signed-off-by: Sam James -Signed-off-by: Giulio Benetti ---- - meson.build | 4 +++- - meson_options.txt | 1 + - 2 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 2c979cc..a9263b5 100644 ---- a/meson.build -+++ b/meson.build -@@ -273,7 +273,9 @@ subdir('internal') - subdir('ccan') - subdir('src') - subdir('libnvme') --subdir('test') -+if get_option('tests') -+ subdir('test') -+endif - subdir('examples') - subdir('doc') - -diff --git a/meson_options.txt b/meson_options.txt -index a1ed79f..251ae11 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -6,6 +6,7 @@ option('rstdir', type : 'string', value : '', description : 'directory for ReST - - option('docs', type : 'combo', choices : ['false', 'html', 'man', 'rst', 'all'], description : 'install documentation') - option('docs-build', type : 'boolean', value : false, description : 'build documentation') -+option('tests', type : 'boolean', value : true, description : 'build tests') - - option('python', type : 'feature', value: 'auto', description : 'Generate libnvme python bindings') - option('openssl', type : 'feature', value: 'auto', description : 'OpenSSL support') --- -2.34.1 - diff --git a/package/libnvme/libnvme.hash b/package/libnvme/libnvme.hash index b9e0281189..2a446eaf0a 100644 --- a/package/libnvme/libnvme.hash +++ b/package/libnvme/libnvme.hash @@ -1,3 +1,3 @@ # Locally calculated sha256 checksums -sha256 0dd8ba8b655abe78c09833edb66632aa6bee82aebf117dd252ded968deaaeec7 libnvme-1.6.tar.gz +sha256 93febccd2e4201a6a9c696a0208a7227adfd1649ad0523754c1885503890e77c libnvme-1.7.tar.gz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libnvme/libnvme.mk b/package/libnvme/libnvme.mk index b393122c85..688624a79e 100644 --- a/package/libnvme/libnvme.mk +++ b/package/libnvme/libnvme.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNVME_VERSION = 1.6 +LIBNVME_VERSION = 1.7 LIBNVME_SITE = $(call github,linux-nvme,libnvme,v$(LIBNVME_VERSION)) LIBNVME_LICENSE = LGPL-2.1 LIBNVME_LICENSE_FILES = COPYING From 08b6c78e6a853831b95c7cbc49d26655d6c2e853 Mon Sep 17 00:00:00 2001 From: Marcus Folkesson Date: Mon, 18 Dec 2023 08:25:06 +0100 Subject: [PATCH 4223/5754] package/criu: bump to version 3.19 Signed-off-by: Marcus Folkesson Signed-off-by: Thomas Petazzoni --- package/criu/criu.hash | 2 +- package/criu/criu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/criu/criu.hash b/package/criu/criu.hash index 2c4a07252b..c3fcdbc03f 100644 --- a/package/criu/criu.hash +++ b/package/criu/criu.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6a9997981c9fe4730c848ce59346b3a22fad69b803607cb67a3f6ec0557fa474 criu-3.18.tar.gz +sha256 990cdd147cb670a5d5d14216c2b5c2fc2b9a53ef19396569a6413807ba2a6aa2 criu-3.19.tar.gz sha256 568a1fa9d90e18a1a1a61ea58ec2eece16b56a5042cc72c1b4f8d4455ae6fcb7 COPYING diff --git a/package/criu/criu.mk b/package/criu/criu.mk index 7f70c89068..3b72a1131e 100644 --- a/package/criu/criu.mk +++ b/package/criu/criu.mk @@ -4,7 +4,7 @@ # ################################################################################ -CRIU_VERSION = 3.18 +CRIU_VERSION = 3.19 CRIU_SITE = $(call github,checkpoint-restore,criu,v$(CRIU_VERSION)) CRIU_LICENSE = GPL-2.0, LGPL-2.1 (for lib/), MIT (for images/) From ceb678ca19d66ea1be945097d3cf53a3af735ca1 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Mon, 18 Dec 2023 09:19:03 +0100 Subject: [PATCH 4224/5754] editorconfig: fix wildcard expansion It turns out that wildcard expansion, * and ?, is not performed in matching lists {...}, at least in the vim plugin. The spec is not clear about that, but refer to "pattern matching through Unix shell-style wildcards" [0]. So, let's consider that this is not supported. Expand the patterns into one section each, rather than use a list. [0] https://spec.editorconfig.org/ Signed-off-by: Yann E. MORIN Signed-off-by: Thomas Petazzoni --- .editorconfig | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.editorconfig b/.editorconfig index 4acaf3486b..af6cf4b449 100644 --- a/.editorconfig +++ b/.editorconfig @@ -13,11 +13,19 @@ insert_final_newline = true indent_style = tab indent_size = tab -[{Config*.in*,linux/Config.ext.in}] +[Config*.in*] indent_style = tab indent_size = tab -[{Makefile*,*.mk}] +[linux/Config.ext.in] +indent_style = tab +indent_size = tab + +[Makefile*] +indent_style = tab +indent_size = tab + +[*.mk] indent_style = tab indent_size = tab From 259de5cff6841346dc39cd7eb64a58ccd78c8cd3 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sun, 10 Dec 2023 16:25:12 +0100 Subject: [PATCH 4225/5754] package/lua-compat53: bump to version 0.12 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit the project has moved to the organization “Lunar Modules”, see https://github.com/lunarmodules/ diff LICENCE: -Copyright (c) 2015 Kepler Project. +Copyright (C) 1994-2020 Lua.org, PUC-Rio. +Copyright (C) 2013-2023 The Lua-Compat-5.3 authors. Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/lua-compat53/Config.in | 2 +- package/lua-compat53/lua-compat53.hash | 4 ++-- package/lua-compat53/lua-compat53.mk | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/lua-compat53/Config.in b/package/lua-compat53/Config.in index de468fcf66..695c139280 100644 --- a/package/lua-compat53/Config.in +++ b/package/lua-compat53/Config.in @@ -5,4 +5,4 @@ config BR2_PACKAGE_LUA_COMPAT53 Compatibility module providing Lua-5.3-style APIs for Lua 5.2 and 5.1. - https://github.com/keplerproject/lua-compat-5.3 + https://github.com/lunarmodules/lua-compat-5.3 diff --git a/package/lua-compat53/lua-compat53.hash b/package/lua-compat53/lua-compat53.hash index ccd9a71205..1930063fdc 100644 --- a/package/lua-compat53/lua-compat53.hash +++ b/package/lua-compat53/lua-compat53.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 e513e75ba0ef4923a1ec0d4f0beb5972a11cc9bd7ac1b0953b5e4f037b259c92 compat53-0.8-1.src.rock -sha256 1b24f475812c979684fb3469f6faccbdc7c33c9d39421728aa0d78deda5a89a5 lua-compat-5.3-0.8/LICENSE +sha256 bff8e597384776de7c139bee7d6a6f2c05c3eb7315d08733473fa986720cec60 compat53-0.12-1.src.rock +sha256 870cdff7e4db4c2e84a335b2b9e242b9f963830550026e2057a5885e945982e5 lua-compat-5.3-0.12/LICENSE diff --git a/package/lua-compat53/lua-compat53.mk b/package/lua-compat53/lua-compat53.mk index 0e8f1c3600..0cfbe2d795 100644 --- a/package/lua-compat53/lua-compat53.mk +++ b/package/lua-compat53/lua-compat53.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_COMPAT53_VERSION_UPSTREAM = 0.8 +LUA_COMPAT53_VERSION_UPSTREAM = 0.12 LUA_COMPAT53_VERSION = $(LUA_COMPAT53_VERSION_UPSTREAM)-1 LUA_COMPAT53_NAME_UPSTREAM = compat53 LUA_COMPAT53_SUBDIR = lua-compat-5.3-$(LUA_COMPAT53_VERSION_UPSTREAM) From 898941a0d78600971c69e688773c5cdbe35ced96 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sun, 10 Dec 2023 16:25:13 +0100 Subject: [PATCH 4226/5754] package/lua-compat53: install compat-5.3.h this file could be required by some native modules note: compat-5.3.c is included by compat-5.3.h Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/lua-compat53/lua-compat53.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/lua-compat53/lua-compat53.mk b/package/lua-compat53/lua-compat53.mk index 0cfbe2d795..12ac5c011b 100644 --- a/package/lua-compat53/lua-compat53.mk +++ b/package/lua-compat53/lua-compat53.mk @@ -10,5 +10,13 @@ LUA_COMPAT53_NAME_UPSTREAM = compat53 LUA_COMPAT53_SUBDIR = lua-compat-5.3-$(LUA_COMPAT53_VERSION_UPSTREAM) LUA_COMPAT53_LICENSE = MIT LUA_COMPAT53_LICENSE_FILES = $(LUA_COMPAT53_SUBDIR)/LICENSE +LUA_COMPAT53_INSTALL_STAGING = YES + +define LUA_COMPAT53_INSTALL_STAGING_CMDS + $(INSTALL) -D -m 0644 $(@D)/$(LUA_COMPAT53_SUBDIR)/c-api/compat-5.3.c \ + $(STAGING_DIR)/usr/include/compat-5.3.c + $(INSTALL) -D -m 0644 $(@D)/$(LUA_COMPAT53_SUBDIR)/c-api/compat-5.3.h \ + $(STAGING_DIR)/usr/include/compat-5.3.h +endef $(eval $(luarocks-package)) From 713a71c73084f9c610dac71df526c8d7c84bf1cf Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 24 Nov 2023 23:24:08 -0700 Subject: [PATCH 4227/5754] package/python-urwid-readline: new package Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-urwid-readline/Config.in | 8 ++++++++ .../python-urwid-readline.hash | 3 +++ .../python-urwid-readline/python-urwid-readline.mk | 13 +++++++++++++ 4 files changed, 25 insertions(+) create mode 100644 package/python-urwid-readline/Config.in create mode 100644 package/python-urwid-readline/python-urwid-readline.hash create mode 100644 package/python-urwid-readline/python-urwid-readline.mk diff --git a/package/Config.in b/package/Config.in index fcc09b07c4..d3fc4514c4 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1372,6 +1372,7 @@ menu "External python modules" source "package/python-unittest-xml-reporting/Config.in" source "package/python-urllib3/Config.in" source "package/python-urwid/Config.in" + source "package/python-urwid-readline/Config.in" source "package/python-uvloop/Config.in" source "package/python-validators/Config.in" source "package/python-versiontools/Config.in" diff --git a/package/python-urwid-readline/Config.in b/package/python-urwid-readline/Config.in new file mode 100644 index 0000000000..a8046fc25b --- /dev/null +++ b/package/python-urwid-readline/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_URWID_READLINE + bool "python-urwid-readline" + select BR2_PACKAGE_PYTHON_URWID # runtime + help + A textbox edit widget for urwid that supports readline + shortcuts. + + https://github.com/rr-/urwid_readline diff --git a/package/python-urwid-readline/python-urwid-readline.hash b/package/python-urwid-readline/python-urwid-readline.hash new file mode 100644 index 0000000000..75220e937b --- /dev/null +++ b/package/python-urwid-readline/python-urwid-readline.hash @@ -0,0 +1,3 @@ +# md5, sha256 from https://pypi.org/pypi/urwid_readline/json +md5 6e0bd170f621f0ad3edab1875bdb5c5f urwid_readline-0.13.tar.gz +sha256 018020cbc864bb5ed87be17dc26b069eae2755cb29f3a9c569aac3bded1efaf4 urwid_readline-0.13.tar.gz diff --git a/package/python-urwid-readline/python-urwid-readline.mk b/package/python-urwid-readline/python-urwid-readline.mk new file mode 100644 index 0000000000..782c425b65 --- /dev/null +++ b/package/python-urwid-readline/python-urwid-readline.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# python-urwid-readline +# +################################################################################ + +PYTHON_URWID_READLINE_VERSION = 0.13 +PYTHON_URWID_READLINE_SOURCE = urwid_readline-$(PYTHON_URWID_READLINE_VERSION).tar.gz +PYTHON_URWID_READLINE_SITE = https://files.pythonhosted.org/packages/ab/bb/c5b3fec22268d97ad30232f5533d4a5939d4df7ed3917a8d20d447f1d0a7 +PYTHON_URWID_READLINE_LICENSE = MIT +PYTHON_URWID_READLINE_SETUP_TYPE = setuptools + +$(eval $(python-package)) From 088dd5fd3f81e929831d846f3afac035fbc079da Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 24 Nov 2023 23:24:09 -0700 Subject: [PATCH 4228/5754] package/python-pudb: bump to version 2023.1 Add new python-urwid-readline runtime dependency. Add new python-packaging runtime dependency. Remove no longer required python-setuptools runtime dependency. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-pudb/Config.in | 3 ++- package/python-pudb/python-pudb.hash | 4 ++-- package/python-pudb/python-pudb.mk | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/python-pudb/Config.in b/package/python-pudb/Config.in index 06f1b20c26..2bdd689121 100644 --- a/package/python-pudb/Config.in +++ b/package/python-pudb/Config.in @@ -1,9 +1,10 @@ config BR2_PACKAGE_PYTHON_PUDB bool "python-pudb" + select BR2_PACKAGE_PYTHON_PACKAGING # runtime select BR2_PACKAGE_PYTHON_URWID # runtime + select BR2_PACKAGE_PYTHON_URWID_READLINE # runtime select BR2_PACKAGE_PYTHON_JEDI # runtime select BR2_PACKAGE_PYTHON_PYGMENTS # runtime - select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime select BR2_PACKAGE_PYTHON3_CURSES # runtime help A full-screen, console-based Python debugger. diff --git a/package/python-pudb/python-pudb.hash b/package/python-pudb/python-pudb.hash index 1ae15ad8a6..08afc67b76 100644 --- a/package/python-pudb/python-pudb.hash +++ b/package/python-pudb/python-pudb.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pudb/json -md5 cda1c28dc52318162e2b131280f09960 pudb-2022.1.3.tar.gz -sha256 58e83ada9e19ffe92c1fdc78ae5458ef91aeb892a5b8f0e7379e6fa61e0e664a pudb-2022.1.3.tar.gz +md5 81178e875fd7e15237267c3055e447a3 pudb-2023.1.tar.gz +sha256 15df3c603aba87a918a666ef8e1bf63f764238cc3589db3c5b7a5f1b01ea2f03 pudb-2023.1.tar.gz # Locally computed sha256 checksums sha256 a95343fffff49cde3d9bf33cf6bb71cb3bf0ed83f47d98a7ba04b175d29c79ab LICENSE diff --git a/package/python-pudb/python-pudb.mk b/package/python-pudb/python-pudb.mk index a357c34c44..ff13efb773 100644 --- a/package/python-pudb/python-pudb.mk +++ b/package/python-pudb/python-pudb.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PUDB_VERSION = 2022.1.3 +PYTHON_PUDB_VERSION = 2023.1 PYTHON_PUDB_SOURCE = pudb-$(PYTHON_PUDB_VERSION).tar.gz -PYTHON_PUDB_SITE = https://files.pythonhosted.org/packages/85/a5/f1fd378f56bd8168b5921fd09d4b84fd8101a90e81402a509796caea2094 +PYTHON_PUDB_SITE = https://files.pythonhosted.org/packages/96/d3/a471fe68788178f2a5024031a153673df72b9287530f32b0cd469d64a68a PYTHON_PUDB_SETUP_TYPE = setuptools PYTHON_PUDB_LICENSE = MIT PYTHON_PUDB_LICENSE_FILES = LICENSE From aa5ee701b11ddafb5565dc0d57a2e045cd68dc19 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 24 Nov 2023 18:38:04 -0700 Subject: [PATCH 4229/5754] package/python-pyproject-metadata: new host package Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- .../python-pyproject-metadata.hash | 5 +++++ .../python-pyproject-metadata.mk | 14 ++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 package/python-pyproject-metadata/python-pyproject-metadata.hash create mode 100644 package/python-pyproject-metadata/python-pyproject-metadata.mk diff --git a/package/python-pyproject-metadata/python-pyproject-metadata.hash b/package/python-pyproject-metadata/python-pyproject-metadata.hash new file mode 100644 index 0000000000..51a3e4b85b --- /dev/null +++ b/package/python-pyproject-metadata/python-pyproject-metadata.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/pyproject-metadata/json +md5 ca5e9527cff96153a976e14530b53746 pyproject-metadata-0.7.1.tar.gz +sha256 0a94f18b108b9b21f3a26a3d541f056c34edcb17dc872a144a15618fed7aef67 pyproject-metadata-0.7.1.tar.gz +# Locally computed sha256 checksums +sha256 aaf9a29ca5907971ccf07de025375db34539a8d5eeebce20b46099805722106f LICENSE diff --git a/package/python-pyproject-metadata/python-pyproject-metadata.mk b/package/python-pyproject-metadata/python-pyproject-metadata.mk new file mode 100644 index 0000000000..6fac22abee --- /dev/null +++ b/package/python-pyproject-metadata/python-pyproject-metadata.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-pyproject-metadata +# +################################################################################ + +PYTHON_PYPROJECT_METADATA_VERSION = 0.7.1 +PYTHON_PYPROJECT_METADATA_SOURCE = pyproject-metadata-$(PYTHON_PYPROJECT_METADATA_VERSION).tar.gz +PYTHON_PYPROJECT_METADATA_SITE = https://files.pythonhosted.org/packages/38/af/b0e6a9eba989870fd26e10889446d1bec2e6d5be0a1bae2dc4dcda9ce199 +PYTHON_PYPROJECT_METADATA_SETUP_TYPE = setuptools +PYTHON_PYPROJECT_METADATA_LICENSE = MIT +PYTHON_PYPROJECT_METADATA_LICENSE_FILES = LICENSE + +$(eval $(host-python-package)) From 36db831321f43746afa336869057d588ce470b84 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 24 Nov 2023 18:38:05 -0700 Subject: [PATCH 4230/5754] package/python-meson-python: new host package Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- .../python-meson-python.hash | 5 +++++ .../python-meson-python/python-meson-python.mk | 18 ++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 package/python-meson-python/python-meson-python.hash create mode 100644 package/python-meson-python/python-meson-python.mk diff --git a/package/python-meson-python/python-meson-python.hash b/package/python-meson-python/python-meson-python.hash new file mode 100644 index 0000000000..537353bad2 --- /dev/null +++ b/package/python-meson-python/python-meson-python.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/meson-python/json +md5 e91eb9946d7bb8be06e434c5a2dadd05 meson_python-0.15.0.tar.gz +sha256 fddb73eecd49e89c1c41c87937cd89c2d0b65a1c63ba28238681d4bd9484d26f meson_python-0.15.0.tar.gz +# Locally computed sha256 checksums +sha256 8f82ea9ef9a55b47f4170536d02e48b5bc33fc5135e5b4a1b5f8d6404833ec9b LICENSE diff --git a/package/python-meson-python/python-meson-python.mk b/package/python-meson-python/python-meson-python.mk new file mode 100644 index 0000000000..64d5de4ba9 --- /dev/null +++ b/package/python-meson-python/python-meson-python.mk @@ -0,0 +1,18 @@ +################################################################################ +# +# python-meson-python +# +################################################################################ + +PYTHON_MESON_PYTHON_VERSION = 0.15.0 +PYTHON_MESON_PYTHON_SOURCE = meson_python-$(PYTHON_MESON_PYTHON_VERSION).tar.gz +PYTHON_MESON_PYTHON_SITE = https://files.pythonhosted.org/packages/a2/3b/276b596824a0820987fdcc7721618453b4f9a8305fe20b611a00ac3f948e +PYTHON_MESON_PYTHON_SETUP_TYPE = pep517 +PYTHON_MESON_PYTHON_LICENSE = MIT +PYTHON_MESON_PYTHON_LICENSE_FILES = LICENSE +HOST_PYTHON_MESON_PYTHON_DEPENDENCIES = \ + host-meson \ + host-patchelf \ + host-python-pyproject-metadata + +$(eval $(host-python-package)) From 1e7f0794bbb0075285dc3b4dab8484f12adbb886 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 24 Nov 2023 18:38:06 -0700 Subject: [PATCH 4231/5754] package/python-contourpy: new package Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-contourpy/Config.in | 8 ++++++++ package/python-contourpy/python-contourpy.hash | 5 +++++ package/python-contourpy/python-contourpy.mk | 14 ++++++++++++++ 4 files changed, 28 insertions(+) create mode 100644 package/python-contourpy/Config.in create mode 100644 package/python-contourpy/python-contourpy.hash create mode 100644 package/python-contourpy/python-contourpy.mk diff --git a/package/Config.in b/package/Config.in index d3fc4514c4..a91ff8d345 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1030,6 +1030,7 @@ menu "External python modules" source "package/python-configshell-fb/Config.in" source "package/python-constantly/Config.in" source "package/python-construct/Config.in" + source "package/python-contourpy/Config.in" source "package/python-couchdb/Config.in" source "package/python-crayons/Config.in" source "package/python-crc16/Config.in" diff --git a/package/python-contourpy/Config.in b/package/python-contourpy/Config.in new file mode 100644 index 0000000000..4843884a97 --- /dev/null +++ b/package/python-contourpy/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_CONTOURPY + bool "python-contourpy" + select BR2_PACKAGE_PYTHON_PYBIND + help + Python library for calculating contours of 2D quadrilateral + grids. + + https://github.com/contourpy/contourpy diff --git a/package/python-contourpy/python-contourpy.hash b/package/python-contourpy/python-contourpy.hash new file mode 100644 index 0000000000..8f23d107ae --- /dev/null +++ b/package/python-contourpy/python-contourpy.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/contourpy/json +md5 cae5b781ade023c01bc1a8a53312f2ac contourpy-1.1.0.tar.gz +sha256 e53046c3863828d21d531cc3b53786e6580eb1ba02477e8681009b6aa0870b21 contourpy-1.1.0.tar.gz +# Locally computed sha256 checksums +sha256 c2522156ba7d4dfbbec266dfea98bf76a69bc41edb18cad323177fad6b19b35f LICENSE diff --git a/package/python-contourpy/python-contourpy.mk b/package/python-contourpy/python-contourpy.mk new file mode 100644 index 0000000000..f305793cb2 --- /dev/null +++ b/package/python-contourpy/python-contourpy.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-contourpy +# +################################################################################ + +PYTHON_CONTOURPY_VERSION = 1.1.0 +PYTHON_CONTOURPY_SOURCE = contourpy-$(PYTHON_CONTOURPY_VERSION).tar.gz +PYTHON_CONTOURPY_SITE = https://files.pythonhosted.org/packages/a7/3b/632c003e1dfbc82d32c0466762f2d2cf139d26032626dc65944e38d0e5b9 +PYTHON_CONTOURPY_LICENSE = BSD-3-Clause +PYTHON_CONTOURPY_LICENSE_FILES = LICENSE +PYTHON_CONTOURPY_DEPENDENCIES = python-pybind host-python-meson-python + +$(eval $(meson-package)) From 2b6c5314867ebf2f5e1370cacbfe139763bf30ec Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 24 Nov 2023 18:38:07 -0700 Subject: [PATCH 4232/5754] package/python-matplotlib: bump to version 3.8.2 Add new python-contourpy runtime dependency. Add new python-pybind dependency. Add new host-python-setuptools-scm build dependency. Update setup.cfg to new mplsetup.cfg install location. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-matplotlib/Config.in | 2 ++ package/python-matplotlib/python-matplotlib.hash | 5 +++-- package/python-matplotlib/python-matplotlib.mk | 8 +++++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/package/python-matplotlib/Config.in b/package/python-matplotlib/Config.in index cc0d830f4f..b3d84e2b43 100644 --- a/package/python-matplotlib/Config.in +++ b/package/python-matplotlib/Config.in @@ -8,7 +8,9 @@ config BR2_PACKAGE_PYTHON_MATPLOTLIB select BR2_PACKAGE_FREETYPE # runtime select BR2_PACKAGE_LIBPNG # runtime select BR2_PACKAGE_PYTHON_CERTIFI # runtime + select BR2_PACKAGE_PYTHON_CONTOURPY # runtime select BR2_PACKAGE_PYTHON_CYCLER + select BR2_PACKAGE_PYTHON_PYBIND select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime select BR2_PACKAGE_PYTHON_DATEUTIL # runtime select BR2_PACKAGE_PYTHON_KIWISOLVER # runtime diff --git a/package/python-matplotlib/python-matplotlib.hash b/package/python-matplotlib/python-matplotlib.hash index 0d7117811c..c2fb907e2c 100644 --- a/package/python-matplotlib/python-matplotlib.hash +++ b/package/python-matplotlib/python-matplotlib.hash @@ -1,4 +1,5 @@ -# sha256 from https://pypi.org/project/matplotlib/#files -sha256 fc4f526dfdb31c9bd6b8ca06bf9fab663ca12f3ec9cdf4496fb44bc680140318 matplotlib-3.4.3.tar.gz +# md5, sha256 from https://pypi.org/pypi/matplotlib/json +md5 72896b8c240903ebddc47be6451d813b matplotlib-3.8.2.tar.gz +sha256 01a978b871b881ee76017152f1f1a0cbf6bd5f7b8ff8c96df0df1bd57d8755a1 matplotlib-3.8.2.tar.gz # Locally computed sha256 checksums sha256 5a1a81ea301728c8bba2933da832c0cd62229daf20893a024ab3d53244468dbc LICENSE/LICENSE diff --git a/package/python-matplotlib/python-matplotlib.mk b/package/python-matplotlib/python-matplotlib.mk index 650aac9bd9..4fd2b5f432 100644 --- a/package/python-matplotlib/python-matplotlib.mk +++ b/package/python-matplotlib/python-matplotlib.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MATPLOTLIB_VERSION = 3.4.3 +PYTHON_MATPLOTLIB_VERSION = 3.8.2 PYTHON_MATPLOTLIB_SOURCE = matplotlib-$(PYTHON_MATPLOTLIB_VERSION).tar.gz -PYTHON_MATPLOTLIB_SITE = https://files.pythonhosted.org/packages/21/37/197e68df384ff694f78d687a49ad39f96c67b8d75718bc61503e1676b617 +PYTHON_MATPLOTLIB_SITE = https://files.pythonhosted.org/packages/fb/ab/38a0e94cb01dacb50f06957c2bed1c83b8f9dac6618988a37b2487862944 PYTHON_MATPLOTLIB_LICENSE = Python-2.0 PYTHON_MATPLOTLIB_LICENSE_FILES = LICENSE/LICENSE PYTHON_MATPLOTLIB_DEPENDENCIES = \ @@ -14,8 +14,10 @@ PYTHON_MATPLOTLIB_DEPENDENCIES = \ host-pkgconf \ host-python-certifi \ host-python-numpy \ + host-python-setuptools-scm \ libpng \ python-cycler \ + python-pybind \ qhull PYTHON_MATPLOTLIB_SETUP_TYPE = setuptools @@ -24,7 +26,7 @@ PYTHON_MATPLOTLIB_DEPENDENCIES += python-pyqt5 endif define PYTHON_MATPLOTLIB_COPY_SETUP_CFG - cp $(PYTHON_MATPLOTLIB_PKGDIR)/setup.cfg $(@D)/setup.cfg + cp $(PYTHON_MATPLOTLIB_PKGDIR)/setup.cfg $(@D)/mplsetup.cfg endef PYTHON_MATPLOTLIB_PRE_CONFIGURE_HOOKS += PYTHON_MATPLOTLIB_COPY_SETUP_CFG From fd1ede59aa603abc4a4b21adc33ca47a59addb93 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Wed, 20 Dec 2023 21:28:18 +0100 Subject: [PATCH 4233/5754] package/libnvme: bump to version 1.7.1 Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/libnvme/libnvme.hash | 2 +- package/libnvme/libnvme.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libnvme/libnvme.hash b/package/libnvme/libnvme.hash index 2a446eaf0a..69963578cd 100644 --- a/package/libnvme/libnvme.hash +++ b/package/libnvme/libnvme.hash @@ -1,3 +1,3 @@ # Locally calculated sha256 checksums -sha256 93febccd2e4201a6a9c696a0208a7227adfd1649ad0523754c1885503890e77c libnvme-1.7.tar.gz +sha256 e9c3ad59c068788faf0f0af4296f92f8ce410d12749f0f35a541d6a21e630393 libnvme-1.7.1.tar.gz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libnvme/libnvme.mk b/package/libnvme/libnvme.mk index 688624a79e..813f7279e8 100644 --- a/package/libnvme/libnvme.mk +++ b/package/libnvme/libnvme.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNVME_VERSION = 1.7 +LIBNVME_VERSION = 1.7.1 LIBNVME_SITE = $(call github,linux-nvme,libnvme,v$(LIBNVME_VERSION)) LIBNVME_LICENSE = LGPL-2.1 LIBNVME_LICENSE_FILES = COPYING From fdeb41bda6c3f56012264cf38a8d3ae466f04320 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 17 Dec 2023 18:25:14 +0100 Subject: [PATCH 4234/5754] package/transmission: bump version to 4.0.5 Release notes: https://github.com/transmission/transmission/releases/tag/4.0.5 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 74b3a654b5..ed600c7699 100644 --- a/package/transmission/transmission.hash +++ b/package/transmission/transmission.hash @@ -1,4 +1,4 @@ # From https://transmissionbt.com/download -sha256 15f7b4318fdfbffb19aa8d9a6b0fd89348e6ef1e86baa21a0806ffd1893bd5a6 transmission-4.0.4.tar.xz +sha256 fd68ff114a479200043c30c7e69dba4c1932f7af36ca4c5b5d2edcb5866e6357 transmission-4.0.5.tar.xz # Locally calculated sha256 f56732960a61ecf3b9637404eef1a39221d2006336a98792b7b65a79f155449c COPYING diff --git a/package/transmission/transmission.mk b/package/transmission/transmission.mk index efb46c0feb..f1130aeadd 100644 --- a/package/transmission/transmission.mk +++ b/package/transmission/transmission.mk @@ -4,7 +4,7 @@ # ################################################################################ -TRANSMISSION_VERSION = 4.0.4 +TRANSMISSION_VERSION = 4.0.5 TRANSMISSION_SOURCE = transmission-$(TRANSMISSION_VERSION).tar.xz TRANSMISSION_SITE = https://github.com/transmission/transmission/releases/download/$(TRANSMISSION_VERSION) TRANSMISSION_DEPENDENCIES = \ From d107888e38f8c34e7ce429552bb77ade5247ce88 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Mon, 18 Dec 2023 12:39:46 -0700 Subject: [PATCH 4235/5754] package/sway/Config.in: remove duplicate dependencies Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- package/sway/Config.in | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/package/sway/Config.in b/package/sway/Config.in index f8d073520f..26b5b2ecea 100644 --- a/package/sway/Config.in +++ b/package/sway/Config.in @@ -2,17 +2,15 @@ config BR2_PACKAGE_SWAY bool "sway" depends on BR2_PACKAGE_SYSTEMD # is required by the sd-bus provider depends on !BR2_STATIC_LIBS # wlroots - depends on BR2_TOOLCHAIN_HAS_THREADS # wlroots + depends on BR2_TOOLCHAIN_HAS_THREADS # pango, wlroots depends on BR2_PACKAGE_HAS_LIBEGL # wlroots depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND # wlroots depends on BR2_PACKAGE_HAS_LIBGLES # wlroots depends on BR2_PACKAGE_HAS_UDEV # wlroots - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c, pango depends on BR2_USE_WCHAR # pango - depends on BR2_TOOLCHAIN_HAS_THREADS # pango depends on BR2_USE_MMU # pango depends on BR2_INSTALL_LIBSTDCPP # pango - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pango select BR2_PACKAGE_WLROOTS select BR2_PACKAGE_JSON_C From 7e767c81a837883f8035bb7d7ee3925218adcd80 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Mon, 18 Dec 2023 12:39:47 -0700 Subject: [PATCH 4236/5754] package/sway/Config.in: select BR2_PACKAGE_XKEYBOARD_CONFIG Much like weston, this is a runtime dependency. Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- package/sway/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/sway/Config.in b/package/sway/Config.in index 26b5b2ecea..08b6911069 100644 --- a/package/sway/Config.in +++ b/package/sway/Config.in @@ -18,6 +18,7 @@ config BR2_PACKAGE_SWAY select BR2_PACKAGE_CAIRO select BR2_PACKAGE_CAIRO_PNG select BR2_PACKAGE_PANGO + select BR2_PACKAGE_XKEYBOARD_CONFIG # runtime help i3-compatible Wayland compositor From 996b786cfc03c3cf2ac631045650545c901e3075 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Mon, 18 Dec 2023 12:39:49 -0700 Subject: [PATCH 4237/5754] package/tllist: new package Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/tllist/Config.in | 6 ++++++ package/tllist/tllist.hash | 3 +++ package/tllist/tllist.mk | 16 ++++++++++++++++ 5 files changed, 27 insertions(+) create mode 100644 package/tllist/Config.in create mode 100644 package/tllist/tllist.hash create mode 100644 package/tllist/tllist.mk diff --git a/DEVELOPERS b/DEVELOPERS index 311dcd9504..4c8a94ebb6 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -39,6 +39,7 @@ F: package/flutter-pi/ F: package/flutter-sdk-bin/ F: package/python-kmod/ F: package/python-versioneer/ +F: package/tllist/ F: support/testing/tests/package/test_firewalld.py F: support/testing/tests/package/test_flutter.py diff --git a/package/Config.in b/package/Config.in index a91ff8d345..ccef66e1ea 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2203,6 +2203,7 @@ endif source "package/tbb/Config.in" source "package/tinycbor/Config.in" source "package/tl-expected/Config.in" + source "package/tllist/Config.in" source "package/tz/Config.in" source "package/tzdata/Config.in" source "package/uvw/Config.in" diff --git a/package/tllist/Config.in b/package/tllist/Config.in new file mode 100644 index 0000000000..879119d13e --- /dev/null +++ b/package/tllist/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_TLLIST + bool "tllist" + help + A C header file only implementation of a typed linked list. + + https://codeberg.org/dnkl/tllist diff --git a/package/tllist/tllist.hash b/package/tllist/tllist.hash new file mode 100644 index 0000000000..2806d62355 --- /dev/null +++ b/package/tllist/tllist.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 3f3fe2f7433719cec816c63937a7aa36e566bd317763ef46d11562073ab6361d 1.1.0.tar.gz +sha256 d534a23a31500a0ac958d9634b84f532bd73ff1aca1bb8f7debbcbebc16ff39a LICENSE diff --git a/package/tllist/tllist.mk b/package/tllist/tllist.mk new file mode 100644 index 0000000000..88a28d2427 --- /dev/null +++ b/package/tllist/tllist.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# tllist +# +################################################################################ + +TLLIST_VERSION = 1.1.0 +TLLIST_SOURCE = $(TLLIST_VERSION).tar.gz +TLLIST_SITE = https://codeberg.org/dnkl/tllist/archive +TLLIST_LICENSE = MIT +TLLIST_LICENSE_FILES = LICENSE +# header only +TLLIST_INSTALL_TARGET = NO +TLLIST_INSTALL_STAGING = YES + +$(eval $(meson-package)) From de5a82755d11ebd2f351a7c8f9250838542fce43 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Mon, 18 Dec 2023 12:39:50 -0700 Subject: [PATCH 4238/5754] package/fcft: new package Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/fcft/Config.in | 52 ++++++++++++++++++++++++++++++++++++++++++ package/fcft/fcft.hash | 3 +++ package/fcft/fcft.mk | 44 +++++++++++++++++++++++++++++++++++ 5 files changed, 101 insertions(+) create mode 100644 package/fcft/Config.in create mode 100644 package/fcft/fcft.hash create mode 100644 package/fcft/fcft.mk diff --git a/DEVELOPERS b/DEVELOPERS index 4c8a94ebb6..6e5bebeea6 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -33,6 +33,7 @@ F: package/vulkan-tools/ N: Adam Duskett F: package/depot-tools/ +F: package/fcft/ F: package/flutter-engine/ F: package/flutter-gallery/ F: package/flutter-pi/ diff --git a/package/Config.in b/package/Config.in index ccef66e1ea..ce8b8a610e 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2225,6 +2225,7 @@ menu "Text and terminal handling" source "package/cli11/Config.in" source "package/docopt-cpp/Config.in" source "package/enchant/Config.in" + source "package/fcft/Config.in" source "package/fmt/Config.in" source "package/fstrcmp/Config.in" source "package/icu/Config.in" diff --git a/package/fcft/Config.in b/package/fcft/Config.in new file mode 100644 index 0000000000..b65515a3f1 --- /dev/null +++ b/package/fcft/Config.in @@ -0,0 +1,52 @@ +config BR2_PACKAGE_FCFT + bool "fcft" + depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_FONTCONFIG + select BR2_PACKAGE_FREETYPE + select BR2_PACKAGE_PIXMAN + select BR2_PACKAGE_TLLIST + help + A simple library for font loading and glyph rasterization + using FontConfig, FreeType and pixman. + + https://codeberg.org/dnkl/fcft + +if BR2_PACKAGE_FCFT + +config BR2_PACKAGE_FCFT_GRAPHEME_SHAPING + bool "grapheme-shaping" + depends on BR2_INSTALL_LIBSTDCPP # harfbuzz + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # harfbuzz + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # harfbuzz + select BR2_PACKAGE_HARFBUZZ + help + Enables shaping of individual grapheme clusters + +comment "grapheme-shaping needs a toolchain w/ C++, gcc >= 4.9" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + +config BR2_PACKAGE_FCFT_RUN_SHAPING + bool "run-shaping" + depends on BR2_INSTALL_LIBSTDCPP # harfbuzz + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # harfbuzz + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # harfbuzz + select BR2_PACKAGE_HARFBUZZ + select BR2_PACKAGE_UTF8PROC + help + Enables shaping of whole text runs. + +comment "run-shaping needs a toolchain w/ C++, gcc >= 4.9" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + +config BR2_PACKAGE_FCFT_SVG_SUPPORT + bool "svg support" + help + Enables svg support. This option increases the size of the + library by approximately 55KB. + +endif # BR2_PACKAGE_FCFT + +comment "fcft needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/fcft/fcft.hash b/package/fcft/fcft.hash new file mode 100644 index 0000000000..96d885db1d --- /dev/null +++ b/package/fcft/fcft.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 904f40d749d198d97c46c5a459cd3c53fe92f008cf1e3e61949f6cf3036a78b7 3.1.6.tar.gz +sha256 d534a23a31500a0ac958d9634b84f532bd73ff1aca1bb8f7debbcbebc16ff39a LICENSE diff --git a/package/fcft/fcft.mk b/package/fcft/fcft.mk new file mode 100644 index 0000000000..538d8a0748 --- /dev/null +++ b/package/fcft/fcft.mk @@ -0,0 +1,44 @@ +################################################################################ +# +# fcft +# +################################################################################ + +FCFT_VERSION = 3.1.6 +FCFT_SOURCE = $(FCFT_VERSION).tar.gz +FCFT_SITE = https://codeberg.org/dnkl/fcft/archive +FCFT_LICENSE = MIT +FCFT_LICENSE_FILES = LICENSE +FCFT_INSTALL_STAGING = YES + +FCFT_DEPENDENCIES = \ + fontconfig \ + freetype \ + pixman \ + tllist + +FCFT_CONF_OPTS = \ + -Ddocs=disabled \ + -Dexamples=false + +ifeq ($(BR2_PACKAGE_FCFT_GRAPHEME_SHAPING),y) +FCFT_DEPENDENCIES += harfbuzz +FCFT_CONF_OPTS += -Dgrapheme-shaping=enabled +else +FCFT_CONF_OPTS += -Dgrapheme-shaping=disabled +endif + +ifeq ($(BR2_PACKAGE_FCFT_RUN_SHAPING),y) +FCFT_DEPENDENCIES += harfbuzz utf8proc +FCFT_CONF_OPTS += -Drun-shaping=enabled +else +FCFT_CONF_OPTS += -Drun-shaping=disabled +endif + +ifeq ($(BR2_PACKAGE_FCFT_SVG_SUPPORT),y) +FCFT_CONF_OPTS += -Dsvg-backend='nanosvg' +else +FCFT_CONF_OPTS += -Dsvg-backend='none' +endif + +$(eval $(meson-package)) From 02c818bc5c7a6967a212f12e4caa8ccdfa0b452b Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Mon, 18 Dec 2023 12:39:51 -0700 Subject: [PATCH 4239/5754] package/libutempter: new package Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + .../0001-force-symlink-creation.patch | 36 +++++++++++++++++++ package/libutempter/Config.in | 11 ++++++ package/libutempter/libutempter.hash | 3 ++ package/libutempter/libutempter.mk | 27 ++++++++++++++ 6 files changed, 79 insertions(+) create mode 100644 package/libutempter/0001-force-symlink-creation.patch create mode 100644 package/libutempter/Config.in create mode 100644 package/libutempter/libutempter.hash create mode 100644 package/libutempter/libutempter.mk diff --git a/DEVELOPERS b/DEVELOPERS index 6e5bebeea6..874e7bd3d2 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -38,6 +38,7 @@ F: package/flutter-engine/ F: package/flutter-gallery/ F: package/flutter-pi/ F: package/flutter-sdk-bin/ +F: package/libutempter/ F: package/python-kmod/ F: package/python-versioneer/ F: package/tllist/ diff --git a/package/Config.in b/package/Config.in index ce8b8a610e..7d4d624253 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2164,6 +2164,7 @@ menu "Other" source "package/libunwind/Config.in" source "package/liburcu/Config.in" source "package/liburing/Config.in" + source "package/libutempter/Config.in" source "package/libuv/Config.in" source "package/lightning/Config.in" source "package/linux-pam/Config.in" diff --git a/package/libutempter/0001-force-symlink-creation.patch b/package/libutempter/0001-force-symlink-creation.patch new file mode 100644 index 0000000000..c30928afd5 --- /dev/null +++ b/package/libutempter/0001-force-symlink-creation.patch @@ -0,0 +1,36 @@ +From 13e0a4ca67d860bc8f1e3b2ad6a3926758d76b47 Mon Sep 17 00:00:00 2001 +From: Adam Duskett +Date: Wed, 22 Nov 2023 14:09:13 -0700 +Subject: [PATCH] force symlink creation + +Force symlink creation to avoid errors when reinstalling + +Upstream: https://github.com/altlinux/libutempter/pull/5 +Signed-off-by: Adam Duskett +--- + Makefile | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Makefile b/Makefile +index 8c90121..1cfc627 100644 +--- a/Makefile ++++ b/Makefile +@@ -83,12 +83,12 @@ install: + $(INSTALL) -p -m644 $(PROJECT).h $(DESTDIR)$(includedir)/ + $(INSTALL) -p -m755 $(SHAREDLIB) $(DESTDIR)$(libdir)/$(SHAREDLIB).$(VERSION) + $(INSTALL) -p -m644 $(STATICLIB) $(DESTDIR)$(libdir)/ +- ln -s $(SHAREDLIB).$(VERSION) $(DESTDIR)$(libdir)/$(SONAME) +- ln -s $(SONAME) $(DESTDIR)$(libdir)/$(SHAREDLIB) ++ ln -sf $(SHAREDLIB).$(VERSION) $(DESTDIR)$(libdir)/$(SONAME) ++ ln -sf $(SONAME) $(DESTDIR)$(libdir)/$(SHAREDLIB) + $(INSTALL) -p -m644 $(PROJECT).3 $(DESTDIR)$(man3dir)/ + for n in lib$(PROJECT) utempter_add_record utempter_remove_record \ + utempter_remove_added_record utempter_set_helper; do \ +- ln -s $(PROJECT).3 $(DESTDIR)$(man3dir)/$$n.3; \ ++ ln -sf $(PROJECT).3 $(DESTDIR)$(man3dir)/$$n.3; \ + done + + clean: +-- +2.42.0 + diff --git a/package/libutempter/Config.in b/package/libutempter/Config.in new file mode 100644 index 0000000000..a06a240418 --- /dev/null +++ b/package/libutempter/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_LIBUTEMPTER + bool "libutempter" + help + The libutempter library provides interface for terminal + emulators such as screen and xterm to record user + sessions to utmp and wtmp files. + + http://ftp.altlinux.org/pub/people/ldv/utempter/ + +comment "libutempter 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/libutempter/libutempter.hash b/package/libutempter/libutempter.hash new file mode 100644 index 0000000000..53a6c6db63 --- /dev/null +++ b/package/libutempter/libutempter.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 967fef372f391de501843ad87570c6cf5dabd9651f00f1783090fbc12b2a34cb libutempter-1.2.1.tar.gz +sha256 ce64d5f7b49ea6d80fdb6d4cdee6839d1a94274f7493dc797c3b55b65ec8e9ed COPYING diff --git a/package/libutempter/libutempter.mk b/package/libutempter/libutempter.mk new file mode 100644 index 0000000000..44b0dc38b0 --- /dev/null +++ b/package/libutempter/libutempter.mk @@ -0,0 +1,27 @@ +################################################################################ +# +# libutempter +# +################################################################################ + +LIBUTEMPTER_VERSION = 1.2.1 +LIBUTEMPTER_SITE = ftp.altlinux.org/pub/people/ldv/utempter +LIBUTEMPTER_INSTALL_STAGING = YES +LIBUTEMPTER_LICENSE = LGPL-2.1 +LIBUTEMPTER_LICENSE_FILES = COPYING + +define LIBUTEMPTER_BUILD_CMDS + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) +endef + +define LIBUTEMPTER_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) \ + $(MAKE) DESTDIR=$(STAGING_DIR) PREFIX=/usr -C $(@D)/ install +endef + +define LIBUTEMPTER_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) \ + $(MAKE) DESTDIR=$(TARGET_DIR) PREFIX=/usr -C $(@D)/ install +endef + +$(eval $(generic-package)) From e59346f7db276852d40618ec04fd012bedf2e245 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 20 Dec 2023 23:38:19 +0100 Subject: [PATCH 4240/5754] package/libutempter: fix license information According to the source file: This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. Signed-off-by: Thomas Petazzoni --- package/libutempter/libutempter.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libutempter/libutempter.mk b/package/libutempter/libutempter.mk index 44b0dc38b0..d51f70049c 100644 --- a/package/libutempter/libutempter.mk +++ b/package/libutempter/libutempter.mk @@ -7,7 +7,7 @@ LIBUTEMPTER_VERSION = 1.2.1 LIBUTEMPTER_SITE = ftp.altlinux.org/pub/people/ldv/utempter LIBUTEMPTER_INSTALL_STAGING = YES -LIBUTEMPTER_LICENSE = LGPL-2.1 +LIBUTEMPTER_LICENSE = LGPL-2.1+ LIBUTEMPTER_LICENSE_FILES = COPYING define LIBUTEMPTER_BUILD_CMDS From af8c0e5c746b11872b57e660afc2118e882f7722 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 20 Dec 2023 21:01:07 +0100 Subject: [PATCH 4241/5754] package/glibc: add proper CPE ID version detail As reported in bug 15895, the GLIBC_VERSION field having a value looking like 2.38-27-g750a45a783906a19591fb8ff6b7841470f1f5701, it prevents the CPE/CVE matching with the NVD database to work correctly. This commit fixes that by defining GLIBC_CPE_ID_VERSION, derived from GLIBC_VERSION, by extracting the base version. Also, we update GLIBC_IGNORE_CVES to account for the CVEs that have clearly been fixed between 2.38 and 2.38-27-g750a45a783906a19591fb8ff6b7841470f1f5701. There are a number of other CVEs still affecting the glibc package, but they are not related to this 2.38...2.38-27-g750a45a783906a19591fb8ff6b7841470f1f5701 range. Fixes: #15895 Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- package/glibc/glibc.mk | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index 0b71530310..32e6516c7f 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -20,6 +20,22 @@ GLIBC_LICENSE = GPL-2.0+ (programs), LGPL-2.1+, BSD-3-Clause, MIT (library) GLIBC_LICENSE_FILES = COPYING COPYING.LIB LICENSES GLIBC_CPE_ID_VENDOR = gnu +# Extract the base version (e.g. 2.38) from GLIBC_VERSION) in order to +# allow proper matching with the CPE database. +GLIBC_CPE_ID_VERSION = $(word 1, $(subst -,$(space),$(GLIBC_VERSION))) + +# Fixed by b25508dd774b617f99419bdc3cf2ace4560cd2d6, which is between +# 2.38 and the version we're really using +GLIBC_IGNORE_CVES += CVE-2023-4527 + +# Fixed by 750a45a783906a19591fb8ff6b7841470f1f5710, which is between +# 2.38 and the version we're really using. +GLIBC_IGNORE_CVES += CVE-2023-4911 + +# Fixed by 5ee59ca371b99984232d7584fe2b1a758b4421d3, which is between +# 2.38 and the version we're really using. +GLIBC_IGNORE_CVES += CVE-2023-5156 + # glibc is part of the toolchain so disable the toolchain dependency GLIBC_ADD_TOOLCHAIN_DEPENDENCY = NO From adaae82c5872aa611b18a4c81bf60be268696442 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 20 Dec 2023 21:01:08 +0100 Subject: [PATCH 4242/5754] package/glibc: ignore CVEs not considered as security issues by upstream 5 CVEs affecting glibc according to the NVD database are considered as not being security issues by upstream glibc developers: * CVE-2010-4756: The glob implementation in the GNU C Library (aka glibc or libc6) allows remote authenticated users to cause a denial of service (CPU and memory consumption) via crafted glob expressions that do not match any pathnames. glibc maintainers position: "That's standard POSIX behaviour implemented by (e)glibc. Applications using glob need to impose limits for themselves" * CVE-2019-1010022: GNU Libc current is affected by: Mitigation bypass. The impact is: Attacker may bypass stack guard protection. The component is: nptl. The attack vector is: Exploit stack buffer overflow vulnerability and use this bypass vulnerability to bypass stack guard. NOTE: Upstream comments indicate "this is being treated as a non-security bug and no real threat. glibc maintainers position: "Not treated as a security issue by upstream https://sourceware.org/bugzilla/show_bug.cgi?id=22850" * CVE-2019-1010023: GNU Libc current is affected by: Re-mapping current loaded library with malicious ELF file. The impact is: In worst case attacker may evaluate privileges. The component is: libld. The attack vector is: Attacker sends 2 ELF files to victim and asks to run ldd on it. ldd execute code. NOTE: Upstream comments indicate "this is being treated as a non-security bug and no real threat. glibc maintainers position: "Not treated as a security issue by upstream https://sourceware.org/bugzilla/show_bug.cgi?id=22851" * CVE-2019-1010024: GNU Libc current is affected by: Mitigation bypass. The impact is: Attacker may bypass ASLR using cache of thread stack and heap. The component is: glibc. NOTE: Upstream comments indicate "this is being treated as a non-security bug and no real threat. glibc maintainers position: "Not treated as a security issue by upstream https://sourceware.org/bugzilla/show_bug.cgi?id=22852" * CVE-2019-1010025: GNU Libc current is affected by: Mitigation bypass. The impact is: Attacker may guess the heap addresses of pthread_created thread. The component is: glibc. NOTE: the vendor's position is "ASLR bypass itself is not a vulnerability. Glibc maintainers position: "Not treated as a security issue by upstream https://sourceware.org/bugzilla/show_bug.cgi?id=22853" Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- package/glibc/glibc.mk | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index 32e6516c7f..29411c58e2 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -36,6 +36,20 @@ GLIBC_IGNORE_CVES += CVE-2023-4911 # 2.38 and the version we're really using. GLIBC_IGNORE_CVES += CVE-2023-5156 +# All these CVEs are considered as not being security issues by +# upstream glibc: +# https://security-tracker.debian.org/tracker/CVE-2010-4756 +# https://security-tracker.debian.org/tracker/CVE-2019-1010022 +# https://security-tracker.debian.org/tracker/CVE-2019-1010023 +# https://security-tracker.debian.org/tracker/CVE-2019-1010024 +# https://security-tracker.debian.org/tracker/CVE-2019-1010025 +GLIBC_IGNORE_CVES += \ + CVE-2010-4756 \ + CVE-2019-1010022 \ + CVE-2019-1010023 \ + CVE-2019-1010024 \ + CVE-2019-1010025 + # glibc is part of the toolchain so disable the toolchain dependency GLIBC_ADD_TOOLCHAIN_DEPENDENCY = NO From 088ac834b7deac1f96d0c769aca015bd8dc99075 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 22 Dec 2023 07:46:00 +0200 Subject: [PATCH 4243/5754] package/libcurl: fix build with GnuTLS and no verbose A change of data logging introduced in version 8.5.0 broke the build. Add a patch to fix that. Fixes: http://autobuild.buildroot.net/results/c5b996696333c4ff1392dbb8e6b0edc9c5322ee4/ Signed-off-by: Baruch Siach Signed-off-by: Yann E. MORIN --- ...nutls-fix-build-with-disable-verbose.patch | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 package/libcurl/0001-gnutls-fix-build-with-disable-verbose.patch diff --git a/package/libcurl/0001-gnutls-fix-build-with-disable-verbose.patch b/package/libcurl/0001-gnutls-fix-build-with-disable-verbose.patch new file mode 100644 index 0000000000..25e389c972 --- /dev/null +++ b/package/libcurl/0001-gnutls-fix-build-with-disable-verbose.patch @@ -0,0 +1,60 @@ +From 0d9f9c5ea8c15c70eb420242b60179d9083c70b7 Mon Sep 17 00:00:00 2001 +From: Baruch Siach +Date: Mon, 11 Dec 2023 20:45:01 +0200 +Subject: [PATCH] gnutls: fix build with --disable-verbose + +infof() parameters must be defined event with --disable-verbose since +commit dac293cfb702 ("lib: apache style infof and trace +macros/functions"). + +Move also 'ptr' definition under !CURL_DISABLE_VERBOSE_STRINGS. + +Fixes the following build failure: + +In file included from ../lib/sendf.h:29, + from vtls/gtls.c:44: +vtls/gtls.c: In function 'Curl_gtls_verifyserver': +vtls/gtls.c:841:34: error: 'version' undeclared (first use in this function); did you mean 'session'? + 841 | gnutls_protocol_get_name(version), ptr); + | ^~~~~~~ + +Signed-off-by: Baruch Siach +Upstream: https://github.com/curl/curl/commit/af520ac9fec7d88e942f05fdcd90704adb9fa566 +--- + lib/vtls/gtls.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/lib/vtls/gtls.c b/lib/vtls/gtls.c +index f42b6d6691de..b95c5be3c5e5 100644 +--- a/lib/vtls/gtls.c ++++ b/lib/vtls/gtls.c +@@ -818,16 +818,17 @@ Curl_gtls_verifyserver(struct Curl_easy *data, + char certname[65] = ""; /* limited to 64 chars by ASN.1 */ + size_t size; + time_t certclock; +- const char *ptr; + int rc; + CURLcode result = CURLE_OK; + #ifndef CURL_DISABLE_VERBOSE_STRINGS ++ const char *ptr; + unsigned int algo; + unsigned int bits; + gnutls_protocol_t version = gnutls_protocol_get_version(session); + #endif + long * const certverifyresult = &ssl_config->certverifyresult; + ++#ifndef CURL_DISABLE_VERBOSE_STRINGS + /* the name of the cipher suite used, e.g. ECDHE_RSA_AES_256_GCM_SHA384. */ + ptr = gnutls_cipher_suite_get_name(gnutls_kx_get(session), + gnutls_cipher_get(session), +@@ -835,6 +836,7 @@ Curl_gtls_verifyserver(struct Curl_easy *data, + + infof(data, "SSL connection using %s / %s", + gnutls_protocol_get_name(version), ptr); ++#endif + + /* This function will return the peer's raw certificate (chain) as sent by + the peer. These certificates are in raw format (DER encoded for +-- +2.43.0 + From fc8eff0c76ab35db7d783ce7959193ff4c30a01e Mon Sep 17 00:00:00 2001 From: Grant Nichol Date: Sat, 23 Dec 2023 01:07:30 -0600 Subject: [PATCH 4244/5754] package/libopenssl: use riscv-specific configure target Adds BR2_PACKAGE_LIBOPENSSL_TARGET_ARCH for riscv32 and riscv64. Otherwise, riscv targets fall back to the linux-generic libopenssl configs. This exacerbates the issue partially addressed in openssl/openssl#22871 which causes build failures. Fixes a mispelling in upstream causing 0builds for riscv32 to fail when linking. Signed-off-by: Grant Nichol [yann.morin.1998@free.fr: squash the two commits together] Signed-off-by: Yann E. MORIN --- ...x-mispelling-of-extension-test-macro.patch | 30 +++++++++++++++++++ package/libopenssl/Config.in | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 package/libopenssl/0004-riscv-Fix-mispelling-of-extension-test-macro.patch diff --git a/package/libopenssl/0004-riscv-Fix-mispelling-of-extension-test-macro.patch b/package/libopenssl/0004-riscv-Fix-mispelling-of-extension-test-macro.patch new file mode 100644 index 0000000000..93b191a61c --- /dev/null +++ b/package/libopenssl/0004-riscv-Fix-mispelling-of-extension-test-macro.patch @@ -0,0 +1,30 @@ +From 68c549df05892c16b99603b9a831c79c540f268c Mon Sep 17 00:00:00 2001 +From: Grant Nichol +Date: Fri, 22 Dec 2023 23:46:39 -0600 +Subject: [PATCH] riscv: Fix mispelling of extension test macro + +When refactoring the riscv extension test macros, +RISCV_HAS_ZKND_AND_ZKNE was mispelled. + +Upstream: https://github.com/openssl/openssl/pull/23139 +Signed-off-by: Grant Nichol +--- + providers/implementations/ciphers/cipher_aes_xts_hw.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/providers/implementations/ciphers/cipher_aes_xts_hw.c b/providers/implementations/ciphers/cipher_aes_xts_hw.c +index b35b71020e..65adc47d1f 100644 +--- a/providers/implementations/ciphers/cipher_aes_xts_hw.c ++++ b/providers/implementations/ciphers/cipher_aes_xts_hw.c +@@ -285,7 +285,7 @@ static const PROV_CIPHER_HW aes_xts_rv32i_zbkb_zknd_zkne = { \ + # define PROV_CIPHER_HW_select_xts() \ + if (RISCV_HAS_ZBKB_AND_ZKND_AND_ZKNE()) \ + return &aes_xts_rv32i_zbkb_zknd_zkne; \ +-if (RISCV_HAS_ZKND_ZKNE()) \ ++if (RISCV_HAS_ZKND_AND_ZKNE()) \ + return &aes_xts_rv32i_zknd_zkne; + # else + /* The generic case */ +-- +2.43.0 + diff --git a/package/libopenssl/Config.in b/package/libopenssl/Config.in index 3199de8cfe..49958d9fd6 100644 --- a/package/libopenssl/Config.in +++ b/package/libopenssl/Config.in @@ -23,6 +23,8 @@ config BR2_PACKAGE_LIBOPENSSL_TARGET_ARCH default "linux-x86" if BR2_i386 && !BR2_TOOLCHAIN_HAS_LIBATOMIC default "linux-x86-latomic" if BR2_i386 && BR2_TOOLCHAIN_HAS_LIBATOMIC default "linux-x86_64" if BR2_x86_64 + default "linux64-riscv64" if BR2_riscv && BR2_ARCH_IS_64 + default "linux32-riscv32" if BR2_riscv && !BR2_ARCH_IS_64 # no-asm is needed with generic architectures such as # linux-generic{32,64}, see # https://github.com/openssl/openssl/issues/9839 From 5baf1ffe7ec959356b5bf4ba8dd6d7e1d4d8689c Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Fri, 22 Dec 2023 21:38:10 +0100 Subject: [PATCH 4245/5754] boot/grub2: bump to version 2.12 For release announce on mailing list, see [1]. For release general news, see [2]. This commit removes all package patches, as they are all included in this version. The .checkpackageignore file is updated accordingly (the entry for patch 0001 is removed). This commit also removes GRUB2_AVOID_AUTORECONF hooks, since patch 0001 is removed. This commit also removes the GRUB2_IGNORE_CVES entries associated to the removed patches. The version bump should now explicitly exclude those CVEs. For patches 8 and 9, the upstream commit IDs were incorrectly recorded: - patch 8 mentioned d5caac8ab79d068ad9a41030c772d03a4d4fbd7b while the actual commit is 5bff31cdb6b93d738f850834e6291df1d0b136fa - patch 9 mentioned 166a4d61448f74745afe1dac2f2cfb85d04909bf while the actual commit is 347880a13c239b4c2811c94c9a7cf78b607332e3 Finally, this commit introduces a new patch, adding a missing file in the release tarball. [1] https://lists.gnu.org/archive/html/grub-devel/2023-12/msg00052.html [2] https://git.savannah.gnu.org/gitweb/?p=grub.git;a=blob;f=NEWS;hb=refs/tags/grub-2.12 Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- .checkpackageignore | 1 - ...-core-extra_deps.lst-file-in-release.patch | 37 + ...ub_fstest.pp-depend-on-config-util.h.patch | 45 -- ...onfig-Restore-umask-for-the-grub.cfg.patch | 43 -- ...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 --- ...gnore-checksum-seed-incompat-feature.patch | 61 -- ...gnore-the-large_dir-incompat-feature.patch | 60 -- boot/grub2/grub2.hash | 4 +- boot/grub2/grub2.mk | 30 +- 24 files changed, 40 insertions(+), 2389 deletions(-) create mode 100644 boot/grub2/0001-Add-missing-grub-core-extra_deps.lst-file-in-release.patch delete mode 100644 boot/grub2/0001-Makefile-Make-grub_fstest.pp-depend-on-config-util.h.patch delete mode 100644 boot/grub2/0002-grub-mkconfig-Restore-umask-for-the-grub.cfg.patch delete mode 100644 boot/grub2/0003-loader-efi-chainloader-Simplify-the-loader-state.patch delete mode 100644 boot/grub2/0004-commands-boot-Add-API-to-pass-context-to-loader.patch delete mode 100644 boot/grub2/0005-loader-efi-chainloader-Use-grub_loader_set_ex.patch delete mode 100644 boot/grub2/0006-kern-efi-sb-Reject-non-kernel-files-in-the-shim_lock.patch delete mode 100644 boot/grub2/0007-video-Remove-trailing-whitespaces.patch delete mode 100644 boot/grub2/0008-video-readers-png-Abort-sooner-if-a-read-operation-f.patch delete mode 100644 boot/grub2/0009-video-readers-png-Refuse-to-handle-multiple-image-he.patch delete mode 100644 boot/grub2/0010-video-readers-png-Drop-greyscale-support-to-fix-heap.patch delete mode 100644 boot/grub2/0011-video-readers-png-Avoid-heap-OOB-R-W-inserting-huff-.patch delete mode 100644 boot/grub2/0012-video-readers-jpeg-Block-int-underflow-wild-pointer-.patch delete mode 100644 boot/grub2/0013-net-ip-Do-IP-fragment-maths-safely.patch delete mode 100644 boot/grub2/0014-net-http-Fix-OOB-write-for-split-http-headers.patch delete mode 100644 boot/grub2/0015-net-http-Error-out-on-headers-with-LF-without-CR.patch delete mode 100644 boot/grub2/0016-font-Fix-size-overflow-in-grub_font_get_glyph_intern.patch delete mode 100644 boot/grub2/0017-font-Fix-several-integer-overflows-in-grub_font_cons.patch delete mode 100644 boot/grub2/0018-font-Fix-an-integer-underflow-in-blit_comb.patch delete mode 100644 boot/grub2/0019-fs-ext2-Ignore-checksum-seed-incompat-feature.patch delete mode 100644 boot/grub2/0020-fs-ext2-Ignore-the-large_dir-incompat-feature.patch diff --git a/.checkpackageignore b/.checkpackageignore index 962fa705ad..99e9e0e0c5 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -104,7 +104,6 @@ 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/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/0001-Add-missing-grub-core-extra_deps.lst-file-in-release.patch b/boot/grub2/0001-Add-missing-grub-core-extra_deps.lst-file-in-release.patch new file mode 100644 index 0000000000..2a7c206b2d --- /dev/null +++ b/boot/grub2/0001-Add-missing-grub-core-extra_deps.lst-file-in-release.patch @@ -0,0 +1,37 @@ +From 4d4dae6a52b1749642261a15f5dcc1e3d4150b36 Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Fri, 22 Dec 2023 19:02:53 +0100 +Subject: [PATCH] Add missing grub-core/extra_deps.lst file in release tarball + +A file is missing in the grub-2.12 release tarballs (both .gz and .xz). +See [1]. The issue was reported in [2] and fixed upstream in [3]. + +This patch adds the missing file, on top of the release tarball. This +patch won't apply on upstream git, since the file is present in the +source repository. Since the issue is fixed upstream in [3], it is +expected upcoming releases tarballs will include the file. + +The file content was fetched from the upstream git repo: +https://git.savannah.gnu.org/gitweb/?p=grub.git;a=blob_plain;f=grub-core/extra_deps.lst;hb=refs/tags/grub-2.12 + +[1] https://ftp.gnu.org/gnu/grub/grub-2.12.tar.xz +[2] https://lists.gnu.org/archive/html/grub-devel/2023-12/msg00054.html +[3] https://git.savannah.gnu.org/gitweb/?p=grub.git;a=commit;h=b835601c7639ed1890f2d3db91900a8506011a8e + +Signed-off-by: Julien Olivain +Upstream: Fixed by: https://git.savannah.gnu.org/gitweb/?p=grub.git;a=commit;h=b835601c7639ed1890f2d3db91900a8506011a8e +--- + grub-core/extra_deps.lst | 1 + + 1 file changed, 1 insertion(+) + create mode 100644 grub-core/extra_deps.lst + +diff --git a/grub-core/extra_deps.lst b/grub-core/extra_deps.lst +new file mode 100644 +index 0000000..f44ad6a +--- /dev/null ++++ b/grub-core/extra_deps.lst +@@ -0,0 +1 @@ ++depends bli part_gpt +-- +2.43.0 + diff --git a/boot/grub2/0001-Makefile-Make-grub_fstest.pp-depend-on-config-util.h.patch b/boot/grub2/0001-Makefile-Make-grub_fstest.pp-depend-on-config-util.h.patch deleted file mode 100644 index ea8787de7a..0000000000 --- a/boot/grub2/0001-Makefile-Make-grub_fstest.pp-depend-on-config-util.h.patch +++ /dev/null @@ -1,45 +0,0 @@ -From bb08b723fa7bc56439c7bc166cff361628e73453 Mon Sep 17 00:00:00 2001 -Message-Id: -From: Stefan Agner -Date: Fri, 5 Aug 2022 08:59:52 +0200 -Subject: [PATCH] Makefile: Make grub_fstest.pp depend on config-util.h - -Warning: This commit does not apply to the GRUB git repository. This -patch applies against the release tarballs. - -Upstream status: https://lists.gnu.org/archive/html/grub-devel/2022-08/msg00045.html -Signed-off-by: Stefan Agner ---- - Makefile.am | 2 +- - Makefile.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index bf9c1ba..f08cfc0 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -51,7 +51,7 @@ libgrub_a_init.c: libgrub_a_init.lst $(top_srcdir)/geninit.sh - CLEANFILES += libgrub_a_init.c - - # For grub-fstest --grub_fstest.pp: $(grub_fstest_SOURCES) -+grub_fstest.pp: config-util.h $(grub_fstest_SOURCES) - $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(grub_fstest_CPPFLAGS) $(CPPFLAGS) \ - -D'GRUB_MOD_INIT(x)=@MARKER@x@' $^ > $@ || (rm -f $@; exit 1) - CLEANFILES += grub_fstest.pp -diff --git a/Makefile.in b/Makefile.in -index 13f2eef..2c1d20b 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -13312,7 +13312,7 @@ libgrub_a_init.c: libgrub_a_init.lst $(top_srcdir)/geninit.sh - sh $(top_srcdir)/geninit.sh `cat $<` > $@ || (rm -f $@; exit 1) - - # For grub-fstest --grub_fstest.pp: $(grub_fstest_SOURCES) -+grub_fstest.pp: config-util.h $(grub_fstest_SOURCES) - $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(grub_fstest_CPPFLAGS) $(CPPFLAGS) \ - -D'GRUB_MOD_INIT(x)=@MARKER@x@' $^ > $@ || (rm -f $@; exit 1) - --- -2.37.1 - 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 deleted file mode 100644 index ba9c8a9344..0000000000 --- a/boot/grub2/0002-grub-mkconfig-Restore-umask-for-the-grub.cfg.patch +++ /dev/null @@ -1,43 +0,0 @@ -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 - -The commit ab2e53c8a (grub-mkconfig: Honor a symlink when generating -configuration by grub-mkconfig) has inadvertently discarded umask for -creating grub.cfg in the process of running grub-mkconfig. The resulting -wrong permission (0644) would allow unprivileged users to read GRUB -configuration file content. This presents a low confidentiality risk -as grub.cfg may contain non-secured plain-text passwords. - -This patch restores the missing umask and sets the creation file mode -to 0600 preventing unprivileged access. - -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 -Signed-off-by: Thomas Petazzoni ---- - util/grub-mkconfig.in | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in -index f8cbb8d7a..84f356ea4 100644 ---- a/util/grub-mkconfig.in -+++ b/util/grub-mkconfig.in -@@ -300,7 +300,10 @@ and /etc/grub.d/* files or please file a bug report with - exit 1 - else - # none of the children aborted with error, install the new grub.cfg -+ oldumask=$(umask) -+ umask 077 - cat ${grub_cfg}.new > ${grub_cfg} -+ umask $oldumask - rm -f ${grub_cfg}.new - fi - fi --- -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 deleted file mode 100644 index f6073add0b..0000000000 --- a/boot/grub2/0003-loader-efi-chainloader-Simplify-the-loader-state.patch +++ /dev/null @@ -1,126 +0,0 @@ -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 deleted file mode 100644 index 30b410e38a..0000000000 --- a/boot/grub2/0004-commands-boot-Add-API-to-pass-context-to-loader.patch +++ /dev/null @@ -1,165 +0,0 @@ -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 deleted file mode 100644 index 4308e3170f..0000000000 --- a/boot/grub2/0005-loader-efi-chainloader-Use-grub_loader_set_ex.patch +++ /dev/null @@ -1,80 +0,0 @@ -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 deleted file mode 100644 index b6fec1e6bb..0000000000 --- a/boot/grub2/0006-kern-efi-sb-Reject-non-kernel-files-in-the-shim_lock.patch +++ /dev/null @@ -1,105 +0,0 @@ -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 deleted file mode 100644 index 94d6aeefe7..0000000000 --- a/boot/grub2/0007-video-Remove-trailing-whitespaces.patch +++ /dev/null @@ -1,689 +0,0 @@ -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 deleted file mode 100644 index 94431a4ef1..0000000000 --- a/boot/grub2/0008-video-readers-png-Abort-sooner-if-a-read-operation-f.patch +++ /dev/null @@ -1,204 +0,0 @@ -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 deleted file mode 100644 index 903d33b7b5..0000000000 --- a/boot/grub2/0009-video-readers-png-Refuse-to-handle-multiple-image-he.patch +++ /dev/null @@ -1,34 +0,0 @@ -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 deleted file mode 100644 index 686a0beafd..0000000000 --- a/boot/grub2/0010-video-readers-png-Drop-greyscale-support-to-fix-heap.patch +++ /dev/null @@ -1,173 +0,0 @@ -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 deleted file mode 100644 index 19fde07060..0000000000 --- a/boot/grub2/0011-video-readers-png-Avoid-heap-OOB-R-W-inserting-huff-.patch +++ /dev/null @@ -1,44 +0,0 @@ -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 deleted file mode 100644 index 75c3f8e43b..0000000000 --- a/boot/grub2/0012-video-readers-jpeg-Block-int-underflow-wild-pointer-.patch +++ /dev/null @@ -1,78 +0,0 @@ -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 deleted file mode 100644 index 3acec5cc20..0000000000 --- a/boot/grub2/0013-net-ip-Do-IP-fragment-maths-safely.patch +++ /dev/null @@ -1,56 +0,0 @@ -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 deleted file mode 100644 index cd249299be..0000000000 --- a/boot/grub2/0014-net-http-Fix-OOB-write-for-split-http-headers.patch +++ /dev/null @@ -1,50 +0,0 @@ -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 deleted file mode 100644 index 684bb88a9c..0000000000 --- a/boot/grub2/0015-net-http-Error-out-on-headers-with-LF-without-CR.patch +++ /dev/null @@ -1,52 +0,0 @@ -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 deleted file mode 100644 index 680df1f5e9..0000000000 --- a/boot/grub2/0016-font-Fix-size-overflow-in-grub_font_get_glyph_intern.patch +++ /dev/null @@ -1,116 +0,0 @@ -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 deleted file mode 100644 index d8e5835e18..0000000000 --- a/boot/grub2/0017-font-Fix-several-integer-overflows-in-grub_font_cons.patch +++ /dev/null @@ -1,83 +0,0 @@ -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 deleted file mode 100644 index 1d3d26fb7b..0000000000 --- a/boot/grub2/0018-font-Fix-an-integer-underflow-in-blit_comb.patch +++ /dev/null @@ -1,93 +0,0 @@ -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/0019-fs-ext2-Ignore-checksum-seed-incompat-feature.patch b/boot/grub2/0019-fs-ext2-Ignore-checksum-seed-incompat-feature.patch deleted file mode 100644 index 9a913e2279..0000000000 --- a/boot/grub2/0019-fs-ext2-Ignore-checksum-seed-incompat-feature.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 7fd5feff97c4b1f446f8fcf6d37aca0c64e7c763 Mon Sep 17 00:00:00 2001 -From: Javier Martinez Canillas -Date: Fri, 11 Jun 2021 21:36:16 +0200 -Subject: [PATCH] fs/ext2: Ignore checksum seed incompat feature - -This incompat feature is used to denote that the filesystem stored its -metadata checksum seed in the superblock. This is used to allow tune2fs -changing the UUID on a mounted metdata_csum filesystem without having -to rewrite all the disk metadata. However, the GRUB doesn't use the -metadata checksum at all. So, it can just ignore this feature if it -is enabled. This is consistent with the GRUB filesystem code in general -which just does a best effort to access the filesystem's data. - -The checksum seed incompat feature has to be removed from the ignore -list if the support for metadata checksum verification is added to the -GRUB ext2 driver later. - -Suggested-by: Eric Sandeen -Suggested-by: Lukas Czerner -Signed-off-by: Javier Martinez Canillas -Reviewed-by: Lukas Czerner -Reviewed-by: Daniel Kiper -Upstream: 7fd5feff97c4b1f446f8fcf6d37aca0c64e7c763 -Signed-off-by: Jens Maus ---- - grub-core/fs/ext2.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/grub-core/fs/ext2.c b/grub-core/fs/ext2.c -index e7dd78e66..4953a1591 100644 ---- a/grub-core/fs/ext2.c -+++ b/grub-core/fs/ext2.c -@@ -103,6 +103,7 @@ GRUB_MOD_LICENSE ("GPLv3+"); - #define EXT4_FEATURE_INCOMPAT_64BIT 0x0080 - #define EXT4_FEATURE_INCOMPAT_MMP 0x0100 - #define EXT4_FEATURE_INCOMPAT_FLEX_BG 0x0200 -+#define EXT4_FEATURE_INCOMPAT_CSUM_SEED 0x2000 - #define EXT4_FEATURE_INCOMPAT_ENCRYPT 0x10000 - - /* The set of back-incompatible features this driver DOES support. Add (OR) -@@ -123,10 +124,15 @@ GRUB_MOD_LICENSE ("GPLv3+"); - * mmp: Not really back-incompatible - was added as such to - * avoid multiple read-write mounts. Safe to ignore for this - * RO driver. -+ * checksum seed: Not really back-incompatible - was added to allow tools -+ * such as tune2fs to change the UUID on a mounted metadata -+ * checksummed filesystem. Safe to ignore for now since the -+ * driver doesn't support checksum verification. However, it -+ * has to be removed from this list if the support is added later. - */ - #define EXT2_DRIVER_IGNORED_INCOMPAT ( EXT3_FEATURE_INCOMPAT_RECOVER \ -- | EXT4_FEATURE_INCOMPAT_MMP) -- -+ | EXT4_FEATURE_INCOMPAT_MMP \ -+ | EXT4_FEATURE_INCOMPAT_CSUM_SEED) - - #define EXT3_JOURNAL_MAGIC_NUMBER 0xc03b3998U - --- -2.34.1 - diff --git a/boot/grub2/0020-fs-ext2-Ignore-the-large_dir-incompat-feature.patch b/boot/grub2/0020-fs-ext2-Ignore-the-large_dir-incompat-feature.patch deleted file mode 100644 index 43b182f968..0000000000 --- a/boot/grub2/0020-fs-ext2-Ignore-the-large_dir-incompat-feature.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 2e9fa73a040462b81bfbfe56c0bc7ad2d30b446b Mon Sep 17 00:00:00 2001 -From: Theodore Ts'o -Date: Tue, 30 Aug 2022 22:41:59 -0400 -Subject: [PATCH] fs/ext2: Ignore the large_dir incompat feature - -Recently, ext4 added the large_dir feature, which adds support for -a 3 level htree directory support. - -The GRUB supports existing file systems with htree directories by -ignoring their existence, and since the index nodes for the hash tree -look like deleted directory entries (by design), the GRUB can simply do -a brute force O(n) linear search of directories. The same is true for -3 level deep htrees indicated by large_dir feature flag. - -Hence, it is safe for the GRUB to ignore the large_dir incompat feature. - -Fixes: https://savannah.gnu.org/bugs/?61606 - -Signed-off-by: Theodore Ts'o -Reviewed-by: Daniel Kiper -Upstream: 2e9fa73a040462b81bfbfe56c0bc7ad2d30b446b -Signed-off-by: Jens Maus ---- - grub-core/fs/ext2.c | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/grub-core/fs/ext2.c b/grub-core/fs/ext2.c -index 0989e26e1..e1cc5e62a 100644 ---- a/grub-core/fs/ext2.c -+++ b/grub-core/fs/ext2.c -@@ -104,6 +104,7 @@ GRUB_MOD_LICENSE ("GPLv3+"); - #define EXT4_FEATURE_INCOMPAT_MMP 0x0100 - #define EXT4_FEATURE_INCOMPAT_FLEX_BG 0x0200 - #define EXT4_FEATURE_INCOMPAT_CSUM_SEED 0x2000 -+#define EXT4_FEATURE_INCOMPAT_LARGEDIR 0x4000 /* >2GB or 3 level htree */ - #define EXT4_FEATURE_INCOMPAT_ENCRYPT 0x10000 - - /* The set of back-incompatible features this driver DOES support. Add (OR) -@@ -129,10 +130,17 @@ GRUB_MOD_LICENSE ("GPLv3+"); - * checksummed filesystem. Safe to ignore for now since the - * driver doesn't support checksum verification. However, it - * has to be removed from this list if the support is added later. -+ * large_dir: Not back-incompatible given that the GRUB ext2 driver does -+ * not implement EXT2_FEATURE_COMPAT_DIR_INDEX. If the GRUB -+ * eventually supports the htree feature (aka dir_index) -+ * it should support 3 level htrees and then move -+ * EXT4_FEATURE_INCOMPAT_LARGEDIR to -+ * EXT2_DRIVER_SUPPORTED_INCOMPAT. - */ - #define EXT2_DRIVER_IGNORED_INCOMPAT ( EXT3_FEATURE_INCOMPAT_RECOVER \ - | EXT4_FEATURE_INCOMPAT_MMP \ -- | EXT4_FEATURE_INCOMPAT_CSUM_SEED) -+ | EXT4_FEATURE_INCOMPAT_CSUM_SEED \ -+ | EXT4_FEATURE_INCOMPAT_LARGEDIR) - - #define EXT3_JOURNAL_MAGIC_NUMBER 0xc03b3998U - --- -2.34.1 - diff --git a/boot/grub2/grub2.hash b/boot/grub2/grub2.hash index 5d9db423d4..65a8ec8e4f 100644 --- a/boot/grub2/grub2.hash +++ b/boot/grub2/grub2.hash @@ -1,5 +1,5 @@ # Locally calculated after checking signature -# https://ftp.gnu.org/gnu/grub/grub-2.06.tar.xz.sig -sha256 b79ea44af91b93d17cd3fe80bdae6ed43770678a9a5ae192ccea803ebb657ee1 grub-2.06.tar.xz +# https://ftp.gnu.org/gnu/grub/grub-2.12.tar.xz.sig +sha256 f3c97391f7c4eaa677a78e090c7e97e6dc47b16f655f04683ebd37bef7fe0faa grub-2.12.tar.xz # Locally computed: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/boot/grub2/grub2.mk b/boot/grub2/grub2.mk index 6c3a861fb6..b9be826885 100644 --- a/boot/grub2/grub2.mk +++ b/boot/grub2/grub2.mk @@ -4,7 +4,7 @@ # ################################################################################ -GRUB2_VERSION = 2.06 +GRUB2_VERSION = 2.12 GRUB2_SITE = http://ftp.gnu.org/gnu/grub GRUB2_SOURCE = grub-$(GRUB2_VERSION).tar.xz GRUB2_LICENSE = GPL-3.0+ @@ -13,13 +13,6 @@ GRUB2_DEPENDENCIES = host-bison host-flex host-grub2 HOST_GRUB2_DEPENDENCIES = host-bison host-flex GRUB2_INSTALL_IMAGES = YES -# 0001-Makefile-Make-grub_fstest.pp-depend-on-config-util.h.patch -define GRUB2_AVOID_AUTORECONF - $(Q)touch $(@D)/Makefile.in -endef -GRUB2_POST_PATCH_HOOKS += GRUB2_AVOID_AUTORECONF -HOST_GRUB2_POST_PATCH_HOOKS += GRUB2_AVOID_AUTORECONF - # CVE-2019-14865 is about a flaw in the grub2-set-bootflag tool, which # doesn't exist upstream, but is added by the Redhat/Fedora # packaging. Not applicable to Buildroot. @@ -30,29 +23,8 @@ GRUB2_IGNORE_CVES += CVE-2019-14865 # grub_linuxefi_secure_validate() is not implemented in the grub2 # version available in Buildroot. GRUB2_IGNORE_CVES += CVE-2020-15705 -# 0002-grub-mkconfig-Restore-umask-for-the-grub.cfg.patch -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 32da4422f9d2a7cdd66cde4404f7dc5d61841c3e Mon Sep 17 00:00:00 2001 From: Petr Vorel Date: Fri, 22 Dec 2023 21:53:20 +0100 Subject: [PATCH 4246/5754] package/iputils: bump version to 20231222 Signed-off-by: Petr Vorel Signed-off-by: Yann E. MORIN --- package/iputils/iputils.hash | 4 ++-- package/iputils/iputils.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/iputils/iputils.hash b/package/iputils/iputils.hash index ea23f27f3c..c2f6a40797 100644 --- a/package/iputils/iputils.hash +++ b/package/iputils/iputils.hash @@ -1,5 +1,5 @@ -# https://github.com/iputils/iputils/releases/download/20221126/sha256sum.asc -sha256 745ea711fe06d5c57d470d21acce3c3ab866eb6afb69379a16c6d60b89bd4311 iputils-20221126.tar.gz +# https://github.com/iputils/iputils/releases/download/20231222/sha256sums.asc +sha256 e3ce5e1a1f795c2d520985463b90e20f9388b7060796d54ad64509aa8e4af775 iputils-20231222.tar.gz # Locally computed sha256 2c9f29d982c48665c30b3adaf400c048988fd256eb91c691e351eb3b6a8b2036 LICENSE sha256 9acc4bc871a4742550158e3696dcb381953172ef808d04ca248184f9f6322712 Documentation/LICENSE.BSD3 diff --git a/package/iputils/iputils.mk b/package/iputils/iputils.mk index fe4468ec19..783ed9a0e7 100644 --- a/package/iputils/iputils.mk +++ b/package/iputils/iputils.mk @@ -11,7 +11,7 @@ # and IPv6 updates. # http://www.spinics.net/lists/netdev/msg279881.html -IPUTILS_VERSION = 20221126 +IPUTILS_VERSION = 20231222 IPUTILS_SITE = $(call github,iputils,iputils,$(IPUTILS_VERSION)) IPUTILS_LICENSE = GPL-2.0+, BSD-3-Clause IPUTILS_LICENSE_FILES = LICENSE Documentation/LICENSE.BSD3 Documentation/LICENSE.GPL2 From e0c8c162597733282f692bb1712ef3e5ff9b30fe Mon Sep 17 00:00:00 2001 From: Petr Vorel Date: Fri, 22 Dec 2023 21:53:21 +0100 Subject: [PATCH 4247/5754] iputils/iputils: remove note about fork After 10 years we don't have to justify the fork anymore, as it has been the new upstream for that long now. Signed-off-by: Petr Vorel Signed-off-by: Yann E. MORIN --- package/iputils/iputils.mk | 7 ------- 1 file changed, 7 deletions(-) diff --git a/package/iputils/iputils.mk b/package/iputils/iputils.mk index 783ed9a0e7..a8f93488bb 100644 --- a/package/iputils/iputils.mk +++ b/package/iputils/iputils.mk @@ -4,13 +4,6 @@ # ################################################################################ -# The original upstream was forked to the github repository in 2014 to -# pull fixes from other distribution and centralize the changes after -# the upstream seemed to have gone dormant. The fork contains the -# latest changes including musl support, removing a libsysfs dependency -# and IPv6 updates. -# http://www.spinics.net/lists/netdev/msg279881.html - IPUTILS_VERSION = 20231222 IPUTILS_SITE = $(call github,iputils,iputils,$(IPUTILS_VERSION)) IPUTILS_LICENSE = GPL-2.0+, BSD-3-Clause From 1b2498fa91b752f4cc3578600bc653ece734c001 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Fri, 22 Dec 2023 11:56:55 +0100 Subject: [PATCH 4248/5754] boot/edk2: add support for RISC-V 64bit architecture RISC-V 64bit qemu virt machine support has been added in edk2 version "stable202302". See [1]. Since edk2-stable202308, introduced in buildroot in commit 5c9f310 "boot/edk2: bump to version edk2-stable202308", it is now possible to boot the edk2 UEFI shell in qemu. This commit adds this early RISC-V support to edk2. The RISC-V edk2 UEFI shell can be booted in Buildroot with the following commands: # Build EDK2 images cat > .config <= 8.0.0 is needed to properly start edk2. A qemu version on the host system might not be sufficient. This is why the Buildroot host-qemu is built in this config example. [1] https://github.com/tianocore/edk2/releases/tag/edk2-stable202302 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- boot/edk2/Config.in | 10 ++++++++++ boot/edk2/edk2.mk | 6 ++++++ 2 files changed, 16 insertions(+) diff --git a/boot/edk2/Config.in b/boot/edk2/Config.in index bed503b168..4e6e7d122c 100644 --- a/boot/edk2/Config.in +++ b/boot/edk2/Config.in @@ -2,6 +2,7 @@ config BR2_TARGET_EDK2_ARCH_SUPPORTS bool default y if BR2_aarch64 default y if BR2_i386 + default y if BR2_RISCV_64 default y if BR2_x86_64 config BR2_TARGET_EDK2 @@ -20,6 +21,7 @@ if BR2_TARGET_EDK2 choice prompt "Platform" default BR2_TARGET_EDK2_PLATFORM_OVMF_I386 if BR2_i386 + default BR2_TARGET_EDK2_PLATFORM_OVMF_RISCV if BR2_RISCV_64 default BR2_TARGET_EDK2_PLATFORM_OVMF_X64 if BR2_x86_64 default BR2_TARGET_EDK2_PLATFORM_ARM_VIRT_QEMU if BR2_aarch64 @@ -31,6 +33,14 @@ config BR2_TARGET_EDK2_PLATFORM_OVMF_I386 This platform will boot from flash address 0x0. It should therefore be used as the first bootloader. +config BR2_TARGET_EDK2_PLATFORM_OVMF_RISCV + bool "RISC-V" + depends on BR2_RISCV_64 + help + Platform configuration for RISC-V QEMU targeting the Virt + machine. This platform will only boot from flash address + 0x0. It should therefore be used as the first bootloader. + config BR2_TARGET_EDK2_PLATFORM_OVMF_X64 bool "x86-64" depends on BR2_x86_64 diff --git a/boot/edk2/edk2.mk b/boot/edk2/edk2.mk index 186854a14c..efdb4d02ce 100644 --- a/boot/edk2/edk2.mk +++ b/boot/edk2/edk2.mk @@ -136,6 +136,12 @@ define EDK2_PRE_BUILD_QEMU_SBSA ln -srf $(BINARIES_DIR)/{bl1.bin,fip.bin} $(EDK2_BUILD_PACKAGES)/Platform/Qemu/Sbsa/ endef +else ifeq ($(BR2_TARGET_EDK2_PLATFORM_OVMF_RISCV),y) +EDK2_ARCH = RISCV64 +EDK2_PACKAGE_NAME = OvmfPkg/RiscVVirt +EDK2_PLATFORM_NAME = RiscVVirtQemu +EDK2_BUILD_DIR = $(EDK2_PLATFORM_NAME) + endif EDK2_BASETOOLS_OPTS = \ From cec73bb5f85c9eb41b2cf44dc792765e684fa7a9 Mon Sep 17 00:00:00 2001 From: Frank Vanbever Date: Fri, 22 Dec 2023 16:46:47 +0100 Subject: [PATCH 4249/5754] package/libmodsecurity: bump to version 3.0.11 Signed-off-by: Frank Vanbever Signed-off-by: Thomas Petazzoni --- package/libmodsecurity/libmodsecurity.hash | 4 ++-- package/libmodsecurity/libmodsecurity.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libmodsecurity/libmodsecurity.hash b/package/libmodsecurity/libmodsecurity.hash index 7bcf99e167..b0a1bf33f3 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.10/modsecurity-v3.0.10.tar.gz.sha256 -sha256 d5d459f7c2e57a69a405f3222d8e285de419a594b0ea8829058709962227ead0 modsecurity-v3.0.10.tar.gz +# From https://github.com/SpiderLabs/ModSecurity/releases/download/v3.0.11/modsecurity-v3.0.11.tar.gz.sha256 +sha256 070f46c779d30785b95eb1316b46e2e4e6f90fd94a96aaca4bd54cd94738b692 modsecurity-v3.0.11.tar.gz # Localy calculated sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/libmodsecurity/libmodsecurity.mk b/package/libmodsecurity/libmodsecurity.mk index 257f0a56df..548eeb8602 100644 --- a/package/libmodsecurity/libmodsecurity.mk +++ b/package/libmodsecurity/libmodsecurity.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMODSECURITY_VERSION = 3.0.10 +LIBMODSECURITY_VERSION = 3.0.11 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 4d025f88e62db50ce28730b6e732b2946fe7d5bc Mon Sep 17 00:00:00 2001 From: Colin Foster Date: Thu, 21 Dec 2023 13:08:00 -0600 Subject: [PATCH 4250/5754] support/testing: add python-tftpy runtime test This runtime test verifies the existence of the tftpy module when selected. Signed-off-by: Colin Foster Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 ++ support/testing/tests/package/sample_python_tftpy.py | 1 + support/testing/tests/package/test_python_tftpy.py | 11 +++++++++++ 3 files changed, 14 insertions(+) create mode 100644 support/testing/tests/package/sample_python_tftpy.py create mode 100644 support/testing/tests/package/test_python_tftpy.py diff --git a/DEVELOPERS b/DEVELOPERS index 874e7bd3d2..bad07d51aa 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -678,6 +678,8 @@ F: configs/beelink_gs1_defconfig N: Colin Foster F: package/python-tftpy/ F: package/rauc-hawkbit-updater/ +F: support/testing/tests/package/sample_python_tftpy.py +F: support/testing/tests/package/test_python_tftpy.py N: Corentin Guillevic F: package/libloki/ diff --git a/support/testing/tests/package/sample_python_tftpy.py b/support/testing/tests/package/sample_python_tftpy.py new file mode 100644 index 0000000000..ea4d20c9a2 --- /dev/null +++ b/support/testing/tests/package/sample_python_tftpy.py @@ -0,0 +1 @@ +import tftpy diff --git a/support/testing/tests/package/test_python_tftpy.py b/support/testing/tests/package/test_python_tftpy.py new file mode 100644 index 0000000000..d64f2c29d7 --- /dev/null +++ b/support/testing/tests/package/test_python_tftpy.py @@ -0,0 +1,11 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonTftpy(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_TFTPY=y + """ + sample_scripts = ["tests/package/sample_python_tftpy.py"] From 922132c39e233aec10835e2a4d7d8dbf92e99723 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 21 Dec 2023 15:00:39 +0100 Subject: [PATCH 4251/5754] package/putty: security bump to version 0.80 As described in the announcement, this fixes a security issue: There is one security fix in this release: - Fix for a newly discovered security issue known as the 'Terrapin' attack, also numbered CVE-2023-48795. The issue affects widely-used OpenSSH extensions to the SSH protocol: the ChaCha20+Poly1305 cipher system, and 'encrypt-then-MAC' mode. In order to benefit from the fix, you must be using a fixed version of PuTTY _and_ a server with the fix, so that they can agree to adopt a modified version of the protocol. Alternatively, you may be able to reconfigure PuTTY to avoid selecting any of the affected modes. If PuTTY 0.80 connects to an SSH server without the fix, it will warn you if the initial protocol negotiation chooses an insecure mode to run the connection in, so that you can abandon the connection. If it's possible to alter PuTTY's configuration to avoid the problem, then the warning message will tell you how to do it. https://lists.tartarus.org/pipermail/putty-announce/2023/000037.html Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- package/putty/putty.hash | 8 ++++---- package/putty/putty.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/putty/putty.hash b/package/putty/putty.hash index 0ae2a86be8..84569a31e5 100644 --- a/package/putty/putty.hash +++ b/package/putty/putty.hash @@ -1,7 +1,7 @@ -# Hashes from: http://the.earth.li/~sgtatham/putty/0.79/{sha1,sha256,sha512}sums -sha1 c40c3ce9fd334c40e64c6b33ee7e1096dad52701 putty-0.79.tar.gz -sha256 428cc8666fbb938ebf4ac9276341980dcd70de395b33164496cf7995ef0ef0d8 putty-0.79.tar.gz -sha512 4f10f870b229c89e928921d3b350955ce1c1170a062e7943d9cc8dbd83389d82a9b844623541605f0db5a429d545c2d188bf8e384c6515466fae69b216120983 putty-0.79.tar.gz +# Hashes from: http://the.earth.li/~sgtatham/putty/0.80/{sha1,sha256,sha512}sums +sha1 9c4a96f63ee3e927472191c935cc89228693c03a putty-0.80.tar.gz +sha256 2013c83a721b1753529e9090f7c3830e8fe4c80a070ccce764539badb3f67081 putty-0.80.tar.gz +sha512 c8a6b6fa54ecd8bcf4ec274fef51343dd9996e6458b250b5555c4dc88ded25e87f97277da482c29858510e65635112d541f559ab683635bd950572d850129f90 putty-0.80.tar.gz # Locally calculated sha256 7ede37f344ee03436c155a375ecb6cdb42a77105baa6e7804bf43260dc4a0c54 LICENCE diff --git a/package/putty/putty.mk b/package/putty/putty.mk index 4c9164d05e..bff6e78074 100644 --- a/package/putty/putty.mk +++ b/package/putty/putty.mk @@ -4,7 +4,7 @@ # ################################################################################ -PUTTY_VERSION = 0.79 +PUTTY_VERSION = 0.80 PUTTY_SITE = http://the.earth.li/~sgtatham/putty/$(PUTTY_VERSION) PUTTY_LICENSE = MIT PUTTY_LICENSE_FILES = LICENCE From a8362e5c85973a775a84b3f4ef0b2afb9ff26094 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 21 Dec 2023 15:22:49 +0100 Subject: [PATCH 4252/5754] package/libssh: security bump to version 0.10.6 Fixes the following security issues: - CVE-2023-6004: Command Injection using malicious hostname in expanded proxycommand https://www.libssh.org/security/advisories/CVE-2023-6004.txt - CVE-2023-48795: Avoid potential downgrade attacks by implementing strict kex https://www.libssh.org/security/advisories/CVE-2023-48795.txt - CVE-2023-6918: Avoid potential use of weak keys in low memory conditions by systematically checking return values of MD functions. https://www.libssh.org/security/advisories/CVE-2023-6918.txt Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- 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 0d61191842..e5eba219b5 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.5.tar.xz.asc +# https://www.libssh.org/files/0.10/libssh-0.10.6.tar.xz.asc # with key 8DFF53E18F2ABC8D8F3C92237EE0FC4DCC014E3D -sha256 b60e2ff7f367b9eee2b5634d3a63303ddfede0e6a18dfca88c44a8770e7e4234 libssh-0.10.5.tar.xz +sha256 1861d498f5b6f1741b6abc73e608478491edcf9c9d4b6630eef6e74596de9dc1 libssh-0.10.6.tar.xz sha256 1656186e951db1c010a8485481fa94587f7e53a26d24976bef97945ad0c4df5a COPYING diff --git a/package/libssh/libssh.mk b/package/libssh/libssh.mk index ff4cddaf91..8b995c3555 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).5 +LIBSSH_VERSION = $(LIBSSH_VERSION_MAJOR).6 LIBSSH_SOURCE = libssh-$(LIBSSH_VERSION).tar.xz LIBSSH_SITE = https://www.libssh.org/files/$(LIBSSH_VERSION_MAJOR) LIBSSH_LICENSE = LGPL-2.1 From 93d38e7c166ff6e782a45afcbac618057198a10e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 20 Dec 2023 20:01:54 +0100 Subject: [PATCH 4253/5754] package/kodi-pvr-hts: bump version to 20.7.0-Nexus Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- 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 046d234d71..a268940b0e 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 bd58fc85543447f918ee567192c87a3beb3f6e2c3fc116abe1f584514d202ada kodi-pvr-hts-20.6.5-Nexus.tar.gz +sha256 15d68d928e0794fb42fd0f3483403fb0290c5c94aa3d3b648a8a2f8e8316dfff kodi-pvr-hts-20.7.0-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 7e667ae1aa..c56d0e0546 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.5-Nexus +KODI_PVR_HTS_VERSION = 20.7.0-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 4dc9ef6895ce6dbd81eb55d7d4c11b2d820b3ce9 Mon Sep 17 00:00:00 2001 From: Xiangyu Chen Date: Wed, 20 Dec 2023 19:18:28 +0800 Subject: [PATCH 4254/5754] package/unrar: bump version to 6.2.12 According to the Debian changelog, it doesn't seem like there is any security issue addressed between 6.2.10 and 6.2.12: unrar-nonfree (1:6.2.12-1) unstable; urgency=medium * New upstream version 6.2.12 * Rediff patches -- YOKOTA Hiroshi Thu, 05 Oct 2023 20:49:53 +0900 unrar-nonfree (1:6.2.11-1) unstable; urgency=medium * New upstream version 6.2.11 -- YOKOTA Hiroshi Wed, 20 Sep 2023 21:41:29 +0900 Signed-off-by: Xiangyu Chen 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 f0600af771..c9a5f521a4 100644 --- a/package/unrar/unrar.hash +++ b/package/unrar/unrar.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 55fe6ebd5e48d6655bfda3fd19b55438ca05e13c7e69772420caad9fdb68ef42 unrarsrc-6.2.10.tar.gz +sha256 a008b5f949bca9bb4ffa1bebbfc8b3c14b89df10a10354809b845232d5f582e5 unrarsrc-6.2.12.tar.gz sha256 6ecc1687808b7d66b24f874755abfed7464d9751ed0001cd4e8e5d9bf397ff8a license.txt diff --git a/package/unrar/unrar.mk b/package/unrar/unrar.mk index ac19225937..0a61bcfcba 100644 --- a/package/unrar/unrar.mk +++ b/package/unrar/unrar.mk @@ -4,7 +4,7 @@ # ################################################################################ -UNRAR_VERSION = 6.2.10 +UNRAR_VERSION = 6.2.12 UNRAR_SOURCE = unrarsrc-$(UNRAR_VERSION).tar.gz UNRAR_SITE = https://www.rarlab.com/rar UNRAR_LICENSE = unrar From 50eed2060ae6a35be257a8773b8e217a623eb29e Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Thu, 21 Dec 2023 08:36:10 -0700 Subject: [PATCH 4255/5754] package/wlroots: add hwdata and hwdata_pnp_ids as a dependency Since upstream commit eec95e3d5e1a4f2e13b1f6b34cc287475ca57daf ("backend/drm: use pnp.ids to fetch EDID data"), the pnp.ids file from hwdata is parsed at build time to generate a C source file. As per backend/drm/meson.build: hwdata = dependency('hwdata', required: false, native: true) if hwdata.found() hwdata_dir = hwdata.get_variable(pkgconfig: 'pkgdatadir') pnp_ids = files(hwdata_dir / 'pnp.ids') else pnp_ids = files('/usr/share/hwdata/pnp.ids') endif This is only needed when the DRM backend of wlroots is enabled, but currently, Buildroot enables this backend unconditionally. This failure can be reproduced using the following defconfig: BR2_x86_64=y BR2_TOOLCHAIN_EXTERNAL=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_OSMESA_GALLIUM=y BR2_PACKAGE_MESA3D_OPENGL_EGL=y BR2_PACKAGE_MESA3D_OPENGL_ES=y BR2_PACKAGE_WLROOTS=y The issue was not caught in the autobuilders because the last successful build of a configuration that includes wlroots dates back from 2022-05-05, at which time Buildroot had wlroots 0.15.1. This change in wlroots was introduced in wlroots 0.16.0, which means that it's only since Buildroot bumped from 0.15.1 to 0.16.2 in d6279bc82c02b43c9a2f28c36639e092b9e9e08b ("package/wlroots: bump to version 0.16.2") that the issue occurs. This commit is not yet in any tagged release, so there is no need to backport this fix. It should be noted that the proposed patch also installs pnp.ids to the target filesystem, while it is in practice not needed at runtime by wlroots. However, our current hwdata packaging doesn't allow installing it only in staging, and since wlroots anyway implies we're building a fairly heavy graphics stack, the size overhead of hwdata is deemed to be an acceptable trade-off. Signed-off-by: Adam Duskett [Thomas: further extend the commit log, with details gathered by Yann and myself.] Signed-off-by: Thomas Petazzoni --- package/wlroots/Config.in | 2 ++ package/wlroots/wlroots.mk | 1 + 2 files changed, 3 insertions(+) diff --git a/package/wlroots/Config.in b/package/wlroots/Config.in index fb23e9069c..7622a3033b 100644 --- a/package/wlroots/Config.in +++ b/package/wlroots/Config.in @@ -16,6 +16,8 @@ config BR2_PACKAGE_WLROOTS depends on BR2_PACKAGE_HAS_LIBEGL depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND depends on BR2_PACKAGE_HAS_LIBGLES + select BR2_PACKAGE_HWDATA + select BR2_PACKAGE_HWDATA_PNP_IDS select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_LIBINPUT select BR2_PACKAGE_LIBXKBCOMMON diff --git a/package/wlroots/wlroots.mk b/package/wlroots/wlroots.mk index b478e57abb..bb5c8f497d 100644 --- a/package/wlroots/wlroots.mk +++ b/package/wlroots/wlroots.mk @@ -13,6 +13,7 @@ WLROOTS_INSTALL_STAGING = YES WLROOTS_DEPENDENCIES = \ host-pkgconf \ host-wayland \ + hwdata \ libinput \ libxkbcommon \ libegl \ From f2799e80a29d7a7a9723017b6f8b9803e6189577 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Wed, 6 Dec 2023 21:41:04 +0100 Subject: [PATCH 4256/5754] package/rtl8723bu: bump to 2023-12-04 version This version allows to build with Linux 6.7 Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/rtl8723bu/rtl8723bu.hash | 2 +- package/rtl8723bu/rtl8723bu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rtl8723bu/rtl8723bu.hash b/package/rtl8723bu/rtl8723bu.hash index bc3b8fc727..66efdaf771 100644 --- a/package/rtl8723bu/rtl8723bu.hash +++ b/package/rtl8723bu/rtl8723bu.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 d0db523f256795d8f3284fa2ec03855f231747ede8337e878bc096325b965654 rtl8723bu-92c19318cb54ef96c2cfb4a22b2c98eb512812d8.tar.gz +sha256 a36511894a612a9a05254e5938dafcc32b5ca46b8912582ccca84708e0f82cf9 rtl8723bu-49cb04d796d44debe965c1597f397f34ae277dbc.tar.gz diff --git a/package/rtl8723bu/rtl8723bu.mk b/package/rtl8723bu/rtl8723bu.mk index ad9bb9a462..7796def113 100644 --- a/package/rtl8723bu/rtl8723bu.mk +++ b/package/rtl8723bu/rtl8723bu.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8723BU_VERSION = 92c19318cb54ef96c2cfb4a22b2c98eb512812d8 +RTL8723BU_VERSION = 49cb04d796d44debe965c1597f397f34ae277dbc RTL8723BU_SITE = $(call github,lwfinger,rtl8723bu,$(RTL8723BU_VERSION)) RTL8723BU_LICENSE = GPL-2.0, proprietary (*.bin firmware blobs) From cf4ebfafaa2d8bc2c646029013f02c2cf048c8b9 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Wed, 6 Dec 2023 21:07:30 +0100 Subject: [PATCH 4257/5754] package/rtl8188eu: bump to 2023-12-04 version on v5.2.2.4 branch This version allows to build with Linux 6.7 Signed-off-by: Giulio Benetti Reviewed-by: Luca Ceresoli Signed-off-by: Thomas Petazzoni --- package/rtl8188eu/rtl8188eu.hash | 2 +- package/rtl8188eu/rtl8188eu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rtl8188eu/rtl8188eu.hash b/package/rtl8188eu/rtl8188eu.hash index b3ead087d4..eb28e6cf0a 100644 --- a/package/rtl8188eu/rtl8188eu.hash +++ b/package/rtl8188eu/rtl8188eu.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6bf8c026c7d875248f18f14de6fd116cac178db9bdb5bdbc1e267c8ac6b6237f rtl8188eu-3ff6f7d84cb5346ed8d5dc21056769f2e03746d9.tar.gz +sha256 8cb10a047d39f13c776b0097ef1290f6b3c63590fd57bc0827e8638c878819f0 rtl8188eu-306f3e62cf7cddf8cee74f70f88a7a7b3af46f56.tar.gz sha256 af8067302947c01fd9eee72befa54c7e3ef8a48fecde7fd71277f2290b2bf0f7 COPYING diff --git a/package/rtl8188eu/rtl8188eu.mk b/package/rtl8188eu/rtl8188eu.mk index f475bf3cab..36a84d34de 100644 --- a/package/rtl8188eu/rtl8188eu.mk +++ b/package/rtl8188eu/rtl8188eu.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8188EU_VERSION = 3ff6f7d84cb5346ed8d5dc21056769f2e03746d9 +RTL8188EU_VERSION = 306f3e62cf7cddf8cee74f70f88a7a7b3af46f56 RTL8188EU_SITE = $(call github,lwfinger,rtl8188eu,$(RTL8188EU_VERSION)) RTL8188EU_LICENSE = GPL-2.0, proprietary (rtl8188eufw.bin firmware blob) RTL8188EU_LICENSE_FILES = COPYING From fbf939b03a5d21144eb84e488ed9db8baad54c23 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Fri, 15 Dec 2023 20:50:14 +0100 Subject: [PATCH 4258/5754] package/lua-ansicolors: new package Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/lua-ansicolors/Config.in | 6 ++++++ package/lua-ansicolors/lua-ansicolors.hash | 3 +++ package/lua-ansicolors/lua-ansicolors.mk | 14 ++++++++++++++ 4 files changed, 24 insertions(+) create mode 100644 package/lua-ansicolors/Config.in create mode 100644 package/lua-ansicolors/lua-ansicolors.hash create mode 100644 package/lua-ansicolors/lua-ansicolors.mk diff --git a/package/Config.in b/package/Config.in index 7d4d624253..083372131c 100644 --- a/package/Config.in +++ b/package/Config.in @@ -715,6 +715,7 @@ menu "Lua libraries/modules" source "package/lpty/Config.in" source "package/lrandom/Config.in" source "package/lsqlite3/Config.in" + source "package/lua-ansicolors/Config.in" source "package/lua-argon2/Config.in" source "package/lua-augeas/Config.in" source "package/lua-basexx/Config.in" diff --git a/package/lua-ansicolors/Config.in b/package/lua-ansicolors/Config.in new file mode 100644 index 0000000000..33ffdde723 --- /dev/null +++ b/package/lua-ansicolors/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_LUA_ANSICOLORS + bool "lua-ansicolors" + help + Library for color Manipulation. + + https://github.com/kikito/ansicolors.lua diff --git a/package/lua-ansicolors/lua-ansicolors.hash b/package/lua-ansicolors/lua-ansicolors.hash new file mode 100644 index 0000000000..53208afaed --- /dev/null +++ b/package/lua-ansicolors/lua-ansicolors.hash @@ -0,0 +1,3 @@ +# computed by luarocks/buildroot +sha256 df6126501af3b9b944019164a08aed91377d82e6845c24432769140f12c815d6 ansicolors-1.0.2-3.src.rock +sha256 cf2980c520ea89935bbe8a5415c5e0ff2606ffc7a89d6854796d856fa066c48e ansicolors.lua-1.0.2/COPYING diff --git a/package/lua-ansicolors/lua-ansicolors.mk b/package/lua-ansicolors/lua-ansicolors.mk new file mode 100644 index 0000000000..5879b66e63 --- /dev/null +++ b/package/lua-ansicolors/lua-ansicolors.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# lua-ansicolors +# +################################################################################ + +LUA_ANSICOLORS_VERSION_UPSTREAM = 1.0.2 +LUA_ANSICOLORS_VERSION = $(LUA_ANSICOLORS_VERSION_UPSTREAM)-3 +LUA_ANSICOLORS_NAME_UPSTREAM = ansicolors +LUA_ANSICOLORS_SUBDIR = ansicolors.lua-$(LUA_ANSICOLORS_VERSION_UPSTREAM) +LUA_ANSICOLORS_LICENSE = MIT +LUA_ANSICOLORS_LICENSE_FILES = $(LUA_ANSICOLORS_SUBDIR)/COPYING + +$(eval $(luarocks-package)) From e70abe9716109068b7c9176dced5396719f64c24 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Fri, 15 Dec 2023 20:50:15 +0100 Subject: [PATCH 4259/5754] package/lua-argparse: new package Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/lua-argparse/Config.in | 6 ++++++ package/lua-argparse/lua-argparse.hash | 3 +++ package/lua-argparse/lua-argparse.mk | 12 ++++++++++++ 4 files changed, 22 insertions(+) create mode 100644 package/lua-argparse/Config.in create mode 100644 package/lua-argparse/lua-argparse.hash create mode 100644 package/lua-argparse/lua-argparse.mk diff --git a/package/Config.in b/package/Config.in index 083372131c..73d286a861 100644 --- a/package/Config.in +++ b/package/Config.in @@ -717,6 +717,7 @@ menu "Lua libraries/modules" source "package/lsqlite3/Config.in" source "package/lua-ansicolors/Config.in" source "package/lua-argon2/Config.in" + source "package/lua-argparse/Config.in" source "package/lua-augeas/Config.in" source "package/lua-basexx/Config.in" source "package/lua-binaryheap/Config.in" diff --git a/package/lua-argparse/Config.in b/package/lua-argparse/Config.in new file mode 100644 index 0000000000..503a001c99 --- /dev/null +++ b/package/lua-argparse/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_LUA_ARGPARSE + bool "lua-argparse" + help + A feature-rich command-line argument parser. + + https://github.com/luarocks/argparse diff --git a/package/lua-argparse/lua-argparse.hash b/package/lua-argparse/lua-argparse.hash new file mode 100644 index 0000000000..c573ba5796 --- /dev/null +++ b/package/lua-argparse/lua-argparse.hash @@ -0,0 +1,3 @@ +# computed by luarocks/buildroot +sha256 ea30d0643586a20aeb6349ca8cb7db63aefc21d9aa007c7b7168a7c564817879 argparse-0.7.1-1.src.rock +sha256 9a918f21485b2a4529c901491d9101392f03586d65ad5b024a4445ebc1dc37b4 argparse-0.7.1/LICENSE diff --git a/package/lua-argparse/lua-argparse.mk b/package/lua-argparse/lua-argparse.mk new file mode 100644 index 0000000000..77f6550fac --- /dev/null +++ b/package/lua-argparse/lua-argparse.mk @@ -0,0 +1,12 @@ +################################################################################ +# +# lua-argparse +# +################################################################################ + +LUA_ARGPARSE_VERSION = 0.7.1-1 +LUA_ARGPARSE_NAME_UPSTREAM = argparse +LUA_ARGPARSE_LICENSE = MIT +LUA_ARGPARSE_LICENSE_FILES = $(LUA_ARGPARSE_SUBDIR)/LICENSE + +$(eval $(luarocks-package)) From ef851d6d93d120648d62572c8f8f570ab8c34fa2 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 6 Dec 2023 10:39:40 +0100 Subject: [PATCH 4260/5754] package/lua-messagepack: bump to version 0.5.4 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/lua-messagepack/lua-messagepack.hash | 6 +++--- package/lua-messagepack/lua-messagepack.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/lua-messagepack/lua-messagepack.hash b/package/lua-messagepack/lua-messagepack.hash index 6c650ce14b..f61a351383 100644 --- a/package/lua-messagepack/lua-messagepack.hash +++ b/package/lua-messagepack/lua-messagepack.hash @@ -1,4 +1,4 @@ # computed by luarocks/buildroot -sha256 fe39b8ad92acf13f91d8660a04ab8fc9fb5d6370f99304d46cab8137ee9147b8 lua-messagepack-0.5.3-1.src.rock -sha256 a7c1842ab7404104c941bc71809cd41c7685b4cd5edd4f1925f9cbe434f3ed4a lua-messagepack-lua53-0.5.3-1.src.rock -sha256 1dbe8e7da2d71088d4759da33a42eda89f5be90d1a9c0b823360a270d6628ed8 lua-MessagePack-0.5.3/COPYRIGHT +sha256 86e5aedc94342f1447b3cac26dfacc69f05b0827221cd5e44d3b623087b16f37 lua-messagepack-0.5.4-1.src.rock +sha256 3ed7ac22e50b06e63f91a16ad6457381af7317f1bccd778f104a4513c1cc118b lua-messagepack-lua53-0.5.4-1.src.rock +sha256 1dbe8e7da2d71088d4759da33a42eda89f5be90d1a9c0b823360a270d6628ed8 lua-MessagePack-0.5.4/COPYRIGHT diff --git a/package/lua-messagepack/lua-messagepack.mk b/package/lua-messagepack/lua-messagepack.mk index 390f85c6e3..7e5ab006c9 100644 --- a/package/lua-messagepack/lua-messagepack.mk +++ b/package/lua-messagepack/lua-messagepack.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_MESSAGEPACK_VERSION_UPSTREAM = 0.5.3 +LUA_MESSAGEPACK_VERSION_UPSTREAM = 0.5.4 LUA_MESSAGEPACK_VERSION = $(LUA_MESSAGEPACK_VERSION_UPSTREAM)-1 ifeq ($(BR2_PACKAGE_LUA_5_3)$(BR2_PACKAGE_LUA_5_4),y) LUA_MESSAGEPACK_NAME_UPSTREAM = lua-MessagePack-lua53 From 85882c69a9d4ed1e821634e1535157ed16c46ac6 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 6 Dec 2023 10:39:41 +0100 Subject: [PATCH 4261/5754] package/lua-conciseserialization: new package Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/lua-conciseserialization/Config.in | 6 ++++++ .../lua-conciseserialization.hash | 4 ++++ .../lua-conciseserialization.mk | 18 ++++++++++++++++++ 4 files changed, 29 insertions(+) create mode 100644 package/lua-conciseserialization/Config.in create mode 100644 package/lua-conciseserialization/lua-conciseserialization.hash create mode 100644 package/lua-conciseserialization/lua-conciseserialization.mk diff --git a/package/Config.in b/package/Config.in index 73d286a861..ae7c3e261a 100644 --- a/package/Config.in +++ b/package/Config.in @@ -728,6 +728,7 @@ menu "Lua libraries/modules" source "package/lua-coatpersistent/Config.in" source "package/lua-codegen/Config.in" source "package/lua-compat53/Config.in" + source "package/lua-conciseserialization/Config.in" source "package/lua-cqueues/Config.in" source "package/lua-csnappy/Config.in" source "package/lua-curl/Config.in" diff --git a/package/lua-conciseserialization/Config.in b/package/lua-conciseserialization/Config.in new file mode 100644 index 0000000000..b660147008 --- /dev/null +++ b/package/lua-conciseserialization/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_LUA_CONCISESERIALIZATION + bool "lua-conciseserialization" + help + a pure Lua implementation of CBOR / RFC8949. + + https://fperrad.frama.io/lua-ConciseSerialization/ diff --git a/package/lua-conciseserialization/lua-conciseserialization.hash b/package/lua-conciseserialization/lua-conciseserialization.hash new file mode 100644 index 0000000000..30ae4536f6 --- /dev/null +++ b/package/lua-conciseserialization/lua-conciseserialization.hash @@ -0,0 +1,4 @@ +# computed by luarocks/buildroot +sha256 1dd7a5bd17349ad78e93b36f05739e4323a8fda8cd66dee423bdd5a21a0c4453 lua-conciseserialization-0.2.4-1.src.rock +sha256 7988a3ab9ea3d8c536387c4e7931b1703fa02f7011771569ed56641fa1a0c78c lua-conciseserialization-lua53-0.2.4-1.src.rock +sha256 23ddf0d4a4dbc0667eeb919ceb7cc0a5b527af6cb51b286b78fa42f350de2130 lua-ConciseSerialization-0.2.4/COPYRIGHT diff --git a/package/lua-conciseserialization/lua-conciseserialization.mk b/package/lua-conciseserialization/lua-conciseserialization.mk new file mode 100644 index 0000000000..a777a4baea --- /dev/null +++ b/package/lua-conciseserialization/lua-conciseserialization.mk @@ -0,0 +1,18 @@ +################################################################################ +# +# lua-conciseserialization +# +################################################################################ + +LUA_CONCISESERIALIZATION_VERSION_UPSTREAM = 0.2.4 +LUA_CONCISESERIALIZATION_VERSION = $(LUA_CONCISESERIALIZATION_VERSION_UPSTREAM)-1 +ifeq ($(BR2_PACKAGE_LUA_5_3)$(BR2_PACKAGE_LUA_5_4),y) +LUA_CONCISESERIALIZATION_NAME_UPSTREAM = lua-ConciseSerialization-lua53 +else +LUA_CONCISESERIALIZATION_NAME_UPSTREAM = lua-ConciseSerialization +endif +LUA_CONCISESERIALIZATION_SUBDIR = lua-ConciseSerialization-$(LUA_CONCISESERIALIZATION_VERSION_UPSTREAM) +LUA_CONCISESERIALIZATION_LICENSE = MIT +LUA_CONCISESERIALIZATION_LICENSE_FILES = $(LUA_CONCISESERIALIZATION_SUBDIR)/COPYRIGHT + +$(eval $(luarocks-package)) From 601fef4ab55319ef8f2f28bf0c1fb8f06f502b0a Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 6 Dec 2023 10:39:42 +0100 Subject: [PATCH 4262/5754] package/lua-ubjson: new package Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/lua-ubjson/Config.in | 7 +++++++ package/lua-ubjson/lua-ubjson.hash | 3 +++ package/lua-ubjson/lua-ubjson.mk | 11 +++++++++++ 4 files changed, 22 insertions(+) create mode 100644 package/lua-ubjson/Config.in create mode 100644 package/lua-ubjson/lua-ubjson.hash create mode 100644 package/lua-ubjson/lua-ubjson.mk diff --git a/package/Config.in b/package/Config.in index ae7c3e261a..bc723fe018 100644 --- a/package/Config.in +++ b/package/Config.in @@ -761,6 +761,7 @@ menu "Lua libraries/modules" source "package/lua-std-normalize/Config.in" source "package/lua-stdlib/Config.in" source "package/lua-testmore/Config.in" + source "package/lua-ubjson/Config.in" source "package/lua-utf8/Config.in" source "package/lua-valua/Config.in" source "package/lua-zlib/Config.in" diff --git a/package/lua-ubjson/Config.in b/package/lua-ubjson/Config.in new file mode 100644 index 0000000000..88ed2c7c79 --- /dev/null +++ b/package/lua-ubjson/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_LUA_UBJSON + bool "lua-ubjson" + select BR2_PACKAGE_LUA_COMPAT53 if BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_1 # runtime + help + a pure Lua implementation of UBJSON. + + https://fperrad.frama.io/lua-ubjson/ diff --git a/package/lua-ubjson/lua-ubjson.hash b/package/lua-ubjson/lua-ubjson.hash new file mode 100644 index 0000000000..6db046ec2f --- /dev/null +++ b/package/lua-ubjson/lua-ubjson.hash @@ -0,0 +1,3 @@ +# computed by luarocks/buildroot +sha256 6605a6a0ca5f6cb8ec1aac14840adcdc6b359f5d8666fb3d224510e8d73c43b9 lua-ubjson-0.1.0-1.src.rock +sha256 c85f6b3d47bcde28fd15bc7e361cdc5ec6b580819f4a891e29cf89513abbadd2 lua-ubjson-0.1.0/COPYRIGHT diff --git a/package/lua-ubjson/lua-ubjson.mk b/package/lua-ubjson/lua-ubjson.mk new file mode 100644 index 0000000000..93e6631962 --- /dev/null +++ b/package/lua-ubjson/lua-ubjson.mk @@ -0,0 +1,11 @@ +################################################################################ +# +# lua-ubjson +# +################################################################################ + +LUA_UBJSON_VERSION = 0.1.0-1 +LUA_UBJSON_LICENSE = MIT +LUA_UBJSON_LICENSE_FILES = $(LUA_UBJSON_SUBDIR)/COPYRIGHT + +$(eval $(luarocks-package)) From c9c28434b2bc3f0bf87b17ab8733b6709861b093 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Mon, 18 Dec 2023 23:47:47 +0100 Subject: [PATCH 4263/5754] package/swupdate: bump version to 2023.12 * make json-c mandatory according to [0] * make libubootenv mandatory according to [1] * drop local patch that has been upstreamed [2] * libconfig is not mandatory anymore if no lua parser is enabled * adjust Config.in comment according to json-c and libubootenv [0]: https://github.com/sbabic/swupdate/commit/82e75322443e021d119a026a3476c410f4705d67 [1]: https://github.com/sbabic/swupdate/commit/75838874e2575f822ed85d89532f47e9adf781b6 [2]: https://github.com/sbabic/swupdate/commit/1999685830d6e9b57014666b9e53e46de17a471c Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- ...001-include-util-h-fix-build-on-musl.patch | 41 ------------------- package/swupdate/Config.in | 13 +++--- package/swupdate/swupdate.hash | 2 +- package/swupdate/swupdate.mk | 17 +------- 4 files changed, 9 insertions(+), 64 deletions(-) delete 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 deleted file mode 100644 index d1e0db6b56..0000000000 --- a/package/swupdate/0001-include-util-h-fix-build-on-musl.patch +++ /dev/null @@ -1,41 +0,0 @@ -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 diff --git a/package/swupdate/Config.in b/package/swupdate/Config.in index 7d9fc90e10..ba3f6a0c0f 100644 --- a/package/swupdate/Config.in +++ b/package/swupdate/Config.in @@ -3,9 +3,9 @@ config BR2_PACKAGE_SWUPDATE depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork() - # swupdate requires a parser and uses libconfig as default - select BR2_PACKAGE_LIBCONFIG if !BR2_PACKAGE_JSON_C && \ - !BR2_PACKAGE_HAS_LUAINTERPRETER + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c + select BR2_PACKAGE_JSON_C + select BR2_PACKAGE_LIBUBOOTENV help swupdate provides a reliable way to update the software on an embedded system. @@ -37,14 +37,12 @@ config BR2_PACKAGE_SWUPDATE remote handler. * Select BR2_PACKAGE_LIBRSYNC to add support for using rdiff handler. - * Select BR2_PACKAGE_LIBUBOOTENV to add support for setting - the U-Boot environment. * Select BR2_PACKAGE_LIBGPIOD to add support for microcontroller firmware update. * Select BR2_PACKAGE_EFIBOOTMGR to add support for EFI Boot Guard. - * Select BR2_PACKAGE_LIBCURL, BR2_PACKAGE_JSON_C, - BR2_PACKAGE_LIBWEBSOCKETS, and BR2_PACKAGE_LIBURIPARSER + * Select BR2_PACKAGE_LIBCURL, BR2_PACKAGE_LIBWEBSOCKETS, + and BR2_PACKAGE_LIBURIPARSER to add support for the SWU forwarder. https://sbabic.github.io/swupdate @@ -89,4 +87,5 @@ endif comment "swupdate needs a toolchain w/ dynamic library, threads" depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/swupdate/swupdate.hash b/package/swupdate/swupdate.hash index 72b71ce12d..c19a82304f 100644 --- a/package/swupdate/swupdate.hash +++ b/package/swupdate/swupdate.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 888df5050035e4fbe14e3a964885646fa3163e727f78c423c3d24c28f7a50b66 swupdate-2023.05.tar.gz +sha256 ce24032300e2b6a6faa3d22e49f981fd90f04ac6f5d7e802166824b0cd5ca669 swupdate-2023.12.tar.gz sha256 4cf04ed34ff0ebbf5c71345b56e6af5093fc17206364cca0ebbae92ef3940683 LICENSES/BSD-1-Clause.txt sha256 e27a3e87706b3aa5ff2e50eaafe2e6ed5397fbf2d7679eaf444a6d000518a3a6 LICENSES/BSD-3-Clause.txt sha256 0558101984550fa84d1d13c2af11d116c20079d2be58711e8d99cadce7009192 LICENSES/CC0-1.0.txt diff --git a/package/swupdate/swupdate.mk b/package/swupdate/swupdate.mk index ea4a5a62e5..ca8c140886 100644 --- a/package/swupdate/swupdate.mk +++ b/package/swupdate/swupdate.mk @@ -4,7 +4,7 @@ # ################################################################################ -SWUPDATE_VERSION = 2023.05 +SWUPDATE_VERSION = 2023.12 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 \ @@ -18,6 +18,7 @@ SWUPDATE_LICENSE_FILES = LICENSES/BSD-1-Clause.txt \ LICENSES/MIT.txt \ LICENSES/OFL-1.1.txt SWUPDATE_INSTALL_STAGING = YES +SWUPDATE_DEPENDENCIES = json-c libubootenv # swupdate uses $CROSS-cc instead of $CROSS-gcc, which is not # available in all external toolchains, and use CC for linking. Ensure @@ -36,13 +37,6 @@ else SWUPDATE_MAKE_ENV += HAVE_LIBEXT2FS=n endif -ifeq ($(BR2_PACKAGE_JSON_C),y) -SWUPDATE_DEPENDENCIES += json-c -SWUPDATE_MAKE_ENV += HAVE_JSON_C=y -else -SWUPDATE_MAKE_ENV += HAVE_JSON_C=n -endif - ifeq ($(BR2_PACKAGE_LIBARCHIVE),y) SWUPDATE_DEPENDENCIES += libarchive SWUPDATE_MAKE_ENV += HAVE_LIBARCHIVE=y @@ -85,13 +79,6 @@ else SWUPDATE_MAKE_ENV += HAVE_LIBGPIOD=n 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) SWUPDATE_DEPENDENCIES += liburiparser SWUPDATE_MAKE_ENV += HAVE_URIPARSER=y From 9dc526aa47f5ca73091504b596d629deb7c227d6 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 4 Dec 2023 22:18:51 +0100 Subject: [PATCH 4264/5754] package/cmake: bump version to 3.27.9 Changelog: https://cmake.org/cmake/help/v3.27/release/3.27.html#updates Release notes: https://www.kitware.com/cmake-3-27-8-available-for-download/ https://www.kitware.com/cmake-3-27-9-available-for-download/ 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 e495061bae..fbf0786232 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.7-SHA-256.txt -sha256 08f71a106036bf051f692760ef9558c0577c42ac39e96ba097e7662bd4158d8e cmake-3.27.7.tar.gz +# From https://cmake.org/files/v3.27/cmake-3.27.9-SHA-256.txt +sha256 609a9b98572a6a5ea477f912cffb973109ed4d0a6a6b3f9e2353d2cdc048708e cmake-3.27.9.tar.gz # Locally calculated sha256 4a01ccf2dc580ba570d02bc015bbe0ec92f1f318717aae9540ba841ba7946756 Copyright.txt diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk index 41278bf6db..7506e964a9 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).7 +CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).9 CMAKE_SITE = https://cmake.org/files/v$(CMAKE_VERSION_MAJOR) CMAKE_LICENSE = BSD-3-Clause CMAKE_LICENSE_FILES = Copyright.txt From ce52fd55969c330868fdae2cb10c6f325a8f42c8 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 4 Dec 2023 22:18:26 +0100 Subject: [PATCH 4265/5754] package/xmrig: bump version to 6.21.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 eab24a7eab..3a54d66ce4 100644 --- a/package/xmrig/xmrig.hash +++ b/package/xmrig/xmrig.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 86c62eb6db83981b21ac1faac69c28fee2952cbbc207ea7476707d4f1799633f xmrig-6.20.0.tar.gz +sha256 4b197c71fa06030216b641b4ea57f7a3d977a17df1b55bd13759d4705dbf5941 xmrig-6.21.0.tar.gz sha256 589ed823e9a84c56feb95ac58e7cf384626b9cbf4fda2a907bc36e103de1bad2 LICENSE diff --git a/package/xmrig/xmrig.mk b/package/xmrig/xmrig.mk index 982ccc8c5d..35cd1d8d82 100644 --- a/package/xmrig/xmrig.mk +++ b/package/xmrig/xmrig.mk @@ -4,7 +4,7 @@ # ################################################################################ -XMRIG_VERSION = 6.20.0 +XMRIG_VERSION = 6.21.0 XMRIG_SITE = $(call github,xmrig,xmrig,v$(XMRIG_VERSION)) XMRIG_LICENSE = GPL-3.0+ XMRIG_LICENSE_FILES = LICENSE From d344ffe6245b7ab67cbd4a2371c35354211983e3 Mon Sep 17 00:00:00 2001 From: Kilian Zinnecker Date: Wed, 6 Dec 2023 20:25:27 +0100 Subject: [PATCH 4266/5754] configs/rock5b: add hash for custom uboot The defconfig uses a custom uboot version, downloaded with wget, so we weant to be sure that it does not get modified on the server, so we add a hash for it. The kernel we get from a git clone, so the sha1 of the commit is enough to be sure that what we get is what we expect (because we do a local tarball out of a git clone). Since we only get a hash for uboot and not for the kernel, we don't enable BR2_DOWNLOAD_FORCE_CHECK_HASHES. Signed-off-by: Kilian Zinnecker Signed-off-by: Yann E. MORIN --- board/radxa/rock5b/patches/uboot/uboot.hash | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 board/radxa/rock5b/patches/uboot/uboot.hash diff --git a/board/radxa/rock5b/patches/uboot/uboot.hash b/board/radxa/rock5b/patches/uboot/uboot.hash new file mode 100644 index 0000000000..efd629bd2f --- /dev/null +++ b/board/radxa/rock5b/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 12e921b466ae731cdbc355e6832b7f22bc90b01aeceef9886f98aaba7b394300 u-boot-2023.07.tar.bz2 From 9ebbfeff38770876e48a4d38741dd9fffc001a42 Mon Sep 17 00:00:00 2001 From: Kilian Zinnecker Date: Wed, 6 Dec 2023 20:25:27 +0100 Subject: [PATCH 4267/5754] configs/rock5b: add hash for custom kernel Commit d344ffe6245b (configs/rock5b: add hash for custom uboot) explicitly noted that the kernel was retrieved from a git-clone, so the sha1 of the commit was enough to get what we expect. However, that does not account for the fact that the upstream repository can disapear or be temporarily unavailable (maliciously or not). In that case, the kernel archive will be looked up on the backup mirror. In that case, the download is via wget over https, which protects the transport, but does not guarantee that the remote server serves the expected archive. The hash file was dropped when d344ffe6245b was applied; restore it. Since the defconfig now has hashes for all its downloads, enforce checking hashes. Signed-off-by: Kilian Zinnecker Signed-off-by: Yann E. MORIN --- board/radxa/rock5b/patches/linux/linux.hash | 2 ++ configs/rock5b_defconfig | 1 + 2 files changed, 3 insertions(+) create mode 100644 board/radxa/rock5b/patches/linux/linux.hash diff --git a/board/radxa/rock5b/patches/linux/linux.hash b/board/radxa/rock5b/patches/linux/linux.hash new file mode 100644 index 0000000000..95ad749554 --- /dev/null +++ b/board/radxa/rock5b/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 a5eca7b8f929a1918125e2e4fbd7ab4ea5b3910b5ae4547e81c794b47373ffb5 linux-52f51a2b5ba178f331af62260d2da86d7472c14b-br1.tar.gz diff --git a/configs/rock5b_defconfig b/configs/rock5b_defconfig index eed656ef5f..2e72b386b1 100644 --- a/configs/rock5b_defconfig +++ b/configs/rock5b_defconfig @@ -6,6 +6,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="" BR2_TARGET_GENERIC_HOSTNAME="rock5b" BR2_TARGET_GENERIC_ISSUE="Welcome to the rock5b board" BR2_GLOBAL_PATCH_DIR="board/radxa/rock5b/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_SYSTEM_DHCP="eth0" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y From 4873799fe761ed3ac97c4f54f8079edbfd4047ef Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Wed, 29 Nov 2023 11:04:29 -0700 Subject: [PATCH 4268/5754] package/openrc: bump version to 0.52.1 The runscript and rc binaries have been removed in this release. However, Buildroot does not use those binaries, so only a simple version bump is necessary. Fixes: - cgroups being inconsistent - Start-stop-daemon did not work correctly on Linux 6.6 Tested on Debian 11 and Fedora 39 with the following command: ./support/testing/run-tests tests.init.test_openrc Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- package/openrc/openrc.hash | 2 +- package/openrc/openrc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/openrc/openrc.hash b/package/openrc/openrc.hash index 698acf4978..c1c16a8c45 100644 --- a/package/openrc/openrc.hash +++ b/package/openrc/openrc.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4ec46f2729c77c4387146b491c4d121f5cba48bff2f0aeaff99895dcda5cea85 openrc-0.51.tar.gz +sha256 0b911eee4e64ad5e6945c6fed572220d537dfd0108838fa6d6797a2d7ff9f052 openrc-0.52.1.tar.gz sha256 6ac2bf77510808fbec7dc86cbfbca98dfc4c6b47dc99e4ca77b5370e097d8e70 LICENSE diff --git a/package/openrc/openrc.mk b/package/openrc/openrc.mk index 63aec7615e..0dd6a5d1ac 100644 --- a/package/openrc/openrc.mk +++ b/package/openrc/openrc.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENRC_VERSION = 0.51 +OPENRC_VERSION = 0.52.1 OPENRC_SITE = $(call github,OpenRC,openrc,$(OPENRC_VERSION)) OPENRC_LICENSE = BSD-2-Clause OPENRC_LICENSE_FILES = LICENSE From 297c88cfca6586e05769cc41ae755bcce6d69044 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fl=C3=A1vio=20Tapaj=C3=B3s?= Date: Thu, 30 Nov 2023 14:53:33 -0300 Subject: [PATCH 4269/5754] configs/asus_tinker-s_rk3288_defconfig: use zImage by default MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Migrates tinker-s away from deprecated uImage Signed-off-by: Flávio Tapajós Signed-off-by: Thomas Petazzoni --- board/asus/tinker-s/extlinux.conf | 2 +- configs/asus_tinker-s_rk3288_defconfig | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/board/asus/tinker-s/extlinux.conf b/board/asus/tinker-s/extlinux.conf index 5a2d05b811..61ebe50c71 100644 --- a/board/asus/tinker-s/extlinux.conf +++ b/board/asus/tinker-s/extlinux.conf @@ -1,4 +1,4 @@ label Tinker linux - kernel /boot/uImage + kernel /boot/zImage devicetree /boot/rk3288-tinker-s.dtb append console=ttyS2,115200n8 root=179:1 rootwait diff --git a/configs/asus_tinker-s_rk3288_defconfig b/configs/asus_tinker-s_rk3288_defconfig index 7082869881..00b42990f8 100644 --- a/configs/asus_tinker-s_rk3288_defconfig +++ b/configs/asus_tinker-s_rk3288_defconfig @@ -25,8 +25,6 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.65" BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" -BR2_LINUX_KERNEL_UIMAGE=y -BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x02000000" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="rk3288-tinker-s" BR2_LINUX_KERNEL_INSTALL_TARGET=y From 9b26461bb0d47efd518267401172df7833730a16 Mon Sep 17 00:00:00 2001 From: Scott Fan Date: Fri, 8 Dec 2023 08:09:57 +0800 Subject: [PATCH 4270/5754] configs/beaglebone_defconfig: bump Linux to 6.1.46-ti-r13 and U-Boot to 2023.10 The linux defconfig 'bb.org_defconfig' is the best for beagleboard. To load compressed kernel modules, kmod and xz packages are needed because busybox doesn't support it. Bump U-Boot to version 2023.10. The uboot-tools package is no need. Tested on beaglebone black. [1] https://github.com/beagleboard/linux/releases/tag/6.1.46-ti-r13 Signed-off-by: Scott Fan Signed-off-by: Thomas Petazzoni --- configs/beaglebone_defconfig | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/configs/beaglebone_defconfig b/configs/beaglebone_defconfig index 7e006e7a85..e2d67019b1 100644 --- a/configs/beaglebone_defconfig +++ b/configs/beaglebone_defconfig @@ -3,11 +3,8 @@ BR2_arm=y BR2_cortex_a8=y BR2_ARM_FPU_VFPV3=y -# Patches -BR2_GLOBAL_PATCH_DIR="board/beaglebone/patches" - -# 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_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y @@ -20,8 +17,8 @@ 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-r59)/linux-5.10.162-ti-r59.tar.gz" -BR2_LINUX_KERNEL_DEFCONFIG="omap2plus" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,6.1.46-ti-r13)/linux-6.1.46-ti-r13.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="bb.org" 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" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y @@ -34,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="2023.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am335x_evm" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y @@ -48,6 +45,9 @@ BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -# Supporting host tools to build FIT image -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y +# Enable compressed kernel module support +BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y +BR2_PACKAGE_KMOD_TOOLS=y +BR2_PACKAGE_XZ=y +BR2_PACKAGE_KMOD=y +BR2_PACKAGE_HOST_KMOD_XZ=y From 33153b0ac965371bd79d4b1aa53b31fb05d5edaa Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 4 Dec 2023 22:18:04 +0100 Subject: [PATCH 4271/5754] package/intel-gmmlib: bump version to 22.3.14 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 c71f2593d1..01b573d1e9 100644 --- a/package/intel-gmmlib/intel-gmmlib.hash +++ b/package/intel-gmmlib/intel-gmmlib.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 14ec859936aea696a65e6b9488e95a0ac26b15126ef65b20956ef219004dd9a6 intel-gmmlib-22.3.12.tar.gz +sha256 63b879a5a20756b6f74244068f4555a56c4f705c96cbc87e5163448a893e133f intel-gmmlib-22.3.14.tar.gz sha256 8b7446825df3f8b0268307e272aa6aaaf78351c83161d860d02c913c22666c48 LICENSE.md diff --git a/package/intel-gmmlib/intel-gmmlib.mk b/package/intel-gmmlib/intel-gmmlib.mk index 578a6ab762..c1a92aaf4f 100644 --- a/package/intel-gmmlib/intel-gmmlib.mk +++ b/package/intel-gmmlib/intel-gmmlib.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_GMMLIB_VERSION = 22.3.12 +INTEL_GMMLIB_VERSION = 22.3.14 INTEL_GMMLIB_SITE = https://github.com/intel/gmmlib/archive INTEL_GMMLIB_LICENSE = MIT INTEL_GMMLIB_LICENSE_FILES = LICENSE.md From 216e4491357ead1711e8021335491439a316af40 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 4 Dec 2023 22:18:05 +0100 Subject: [PATCH 4272/5754] package/onevpl: bump version to 2023.4.0 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/onevpl/onevpl.hash | 2 +- package/onevpl/onevpl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/onevpl/onevpl.hash b/package/onevpl/onevpl.hash index c9ca1e6c04..328fa94487 100644 --- a/package/onevpl/onevpl.hash +++ b/package/onevpl/onevpl.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4411543519486a2450f6f5af06a077596e7888a551768594e9dfa2a46b23b6f5 onevpl-2023.3.1.tar.gz +sha256 978398c7bb1665a6ad7a1a15cc57dc0204608e56c88436e376b717320a9e63fd onevpl-2023.4.0.tar.gz sha256 bf1cfac2e2792b6e1e995ce103d70796aecaf2ec7e4c5fe5474f7acec7b4a677 LICENSE diff --git a/package/onevpl/onevpl.mk b/package/onevpl/onevpl.mk index 601e121a55..1a580d0636 100644 --- a/package/onevpl/onevpl.mk +++ b/package/onevpl/onevpl.mk @@ -4,7 +4,7 @@ # ################################################################################ -ONEVPL_VERSION = 2023.3.1 +ONEVPL_VERSION = 2023.4.0 ONEVPL_SITE = $(call github,oneapi-src,oneVPL,v$(ONEVPL_VERSION)) ONEVPL_LICENSE = MIT ONEVPL_LICENSE_FILES = LICENSE From 7260675c7dca07c431da51337dc42e86013d3ddf Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 4 Dec 2023 22:18:06 +0100 Subject: [PATCH 4273/5754] package/intel-mediadriver: bump version to 23.4.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 93930f07f2..d3173260b1 100644 --- a/package/intel-mediadriver/intel-mediadriver.hash +++ b/package/intel-mediadriver/intel-mediadriver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 67fd15654bb3c596feb8c85e81221de5632e11f598421c35adc4453d727f0130 intel-media-23.3.5.tar.gz +sha256 321f2ade9e55ed5b8809ca875d80c81245093fe9f8a26a39712d2f4a6be18d18 intel-media-23.4.2.tar.gz sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md diff --git a/package/intel-mediadriver/intel-mediadriver.mk b/package/intel-mediadriver/intel-mediadriver.mk index 5492411b63..a6c3b469d4 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.5 +INTEL_MEDIADRIVER_VERSION = 23.4.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 1667987a2d66d787b7e7ff77284909dcaea20369 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 4 Dec 2023 22:18:07 +0100 Subject: [PATCH 4274/5754] package/onevpl-intel-gpu: bump version to 23.4.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 5f7728e5f9..319bd37de0 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 0939232daa2ef3e35b453e4aa0d25674a9b2376b4ef814fb64712cf587654787 onevpl-intel-gpu-23.4.0.tar.gz +sha256 ab530e9e221d94f6bfaab853a8aa4528ec2d4de7d48aed95cd4c7ee633095577 onevpl-intel-gpu-23.4.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 8c9275fe75..98b228f9fc 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.4.0 +ONEVPL_INTEL_GPU_VERSION = 23.4.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 3dae30d7d15896eaf8f9d7a8e2d4f86e67545577 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 4 Dec 2023 22:16:20 +0100 Subject: [PATCH 4275/5754] package/squid: fix build with libxml2 version 2.12 As we're about to update libxml2 to version 2.12, let's first fix a build issue that would occur with squid by backporting an upstream patch. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- ...-ESI-build-with-libxml2-v2.12.0-1600.patch | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 package/squid/0001-Bug-5328-Fix-ESI-build-with-libxml2-v2.12.0-1600.patch diff --git a/package/squid/0001-Bug-5328-Fix-ESI-build-with-libxml2-v2.12.0-1600.patch b/package/squid/0001-Bug-5328-Fix-ESI-build-with-libxml2-v2.12.0-1600.patch new file mode 100644 index 0000000000..fcbdcc1749 --- /dev/null +++ b/package/squid/0001-Bug-5328-Fix-ESI-build-with-libxml2-v2.12.0-1600.patch @@ -0,0 +1,32 @@ +From c9b3edc1396925aa7eca3d3cc6c798806286a974 Mon Sep 17 00:00:00 2001 +From: bkuhls +Date: Sun, 26 Nov 2023 15:09:21 +0000 +Subject: [PATCH] Bug 5328: Fix ESI build with libxml2 v2.12.0 (#1600) + + Libxml2Parser.cc:147:40: error: invalid conversion from + 'const xmlError*' to 'xmlErrorPtr' {aka 'xmlError*'} [-fpermissive] + +libxml2 recently made xmlGetLastError() return a constant object. + +Upstream: https://github.com/squid-cache/squid/commit/c9b3edc1396925aa7eca3d3cc6c798806286a974 +Signed-off-by: Bernd Kuhls +--- + src/esi/Libxml2Parser.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/esi/Libxml2Parser.cc b/src/esi/Libxml2Parser.cc +index f03752885..236a37433 100644 +--- a/src/esi/Libxml2Parser.cc ++++ b/src/esi/Libxml2Parser.cc +@@ -144,7 +144,7 @@ ESILibxml2Parser::lineNumber() const + char const * + ESILibxml2Parser::errorString() const + { +- xmlErrorPtr error = xmlGetLastError(); ++ const auto error = xmlGetLastError(); + + if (error == nullptr) + return nullptr; +-- +2.43.0 + From 180f119b756258d47461f1e4e70bfd581024de1a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 4 Dec 2023 22:16:21 +0100 Subject: [PATCH 4276/5754] package/xmlstarlet: fix build with libxml2-2.12 Signed-off-by: Bernd Kuhls [Thomas: improved with a more complete patch provided by upstream developer.] Signed-off-by: Thomas Petazzoni --- ...1-Fix-build-issues-with-libxml2-2.12.patch | 97 +++++++++++++++++++ 1 file changed, 97 insertions(+) create mode 100644 package/xmlstarlet/0001-Fix-build-issues-with-libxml2-2.12.patch diff --git a/package/xmlstarlet/0001-Fix-build-issues-with-libxml2-2.12.patch b/package/xmlstarlet/0001-Fix-build-issues-with-libxml2-2.12.patch new file mode 100644 index 0000000000..74034dad53 --- /dev/null +++ b/package/xmlstarlet/0001-Fix-build-issues-with-libxml2-2.12.patch @@ -0,0 +1,97 @@ +From 702988467d67c3a33255de4c543f56767c64c72e Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sat, 23 Dec 2023 21:30:30 +0100 +Subject: [PATCH] Fix build issues with libxml2 2.12 + +Based on initial work from Bernd Kuhls , improved by +Yaakov Selkowitz. + +Upstream: https://sourceforge.net/p/xmlstar/patches/22/ +Signed-off-by: Thomas Petazzoni +--- + src/trans.h | 1 + + src/xml.c | 2 +- + src/xml_edit.c | 1 + + src/xml_elem.c | 2 +- + src/xml_format.c | 1 + + src/xmlstar.h | 2 +- + 6 files changed, 6 insertions(+), 3 deletions(-) + +diff --git a/src/trans.h b/src/trans.h +index 016304e..395462c 100644 +--- a/src/trans.h ++++ b/src/trans.h +@@ -36,6 +36,7 @@ THE SOFTWARE. + #include + #include + #include ++#include + + #include + #include +diff --git a/src/xml.c b/src/xml.c +index cf47cc2..e6f19c1 100644 +--- a/src/xml.c ++++ b/src/xml.c +@@ -104,7 +104,7 @@ void reportGenericError(void* ctx, const char * msg, ...) { + /* by default all errors are reported */ + static ErrorInfo errorInfo = { NULL, NULL, VERBOSE, CONTINUE }; + +-void reportError(void *ptr, xmlErrorPtr error) ++void reportError(void *ptr, const xmlError *error) + { + ErrorInfo *errorInfo = (ErrorInfo*) ptr; + assert(errorInfo); +diff --git a/src/xml_edit.c b/src/xml_edit.c +index e199178..b3da8a4 100644 +--- a/src/xml_edit.c ++++ b/src/xml_edit.c +@@ -42,6 +42,7 @@ THE SOFTWARE. + #include + #include + #include ++#include + #include + + #include "xmlstar.h" +diff --git a/src/xml_elem.c b/src/xml_elem.c +index 024e62a..a73038a 100644 +--- a/src/xml_elem.c ++++ b/src/xml_elem.c +@@ -186,7 +186,7 @@ typedef struct { + * put @name into @data->array[@data->offset] + */ + static void +-hash_key_put(void *payload, void *data, xmlChar *name) ++hash_key_put(void *payload, void *data, const xmlChar *name) + { + ArrayDest *dest = data; + dest->array[dest->offset++] = name; +diff --git a/src/xml_format.c b/src/xml_format.c +index e9da4df..ddd6614 100644 +--- a/src/xml_format.c ++++ b/src/xml_format.c +@@ -42,6 +42,7 @@ THE SOFTWARE. + #include + #include + #include ++#include + + #include "xmlstar.h" + +diff --git a/src/xmlstar.h b/src/xmlstar.h +index 3e1eed3..e8d7177 100644 +--- a/src/xmlstar.h ++++ b/src/xmlstar.h +@@ -32,7 +32,7 @@ typedef struct _errorInfo { + ErrorStop stop; + } ErrorInfo; + +-void reportError(void *ptr, xmlErrorPtr error); ++void reportError(void *ptr, const xmlError *error); + void suppressErrors(void); + + typedef struct _gOptions { +-- +2.43.0 + From d8ac52108c12f0fcc9641b63e7922009270f96c6 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 4 Dec 2023 22:16:22 +0100 Subject: [PATCH 4277/5754] package/libxml2: bump version to 2.12.1 Updated license hash due to upstream commit https://github.com/GNOME/libxml2/commit/4a513d5667d7690998f01b9048c56c4f1f50f6a5 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libxml2/libxml2.hash | 6 +++--- package/libxml2/libxml2.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/libxml2/libxml2.hash b/package/libxml2/libxml2.hash index 78c1ddc6a2..a3b2230b8a 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.6.sha256sum -sha256 c90eee7506764abbe07bb616b82da452529609815aefef423d66ef080eb0c300 libxml2-2.11.6.tar.xz +# From https://download.gnome.org/sources/libxml2/2.12/libxml2-2.12.1.sha256sum +sha256 8982b9ccdf7f456e30d8f7012d50858c6623e495333b6191def455c7e95427eb libxml2-2.12.1.tar.xz # License files, locally calculated -sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd Copyright +sha256 7fb0a66f3989f9bd5c7e5438a3de02cd4a7a47dde0aea2f7ea2ba2ff454ee6a4 Copyright diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk index c93a4aacc5..5606532b62 100644 --- a/package/libxml2/libxml2.mk +++ b/package/libxml2/libxml2.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBXML2_VERSION_MAJOR = 2.11 -LIBXML2_VERSION = $(LIBXML2_VERSION_MAJOR).6 +LIBXML2_VERSION_MAJOR = 2.12 +LIBXML2_VERSION = $(LIBXML2_VERSION_MAJOR).1 LIBXML2_SOURCE = libxml2-$(LIBXML2_VERSION).tar.xz LIBXML2_SITE = \ https://download.gnome.org/sources/libxml2/$(LIBXML2_VERSION_MAJOR) From f1089391a83aa63b6977e65970451365f10dc66a Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Sat, 2 Dec 2023 21:18:34 -0700 Subject: [PATCH 4278/5754] package/google-breakpad/gen-syms.sh: fix shellcheck warnings Fixes warning SC2068 Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- package/google-breakpad/gen-syms.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/google-breakpad/gen-syms.sh b/package/google-breakpad/gen-syms.sh index 2bc0afafb6..4bc020ec19 100755 --- a/package/google-breakpad/gen-syms.sh +++ b/package/google-breakpad/gen-syms.sh @@ -14,7 +14,7 @@ error() { exit 1 } -for FILE in ${@}; do +for FILE in "${@}"; do f="${TARGET_DIR}${FILE}" if [ ! -e "${f}" ]; then error "%s: No such file or directory\n" "${FILE}" From 08fa882d3c443ee9b7a956e84a87e60af8a7a7dd Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Sat, 2 Dec 2023 21:18:36 -0700 Subject: [PATCH 4279/5754] package/google-breakpad: fix building with gcc 13.x MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes the following error when building with gcc 13.x: ‘uintptr_t’ is defined in header ‘’; did you forget to ‘#include ’? Fixes: http://autobuild.buildroot.net/results/73f17ec308b6fd20dabdb7e391a3f67793a14d5b/ (which happens with the target google-breakpad, but the issue can also happen when building host-google-breakpad if the host system uses gcc 13.x) Signed-off-by: Adam Duskett [Thomas: use upstream fix, improve commit log] Signed-off-by: Thomas Petazzoni --- ...-gcc-13-cannot-use-uintptr_t-via-inc.patch | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 package/google-breakpad/0001-mainline-version-gcc-13-cannot-use-uintptr_t-via-inc.patch diff --git a/package/google-breakpad/0001-mainline-version-gcc-13-cannot-use-uintptr_t-via-inc.patch b/package/google-breakpad/0001-mainline-version-gcc-13-cannot-use-uintptr_t-via-inc.patch new file mode 100644 index 0000000000..2c3619b74b --- /dev/null +++ b/package/google-breakpad/0001-mainline-version-gcc-13-cannot-use-uintptr_t-via-inc.patch @@ -0,0 +1,30 @@ +From 7ea7ded187b4d739239f3ab7082fcd5a2ccc1eaa Mon Sep 17 00:00:00 2001 +From: mingtaoxt xt +Date: Wed, 19 Oct 2022 19:36:13 +0800 +Subject: [PATCH] mainline version gcc-13 cannot use "uintptr_t" via "#include + " + +Change-Id: I0049bb92658b4226e32783ad4d8271787deef5f3 +Reviewed-on: https://chromium-review.googlesource.com/c/breakpad/breakpad/+/3964166 +Reviewed-by: Mike Frysinger +Upstream: https://chromium.googlesource.com/breakpad/breakpad/+/7ea7ded187b4d739239f3ab7082fcd5a2ccc1eaa +Signed-off-by: Thomas Petazzoni +--- + src/client/linux/handler/minidump_descriptor.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/client/linux/handler/minidump_descriptor.h b/src/client/linux/handler/minidump_descriptor.h +index 4349b88f..d822c9d9 100644 +--- a/src/client/linux/handler/minidump_descriptor.h ++++ b/src/client/linux/handler/minidump_descriptor.h +@@ -32,6 +32,7 @@ + #include + #include + ++#include + #include + + #include "client/linux/handler/microdump_extra_info.h" +-- +2.43.0 + From c20334d35cebed3f28d92734fd6d070bfb936e68 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Sat, 2 Dec 2023 21:18:35 -0700 Subject: [PATCH 4280/5754] package/google-breakpad: disable uclibc support The google-breakpad package uses stab.h which is not included in uClibc, causing the following build error: src/common/stabs_reader.cc:37:10: fatal error: stab.h: No such file or directory 37 | #include | ^~~~~~~~ compilation terminated. Fixes: http://autobuild.buildroot.net/results/bba513b7c63a24a83805d2b989a9b95e5fe08e82/ Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- Config.in | 2 +- package/google-breakpad/Config.in | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Config.in b/Config.in index 27f5deb16a..554b4062eb 100644 --- a/Config.in +++ b/Config.in @@ -589,7 +589,7 @@ config BR2_GOOGLE_BREAKPAD_ENABLE depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS - depends on (BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_UCLIBC) + depends on BR2_TOOLCHAIN_USES_GLIBC depends on BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS depends on BR2_PACKAGE_HOST_GOOGLE_BREAKPAD_ARCH_SUPPORTS select BR2_PACKAGE_GOOGLE_BREAKPAD diff --git a/package/google-breakpad/Config.in b/package/google-breakpad/Config.in index 4320ad64aa..49d0bc06de 100644 --- a/package/google-breakpad/Config.in +++ b/package/google-breakpad/Config.in @@ -9,7 +9,7 @@ config BR2_PACKAGE_GOOGLE_BREAKPAD depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS - depends on (BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_UCLIBC) + depends on BR2_TOOLCHAIN_USES_GLIBC depends on BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS depends on BR2_PACKAGE_HOST_GOOGLE_BREAKPAD_ARCH_SUPPORTS select BR2_PACKAGE_LINUX_SYSCALL_SUPPORT @@ -34,12 +34,12 @@ config BR2_PACKAGE_GOOGLE_BREAKPAD https://chromium.googlesource.com/breakpad/breakpad -comment "google-breakpad requires a glibc or uClibc toolchain w/ wchar, thread, C++, gcc >= 4.8" +comment "google-breakpad requires a glibc toolchain w/ wchar, thread, C++, gcc >= 4.8" depends on BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS depends on BR2_PACKAGE_HOST_GOOGLE_BREAKPAD_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_HAS_THREADS || \ - !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_UCLIBC) || \ + !BR2_TOOLCHAIN_USES_GLIBC || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 if BR2_PACKAGE_GOOGLE_BREAKPAD From 9212a719a5c3078048737d56596442e5ac7120a4 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 23 Dec 2023 22:35:11 +0100 Subject: [PATCH 4281/5754] .checkpackageignore: stop ignoring ShellCheck issues in google-breakpad The issues have been fixed by commit f1089391a83aa63b6977e65970451365f10dc66a ("package/google-breakpad/gen-syms.sh: fix shellcheck warnings") Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/5815132933 Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.checkpackageignore b/.checkpackageignore index 99e9e0e0c5..0868593a92 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -505,7 +505,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/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 From 875b898b984e9aabaeced6a485356fb9c4b8d5db Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 23 Dec 2023 21:30:32 +0100 Subject: [PATCH 4282/5754] boot/grub2: needs host-gawk grub2 build is failing, when compiled on host system not including gawk and host-gawk is not built by another package before. This can be the the case on current Buildroot Docker image, based on Debian, which includes mawk. grub2 was updated in commit 5baf1ffe7e "boot/grub2: bump to version 2.12". This version includes the commit [1], which introduced the use of the asorti() awk function. This function is a specific gawk builtin extension. See [2]. This commit fixes this issue by adding host-gawk as a dependency. Fixes: mawk: ../../grub-core/genmoddep.awk: line 110: function asorti never defined make[4]: *** [Makefile:49030: moddep.lst] Error 1 make[4]: Leaving directory '/buildroot/output/build/grub2-2.12/build-i386-pc/grub-core' make[3]: *** [Makefile:28116: all] Error 2 make[3]: Leaving directory '/buildroot/output/build/grub2-2.12/build-i386-pc/grub-core' make[2]: *** [Makefile:11714: all-recursive] Error 1 make[2]: Leaving directory '/buildroot/output/build/grub2-2.12/build-i386-pc' make[1]: *** [Makefile:3547: all] Error 2 make[1]: Leaving directory '/buildroot/output/build/grub2-2.12/build-i386-pc' make: *** [package/pkg-generic.mk:283: /buildroot/output/build/grub2-2.12/.stamp_built] Error 2 [1] https://git.savannah.gnu.org/gitweb/?p=grub.git;a=commitdiff;h=87648e9c12a32bddb005b899edc44c2c9c63df82 [2] https://www.gnu.org/software/gawk/manual/gawk.html#Sorting-Array-Values-and-Indices-with-gawk Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- boot/grub2/grub2.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/boot/grub2/grub2.mk b/boot/grub2/grub2.mk index b9be826885..4430aebd59 100644 --- a/boot/grub2/grub2.mk +++ b/boot/grub2/grub2.mk @@ -9,8 +9,8 @@ GRUB2_SITE = http://ftp.gnu.org/gnu/grub GRUB2_SOURCE = grub-$(GRUB2_VERSION).tar.xz GRUB2_LICENSE = GPL-3.0+ GRUB2_LICENSE_FILES = COPYING -GRUB2_DEPENDENCIES = host-bison host-flex host-grub2 -HOST_GRUB2_DEPENDENCIES = host-bison host-flex +GRUB2_DEPENDENCIES = host-bison host-flex host-gawk host-grub2 +HOST_GRUB2_DEPENDENCIES = host-bison host-flex host-gawk GRUB2_INSTALL_IMAGES = YES # CVE-2019-14865 is about a flaw in the grub2-set-bootflag tool, which From 32c1fbad554d4c2bfbe56a652333195c8ae67904 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Sat, 2 Dec 2023 21:18:39 -0700 Subject: [PATCH 4283/5754] package/google-breakpad: bump version to f49c2f1a2023da0cb055874fba050563dfea57db - Drop no longer needed 0001-mainline-version-gcc-13-cannot-use-uintptr_t-via-inc.patch as it was a backport from upstream - Updated license hash due to numerous additions of licenses, and updated copyright years. The LICENSE variable was updated accordingly, and clarified - zlib is now a mandatory dependency, it is not checked at configure time, but is uncondtionnally included, and libzlib is linked in unconditionnally. See https://chromium.googlesource.com/breakpad/breakpad/+/de086a98595f68715c1dce9860f77014a2a1b187 - explicitly disable zstd support, which was added in upstream commit https://chromium.googlesource.com/breakpad/breakpad/+/9ea5b228f560580f85df895c2f117d7e43340935. This requires adding AUTORECONF = YES because the pre-generated configure/Makefile.in available in the Git repository is out of date, and links unconditionnally with -lzstd, even when --disable-zstd is passed. Signed-off-by: Adam Duskett [Thomas: handle zlib dependency, handle zstd option, fix LICENSE variable] Signed-off-by: Thomas Petazzoni --- ...-gcc-13-cannot-use-uintptr_t-via-inc.patch | 30 ------------------- package/google-breakpad/Config.in | 1 + package/google-breakpad/google-breakpad.hash | 4 +-- package/google-breakpad/google-breakpad.mk | 21 ++++++++++--- 4 files changed, 20 insertions(+), 36 deletions(-) delete mode 100644 package/google-breakpad/0001-mainline-version-gcc-13-cannot-use-uintptr_t-via-inc.patch diff --git a/package/google-breakpad/0001-mainline-version-gcc-13-cannot-use-uintptr_t-via-inc.patch b/package/google-breakpad/0001-mainline-version-gcc-13-cannot-use-uintptr_t-via-inc.patch deleted file mode 100644 index 2c3619b74b..0000000000 --- a/package/google-breakpad/0001-mainline-version-gcc-13-cannot-use-uintptr_t-via-inc.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 7ea7ded187b4d739239f3ab7082fcd5a2ccc1eaa Mon Sep 17 00:00:00 2001 -From: mingtaoxt xt -Date: Wed, 19 Oct 2022 19:36:13 +0800 -Subject: [PATCH] mainline version gcc-13 cannot use "uintptr_t" via "#include - " - -Change-Id: I0049bb92658b4226e32783ad4d8271787deef5f3 -Reviewed-on: https://chromium-review.googlesource.com/c/breakpad/breakpad/+/3964166 -Reviewed-by: Mike Frysinger -Upstream: https://chromium.googlesource.com/breakpad/breakpad/+/7ea7ded187b4d739239f3ab7082fcd5a2ccc1eaa -Signed-off-by: Thomas Petazzoni ---- - src/client/linux/handler/minidump_descriptor.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/client/linux/handler/minidump_descriptor.h b/src/client/linux/handler/minidump_descriptor.h -index 4349b88f..d822c9d9 100644 ---- a/src/client/linux/handler/minidump_descriptor.h -+++ b/src/client/linux/handler/minidump_descriptor.h -@@ -32,6 +32,7 @@ - #include - #include - -+#include - #include - - #include "client/linux/handler/microdump_extra_info.h" --- -2.43.0 - diff --git a/package/google-breakpad/Config.in b/package/google-breakpad/Config.in index 49d0bc06de..0d21fd2e5c 100644 --- a/package/google-breakpad/Config.in +++ b/package/google-breakpad/Config.in @@ -13,6 +13,7 @@ config BR2_PACKAGE_GOOGLE_BREAKPAD depends on BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS depends on BR2_PACKAGE_HOST_GOOGLE_BREAKPAD_ARCH_SUPPORTS select BR2_PACKAGE_LINUX_SYSCALL_SUPPORT + select BR2_PACKAGE_ZLIB help Google-Breakpad is a library and tool suite that allows you to distribute an application to users with compiler-provided diff --git a/package/google-breakpad/google-breakpad.hash b/package/google-breakpad/google-breakpad.hash index 03719816b5..788978f08a 100644 --- a/package/google-breakpad/google-breakpad.hash +++ b/package/google-breakpad/google-breakpad.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 52716d140ba528d36b40591ae2c7485b18023f6610414bba0057f0cc13caf256 google-breakpad-c85eb4a59b618f3beaad5445ceb1f865ffa8efdf-br1.tar.gz -sha256 8d5d1311342ed55b486d778a6763f54a26002698ac0cbab64026b98033300dfd LICENSE +sha256 29e147011bf6577df95ee3a50bf5ffd1941645dd414d569bd409a9035bcbb7f7 google-breakpad-f49c2f1a2023da0cb055874fba050563dfea57db-br1.tar.gz +sha256 69b3d80c19a460e09716910d54d1ada5d800716e2b73751bebac44352590f646 LICENSE diff --git a/package/google-breakpad/google-breakpad.mk b/package/google-breakpad/google-breakpad.mk index 132323363b..81d2c7d4a2 100644 --- a/package/google-breakpad/google-breakpad.mk +++ b/package/google-breakpad/google-breakpad.mk @@ -4,15 +4,28 @@ # ################################################################################ -GOOGLE_BREAKPAD_VERSION = c85eb4a59b618f3beaad5445ceb1f865ffa8efdf +GOOGLE_BREAKPAD_VERSION = f49c2f1a2023da0cb055874fba050563dfea57db GOOGLE_BREAKPAD_SITE = https://chromium.googlesource.com/breakpad/breakpad GOOGLE_BREAKPAD_SITE_METHOD = git GOOGLE_BREAKPAD_INSTALL_STAGING = YES -GOOGLE_BREAKPAD_LICENSE = BSD-3-Clause, MIT +# APSL-2.0, BSD-4-Clause, Apache-2.0, BSD-2-Clause not listed, only +# used for Mac code, GPL-2.0 not listed, only used for autotools code +GOOGLE_BREAKPAD_LICENSE = \ + BSD-3-Clause, \ + Unicode-DFS-2015 (UTF code), \ + MIT (src/common/linux/breakpad_getcontext.S), \ + curl (src/third_party/curl/), \ + ClArtistic (src/third_party/libdisasm) GOOGLE_BREAKPAD_LICENSE_FILES = LICENSE -GOOGLE_BREAKPAD_DEPENDENCIES = host-google-breakpad linux-syscall-support +# Needed because the configure/Makefile.in provided in the Git +# repository is out of date, and links with -lzstd even if +# --disable-zstd is passed +GOOGLE_BREAKPAD_AUTORECONF = YES +GOOGLE_BREAKPAD_DEPENDENCIES = host-google-breakpad linux-syscall-support zlib +GOOGLE_BREAKPAD_CONF_OPTS = --disable-zstd -HOST_GOOGLE_BREAKPAD_DEPENDENCIES = host-linux-syscall-support +HOST_GOOGLE_BREAKPAD_DEPENDENCIES = host-linux-syscall-support host-zlib +HOST_GOOGLE_BREAKPAD_CONF_OPTS = --disable-zstd ifeq ($(BR2_PACKAGE_GOOGLE_BREAKPAD_TOOLS),) GOOGLE_BREAKPAD_INSTALL_TARGET = NO From 78e8f3831fbe115b0e6b0b2506852cfc887a083e Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 16 Sep 2023 16:06:13 +0200 Subject: [PATCH 4284/5754] configs/imx8mmpico: bump bsp components to version tn-kirkstone_5.15.71-2.2.0 Those components are aligned with NXP BSP lf-5.15.71-2.2.0. This commit introduces arm-trusted-firmware upstream patches to compile the needed version with newer gcc and binutils. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/5083366606 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- ...low-lower-address-access-with-gcc-12.patch | 62 +++++++++++++++++++ ...dd-support-for-new-binutils-versions.patch | 62 +++++++++++++++++++ configs/imx8mmpico_defconfig | 9 +-- 3 files changed, 129 insertions(+), 4 deletions(-) create mode 100644 board/technexion/imx8mmpico/patches/arm-trusted-firmware/0001-fix-build-allow-lower-address-access-with-gcc-12.patch create mode 100644 board/technexion/imx8mmpico/patches/arm-trusted-firmware/0002-feat-build-add-support-for-new-binutils-versions.patch diff --git a/board/technexion/imx8mmpico/patches/arm-trusted-firmware/0001-fix-build-allow-lower-address-access-with-gcc-12.patch b/board/technexion/imx8mmpico/patches/arm-trusted-firmware/0001-fix-build-allow-lower-address-access-with-gcc-12.patch new file mode 100644 index 0000000000..90e808cc8e --- /dev/null +++ b/board/technexion/imx8mmpico/patches/arm-trusted-firmware/0001-fix-build-allow-lower-address-access-with-gcc-12.patch @@ -0,0 +1,62 @@ +From 078cbf942c86d77775a26d83fc87ca244de02d4c Mon Sep 17 00:00:00 2001 +From: Govindraj Raja +Date: Fri, 5 May 2023 09:09:36 -0500 +Subject: [PATCH] fix(build): allow lower address access with gcc-12 + +With gcc-12 any lower address access can trigger a warning/error +this would be useful in other parts of system but in TF-A +there are various reasons to access to the lower address ranges, +example using mmio_read_*/writes_* + +So setup to allow access to lower addresses while using gcc-12 + +Change-Id: Id1b4012b13bc6876d83b90a347fee12478a1921d +Signed-off-by: Govindraj Raja +Upstream: https://github.com/ARM-software/arm-trusted-firmware/commit/dea23e245fb890c6c06eff7d1aed8fffa981fc05 +Signed-off-by: Julien Olivain +--- + Makefile | 4 ++++ + make_helpers/build_macros.mk | 12 ++++++++++++ + 2 files changed, 16 insertions(+) + +diff --git a/Makefile b/Makefile +index dccf0121d..edd7f5886 100644 +--- a/Makefile ++++ b/Makefile +@@ -385,6 +385,10 @@ ifeq ($(findstring clang,$(notdir $(CC))),) + WARNINGS += -Wunused-but-set-variable -Wmaybe-uninitialized \ + -Wpacked-bitfield-compat -Wshift-overflow=2 \ + -Wlogical-op ++ ++# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105523 ++TF_CFLAGS += $(call cc_option, --param=min-pagesize=0) ++ + else + # using clang + WARNINGS += -Wshift-overflow -Wshift-sign-overflow \ +diff --git a/make_helpers/build_macros.mk b/make_helpers/build_macros.mk +index 12aaee684..3a54bf67c 100644 +--- a/make_helpers/build_macros.mk ++++ b/make_helpers/build_macros.mk +@@ -86,6 +86,18 @@ define assert_numerics + $(foreach num,$1,$(eval $(call assert_numeric,$(num)))) + endef + ++# Convenience function to check for a given linker option. An call to ++# $(call ld_option, --no-XYZ) will return --no-XYZ if supported by the linker ++define ld_option ++ $(shell if $(LD) $(1) -v >/dev/null 2>&1; then echo $(1); fi ) ++endef ++ ++# Convenience function to check for a given compiler option. A call to ++# $(call cc_option, --no-XYZ) will return --no-XYZ if supported by the compiler ++define cc_option ++ $(shell if $(CC) $(1) -c -x c /dev/null -o /dev/null >/dev/null 2>&1; then echo $(1); fi ) ++endef ++ + # CREATE_SEQ is a recursive function to create sequence of numbers from 1 to + # $(2) and assign the sequence to $(1) + define CREATE_SEQ +-- +2.41.0 + diff --git a/board/technexion/imx8mmpico/patches/arm-trusted-firmware/0002-feat-build-add-support-for-new-binutils-versions.patch b/board/technexion/imx8mmpico/patches/arm-trusted-firmware/0002-feat-build-add-support-for-new-binutils-versions.patch new file mode 100644 index 0000000000..d989bdb06b --- /dev/null +++ b/board/technexion/imx8mmpico/patches/arm-trusted-firmware/0002-feat-build-add-support-for-new-binutils-versions.patch @@ -0,0 +1,62 @@ +From cc14748257e07ed5b2caf5194c4c333a8d09a1f4 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 +Upstream: https://github.com/ARM-software/arm-trusted-firmware/commit/1f49db5f25cdd4e43825c9bcc0575070b80f628c +Signed-off-by: Julien Olivain +--- + Makefile | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/Makefile b/Makefile +index edd7f5886..4c0e1473e 100644 +--- a/Makefile ++++ b/Makefile +@@ -418,6 +418,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 +@@ -445,6 +447,12 @@ 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.41.0 + diff --git a/configs/imx8mmpico_defconfig b/configs/imx8mmpico_defconfig index 8c34c40fef..c402ea675d 100644 --- a/configs/imx8mmpico_defconfig +++ b/configs/imx8mmpico_defconfig @@ -1,10 +1,11 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y 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/imx8mm-pico-pi.dtb" +BR2_GLOBAL_PATCH_DIR="board/technexion/imx8mmpico/patches" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,TechNexion,linux-tn-imx,tn-hardknott_5.10.72-2.2.0_20220207)/linux-tn-im-tn-hardknott_5.10.72-2.2.0_20220207.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,TechNexion,linux-tn-imx,tn-kirkstone_5.15.71-2.2.0_20230512)/linux-tn-imx-tn-kirkstone_5.15.71-2.2.0_20230512.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="tn_imx8" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mm-pico-pi freescale/imx8mm-pico-pi-ili9881c" @@ -18,13 +19,13 @@ 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_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-5.10.72-2.2.0)/imx-atf-lf-5.10.72-2.2.0.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-5.15.71-2.2.0)/imx-atf-lf-5.15.71-2.2.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm" 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,TechNexion,u-boot-tn-imx,tn-hardknott_5.10.72-2.2.0_20220207)/u-boot-tn-imx-tn-hardknott_5.10.72-2.2.0_20220207.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,TechNexion,u-boot-tn-imx,tn-kirkstone_5.15.71-2.2.0_20230512)/u-boot-tn-imx-tn-kirkstone_5.15.71-2.2.0_20230512.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="pico-imx8mm" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y From 120f961fc6d4a8902487f17a13646be60f6f7ce1 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 24 Dec 2023 17:16:19 +0100 Subject: [PATCH 4285/5754] package/onevpl-intel-gpu: add missing dependency on BR2_x86_64 BR2_PACKAGE_ONEVPL_INTEL_GPU selects BR2_PACKAGE_INTEL_MEDIADRIVER, but it forgets to replicate all its dependencies, in particular BR2_x86_64, causing: WARNING: unmet direct dependencies detected for BR2_PACKAGE_INTEL_MEDIADRIVER Depends on [n]: BR2_x86_64 [=n] && !BR2_STATIC_LIBS [=n] && BR2_INSTALL_LIBSTDCPP [=y] && BR2_TOOLCHAIN_GCC_AT_LEAST_8 [=y] && BR2_TOOLCHAIN_HAS_SYNC_1 [=y] && BR2_TOOLCHAIN_HAS_THREADS [=y] && BR2_TOOLCHAIN_HAS_THREADS_NPTL [=y] Selected by [y]: - BR2_PACKAGE_ONEVPL_INTEL_GPU [=y] && BR2_PACKAGE_ONEVPL_ARCH_SUPPORTS [=y] && BR2_INSTALL_LIBSTDCPP [=y] && !BR2_STATIC_LIBS [=n] && BR2_TOOLCHAIN_GCC_AT_LEAST_7 [=y] && BR2_TOOLCHAIN_HAS_SYNC_1 [=y] && BR2_TOOLCHAIN_HAS_THREADS [=y] && BR2_TOOLCHAIN_HAS_THREADS_NPTL [=y] Fixes: ac65841defece904e91afe1fb51419084c993dba ("package/onevpl-intel-gpu: new package") Signed-off-by: Thomas Petazzoni --- package/onevpl-intel-gpu/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/onevpl-intel-gpu/Config.in b/package/onevpl-intel-gpu/Config.in index 11a1c60a0f..b1ab6624e5 100644 --- a/package/onevpl-intel-gpu/Config.in +++ b/package/onevpl-intel-gpu/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_ONEVPL_INTEL_GPU bool "onevpl-intel-gpu" + depends on BR2_x86_64 # intel-mediadriver depends on BR2_PACKAGE_ONEVPL_ARCH_SUPPORTS # onevpl depends on BR2_INSTALL_LIBSTDCPP # onevpl depends on !BR2_STATIC_LIBS # onevpl @@ -17,6 +18,7 @@ config BR2_PACKAGE_ONEVPL_INTEL_GPU https://github.com/oneapi-src/oneVPL-intel-gpu comment "onevpl-intel-gpu needs a toolchain w/ dynamic library, gcc >= 7, C++, NPTL" + depends on BR2_x86_64 depends on BR2_PACKAGE_ONEVPL_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_SYNC_1 depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ From 0ac3eb947dc6274ae7124a193db5052232e2d280 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 24 Dec 2023 09:13:16 +0100 Subject: [PATCH 4286/5754] package/onevpl-intel-gpu: bump version to 23.4.3 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 319bd37de0..38d788a86d 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 ab530e9e221d94f6bfaab853a8aa4528ec2d4de7d48aed95cd4c7ee633095577 onevpl-intel-gpu-23.4.2.tar.gz +sha256 c61a6866f4ea3c8378330e98cc3e03586c8059061c2642ee69ed8f91df41e939 onevpl-intel-gpu-23.4.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 98b228f9fc..55a68a7999 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.4.2 +ONEVPL_INTEL_GPU_VERSION = 23.4.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 77b21f55663eaf3a3a8f930de4b148d11b4d4dab Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 24 Dec 2023 09:13:17 +0100 Subject: [PATCH 4287/5754] package/intel-gmmlib: bump version to 22.3.16 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 01b573d1e9..6154ce636d 100644 --- a/package/intel-gmmlib/intel-gmmlib.hash +++ b/package/intel-gmmlib/intel-gmmlib.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 63b879a5a20756b6f74244068f4555a56c4f705c96cbc87e5163448a893e133f intel-gmmlib-22.3.14.tar.gz +sha256 083b86fd65ec9515971723872e56e1ba72e83ff75a9737d41a55938c0f2d4ac2 intel-gmmlib-22.3.16.tar.gz sha256 8b7446825df3f8b0268307e272aa6aaaf78351c83161d860d02c913c22666c48 LICENSE.md diff --git a/package/intel-gmmlib/intel-gmmlib.mk b/package/intel-gmmlib/intel-gmmlib.mk index c1a92aaf4f..2244f5755e 100644 --- a/package/intel-gmmlib/intel-gmmlib.mk +++ b/package/intel-gmmlib/intel-gmmlib.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_GMMLIB_VERSION = 22.3.14 +INTEL_GMMLIB_VERSION = 22.3.16 INTEL_GMMLIB_SITE = https://github.com/intel/gmmlib/archive INTEL_GMMLIB_LICENSE = MIT INTEL_GMMLIB_LICENSE_FILES = LICENSE.md From cadbdffd538bcb9cfd89b4907ea3ad878ac4e9fa Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 24 Dec 2023 09:13:18 +0100 Subject: [PATCH 4288/5754] package/intel-mediadriver: bump version to 23.4.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 d3173260b1..b021d05301 100644 --- a/package/intel-mediadriver/intel-mediadriver.hash +++ b/package/intel-mediadriver/intel-mediadriver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 321f2ade9e55ed5b8809ca875d80c81245093fe9f8a26a39712d2f4a6be18d18 intel-media-23.4.2.tar.gz +sha256 83b95eefe86c9d58d92c2a77793541ea3cb643dff419599ffa87899fd58738cd intel-media-23.4.3.tar.gz sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md diff --git a/package/intel-mediadriver/intel-mediadriver.mk b/package/intel-mediadriver/intel-mediadriver.mk index a6c3b469d4..c9989f9380 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.4.2 +INTEL_MEDIADRIVER_VERSION = 23.4.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 f6acde11ab639f5772ceeac51ff21ca7aadeca8d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 24 Dec 2023 09:13:19 +0100 Subject: [PATCH 4289/5754] package/onevpl: rename package to libvpl Upstream changed the package name and its github repo: https://github.com/intel/libvpl/commit/44df6e08cc836ed65725ed344e7ec9ded5193874 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 5 +++ DEVELOPERS | 2 +- package/Config.in | 2 +- .../0001-Don-t-force-fstack-protector.patch | 0 package/{onevpl => libvpl}/Config.in | 12 ++--- .../onevpl.hash => libvpl/libvpl.hash} | 2 +- package/libvpl/libvpl.mk | 44 +++++++++++++++++++ package/onevpl-intel-gpu/Config.in | 14 +++--- package/onevpl-intel-gpu/onevpl-intel-gpu.mk | 2 +- package/onevpl/onevpl.mk | 44 ------------------- 10 files changed, 66 insertions(+), 61 deletions(-) rename package/{onevpl => libvpl}/0001-Don-t-force-fstack-protector.patch (100%) rename package/{onevpl => libvpl}/Config.in (75%) rename package/{onevpl/onevpl.hash => libvpl/libvpl.hash} (83%) create mode 100644 package/libvpl/libvpl.mk delete mode 100644 package/onevpl/onevpl.mk diff --git a/Config.in.legacy b/Config.in.legacy index 4689226290..d46bd97442 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,11 @@ endif comment "Legacy options removed in 2023.11" +config BR2_PACKAGE_ONEVPL + bool "onevpl package was renamed" + select BR2_LEGACY + select BR2_PACKAGE_LIBVPL + config BR2_KERNEL_HEADERS_6_5 bool "kernel headers version 6.5.x are no longer supported" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index bad07d51aa..834be54eb1 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -439,6 +439,7 @@ F: package/libva/ F: package/libva-intel-driver/ F: package/libva-utils/ F: package/libvorbis/ +F: package/libvpl/ F: package/libvpx/ F: package/libyuv/ F: package/linux-firmware/ @@ -449,7 +450,6 @@ F: package/mjpg-streamer/ F: package/mpg123/ F: package/ntp/ F: package/nut/ -F: package/onevpl/ F: package/onevpl-intel-gpu/ F: package/opus/ F: package/pciutils/ diff --git a/package/Config.in b/package/Config.in index bc723fe018..28924f650e 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1669,9 +1669,9 @@ menu "Graphics" source "package/libva-intel-driver/Config.in" source "package/libvdpau/Config.in" source "package/libvips/Config.in" + source "package/libvpl/Config.in" source "package/libwpe/Config.in" source "package/menu-cache/Config.in" - source "package/onevpl/Config.in" source "package/onevpl-intel-gpu/Config.in" source "package/opencl-clhpp/Config.in" source "package/opencv3/Config.in" diff --git a/package/onevpl/0001-Don-t-force-fstack-protector.patch b/package/libvpl/0001-Don-t-force-fstack-protector.patch similarity index 100% rename from package/onevpl/0001-Don-t-force-fstack-protector.patch rename to package/libvpl/0001-Don-t-force-fstack-protector.patch diff --git a/package/onevpl/Config.in b/package/libvpl/Config.in similarity index 75% rename from package/onevpl/Config.in rename to package/libvpl/Config.in index a750e54d52..012f31b3be 100644 --- a/package/onevpl/Config.in +++ b/package/libvpl/Config.in @@ -1,11 +1,11 @@ -config BR2_PACKAGE_ONEVPL_ARCH_SUPPORTS +config BR2_PACKAGE_LIBVPL_ARCH_SUPPORTS bool default y if BR2_ARCH_IS_64 default y if BR2_arm -config BR2_PACKAGE_ONEVPL - bool "onevpl" - depends on BR2_PACKAGE_ONEVPL_ARCH_SUPPORTS +config BR2_PACKAGE_LIBVPL + bool "libvpl" + depends on BR2_PACKAGE_LIBVPL_ARCH_SUPPORTS depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_STATIC_LIBS # dlfcn.h depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 @@ -21,7 +21,7 @@ config BR2_PACKAGE_ONEVPL https://github.com/oneapi-src/oneVPL -comment "onevpl needs a toolchain w/ dynamic library, gcc >= 7, C++, threads" - depends on BR2_PACKAGE_ONEVPL_ARCH_SUPPORTS +comment "libvpl needs a toolchain w/ dynamic library, gcc >= 7, C++, threads" + depends on BR2_PACKAGE_LIBVPL_ARCH_SUPPORTS depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/onevpl/onevpl.hash b/package/libvpl/libvpl.hash similarity index 83% rename from package/onevpl/onevpl.hash rename to package/libvpl/libvpl.hash index 328fa94487..8f3ea64d2e 100644 --- a/package/onevpl/onevpl.hash +++ b/package/libvpl/libvpl.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 978398c7bb1665a6ad7a1a15cc57dc0204608e56c88436e376b717320a9e63fd onevpl-2023.4.0.tar.gz +sha256 978398c7bb1665a6ad7a1a15cc57dc0204608e56c88436e376b717320a9e63fd libvpl-2023.4.0.tar.gz sha256 bf1cfac2e2792b6e1e995ce103d70796aecaf2ec7e4c5fe5474f7acec7b4a677 LICENSE diff --git a/package/libvpl/libvpl.mk b/package/libvpl/libvpl.mk new file mode 100644 index 0000000000..3b0adaaf0f --- /dev/null +++ b/package/libvpl/libvpl.mk @@ -0,0 +1,44 @@ +################################################################################ +# +# libvpl +# +################################################################################ + +LIBVPL_VERSION = 2023.4.0 +LIBVPL_SITE = $(call github,intel,libvpl,v$(LIBVPL_VERSION)) +LIBVPL_LICENSE = MIT +LIBVPL_LICENSE_FILES = LICENSE +LIBVPL_INSTALL_STAGING = YES +LIBVPL_DEPENDENCIES = host-pkgconf + +LIBVPL_CONF_OPTS = \ + -DBUILD_TOOLS=OFF \ + -DINSTALL_EXAMPLE_CODE=OFF + +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +LIBVPL_CONF_OPTS += \ + -DCMAKE_CXX_FLAGS="-latomic" +endif + +ifeq ($(BR2_PACKAGE_LIBVA),y) +LIBVPL_CONF_OPTS += -DENABLE_VA=ON +LIBVPL_DEPENDENCIES += libva +else +LIBVPL_CONF_OPTS += -DENABLE_VA=OFF +endif + +ifeq ($(BR2_PACKAGE_WAYLAND),y) +LIBVPL_CONF_OPTS += -DENABLE_WAYLAND=ON +LIBVPL_DEPENDENCIES += wayland wayland-protocols +else +LIBVPL_CONF_OPTS += -DENABLE_WAYLAND=OFF +endif + +ifeq ($(BR2_PACKAGE_XORG7),y) +LIBVPL_CONF_OPTS += -DENABLE_X11=ON +LIBVPL_DEPENDENCIES += libxcb xlib_libX11 +else +LIBVPL_CONF_OPTS += -DENABLE_X11=OFF +endif + +$(eval $(cmake-package)) diff --git a/package/onevpl-intel-gpu/Config.in b/package/onevpl-intel-gpu/Config.in index b1ab6624e5..740e954ee5 100644 --- a/package/onevpl-intel-gpu/Config.in +++ b/package/onevpl-intel-gpu/Config.in @@ -1,16 +1,16 @@ config BR2_PACKAGE_ONEVPL_INTEL_GPU bool "onevpl-intel-gpu" depends on BR2_x86_64 # intel-mediadriver - depends on BR2_PACKAGE_ONEVPL_ARCH_SUPPORTS # onevpl - depends on BR2_INSTALL_LIBSTDCPP # onevpl - depends on !BR2_STATIC_LIBS # onevpl - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # onevpl + depends on BR2_PACKAGE_LIBVPL_ARCH_SUPPORTS # libvpl + depends on BR2_INSTALL_LIBSTDCPP # libvpl + depends on !BR2_STATIC_LIBS # libvpl + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # libvpl depends on BR2_TOOLCHAIN_HAS_SYNC_1 # intel-mediadriver - depends on BR2_TOOLCHAIN_HAS_THREADS # onevpl + depends on BR2_TOOLCHAIN_HAS_THREADS # libvpl depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # intel-mediadriver select BR2_PACKAGE_INTEL_MEDIADRIVER # runtime select BR2_PACKAGE_LIBVA - select BR2_PACKAGE_ONEVPL + select BR2_PACKAGE_LIBVPL help Intel® oneVPL GPU Runtime is a Runtime implementation of oneVPL API for Intel Gen GPUs, starting with Tiger Lake. @@ -19,7 +19,7 @@ config BR2_PACKAGE_ONEVPL_INTEL_GPU comment "onevpl-intel-gpu needs a toolchain w/ dynamic library, gcc >= 7, C++, NPTL" depends on BR2_x86_64 - depends on BR2_PACKAGE_ONEVPL_ARCH_SUPPORTS + depends on BR2_PACKAGE_LIBVPL_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_SYNC_1 depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/onevpl-intel-gpu/onevpl-intel-gpu.mk b/package/onevpl-intel-gpu/onevpl-intel-gpu.mk index 55a68a7999..0a62ebbb6a 100644 --- a/package/onevpl-intel-gpu/onevpl-intel-gpu.mk +++ b/package/onevpl-intel-gpu/onevpl-intel-gpu.mk @@ -8,6 +8,6 @@ ONEVPL_INTEL_GPU_VERSION = 23.4.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 -ONEVPL_INTEL_GPU_DEPENDENCIES = libva onevpl +ONEVPL_INTEL_GPU_DEPENDENCIES = libva libvpl $(eval $(cmake-package)) diff --git a/package/onevpl/onevpl.mk b/package/onevpl/onevpl.mk deleted file mode 100644 index 1a580d0636..0000000000 --- a/package/onevpl/onevpl.mk +++ /dev/null @@ -1,44 +0,0 @@ -################################################################################ -# -# onevpl -# -################################################################################ - -ONEVPL_VERSION = 2023.4.0 -ONEVPL_SITE = $(call github,oneapi-src,oneVPL,v$(ONEVPL_VERSION)) -ONEVPL_LICENSE = MIT -ONEVPL_LICENSE_FILES = LICENSE -ONEVPL_INSTALL_STAGING = YES -ONEVPL_DEPENDENCIES = host-pkgconf - -ONEVPL_CONF_OPTS = \ - -DBUILD_TOOLS=OFF \ - -DINSTALL_EXAMPLE_CODE=OFF - -ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -ONEVPL_CONF_OPTS += \ - -DCMAKE_CXX_FLAGS="-latomic" -endif - -ifeq ($(BR2_PACKAGE_LIBVA),y) -ONEVPL_CONF_OPTS += -DENABLE_VA=ON -ONEVPL_DEPENDENCIES += libva -else -ONEVPL_CONF_OPTS += -DENABLE_VA=OFF -endif - -ifeq ($(BR2_PACKAGE_WAYLAND),y) -ONEVPL_CONF_OPTS += -DENABLE_WAYLAND=ON -ONEVPL_DEPENDENCIES += wayland wayland-protocols -else -ONEVPL_CONF_OPTS += -DENABLE_WAYLAND=OFF -endif - -ifeq ($(BR2_PACKAGE_XORG7),y) -ONEVPL_CONF_OPTS += -DENABLE_X11=ON -ONEVPL_DEPENDENCIES += libxcb xlib_libX11 -else -ONEVPL_CONF_OPTS += -DENABLE_X11=OFF -endif - -$(eval $(cmake-package)) From ee2e272b89f565ebc7665f0ec31ea263dee692ee Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 24 Dec 2023 09:13:20 +0100 Subject: [PATCH 4290/5754] package/libvpl: bump version to 2.10.1 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libvpl/libvpl.hash | 2 +- package/libvpl/libvpl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libvpl/libvpl.hash b/package/libvpl/libvpl.hash index 8f3ea64d2e..df1914e4a4 100644 --- a/package/libvpl/libvpl.hash +++ b/package/libvpl/libvpl.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 978398c7bb1665a6ad7a1a15cc57dc0204608e56c88436e376b717320a9e63fd libvpl-2023.4.0.tar.gz +sha256 524299a7b920ac0de1f6913ca90515858ea3a8ea2daaea60f8e0be62f22c8041 libvpl-2.10.1.tar.gz sha256 bf1cfac2e2792b6e1e995ce103d70796aecaf2ec7e4c5fe5474f7acec7b4a677 LICENSE diff --git a/package/libvpl/libvpl.mk b/package/libvpl/libvpl.mk index 3b0adaaf0f..0c5d354874 100644 --- a/package/libvpl/libvpl.mk +++ b/package/libvpl/libvpl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVPL_VERSION = 2023.4.0 +LIBVPL_VERSION = 2.10.1 LIBVPL_SITE = $(call github,intel,libvpl,v$(LIBVPL_VERSION)) LIBVPL_LICENSE = MIT LIBVPL_LICENSE_FILES = LICENSE From adf58f26be60462b5d55d4296419d724ba30c014 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 24 Dec 2023 09:13:21 +0100 Subject: [PATCH 4291/5754] package/libva-utils: bump version to 2.20.1 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- 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 b7b6fe3bbc..f82a251ef8 100644 --- a/package/libva-utils/libva-utils.hash +++ b/package/libva-utils/libva-utils.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 1a5e3c3c24677a6b4bbee21042c4c06b0a2c62e56ebb1baa4e712392b5c72f9b libva-utils-2.20.0.tar.gz +sha256 97413a7ec27ec479b97ffc7ab8acebe053615224a4b051602859cf9f88e4e889 libva-utils-2.20.1.tar.gz sha256 c6220c9f87832c27abcb8a32eafdd2823e13ce146b3ea63d5deae2a76798ef50 COPYING diff --git a/package/libva-utils/libva-utils.mk b/package/libva-utils/libva-utils.mk index 4f0fa68aa9..1f53964789 100644 --- a/package/libva-utils/libva-utils.mk +++ b/package/libva-utils/libva-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVA_UTILS_VERSION = 2.20.0 +LIBVA_UTILS_VERSION = 2.20.1 LIBVA_UTILS_SITE = $(call github,intel,libva-utils,$(LIBVA_UTILS_VERSION)) LIBVA_UTILS_LICENSE = MIT LIBVA_UTILS_LICENSE_FILES = COPYING From f439b47ed6e987306c7de6d9c3be11de04935377 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 23 Dec 2023 22:29:47 +0100 Subject: [PATCH 4292/5754] boot/grub2: add RISC-V 64bit EFI support Grub can be built as a RISC-V UEFI application since commit [1]. This commit was first included in grub version 2.04. This commit enables this support. [1] https://git.savannah.gnu.org/gitweb/?p=grub.git;a=commitdiff;h=f1957dc8a3347278a095bc8f44197662559a8ba3 Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- boot/grub2/Config.in | 10 ++++++++++ boot/grub2/grub2.mk | 9 +++++++++ 2 files changed, 19 insertions(+) diff --git a/boot/grub2/Config.in b/boot/grub2/Config.in index f05f33ccc7..7c235e96f7 100644 --- a/boot/grub2/Config.in +++ b/boot/grub2/Config.in @@ -4,6 +4,7 @@ config BR2_TARGET_GRUB2_ARCH_SUPPORTS default y if BR2_x86_64 default y if BR2_arm default y if BR2_aarch64 + default y if BR2_RISCV_64 depends on BR2_USE_MMU config BR2_TARGET_GRUB2 @@ -102,6 +103,15 @@ config BR2_TARGET_GRUB2_ARM64_EFI Aarch64 platform and you want to boot Grub 2 as an EFI application. +config BR2_TARGET_GRUB2_RISCV64_EFI + bool "riscv64-efi" + depends on BR2_RISCV_64 + select BR2_TARGET_GRUB2_HAS_EFI_BOOT + help + Select this option if the platform you're targetting is a + 64bit RISC-V platform and you want to boot Grub 2 as an EFI + application. + if BR2_TARGET_GRUB2_HAS_LEGACY_BOOT comment "Options for the x86 legacy BIOS or ARM U-Boot support" diff --git a/boot/grub2/grub2.mk b/boot/grub2/grub2.mk index 4430aebd59..6d0d71c47d 100644 --- a/boot/grub2/grub2.mk +++ b/boot/grub2/grub2.mk @@ -93,6 +93,15 @@ GRUB2_BUILTIN_CONFIG_arm64-efi = $(GRUB2_BUILTIN_CONFIG_EFI) GRUB2_BUILTIN_MODULES_arm64-efi = $(GRUB2_BUILTIN_MODULES_EFI) GRUB2_TUPLES-$(BR2_TARGET_GRUB2_ARM64_EFI) += arm64-efi +GRUB2_IMAGE_riscv64-efi = $(BINARIES_DIR)/efi-part/EFI/BOOT/bootriscv64.efi +GRUB2_CFG_riscv64-efi = $(BINARIES_DIR)/efi-part/EFI/BOOT/grub.cfg +GRUB2_PREFIX_riscv64-efi = /EFI/BOOT +GRUB2_TARGET_riscv64-efi = riscv64 +GRUB2_PLATFORM_riscv64-efi = efi +GRUB2_BUILTIN_CONFIG_riscv64-efi = $(GRUB2_BUILTIN_CONFIG_EFI) +GRUB2_BUILTIN_MODULES_riscv64-efi = $(GRUB2_BUILTIN_MODULES_EFI) +GRUB2_TUPLES-$(BR2_TARGET_GRUB2_RISCV64_EFI) += riscv64-efi + # Grub2 is kind of special: it considers CC, LD and so on to be the # tools to build the host programs and uses TARGET_CC, TARGET_CFLAGS, # TARGET_CPPFLAGS, TARGET_LDFLAGS to build the bootloader itself. From 8219955118fee56ccd3ca8a13a6350d0e15de418 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 23 Dec 2023 22:29:48 +0100 Subject: [PATCH 4293/5754] configs/qemu_riscv64_virt_efi: new defconfig This defconfig enables edk2 UEFI shell and grub2 riscv64-efi boot of a Linux Kernel. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- DEVELOPERS | 2 ++ .../riscv64-virt-efi/assemble-flash-images | 11 ++++++ board/qemu/riscv64-virt-efi/genimage.cfg | 34 ++++++++++++++++++ board/qemu/riscv64-virt-efi/grub.cfg | 6 ++++ board/qemu/riscv64-virt-efi/readme.txt | 36 +++++++++++++++++++ configs/qemu_riscv64_virt_efi_defconfig | 19 ++++++++++ 6 files changed, 108 insertions(+) create mode 100755 board/qemu/riscv64-virt-efi/assemble-flash-images create mode 100644 board/qemu/riscv64-virt-efi/genimage.cfg create mode 100644 board/qemu/riscv64-virt-efi/grub.cfg create mode 100644 board/qemu/riscv64-virt-efi/readme.txt create mode 100644 configs/qemu_riscv64_virt_efi_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index 834be54eb1..b5158ba986 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1713,11 +1713,13 @@ F: configs/ts7680_defconfig F: package/paho-mqtt-c N: Julien Olivain +F: board/qemu/riscv64-virt-efi/ F: board/spike/ F: board/technexion/imx8mmpico/ F: board/technexion/imx8mpico/ F: configs/imx8mmpico_defconfig F: configs/imx8mpico_defconfig +F: configs/qemu_riscv64_virt_efi_defconfig F: configs/spike_riscv64_defconfig F: package/fluid-soundfont/ F: package/fluidsynth/ diff --git a/board/qemu/riscv64-virt-efi/assemble-flash-images b/board/qemu/riscv64-virt-efi/assemble-flash-images new file mode 100755 index 0000000000..abcaa2c93b --- /dev/null +++ b/board/qemu/riscv64-virt-efi/assemble-flash-images @@ -0,0 +1,11 @@ +#! /bin/sh + +set -e + +BOARD_DIR="$(dirname "$0")" + +cp -f "${BOARD_DIR}"/grub.cfg "${BINARIES_DIR}"/efi-part/EFI/BOOT/grub.cfg + +# The QEMU riscv64 virt machine expects flash devices to be 32M. +truncate -s 32M "${BINARIES_DIR}"/RISCV_VIRT_CODE.fd +truncate -s 32M "${BINARIES_DIR}"/RISCV_VIRT_VARS.fd diff --git a/board/qemu/riscv64-virt-efi/genimage.cfg b/board/qemu/riscv64-virt-efi/genimage.cfg new file mode 100644 index 0000000000..46950591e0 --- /dev/null +++ b/board/qemu/riscv64-virt-efi/genimage.cfg @@ -0,0 +1,34 @@ +image efi-part.vfat { + vfat { + file EFI { + image = "efi-part/EFI" + } + + file Image { + image = "Image" + } + } + + size = 64M +} + +image disk.img { + hdimage { + partition-table-type = "gpt" + } + + partition boot { + image = "efi-part.vfat" + partition-type-uuid = U + offset = 32K + bootable = true + } + + partition root { + # For partition-type-uuid value, see: + # https://uapi-group.org/specifications/specs/discoverable_partitions_specification/ + # SD_GPT_ROOT_RISCV64 + partition-type-uuid = 72ec70a6-cf74-40e6-bd49-4bda08e8f224 + image = "rootfs.ext2" + } +} diff --git a/board/qemu/riscv64-virt-efi/grub.cfg b/board/qemu/riscv64-virt-efi/grub.cfg new file mode 100644 index 0000000000..d99e19c4cd --- /dev/null +++ b/board/qemu/riscv64-virt-efi/grub.cfg @@ -0,0 +1,6 @@ +set default="0" +set timeout="5" + +menuentry "Buildroot" { + linux /Image root=PARTLABEL=root rootwait +} diff --git a/board/qemu/riscv64-virt-efi/readme.txt b/board/qemu/riscv64-virt-efi/readme.txt new file mode 100644 index 0000000000..6b9651a011 --- /dev/null +++ b/board/qemu/riscv64-virt-efi/readme.txt @@ -0,0 +1,36 @@ +Intro +===== + +This is a RISC-V 64bit UEFI Linux boot demo in QEmu virt machine. + +Build +===== + + make qemu_riscv64_virt_efi_defconfig + make + +Emulation +========= + +Run the emulation with: + + qemu-system-riscv64 \ + -M virt,pflash0=pflash0,pflash1=pflash1,acpi=off \ + -smp 4 \ + -m 1024 \ + -nographic \ + -blockdev node-name=pflash0,driver=file,read-only=on,filename=output/images/RISCV_VIRT_CODE.fd \ + -blockdev node-name=pflash1,driver=file,filename=output/images/RISCV_VIRT_VARS.fd \ + \ + -drive file=output/images/disk.img,format=raw,id=hd0 \ + -device virtio-blk-device,drive=hd0 \ + \ + -netdev user,id=net0 \ + -device virtio-net-device,netdev=net0 # qemu_riscv64_virt_efi_defconfig + +Note: for information, qemu version >= 8.0.0 is needed for this UEFI +Linux demo. It introduced the two pflash memories (previous versions +had only one). The host-qemu package in Buildroot (enabled in this +defconfig) is sufficient to run this demo. In case another qemu is +used (for example, from the host OS), make sure to check the version +requirement. diff --git a/configs/qemu_riscv64_virt_efi_defconfig b/configs/qemu_riscv64_virt_efi_defconfig new file mode 100644 index 0000000000..79aadf78ca --- /dev/null +++ b/configs/qemu_riscv64_virt_efi_defconfig @@ -0,0 +1,19 @@ +BR2_riscv=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_SYSTEM_DHCP="eth0" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh board/qemu/riscv64-virt-efi/assemble-flash-images support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG) -c board/qemu/riscv64-virt-efi/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.69" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_TARGET_ROOTFS_EXT2=y +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_EDK2=y +BR2_TARGET_GRUB2=y +BR2_TARGET_GRUB2_RISCV64_EFI=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y From cbd06b6ddd20493bf7bb56ee52919ecdd55ec647 Mon Sep 17 00:00:00 2001 From: Charles Hardin Date: Fri, 25 Aug 2023 12:56:35 -0700 Subject: [PATCH 4294/5754] package/python3: add option to support curses in host-python This can be relevant for host scripts that use Python. Signed-off-by: Charles Hardin Signed-off-by: Thomas Petazzoni --- package/python3/Config.in.host | 5 +++++ package/python3/python3.mk | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/package/python3/Config.in.host b/package/python3/Config.in.host index 77d608bdc0..88c286c55b 100644 --- a/package/python3/Config.in.host +++ b/package/python3/Config.in.host @@ -12,6 +12,11 @@ config BR2_PACKAGE_HOST_PYTHON3_BZIP2 help bz2 module for host Python3. +config BR2_PACKAGE_HOST_PYTHON3_CURSES + bool "curses" + help + curses module for host Python3. + config BR2_PACKAGE_HOST_PYTHON3_SSL bool "ssl" select BR2_PACKAGE_HOST_OPENSSL diff --git a/package/python3/python3.mk b/package/python3/python3.mk index b9c5054a21..7a704d81e0 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -22,7 +22,6 @@ HOST_PYTHON3_CONF_OPTS += \ --disable-sqlite3 \ --disable-tk \ --with-expat=system \ - --disable-curses \ --disable-codecs-cjk \ --disable-nis \ --enable-unicodedata \ @@ -55,6 +54,12 @@ else HOST_PYTHON3_CONF_OPTS += --disable-bzip2 endif +ifeq ($(BR2_PACKAGE_HOST_PYTHON3_CURSES),y) +HOST_PYTHON3_DEPENDENCIES += host-ncurses +else +HOST_PYTHON3_CONF_OPTS += --disable-curses +endif + ifeq ($(BR2_PACKAGE_HOST_PYTHON3_SSL),y) HOST_PYTHON3_DEPENDENCIES += host-openssl else From 7b155cdf60130d1ebd4658a537dc010f5280dc22 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 24 Dec 2023 09:15:10 +0100 Subject: [PATCH 4295/5754] package/libxslt: bump to version 1.1.39 Release notes: https://download.gnome.org/sources/libxslt/1.1/libxslt-1.1.39.news Fixes: http://autobuild.buildroot.net/results/8dc/8dc9b1fb68c196deace94951ed81a9a520f98973// Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- 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 458c1388d3..7597e7954d 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.38.sha256sum -sha256 1f32450425819a09acaff2ab7a5a7f8a2ec7956e505d7beeb45e843d0e1ecab1 libxslt-1.1.38.tar.xz +# From https://download.gnome.org/sources/libxslt/1.1/libxslt-1.1.39.sha256sum +sha256 2a20ad621148339b0759c4d4e96719362dee64c9a096dbba625ba053846349f0 libxslt-1.1.39.tar.xz # Hash for license file: sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 COPYING diff --git a/package/libxslt/libxslt.mk b/package/libxslt/libxslt.mk index ec066fbfa2..8098937ef3 100644 --- a/package/libxslt/libxslt.mk +++ b/package/libxslt/libxslt.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBXSLT_VERSION = 1.1.38 +LIBXSLT_VERSION = 1.1.39 LIBXSLT_SOURCE = libxslt-$(LIBXSLT_VERSION).tar.xz LIBXSLT_SITE = https://download.gnome.org/sources/libxslt/1.1 LIBXSLT_INSTALL_STAGING = YES From 6d6fe258a68e75f2f310c74dad57f430b748d762 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 24 Dec 2023 09:15:11 +0100 Subject: [PATCH 4296/5754] package/apache: fix build with libxml2-2.12 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- ...emove-dependency-on-xmlstring-header.patch | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 package/apache/0004-mod_xml2enc-remove-dependency-on-xmlstring-header.patch diff --git a/package/apache/0004-mod_xml2enc-remove-dependency-on-xmlstring-header.patch b/package/apache/0004-mod_xml2enc-remove-dependency-on-xmlstring-header.patch new file mode 100644 index 0000000000..8ff7076589 --- /dev/null +++ b/package/apache/0004-mod_xml2enc-remove-dependency-on-xmlstring-header.patch @@ -0,0 +1,47 @@ +From 27a68e54b7c6d2ae80dca396fd2727852897dab1 Mon Sep 17 00:00:00 2001 +From: Eric Covener +Date: Tue, 21 Nov 2023 12:58:47 +0000 +Subject: [PATCH] mod_xml2enc: remove dependency on xmlstring header + +Submitted by: ttachi + +Github: closes #393 + +git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1914013 13f79535-47bb-0310-9956-ffa450edef68 + +Upstream: https://github.com/apache/httpd/commit/27a68e54b7c6d2ae80dca396fd2727852897dab1 + +Signed-off-by: Bernd Kuhls +--- + changes-entries/xmlchar.txt | 2 ++ + modules/filters/mod_xml2enc.c | 6 +++--- + 2 files changed, 5 insertions(+), 3 deletions(-) + create mode 100644 changes-entries/xmlchar.txt + +diff --git a/changes-entries/xmlchar.txt b/changes-entries/xmlchar.txt +new file mode 100644 +index 00000000000..d0e06300411 +--- /dev/null ++++ b/changes-entries/xmlchar.txt +@@ -0,0 +1,2 @@ ++ *) mod_xml2enc: Tolerate libxml2 2.12.0 and later. ++ [ttachi ] +diff --git a/modules/filters/mod_xml2enc.c b/modules/filters/mod_xml2enc.c +index 34f8e8ee090..e8ee2647955 100644 +--- a/modules/filters/mod_xml2enc.c ++++ b/modules/filters/mod_xml2enc.c +@@ -206,11 +206,11 @@ static void sniff_encoding(request_rec* r, xml2ctx* ctx) + } + } + } +- ++ + /* to sniff, first we look for BOM */ + if (ctx->xml2enc == XML_CHAR_ENCODING_NONE) { +- ctx->xml2enc = xmlDetectCharEncoding((const xmlChar*)ctx->buf, +- ctx->bytes); ++ ctx->xml2enc = xmlDetectCharEncoding((const unsigned char*)ctx->buf, ++ ctx->bytes); + if (HAVE_ENCODING(ctx->xml2enc)) { + ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, APLOGNO(01432) + "Got charset from XML rules.") ; From 973eff2ff2d7f0a1ce1be0605b360ec24f0c2c01 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 24 Dec 2023 09:19:01 +0100 Subject: [PATCH 4297/5754] package/php: bump version to 8.2.14 Changelog: https://www.php.net/ChangeLog-8.php#8.2.14 Release notes: https://www.php.net/releases/8_2_14.php This release fixes build errors with libxml2 2.12.0. 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 8ad3823960..3759852a9b 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 2629bba10117bf78912068a230c68a8fd09b7740267bd8ebd3cfce91515d454b php-8.2.13.tar.xz +sha256 763ecd39fcf51c3815af6ef6e43fa9aa0d0bd8e5a615009e5f4780c92705f583 php-8.2.14.tar.xz # License file sha256 080d0d0cca64181ef8bf1df9fba0c6f0c485f78f79540c479a45b593bb3b33b5 LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index aaad741de7..63fcfd8634 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.2.13 +PHP_VERSION = 8.2.14 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From d42683a05517dd6bad1322c02058aeaa97e3ab3a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 24 Dec 2023 09:23:29 +0100 Subject: [PATCH 4298/5754] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.{1, 6}.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 f076ef5b5e..627cfd2130 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.6.7" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.6.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 4bd5261439..e0b7183888 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 0ce68ec6019019140043263520955ecd04839e55a1baab2fa9155b42bb6fd841 linux-6.6.7.tar.xz -sha256 365ff26a30e206de9b18489f45d38582a0a61b7c5919f8ab89295a47316784e1 linux-6.1.68.tar.xz +sha256 5036c434e11e4b36d8da3f489851f7f829cf785fa7f7887468537a9ea4572416 linux-6.6.8.tar.xz +sha256 7e3d2694d18ce502068cc88a430da809abbd17d0773268524ebece442612b541 linux-6.1.69.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 096bb16ec07232f27f6a07998c41b655883a8d0a6bb613d39bf524a9ffd99e02 linux-5.15.143.tar.xz -sha256 ff950750b1060f65c0dde7d4d89238937d80faddf3bcf9ba28189d917daccaee linux-5.10.204.tar.xz -sha256 d39c90dd9297a36aab7246b516f61e21493826004011f161090bce84db21b6b0 linux-5.4.264.tar.xz +sha256 b2a49d87605f3a9491581150315e22337c1afb599efc1e2737481be3a2d6d620 linux-5.15.145.tar.xz +sha256 c55217a80d74f81b83116289a8bfe4302293390b45aeabb76f64814920788863 linux-5.10.205.tar.xz +sha256 4dae99e49f466d4689e128ec023754908147159d7462019a83c7da1f25df9b15 linux-5.4.265.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 53d33c0042eff3700b7f59bdac06295c98c50056fce72f630438974b46bd73ce linux-4.19.302.tar.xz -sha256 66337a2afdc32e5935294139765c99ef878eedbfe1495f3f3625c23cadcab648 linux-4.14.333.tar.xz +sha256 022dce3935eadec7c31093992cc101c905fd4ffbb8afce92f3e41fdd0fa18b36 linux-4.19.303.tar.xz +sha256 8a1d520cfa71e9faebae9d8c24101f5bffe48fcb897dede4cecad5af67c34a45 linux-4.14.334.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 a3d8247cea..e593ace5ce 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -408,13 +408,13 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.14.333" if BR2_KERNEL_HEADERS_4_14 - default "4.19.302" if BR2_KERNEL_HEADERS_4_19 - default "5.4.264" if BR2_KERNEL_HEADERS_5_4 - default "5.10.204" if BR2_KERNEL_HEADERS_5_10 - default "5.15.143" if BR2_KERNEL_HEADERS_5_15 - default "6.1.68" if BR2_KERNEL_HEADERS_6_1 - default "6.6.7" if BR2_KERNEL_HEADERS_6_6 + default "4.14.334" if BR2_KERNEL_HEADERS_4_14 + default "4.19.303" if BR2_KERNEL_HEADERS_4_19 + default "5.4.265" if BR2_KERNEL_HEADERS_5_4 + default "5.10.205" if BR2_KERNEL_HEADERS_5_10 + default "5.15.145" if BR2_KERNEL_HEADERS_5_15 + default "6.1.69" if BR2_KERNEL_HEADERS_6_1 + default "6.6.8" 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 58bf6a7f051dfe69c78fa5c794ba72357ddae82f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 24 Dec 2023 10:45:15 +0100 Subject: [PATCH 4299/5754] package/kodi-inputstream-adaptive: bump version to 20.3.15-Nexus Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../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 a59e0fda88..ebcf32fd4a 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 43d8da96176aedaef8ba14ec90398c5b13d0bb01c388150c02b9952870b655e8 kodi-inputstream-adaptive-20.3.13-Nexus.tar.gz +sha256 1d7c933d05534e591e11fd204e836a3498fffc6a0717d5427c89acfd16fb9d40 kodi-inputstream-adaptive-20.3.15-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 be7b36bce4..267541ace9 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.13-Nexus +KODI_INPUTSTREAM_ADAPTIVE_VERSION = 20.3.15-Nexus KODI_INPUTSTREAM_ADAPTIVE_SITE = $(call github,xbmc,inputstream.adaptive,$(KODI_INPUTSTREAM_ADAPTIVE_VERSION)) KODI_INPUTSTREAM_ADAPTIVE_LICENSE = \ BSD-2-Clause-Views \ From 80286eb5f19c1291e6a9334347d484ed28c16297 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Thu, 14 Dec 2023 00:01:35 -0700 Subject: [PATCH 4300/5754] package/python-certifi: bump to version 2023.11.17 License hash changed due to inaccurate date cleanup: https://github.com/certifi/python-certifi/commit/2103453dd43dbfb859f257b193d9087b3997959a Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-certifi/python-certifi.hash | 6 +++--- package/python-certifi/python-certifi.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-certifi/python-certifi.hash b/package/python-certifi/python-certifi.hash index fe0748adb8..48e25119e5 100644 --- a/package/python-certifi/python-certifi.hash +++ b/package/python-certifi/python-certifi.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/certifi/json -md5 10a72845d3fc2c38d212b4b7b1872c76 certifi-2023.7.22.tar.gz -sha256 539cc1d13202e33ca466e88b2807e29f4c13049d6d87031a3c110744495cb082 certifi-2023.7.22.tar.gz +md5 5a41f94d681748e76675f3cb4a7d517e certifi-2023.11.17.tar.gz +sha256 9b469f3a900bf28dc19b8cfbf8019bf47f7fdd1a65a1d4ffb98fc14166beb4d1 certifi-2023.11.17.tar.gz # Locally computed sha256 checksums -sha256 a02f6c638f9fb84d06f7764c3ab085d8af7eda5b93c166da54312479077c6fb0 LICENSE +sha256 e93716da6b9c0d5a4a1df60fe695b370f0695603d21f6f83f053e42cfc10caf7 LICENSE diff --git a/package/python-certifi/python-certifi.mk b/package/python-certifi/python-certifi.mk index 9b5f853682..90aabaa1ac 100644 --- a/package/python-certifi/python-certifi.mk +++ b/package/python-certifi/python-certifi.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CERTIFI_VERSION = 2023.7.22 +PYTHON_CERTIFI_VERSION = 2023.11.17 PYTHON_CERTIFI_SOURCE = certifi-$(PYTHON_CERTIFI_VERSION).tar.gz -PYTHON_CERTIFI_SITE = https://files.pythonhosted.org/packages/98/98/c2ff18671db109c9f10ed27f5ef610ae05b73bd876664139cf95bd1429aa +PYTHON_CERTIFI_SITE = https://files.pythonhosted.org/packages/d4/91/c89518dd4fe1f3a4e3f6ab7ff23cb00ef2e8c9adf99dacc618ad5e068e28 PYTHON_CERTIFI_SETUP_TYPE = setuptools PYTHON_CERTIFI_LICENSE = ISC (Python code), MPL-2.0 (cacert.pem) PYTHON_CERTIFI_LICENSE_FILES = LICENSE From c81af1667f74edaa977fa7c8677555c8efaaa068 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Tue, 12 Dec 2023 20:01:23 +0100 Subject: [PATCH 4301/5754] package/perftest: bump to version 23.10.0-0.29 For change log, see: https://github.com/linux-rdma/perftest/releases/tag/23.10.0-0.29 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 e771d4f463..2fa8c63493 100644 --- a/package/perftest/perftest.hash +++ b/package/perftest/perftest.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c5b437734b7f9d31dac0b044cd8510b5580eb932080871b470aeae7309884d3b perftest-23.07.0-0.27.tar.gz +sha256 79bcbb4a62a578408379e89d73f4ceea8f272a139e8a634611f92b1d9ac911a0 perftest-23.10.0-0.29.tar.gz sha256 763adb7d5094f2127b026adea8701f042d28d4b1f6fb8b6e828989227a9cf7f5 COPYING diff --git a/package/perftest/perftest.mk b/package/perftest/perftest.mk index d3259face5..9e0424e47e 100644 --- a/package/perftest/perftest.mk +++ b/package/perftest/perftest.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERFTEST_VERSION = 23.07.0-0.27 +PERFTEST_VERSION = 23.10.0-0.29 PERFTEST_SITE = $(call github,linux-rdma,perftest,$(PERFTEST_VERSION)) PERFTEST_LICENSE = GPL-2.0 or BSD-2-Clause PERFTEST_LICENSE_FILES = COPYING From df89e73e92abcddfdfa5d61cd00757a7c80a699d Mon Sep 17 00:00:00 2001 From: Christian Hitz Date: Mon, 11 Dec 2023 14:53:21 +0100 Subject: [PATCH 4302/5754] package/imagemagick: add option to build host-imagemagick with XML support Since upstream commit https://github.com/ImageMagick/ImageMagick/commit/25e3a4f3845f59536d19aba0ac0580aa6715147f (which first appeared in version 7.1.1-19), ImageMagick does not trust unvalidated XMP profiles in images anymore. If such a XML profile is encountered inside e.g. a PNG image the processing is aborted. Validating the XMP profile requires that ImageMagick is compiled with XML support. As host-imagemagick supports PNG file also activate XML support. Signed-off-by: Christian Hitz Signed-off-by: Thomas Petazzoni --- package/imagemagick/Config.in.host | 11 +++++++++++ package/imagemagick/imagemagick.mk | 14 +++++++++----- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/package/imagemagick/Config.in.host b/package/imagemagick/Config.in.host index 5055101e23..26912e5f04 100644 --- a/package/imagemagick/Config.in.host +++ b/package/imagemagick/Config.in.host @@ -18,6 +18,7 @@ config BR2_PACKAGE_HOST_IMAGEMAGICK_SVG bool "SVG support" depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS # host-librsvg depends on BR2_HOST_GCC_AT_LEAST_4_9 # host-pango -> host-harfbuzz + select BR2_PACKAGE_HOST_IMAGEMAGICK_XML help Say 'y' here is you need ImageMagick tools (like convert) to support SVG. @@ -29,4 +30,14 @@ comment "SVG support needs host gcc >= 4.9" depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS depends on !BR2_HOST_GCC_AT_LEAST_4_9 +config BR2_PACKAGE_HOST_IMAGEMAGICK_XML + bool "XML support" + help + Say 'y' here if you need ImageMagick to support XML. Indeed, + ImageMagick does not trust unvalidated XMP profiles in + images. If such a XML profile is encountered inside e.g. a + PNG image the processing is aborted. Validating the XMP + profile requires that ImageMagick is compiled with XML + support. + endif diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk index 719c6768af..53cf02abf4 100644 --- a/package/imagemagick/imagemagick.mk +++ b/package/imagemagick/imagemagick.mk @@ -238,22 +238,26 @@ HOST_IMAGEMAGICK_DEPENDENCIES += \ host-fontconfig \ host-freetype \ host-librsvg \ - host-libxml2 \ host-pango HOST_IMAGEMAGICK_CONF_ENV += ac_cv_path_xml2_config=$(HOST_DIR)/bin/xml2-config HOST_IMAGEMAGICK_CONF_OPTS += \ --with-fontconfig \ --with-freetype \ --with-pango \ - --with-rsvg \ - --with-xml + --with-rsvg else HOST_IMAGEMAGICK_CONF_OPTS += \ --without-fontconfig \ --without-freetype \ --without-pango \ - --without-rsvg \ - --without-xml + --without-rsvg +endif + +ifeq ($(BR2_PACKAGE_HOST_IMAGEMAGICK_XML),y) +HOST_IMAGEMAGICK_CONF_OPTS += --with-xml +HOST_IMAGEMAGICK_DEPENDENCIES += host-libxml2 +else +HOST_IMAGEMAGICK_CONF_OPTS += --without-xml endif $(eval $(autotools-package)) From 2f6b1b8e6893003efcc72185cd468dcb0b088b2d Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Thu, 21 Dec 2023 08:36:11 -0700 Subject: [PATCH 4303/5754] package/dmenu-wayland: new package The traditional dmenu is only running under X; dmenu-wayland is an implementation that runs only on (some) wayland compositors; Sway uses it by default as its menu bar. Signed-off-by: Adam Duskett [yann.morin.1998@free.fr: - _SYNC_4 is an arch dependency, so comment should be hidden - add a few missing comments for first-level dependencies ] Signed-off-by: Yann E. MORIN --- DEVELOPERS | 1 + package/Config.in | 1 + .../0001-support-cross-compilation.patch | 32 +++++++++++++++++++ package/dmenu-wayland/Config.in | 27 ++++++++++++++++ package/dmenu-wayland/dmenu-wayland.hash | 3 ++ package/dmenu-wayland/dmenu-wayland.mk | 28 ++++++++++++++++ 6 files changed, 92 insertions(+) create mode 100644 package/dmenu-wayland/0001-support-cross-compilation.patch create mode 100644 package/dmenu-wayland/Config.in create mode 100644 package/dmenu-wayland/dmenu-wayland.hash create mode 100644 package/dmenu-wayland/dmenu-wayland.mk diff --git a/DEVELOPERS b/DEVELOPERS index b5158ba986..9492ebe79b 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -33,6 +33,7 @@ F: package/vulkan-tools/ N: Adam Duskett F: package/depot-tools/ +F: package/dmenu-wayland/ F: package/fcft/ F: package/flutter-engine/ F: package/flutter-gallery/ diff --git a/package/Config.in b/package/Config.in index 28924f650e..b0e18436ff 100644 --- a/package/Config.in +++ b/package/Config.in @@ -313,6 +313,7 @@ menu "Graphic libraries and applications (graphic/text)" comment "Graphic applications" source "package/cage/Config.in" source "package/cog/Config.in" + source "package/dmenu-wayland/Config.in" source "package/fswebcam/Config.in" source "package/ghostscript/Config.in" source "package/glmark2/Config.in" diff --git a/package/dmenu-wayland/0001-support-cross-compilation.patch b/package/dmenu-wayland/0001-support-cross-compilation.patch new file mode 100644 index 0000000000..3d99330cba --- /dev/null +++ b/package/dmenu-wayland/0001-support-cross-compilation.patch @@ -0,0 +1,32 @@ +From cd72cade6250a3ec46dd402b25a0bd55bbb97a88 Mon Sep 17 00:00:00 2001 +From: Rick van Schijndel +Date: Wed, 20 Dec 2023 16:44:12 -0700 +Subject: [PATCH] support cross-compilation + +Marking wayland-scanner as native dependency fixes the path check for +wayland-scanner. + +Upstream: https://github.com/nyyManni/dmenu-wayland/pull/23 + +Signed-off-by: Rick van Schijndel +Signed-off-by: Adam Duskett +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 3ae6f69..8d401ff 100644 +--- a/meson.build ++++ b/meson.build +@@ -26,7 +26,7 @@ pangocairo = dependency('pangocairo') + rt = cc.find_library('rt') + wayland_client = dependency('wayland-client') + wayland_protos = dependency('wayland-protocols') +-wayland_scanner_dep = dependency('wayland-scanner') ++wayland_scanner_dep = dependency('wayland-scanner', native: true) + wayland_scanner = find_program( + wayland_scanner_dep.get_pkgconfig_variable('wayland_scanner') + ) +-- +2.43.0 + diff --git a/package/dmenu-wayland/Config.in b/package/dmenu-wayland/Config.in new file mode 100644 index 0000000000..8a4d0918dc --- /dev/null +++ b/package/dmenu-wayland/Config.in @@ -0,0 +1,27 @@ +config BR2_PACKAGE_DMENU_WAYLAND + bool "dmenu-wayland" + depends on BR2_USE_MMU # pango + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango + depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2, pango, wayland + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pango + depends on !BR2_STATIC_LIBS # wayland + depends on BR2_INSTALL_LIBSTDCPP # pango + depends on BR2_USE_WCHAR # libglib2, pango + select BR2_PACKAGE_CAIRO + select BR2_PACKAGE_CAIRO_PNG + select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_LIBXKBCOMMON + select BR2_PACKAGE_PANGO + select BR2_PACKAGE_WAYLAND + select BR2_PACKAGE_WAYLAND_PROTOCOLS + help + dmenu-wl is an efficient dynamic menu for wayland (wlroots). + + https://github.com/nyyManni/dmenu-wayland + +comment "dmenu-wayland needs a toolchain w/ wchar, threads, C++, dynamic library, gcc >= 4.9" + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || BR2_STATIC_LIBS || \ + !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR diff --git a/package/dmenu-wayland/dmenu-wayland.hash b/package/dmenu-wayland/dmenu-wayland.hash new file mode 100644 index 0000000000..1248c4ad66 --- /dev/null +++ b/package/dmenu-wayland/dmenu-wayland.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 56340e198a2c58468c6109f3bb07ab8a074487e67b0758b29c9d4fdce7c4d594 dmenu-wayland-a380201dff5bfac2dace553d7eaedb6cea6855f9.tar.gz +sha256 8d26bccf8a21c5e29dc756beef534403c935766c815bbb6e7eab0598632b9827 LICENSE diff --git a/package/dmenu-wayland/dmenu-wayland.mk b/package/dmenu-wayland/dmenu-wayland.mk new file mode 100644 index 0000000000..33a73c0153 --- /dev/null +++ b/package/dmenu-wayland/dmenu-wayland.mk @@ -0,0 +1,28 @@ +################################################################################ +# +# dmenu-wayland +# +################################################################################ + +DMENU_WAYLAND_VERSION = a380201dff5bfac2dace553d7eaedb6cea6855f9 +DMENU_WAYLAND_SITE = $(call github,nyyManni,dmenu-wayland,$(DMENU_WAYLAND_VERSION)) +DMENU_WAYLAND_LICENSE = MIT +DMENU_WAYLAND_LICENSE_FILES = LICENSE + +# host-wayland is for wayland-scanner +DMENU_WAYLAND_DEPENDENCIES = \ + host-wayland \ + cairo \ + libglib2 \ + libxkbcommon \ + pango \ + wayland \ + wayland-protocols + +# By default, sway calls dmenu not dmenu-wl +define DMENU_WAYLAND_SYMLINK_DMENU_WL + ln -sf dmenu-wl $(TARGET_DIR)/usr/bin/dmenu +endef +DMENU_WAYLAND_POST_INSTALL_TARGET_HOOKS += DMENU_WAYLAND_SYMLINK_DMENU_WL + +$(eval $(meson-package)) From d62dda206539ef2eeaf767772a00cdd52a55ab1d Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Thu, 21 Dec 2023 08:36:12 -0700 Subject: [PATCH 4304/5754] package/foot: new package This is the default terminal sway uses. Signed-off-by: Adam Duskett [yann.morin.1998@free.fr: add comment only for first-order deps] Signed-off-by: Yann E. MORIN --- DEVELOPERS | 1 + package/Config.in | 1 + package/foot/Config.in | 36 ++++++++++++++++++++++++++++++ package/foot/foot.hash | 3 +++ package/foot/foot.mk | 50 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 91 insertions(+) create mode 100644 package/foot/Config.in create mode 100644 package/foot/foot.hash create mode 100644 package/foot/foot.mk diff --git a/DEVELOPERS b/DEVELOPERS index 9492ebe79b..a232059a62 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -35,6 +35,7 @@ N: Adam Duskett F: package/depot-tools/ F: package/dmenu-wayland/ F: package/fcft/ +F: package/foot/ F: package/flutter-engine/ F: package/flutter-gallery/ F: package/flutter-pi/ diff --git a/package/Config.in b/package/Config.in index b0e18436ff..a7c653746e 100644 --- a/package/Config.in +++ b/package/Config.in @@ -314,6 +314,7 @@ comment "Graphic applications" source "package/cage/Config.in" source "package/cog/Config.in" source "package/dmenu-wayland/Config.in" + source "package/foot/Config.in" source "package/fswebcam/Config.in" source "package/ghostscript/Config.in" source "package/glmark2/Config.in" diff --git a/package/foot/Config.in b/package/foot/Config.in new file mode 100644 index 0000000000..24b3f78821 --- /dev/null +++ b/package/foot/Config.in @@ -0,0 +1,36 @@ +config BR2_PACKAGE_FOOT + bool "foot" + depends on !BR2_STATIC_LIBS # wayland + depends on BR2_TOOLCHAIN_HAS_THREADS # fcft, wayland + select BR2_PACKAGE_FCFT + select BR2_PACKAGE_FONTCONFIG + select BR2_PACKAGE_FREETYPE + select BR2_PACKAGE_LIBXKBCOMMON + select BR2_PACKAGE_PIXMAN + select BR2_PACKAGE_TLLIST + select BR2_PACKAGE_WAYLAND + select BR2_PACKAGE_WAYLAND_PROTOCOLS + help + A fast, lightweight and minimalistic Wayland terminal + emulator. + NOTE: foot needs a working UTF-8 locale (BR2_GENERATE_LOCALE) + + https://codeberg.org/dnkl/foot + +if BR2_PACKAGE_FOOT + +config BR2_PACKAGE_FOOT_GRAPHEME_CLUSTERING + bool "grapheme-clustering" + select BR2_PACKAGE_UTF8PROC + help + Enables grapheme clustering. + +config BR2_PACKAGE_FOOT_THEMES + bool "themes" + help + Install themes (predefined color schemes) + +endif # BR2_PACKAGE_FOOT + +comment "foot needs a toolchain w/ dynamic library, threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/foot/foot.hash b/package/foot/foot.hash new file mode 100644 index 0000000000..f3bf0f6058 --- /dev/null +++ b/package/foot/foot.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 8060ec28cbf6e2e3d408665330da4bc48fd094d4f1265d7c58dc75c767463c29 1.16.2.tar.gz +sha256 d534a23a31500a0ac958d9634b84f532bd73ff1aca1bb8f7debbcbebc16ff39a LICENSE diff --git a/package/foot/foot.mk b/package/foot/foot.mk new file mode 100644 index 0000000000..1595e2a718 --- /dev/null +++ b/package/foot/foot.mk @@ -0,0 +1,50 @@ +################################################################################ +# +# foot +# +################################################################################ + +FOOT_VERSION = 1.16.2 +FOOT_SOURCE = $(FOOT_VERSION).tar.gz +FOOT_SITE = https://codeberg.org/dnkl/foot/archive +FOOT_LICENSE = MIT +FOOT_LICENSE_FILES = LICENSE +FOOT_DEPENDENCIES = \ + fcft \ + fontconfig \ + freetype \ + libxkbcommon \ + pixman \ + tllist \ + wayland \ + wayland-protocols + +FOOT_CONF_OPTS = \ + -Ddocs=disabled \ + -Dtests=false + +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +FOOT_DEPENDENCIES += systemd +endif + +ifeq ($(BR2_PACKAGE_LIBUTEMPTER),y) +FOOT_DEPENDENCIES += libutempter +FOOT_CONF_OPTS += -Dutmp-backend='libutempter' +else +FOOT_CONF_OPTS += -Dutmp-backend='none' +endif + +ifeq ($(BR2_PACKAGE_FOOT_GRAPHEME_CLUSTERING),y) +FOOT_DEPENDENCIES += utf8proc +FOOT_CONF_OPTS += -Dgrapheme-clustering=enabled +else +FOOT_CONF_OPTS += -Dgrapheme-clustering=disabled +endif + +ifeq ($(BR2_PACKAGE_FOOT_THEMES),y) +FOOT_CONF_OPTS += -Dthemes=true +else +FOOT_CONF_OPTS += -Dthemes=false +endif + +$(eval $(meson-package)) From 453b993ac19227391c577329e7327bb435bb77e6 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Thu, 21 Dec 2023 08:36:13 -0700 Subject: [PATCH 4305/5754] package/ncurses: install foot terminfo if foot is selected MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From foot/INSTALL.md: ``` As of ncurses 2021-07-31, ncurses includes a version of foot’s terminfo. **The recommendation is to use those**, and only install the terminfo definitions from this git repo if the system’s ncurses predates 2021-07-31. ``` So it is best to follow the instructions and install the foot terminfo provided by ncurses. Signed-off-by: Adam Duskett Signed-off-by: Yann E. MORIN --- package/ncurses/ncurses.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk index 3b805cb1fd..00e1c0d424 100644 --- a/package/ncurses/ncurses.mk +++ b/package/ncurses/ncurses.mk @@ -73,6 +73,13 @@ NCURSES_TERMINFO_FILES = \ x/xterm-xfree86 \ $(call qstrip,$(BR2_PACKAGE_NCURSES_ADDITIONAL_TERMINFO)) +ifeq ($(BR2_PACKAGE_FOOT),y) +NCURSES_TERMINFO_FILES += \ + f/foot \ + f/foot+base \ + f/foot-direct +endif + ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y) NCURSES_CONF_OPTS += --enable-widec NCURSES_LIB_SUFFIX = w From cb39803ee3a18d51f569745bc08a0a8d2270decd Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Thu, 21 Dec 2023 08:36:14 -0700 Subject: [PATCH 4306/5754] package/sway: enable bash-completion support Signed-off-by: Adam Duskett Signed-off-by: Yann E. MORIN --- package/sway/sway.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/package/sway/sway.mk b/package/sway/sway.mk index 19f90b8b00..677b101f1d 100644 --- a/package/sway/sway.mk +++ b/package/sway/sway.mk @@ -13,7 +13,6 @@ SWAY_CONF_OPTS = \ -Dwerror=false \ -Ddefault-wallpaper=false \ -Dzsh-completions=false \ - -Dbash-completions=false \ -Dfish-completions=false \ -Dswaybar=false \ -Dswaynag=false \ @@ -34,4 +33,10 @@ else SWAY_CONF_OPTS += -Dgdk-pixbuf=disabled endif +ifeq ($(BR2_PACKAGE_BASH_COMPLETION),y) +SWAY_CONF_OPTS += -Dbash-completions=true +else +SWAY_CONF_OPTS += -Dbash-completions=false +endif + $(eval $(meson-package)) From b5b18f9ebaf1c095df08dcf69418bccb4bc46b6c Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Thu, 21 Dec 2023 08:36:15 -0700 Subject: [PATCH 4307/5754] package/sway: enable default-wallpaper support If swaybg is selected, set default-wallpaper to true. Signed-off-by: Adam Duskett Signed-off-by: Yann E. MORIN --- package/sway/sway.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/package/sway/sway.mk b/package/sway/sway.mk index 677b101f1d..1e3dd279ef 100644 --- a/package/sway/sway.mk +++ b/package/sway/sway.mk @@ -11,7 +11,6 @@ SWAY_LICENSE_FILES = LICENSE SWAY_DEPENDENCIES = systemd host-pkgconf wlroots json-c pcre cairo pango SWAY_CONF_OPTS = \ -Dwerror=false \ - -Ddefault-wallpaper=false \ -Dzsh-completions=false \ -Dfish-completions=false \ -Dswaybar=false \ @@ -39,4 +38,10 @@ else SWAY_CONF_OPTS += -Dbash-completions=false endif +ifeq ($(BR2_PACKAGE_SWAYBG),y) +SWAY_CONF_OPTS += -Ddefault-wallpaper=true +else +SWAY_CONF_OPTS += -Ddefault-wallpaper=false +endif + $(eval $(meson-package)) From b08df59fc61ebbcabf58ee706d74384cbb7dcb7e Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Thu, 21 Dec 2023 08:36:16 -0700 Subject: [PATCH 4308/5754] package/sway: enable swaybar support Add a config option to build sway with swaybar support. - The bar requires dejavu fonts. - If bash-completions is selected, JQ is required. - Select dmenu-wayland as a runtime dependency. Signed-off-by: Adam Duskett [yann.morin.1998@free.fr: jq is a runtime dependency too] Signed-off-by: Yann E. MORIN --- package/sway/Config.in | 12 ++++++++++++ package/sway/sway.mk | 7 ++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/package/sway/Config.in b/package/sway/Config.in index 08b6911069..6fd13636a3 100644 --- a/package/sway/Config.in +++ b/package/sway/Config.in @@ -24,6 +24,18 @@ config BR2_PACKAGE_SWAY https://github.com/swaywm/sway +if BR2_PACKAGE_SWAY + +config BR2_PACKAGE_SWAY_SWAYBAR + bool "swaybar" + select BR2_PACKAGE_DEJAVU + select BR2_PACKAGE_JQ if BR2_PACKAGE_BASH_COMPLETION # Runtime + select BR2_PACKAGE_DMENU_WAYLAND # Runtime + help + Enable support for swaybar + +endif # BR2_PACKAGE_SWAY + comment "sway needs systemd, udev, EGL w/ Wayland backend and OpenGL ES support" depends on !BR2_PACKAGE_SYSTEMD || \ !BR2_PACKAGE_HAS_UDEV || \ diff --git a/package/sway/sway.mk b/package/sway/sway.mk index 1e3dd279ef..6d924ca92e 100644 --- a/package/sway/sway.mk +++ b/package/sway/sway.mk @@ -13,7 +13,6 @@ SWAY_CONF_OPTS = \ -Dwerror=false \ -Dzsh-completions=false \ -Dfish-completions=false \ - -Dswaybar=false \ -Dswaynag=false \ -Dtray=disabled \ -Dman-pages=disabled \ @@ -44,4 +43,10 @@ else SWAY_CONF_OPTS += -Ddefault-wallpaper=false endif +ifeq ($(BR2_PACKAGE_SWAY_SWAYBAR),y) +SWAY_CONF_OPTS += -Dswaybar=true +else +SWAY_CONF_OPTS += -Dswaybar=false +endif + $(eval $(meson-package)) From 31058f5fdfddcbb4eb50a2eeeaa57ed4f9608524 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Thu, 21 Dec 2023 08:36:17 -0700 Subject: [PATCH 4309/5754] package/sway: enable swaybar tray support Add a config option to build swaybar with tray support. Signed-off-by: Adam Duskett Signed-off-by: Yann E. MORIN --- package/sway/Config.in | 9 +++++++++ package/sway/sway.mk | 7 ++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/package/sway/Config.in b/package/sway/Config.in index 6fd13636a3..c2301000e6 100644 --- a/package/sway/Config.in +++ b/package/sway/Config.in @@ -34,6 +34,15 @@ config BR2_PACKAGE_SWAY_SWAYBAR help Enable support for swaybar +if BR2_PACKAGE_SWAY_SWAYBAR + +config BR2_PACKAGE_SWAY_SWAYBAR_TRAY + bool "swaybar tray" + help + Enable support for swaybar tray + +endif # BR2_PACKAGE_SWAY_SWAYBAR + endif # BR2_PACKAGE_SWAY comment "sway needs systemd, udev, EGL w/ Wayland backend and OpenGL ES support" diff --git a/package/sway/sway.mk b/package/sway/sway.mk index 6d924ca92e..5de4c32a04 100644 --- a/package/sway/sway.mk +++ b/package/sway/sway.mk @@ -14,7 +14,6 @@ SWAY_CONF_OPTS = \ -Dzsh-completions=false \ -Dfish-completions=false \ -Dswaynag=false \ - -Dtray=disabled \ -Dman-pages=disabled \ -Dsd-bus-provider=libsystemd @@ -49,4 +48,10 @@ else SWAY_CONF_OPTS += -Dswaybar=false endif +ifeq ($(BR2_PACKAGE_SWAY_SWAYBAR_TRAY),y) +SWAY_CONF_OPTS += -Dtray=enabled +else +SWAY_CONF_OPTS += -Dtray=disabled +endif + $(eval $(meson-package)) From 4163b67c376bbfc81d41e4162ea05b65a9110661 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Thu, 21 Dec 2023 08:36:18 -0700 Subject: [PATCH 4310/5754] package/sway: enable swaynag support Add a config option to build sway with swaynag support. Signed-off-by: Adam Duskett Signed-off-by: Yann E. MORIN --- package/sway/Config.in | 5 +++++ package/sway/sway.mk | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/package/sway/Config.in b/package/sway/Config.in index c2301000e6..e97777ac87 100644 --- a/package/sway/Config.in +++ b/package/sway/Config.in @@ -43,6 +43,11 @@ config BR2_PACKAGE_SWAY_SWAYBAR_TRAY endif # BR2_PACKAGE_SWAY_SWAYBAR +config BR2_PACKAGE_SWAY_SWAYNAG + bool "swaynag" + help + Enable support for swaynag + endif # BR2_PACKAGE_SWAY comment "sway needs systemd, udev, EGL w/ Wayland backend and OpenGL ES support" diff --git a/package/sway/sway.mk b/package/sway/sway.mk index 5de4c32a04..0aad9de712 100644 --- a/package/sway/sway.mk +++ b/package/sway/sway.mk @@ -13,7 +13,6 @@ SWAY_CONF_OPTS = \ -Dwerror=false \ -Dzsh-completions=false \ -Dfish-completions=false \ - -Dswaynag=false \ -Dman-pages=disabled \ -Dsd-bus-provider=libsystemd @@ -48,6 +47,12 @@ else SWAY_CONF_OPTS += -Dswaybar=false endif +ifeq ($(BR2_PACKAGE_SWAY_SWAYNAG),y) +SWAY_CONF_OPTS += -Dswaynag=true +else +SWAY_CONF_OPTS += -Dswaynag=false +endif + ifeq ($(BR2_PACKAGE_SWAY_SWAYBAR_TRAY),y) SWAY_CONF_OPTS += -Dtray=enabled else From 31c169f556d3bf644eae357f7b6781300d60f173 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Thu, 21 Dec 2023 08:36:19 -0700 Subject: [PATCH 4311/5754] package/sway/Config.in: Add a help note about the default terminal The default terminal used by sway is the foot terminal. Add a note in the Config.in explaining that if a user is using the default sway config, it is recommended to also enable the foot package. Signed-off-by: Adam Duskett Signed-off-by: Yann E. MORIN --- package/sway/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/sway/Config.in b/package/sway/Config.in index e97777ac87..4f6d9fb215 100644 --- a/package/sway/Config.in +++ b/package/sway/Config.in @@ -21,6 +21,10 @@ config BR2_PACKAGE_SWAY select BR2_PACKAGE_XKEYBOARD_CONFIG # runtime help i3-compatible Wayland compositor + Note: + The default sway config uses the foot package as the + default terminal. If you plan on using the default + config, it is recommended to select the foot package! https://github.com/swaywm/sway From 8dc5506c76a555bd7eb2455407022b1287b9a821 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Thu, 14 Dec 2023 03:08:33 -0700 Subject: [PATCH 4312/5754] package/python-decouple: new package Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-decouple/Config.in | 6 ++++++ package/python-decouple/python-decouple.hash | 5 +++++ package/python-decouple/python-decouple.mk | 13 +++++++++++++ 4 files changed, 25 insertions(+) create mode 100644 package/python-decouple/Config.in create mode 100644 package/python-decouple/python-decouple.hash create mode 100644 package/python-decouple/python-decouple.mk diff --git a/package/Config.in b/package/Config.in index a7c653746e..c3aeb87f08 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1056,6 +1056,7 @@ menu "External python modules" source "package/python-dbus-fast/Config.in" source "package/python-dbus-next/Config.in" source "package/python-decorator/Config.in" + source "package/python-decouple/Config.in" source "package/python-defusedxml/Config.in" source "package/python-dialog3/Config.in" source "package/python-dicttoxml/Config.in" diff --git a/package/python-decouple/Config.in b/package/python-decouple/Config.in new file mode 100644 index 0000000000..528f43d0cb --- /dev/null +++ b/package/python-decouple/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_DECOUPLE + bool "python-decouple" + help + Strict separation of settings from code. + + http://github.com/henriquebastos/python-decouple/ diff --git a/package/python-decouple/python-decouple.hash b/package/python-decouple/python-decouple.hash new file mode 100644 index 0000000000..cf1290c90e --- /dev/null +++ b/package/python-decouple/python-decouple.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/python-decouple/json +md5 21b174a381d6bff5f4814018a4fd44cd python-decouple-3.8.tar.gz +sha256 ba6e2657d4f376ecc46f77a3a615e058d93ba5e465c01bbe57289bfb7cce680f python-decouple-3.8.tar.gz +# Locally computed sha256 checksums +sha256 4d6e3c2ef229ec3c1a486f52c9d76235e9eb7c94db8ec71a8bff0af60e4f0aa4 LICENSE diff --git a/package/python-decouple/python-decouple.mk b/package/python-decouple/python-decouple.mk new file mode 100644 index 0000000000..c0d0cdb909 --- /dev/null +++ b/package/python-decouple/python-decouple.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# python-decouple +# +################################################################################ + +PYTHON_DECOUPLE_VERSION = 3.8 +PYTHON_DECOUPLE_SITE = https://files.pythonhosted.org/packages/e1/97/373dcd5844ec0ea5893e13c39a2c67e7537987ad8de3842fe078db4582fa +PYTHON_DECOUPLE_SETUP_TYPE = setuptools +PYTHON_DECOUPLE_LICENSE = MIT +PYTHON_DECOUPLE_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From b48a1955099085b68df1bdee99bb18848fc2e2cc Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Thu, 14 Dec 2023 03:01:56 -0700 Subject: [PATCH 4313/5754] package/python-multipart: new package Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-multipart/Config.in | 6 ++++++ package/python-multipart/python-multipart.hash | 5 +++++ package/python-multipart/python-multipart.mk | 15 +++++++++++++++ 4 files changed, 27 insertions(+) create mode 100644 package/python-multipart/Config.in create mode 100644 package/python-multipart/python-multipart.hash create mode 100644 package/python-multipart/python-multipart.mk diff --git a/package/Config.in b/package/Config.in index c3aeb87f08..67713e9209 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1179,6 +1179,7 @@ menu "External python modules" source "package/python-msgfy/Config.in" source "package/python-msgpack/Config.in" source "package/python-multidict/Config.in" + source "package/python-multipart/Config.in" source "package/python-munch/Config.in" source "package/python-mutagen/Config.in" source "package/python-mwclient/Config.in" diff --git a/package/python-multipart/Config.in b/package/python-multipart/Config.in new file mode 100644 index 0000000000..07002e1018 --- /dev/null +++ b/package/python-multipart/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_MULTIPART + bool "python-multipart" + help + A streaming multipart parser for Python. + + https://github.com/andrew-d/python-multipart diff --git a/package/python-multipart/python-multipart.hash b/package/python-multipart/python-multipart.hash new file mode 100644 index 0000000000..9b2b6d3d82 --- /dev/null +++ b/package/python-multipart/python-multipart.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/python-multipart/json +md5 a61a045b7f5e64d44dc53c73522ac4d2 python_multipart-0.0.6.tar.gz +sha256 e9925a80bb668529f1b67c7fdb0a5dacdd7cbfc6fb0bff3ea443fe22bdd62132 python_multipart-0.0.6.tar.gz +# Locally computed sha256 checksums +sha256 a8e833176cd617daf00b9d6d39fa15ca8edebc6d1643079cd2f4893c0c289be2 LICENSE.txt diff --git a/package/python-multipart/python-multipart.mk b/package/python-multipart/python-multipart.mk new file mode 100644 index 0000000000..7ffb05fa92 --- /dev/null +++ b/package/python-multipart/python-multipart.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-multipart +# +################################################################################ + +PYTHON_MULTIPART_VERSION = 0.0.6 +PYTHON_MULTIPART_SOURCE = python_multipart-$(PYTHON_MULTIPART_VERSION).tar.gz +PYTHON_MULTIPART_SITE = https://files.pythonhosted.org/packages/2d/23/abcfad10c3348cb6358400f8adbc21b523bbc6c954494fd0974428068672 +PYTHON_MULTIPART_SETUP_TYPE = pep517 +PYTHON_MULTIPART_LICENSE = Apache-2.0 +PYTHON_MULTIPART_LICENSE_FILES = LICENSE.txt +PYTHON_MULTIPART_DEPENDENCIES = host-python-hatchling + +$(eval $(python-package)) From ebe47e7605c6cde295e209d80690508cfd11ba61 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 24 Dec 2023 00:05:13 +0100 Subject: [PATCH 4314/5754] package/python-ml-dtypes: new package ml_dtypes is a stand-alone implementation of several NumPy dtype extensions used in machine learning libraries. https://github.com/jax-ml/ml_dtypes Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 ++ package/Config.in | 1 + package/python-ml-dtypes/Config.in | 13 +++++++ .../python-ml-dtypes/python-ml-dtypes.hash | 5 +++ package/python-ml-dtypes/python-ml-dtypes.mk | 19 +++++++++ .../tests/package/sample_python_ml_dtypes.py | 39 +++++++++++++++++++ .../tests/package/test_python_ml_dtypes.py | 20 ++++++++++ 7 files changed, 100 insertions(+) create mode 100644 package/python-ml-dtypes/Config.in create mode 100644 package/python-ml-dtypes/python-ml-dtypes.hash create mode 100644 package/python-ml-dtypes/python-ml-dtypes.mk create mode 100644 support/testing/tests/package/sample_python_ml_dtypes.py create mode 100644 support/testing/tests/package/test_python_ml_dtypes.py diff --git a/DEVELOPERS b/DEVELOPERS index a232059a62..f4adda40a8 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1745,6 +1745,7 @@ F: package/python-magic-wormhole/ F: package/python-magic-wormhole-mailbox-server/ F: package/python-magic-wormhole-transit-relay/ F: package/python-midiutil/ +F: package/python-ml-dtypes/ F: package/python-pyalsa/ F: package/python-spake2/ F: package/rdma-core/ @@ -1756,6 +1757,7 @@ 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_midiutil.py +F: support/testing/tests/package/sample_python_ml_dtypes.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 @@ -1806,6 +1808,7 @@ 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_midiutil.py +F: support/testing/tests/package/test_python_ml_dtypes.py 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 diff --git a/package/Config.in b/package/Config.in index 67713e9209..aa79c2dae4 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1173,6 +1173,7 @@ menu "External python modules" source "package/python-mimeparse/Config.in" source "package/python-minimalmodbus/Config.in" source "package/python-mistune/Config.in" + source "package/python-ml-dtypes/Config.in" source "package/python-modbus-tk/Config.in" source "package/python-more-itertools/Config.in" source "package/python-mpd2/Config.in" diff --git a/package/python-ml-dtypes/Config.in b/package/python-ml-dtypes/Config.in new file mode 100644 index 0000000000..72506896df --- /dev/null +++ b/package/python-ml-dtypes/Config.in @@ -0,0 +1,13 @@ +config BR2_PACKAGE_PYTHON_ML_DTYPES + bool "python-ml-dtypes" + 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_PYBIND + help + ml_dtypes is a stand-alone implementation of several NumPy + dtype extensions used in machine learning libraries. + + https://github.com/jax-ml/ml_dtypes diff --git a/package/python-ml-dtypes/python-ml-dtypes.hash b/package/python-ml-dtypes/python-ml-dtypes.hash new file mode 100644 index 0000000000..a440268e39 --- /dev/null +++ b/package/python-ml-dtypes/python-ml-dtypes.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/ml_dtypes/json +md5 6adbb05530819bdb4a78d2372d187fe2 ml_dtypes-0.3.1.tar.gz +sha256 60778f99194b4c4f36ba42da200b35ef851ce4d4af698aaf70f5b91fe70fc611 ml_dtypes-0.3.1.tar.gz +# Locally computed sha256 checksums +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/python-ml-dtypes/python-ml-dtypes.mk b/package/python-ml-dtypes/python-ml-dtypes.mk new file mode 100644 index 0000000000..92d23bece4 --- /dev/null +++ b/package/python-ml-dtypes/python-ml-dtypes.mk @@ -0,0 +1,19 @@ +################################################################################ +# +# python-ml-dtypes +# +################################################################################ + +PYTHON_ML_DTYPES_VERSION = 0.3.1 +PYTHON_ML_DTYPES_SOURCE = ml_dtypes-$(PYTHON_ML_DTYPES_VERSION).tar.gz +PYTHON_ML_DTYPES_SITE = https://files.pythonhosted.org/packages/16/6e/9a7a51ee1ca24b8e92109128260c5aec8340c8fe5572e9ceecddae559abe +PYTHON_ML_DTYPES_LICENSE = Apache-2.0 +PYTHON_ML_DTYPES_LICENSE_FILES = LICENSE +PYTHON_ML_DTYPES_SETUP_TYPE = distutils + +PYTHON_ML_DTYPES_DEPENDENCIES = \ + host-python-numpy \ + python-numpy \ + python-pybind + +$(eval $(python-package)) diff --git a/support/testing/tests/package/sample_python_ml_dtypes.py b/support/testing/tests/package/sample_python_ml_dtypes.py new file mode 100644 index 0000000000..156d54a875 --- /dev/null +++ b/support/testing/tests/package/sample_python_ml_dtypes.py @@ -0,0 +1,39 @@ +#! /usr/bin/env python3 + +# Tests inspired from commands published on project page: +# https://pypi.org/project/ml-dtypes/ + +from ml_dtypes import bfloat16 + +import numpy as np + +a = np.zeros(4, dtype=bfloat16) +assert a.dtype.name == 'bfloat16' +assert a[0] == 0.0 + +types = [ + 'bfloat16', + 'float8_e4m3b11fnuz', + 'float8_e4m3fn', + 'float8_e4m3fnuz', + 'float8_e5m2', + 'int4', + 'uint4' +] +for t in types: + dtype = np.dtype(t) + assert dtype.name == t + +rng = np.random.default_rng(seed=0) +vals = rng.uniform(size=10000).astype(bfloat16) +sum_vals = vals.sum() +assert sum_vals == 256 + +b = bfloat16(256) + bfloat16(1) +assert b == 256 + +c = np.nextafter(bfloat16(256), bfloat16(np.inf)) +assert c == 258 + +d = vals.sum(dtype='float32').astype(bfloat16) +assert d > 4500 and d < 5500 diff --git a/support/testing/tests/package/test_python_ml_dtypes.py b/support/testing/tests/package/test_python_ml_dtypes.py new file mode 100644 index 0000000000..8d2369576b --- /dev/null +++ b/support/testing/tests/package/test_python_ml_dtypes.py @@ -0,0 +1,20 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3MlDtypes(TestPythonPackageBase): + __test__ = True + + # Note: BR2_PACKAGE_PYTHON3_ZLIB=y is needed as a runtime + # dependency because the Bootlin toolchain used for this test is + # tainted with zlib (and gets detected by python3/numpy). + # See commit 8ce33fed "package/gdb: gdbserver does not need zlib". + # This config entry can be removed as soon as the toolchain is + # updated without zlib in its sysroot. + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON3_ZLIB=y + BR2_PACKAGE_PYTHON_ML_DTYPES=y + """ + sample_scripts = ["tests/package/sample_python_ml_dtypes.py"] + timeout = 20 From 442b2af2d4920f1cc0cfc4438a78898cc324e640 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Thu, 14 Dec 2023 10:53:10 -0700 Subject: [PATCH 4315/5754] package/python-asyncssh: new package Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-asyncssh/Config.in | 9 +++++++++ package/python-asyncssh/python-asyncssh.hash | 6 ++++++ package/python-asyncssh/python-asyncssh.mk | 14 ++++++++++++++ 4 files changed, 30 insertions(+) create mode 100644 package/python-asyncssh/Config.in create mode 100644 package/python-asyncssh/python-asyncssh.hash create mode 100644 package/python-asyncssh/python-asyncssh.mk diff --git a/package/Config.in b/package/Config.in index aa79c2dae4..d5b8982df1 100644 --- a/package/Config.in +++ b/package/Config.in @@ -994,6 +994,7 @@ menu "External python modules" source "package/python-async-generator/Config.in" source "package/python-async-lru/Config.in" source "package/python-async-timeout/Config.in" + source "package/python-asyncssh/Config.in" source "package/python-attrs/Config.in" source "package/python-augeas/Config.in" source "package/python-autobahn/Config.in" diff --git a/package/python-asyncssh/Config.in b/package/python-asyncssh/Config.in new file mode 100644 index 0000000000..eef4478f3c --- /dev/null +++ b/package/python-asyncssh/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_PYTHON_ASYNCSSH + bool "python-asyncssh" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-cryptography + select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime + select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime + help + AsyncSSH: Asynchronous SSHv2 client and server library. + + http://asyncssh.timeheart.net diff --git a/package/python-asyncssh/python-asyncssh.hash b/package/python-asyncssh/python-asyncssh.hash new file mode 100644 index 0000000000..d72b5329c5 --- /dev/null +++ b/package/python-asyncssh/python-asyncssh.hash @@ -0,0 +1,6 @@ +# md5, sha256 from https://pypi.org/pypi/asyncssh/json +md5 4194feb9e0d17a0750f107f3445ff9f7 asyncssh-2.14.1.tar.gz +sha256 1ac31c333a0d83c88831523245500caa814503423741b0e465339ef6da5b5e29 asyncssh-2.14.1.tar.gz +# Locally computed sha256 checksums +sha256 0becf16567beb77fa252b7664631dd177c8f9a1889e48995b45379c7130e5303 LICENSE +sha256 68c286b0cf4507bec8922103efe861adb0bd3218003b1ec1b25e2e64bdd76bd3 COPYRIGHT diff --git a/package/python-asyncssh/python-asyncssh.mk b/package/python-asyncssh/python-asyncssh.mk new file mode 100644 index 0000000000..91e0d9d419 --- /dev/null +++ b/package/python-asyncssh/python-asyncssh.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-asyncssh +# +################################################################################ + +PYTHON_ASYNCSSH_VERSION = 2.14.1 +PYTHON_ASYNCSSH_SOURCE = asyncssh-$(PYTHON_ASYNCSSH_VERSION).tar.gz +PYTHON_ASYNCSSH_SITE = https://files.pythonhosted.org/packages/5f/86/59278fefc49ddcc10567e52a8e0e1553fc936584e241d516b5682d55ea17 +PYTHON_ASYNCSSH_SETUP_TYPE = setuptools +PYTHON_ASYNCSSH_LICENSE = EPL-2.0 or GPL-2.0+ +PYTHON_ASYNCSSH_LICENSE_FILES = LICENSE COPYRIGHT + +$(eval $(python-package)) From 02fddb29abba52fd00aa66cf8608f008b71533b3 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Thu, 14 Dec 2023 09:54:13 -0700 Subject: [PATCH 4316/5754] package/python-typing-extensions: bump to version 4.9.0 Signed-off-by: James Hilliard Reviewed-by: Marcus Hoffmann Signed-off-by: Thomas Petazzoni --- .../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 fedb9e0446..778b2d5771 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 06e7fff4b1d51f8dc6f49b16e71de54e typing_extensions-4.7.1.tar.gz -sha256 b75ddc264f0ba5615db7ba217daeb99701ad295353c45f9e95963337ceeeffb2 typing_extensions-4.7.1.tar.gz +# md5, sha256 from https://pypi.org/pypi/typing-extensions/json +md5 2bcafbd6817cb0d7a29ed7a7f1bb1e5d typing_extensions-4.9.0.tar.gz +sha256 23478f88c37f27d76ac8aee6c905017a143b0b1b886c3c9f66bc2fd94f9f5783 typing_extensions-4.9.0.tar.gz # Locally computed sha256 checksums sha256 3b2f81fe21d181c499c59a256c8e1968455d6689d269aa85373bfb6af41da3bf LICENSE diff --git a/package/python-typing-extensions/python-typing-extensions.mk b/package/python-typing-extensions/python-typing-extensions.mk index 9d41b0a6a5..89ed75bda7 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.7.1 +PYTHON_TYPING_EXTENSIONS_VERSION = 4.9.0 PYTHON_TYPING_EXTENSIONS_SOURCE = typing_extensions-$(PYTHON_TYPING_EXTENSIONS_VERSION).tar.gz -PYTHON_TYPING_EXTENSIONS_SITE = https://files.pythonhosted.org/packages/3c/8b/0111dd7d6c1478bf83baa1cab85c686426c7a6274119aceb2bd9d35395ad +PYTHON_TYPING_EXTENSIONS_SITE = https://files.pythonhosted.org/packages/0c/1d/eb26f5e75100d531d7399ae800814b069bc2ed2a7410834d57374d010d96 PYTHON_TYPING_EXTENSIONS_SETUP_TYPE = flit PYTHON_TYPING_EXTENSIONS_LICENSE = Python-2.0 PYTHON_TYPING_EXTENSIONS_LICENSE_FILES = LICENSE From 111e725b08c076dca4966cc3eac3fb073b462fc7 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Thu, 14 Dec 2023 09:54:14 -0700 Subject: [PATCH 4317/5754] package/python-anyio: new package Signed-off-by: James Hilliard Reviewed-by: Marcus Hoffmann Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-anyio/Config.in | 9 +++++++++ package/python-anyio/python-anyio.hash | 5 +++++ package/python-anyio/python-anyio.mk | 15 +++++++++++++++ 4 files changed, 30 insertions(+) create mode 100644 package/python-anyio/Config.in create mode 100644 package/python-anyio/python-anyio.hash create mode 100644 package/python-anyio/python-anyio.mk diff --git a/package/Config.in b/package/Config.in index d5b8982df1..d8894e4925 100644 --- a/package/Config.in +++ b/package/Config.in @@ -982,6 +982,7 @@ menu "External python modules" source "package/python-alsaaudio/Config.in" source "package/python-annotated-types/Config.in" source "package/python-ansicolors/Config.in" + source "package/python-anyio/Config.in" source "package/python-apispec/Config.in" source "package/python-appdirs/Config.in" source "package/python-argh/Config.in" diff --git a/package/python-anyio/Config.in b/package/python-anyio/Config.in new file mode 100644 index 0000000000..d843f37af0 --- /dev/null +++ b/package/python-anyio/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_PYTHON_ANYIO + bool "python-anyio" + select BR2_PACKAGE_PYTHON_IDNA # runtime + select BR2_PACKAGE_PYTHON_SNIFFIO # runtime + help + High level compatibility layer for multiple asynchronous + event loop implementations. + + https://github.com/agronholm/anyio diff --git a/package/python-anyio/python-anyio.hash b/package/python-anyio/python-anyio.hash new file mode 100644 index 0000000000..1cea549bc1 --- /dev/null +++ b/package/python-anyio/python-anyio.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/anyio/json +md5 58d288dd84e28e2507ff9ce7e4620010 anyio-3.7.1.tar.gz +sha256 44a3c9aba0f5defa43261a8b3efb97891f2bd7d804e0e1f56419befa1adfc780 anyio-3.7.1.tar.gz +# Locally computed sha256 checksums +sha256 5361ac9dc58f2ef5fd2e9b09c68297c17f04950909bbc8023bdb82eacf22c2b0 LICENSE diff --git a/package/python-anyio/python-anyio.mk b/package/python-anyio/python-anyio.mk new file mode 100644 index 0000000000..80404ac660 --- /dev/null +++ b/package/python-anyio/python-anyio.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-anyio +# +################################################################################ + +PYTHON_ANYIO_VERSION = 3.7.1 +PYTHON_ANYIO_SOURCE = anyio-$(PYTHON_ANYIO_VERSION).tar.gz +PYTHON_ANYIO_SITE = https://files.pythonhosted.org/packages/28/99/2dfd53fd55ce9838e6ff2d4dac20ce58263798bd1a0dbe18b3a9af3fcfce +PYTHON_ANYIO_SETUP_TYPE = setuptools +PYTHON_ANYIO_LICENSE = MIT +PYTHON_ANYIO_LICENSE_FILES = LICENSE +PYTHON_ANYIO_DEPENDENCIES = host-python-setuptools-scm + +$(eval $(python-package)) From cfb0987517db1b16f7794cf6d113019bcd069e17 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Thu, 14 Dec 2023 09:54:15 -0700 Subject: [PATCH 4318/5754] package/python-starlette: new package Signed-off-by: James Hilliard Reviewed-by: Marcus Hoffmann Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-starlette/Config.in | 7 +++++++ package/python-starlette/python-starlette.hash | 5 +++++ package/python-starlette/python-starlette.mk | 15 +++++++++++++++ 4 files changed, 28 insertions(+) create mode 100644 package/python-starlette/Config.in create mode 100644 package/python-starlette/python-starlette.hash create mode 100644 package/python-starlette/python-starlette.mk diff --git a/package/Config.in b/package/Config.in index d8894e4925..caab7ccfab 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1349,6 +1349,7 @@ menu "External python modules" source "package/python-sqliteschema/Config.in" source "package/python-sqlparse/Config.in" source "package/python-stack-data/Config.in" + source "package/python-starlette/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-starlette/Config.in b/package/python-starlette/Config.in new file mode 100644 index 0000000000..90f590689a --- /dev/null +++ b/package/python-starlette/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_STARLETTE + bool "python-starlette" + select BR2_PACKAGE_PYTHON_ANYIO # runtime + help + The little ASGI library that shines. + + https://github.com/encode/starlette diff --git a/package/python-starlette/python-starlette.hash b/package/python-starlette/python-starlette.hash new file mode 100644 index 0000000000..a7f1f66446 --- /dev/null +++ b/package/python-starlette/python-starlette.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/starlette/json +md5 5193c4b7d2ea4c93635c340a7ba9b54f starlette-0.27.0.tar.gz +sha256 6a6b0d042acb8d469a01eba54e9cda6cbd24ac602c4cd016723117d6a7e73b75 starlette-0.27.0.tar.gz +# Locally computed sha256 checksums +sha256 dcb95677a02240243187e964f941847d19b17821cf99e5afae684fab328c19bf LICENSE.md diff --git a/package/python-starlette/python-starlette.mk b/package/python-starlette/python-starlette.mk new file mode 100644 index 0000000000..40932929a0 --- /dev/null +++ b/package/python-starlette/python-starlette.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-starlette +# +################################################################################ + +PYTHON_STARLETTE_VERSION = 0.27.0 +PYTHON_STARLETTE_SOURCE = starlette-$(PYTHON_STARLETTE_VERSION).tar.gz +PYTHON_STARLETTE_SITE = https://files.pythonhosted.org/packages/06/68/559bed5484e746f1ab2ebbe22312f2c25ec62e4b534916d41a8c21147bf8 +PYTHON_STARLETTE_SETUP_TYPE = pep517 +PYTHON_STARLETTE_LICENSE = BSD-3-Clause +PYTHON_STARLETTE_LICENSE_FILES = LICENSE.md +PYTHON_STARLETTE_DEPENDENCIES = host-python-hatchling + +$(eval $(python-package)) From da1f15dbca77131751aa96c0701c4339aca95192 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Thu, 14 Dec 2023 09:54:16 -0700 Subject: [PATCH 4319/5754] package/python-fastapi: new package Signed-off-by: James Hilliard Reviewed-by: Marcus Hoffmann Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-fastapi/Config.in | 12 ++++++++++++ package/python-fastapi/python-fastapi.hash | 5 +++++ package/python-fastapi/python-fastapi.mk | 15 +++++++++++++++ 4 files changed, 33 insertions(+) create mode 100644 package/python-fastapi/Config.in create mode 100644 package/python-fastapi/python-fastapi.hash create mode 100644 package/python-fastapi/python-fastapi.mk diff --git a/package/Config.in b/package/Config.in index caab7ccfab..7f9069b75e 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1082,6 +1082,7 @@ menu "External python modules" source "package/python-evdev/Config.in" source "package/python-executing/Config.in" source "package/python-falcon/Config.in" + source "package/python-fastapi/Config.in" source "package/python-filelock/Config.in" source "package/python-fire/Config.in" source "package/python-flask/Config.in" diff --git a/package/python-fastapi/Config.in b/package/python-fastapi/Config.in new file mode 100644 index 0000000000..7d376d3dd7 --- /dev/null +++ b/package/python-fastapi/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_PYTHON_FASTAPI + bool "python-fastapi" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-pydantic -> python-pydantic-core + select BR2_PACKAGE_PYTHON_ANYIO # runtime + select BR2_PACKAGE_PYTHON_PYDANTIC # runtime + select BR2_PACKAGE_PYTHON_STARLETTE # runtime + select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime + help + FastAPI framework, high performance, easy to learn, fast to + code, ready for production. + + https://github.com/tiangolo/fastapi diff --git a/package/python-fastapi/python-fastapi.hash b/package/python-fastapi/python-fastapi.hash new file mode 100644 index 0000000000..3dc1578cb7 --- /dev/null +++ b/package/python-fastapi/python-fastapi.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/fastapi/json +md5 06bfa7c610fc9e81d05b0319eb70cae7 fastapi-0.105.0.tar.gz +sha256 4d12838819aa52af244580675825e750ad67c9df4614f557a769606af902cf22 fastapi-0.105.0.tar.gz +# Locally computed sha256 checksums +sha256 4ec89ffc81485b97fec584b2d4a961032eeffe834453894fd9c1274906cc744e LICENSE diff --git a/package/python-fastapi/python-fastapi.mk b/package/python-fastapi/python-fastapi.mk new file mode 100644 index 0000000000..db86bfce30 --- /dev/null +++ b/package/python-fastapi/python-fastapi.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-fastapi +# +################################################################################ + +PYTHON_FASTAPI_VERSION = 0.105.0 +PYTHON_FASTAPI_SOURCE = fastapi-$(PYTHON_FASTAPI_VERSION).tar.gz +PYTHON_FASTAPI_SITE = https://files.pythonhosted.org/packages/77/bb/5941e6e2ce3020f64b539a49d39f49be05de17d0c47fea95012589f812a5 +PYTHON_FASTAPI_SETUP_TYPE = pep517 +PYTHON_FASTAPI_LICENSE = MIT +PYTHON_FASTAPI_LICENSE_FILES = LICENSE +PYTHON_FASTAPI_DEPENDENCIES = host-python-hatchling + +$(eval $(python-package)) From 8e0ac9660c7247d7283d27560dbe661dadf25c03 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Thu, 14 Dec 2023 09:54:17 -0700 Subject: [PATCH 4320/5754] package/python-uvicorn: new package Signed-off-by: James Hilliard Reviewed-by: Marcus Hoffmann Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-uvicorn/Config.in | 8 ++++++++ package/python-uvicorn/python-uvicorn.hash | 5 +++++ package/python-uvicorn/python-uvicorn.mk | 15 +++++++++++++++ 4 files changed, 29 insertions(+) create mode 100644 package/python-uvicorn/Config.in create mode 100644 package/python-uvicorn/python-uvicorn.hash create mode 100644 package/python-uvicorn/python-uvicorn.mk diff --git a/package/Config.in b/package/Config.in index 7f9069b75e..7beedf3b0c 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1387,6 +1387,7 @@ menu "External python modules" source "package/python-urllib3/Config.in" source "package/python-urwid/Config.in" source "package/python-urwid-readline/Config.in" + source "package/python-uvicorn/Config.in" source "package/python-uvloop/Config.in" source "package/python-validators/Config.in" source "package/python-versiontools/Config.in" diff --git a/package/python-uvicorn/Config.in b/package/python-uvicorn/Config.in new file mode 100644 index 0000000000..3e769392f9 --- /dev/null +++ b/package/python-uvicorn/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_UVICORN + bool "python-uvicorn" + select BR2_PACKAGE_PYTHON_CLICK # runtime + select BR2_PACKAGE_PYTHON_H11 # runtime + help + The lightning-fast ASGI server. + + https://www.uvicorn.org/ diff --git a/package/python-uvicorn/python-uvicorn.hash b/package/python-uvicorn/python-uvicorn.hash new file mode 100644 index 0000000000..cfa999e210 --- /dev/null +++ b/package/python-uvicorn/python-uvicorn.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/uvicorn/json +md5 a1af843e7e305d551030abfa09dd3b15 uvicorn-0.24.0.post1.tar.gz +sha256 09c8e5a79dc466bdf28dead50093957db184de356fcdc48697bad3bde4c2588e uvicorn-0.24.0.post1.tar.gz +# Locally computed sha256 checksums +sha256 efe1acf3e62fb99c288b0ec73e5a773b7268ef4320fe757ea994214e4b63c371 LICENSE.md diff --git a/package/python-uvicorn/python-uvicorn.mk b/package/python-uvicorn/python-uvicorn.mk new file mode 100644 index 0000000000..887e4ac390 --- /dev/null +++ b/package/python-uvicorn/python-uvicorn.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-uvicorn +# +################################################################################ + +PYTHON_UVICORN_VERSION = 0.24.0.post1 +PYTHON_UVICORN_SOURCE = uvicorn-$(PYTHON_UVICORN_VERSION).tar.gz +PYTHON_UVICORN_SITE = https://files.pythonhosted.org/packages/e5/84/d43ce8fe6b31a316ef0ed04ea0d58cab981bdf7f17f8423491fa8b4f50b6 +PYTHON_UVICORN_SETUP_TYPE = pep517 +PYTHON_UVICORN_LICENSE = BSD-3-Clause +PYTHON_UVICORN_LICENSE_FILES = LICENSE.md +PYTHON_UVICORN_DEPENDENCIES = host-python-hatchling + +$(eval $(python-package)) From 607f0ecb7e43a3d24030da3d683f0a32e2802865 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Thu, 14 Dec 2023 09:54:18 -0700 Subject: [PATCH 4321/5754] package/python-fastapi-sessions: new package Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-fastapi-sessions/Config.in | 10 ++++++++++ .../python-fastapi-sessions.hash | 5 +++++ .../python-fastapi-sessions.mk | 14 ++++++++++++++ 4 files changed, 30 insertions(+) create mode 100644 package/python-fastapi-sessions/Config.in create mode 100644 package/python-fastapi-sessions/python-fastapi-sessions.hash create mode 100644 package/python-fastapi-sessions/python-fastapi-sessions.mk diff --git a/package/Config.in b/package/Config.in index 7beedf3b0c..9108ce5e25 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1083,6 +1083,7 @@ menu "External python modules" source "package/python-executing/Config.in" source "package/python-falcon/Config.in" source "package/python-fastapi/Config.in" + source "package/python-fastapi-sessions/Config.in" source "package/python-filelock/Config.in" source "package/python-fire/Config.in" source "package/python-flask/Config.in" diff --git a/package/python-fastapi-sessions/Config.in b/package/python-fastapi-sessions/Config.in new file mode 100644 index 0000000000..a54b072f09 --- /dev/null +++ b/package/python-fastapi-sessions/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_PYTHON_FASTAPI_SESSIONS + bool "python-fastapi-sessions" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-pydantic -> python-pydantic-core + select BR2_PACKAGE_PYTHON_FASTAPI # runtime + select BR2_PACKAGE_PYTHON_ITSDANGEROUS # runtime + select BR2_PACKAGE_PYTHON_PYDANTIC # runtime + help + Ready-to-use session library for FastAPI. + + https://github.com/jordanisaacs/fastapi-sessions diff --git a/package/python-fastapi-sessions/python-fastapi-sessions.hash b/package/python-fastapi-sessions/python-fastapi-sessions.hash new file mode 100644 index 0000000000..dd5e224bde --- /dev/null +++ b/package/python-fastapi-sessions/python-fastapi-sessions.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/fastapi-sessions/json +md5 397ee37291bdbb7330ef8f4af378cd28 fastapi-sessions-0.3.2.tar.gz +sha256 5159023fd548f8a9c198a966cf1086a73a43038cf3b9b79175fe33129f15e64c fastapi-sessions-0.3.2.tar.gz +# Locally computed sha256 checksums +sha256 4962ee6d7777ff7d2f96ad81424c2e78d73ea7f6282d368afa14a7500c2d223e LICENSE diff --git a/package/python-fastapi-sessions/python-fastapi-sessions.mk b/package/python-fastapi-sessions/python-fastapi-sessions.mk new file mode 100644 index 0000000000..abfb41b5b6 --- /dev/null +++ b/package/python-fastapi-sessions/python-fastapi-sessions.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-fastapi-sessions +# +################################################################################ + +PYTHON_FASTAPI_SESSIONS_VERSION = 0.3.2 +PYTHON_FASTAPI_SESSIONS_SOURCE = fastapi-sessions-$(PYTHON_FASTAPI_SESSIONS_VERSION).tar.gz +PYTHON_FASTAPI_SESSIONS_SITE = https://files.pythonhosted.org/packages/1d/89/da83ba47bd70101e14eca0ac57c7f300b055b70104446badfdc1dcbe813f +PYTHON_FASTAPI_SESSIONS_SETUP_TYPE = setuptools +PYTHON_FASTAPI_SESSIONS_LICENSE = MIT +PYTHON_FASTAPI_SESSIONS_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From 3d743c1027a5c633926f27d6edc801c569f7b953 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Thu, 14 Dec 2023 09:54:19 -0700 Subject: [PATCH 4322/5754] package/python-httpcore: new package Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-httpcore/Config.in | 8 ++++++++ package/python-httpcore/python-httpcore.hash | 5 +++++ package/python-httpcore/python-httpcore.mk | 17 +++++++++++++++++ 4 files changed, 31 insertions(+) create mode 100644 package/python-httpcore/Config.in create mode 100644 package/python-httpcore/python-httpcore.hash create mode 100644 package/python-httpcore/python-httpcore.mk diff --git a/package/Config.in b/package/Config.in index 9108ce5e25..f9867bf2ca 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1113,6 +1113,7 @@ menu "External python modules" source "package/python-hkdf/Config.in" source "package/python-hpack/Config.in" source "package/python-html5lib/Config.in" + source "package/python-httpcore/Config.in" source "package/python-httplib2/Config.in" source "package/python-huepy/Config.in" source "package/python-humanize/Config.in" diff --git a/package/python-httpcore/Config.in b/package/python-httpcore/Config.in new file mode 100644 index 0000000000..d8c9083da8 --- /dev/null +++ b/package/python-httpcore/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_HTTPCORE + bool "python-httpcore" + select BR2_PACKAGE_PYTHON_CERTIFI # runtime + select BR2_PACKAGE_PYTHON_H11 # runtime + help + A minimal low-level HTTP client. + + https://www.encode.io/httpcore/ diff --git a/package/python-httpcore/python-httpcore.hash b/package/python-httpcore/python-httpcore.hash new file mode 100644 index 0000000000..1623573b65 --- /dev/null +++ b/package/python-httpcore/python-httpcore.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/httpcore/json +md5 155fbd7794ce7351b607d408cb8182bf httpcore-1.0.2.tar.gz +sha256 9fc092e4799b26174648e54b74ed5f683132a464e95643b226e00c2ed2fa6535 httpcore-1.0.2.tar.gz +# Locally computed sha256 checksums +sha256 fdcb59154c74cbaba16a11242f7740bea9f23d6feb5547917d8c5f94a80392a5 LICENSE.md diff --git a/package/python-httpcore/python-httpcore.mk b/package/python-httpcore/python-httpcore.mk new file mode 100644 index 0000000000..f1b3b810d7 --- /dev/null +++ b/package/python-httpcore/python-httpcore.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# python-httpcore +# +################################################################################ + +PYTHON_HTTPCORE_VERSION = 1.0.2 +PYTHON_HTTPCORE_SOURCE = httpcore-$(PYTHON_HTTPCORE_VERSION).tar.gz +PYTHON_HTTPCORE_SITE = https://files.pythonhosted.org/packages/18/56/78a38490b834fa0942cbe6d39bd8a7fd76316e8940319305a98d2b320366 +PYTHON_HTTPCORE_SETUP_TYPE = pep517 +PYTHON_HTTPCORE_LICENSE = BSD-3-Clause +PYTHON_HTTPCORE_LICENSE_FILES = LICENSE.md +PYTHON_HTTPCORE_DEPENDENCIES = \ + host-python-hatchling \ + host-python-hatch-fancy-pypi-readme + +$(eval $(python-package)) From ae9137661bc11aeb037f0c941d122b1511495729 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Thu, 14 Dec 2023 09:54:20 -0700 Subject: [PATCH 4323/5754] package/python-httpx: new package Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-httpx/Config.in | 11 +++++++++++ package/python-httpx/python-httpx.hash | 5 +++++ package/python-httpx/python-httpx.mk | 17 +++++++++++++++++ 4 files changed, 34 insertions(+) create mode 100644 package/python-httpx/Config.in create mode 100644 package/python-httpx/python-httpx.hash create mode 100644 package/python-httpx/python-httpx.mk diff --git a/package/Config.in b/package/Config.in index f9867bf2ca..98653ff29d 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1115,6 +1115,7 @@ menu "External python modules" source "package/python-html5lib/Config.in" source "package/python-httpcore/Config.in" source "package/python-httplib2/Config.in" + source "package/python-httpx/Config.in" source "package/python-huepy/Config.in" source "package/python-humanize/Config.in" source "package/python-hwdata/Config.in" diff --git a/package/python-httpx/Config.in b/package/python-httpx/Config.in new file mode 100644 index 0000000000..592cd559cd --- /dev/null +++ b/package/python-httpx/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_PYTHON_HTTPX + bool "python-httpx" + select BR2_PACKAGE_PYTHON_ANYIO # runtime + select BR2_PACKAGE_PYTHON_CERTIFI # runtime + select BR2_PACKAGE_PYTHON_HTTPCORE # runtime + select BR2_PACKAGE_PYTHON_IDNA # runtime + select BR2_PACKAGE_PYTHON_SNIFFIO # runtime + help + The next generation HTTP client. + + https://github.com/encode/httpx diff --git a/package/python-httpx/python-httpx.hash b/package/python-httpx/python-httpx.hash new file mode 100644 index 0000000000..fc4a68cf51 --- /dev/null +++ b/package/python-httpx/python-httpx.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/httpx/json +md5 f4dcf1002b2116c634a53534ce9d6776 httpx-0.25.2.tar.gz +sha256 8b8fcaa0c8ea7b05edd69a094e63a2094c4efcb48129fb757361bc423c0ad9e8 httpx-0.25.2.tar.gz +# Locally computed sha256 checksums +sha256 4ec59d544f12b5f539a3a716fd321ac58ccd8030b465221f2c880200cdf28d8d LICENSE.md diff --git a/package/python-httpx/python-httpx.mk b/package/python-httpx/python-httpx.mk new file mode 100644 index 0000000000..4227acec59 --- /dev/null +++ b/package/python-httpx/python-httpx.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# python-httpx +# +################################################################################ + +PYTHON_HTTPX_VERSION = 0.25.2 +PYTHON_HTTPX_SOURCE = httpx-$(PYTHON_HTTPX_VERSION).tar.gz +PYTHON_HTTPX_SITE = https://files.pythonhosted.org/packages/8c/23/911d93a022979d3ea295f659fbe7edb07b3f4561a477e83b3a6d0e0c914e +PYTHON_HTTPX_SETUP_TYPE = pep517 +PYTHON_HTTPX_LICENSE = BSD-3-Clause +PYTHON_HTTPX_LICENSE_FILES = LICENSE.md +PYTHON_HTTPX_DEPENDENCIES = \ + host-python-hatchling \ + host-python-hatch-fancy-pypi-readme + +$(eval $(python-package)) From be24c10472666d9dbfa12668c9326bc0bc9598b9 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 25 Dec 2023 20:38:33 +0100 Subject: [PATCH 4324/5754] package/dbus: bump to version 1.14.10 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- 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 638bb4bc6f..a06ba50ccd 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.14.8.tar.xz.asc +# https://dbus.freedesktop.org/releases/dbus/dbus-1.14.10.tar.xz.asc # using key 36EC5A6448A4F5EF79BEFE98E05AE1478F814C4F -sha256 a6bd5bac5cf19f0c3c594bdae2565a095696980a683a0ef37cb6212e093bde35 dbus-1.14.8.tar.xz +sha256 ba1f21d2bd9d339da2d4aa8780c09df32fea87998b73da24f49ab9df1e36a50f dbus-1.14.10.tar.xz # Locally calculated sha256 e61807cd1c32ff4e7bd5b4b61dd21997c6dc5642cf19316124fe38d50e1f9fa3 COPYING diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk index 930b1a298b..c41fbcb4dd 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.14.8 +DBUS_VERSION = 1.14.10 DBUS_SOURCE = dbus-$(DBUS_VERSION).tar.xz DBUS_SITE = https://dbus.freedesktop.org/releases/dbus DBUS_LICENSE = AFL-2.1 or GPL-2.0+ (library, tools), GPL-2.0+ (tools) From 248effdd9bd8f4823dfd6287c12112d98b37e886 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 25 Dec 2023 20:38:42 +0100 Subject: [PATCH 4325/5754] package/libatomic_ops: bump to version 7.8.2 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/libatomic_ops/libatomic_ops.hash | 2 +- package/libatomic_ops/libatomic_ops.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libatomic_ops/libatomic_ops.hash b/package/libatomic_ops/libatomic_ops.hash index c6de93fb4a..1710fd3a47 100644 --- a/package/libatomic_ops/libatomic_ops.hash +++ b/package/libatomic_ops/libatomic_ops.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 68c5970b11297056c8e5c63a73f26621a8eb8c667a5fe9a2b3e3ff6c0fbb3177 libatomic_ops-7.8.0.tar.gz +sha256 ad8428a40e01d41bc4ddad3166afa1fc175c9e58d8ef7ddbd7ef3298e32ac37b libatomic_ops-7.8.2.tar.gz sha256 969294c9324b2d360ae2a08edd5ca6f9cd754cb71b71e56bee15d2f10bb10496 LICENSE sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/libatomic_ops/libatomic_ops.mk b/package/libatomic_ops/libatomic_ops.mk index 0c72b1725e..bf6994b3a0 100644 --- a/package/libatomic_ops/libatomic_ops.mk +++ b/package/libatomic_ops/libatomic_ops.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBATOMIC_OPS_VERSION = 7.8.0 +LIBATOMIC_OPS_VERSION = 7.8.2 LIBATOMIC_OPS_SITE = $(call github,ivmai,libatomic_ops,v$(LIBATOMIC_OPS_VERSION)) LIBATOMIC_OPS_AUTORECONF = YES From a449898d8216fd0ed2e47996935329612f2b790c Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 25 Dec 2023 20:38:52 +0100 Subject: [PATCH 4326/5754] package/libgtk3: bump to version 3.24.39 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 4d6c210c62..c62dd82577 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.38.sha256sum -sha256 ce11decf018b25bdd8505544a4f87242854ec88be054d9ade5f3a20444dd8ee7 gtk+-3.24.38.tar.xz +# From https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.39.sha256sum +sha256 1cac3e566b9b2f3653a458c08c2dcdfdca9f908037ac03c9d8564b4295778d79 gtk+-3.24.39.tar.xz # Hash for license file: sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk index 6655a0d097..00a7672c6d 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).38 +LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).39 LIBGTK3_SOURCE = gtk+-$(LIBGTK3_VERSION).tar.xz LIBGTK3_SITE = https://download.gnome.org/sources/gtk+/$(LIBGTK3_VERSION_MAJOR) LIBGTK3_LICENSE = LGPL-2.0+ From 1edafc4b483e82b045d3a0cc9cbbd000d6183ac7 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 25 Dec 2023 20:39:01 +0100 Subject: [PATCH 4327/5754] package/lsof: bump to version 4.99.3 Signed-off-by: Francois Perrad 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 d9e85ac15c..90d8aede92 100644 --- a/package/lsof/lsof.hash +++ b/package/lsof/lsof.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 80308a614508814ac70eb2ae1ed2c4344dcf6076fa60afc7734d6b1a79e62b16 lsof-4.98.0.tar.gz +sha256 b9c56468b927d9691ab168c0b1e9f8f1f835694a35ff898c549d383bd8d09bd4 lsof-4.99.3.tar.gz sha256 225222ff9bf38abc2cef7205e9b05c60935efa9ec28d1fd01e503c9316088718 COPYING diff --git a/package/lsof/lsof.mk b/package/lsof/lsof.mk index 303622d111..bb6eacb696 100644 --- a/package/lsof/lsof.mk +++ b/package/lsof/lsof.mk @@ -4,7 +4,7 @@ # ################################################################################ -LSOF_VERSION = 4.98.0 +LSOF_VERSION = 4.99.3 LSOF_SITE = $(call github,lsof-org,lsof,$(LSOF_VERSION)) LSOF_LICENSE = lsof license LSOF_LICENSE_FILES = COPYING From 814e7fcacfed75c2bbaa83dba160bba7f36dd9ac Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 25 Dec 2023 20:39:09 +0100 Subject: [PATCH 4328/5754] package/xz: bump to version 5.4.5 Signed-off-by: Francois Perrad 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 92bac40463..3d93ad6b5e 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.4.tar.gz.sig -sha256 0b6fcde1ac38e90433a2556f500c065950b9bcd2d602006efc334782bdfe6296 xz-5.4.4.tar.bz2 +# https://tukaani.org/xz/xz-5.4.5.tar.bz2.sig +sha256 8ccf5fff868c006f29522e386fb4c6a1b66463fbca65a4cfc3c4bd596e895e79 xz-5.4.5.tar.bz2 # Hash for license files sha256 72d7ef9c98be319fd34ce88b45203b36d5936f9c49e82bf3198ffee5e0c7d87e COPYING diff --git a/package/xz/xz.mk b/package/xz/xz.mk index 42fee82e80..547959c743 100644 --- a/package/xz/xz.mk +++ b/package/xz/xz.mk @@ -4,7 +4,7 @@ # ################################################################################ -XZ_VERSION = 5.4.4 +XZ_VERSION = 5.4.5 XZ_SOURCE = xz-$(XZ_VERSION).tar.bz2 XZ_SITE = https://tukaani.org/xz XZ_INSTALL_STAGING = YES From 7f7a7c34e5747c122815d407a70be0d1eca512d8 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 26 Dec 2023 12:17:22 +0100 Subject: [PATCH 4329/5754] package/python-asyncssh: add CPE variables cpe:2.3:a:asyncssh_project:asyncssh is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/55866328-B495-4FDC-B9EF-C014E6885187 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/python-asyncssh/python-asyncssh.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-asyncssh/python-asyncssh.mk b/package/python-asyncssh/python-asyncssh.mk index 91e0d9d419..51e2e1973c 100644 --- a/package/python-asyncssh/python-asyncssh.mk +++ b/package/python-asyncssh/python-asyncssh.mk @@ -10,5 +10,7 @@ PYTHON_ASYNCSSH_SITE = https://files.pythonhosted.org/packages/5f/86/59278fefc49 PYTHON_ASYNCSSH_SETUP_TYPE = setuptools PYTHON_ASYNCSSH_LICENSE = EPL-2.0 or GPL-2.0+ PYTHON_ASYNCSSH_LICENSE_FILES = LICENSE COPYRIGHT +PYTHON_ASYNCSSH_CPE_ID_VENDOR = asyncssh_project +PYTHON_ASYNCSSH_CPE_ID_PRODUCT = asyncssh $(eval $(python-package)) From 27182fcd35d34822026b19d481932f6fb8661b4f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 26 Dec 2023 12:21:05 +0100 Subject: [PATCH 4330/5754] package/python-starlette: add CPE variables cpe:2.3:a:encode:starlette is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/B4613D5C-E46D-443A-8738-58E4FBC0C127 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/python-starlette/python-starlette.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-starlette/python-starlette.mk b/package/python-starlette/python-starlette.mk index 40932929a0..b04b95a797 100644 --- a/package/python-starlette/python-starlette.mk +++ b/package/python-starlette/python-starlette.mk @@ -11,5 +11,7 @@ PYTHON_STARLETTE_SETUP_TYPE = pep517 PYTHON_STARLETTE_LICENSE = BSD-3-Clause PYTHON_STARLETTE_LICENSE_FILES = LICENSE.md PYTHON_STARLETTE_DEPENDENCIES = host-python-hatchling +PYTHON_STARLETTE_CPE_ID_VENDOR = encode +PYTHON_STARLETTE_CPE_ID_PRODUCT = starlette $(eval $(python-package)) From 55c3fe590f0c2d0207a25d461ae2bf33e5e4c163 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 26 Dec 2023 12:24:17 +0100 Subject: [PATCH 4331/5754] package/python-fastapi: add CPE variables cpe:2.3:a:fastapi_project:fastapi is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/E6E33EA5-0404-4037-9B3E-FE718E1593E5 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/python-fastapi/python-fastapi.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-fastapi/python-fastapi.mk b/package/python-fastapi/python-fastapi.mk index db86bfce30..dc6d919926 100644 --- a/package/python-fastapi/python-fastapi.mk +++ b/package/python-fastapi/python-fastapi.mk @@ -10,6 +10,8 @@ PYTHON_FASTAPI_SITE = https://files.pythonhosted.org/packages/77/bb/5941e6e2ce30 PYTHON_FASTAPI_SETUP_TYPE = pep517 PYTHON_FASTAPI_LICENSE = MIT PYTHON_FASTAPI_LICENSE_FILES = LICENSE +PYTHON_FASTAPI_CPE_ID_VENDOR = fastapi_project +PYTHON_FASTAPI_CPE_ID_PRODUCT = fastapi PYTHON_FASTAPI_DEPENDENCIES = host-python-hatchling $(eval $(python-package)) From 3f9709f803667956c58b79b4ea13e10ebace4f47 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 26 Dec 2023 12:27:11 +0100 Subject: [PATCH 4332/5754] package/python-uvicorn: add CPE variables cpe:2.3:a:encode:uvicorn is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/D3AA1B54-4363-4E52-90AB-01DC2080D950 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/python-uvicorn/python-uvicorn.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-uvicorn/python-uvicorn.mk b/package/python-uvicorn/python-uvicorn.mk index 887e4ac390..04e6dd66a7 100644 --- a/package/python-uvicorn/python-uvicorn.mk +++ b/package/python-uvicorn/python-uvicorn.mk @@ -10,6 +10,8 @@ PYTHON_UVICORN_SITE = https://files.pythonhosted.org/packages/e5/84/d43ce8fe6b31 PYTHON_UVICORN_SETUP_TYPE = pep517 PYTHON_UVICORN_LICENSE = BSD-3-Clause PYTHON_UVICORN_LICENSE_FILES = LICENSE.md +PYTHON_UVICORN_CPE_ID_VENDOR = encode +PYTHON_UVICORN_CPE_ID_PRODUCT = uvicorn PYTHON_UVICORN_DEPENDENCIES = host-python-hatchling $(eval $(python-package)) From 3cc18e40856868f24e933a24dfa2ce0708d0f793 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 26 Dec 2023 12:29:19 +0100 Subject: [PATCH 4333/5754] package/python-httpx: add CPE variables cpe:2.3:a:encode:httpx is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/0B9D7A81-3934-40D1-A7E4-FD8132304152 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/python-httpx/python-httpx.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-httpx/python-httpx.mk b/package/python-httpx/python-httpx.mk index 4227acec59..88166ad242 100644 --- a/package/python-httpx/python-httpx.mk +++ b/package/python-httpx/python-httpx.mk @@ -10,6 +10,8 @@ PYTHON_HTTPX_SITE = https://files.pythonhosted.org/packages/8c/23/911d93a022979d PYTHON_HTTPX_SETUP_TYPE = pep517 PYTHON_HTTPX_LICENSE = BSD-3-Clause PYTHON_HTTPX_LICENSE_FILES = LICENSE.md +PYTHON_HTTPX_CPE_ID_VENDOR = encode +PYTHON_HTTPX_CPE_ID_PRODUCT = httpx PYTHON_HTTPX_DEPENDENCIES = \ host-python-hatchling \ host-python-hatch-fancy-pypi-readme From 449538348ebc941bd7a2ebde3e4e691daca45a91 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 26 Dec 2023 12:34:28 +0100 Subject: [PATCH 4334/5754] package/cjson: security bump to version 1.7.17 - Fix null reference in cJSON_SetValuestring (CVE-2023-50472) - Fix null reference in cJSON_InsertItemInArray (CVE-2023-50471) https://github.com/DaveGamble/cJSON/releases/tag/v1.7.17 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/cjson/cjson.hash | 2 +- package/cjson/cjson.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/cjson/cjson.hash b/package/cjson/cjson.hash index 74844d6aa6..305dc0d7b8 100644 --- a/package/cjson/cjson.hash +++ b/package/cjson/cjson.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 451131a92c55efc5457276807fc0c4c2c2707c9ee96ef90c47d68852d5384c6c cjson-1.7.16.tar.gz +sha256 c91d1eeb7175c50d49f6ba2a25e69b46bd05cffb798382c19bfb202e467ec51c cjson-1.7.17.tar.gz sha256 a36dda207c36db5818729c54e7ad4e8b0c6fba847491ba64f372c1a2037b6d5c LICENSE diff --git a/package/cjson/cjson.mk b/package/cjson/cjson.mk index 7ed732ac90..f699c160ef 100644 --- a/package/cjson/cjson.mk +++ b/package/cjson/cjson.mk @@ -4,7 +4,7 @@ # ################################################################################ -CJSON_VERSION = 1.7.16 +CJSON_VERSION = 1.7.17 CJSON_SITE = $(call github,DaveGamble,cjson,v$(CJSON_VERSION)) CJSON_INSTALL_STAGING = YES CJSON_LICENSE = MIT From 312f4ab4c8a79e8cdc40dfed6870ac2aea981883 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 26 Dec 2023 16:14:42 +0100 Subject: [PATCH 4335/5754] package/onevpl-intel-gpu: add CPE variables cpe:2.3:a:intel:onevpl_gpu_runtime is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/7F7056CA-A41D-4AB5-B9CC-9DE24A27B8BA Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/onevpl-intel-gpu/onevpl-intel-gpu.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/onevpl-intel-gpu/onevpl-intel-gpu.mk b/package/onevpl-intel-gpu/onevpl-intel-gpu.mk index 0a62ebbb6a..da6da2ad61 100644 --- a/package/onevpl-intel-gpu/onevpl-intel-gpu.mk +++ b/package/onevpl-intel-gpu/onevpl-intel-gpu.mk @@ -8,6 +8,8 @@ ONEVPL_INTEL_GPU_VERSION = 23.4.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 +ONEVPL_INTEL_GPU_CPE_ID_VENDOR = intel +ONEVPL_INTEL_GPU_CPE_ID_PRODUCT = onevpl_gpu_runtime ONEVPL_INTEL_GPU_DEPENDENCIES = libva libvpl $(eval $(cmake-package)) From 01689a9a65dceb15d453130b663a78ad9669aae5 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 26 Dec 2023 16:07:17 +0100 Subject: [PATCH 4336/5754] package/libheif: security bump to version 1.17.6 A couple of build fixes and bug fixes detected by fuzzing. Corrects these issues: - CVE-2023-49462 - CVE-2023-49463 https://github.com/strukturag/libheif/releases/tag/v1.17.6 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libheif/libheif.hash | 2 +- package/libheif/libheif.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libheif/libheif.hash b/package/libheif/libheif.hash index 6ea3ba6eec..a2ca065b7a 100644 --- a/package/libheif/libheif.hash +++ b/package/libheif/libheif.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 38ab01938ef419dbebb98346dc0b1c8bb503a0449ea61a0e409a988786c2af5b libheif-1.17.5.tar.gz +sha256 8390baf4913eda0a183e132cec62b875fb2ef507ced5ddddc98dfd2f17780aee libheif-1.17.6.tar.gz sha256 b2eb4f6588b005bebac44cfb2dfd23f6a16c5ca9b8a619a315158b0215a917a3 COPYING diff --git a/package/libheif/libheif.mk b/package/libheif/libheif.mk index 419a864ef3..bd307deb7b 100644 --- a/package/libheif/libheif.mk +++ b/package/libheif/libheif.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBHEIF_VERSION = 1.17.5 +LIBHEIF_VERSION = 1.17.6 LIBHEIF_SITE = https://github.com/strukturag/libheif/releases/download/v$(LIBHEIF_VERSION) LIBHEIF_LICENSE = LGPL-3.0+ LIBHEIF_LICENSE_FILES = COPYING From 158edd5aa94b516cf8710e690431289da2545e40 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 26 Dec 2023 16:17:54 +0100 Subject: [PATCH 4337/5754] package/libde265: security bump to version 1.0.15 A couple of bug fixes, including the following CVEs: - CVE-2023-49465 - CVE-2023-49467 - CVE-2023-49468 https://github.com/strukturag/libde265/releases/tag/v1.0.15 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- 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 9bb3f20a71..a21a8a1265 100644 --- a/package/libde265/libde265.hash +++ b/package/libde265/libde265.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 99f46ef77a438be639aa3c5d9632c0670541c5ed5d386524d4199da2d30df28f libde265-1.0.14.tar.gz +sha256 00251986c29d34d3af7117ed05874950c875dd9292d016be29d3b3762666511d libde265-1.0.15.tar.gz sha256 02cc1585a20677992e0ba578fa692635dc193735f2691dc81de924b51c4e8020 COPYING diff --git a/package/libde265/libde265.mk b/package/libde265/libde265.mk index 8624d2f949..62c22246aa 100644 --- a/package/libde265/libde265.mk +++ b/package/libde265/libde265.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBDE265_VERSION = 1.0.14 +LIBDE265_VERSION = 1.0.15 LIBDE265_SITE = https://github.com/strukturag/libde265/releases/download/v$(LIBDE265_VERSION) LIBDE265_LICENSE = LGPL-3.0+ LIBDE265_LICENSE_FILES = COPYING From 9e5cbbb4134bf5730e91bc03fe01ab8cb571f0db Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 26 Dec 2023 16:25:35 +0100 Subject: [PATCH 4338/5754] package/strongswan: security bump to version 5.9.13 A vulnerability in charon-tkm related to processing DH public values was discovered in strongSwan that can result in a buffer overflow and potentially remote code execution. All versions since 5.3.0 are affected. https://www.strongswan.org/blog/2023/11/20/strongswan-vulnerability-(cve-2023-41913).html https://github.com/strongswan/strongswan/blob/5.9.13/NEWS 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 de8f18747a..ed8cf0ae31 100644 --- a/package/strongswan/strongswan.hash +++ b/package/strongswan/strongswan.hash @@ -1,7 +1,7 @@ -# From http://download.strongswan.org/strongswan-5.9.11.tar.bz2.md5 -md5 673e194cd256af77b46928179f2c81ad strongswan-5.9.11.tar.bz2 +# From http://download.strongswan.org/strongswan-5.9.13.tar.bz2.md5 +md5 9ada6be0c89846fb7ded1787a17cfbb2 strongswan-5.9.13.tar.bz2 # Calculated based on the hash above -sha256 ddf53f1f26ad26979d5f55e8da95bd389552f5de3682e35593f9a70b2584ed2d strongswan-5.9.11.tar.bz2 +sha256 56e30effb578fd9426d8457e3b76c8c3728cd8a5589594b55649b2719308ba55 strongswan-5.9.13.tar.bz2 # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 2292e21797754548dccdef9eef6aee7584e552fbd890fa914e1de8d3577d23f0 LICENSE diff --git a/package/strongswan/strongswan.mk b/package/strongswan/strongswan.mk index 6058631696..36cb72f6be 100644 --- a/package/strongswan/strongswan.mk +++ b/package/strongswan/strongswan.mk @@ -4,7 +4,7 @@ # ################################################################################ -STRONGSWAN_VERSION = 5.9.11 +STRONGSWAN_VERSION = 5.9.13 STRONGSWAN_SOURCE = strongswan-$(STRONGSWAN_VERSION).tar.bz2 STRONGSWAN_SITE = http://download.strongswan.org STRONGSWAN_LICENSE = GPL-2.0+ From 37eb68c9fb46279e9ce8d56af6f90456a6274070 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 26 Dec 2023 17:11:29 +0100 Subject: [PATCH 4339/5754] package/opensc: security bump to version 0.24.0 - Drop patches (already in version) and so drop autoreconf - Fix the following security issues: - CVE-2023-40660: Fix Potential PIN bypass - CVE-2023-40661: Important dynamic analyzers reports - CVE-2023-4535: Out-of-bounds read in MyEID driver handling encryption using symmetric keys https://github.com/OpenSC/OpenSC/releases/tag/0.24.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...ed-compatibility-with-LibreSSL-3.5.0.patch | 54 --------------- ...ed-compatibility-with-LibreSSL-3.7.0.patch | 28 -------- ...onfigure-add-option-to-disable-tests.patch | 67 ------------------- ...alculation-to-fix-buffer-overrun-bug.patch | 51 -------------- ...L-does-provide-EVP_sha3_-after-3-7-3.patch | 32 --------- ...ixed-detection-of-SHA3-compatibility.patch | 27 -------- package/opensc/opensc.hash | 2 +- package/opensc/opensc.mk | 7 +- 8 files changed, 2 insertions(+), 266 deletions(-) delete mode 100644 package/opensc/0001-fixed-compatibility-with-LibreSSL-3.5.0.patch delete mode 100644 package/opensc/0002-fixed-compatibility-with-LibreSSL-3.7.0.patch delete mode 100644 package/opensc/0003-configure-add-option-to-disable-tests.patch delete mode 100644 package/opensc/0004-pkcs15init-correct-left-length-calculation-to-fix-buffer-overrun-bug.patch delete mode 100644 package/opensc/0005-LibreSSL-does-provide-EVP_sha3_-after-3-7-3.patch delete mode 100644 package/opensc/0006-fixed-detection-of-SHA3-compatibility.patch 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 deleted file mode 100644 index 0daf75d5ba..0000000000 --- a/package/opensc/0001-fixed-compatibility-with-LibreSSL-3.5.0.patch +++ /dev/null @@ -1,54 +0,0 @@ -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/0002-fixed-compatibility-with-LibreSSL-3.7.0.patch b/package/opensc/0002-fixed-compatibility-with-LibreSSL-3.7.0.patch deleted file mode 100644 index 6bbbea6ce6..0000000000 --- a/package/opensc/0002-fixed-compatibility-with-LibreSSL-3.7.0.patch +++ /dev/null @@ -1,28 +0,0 @@ -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/0003-configure-add-option-to-disable-tests.patch b/package/opensc/0003-configure-add-option-to-disable-tests.patch deleted file mode 100644 index 29342026c1..0000000000 --- a/package/opensc/0003-configure-add-option-to-disable-tests.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 3c3ed2ecbf31d41b6e5406da55971b9d9eaa3388 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Mon, 24 Jul 2023 22:28:11 +0200 -Subject: [PATCH] configure: add option to disable tests - -Upstream: https://github.com/OpenSC/OpenSC/pull/2822 - -Signed-off-by: Bernd Kuhls ---- - configure.ac | 9 +++++++++ - src/Makefile.am | 6 +++++- - 2 files changed, 14 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 0a90445b..9b7543da 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -272,6 +272,13 @@ AC_ARG_ENABLE( - [enable_doc="no"] - ) - -+AC_ARG_ENABLE( -+ [tests], -+ [AS_HELP_STRING([--enable-tests],[enable tests @<:@enabled@:>@])], -+ , -+ [enable_tests="yes"] -+) -+ - AC_ARG_ENABLE( - [dnie-ui], - [AS_HELP_STRING([--enable-dnie-ui],[enable use of external user interface program to request DNIe pin@<:@disabled@:>@])], -@@ -1119,6 +1126,7 @@ AM_CONDITIONAL([ENABLE_NOTIFY], [test "${enable_notify}" = "yes"]) - AM_CONDITIONAL([ENABLE_CRYPTOTOKENKIT], [test "${enable_cryptotokenkit}" = "yes"]) - AM_CONDITIONAL([ENABLE_OPENCT], [test "${enable_openct}" = "yes"]) - AM_CONDITIONAL([ENABLE_DOC], [test "${enable_doc}" = "yes"]) -+AM_CONDITIONAL([ENABLE_TESTS], [test "${enable_tests}" = "yes"]) - AM_CONDITIONAL([WIN32], [test "${WIN32}" = "yes"]) - AM_CONDITIONAL([CYGWIN], [test "${CYGWIN}" = "yes"]) - AM_CONDITIONAL([ENABLE_MINIDRIVER], [test "${enable_minidriver}" = "yes"]) -@@ -1213,6 +1221,7 @@ XSL stylesheets: ${xslstylesheetsdir} - - man support: ${enable_man} - doc support: ${enable_doc} -+tests: ${enable_tests} - thread locking support: ${enable_thread_locking} - zlib support: ${enable_zlib} - readline support: ${enable_readline} -diff --git a/src/Makefile.am b/src/Makefile.am -index 3ce465bf..bf71b61f 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -3,7 +3,11 @@ EXTRA_DIST = Makefile.mak - - # Order IS important - SUBDIRS = common scconf ui pkcs15init sm \ -- libopensc pkcs11 tools minidriver tests -+ libopensc pkcs11 tools minidriver -+ -+if ENABLE_TESTS -+SUBDIRS += tests -+endif - - if ENABLE_SM - SUBDIRS += smm --- -2.39.2 - 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 deleted file mode 100644 index 079f960b59..0000000000 --- a/package/opensc/0004-pkcs15init-correct-left-length-calculation-to-fix-buffer-overrun-bug.patch +++ /dev/null @@ -1,51 +0,0 @@ -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/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 deleted file mode 100644 index 80c19a3f5f..0000000000 --- a/package/opensc/0005-LibreSSL-does-provide-EVP_sha3_-after-3-7-3.patch +++ /dev/null @@ -1,32 +0,0 @@ -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 deleted file mode 100644 index 3d8aa7e4ef..0000000000 --- a/package/opensc/0006-fixed-detection-of-SHA3-compatibility.patch +++ /dev/null @@ -1,27 +0,0 @@ -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) diff --git a/package/opensc/opensc.hash b/package/opensc/opensc.hash index e8e675667e..232222062c 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 a4844a6ea03a522ecf35e49659716dacb6be03f7c010a1a583aaf3eb915ed2e0 opensc-0.23.0.tar.gz +sha256 24d03c69287291da32a30c4c38a304ad827f56cb85d83619e1f5403ab6480ef8 opensc-0.24.0.tar.gz # Computed locally sha256 376b54d4c5f4aa99421823fa4da93e3ab73096fce2400e89858632aa7da24a14 COPYING diff --git a/package/opensc/opensc.mk b/package/opensc/opensc.mk index 823bc50102..49bdcae37a 100644 --- a/package/opensc/opensc.mk +++ b/package/opensc/opensc.mk @@ -4,18 +4,13 @@ # ################################################################################ -OPENSC_VERSION = 0.23.0 +OPENSC_VERSION = 0.24.0 OPENSC_SITE = https://github.com/OpenSC/OpenSC/releases/download/$(OPENSC_VERSION) OPENSC_LICENSE = LGPL-2.1+ OPENSC_LICENSE_FILES = COPYING OPENSC_CPE_ID_VENDOR = opensc_project -# 0003-configure-add-option-to-disable-tests.patch -OPENSC_AUTORECONF = YES 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 69df189aea5e8c4f0de340e541f25705acaea1d2 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 26 Dec 2023 18:03:33 +0100 Subject: [PATCH 4340/5754] package/libebml: security bump to version 1.4.5 Fix invalid memory access (reading beyond allocated memory) due to missing integer overflow check. https://github.com/Matroska-Org/libebml/blob/release-1.4.5/NEWS.md Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libebml/libebml.hash | 2 +- package/libebml/libebml.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libebml/libebml.hash b/package/libebml/libebml.hash index c83fde32ab..34626eb1f4 100644 --- a/package/libebml/libebml.hash +++ b/package/libebml/libebml.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 82dc5f83356cc9340aee76ed7512210b3a4edf5f346bc9c2c7044f55052687a7 libebml-1.4.4.tar.xz +sha256 4971640b0592da29c2d426f303e137a9b0b3d07e1b81d069c1e56a2f49ab221b libebml-1.4.5.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL diff --git a/package/libebml/libebml.mk b/package/libebml/libebml.mk index c85638c03e..0f69de8c81 100644 --- a/package/libebml/libebml.mk +++ b/package/libebml/libebml.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBEBML_VERSION = 1.4.4 +LIBEBML_VERSION = 1.4.5 LIBEBML_SOURCE = libebml-$(LIBEBML_VERSION).tar.xz LIBEBML_SITE = http://dl.matroska.org/downloads/libebml LIBEBML_INSTALL_STAGING = YES From 66a77af985ee6e8be917abfe428fa381294115fc Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 26 Dec 2023 18:33:49 +0100 Subject: [PATCH 4341/5754] package/ksmbd-tools: security bump to version 3.5.1 Fix potential NULL deference errors. https://github.com/cifsd-team/ksmbd-tools/releases/tag/3.5.1 https://github.com/cifsd-team/ksmbd-tools/releases/tag/3.5.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/ksmbd-tools/ksmbd-tools.hash | 2 +- package/ksmbd-tools/ksmbd-tools.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ksmbd-tools/ksmbd-tools.hash b/package/ksmbd-tools/ksmbd-tools.hash index 6f7064c6eb..c3e6ebefe5 100644 --- a/package/ksmbd-tools/ksmbd-tools.hash +++ b/package/ksmbd-tools/ksmbd-tools.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 418c7d87e8359355d150bdde6784612cd2ebd48ec87765852169e289d9de67e6 ksmbd-tools-3.4.9.tar.gz +sha256 ab377b3044c48382303f3f7ec95f2e1a17592c774d70b2a11f32952099dbb214 ksmbd-tools-3.5.1.tar.gz sha256 576540abf5e95029ad4ad90e32071385a5e95b2c30708c706116f3eb87b9a3de COPYING diff --git a/package/ksmbd-tools/ksmbd-tools.mk b/package/ksmbd-tools/ksmbd-tools.mk index c758c17bf2..c56c6e10bb 100644 --- a/package/ksmbd-tools/ksmbd-tools.mk +++ b/package/ksmbd-tools/ksmbd-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -KSMBD_TOOLS_VERSION = 3.4.9 +KSMBD_TOOLS_VERSION = 3.5.1 KSMBD_TOOLS_SITE = https://github.com/cifsd-team/ksmbd-tools/releases/download/$(KSMBD_TOOLS_VERSION) KSMBD_TOOLS_LICENSE = GPL-2.0+ KSMBD_TOOLS_LICENSE_FILES = COPYING From c13199c9326fa2daa574f08ec8fc063a48d0eb06 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 26 Dec 2023 21:34:23 +0100 Subject: [PATCH 4342/5754] package/squid: security bump to version 6.6 - Drop patch (already in version) - Fix CVE-2023-50269: This problem allows a remote client to perform Denial of Service attack by sending a large X-Forwarded-For header when the follow_x_forwarded_for feature is configured. https://github.com/squid-cache/squid/security/advisories/GHSA-wgq4-4cfg-c4x3 https://github.com/squid-cache/squid/blob/SQUID_6_6/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...-ESI-build-with-libxml2-v2.12.0-1600.patch | 32 ------------------- package/squid/squid.hash | 8 ++--- package/squid/squid.mk | 2 +- 3 files changed, 5 insertions(+), 37 deletions(-) delete mode 100644 package/squid/0001-Bug-5328-Fix-ESI-build-with-libxml2-v2.12.0-1600.patch diff --git a/package/squid/0001-Bug-5328-Fix-ESI-build-with-libxml2-v2.12.0-1600.patch b/package/squid/0001-Bug-5328-Fix-ESI-build-with-libxml2-v2.12.0-1600.patch deleted file mode 100644 index fcbdcc1749..0000000000 --- a/package/squid/0001-Bug-5328-Fix-ESI-build-with-libxml2-v2.12.0-1600.patch +++ /dev/null @@ -1,32 +0,0 @@ -From c9b3edc1396925aa7eca3d3cc6c798806286a974 Mon Sep 17 00:00:00 2001 -From: bkuhls -Date: Sun, 26 Nov 2023 15:09:21 +0000 -Subject: [PATCH] Bug 5328: Fix ESI build with libxml2 v2.12.0 (#1600) - - Libxml2Parser.cc:147:40: error: invalid conversion from - 'const xmlError*' to 'xmlErrorPtr' {aka 'xmlError*'} [-fpermissive] - -libxml2 recently made xmlGetLastError() return a constant object. - -Upstream: https://github.com/squid-cache/squid/commit/c9b3edc1396925aa7eca3d3cc6c798806286a974 -Signed-off-by: Bernd Kuhls ---- - src/esi/Libxml2Parser.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/esi/Libxml2Parser.cc b/src/esi/Libxml2Parser.cc -index f03752885..236a37433 100644 ---- a/src/esi/Libxml2Parser.cc -+++ b/src/esi/Libxml2Parser.cc -@@ -144,7 +144,7 @@ ESILibxml2Parser::lineNumber() const - char const * - ESILibxml2Parser::errorString() const - { -- xmlErrorPtr error = xmlGetLastError(); -+ const auto error = xmlGetLastError(); - - if (error == nullptr) - return nullptr; --- -2.43.0 - diff --git a/package/squid/squid.hash b/package/squid/squid.hash index a163bd9ad3..4a8ea5d550 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.5.tar.xz.asc -md5 da2797d899cf538fab7f504fdf3c18bf squid-6.5.tar.xz -sha1 07a08394625948750264778c82e19cf24ea7cb1f squid-6.5.tar.xz +# From http://www.squid-cache.org/Versions/v6/squid-6.6.tar.xz.asc +md5 5a41134ee1b7e75f62088acdec92d2ca squid-6.6.tar.xz +sha1 f05e06a9dd3bf7501d2844e43d9ae1bd00e9edcc squid-6.6.tar.xz # Locally calculated -sha256 5070f8a3ae6666870c8fc716326befb0a1abe8b5ff3a6f3932cbc5543d7c8549 squid-6.5.tar.xz +sha256 55bd7f9f4898153161ea1228998acb551bf840832b9e5b90fc8ecd2942420318 squid-6.6.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/squid/squid.mk b/package/squid/squid.mk index c1477b1adf..3a9edac71e 100644 --- a/package/squid/squid.mk +++ b/package/squid/squid.mk @@ -4,7 +4,7 @@ # ################################################################################ -SQUID_VERSION = 6.5 +SQUID_VERSION = 6.6 SQUID_SOURCE = squid-$(SQUID_VERSION).tar.xz SQUID_SITE = http://www.squid-cache.org/Versions/v6 SQUID_LICENSE = GPL-2.0+ From 9f6146acb8d7165d4e06bee6e140cd96984db563 Mon Sep 17 00:00:00 2001 From: Petr Vorel Date: Tue, 26 Dec 2023 13:02:51 +0100 Subject: [PATCH 4343/5754] package/iputils: fix IPUTILS_SITE URL Upstream in release 20231222 shipped self generated iputils-20231222.tar.gz, which is signed and thus has different checksum than "Source code (tar.gz)" generated by github. Therefore different URL needs to be used to get correct checksum. Fixes: http://autobuild.buildroot.net/results/e9b39e142d5f56bf589253a10ed4722dbbda375c Fixes: 32da4422f9 ("package/iputils: bump version to 20231222") Signed-off-by: Petr Vorel Signed-off-by: Yann E. MORIN --- package/iputils/iputils.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/iputils/iputils.mk b/package/iputils/iputils.mk index a8f93488bb..bcf440ec93 100644 --- a/package/iputils/iputils.mk +++ b/package/iputils/iputils.mk @@ -5,7 +5,7 @@ ################################################################################ IPUTILS_VERSION = 20231222 -IPUTILS_SITE = $(call github,iputils,iputils,$(IPUTILS_VERSION)) +IPUTILS_SITE = https://github.com/iputils/iputils/releases/download/$(IPUTILS_VERSION) IPUTILS_LICENSE = GPL-2.0+, BSD-3-Clause IPUTILS_LICENSE_FILES = LICENSE Documentation/LICENSE.BSD3 Documentation/LICENSE.GPL2 IPUTILS_CPE_ID_VENDOR = iputils_project From 6d8c7aecbb28f1703b8eec1ffb6f555c1b422b31 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 26 Dec 2023 14:18:04 +0100 Subject: [PATCH 4344/5754] package/flickcurl: remove package This package is causing some build issues, which are probably due to the recent libxml2 upgrade: http://autobuild.buildroot.net/results/34d6f6c02f884ab9a2578a38ee8646e14632d6ff/ There has been no new commit upstream for the past 8 years: https://github.com/dajobe/flickcurl, and the last release, 1.26 is from 2014. So let's kill the package. Fixes: http://autobuild.buildroot.net/results/34d6f6c02f884ab9a2578a38ee8646e14632d6ff/ Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- Config.in.legacy | 7 +++++++ DEVELOPERS | 1 - package/Config.in | 1 - package/flickcurl/Config.in | 21 --------------------- package/flickcurl/flickcurl.hash | 7 ------- package/flickcurl/flickcurl.mk | 23 ----------------------- 6 files changed, 7 insertions(+), 53 deletions(-) delete mode 100644 package/flickcurl/Config.in delete mode 100644 package/flickcurl/flickcurl.hash delete mode 100644 package/flickcurl/flickcurl.mk diff --git a/Config.in.legacy b/Config.in.legacy index d46bd97442..e5822eec24 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2023.11" +config BR2_PACKAGE_FLICKCURL + bool "flickcurl package was removed" + select BR2_LEGACY + help + The flickcurl package was removed because it was + unmaintained upstream and causing build failures. + config BR2_PACKAGE_ONEVPL bool "onevpl package was renamed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index f4adda40a8..cc089e8ff6 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2386,7 +2386,6 @@ F: package/dfu-programmer/ F: package/docker-compose/ F: package/dump1090/ F: package/fatcat/ -F: package/flickcurl/ F: package/fscryptctl/ F: package/ifmetric/ F: package/jo/ diff --git a/package/Config.in b/package/Config.in index 98653ff29d..14af880cb8 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1934,7 +1934,6 @@ menu "Networking" source "package/dht/Config.in" source "package/enet/Config.in" source "package/filemq/Config.in" - source "package/flickcurl/Config.in" source "package/fmlib/Config.in" source "package/freeradius-client/Config.in" source "package/gensio/Config.in" diff --git a/package/flickcurl/Config.in b/package/flickcurl/Config.in deleted file mode 100644 index 426ceecba1..0000000000 --- a/package/flickcurl/Config.in +++ /dev/null @@ -1,21 +0,0 @@ -config BR2_PACKAGE_FLICKCURL - bool "flickcurl" - select BR2_PACKAGE_LIBCURL - select BR2_PACKAGE_LIBXML2 - # Ensure that libcurl is built with crypto support, since - # flickcurl must access https:// URLs. - select BR2_PACKAGE_OPENSSL if !(BR2_PACKAGE_GNUTLS || BR2_PACKAGE_LIBNSS) - select BR2_PACKAGE_CA_CERTIFICATES # runtime - help - Flickcurl is a C library for the Flickr API, handling - creating the requests, signing, token management, calling - the API, marshalling request parameters and decoding - responses. - - http://librdf.org/flickcurl/ - -config BR2_PACKAGE_FLICKCURL_UTILS - bool "flickcurl utilities" - depends on BR2_PACKAGE_FLICKCURL - help - Install flickcurl utilites (flickcurl + flickrdf) to target. diff --git a/package/flickcurl/flickcurl.hash b/package/flickcurl/flickcurl.hash deleted file mode 100644 index 8c3ea1682a..0000000000 --- a/package/flickcurl/flickcurl.hash +++ /dev/null @@ -1,7 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 ff42a36c7c1c7d368246f6bc9b7d792ed298348e5f0f5d432e49f6803562f5a3 flickcurl-1.26.tar.gz -# Locally computed -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING -sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LIB -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE-2.0.txt -sha256 3590f30b0fb9446a1f0a7ea5bcbb5786fa66fa362800f53d2575875d74b91909 LICENSE.html diff --git a/package/flickcurl/flickcurl.mk b/package/flickcurl/flickcurl.mk deleted file mode 100644 index 610b81f4d4..0000000000 --- a/package/flickcurl/flickcurl.mk +++ /dev/null @@ -1,23 +0,0 @@ -################################################################################ -# -# flickcurl -# -################################################################################ - -FLICKCURL_VERSION = 1.26 -FLICKCURL_SITE = http://download.dajobe.org/flickcurl -FLICKCURL_LICENSE = LGPL-2.1+ or GPL-2.0+ or Apache-2.0+ -FLICKCURL_LICENSE_FILES = COPYING COPYING.LIB LICENSE-2.0.txt LICENSE.html -FLICKCURL_INSTALL_STAGING = YES -FLICKCURL_CONFIG_SCRIPTS = flickcurl-config -FLICKCURL_CONF_OPTS = --without-curl-config --without-xml2-config --without-raptor -FLICKCURL_DEPENDENCIES = libcurl libxml2 host-pkgconf - -ifeq ($(BR2_PACKAGE_FLICKCURL_UTILS),) -define FLICKCURL_REMOVE_UTILS - rm -f $(TARGET_DIR)/usr/bin/flickcurl $(TARGET_DIR)/usr/bin/flickrdf -endef -FLICKCURL_POST_INSTALL_TARGET_HOOKS += FLICKCURL_REMOVE_UTILS -endif - -$(eval $(autotools-package)) From f93380ab1a36bdd019cfbc651a9df5904096e189 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 26 Dec 2023 14:59:39 +0100 Subject: [PATCH 4345/5754] package/gmpc: remove package This package is unmaintained upstream: - The URL in our Config.in, http://gmpcwiki.sarine.nl/index.php?title=GMPC, no longer works - https://github.com/DaveDavenport/gmpc says it's unmaintained - The official lists of MPD clients at https://www.musicpd.org/clients/ says it's maintained, and points at http://gmpclient.org/, which is no longer owned by the developers of GMPC. - It still uses libsoup (2) which we want to get rid of at some point. - It was added by Gustavo Zacarias, and no version bumped occurred since 2011. So let's kill this package. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- Config.in.legacy | 7 +++++++ package/Config.in | 1 - package/gmpc/Config.in | 26 -------------------------- package/gmpc/gmpc.hash | 3 --- package/gmpc/gmpc.mk | 18 ------------------ 5 files changed, 7 insertions(+), 48 deletions(-) delete mode 100644 package/gmpc/Config.in delete mode 100644 package/gmpc/gmpc.hash delete mode 100644 package/gmpc/gmpc.mk diff --git a/Config.in.legacy b/Config.in.legacy index e5822eec24..58b40e5bac 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2023.11" +config BR2_PACKAGE_GMPC + bool "gmpc package was removed" + select BR2_LEGACY + help + The gmpc package was removed because it was unmaintained, + and still using the old libsoup2 library. + config BR2_PACKAGE_FLICKCURL bool "flickcurl package was removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index 14af880cb8..c7debd6f10 100644 --- a/package/Config.in +++ b/package/Config.in @@ -405,7 +405,6 @@ comment "X applications" source "package/dillo/Config.in" source "package/docker/Config.in" source "package/feh/Config.in" - source "package/gmpc/Config.in" source "package/gtkperf/Config.in" source "package/leafpad/Config.in" source "package/mupdf/Config.in" diff --git a/package/gmpc/Config.in b/package/gmpc/Config.in deleted file mode 100644 index 1aa74251f0..0000000000 --- a/package/gmpc/Config.in +++ /dev/null @@ -1,26 +0,0 @@ -config BR2_PACKAGE_GMPC - bool "gmpc" - depends on BR2_PACKAGE_LIBGTK2 - depends on BR2_USE_WCHAR # glib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 - depends on BR2_USE_MMU # glib2 - depends on BR2_PACKAGE_XORG7 - select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE - select BR2_PACKAGE_LIBMPD - select BR2_PACKAGE_LIBSOUP - select BR2_PACKAGE_LIBXML2 - select BR2_PACKAGE_SQLITE - select BR2_PACKAGE_XLIB_LIBICE - select BR2_PACKAGE_XLIB_LIBSM - select BR2_PACKAGE_XLIB_LIBX11 - help - Gnome Music Player Client is a GNOME/GTK2.2 client for - Music Player Daemon. - - http://gmpcwiki.sarine.nl/index.php?title=GMPC - -comment "gmpc needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on BR2_PACKAGE_XORG7 && BR2_PACKAGE_LIBGTK2 - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/gmpc/gmpc.hash b/package/gmpc/gmpc.hash deleted file mode 100644 index 66de8b6226..0000000000 --- a/package/gmpc/gmpc.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 a69414f35396846733632ca9619921d7acda537ffd6d49bd84b444945cb76b2c gmpc-11.8.16.tar.gz -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/gmpc/gmpc.mk b/package/gmpc/gmpc.mk deleted file mode 100644 index 40b77eb189..0000000000 --- a/package/gmpc/gmpc.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# gmpc -# -################################################################################ - -GMPC_VERSION = 11.8.16 -GMPC_SITE = http://download.sarine.nl/Programs/gmpc/$(GMPC_VERSION) -GMPC_CONF_ENV = ac_cv_path_GOB2=$(GOB2_HOST_BINARY) -GMPC_CONF_OPTS = --disable-mmkeys --disable-unique -GMPC_LICENSE = GPL-2.0+ -GMPC_LICENSE_FILES = COPYING -GMPC_DEPENDENCIES = host-gob2 host-intltool host-pkgconf host-vala \ - libglib2 libgtk2 libmpd libsoup sqlite \ - xlib_libICE xlib_libSM xlib_libX11 \ - $(TARGET_NLS_DEPENDENCIES) - -$(eval $(autotools-package)) From 64a5831679cf743357e725284e56cf0365010c36 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 26 Dec 2023 14:59:40 +0100 Subject: [PATCH 4346/5754] package/libmpd: remove package Following the removal of gmpc, we can drop libmpd as well, which was apparently developed/maintained by the same group of people. The URL in Config.in, http://gmpcwiki.sarine.nl/index.php?title=Libmpd, no longer works, and no new alternative upstream was found. The reference MPD client library is libmpdclient, which is still maintained. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- .checkpackageignore | 1 - Config.in.legacy | 7 ++++++ package/Config.in | 1 - ...x-build-on-archlinux-missing-include.patch | 24 ------------------- package/libmpd/Config.in | 17 ------------- package/libmpd/libmpd.hash | 3 --- package/libmpd/libmpd.mk | 15 ------------ 7 files changed, 7 insertions(+), 61 deletions(-) delete mode 100644 package/libmpd/0001-Fix-build-on-archlinux-missing-include.patch delete mode 100644 package/libmpd/Config.in delete mode 100644 package/libmpd/libmpd.hash delete mode 100644 package/libmpd/libmpd.mk diff --git a/.checkpackageignore b/.checkpackageignore index 0868593a92..4e6c688380 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -685,7 +685,6 @@ package/libmanette/0001-Meson-Un-hardcode-building-a-shared-library.patch Upstre 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/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 diff --git a/Config.in.legacy b/Config.in.legacy index 58b40e5bac..1881d43f90 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2023.11" +config BR2_PACKAGE_LIBMPD + bool "libmpd package was removed" + select BR2_LEGACY + help + The libmpd package was only used by gmpc, both of which are + no longer maintained upstream. + config BR2_PACKAGE_GMPC bool "gmpc package was removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index c7debd6f10..d5d89c50aa 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1467,7 +1467,6 @@ menu "Audio/Sound" source "package/liblo/Config.in" source "package/libmad/Config.in" source "package/libmodplug/Config.in" - source "package/libmpd/Config.in" source "package/libmpdclient/Config.in" source "package/libreplaygain/Config.in" source "package/libsamplerate/Config.in" diff --git a/package/libmpd/0001-Fix-build-on-archlinux-missing-include.patch b/package/libmpd/0001-Fix-build-on-archlinux-missing-include.patch deleted file mode 100644 index be16eb9713..0000000000 --- a/package/libmpd/0001-Fix-build-on-archlinux-missing-include.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 4f946c01000fd97100e4a534b47f9c7ace0403df Mon Sep 17 00:00:00 2001 -From: QC -Date: Thu, 9 Oct 2014 19:51:50 +0200 -Subject: [PATCH] Fix build on archlinux (missing include) - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/DaveDavenport/libmpd/commit/4f946c01000fd97100e4a534b47f9c7ace0403df] ---- - src/libmpd-internal.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/libmpd-internal.h b/src/libmpd-internal.h -index c84c3a4..30cdc85 100644 ---- a/src/libmpd-internal.h -+++ b/src/libmpd-internal.h -@@ -21,6 +21,7 @@ - #define __MPD_INTERNAL_LIB_ - - #include "libmpdclient.h" -+#include - struct _MpdData_real; - - typedef struct _MpdData_real { diff --git a/package/libmpd/Config.in b/package/libmpd/Config.in deleted file mode 100644 index 1e3b860063..0000000000 --- a/package/libmpd/Config.in +++ /dev/null @@ -1,17 +0,0 @@ -config BR2_PACKAGE_LIBMPD - bool "libmpd" - 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_LIBICONV if !BR2_ENABLE_LOCALE - help - High-level client library for accessing Music Player Daemon. - LibMpd is a library that provides high-level, callback-based - access to Music Player Daemon (mpd). - - http://gmpcwiki.sarine.nl/index.php?title=Libmpd - -comment "libmpd needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/libmpd/libmpd.hash b/package/libmpd/libmpd.hash deleted file mode 100644 index 875eba2b05..0000000000 --- a/package/libmpd/libmpd.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 fe20326b0d10641f71c4673fae637bf9222a96e1712f71f170fca2fc34bf7a83 libmpd-11.8.17.tar.gz -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/libmpd/libmpd.mk b/package/libmpd/libmpd.mk deleted file mode 100644 index 2aa7ff7e05..0000000000 --- a/package/libmpd/libmpd.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# libmpd -# -################################################################################ - -LIBMPD_VERSION_MAJOR = 11.8 -LIBMPD_VERSION = $(LIBMPD_VERSION_MAJOR).17 -LIBMPD_SITE = http://download.sarine.nl/Programs/gmpc/$(LIBMPD_VERSION_MAJOR) -LIBMPD_INSTALL_STAGING = YES -LIBMPD_DEPENDENCIES = libglib2 -LIBMPD_LICENSE = GPL-2.0+ -LIBMPD_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) From 078b8558b9e25917db680fdeb8d9c64db9aafc8e Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 23 Dec 2023 20:55:09 +0100 Subject: [PATCH 4347/5754] package/x11r7/xwayland: security bump to 23.2.3 According to https://lists.x.org/archives/xorg-announce/2023-December/003437.html: This release contains the fixes for CVE-2023-6377 and CVE-2023-6478 in today's security advisory: https://lists.x.org/archives/xorg-announce/2023-December/003435.html The release has only 10 commits compared to 23.2.2, all of which being fixes, two of them being the security fixes. So it seems like bumping the version is a reasonable trade-off vs. backporting the security fixes. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/x11r7/xwayland/xwayland.hash | 6 +++--- package/x11r7/xwayland/xwayland.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/x11r7/xwayland/xwayland.hash b/package/x11r7/xwayland/xwayland.hash index 12363a66bf..533ef9de86 100644 --- a/package/x11r7/xwayland/xwayland.hash +++ b/package/x11r7/xwayland/xwayland.hash @@ -1,6 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2023-October/003432.html -sha256 9f7c0938d2a41e941ffa04f99c35e5db2bcd3eec034afe8d35d5c810a22eb0a8 xwayland-23.2.2.tar.xz -sha512 f5b319fdace7d7c078544730ecd26afeb63b1a0c779fb097455147945df85af32d9e91501ebdb70209d48e8a3ead3b23be31e9d5118358ac17e699abb4b6ac07 xwayland-23.2.2.tar.xz +# From https://lists.x.org/archives/xorg-announce/2023-December/003437.html +sha256 eb9d9aa7232c47412c8835ec15a97c575f03563726c787754ff0c019bd07e302 xwayland-23.2.3.tar.xz +sha512 37198aa2f06313a0cb2add51cc78f81b26a42f2c9d55a0d3eecf958777107ea5560961c128f2d0af055f7460ba10fadb1b9050251c2c50f2251b40ab517e79cd xwayland-23.2.3.tar.xz # Locally calculated sha256 4cc0447a22635c7b2f1a93fec4aa94f1970fadeb72a063de006b51cf4963a06f COPYING diff --git a/package/x11r7/xwayland/xwayland.mk b/package/x11r7/xwayland/xwayland.mk index b0bff19be5..8f4bcd8117 100644 --- a/package/x11r7/xwayland/xwayland.mk +++ b/package/x11r7/xwayland/xwayland.mk @@ -4,7 +4,7 @@ # ################################################################################ -XWAYLAND_VERSION = 23.2.2 +XWAYLAND_VERSION = 23.2.3 XWAYLAND_SOURCE = xwayland-$(XWAYLAND_VERSION).tar.xz XWAYLAND_SITE = https://xorg.freedesktop.org/archive/individual/xserver XWAYLAND_LICENSE = MIT From 95a5ed75457f1511777c57075f33d34b3622a3de Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 27 Dec 2023 14:46:56 +0100 Subject: [PATCH 4348/5754] package/gstreamer1/gstd: drop readline dependency readline is not a dependency since bump to version 0.15.0 in commit cbd06adac50e304f413689febf676911ae29d967 and https://github.com/RidgeRun/gstd-1.x/commit/978b503840e0f9ae99f732113babbc4fbfb2a770 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/gstreamer1/gstd/Config.in | 1 - package/gstreamer1/gstd/gstd.mk | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/package/gstreamer1/gstd/Config.in b/package/gstreamer1/gstd/Config.in index df1d2f59c3..bfe1a40bfd 100644 --- a/package/gstreamer1/gstd/Config.in +++ b/package/gstreamer1/gstd/Config.in @@ -10,7 +10,6 @@ config BR2_PACKAGE_GSTD select BR2_PACKAGE_LIBEDIT select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBSOUP - select BR2_PACKAGE_READLINE help GStreamer Daemon, also called gstd, is a GStreamer framework for controlling audio and video streaming using an diff --git a/package/gstreamer1/gstd/gstd.mk b/package/gstreamer1/gstd/gstd.mk index ccb3b3e1bc..965ede7949 100644 --- a/package/gstreamer1/gstd/gstd.mk +++ b/package/gstreamer1/gstd/gstd.mk @@ -17,8 +17,7 @@ GSTD_DEPENDENCIES = \ libdaemon \ libedit \ libglib2 \ - libsoup \ - readline + libsoup GSTD_CONF_OPTS = \ -Denable-tests=disabled \ From 19f083717451eb22e097d3cdc53785161c2f156a Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 27 Dec 2023 15:44:24 +0100 Subject: [PATCH 4349/5754] package/mp4v2: security bump to version 2.1.3 Fix CVE-2023-1450, CVE-2023-1451 and CVE-2023-29584 https://github.com/enzo1982/mp4v2/releases/tag/v2.1.3 https://github.com/enzo1982/mp4v2/releases/tag/v2.1.2 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/mp4v2/mp4v2.hash | 2 +- package/mp4v2/mp4v2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mp4v2/mp4v2.hash b/package/mp4v2/mp4v2.hash index d3f0243650..4605ee6b0d 100644 --- a/package/mp4v2/mp4v2.hash +++ b/package/mp4v2/mp4v2.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 29420c62e56a2e527fd8979d59d05ed6d83ebe27e0e2c782c1ec19a3a402eaee mp4v2-2.1.1.tar.bz2 +sha256 033185c17bf3c5fdd94020c95f8325be2e5356558e3913c3d6547a85dd61f7f1 mp4v2-2.1.3.tar.bz2 sha256 7187891a4c39ee9e7ec70c71fc7dc8b8ed02c6f56ae1ffc017a34ac66dca5390 COPYING diff --git a/package/mp4v2/mp4v2.mk b/package/mp4v2/mp4v2.mk index 7de837c170..ae777cdc75 100644 --- a/package/mp4v2/mp4v2.mk +++ b/package/mp4v2/mp4v2.mk @@ -4,7 +4,7 @@ # ################################################################################ -MP4V2_VERSION = 2.1.1 +MP4V2_VERSION = 2.1.3 MP4V2_SITE = \ https://github.com/enzo1982/mp4v2/releases/download/v$(MP4V2_VERSION) MP4V2_SOURCE = mp4v2-$(MP4V2_VERSION).tar.bz2 From d0c4bd703a424f69451d7774727680fae2b4daa3 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 26 Dec 2023 23:43:46 +0100 Subject: [PATCH 4350/5754] package/wolfssl: security bump to version 5.6.6 - Use official tarball and so drop autoreconf - Fix CVE-2023-6935, CVE-2023-6936 and CVE-2023-6937 https://github.com/wolfSSL/wolfssl/releases/tag/v5.6.6-stable Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/wolfssl/wolfssl.hash | 2 +- package/wolfssl/wolfssl.mk | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/package/wolfssl/wolfssl.hash b/package/wolfssl/wolfssl.hash index fb5a570de8..59e42e98b9 100644 --- a/package/wolfssl/wolfssl.hash +++ b/package/wolfssl/wolfssl.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 031691906794ff45e1e792561cf31759f5d29ac74936bc8dffb8b14f16d820b4 wolfssl-5.6.4.tar.gz +sha256 75aaafe3b8c776d1ac417288116c8d444115f9fac5acb382a39a7d163dfd618d wolfssl-5.6.6.tar.gz # Hash for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/wolfssl/wolfssl.mk b/package/wolfssl/wolfssl.mk index 17452fdcaf..68c69afd59 100644 --- a/package/wolfssl/wolfssl.mk +++ b/package/wolfssl/wolfssl.mk @@ -4,8 +4,8 @@ # ################################################################################ -WOLFSSL_VERSION = 5.6.4 -WOLFSSL_SITE = $(call github,wolfSSL,wolfssl,v$(WOLFSSL_VERSION)-stable) +WOLFSSL_VERSION = 5.6.6 +WOLFSSL_SITE = https://github.com/wolfSSL/wolfssl/releases/download/v$(WOLFSSL_VERSION)-stable WOLFSSL_INSTALL_STAGING = YES WOLFSSL_LICENSE = GPL-2.0+ @@ -14,10 +14,6 @@ WOLFSSL_CPE_ID_VENDOR = wolfssl WOLFSSL_CONFIG_SCRIPTS = wolfssl-config WOLFSSL_DEPENDENCIES = host-pkgconf -# wolfssl's source code is released without a configure -# script, so we need autoreconf -WOLFSSL_AUTORECONF = YES - WOLFSSL_CONF_OPTS = --disable-examples --disable-crypttests ifeq ($(BR2_PACKAGE_WOLFSSL_ALL),y) From 53779570e50307482d095ff6ef95582cac2a0165 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 26 Dec 2023 23:34:07 +0100 Subject: [PATCH 4351/5754] package/zlog: bump to version 1.2.17 License changed to Apache-2.0: https://github.com/HardySimpson/zlog/commit/1a7b1a6fb956b92a4079ccc91f30da21f34ca063 https://github.com/HardySimpson/zlog/compare/1.2.16...1.2.17 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/zlog/zlog.hash | 4 ++-- package/zlog/zlog.mk | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/zlog/zlog.hash b/package/zlog/zlog.hash index 3b7c6aa78c..19881183e9 100644 --- a/package/zlog/zlog.hash +++ b/package/zlog/zlog.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 742401902f2134eb272c49631fe5c38d7aeb9a2ad56fa3ec3d15219b371ba655 zlog-1.2.16.tar.gz -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING +sha256 7fe412130abbb75a0779df89ae407db5d8f594435cc4ff6b068d924e13fd5c68 zlog-1.2.17.tar.gz +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/zlog/zlog.mk b/package/zlog/zlog.mk index 329f2cfe2c..ccf2576529 100644 --- a/package/zlog/zlog.mk +++ b/package/zlog/zlog.mk @@ -4,10 +4,10 @@ # ################################################################################ -ZLOG_VERSION = 1.2.16 +ZLOG_VERSION = 1.2.17 ZLOG_SITE = $(call github,HardySimpson,zlog,$(ZLOG_VERSION)) -ZLOG_LICENSE = LGPL-2.1 -ZLOG_LICENSE_FILES = COPYING +ZLOG_LICENSE = Apache-2.0 +ZLOG_LICENSE_FILES = LICENSE ZLOG_CPE_ID_VENDOR = zlog_project ZLOG_INSTALL_STAGING = YES From a760645bfb3fa74253d24462a39e29d4c54ee5ea Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 27 Dec 2023 12:48:23 +0100 Subject: [PATCH 4352/5754] package/gstreamer1/gst1-plugins-good: switch to libsoup3 libsoup3 is supported since https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/c3455def2e7bd09a7c3806283ceb69d0bef24869 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-good/Config.in | 10 +++++----- .../gstreamer1/gst1-plugins-good/gst1-plugins-good.mk | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-good/Config.in b/package/gstreamer1/gst1-plugins-good/Config.in index 36a542227a..e1e2674a4a 100644 --- a/package/gstreamer1/gst1-plugins-good/Config.in +++ b/package/gstreamer1/gst1-plugins-good/Config.in @@ -261,7 +261,7 @@ 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 + select BR2_PACKAGE_LIBSOUP3 config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_LAME bool "lame (*.mp3 audio encoder)" @@ -383,11 +383,11 @@ comment "pulseaudio support needs a toolchain w/ threads, wchar, dynamic library config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SOUPHTTPSRC bool "souphttpsrc (http client)" - depends on BR2_USE_WCHAR # libsoup -> glib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # libsoup -> glib2 - select BR2_PACKAGE_LIBSOUP + depends on BR2_USE_WCHAR # libsoup3 -> glib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # libsoup3 -> glib2 + select BR2_PACKAGE_LIBSOUP3 help - libsoup HTTP client src/sink + libsoup3 HTTP client src/sink comment "souphttpsrc needs a toolchain w/ wchar, threads" depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk index 4a84ea01b9..d1a0d71dfb 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk @@ -60,7 +60,7 @@ endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_ADAPTIVEMUX2),y) GST1_PLUGINS_GOOD_CONF_OPTS += -Dadaptivedemux2=enabled -GST1_PLUGINS_GOOD_DEPENDENCIES += libsoup libxml2 +GST1_PLUGINS_GOOD_DEPENDENCIES += libsoup3 libxml2 else GST1_PLUGINS_GOOD_CONF_OPTS += -Dadaptivedemux2=disabled endif @@ -453,7 +453,7 @@ endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SOUPHTTPSRC),y) GST1_PLUGINS_GOOD_CONF_OPTS += -Dsoup=enabled -GST1_PLUGINS_GOOD_DEPENDENCIES += libsoup +GST1_PLUGINS_GOOD_DEPENDENCIES += libsoup3 else GST1_PLUGINS_GOOD_CONF_OPTS += -Dsoup=disabled endif From e5729d3008e4f958324fbbd9ea742badb3f41de4 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 25 Dec 2023 23:54:19 +0100 Subject: [PATCH 4353/5754] package/gdb: build and link libbfd and libopcodes as static libraries Since GDB 13.x and upstream commit b686ecb5b10be9a33ab8f1bfdcff22eef920d1a5 ("gdb: link executables with libtool"), gdb will be linked against the shared variants of libbfd and libopcodes if they exist. However, this causes host gdb and target gdb to not work, because our gdb package does not install libbfd and libopcodes (to not clash with the ones potentially installed by binutils). In order to get around this, this commit proposes to get back to the situation we had before GDB 13.x: libbfd and libopcodes are only compiled as static libraries, so that they are linked directly inside the gdb binary, avoiding the problem entirely. This resolves: # gdb --version gdb: error while loading shared libraries: libopcodes-2.39.50.so: cannot open shared object file: No such file or directory for target gdb, and: $ ./host/bin/arm-linux-gdb --version ./host/bin/arm-linux-gdb: error while loading shared libraries: libopcodes-2.39.50.so: cannot open shared object file: No such file or directory for host gdb. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- package/gdb/gdb.mk | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk index 070598b385..ea710f0c1f 100644 --- a/package/gdb/gdb.mk +++ b/package/gdb/gdb.mk @@ -121,8 +121,10 @@ GDB_MAKE_ENV += \ GDB_CONF_ENV += gdb_cv_prfpregset_t_broken=no GDB_MAKE_ENV += gdb_cv_prfpregset_t_broken=no -# The shared only build is not supported by gdb, so enable static build for -# build-in libraries with --enable-static. +# We want the built-in libraries of gdb (libbfd, libopcodes) to be +# built and linked statically, as we do not install them on the +# target, to not clash with the ones potentially installed by +# binutils. This is why we pass --enable-static --disable-shared. GDB_CONF_OPTS = \ --without-uiout \ --disable-gdbtk \ @@ -132,6 +134,7 @@ GDB_CONF_OPTS = \ --without-included-gettext \ --disable-werror \ --enable-static \ + --disable-shared \ --without-mpfr \ --disable-source-highlight @@ -248,10 +251,14 @@ endif # A few notes: # * --target, because we're doing a cross build rather than a real # host build. -# * --enable-static because gdb really wants to use libbfd.a +# * --enable-static --disable-shared because we want host gdb to +# build and link against a static version of libbfd and +# libopcodes, because we don't install the shared variants of +# those libraries in $(HOST_DIR), as it might clash with binutils HOST_GDB_CONF_OPTS = \ --target=$(GNU_TARGET_NAME) \ --enable-static \ + --disable-shared \ --without-uiout \ --disable-gdbtk \ --without-x \ From 7b93aade5d48ead736a9ccc01e9ff0d59e32151a Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 27 Dec 2023 22:22:52 +0100 Subject: [PATCH 4354/5754] Config.in.legacy: recent removals are for the future release A few package or config removals have been introduced after the 2023.11 release, but there entries were still added to the list of options removed in 2023.11. The affected commits are: 64a5831679 package/libmpd: remove package f93380ab1a package/gmpc: remove package 6d8c7aecbb package/flickcurl: remove package f6acde11ab package/onevpl: rename package to libvpl fffb245f66 package/linux-headers: drop 6.5.x option Introduce the 2024.02 section and move the 2023.11 one to where it belongs. Signed-off-by: Yann E. MORIN --- Config.in.legacy | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Config.in.legacy b/Config.in.legacy index 1881d43f90..b9089250c8 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -144,7 +144,7 @@ endif ############################################################################### -comment "Legacy options removed in 2023.11" +comment "Legacy options removed in 2024.02" config BR2_PACKAGE_LIBMPD bool "libmpd package was removed" @@ -179,6 +179,8 @@ config BR2_KERNEL_HEADERS_6_5 Version 6.5.x of the Linux kernel headers are no longer maintained upstream and are now removed. +comment "Legacy options removed in 2023.11" + config BR2_PACKAGE_PYTHON_PYXB bool "python-pyxb removed" select BR2_LEGACY From a9a56ab6fd98125ca09078bdeb7c8d55d53aa35e Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 24 Dec 2023 17:08:27 +0100 Subject: [PATCH 4355/5754] package/gdb: add support for GDB 14.1 All patches are still relevant, and have been rebased on top of GDB 14.1. GDB 14.1 now needs mpfr unconditionally, so it is added as a dependency of host-gdb, and of gdb when the full debugger is built. Signed-off-by: Thomas Petazzoni [yann.morin.1998@free.fr: - add comment about selecting mpfr for 14.x or later ] Signed-off-by: Yann E. MORIN --- .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/14.1/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 ++++++++++++ .../14.1/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 | 1 + package/gdb/Config.in.host | 6 ++ package/gdb/gdb.hash | 1 + package/gdb/gdb.mk | 19 +++++- 14 files changed, 482 insertions(+), 2 deletions(-) create mode 100644 package/gdb/14.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch create mode 100644 package/gdb/14.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch create mode 100644 package/gdb/14.1/0003-use-asm-sgidefs.h.patch create mode 100644 package/gdb/14.1/0004-gdbserver-fix-build-for-m68k.patch create mode 100644 package/gdb/14.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch create mode 100644 package/gdb/14.1/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch create mode 100644 package/gdb/14.1/0007-fix-musl-build-on-riscv.patch create mode 100644 package/gdb/14.1/0008-gdbserver-Makefile.in-fix-NLS-build.patch create mode 100644 package/gdb/14.1/0009-gdb-Fix-native-build-on-xtensa.patch diff --git a/.checkpackageignore b/.checkpackageignore index 4e6c688380..5aae566ba9 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -485,6 +485,15 @@ 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/gdb/14.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch Upstream +package/gdb/14.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch Upstream +package/gdb/14.1/0003-use-asm-sgidefs.h.patch Upstream +package/gdb/14.1/0004-gdbserver-fix-build-for-m68k.patch Upstream +package/gdb/14.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch Upstream +package/gdb/14.1/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch Upstream +package/gdb/14.1/0007-fix-musl-build-on-riscv.patch Upstream +package/gdb/14.1/0008-gdbserver-Makefile.in-fix-NLS-build.patch Upstream +package/gdb/14.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 diff --git a/package/gdb/14.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch b/package/gdb/14.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch new file mode 100644 index 0000000000..b213ba5a09 --- /dev/null +++ b/package/gdb/14.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch @@ -0,0 +1,55 @@ +From ee74f5a6fa98b43c45c9c56a26c00abc21aeeaa1 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 86fbc8f5d96..8a1a39bc750 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.43.0 + diff --git a/package/gdb/14.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch b/package/gdb/14.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch new file mode 100644 index 0000000000..b070c4fc05 --- /dev/null +++ b/package/gdb/14.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch @@ -0,0 +1,43 @@ +From 57b2606e39b2ac90a3810baccbd73161ffdb5f2d 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.43.0 + diff --git a/package/gdb/14.1/0003-use-asm-sgidefs.h.patch b/package/gdb/14.1/0003-use-asm-sgidefs.h.patch new file mode 100644 index 0000000000..12f0885b34 --- /dev/null +++ b/package/gdb/14.1/0003-use-asm-sgidefs.h.patch @@ -0,0 +1,40 @@ +From 5288e2a3dcb2928e1367cd1d4c31da3b8310f3a0 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 8a7cc95f2a4..3686f43abfd 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.43.0 + diff --git a/package/gdb/14.1/0004-gdbserver-fix-build-for-m68k.patch b/package/gdb/14.1/0004-gdbserver-fix-build-for-m68k.patch new file mode 100644 index 0000000000..21509b3283 --- /dev/null +++ b/package/gdb/14.1/0004-gdbserver-fix-build-for-m68k.patch @@ -0,0 +1,63 @@ +From 5e352184c2fc696c5b7aff1985098c460686a638 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.43.0 + diff --git a/package/gdb/14.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch b/package/gdb/14.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch new file mode 100644 index 0000000000..43ed3778ca --- /dev/null +++ b/package/gdb/14.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch @@ -0,0 +1,53 @@ +From 3e55ad5448f5379e3d7e079f17a18904e905cebf 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.43.0 + diff --git a/package/gdb/14.1/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch b/package/gdb/14.1/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch new file mode 100644 index 0000000000..7fed8266df --- /dev/null +++ b/package/gdb/14.1/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch @@ -0,0 +1,39 @@ +From c87940ff1c2efd22c3dab9cd712531281144ed89 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.43.0 + diff --git a/package/gdb/14.1/0007-fix-musl-build-on-riscv.patch b/package/gdb/14.1/0007-fix-musl-build-on-riscv.patch new file mode 100644 index 0000000000..ca6af2522f --- /dev/null +++ b/package/gdb/14.1/0007-fix-musl-build-on-riscv.patch @@ -0,0 +1,60 @@ +From f297ef653008b47fdaa4eebbccf2705f3d0996a8 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 4c251bb179c..77a48ac9ee1 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.43.0 + diff --git a/package/gdb/14.1/0008-gdbserver-Makefile.in-fix-NLS-build.patch b/package/gdb/14.1/0008-gdbserver-Makefile.in-fix-NLS-build.patch new file mode 100644 index 0000000000..05fedfc960 --- /dev/null +++ b/package/gdb/14.1/0008-gdbserver-Makefile.in-fix-NLS-build.patch @@ -0,0 +1,38 @@ +From 49cc0d8a7a930eab1eb8c848101150ca83145334 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 b597515d428..54cc7ccb0f6 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.43.0 + diff --git a/package/gdb/14.1/0009-gdb-Fix-native-build-on-xtensa.patch b/package/gdb/14.1/0009-gdb-Fix-native-build-on-xtensa.patch new file mode 100644 index 0000000000..10302a4bb6 --- /dev/null +++ b/package/gdb/14.1/0009-gdb-Fix-native-build-on-xtensa.patch @@ -0,0 +1,57 @@ +From 0533122983d2ac973453915cb1331b87d8d7fc0a 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.43.0 + diff --git a/package/gdb/Config.in b/package/gdb/Config.in index e4ab39a2bd..7251dce668 100644 --- a/package/gdb/Config.in +++ b/package/gdb/Config.in @@ -59,6 +59,7 @@ config BR2_PACKAGE_GDB_DEBUGGER depends on BR2_USE_WCHAR depends on !BR2_sh select BR2_PACKAGE_GMP if !BR2_arc + select BR2_PACKAGE_MPFR if BR2_GDB_VERSION_14 select BR2_PACKAGE_NCURSES select BR2_PACKAGE_ZLIB diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host index 9ba987222a..670818cb0e 100644 --- a/package/gdb/Config.in.host +++ b/package/gdb/Config.in.host @@ -57,6 +57,9 @@ config BR2_GDB_VERSION_12 config BR2_GDB_VERSION_13 bool "gdb 13.x" +config BR2_GDB_VERSION_14 + bool "gdb 14.x" + endchoice endif @@ -68,4 +71,7 @@ config BR2_GDB_VERSION 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 + # When making 14.x the default, or 14.x becomes the oldest version, + # be sure to update the target variant to properly select mpfr. + default "14.1" if BR2_GDB_VERSION_14 depends on BR2_PACKAGE_GDB || BR2_PACKAGE_HOST_GDB diff --git a/package/gdb/gdb.hash b/package/gdb/gdb.hash index ebe5647dab..ba90bff5d6 100644 --- a/package/gdb/gdb.hash +++ b/package/gdb/gdb.hash @@ -3,6 +3,7 @@ sha512 3653762ac008e065c37cd641653184c9ff7ce51ee2222ade1122bec9d6cc64dffd4fb748 sha512 07e9026423438049b11f4f784d57401ece4e940570f613bd6958b3714fe7fbc2c048470bcce3e7d7d9f93331cdf3881d30dcc964cb113a071143a02b28e5b127 gdb-11.2.tar.xz sha512 425568d2e84672177d0fb87b1ad7daafdde097648d605e30cf0656970f66adc6a82ca2d83375ea4be583e9683a340e5bfdf5819668ddf66728200141ae50ff2d gdb-12.1.tar.xz sha512 8185d3e11ab60dafff5860a5016577bfe7dd7547ef01ebc867bc247603d82b74ff74c4f29492c7d2aee57076f52be33e289f4c6b414a4b870d4b3004909f4c34 gdb-13.2.tar.xz +sha512 575e198105076fc4a88f68591aa114ab9c1196e84386a3f7b9b58fe5f30cdeed33f6a5f957b68f08c47284ec922bb60c964627e238471419673fd913575ce427 gdb-14.1.tar.xz # Locally calculated (fetched from Github) sha512 5a2acf2fd33ab2ff589e1037ca40abda54328997dcff26b2b49b874bd3be980be5a63342962254f3c3bda98e32ce7a33af704d37353352833dee193135600458 gdb-arc-2020.09-release-gdb.tar.gz diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk index ea710f0c1f..af40f7f986 100644 --- a/package/gdb/gdb.mk +++ b/package/gdb/gdb.mk @@ -135,7 +135,6 @@ GDB_CONF_OPTS = \ --disable-werror \ --enable-static \ --disable-shared \ - --without-mpfr \ --disable-source-highlight ifeq ($(BR2_PACKAGE_GDB_DEBUGGER),y) @@ -167,6 +166,15 @@ GDB_CONF_OPTS += \ GDB_DEPENDENCIES += gmp endif +# Starting from GDB 14.x, mpfr is needed as a dependency to build full +# gdb. +ifeq ($(BR2_GDB_VERSION_14)$(BR2_PACKAGE_GDB_DEBUGGER),yy) +GDB_DEPENDENCIES += mpfr +GDB_CONF_OPTS += --with-mpfr=$(STAGING_DIR) +else +GDB_CONF_OPTS += --without-mpfr +endif + ifeq ($(BR2_PACKAGE_GDB_SERVER),y) GDB_CONF_OPTS += --enable-gdbserver GDB_DEPENDENCIES += $(TARGET_NLS_DEPENDENCIES) @@ -267,10 +275,17 @@ HOST_GDB_CONF_OPTS = \ --without-included-gettext \ --with-system-zlib \ --with-curses \ - --without-mpfr \ --disable-source-highlight \ $(GDB_DISABLE_BINUTILS_CONF_OPTS) +# GDB newer than 14.x need host-mpfr +ifeq ($(BR2_GDB_VERSION_14),y) +HOST_GDB_DEPENDENCIES += host-mpfr +HOST_GDB_CONF_OPTS += --with-mpfr=$(HOST_DIR) +else +HOST_GDB_CONF_OPTS += --without-mpfr +endif + ifeq ($(BR2_PACKAGE_HOST_GDB_TUI),y) HOST_GDB_CONF_OPTS += --enable-tui else From 03dc0fbd5cfb109e90531be1bc7c44ba70df0436 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 24 Dec 2023 17:08:28 +0100 Subject: [PATCH 4356/5754] package/gdb: make GDB 13.x the default version Following the addition of GDB 14.x, let's make GDB 13.x the default. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- 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 670818cb0e..0c6f75a3eb 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_12 + default BR2_GDB_VERSION_13 depends on !BR2_arc help Select the version of gdb you wish to use. @@ -69,8 +69,8 @@ config BR2_GDB_VERSION string default "arc-2020.09-release-gdb" if BR2_arc 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 + default "12.1" if BR2_GDB_VERSION_12 + default "13.2" if BR2_GDB_VERSION_13 || !BR2_PACKAGE_HOST_GDB # When making 14.x the default, or 14.x becomes the oldest version, # be sure to update the target variant to properly select mpfr. default "14.1" if BR2_GDB_VERSION_14 From 030497be18cfb4dfae6494ada0c202f6c7c0f5c0 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 24 Dec 2023 17:08:29 +0100 Subject: [PATCH 4357/5754] package/gdb: remove support for GDB 11.x After adding GDB 14.x and making GDB 13.x the new default, let's drop support for GDB 11.x. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- .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/11.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 ------------ .../11.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 | 6 -- 12 files changed, 6 insertions(+), 463 deletions(-) delete mode 100644 package/gdb/11.2/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch delete mode 100644 package/gdb/11.2/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch delete mode 100644 package/gdb/11.2/0003-use-asm-sgidefs.h.patch delete mode 100644 package/gdb/11.2/0004-gdbserver-fix-build-for-m68k.patch delete mode 100644 package/gdb/11.2/0005-nat-fork-inferior-include-linux-ptrace.h.patch delete mode 100644 package/gdb/11.2/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch delete mode 100644 package/gdb/11.2/0007-fix-musl-build-on-riscv.patch delete mode 100644 package/gdb/11.2/0008-gdbserver-Makefile.in-fix-NLS-build.patch delete mode 100644 package/gdb/11.2/0009-gdb-Fix-native-build-on-xtensa.patch diff --git a/.checkpackageignore b/.checkpackageignore index 5aae566ba9..599abafd2f 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -458,15 +458,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/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 diff --git a/Config.in.legacy b/Config.in.legacy index b9089250c8..f06fc851c4 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2024.02" +config BR2_GDB_VERSION_11 + bool "gdb 11.x removed" + select BR2_LEGACY + help + GDB 11.x has been removed, use a newer version. + config BR2_PACKAGE_LIBMPD bool "libmpd package was removed" select BR2_LEGACY diff --git a/package/gdb/11.2/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch b/package/gdb/11.2/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch deleted file mode 100644 index 9369a14d2c..0000000000 --- a/package/gdb/11.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/11.2/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch b/package/gdb/11.2/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch deleted file mode 100644 index 2f96d29820..0000000000 --- a/package/gdb/11.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/11.2/0003-use-asm-sgidefs.h.patch b/package/gdb/11.2/0003-use-asm-sgidefs.h.patch deleted file mode 100644 index e04ebd1dd5..0000000000 --- a/package/gdb/11.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/11.2/0004-gdbserver-fix-build-for-m68k.patch b/package/gdb/11.2/0004-gdbserver-fix-build-for-m68k.patch deleted file mode 100644 index 846f7ed293..0000000000 --- a/package/gdb/11.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/11.2/0005-nat-fork-inferior-include-linux-ptrace.h.patch b/package/gdb/11.2/0005-nat-fork-inferior-include-linux-ptrace.h.patch deleted file mode 100644 index 33dce4d940..0000000000 --- a/package/gdb/11.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/11.2/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch b/package/gdb/11.2/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch deleted file mode 100644 index b02d63fc0c..0000000000 --- a/package/gdb/11.2/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 879008ef9a48aa1363671f5c1736b49f30c5a379 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 41212fb..0ad3f96 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/11.2/0007-fix-musl-build-on-riscv.patch b/package/gdb/11.2/0007-fix-musl-build-on-riscv.patch deleted file mode 100644 index 34ab08a97a..0000000000 --- a/package/gdb/11.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/11.2/0008-gdbserver-Makefile.in-fix-NLS-build.patch b/package/gdb/11.2/0008-gdbserver-Makefile.in-fix-NLS-build.patch deleted file mode 100644 index 903dc61df8..0000000000 --- a/package/gdb/11.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} - $(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.33.0 - diff --git a/package/gdb/11.2/0009-gdb-Fix-native-build-on-xtensa.patch b/package/gdb/11.2/0009-gdb-Fix-native-build-on-xtensa.patch deleted file mode 100644 index bf4d617fc1..0000000000 --- a/package/gdb/11.2/0009-gdb-Fix-native-build-on-xtensa.patch +++ /dev/null @@ -1,57 +0,0 @@ -From d3bb361eb0b6cbf0257f515f9d5e64add89e6bfa 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 ec33f4a10f2..73f35eac683 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.host b/package/gdb/Config.in.host index 0c6f75a3eb..da35fd94f7 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_11 - bool "gdb 11.x" - # gdbserver support missing - depends on !BR2_or1k - config BR2_GDB_VERSION_12 bool "gdb 12.x" @@ -68,7 +63,6 @@ endif config BR2_GDB_VERSION string default "arc-2020.09-release-gdb" if BR2_arc - default "11.2" if BR2_GDB_VERSION_11 default "12.1" if BR2_GDB_VERSION_12 default "13.2" if BR2_GDB_VERSION_13 || !BR2_PACKAGE_HOST_GDB # When making 14.x the default, or 14.x becomes the oldest version, From b45c2a048d02a0e30da8534b5c048d048b252452 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 26 Dec 2023 14:42:48 +0100 Subject: [PATCH 4358/5754] package/libsoup: fix build with libxml2 2.12 This commit adds a libsoup patch that fixes the build with libxml2 2.12, only due to a missing header inclusion. The patch cannot be submitted upstream as libsoup2 is unmaintained, and libsoup3 no longer has the problematic XMLRPC code. Fixes: http://autobuild.buildroot.net/results/4c3152720d64b204101e1611442e535b14adc41c/ Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- ...rpc-soup-xmlrpc-old-add-missing-libx.patch | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 package/libsoup/0002-libsoup-soup-xmlrpc-soup-xmlrpc-old-add-missing-libx.patch diff --git a/package/libsoup/0002-libsoup-soup-xmlrpc-soup-xmlrpc-old-add-missing-libx.patch b/package/libsoup/0002-libsoup-soup-xmlrpc-soup-xmlrpc-old-add-missing-libx.patch new file mode 100644 index 0000000000..cceff2d2ba --- /dev/null +++ b/package/libsoup/0002-libsoup-soup-xmlrpc-soup-xmlrpc-old-add-missing-libx.patch @@ -0,0 +1,47 @@ +From 8a21b58b45edbf11d9041f884bb9c42e6440104c Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Tue, 26 Dec 2023 14:38:58 +0100 +Subject: [PATCH] libsoup/{soup-xmlrpc,soup-xmlrpc-old}: add missing + include + +Since libxml2 2.12.1, including is needed to get the +prototype of xmlParseMemory(), causing a build breakage of libsoup +with a recent version of libxml2. + +Upstream: Not Applicable +[libsoup2 is not maintained upstream, and libsoup3 no longer contains +the XMLRPC code. We are keepin libsoup2 in Buildroot for compatibility +with packages that haven't moved to libsoup3 yet.] +Signed-off-by: Thomas Petazzoni +--- + libsoup/soup-xmlrpc-old.c | 1 + + libsoup/soup-xmlrpc.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/libsoup/soup-xmlrpc-old.c b/libsoup/soup-xmlrpc-old.c +index c57086b6..dd51de53 100644 +--- a/libsoup/soup-xmlrpc-old.c ++++ b/libsoup/soup-xmlrpc-old.c +@@ -12,6 +12,7 @@ + #include + + #include ++#include + + #include "soup-xmlrpc-old.h" + #include "soup.h" +diff --git a/libsoup/soup-xmlrpc.c b/libsoup/soup-xmlrpc.c +index 42dcda9c..b0132d26 100644 +--- a/libsoup/soup-xmlrpc.c ++++ b/libsoup/soup-xmlrpc.c +@@ -18,6 +18,7 @@ + #include + #include + #include ++#include + #include "soup-xmlrpc.h" + #include "soup.h" + +-- +2.43.0 + From bf7a1f10ddb1f9c327f110dc745762af30310828 Mon Sep 17 00:00:00 2001 From: Sebastian Bauer Date: Wed, 27 Dec 2023 19:24:27 +0100 Subject: [PATCH 4359/5754] Revert "package/libcamera-apps: bump to version 1.3.0" This reverts commit c9645fd29bf38b5a960aed3eeac36975d64a400a. Building libcamera-apps 1.3.0 with current libcamera 0.1.0 fails because some of the symbols like controls::AeFlickerMode are not recognized. According to my research, they have been introduced after libcamera 0.1.0 but there is no release version of libcamera newer than 0.1.0 available to which we could bump. Signed-off-by: Sebastian Bauer Signed-off-by: Yann E. MORIN --- 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 281aab88be..1437a0e8fa 100644 --- a/package/libcamera-apps/libcamera-apps.hash +++ b/package/libcamera-apps/libcamera-apps.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 92ff51e2aa4cd7165a8f5131df57cb0967a259bc74e4a47d7fb9dcfd65e45e25 libcamera-apps-1.3.0.tar.gz +sha256 e6b74a0ba10a962f1930199d7dd828c8d9ee370dfe1fdfd8ae2638df744f1344 libcamera-apps-1.2.1.tar.gz sha256 36dfed86bdef661a0a14ec1a1cc84c771d5a06b6f9b92e9ebb610ba711bd528a license.txt diff --git a/package/libcamera-apps/libcamera-apps.mk b/package/libcamera-apps/libcamera-apps.mk index d60e58e7e4..2a217f095f 100644 --- a/package/libcamera-apps/libcamera-apps.mk +++ b/package/libcamera-apps/libcamera-apps.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCAMERA_APPS_VERSION = 1.3.0 +LIBCAMERA_APPS_VERSION = 1.2.1 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 782d268abadc2541953d1782d79d142a7b6f07b1 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Thu, 9 Nov 2023 22:28:58 +0100 Subject: [PATCH 4360/5754] package/libcamera: pipeline option 'raspberrypi' changed to 'rpi/vc4' With upstram commit [1] (since version v0.1.0) the pipeline option 'raspberrypi' was renamed to 'rpi/vc4'. Change the buildroot option name from BR2_PACKAGE_LIBCAMERA_PIPELINE_RASPBERRYPI to BR2_PACKAGE_LIBCAMERA_PIPELINE_RPI_VC4 (and add Config.in.legacy entry accordingly) and move handling in Config.in/libcamer.mk to follow alphabetic ordering. Fixes: .../build/libcamera-v0.1.0/meson.build:3:0: ERROR: Options "raspberrypi" are not in allowed choices: "all, auto, imx8-isi, ipu3, rkisp1, rpi/vc4, simple, uvcvideo, vimc" [1] https://git.libcamera.org/libcamera/libcamera.git/commit/?id=726e9274ea95fa46352556d340c5793a8da51fcd Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- Config.in.legacy | 10 ++++++++++ package/libcamera/Config.in | 16 ++++++++-------- package/libcamera/libcamera.mk | 6 +++--- 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index f06fc851c4..bca483215f 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,16 @@ endif comment "Legacy options removed in 2024.02" +config BR2_PACKAGE_LIBCAMERA_PIPELINE_RASPBERRYPI + bool "libcamera pipeline 'raspberrypi' was renamed to 'rpi/vc4'" + depends on BR2_arm || BR2_aarch64 + depends on BR2_USE_WCHAR + select BR2_LEGACY + select BR2_PACKAGE_LIBCAMERA_PIPELINE_RPI_VC4 + help + Since version ... the libcamera pipeline option 'raspberrypi' was + renamed to 'rpi/vc4'. + config BR2_GDB_VERSION_11 bool "gdb 11.x removed" select BR2_LEGACY diff --git a/package/libcamera/Config.in b/package/libcamera/Config.in index 63c06173db..65d5fb37f8 100644 --- a/package/libcamera/Config.in +++ b/package/libcamera/Config.in @@ -40,21 +40,21 @@ config BR2_PACKAGE_LIBCAMERA_PIPELINE_IPU3 help Pipeline for Intel IPU3. -config BR2_PACKAGE_LIBCAMERA_PIPELINE_RASPBERRYPI - bool "raspberrypi pipeline" +config BR2_PACKAGE_LIBCAMERA_PIPELINE_RKISP1 + bool "rkisp1 pipeline" depends on BR2_arm || BR2_aarch64 - depends on BR2_USE_WCHAR # boost (already enforced for gnutls) - select BR2_PACKAGE_BOOST select BR2_PACKAGE_LIBCAMERA_HAS_PIPELINE help - Pipeline for Raspberry Pi devices. + Pipeline for Rockchip ISP1. -config BR2_PACKAGE_LIBCAMERA_PIPELINE_RKISP1 - bool "rkisp1 pipeline" +config BR2_PACKAGE_LIBCAMERA_PIPELINE_RPI_VC4 + bool "rpi/vc4 pipeline" depends on BR2_arm || BR2_aarch64 + depends on BR2_USE_WCHAR # boost (already enforced for gnutls) + select BR2_PACKAGE_BOOST select BR2_PACKAGE_LIBCAMERA_HAS_PIPELINE help - Pipeline for Rockchip ISP1. + Pipeline for Raspberry Pi devices. config BR2_PACKAGE_LIBCAMERA_PIPELINE_SIMPLE bool "simple pipeline" diff --git a/package/libcamera/libcamera.mk b/package/libcamera/libcamera.mk index 8dce67f60f..c1c8bb7b33 100644 --- a/package/libcamera/libcamera.mk +++ b/package/libcamera/libcamera.mk @@ -51,11 +51,11 @@ LIBCAMERA_CONF_OPTS += -Dv4l2=false endif LIBCAMERA_PIPELINES-$(BR2_PACKAGE_LIBCAMERA_PIPELINE_IPU3) += ipu3 -ifeq ($(BR2_PACKAGE_LIBCAMERA_PIPELINE_RASPBERRYPI),y) -LIBCAMERA_PIPELINES-y += raspberrypi +LIBCAMERA_PIPELINES-$(BR2_PACKAGE_LIBCAMERA_PIPELINE_RKISP1) += rkisp1 +ifeq ($(BR2_PACKAGE_LIBCAMERA_PIPELINE_RPI_VC4),y) +LIBCAMERA_PIPELINES-y += rpi/vc4 LIBCAMERA_DEPENDENCIES += boost endif -LIBCAMERA_PIPELINES-$(BR2_PACKAGE_LIBCAMERA_PIPELINE_RKISP1) += rkisp1 LIBCAMERA_PIPELINES-$(BR2_PACKAGE_LIBCAMERA_PIPELINE_SIMPLE) += simple LIBCAMERA_PIPELINES-$(BR2_PACKAGE_LIBCAMERA_PIPELINE_UVCVIDEO) += uvcvideo LIBCAMERA_PIPELINES-$(BR2_PACKAGE_LIBCAMERA_PIPELINE_VIMC) += vimc From f29c5b57f97bc329b9f20bba66460c4d9aa8cc35 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 27 Dec 2023 23:18:04 +0100 Subject: [PATCH 4361/5754] Config.in.legacy: fix check-package errors Signed-off-by: Yann E. MORIN --- Config.in.legacy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Config.in.legacy b/Config.in.legacy index bca483215f..46ae84997e 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -153,7 +153,7 @@ config BR2_PACKAGE_LIBCAMERA_PIPELINE_RASPBERRYPI select BR2_LEGACY select BR2_PACKAGE_LIBCAMERA_PIPELINE_RPI_VC4 help - Since version ... the libcamera pipeline option 'raspberrypi' was + Since version 0.1.0, the pipeline option 'raspberrypi' was renamed to 'rpi/vc4'. config BR2_GDB_VERSION_11 From 09e61e40d27daaabd41ad180eca144dd498ec75d Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Thu, 9 Nov 2023 22:28:59 +0100 Subject: [PATCH 4362/5754] package/libcamera: disable python bindings Disable python binding option (introduced with upstream commit [1] since version v0.0.1). [1] https://git.libcamera.org/libcamera/libcamera.git/commit/?id=8aa02271fd716ed046970a0b1f89176963303f50 Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/libcamera/libcamera.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libcamera/libcamera.mk b/package/libcamera/libcamera.mk index c1c8bb7b33..8b33b9e708 100644 --- a/package/libcamera/libcamera.mk +++ b/package/libcamera/libcamera.mk @@ -19,6 +19,7 @@ LIBCAMERA_CONF_OPTS = \ -Dandroid=disabled \ -Ddocumentation=disabled \ -Dtest=false \ + -Dpycamera=disabled \ -Dwerror=false LIBCAMERA_INSTALL_STAGING = YES LIBCAMERA_LICENSE = \ From 5020985e392907c05a66ab7d12b0406fd74ab023 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Thu, 9 Nov 2023 22:29:00 +0100 Subject: [PATCH 4363/5754] package/libcamera: use udev configure option Use the udev configure option introduced with upstream commit [1] (since version v0.1.0). [1] https://git.libcamera.org/libcamera/libcamera.git/commit/?id=d314d3b98b86dec9a25ce7b829e72a790b7ead1b Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/libcamera/libcamera.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/libcamera/libcamera.mk b/package/libcamera/libcamera.mk index 8b33b9e708..dd31d90e98 100644 --- a/package/libcamera/libcamera.mk +++ b/package/libcamera/libcamera.mk @@ -98,7 +98,10 @@ LIBCAMERA_DEPENDENCIES += tiff endif ifeq ($(BR2_PACKAGE_HAS_UDEV),y) +LIBCAMERA_CONF_OPTS += -Dudev=enabled LIBCAMERA_DEPENDENCIES += udev +else +LIBCAMERA_CONF_OPTS += -Dudev=disabled endif ifeq ($(BR2_PACKAGE_LTTNG_LIBUST),y) From 3438a8869f97ad5051e9270ffebd73ecbbb4190d Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Thu, 9 Nov 2023 22:29:01 +0100 Subject: [PATCH 4364/5754] package/libcamera: add i.MX8 ISI pipeline option Add i.MX8 ISI pipeline option (introduced with upstream commit [1] (since version v0.0.1). [1] https://git.libcamera.org/libcamera/libcamera.git/commit/?id=0ec982d210861cc6aaebb5d6e8f1a755a16c9792 Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/libcamera/Config.in | 7 +++++++ package/libcamera/libcamera.mk | 1 + 2 files changed, 8 insertions(+) diff --git a/package/libcamera/Config.in b/package/libcamera/Config.in index 65d5fb37f8..ccb5281b4b 100644 --- a/package/libcamera/Config.in +++ b/package/libcamera/Config.in @@ -33,6 +33,13 @@ config BR2_PACKAGE_LIBCAMERA_V4L2 config BR2_PACKAGE_LIBCAMERA_HAS_PIPELINE bool +config BR2_PACKAGE_LIBCAMERA_PIPELINE_IMX8_ISI + bool "imx8-isi pipeline" + depends on BR2_arm || BR2_aarch64 + select BR2_PACKAGE_LIBCAMERA_HAS_PIPELINE + help + Pipeline for i.MX8 SoC ISI capture interface. + config BR2_PACKAGE_LIBCAMERA_PIPELINE_IPU3 bool "ipu3 pipeline" depends on BR2_i386 || BR2_x86_64 diff --git a/package/libcamera/libcamera.mk b/package/libcamera/libcamera.mk index dd31d90e98..c9af90f35f 100644 --- a/package/libcamera/libcamera.mk +++ b/package/libcamera/libcamera.mk @@ -51,6 +51,7 @@ else LIBCAMERA_CONF_OPTS += -Dv4l2=false endif +LIBCAMERA_PIPELINES-$(BR2_PACKAGE_LIBCAMERA_PIPELINE_IMX8_ISI) += imx8-isi LIBCAMERA_PIPELINES-$(BR2_PACKAGE_LIBCAMERA_PIPELINE_IPU3) += ipu3 LIBCAMERA_PIPELINES-$(BR2_PACKAGE_LIBCAMERA_PIPELINE_RKISP1) += rkisp1 ifeq ($(BR2_PACKAGE_LIBCAMERA_PIPELINE_RPI_VC4),y) From 2631267648b44b7ca423238c57bf723dbccf6250 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 27 Dec 2023 21:23:32 +0100 Subject: [PATCH 4365/5754] package/gstreamer1: bump to version 1.22.8 Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- 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 7d62d05fec..89cc25674e 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.7.tar.xz.sha256sum -sha256 01e42c6352a06bdfa4456e64b06ab7d98c5c487a25557c761554631cbda64217 gstreamer-1.22.7.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.22.8.tar.xz.sha256sum +sha256 ad4e3db1771139b1db17b1afa7c05db083ae0100bd4da244b71f162dcce41bfc gstreamer-1.22.8.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gstreamer1/gstreamer1.mk b/package/gstreamer1/gstreamer1/gstreamer1.mk index 9ee41392b2..88c528d4b5 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.mk +++ b/package/gstreamer1/gstreamer1/gstreamer1.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_VERSION = 1.22.7 +GSTREAMER1_VERSION = 1.22.8 GSTREAMER1_SOURCE = gstreamer-$(GSTREAMER1_VERSION).tar.xz GSTREAMER1_SITE = https://gstreamer.freedesktop.org/src/gstreamer GSTREAMER1_INSTALL_STAGING = YES From 44820b60218560e310bc8b68628728bda0cc55c5 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 27 Dec 2023 21:23:33 +0100 Subject: [PATCH 4366/5754] package/gst1-plugins-base: bump to version 1.22.8 Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- 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 7c99f47660..c637cf9a7f 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.7.tar.xz.sha256sum -sha256 62519e0d8f969ebf62a9a7996f2d23efdda330217a635f4a32c0bf1c71577468 gst-plugins-base-1.22.7.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.22.8.tar.xz.sha256sum +sha256 eb6792e5c73c6defb9159c36ea6e4b78a2f8af6512678b4bd3b02c8d2d492acf gst-plugins-base-1.22.8.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 0649a09c07..59c5e220ea 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.7 +GST1_PLUGINS_BASE_VERSION = 1.22.8 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 04894475354f5fbe2f301cce2bb20b18cd71eea6 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 27 Dec 2023 21:23:34 +0100 Subject: [PATCH 4367/5754] package/gst1-plugins-good: bump to version 1.22.8 Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- 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 8bc8d5b5a6..b810115bb9 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.7.tar.xz.sha256sum -sha256 b6db0e18e398b52665b7cdce301c34a8750483d5f4fbac1ede9f80b03743cd15 gst-plugins-good-1.22.7.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.22.8.tar.xz.sha256sum +sha256 e305b9f07f52743ca481da0a4e0c76c35efd60adaf1b0694eb3bb021e2137e39 gst-plugins-good-1.22.8.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 d1a0d71dfb..3e7ddbe567 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.7 +GST1_PLUGINS_GOOD_VERSION = 1.22.8 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 7add923aedcd64c310a1c6bb93ad006ca8e7ee54 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 27 Dec 2023 21:23:35 +0100 Subject: [PATCH 4368/5754] package/gst1-plugins-bad: security bump to version 1.22.8 Fixes the following security issue: ZDI-CAN-22300: Heap-based buffer overflow in the AV1 codec parser when handling certain malformed streams before GStreamer 1.22.8 https://gstreamer.freedesktop.org/security/sa-2023-0011.html Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- 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 e6f57393db..bf4abd3c2f 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.7.tar.xz.sha256sum -sha256 c716f8dffa8fac3fb646941af1c6ec72fff05a045131311bf2d049fdc87bce2e gst-plugins-bad-1.22.7.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.22.8.tar.xz.sha256sum +sha256 458783f8236068991e3e296edd671c8eddb8be6fac933c1c2e1503462864ea0f gst-plugins-bad-1.22.8.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 a41fb336a9..ac1328b7e2 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.7 +GST1_PLUGINS_BAD_VERSION = 1.22.8 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 f93be77769f2a4c29e0b4223ed858b2e2d12ba95 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 27 Dec 2023 21:23:36 +0100 Subject: [PATCH 4369/5754] package/gst1-plugins-ugly: bump to version 1.22.8 Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- 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 7faf0fe689..7b85301280 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.7.tar.xz.sha256sum -sha256 520b46bca637189ad86a298ff245b2d89375dbcac8b05d74daea910f81a9e9da gst-plugins-ugly-1.22.7.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.22.8.tar.xz.sha256sum +sha256 0761d96ba508e01c0271881b26828c2bffd7d8afd50872219f088f755b252ca7 gst-plugins-ugly-1.22.8.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 f5df83bed0..90be791e0c 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.7 +GST1_PLUGINS_UGLY_VERSION = 1.22.8 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 32935c020f42cb942d61b8c345f2fc2bee597b44 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 27 Dec 2023 21:23:37 +0100 Subject: [PATCH 4370/5754] package/gst1-devtools: bump to version 1.22.8 Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- 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 e02af776df..823812114b 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.7.tar.xz.sha256sum -sha256 157cf93fb2741cf0c3dea731be3af2ffae703c9f2cd3c0c91b380fbc685eb9f9 gst-devtools-1.22.7.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.22.8.tar.xz.sha256sum +sha256 cd634056fcb16d035b3df5953ec85ae8bd56c68f29920b720ef920ca71ea76a7 gst-devtools-1.22.8.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 cc633bad82..21d7253d91 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.7 +GST1_DEVTOOLS_VERSION = 1.22.8 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 d6c03ac99e10c58b2367d0914e5339ae3106f9ea Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 27 Dec 2023 21:23:38 +0100 Subject: [PATCH 4371/5754] package/gst1-libav: bump to version 1.22.8 Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- 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 3e83e0dddb..7d27929cab 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.7.tar.xz.sha256sum -sha256 1525b917141b895fe5cf618fe8867622b2528278a0286e9f727b5f37317daca1 gst-libav-1.22.7.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.22.8.tar.xz.sha256sum +sha256 be39349bc07ab4cdbd9a5fd6ea9848c601c7560ba5a0577ad5200b83bd424981 gst-libav-1.22.8.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gst1-libav/gst1-libav.mk b/package/gstreamer1/gst1-libav/gst1-libav.mk index 88b55cd5c9..5017cda01a 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.7 +GST1_LIBAV_VERSION = 1.22.8 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 bbc3fdea585002d8120a02bc3e29caca7ae48616 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 27 Dec 2023 21:23:39 +0100 Subject: [PATCH 4372/5754] package/gst1-python: bump to version 1.22.8 Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- 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 dfaf785161..5c42a0ca08 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.7.tar.xz.sha256sum -sha256 1ef8df7608012fa469329799c950ec087737a6dabad3003c230658b58c710172 gst-python-1.22.7.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.22.8.tar.xz.sha256sum +sha256 d5cb8f144054a2a110e6672bd512e4b15d5b1b8d9879c192b9723535efb70b8f gst-python-1.22.8.tar.xz sha256 ea3ad127610e5ded2210b3a86a46314f2b3b28e438eccffdae19a4d6fbcdb0c2 COPYING diff --git a/package/gstreamer1/gst1-python/gst1-python.mk b/package/gstreamer1/gst1-python/gst1-python.mk index 66743abe04..df53efaa99 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.7 +GST1_PYTHON_VERSION = 1.22.8 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 d70360eed5a8ac5f9cc6148b9ca80bc9b1550538 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 27 Dec 2023 21:23:40 +0100 Subject: [PATCH 4373/5754] package/gst1-rtsp-server: bump to version 1.22.8 Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- 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 b97125784f..3ddea4e744 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.7.tar.xz.sha256sum -sha256 f7fac001e20ad21e36d18397741c4657c5d43571eb1cc3b49f9a93ae127dc88f gst-rtsp-server-1.22.7.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.22.8.tar.xz.sha256sum +sha256 705177051c229976f171adcd7ab9762ae6bcc4bb77dc308a0bd80a63da6c337f gst-rtsp-server-1.22.8.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 5995e7cc51..13e5a369da 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.7 +GST1_RTSP_SERVER_VERSION = 1.22.8 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 7289bdb4759455dcda49577c04086c3aa6e35327 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 27 Dec 2023 21:23:41 +0100 Subject: [PATCH 4374/5754] package/gst1-vaapi: bump to version 1.22.8 Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- 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 5ccd69c7aa..9a7b7df520 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.7.tar.xz.sha256sum -sha256 0e9fff768b89de6d318b34146e4e781d82b9a0f4025dc541b2c8349c7bcb7f67 gstreamer-vaapi-1.22.7.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.22.8.tar.xz.sha256sum +sha256 1298ba347a70c42b88cdebf91b659fea02b1bb7269eabf8e29e3c0bd58278928 gstreamer-vaapi-1.22.8.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 9eea474e88..0a2f35c8ce 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.7 +GST1_VAAPI_VERSION = 1.22.8 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 574a11910171ecd9a44f5cfc9984db3c462034fa Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 27 Dec 2023 21:23:42 +0100 Subject: [PATCH 4375/5754] package/gst-omx: bump to version 1.22.8 Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- 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 dc9b369ca0..528ebb99c2 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.7.tar.xz.sha256sum -sha256 d7a18ec47d40a472bd5cba2015e0be72b732f1699895398cec5cd8e6a3a53b44 gst-omx-1.22.7.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.22.8.tar.xz.sha256sum +sha256 94df10e7713618f0c8a4223f6e047f2d8f0ccecba1d585618e791f13037762df gst-omx-1.22.8.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gstreamer1/gst-omx/gst-omx.mk b/package/gstreamer1/gst-omx/gst-omx.mk index 6c27989ec6..472f929189 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.7 +GST_OMX_VERSION = 1.22.8 GST_OMX_SOURCE = gst-omx-$(GST_OMX_VERSION).tar.xz GST_OMX_SITE = https://gstreamer.freedesktop.org/src/gst-omx From 5dbff1a92f7597fd562b24dce5351460350c292f Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 27 Dec 2023 21:23:43 +0100 Subject: [PATCH 4376/5754] package/gstreamer1-editing-services: bump to version 1.22.8 Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- .../gstreamer1-editing-services.hash | 4 ++-- .../gstreamer1-editing-services.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash index c23da20962..70f7e574e3 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.7.tar.xz.sha256sum -sha256 fec56a2c37a253cd048d288d4c7eda6eff191022b09db975e07a2c105d1b521e gst-editing-services-1.22.7.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.22.8.tar.xz.sha256sum +sha256 d1d5e75e190eb0be3fd49409e41a3aa8e68cfb4deaa7353488554674956cd1df gst-editing-services-1.22.8.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 22fa9ea188..1d59e8ffde 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.7 +GSTREAMER1_EDITING_SERVICES_VERSION = 1.22.8 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 5b0c02a77ac13489a625db7b60a204a64cfc37cb Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 27 Dec 2023 18:07:58 +0100 Subject: [PATCH 4377/5754] Config.in: rework BR2_DOWNLOAD_FORCE_CHECK_HASHES BR2_DOWNLOAD_FORCE_CHECK_HASHES currently has the following dependency: depends on BR2_GLOBAL_PATCH_DIR != "" However, strictly speaking checking all hashes does not necessarily require using BR2_GLOBAL_PATCH_DIR, as long as you don't use custom versions. But more importantly: - Having this dependency means that this options is hidden when people don't use BR2_GLOBAL_PATCH_DIR. Instead the option should always be made visible, encouraging people to turn it on. - The Config.in comment was there to mitigate this previous argument, but this comment then shows up all the time when you have an empty global patch dir. This seems over-complicated, and it sounds much easier to have the option unconditionally available, and visible, and clarify in its help text that in order to this to work fully with custom package versions, BR2_GLOBAL_PATCH_DIR can be used to provide extra hash files. Signed-off-by: Thomas Petazzoni [yann.morin.1998@free.fr: - fix typo noticed by Peter K. - reword kast sentence after review by Peter K. ] Signed-off-by: Yann E. MORIN --- Config.in | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/Config.in b/Config.in index 554b4062eb..7b6ea801e7 100644 --- a/Config.in +++ b/Config.in @@ -711,20 +711,18 @@ config BR2_FORCE_HOST_BUILD config BR2_DOWNLOAD_FORCE_CHECK_HASHES bool "Force all downloads to have a valid hash" - depends on BR2_GLOBAL_PATCH_DIR != "" help - For packages where a custom version or location can be set, - Buildroot does not carry a hash for those custom versions or - locations, so the integrity of such downloads is not verified. - Say 'y' here to enforce downloads to have at least one valid hash (and of course, that all hashes be valid). - Those hashes are looked in files in BR2_GLOBAL_PATCH_DIR, - see above. + By default, Buildroot checks hashes of all packages + downloaded, except those for which a custom version is + used. -comment "Forcing all downloads to have a valid hash needs a global patch and hash directory" - depends on BR2_GLOBAL_PATCH_DIR = "" + With this option turned on, Buildroot will check hashes of + all packages, including those that use a custom version. In + order to provide hashes for such packages, place additional + hash files in BR2_GLOBAL_PATCH_DIR directories. config BR2_REPRODUCIBLE bool "Make the build reproducible (experimental)" From e29fcde4ba70ce2259824b3b7dd807b2195baefa Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 24 Aug 2023 23:08:00 +0200 Subject: [PATCH 4378/5754] package/qt6base: remove $(TARGET_DIR)/usr/mkspecs in target-finalize qt6base installs things in /usr/mkspecs, but also the soon to be added qt6core5compat, and the existing package qwt as well. So let's move the removal of /usr/mkspecs in target-finalize, where we already remove lots of development-related directories, using a target-finalize hook in the qt6base package. Signed-off-by: Thomas Petazzoni [yann.morin.1998@free.fr: make it a qt6base target-finalize hook] Signed-off-by: Yann E. MORIN --- package/qt6/qt6base/qt6base.mk | 5 +++++ package/qwt/qwt.mk | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index c32089f551..67c705fb93 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -366,5 +366,10 @@ else QT6BASE_CONF_OPTS += -DFEATURE_zstd=OFF endif +define QT6BASE_RM_USR_MKSPECS + $(Q)rm -rf $(TARGET_DIR)/usr/mkspecs +endef +QT6BASE_TARGET_FINALIZE_HOOKS += QT6BASE_RM_USR_MKSPECS + $(eval $(cmake-package)) $(eval $(host-cmake-package)) diff --git a/package/qwt/qwt.mk b/package/qwt/qwt.mk index 9f0b78655f..f344ca4e3a 100644 --- a/package/qwt/qwt.mk +++ b/package/qwt/qwt.mk @@ -58,7 +58,6 @@ endef define QWT_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install INSTALL_ROOT=$(TARGET_DIR) - rm -Rf $(TARGET_DIR)/usr/mkspecs endef $(eval $(qmake-package)) From b678091a1c68327d086b6534a27224763db23006 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 2 Sep 2023 15:33:46 +0200 Subject: [PATCH 4379/5754] package/pkg-qmake.mk: drop host-perl dependency Since commit 5770a645a3a49a3f0f02972131a4ff5283b4c11e ("package/qt5: bump packages to latest kde submodule versions"), the QT_HEADERS_SYNC_HOOK hook no longer calls the syncqt.pl script, so host-perl is no longer needed as a dependency of running this hook (and as a dependency of building Qt). Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- package/pkg-qmake.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/pkg-qmake.mk b/package/pkg-qmake.mk index fdaddf08df..ccf78692e8 100644 --- a/package/pkg-qmake.mk +++ b/package/pkg-qmake.mk @@ -50,7 +50,6 @@ $(2)_DEPENDENCIES += qt5base endif ifeq ($$($(2)_SYNC_QT_HEADERS),YES) -$(2)_DEPENDENCIES += host-perl $(2)_PRE_CONFIGURE_HOOKS += QT_HEADERS_SYNC_HOOK endif From eab17d763c6ca1bf74749e3a793fd044b5e6d457 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 27 Dec 2023 18:13:41 +0100 Subject: [PATCH 4380/5754] arch/Config.in: introduce BR2_ARCH_NEEDS_GCC_AT_LEAST_14 Since commit a0d2a5cfec0ade7cb577cbff25aac289e746e61b ("support/scripts/gen-bootlin-toolchains: generate BR2_ARCH_NEEDS_GCC_AT_LEAST_X guard"), the gen-bootlin-toolchains script will generate references to BR2_ARCH_NEEDS_GCC_AT_LEAST_X including potentially against the "next" version of gcc. Indeed, a toolchain using gcc 13.x should have a "depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14" so that once some architectures that require gcc 14.x are added, such toolchains are not made visible. In order for this to work, we must have the BR2_ARCH_NEEDS_GCC_AT_LEAST_x symbol ready for the N+1 version of gcc compared to the latest one we support. As we're supporting up to gcc 13.x right now, let's introduce the symbol BR2_ARCH_NEEDS_GCC_AT_LEAST_14 so that gcc 13.x toolchains can be marked depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14. The other alternative would be to make the gen-bootlin-toolchains a bit smarter, and not emit this depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 if BR2_ARCH_NEEDS_GCC_AT_LEAST_14 does not exist. But this would require re-running the script when BR2_ARCH_NEEDS_GCC_AT_LEAST_14 which we are unlikely to do. While today, when the script is invoked, the usual check-symbols complains and reminds us that BR2_ARCH_NEEDS_GCC_AT_LEAST_14 should be added, so we remember to do it right away. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- arch/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/Config.in b/arch/Config.in index e37f4dab1d..9912f9fce6 100644 --- a/arch/Config.in +++ b/arch/Config.in @@ -313,6 +313,10 @@ config BR2_ARCH_NEEDS_GCC_AT_LEAST_13 bool select BR2_ARCH_NEEDS_GCC_AT_LEAST_12 +config BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + bool + select BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + # The following string values are defined by the individual # Config.in.$ARCH files config BR2_ARCH From 7e0e6e3b8618ab942f25b11ee72fbc5a4deefdf1 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 27 Dec 2023 18:13:42 +0100 Subject: [PATCH 4381/5754] toolchain/toolchain-external/toolchain-external-bootlin: update to 2023.11-1 New toolchains have been released, with the following changes: - The bleeding-edge toolchains are based on gcc 13.2, binutils 2.41, gdb 14.1, kernel headers 5.10, glibc 2.38, musl 1.2.4 or uclibc-ng 1.0.45. - The stable toolchains are based on gcc 12.3, binutils 2.40, gdb 13.2, kernel headers 4.14, glibc 2.38, musl 1.2.4 or uclibc-ng 1.0.45. - The glibc version is no longer affected by CVE-2023-4911 - The gdb build has been fixed to no longer rely on uninstalled libbfd.so and libopcodes.so libraries - The zlib library, which was incorrectly present in the toolchain sysroot, is gone, fixing various build failures encountered with 2023.08 toolchains. - There are now toolchains for m68k 68xxx based on uclibc and musl in addition to glibc, which was already supported The careful reviewer will notice that a number of depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 are being added to the toolchains that use gcc 13.x, as per a0d2a5cfec0ade7cb577cbff25aac289e746e61b ("support/scripts/gen-bootlin-toolchains: generate BR2_ARCH_NEEDS_GCC_AT_LEAST_X guard"). All 214 test cases were successfully run: https://gitlab.com/tpetazzoni/buildroot/-/pipelines/1120323562 Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- .../tests/toolchain/test_external_bootlin.py | 60 ++ .../Config.in.options | 618 ++++++++----- .../toolchain-external-bootlin.hash | 836 +++++++++--------- .../toolchain-external-bootlin.mk | 438 ++++----- 4 files changed, 1124 insertions(+), 828 deletions(-) diff --git a/support/testing/tests/toolchain/test_external_bootlin.py b/support/testing/tests/toolchain/test_external_bootlin.py index fb82a0a377..02090755fd 100644 --- a/support/testing/tests/toolchain/test_external_bootlin.py +++ b/support/testing/tests/toolchain/test_external_bootlin.py @@ -675,6 +675,66 @@ def test_run(self): TestExternalToolchain.common_check(self) +class TestExternalToolchainBootlinM68k68xxxGlibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_m68k=y + BR2_m68k_68040=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_GLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "m68k-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinM68k68xxxGlibcStable(TestExternalToolchain): + config = """ + BR2_m68k=y + BR2_m68k_68040=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_GLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "m68k-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinM68k68xxxMuslBleedingEdge(TestExternalToolchain): + config = """ + BR2_m68k=y + BR2_m68k_68040=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_MUSL_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "m68k-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinM68k68xxxMuslStable(TestExternalToolchain): + config = """ + BR2_m68k=y + BR2_m68k_68040=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_MUSL_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "m68k-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + class TestExternalToolchainBootlinM68k68xxxUclibcBleedingEdge(TestExternalToolchain): config = """ BR2_m68k=y diff --git a/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options b/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options index eb6ed5a865..37daa731f2 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options @@ -58,8 +58,9 @@ config BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL choice prompt "Bootlin toolchain variant" config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_BLEEDING_EDGE - bool "aarch64 glibc bleeding-edge 2023.08-1" + bool "aarch64 glibc bleeding-edge 2023.11-1" depends on BR2_aarch64 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 @@ -82,7 +83,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE - bool "aarch64 glibc stable 2023.08-1" + bool "aarch64 glibc stable 2023.11-1" depends on BR2_aarch64 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU @@ -107,8 +108,9 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_MUSL_BLEEDING_EDGE - bool "aarch64 musl bleeding-edge 2023.08-1" + bool "aarch64 musl bleeding-edge 2023.11-1" depends on BR2_aarch64 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 @@ -131,7 +133,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_MUSL_STABLE - bool "aarch64 musl stable 2023.08-1" + bool "aarch64 musl stable 2023.11-1" depends on BR2_aarch64 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU @@ -155,8 +157,9 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_UCLIBC_BLEEDING_EDGE - bool "aarch64 uclibc bleeding-edge 2023.08-1" + bool "aarch64 uclibc bleeding-edge 2023.11-1" depends on BR2_aarch64 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 select BR2_USE_WCHAR @@ -179,7 +182,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_UCLIBC_STABLE - bool "aarch64 uclibc stable 2023.08-1" + bool "aarch64 uclibc stable 2023.11-1" depends on BR2_aarch64 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_GCC_AT_LEAST_12 @@ -204,8 +207,9 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_GLIBC_BLEEDING_EDGE - bool "aarch64be glibc bleeding-edge 2023.08-1" + bool "aarch64be glibc bleeding-edge 2023.11-1" depends on BR2_aarch64_be + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 @@ -228,7 +232,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_GLIBC_STABLE - bool "aarch64be glibc stable 2023.08-1" + bool "aarch64be glibc stable 2023.11-1" depends on BR2_aarch64_be depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU @@ -253,8 +257,9 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_MUSL_BLEEDING_EDGE - bool "aarch64be musl bleeding-edge 2023.08-1" + bool "aarch64be musl bleeding-edge 2023.11-1" depends on BR2_aarch64_be + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 @@ -277,7 +282,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_MUSL_STABLE - bool "aarch64be musl stable 2023.08-1" + bool "aarch64be musl stable 2023.11-1" depends on BR2_aarch64_be depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU @@ -301,8 +306,9 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_UCLIBC_BLEEDING_EDGE - bool "aarch64be uclibc bleeding-edge 2023.08-1" + bool "aarch64be uclibc bleeding-edge 2023.11-1" depends on BR2_aarch64_be + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 select BR2_USE_WCHAR @@ -325,7 +331,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_UCLIBC_STABLE - bool "aarch64be uclibc stable 2023.08-1" + bool "aarch64be uclibc stable 2023.11-1" depends on BR2_aarch64_be depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_GCC_AT_LEAST_12 @@ -350,9 +356,10 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_750D_UCLIBC_BLEEDING_EDGE - bool "arcle-750d uclibc bleeding-edge 2023.08-1" + bool "arcle-750d uclibc bleeding-edge 2023.11-1" depends on BR2_arcle depends on BR2_arc750d + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 select BR2_USE_WCHAR @@ -374,7 +381,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_750D_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_750D_UCLIBC_STABLE - bool "arcle-750d uclibc stable 2023.08-1" + bool "arcle-750d uclibc stable 2023.11-1" depends on BR2_arcle depends on BR2_arc750d depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_11 @@ -399,9 +406,10 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_750D_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_HS38_GLIBC_BLEEDING_EDGE - bool "arcle-hs38 glibc bleeding-edge 2023.08-1" + bool "arcle-hs38 glibc bleeding-edge 2023.11-1" depends on BR2_arcle depends on BR2_archs38 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 @@ -423,7 +431,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_HS38_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_HS38_GLIBC_STABLE - bool "arcle-hs38 glibc stable 2023.08-1" + bool "arcle-hs38 glibc stable 2023.11-1" depends on BR2_arcle depends on BR2_archs38 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_11 @@ -448,9 +456,10 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_HS38_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_HS38_UCLIBC_BLEEDING_EDGE - bool "arcle-hs38 uclibc bleeding-edge 2023.08-1" + bool "arcle-hs38 uclibc bleeding-edge 2023.11-1" depends on BR2_arcle depends on BR2_archs38 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 select BR2_USE_WCHAR @@ -472,7 +481,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_HS38_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_HS38_UCLIBC_STABLE - bool "arcle-hs38 uclibc stable 2023.08-1" + bool "arcle-hs38 uclibc stable 2023.11-1" depends on BR2_arcle depends on BR2_archs38 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_11 @@ -497,10 +506,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_HS38_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_BLEEDING_EDGE - bool "armv5-eabi glibc bleeding-edge 2023.08-1" + bool "armv5-eabi glibc bleeding-edge 2023.11-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV5 depends on BR2_ARM_EABI + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 @@ -523,7 +533,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_STABLE - bool "armv5-eabi glibc stable 2023.08-1" + bool "armv5-eabi glibc stable 2023.11-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV5 depends on BR2_ARM_EABI @@ -550,10 +560,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_MUSL_BLEEDING_EDGE - bool "armv5-eabi musl bleeding-edge 2023.08-1" + bool "armv5-eabi musl bleeding-edge 2023.11-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV5 depends on BR2_ARM_EABI + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 @@ -576,7 +587,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_MUSL_STABLE - bool "armv5-eabi musl stable 2023.08-1" + bool "armv5-eabi musl stable 2023.11-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV5 depends on BR2_ARM_EABI @@ -603,10 +614,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_UCLIBC_BLEEDING_EDGE - bool "armv5-eabi uclibc bleeding-edge 2023.08-1" + bool "armv5-eabi uclibc bleeding-edge 2023.11-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV5 depends on BR2_ARM_EABI + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 select BR2_USE_WCHAR @@ -629,7 +641,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_UCLIBC_STABLE - bool "armv5-eabi uclibc stable 2023.08-1" + bool "armv5-eabi uclibc stable 2023.11-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV5 depends on BR2_ARM_EABI @@ -656,10 +668,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_GLIBC_BLEEDING_EDGE - bool "armv6-eabihf glibc bleeding-edge 2023.08-1" + bool "armv6-eabihf glibc bleeding-edge 2023.11-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV6 depends on BR2_ARM_EABIHF + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 @@ -682,7 +695,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_GLIBC_STABLE - bool "armv6-eabihf glibc stable 2023.08-1" + bool "armv6-eabihf glibc stable 2023.11-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV6 depends on BR2_ARM_EABIHF @@ -709,10 +722,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_MUSL_BLEEDING_EDGE - bool "armv6-eabihf musl bleeding-edge 2023.08-1" + bool "armv6-eabihf musl bleeding-edge 2023.11-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV6 depends on BR2_ARM_EABIHF + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 @@ -735,7 +749,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_MUSL_STABLE - bool "armv6-eabihf musl stable 2023.08-1" + bool "armv6-eabihf musl stable 2023.11-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV6 depends on BR2_ARM_EABIHF @@ -762,10 +776,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_UCLIBC_BLEEDING_EDGE - bool "armv6-eabihf uclibc bleeding-edge 2023.08-1" + bool "armv6-eabihf uclibc bleeding-edge 2023.11-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV6 depends on BR2_ARM_EABIHF + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 select BR2_USE_WCHAR @@ -788,7 +803,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_UCLIBC_STABLE - bool "armv6-eabihf uclibc stable 2023.08-1" + bool "armv6-eabihf uclibc stable 2023.11-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV6 depends on BR2_ARM_EABIHF @@ -815,10 +830,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_BLEEDING_EDGE - bool "armv7-eabihf glibc bleeding-edge 2023.08-1" + bool "armv7-eabihf glibc bleeding-edge 2023.11-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV7A depends on BR2_ARM_EABIHF + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 @@ -841,7 +857,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_STABLE - bool "armv7-eabihf glibc stable 2023.08-1" + bool "armv7-eabihf glibc stable 2023.11-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV7A depends on BR2_ARM_EABIHF @@ -868,10 +884,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_MUSL_BLEEDING_EDGE - bool "armv7-eabihf musl bleeding-edge 2023.08-1" + bool "armv7-eabihf musl bleeding-edge 2023.11-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV7A depends on BR2_ARM_EABIHF + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 @@ -894,7 +911,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_MUSL_STABLE - bool "armv7-eabihf musl stable 2023.08-1" + bool "armv7-eabihf musl stable 2023.11-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV7A depends on BR2_ARM_EABIHF @@ -921,10 +938,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_UCLIBC_BLEEDING_EDGE - bool "armv7-eabihf uclibc bleeding-edge 2023.08-1" + bool "armv7-eabihf uclibc bleeding-edge 2023.11-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV7A depends on BR2_ARM_EABIHF + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 select BR2_USE_WCHAR @@ -947,7 +965,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_UCLIBC_STABLE - bool "armv7-eabihf uclibc stable 2023.08-1" + bool "armv7-eabihf uclibc stable 2023.11-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV7A depends on BR2_ARM_EABIHF @@ -974,10 +992,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_GLIBC_BLEEDING_EDGE - bool "armebv7-eabihf glibc bleeding-edge 2023.08-1" + bool "armebv7-eabihf glibc bleeding-edge 2023.11-1" depends on BR2_armeb depends on BR2_ARM_CPU_ARMV7A depends on BR2_ARM_EABIHF + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 @@ -1000,7 +1019,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_GLIBC_STABLE - bool "armebv7-eabihf glibc stable 2023.08-1" + bool "armebv7-eabihf glibc stable 2023.11-1" depends on BR2_armeb depends on BR2_ARM_CPU_ARMV7A depends on BR2_ARM_EABIHF @@ -1027,10 +1046,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_MUSL_BLEEDING_EDGE - bool "armebv7-eabihf musl bleeding-edge 2023.08-1" + bool "armebv7-eabihf musl bleeding-edge 2023.11-1" depends on BR2_armeb depends on BR2_ARM_CPU_ARMV7A depends on BR2_ARM_EABIHF + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 @@ -1053,7 +1073,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_MUSL_STABLE - bool "armebv7-eabihf musl stable 2023.08-1" + bool "armebv7-eabihf musl stable 2023.11-1" depends on BR2_armeb depends on BR2_ARM_CPU_ARMV7A depends on BR2_ARM_EABIHF @@ -1080,10 +1100,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_UCLIBC_BLEEDING_EDGE - bool "armebv7-eabihf uclibc bleeding-edge 2023.08-1" + bool "armebv7-eabihf uclibc bleeding-edge 2023.11-1" depends on BR2_armeb depends on BR2_ARM_CPU_ARMV7A depends on BR2_ARM_EABIHF + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 select BR2_USE_WCHAR @@ -1106,7 +1127,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_UCLIBC_STABLE - bool "armebv7-eabihf uclibc stable 2023.08-1" + bool "armebv7-eabihf uclibc stable 2023.11-1" depends on BR2_armeb depends on BR2_ARM_CPU_ARMV7A depends on BR2_ARM_EABIHF @@ -1133,9 +1154,10 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7M_UCLIBC_BLEEDING_EDGE - bool "armv7m uclibc bleeding-edge 2023.08-1" + bool "armv7m uclibc bleeding-edge 2023.11-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV7M + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 select BR2_USE_WCHAR @@ -1156,7 +1178,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7M_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7M_UCLIBC_STABLE - bool "armv7m uclibc stable 2023.08-1" + bool "armv7m uclibc stable 2023.11-1" depends on BR2_arm depends on BR2_ARM_CPU_ARMV7M depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 @@ -1179,9 +1201,110 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7M_UCLIBC_STABLE https://toolchains.bootlin.com/ +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_GLIBC_BLEEDING_EDGE + bool "m68k-68xxx glibc bleeding-edge 2023.11-1" + depends on BR2_m68k_m68k + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + help + Bootlin toolchain for the m68k-68xxx architecture, using + the glibc C library. This is a bleeding-edge version, which + means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_GLIBC_STABLE + bool "m68k-68xxx glibc stable 2023.11-1" + depends on BR2_m68k_m68k + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + help + Bootlin toolchain for the m68k-68xxx architecture, using + the glibc C library. This is a stable version, which means + it is using stable and proven versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_MUSL_BLEEDING_EDGE + bool "m68k-68xxx musl bleeding-edge 2023.11-1" + depends on BR2_m68k_m68k + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_MUSL + help + Bootlin toolchain for the m68k-68xxx architecture, using + the musl C library. This is a bleeding-edge version, which + means it is using the latest versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_MUSL_STABLE + bool "m68k-68xxx musl stable 2023.11-1" + depends on BR2_m68k_m68k + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_TOOLCHAIN_EXTERNAL_MUSL + help + Bootlin toolchain for the m68k-68xxx architecture, using + the musl C library. This is a stable version, which means + it is using stable and proven versions of gcc, gdb and + binutils. + + https://toolchains.bootlin.com/ + config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_UCLIBC_BLEEDING_EDGE - bool "m68k-68xxx uclibc bleeding-edge 2023.08-1" + bool "m68k-68xxx uclibc bleeding-edge 2023.11-1" depends on BR2_m68k_m68k + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 select BR2_USE_WCHAR @@ -1204,7 +1327,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_UCLIBC_STABLE - bool "m68k-68xxx uclibc stable 2023.08-1" + bool "m68k-68xxx uclibc stable 2023.11-1" depends on BR2_m68k_m68k depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_GCC_AT_LEAST_12 @@ -1229,8 +1352,9 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_COLDFIRE_UCLIBC_BLEEDING_EDGE - bool "m68k-coldfire uclibc bleeding-edge 2023.08-1" + bool "m68k-coldfire uclibc bleeding-edge 2023.11-1" depends on BR2_m68k_cf + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 select BR2_USE_WCHAR @@ -1251,7 +1375,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_COLDFIRE_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_COLDFIRE_UCLIBC_STABLE - bool "m68k-coldfire uclibc stable 2023.08-1" + bool "m68k-coldfire uclibc stable 2023.11-1" depends on BR2_m68k_cf depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_GCC_AT_LEAST_12 @@ -1274,8 +1398,9 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_COLDFIRE_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_GLIBC_BLEEDING_EDGE - bool "microblazebe glibc bleeding-edge 2023.08-1" + bool "microblazebe glibc bleeding-edge 2023.11-1" depends on BR2_microblazebe + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER select BR2_TOOLCHAIN_GCC_AT_LEAST_13 @@ -1297,7 +1422,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_GLIBC_STABLE - bool "microblazebe glibc stable 2023.08-1" + bool "microblazebe glibc stable 2023.11-1" depends on BR2_microblazebe depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU @@ -1321,8 +1446,9 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_MUSL_BLEEDING_EDGE - bool "microblazebe musl bleeding-edge 2023.08-1" + bool "microblazebe musl bleeding-edge 2023.11-1" depends on BR2_microblazebe + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER select BR2_TOOLCHAIN_GCC_AT_LEAST_13 @@ -1344,7 +1470,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_MUSL_STABLE - bool "microblazebe musl stable 2023.08-1" + bool "microblazebe musl stable 2023.11-1" depends on BR2_microblazebe depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU @@ -1368,8 +1494,9 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_UCLIBC_BLEEDING_EDGE - bool "microblazebe uclibc bleeding-edge 2023.08-1" + bool "microblazebe uclibc bleeding-edge 2023.11-1" depends on BR2_microblazebe + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 @@ -1392,7 +1519,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_UCLIBC_STABLE - bool "microblazebe uclibc stable 2023.08-1" + bool "microblazebe uclibc stable 2023.11-1" depends on BR2_microblazebe depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER @@ -1417,8 +1544,9 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_GLIBC_BLEEDING_EDGE - bool "microblazeel glibc bleeding-edge 2023.08-1" + bool "microblazeel glibc bleeding-edge 2023.11-1" depends on BR2_microblazeel + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER select BR2_TOOLCHAIN_GCC_AT_LEAST_13 @@ -1440,7 +1568,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_GLIBC_STABLE - bool "microblazeel glibc stable 2023.08-1" + bool "microblazeel glibc stable 2023.11-1" depends on BR2_microblazeel depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU @@ -1464,8 +1592,9 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_MUSL_BLEEDING_EDGE - bool "microblazeel musl bleeding-edge 2023.08-1" + bool "microblazeel musl bleeding-edge 2023.11-1" depends on BR2_microblazeel + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER select BR2_TOOLCHAIN_GCC_AT_LEAST_13 @@ -1487,7 +1616,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_MUSL_STABLE - bool "microblazeel musl stable 2023.08-1" + bool "microblazeel musl stable 2023.11-1" depends on BR2_microblazeel depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU @@ -1511,8 +1640,9 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_UCLIBC_BLEEDING_EDGE - bool "microblazeel uclibc bleeding-edge 2023.08-1" + bool "microblazeel uclibc bleeding-edge 2023.11-1" depends on BR2_microblazeel + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 @@ -1535,7 +1665,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_UCLIBC_STABLE - bool "microblazeel uclibc stable 2023.08-1" + bool "microblazeel uclibc stable 2023.11-1" depends on BR2_microblazeel depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER @@ -1560,10 +1690,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_GLIBC_BLEEDING_EDGE - bool "mips32 glibc bleeding-edge 2023.08-1" + bool "mips32 glibc bleeding-edge 2023.11-1" depends on BR2_mips depends on BR2_mips_32 depends on !BR2_MIPS_SOFT_FLOAT + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 @@ -1586,7 +1717,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_GLIBC_STABLE - bool "mips32 glibc stable 2023.08-1" + bool "mips32 glibc stable 2023.11-1" depends on BR2_mips depends on BR2_mips_32 depends on !BR2_MIPS_SOFT_FLOAT @@ -1613,10 +1744,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_MUSL_BLEEDING_EDGE - bool "mips32 musl bleeding-edge 2023.08-1" + bool "mips32 musl bleeding-edge 2023.11-1" depends on BR2_mips depends on BR2_mips_32 depends on !BR2_MIPS_SOFT_FLOAT + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 @@ -1639,7 +1771,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_MUSL_STABLE - bool "mips32 musl stable 2023.08-1" + bool "mips32 musl stable 2023.11-1" depends on BR2_mips depends on BR2_mips_32 depends on !BR2_MIPS_SOFT_FLOAT @@ -1665,10 +1797,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_UCLIBC_BLEEDING_EDGE - bool "mips32 uclibc bleeding-edge 2023.08-1" + bool "mips32 uclibc bleeding-edge 2023.11-1" depends on BR2_mips depends on BR2_mips_32 depends on !BR2_MIPS_SOFT_FLOAT + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 select BR2_USE_WCHAR @@ -1691,7 +1824,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_UCLIBC_STABLE - bool "mips32 uclibc stable 2023.08-1" + bool "mips32 uclibc stable 2023.11-1" depends on BR2_mips depends on BR2_mips_32 depends on !BR2_MIPS_SOFT_FLOAT @@ -1718,10 +1851,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_GLIBC_BLEEDING_EDGE - bool "mips32el glibc bleeding-edge 2023.08-1" + bool "mips32el glibc bleeding-edge 2023.11-1" depends on BR2_mipsel depends on BR2_mips_32 depends on !BR2_MIPS_SOFT_FLOAT + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 @@ -1744,7 +1878,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_GLIBC_STABLE - bool "mips32el glibc stable 2023.08-1" + bool "mips32el glibc stable 2023.11-1" depends on BR2_mipsel depends on BR2_mips_32 depends on !BR2_MIPS_SOFT_FLOAT @@ -1771,10 +1905,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_MUSL_BLEEDING_EDGE - bool "mips32el musl bleeding-edge 2023.08-1" + bool "mips32el musl bleeding-edge 2023.11-1" depends on BR2_mipsel depends on BR2_mips_32 depends on !BR2_MIPS_SOFT_FLOAT + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 @@ -1797,7 +1932,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_MUSL_STABLE - bool "mips32el musl stable 2023.08-1" + bool "mips32el musl stable 2023.11-1" depends on BR2_mipsel depends on BR2_mips_32 depends on !BR2_MIPS_SOFT_FLOAT @@ -1823,10 +1958,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_UCLIBC_BLEEDING_EDGE - bool "mips32el uclibc bleeding-edge 2023.08-1" + bool "mips32el uclibc bleeding-edge 2023.11-1" depends on BR2_mipsel depends on BR2_mips_32 depends on !BR2_MIPS_SOFT_FLOAT + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 select BR2_USE_WCHAR @@ -1849,7 +1985,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_UCLIBC_STABLE - bool "mips32el uclibc stable 2023.08-1" + bool "mips32el uclibc stable 2023.11-1" depends on BR2_mipsel depends on BR2_mips_32 depends on !BR2_MIPS_SOFT_FLOAT @@ -1876,10 +2012,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_GLIBC_BLEEDING_EDGE - bool "mips32r5el glibc bleeding-edge 2023.08-1" + bool "mips32r5el glibc bleeding-edge 2023.11-1" depends on BR2_mipsel depends on BR2_mips_32r5 depends on !BR2_MIPS_SOFT_FLOAT + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 @@ -1902,7 +2039,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_GLIBC_STABLE - bool "mips32r5el glibc stable 2023.08-1" + bool "mips32r5el glibc stable 2023.11-1" depends on BR2_mipsel depends on BR2_mips_32r5 depends on !BR2_MIPS_SOFT_FLOAT @@ -1929,10 +2066,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_MUSL_BLEEDING_EDGE - bool "mips32r5el musl bleeding-edge 2023.08-1" + bool "mips32r5el musl bleeding-edge 2023.11-1" depends on BR2_mipsel depends on BR2_mips_32r5 depends on !BR2_MIPS_SOFT_FLOAT + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 @@ -1955,7 +2093,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_MUSL_STABLE - bool "mips32r5el musl stable 2023.08-1" + bool "mips32r5el musl stable 2023.11-1" depends on BR2_mipsel depends on BR2_mips_32r5 depends on !BR2_MIPS_SOFT_FLOAT @@ -1982,10 +2120,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_UCLIBC_BLEEDING_EDGE - bool "mips32r5el uclibc bleeding-edge 2023.08-1" + bool "mips32r5el uclibc bleeding-edge 2023.11-1" depends on BR2_mipsel depends on BR2_mips_32r5 depends on !BR2_MIPS_SOFT_FLOAT + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 select BR2_USE_WCHAR @@ -2008,7 +2147,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_UCLIBC_STABLE - bool "mips32r5el uclibc stable 2023.08-1" + bool "mips32r5el uclibc stable 2023.11-1" depends on BR2_mipsel depends on BR2_mips_32r5 depends on !BR2_MIPS_SOFT_FLOAT @@ -2035,10 +2174,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_GLIBC_BLEEDING_EDGE - bool "mips32r6el glibc bleeding-edge 2023.08-1" + bool "mips32r6el glibc bleeding-edge 2023.11-1" depends on BR2_mipsel depends on BR2_mips_32r6 depends on !BR2_MIPS_SOFT_FLOAT + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 @@ -2061,7 +2201,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_GLIBC_STABLE - bool "mips32r6el glibc stable 2023.08-1" + bool "mips32r6el glibc stable 2023.11-1" depends on BR2_mipsel depends on BR2_mips_32r6 depends on !BR2_MIPS_SOFT_FLOAT @@ -2088,10 +2228,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_MUSL_BLEEDING_EDGE - bool "mips32r6el musl bleeding-edge 2023.08-1" + bool "mips32r6el musl bleeding-edge 2023.11-1" depends on BR2_mipsel depends on BR2_mips_32r6 depends on !BR2_MIPS_SOFT_FLOAT + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 @@ -2114,7 +2255,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_MUSL_STABLE - bool "mips32r6el musl stable 2023.08-1" + bool "mips32r6el musl stable 2023.11-1" depends on BR2_mipsel depends on BR2_mips_32r6 depends on !BR2_MIPS_SOFT_FLOAT @@ -2141,10 +2282,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_UCLIBC_BLEEDING_EDGE - bool "mips32r6el uclibc bleeding-edge 2023.08-1" + bool "mips32r6el uclibc bleeding-edge 2023.11-1" depends on BR2_mipsel depends on BR2_mips_32r6 depends on !BR2_MIPS_SOFT_FLOAT + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 select BR2_USE_WCHAR @@ -2167,7 +2309,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_UCLIBC_STABLE - bool "mips32r6el uclibc stable 2023.08-1" + bool "mips32r6el uclibc stable 2023.11-1" depends on BR2_mipsel depends on BR2_mips_32r6 depends on !BR2_MIPS_SOFT_FLOAT @@ -2194,11 +2336,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_GLIBC_BLEEDING_EDGE - bool "mips64-n32 glibc bleeding-edge 2023.08-1" + bool "mips64-n32 glibc bleeding-edge 2023.11-1" depends on BR2_mips64 depends on BR2_mips_64 depends on BR2_MIPS_NABI32 depends on !BR2_MIPS_SOFT_FLOAT + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 @@ -2221,7 +2364,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_GLIBC_STABLE - bool "mips64-n32 glibc stable 2023.08-1" + bool "mips64-n32 glibc stable 2023.11-1" depends on BR2_mips64 depends on BR2_mips_64 depends on BR2_MIPS_NABI32 @@ -2249,11 +2392,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_MUSL_BLEEDING_EDGE - bool "mips64-n32 musl bleeding-edge 2023.08-1" + bool "mips64-n32 musl bleeding-edge 2023.11-1" depends on BR2_mips64 depends on BR2_mips_64 depends on BR2_MIPS_NABI32 depends on !BR2_MIPS_SOFT_FLOAT + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 @@ -2276,7 +2420,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_MUSL_STABLE - bool "mips64-n32 musl stable 2023.08-1" + bool "mips64-n32 musl stable 2023.11-1" depends on BR2_mips64 depends on BR2_mips_64 depends on BR2_MIPS_NABI32 @@ -2304,11 +2448,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_UCLIBC_BLEEDING_EDGE - bool "mips64-n32 uclibc bleeding-edge 2023.08-1" + bool "mips64-n32 uclibc bleeding-edge 2023.11-1" depends on BR2_mips64 depends on BR2_mips_64 depends on BR2_MIPS_NABI32 depends on !BR2_MIPS_SOFT_FLOAT + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 select BR2_USE_WCHAR @@ -2331,7 +2476,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_UCLIBC_STABLE - bool "mips64-n32 uclibc stable 2023.08-1" + bool "mips64-n32 uclibc stable 2023.11-1" depends on BR2_mips64 depends on BR2_mips_64 depends on BR2_MIPS_NABI32 @@ -2359,11 +2504,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_GLIBC_BLEEDING_EDGE - bool "mips64el-n32 glibc bleeding-edge 2023.08-1" + bool "mips64el-n32 glibc bleeding-edge 2023.11-1" depends on BR2_mips64el depends on BR2_mips_64 depends on BR2_MIPS_NABI32 depends on !BR2_MIPS_SOFT_FLOAT + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 @@ -2386,7 +2532,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_GLIBC_STABLE - bool "mips64el-n32 glibc stable 2023.08-1" + bool "mips64el-n32 glibc stable 2023.11-1" depends on BR2_mips64el depends on BR2_mips_64 depends on BR2_MIPS_NABI32 @@ -2414,11 +2560,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_MUSL_BLEEDING_EDGE - bool "mips64el-n32 musl bleeding-edge 2023.08-1" + bool "mips64el-n32 musl bleeding-edge 2023.11-1" depends on BR2_mips64el depends on BR2_mips_64 depends on BR2_MIPS_NABI32 depends on !BR2_MIPS_SOFT_FLOAT + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 @@ -2441,7 +2588,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_MUSL_STABLE - bool "mips64el-n32 musl stable 2023.08-1" + bool "mips64el-n32 musl stable 2023.11-1" depends on BR2_mips64el depends on BR2_mips_64 depends on BR2_MIPS_NABI32 @@ -2469,11 +2616,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_UCLIBC_BLEEDING_EDGE - bool "mips64el-n32 uclibc bleeding-edge 2023.08-1" + bool "mips64el-n32 uclibc bleeding-edge 2023.11-1" depends on BR2_mips64el depends on BR2_mips_64 depends on BR2_MIPS_NABI32 depends on !BR2_MIPS_SOFT_FLOAT + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 select BR2_USE_WCHAR @@ -2496,7 +2644,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_UCLIBC_STABLE - bool "mips64el-n32 uclibc stable 2023.08-1" + bool "mips64el-n32 uclibc stable 2023.11-1" depends on BR2_mips64el depends on BR2_mips_64 depends on BR2_MIPS_NABI32 @@ -2524,11 +2672,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_GLIBC_BLEEDING_EDGE - bool "mips64r6el-n32 glibc bleeding-edge 2023.08-1" + bool "mips64r6el-n32 glibc bleeding-edge 2023.11-1" depends on BR2_mips64el depends on BR2_mips_64r6 depends on BR2_MIPS_NABI32 depends on !BR2_MIPS_SOFT_FLOAT + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 @@ -2551,7 +2700,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_GLIBC_STABLE - bool "mips64r6el-n32 glibc stable 2023.08-1" + bool "mips64r6el-n32 glibc stable 2023.11-1" depends on BR2_mips64el depends on BR2_mips_64r6 depends on BR2_MIPS_NABI32 @@ -2579,11 +2728,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_MUSL_BLEEDING_EDGE - bool "mips64r6el-n32 musl bleeding-edge 2023.08-1" + bool "mips64r6el-n32 musl bleeding-edge 2023.11-1" depends on BR2_mips64el depends on BR2_mips_64r6 depends on BR2_MIPS_NABI32 depends on !BR2_MIPS_SOFT_FLOAT + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 @@ -2606,7 +2756,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_MUSL_STABLE - bool "mips64r6el-n32 musl stable 2023.08-1" + bool "mips64r6el-n32 musl stable 2023.11-1" depends on BR2_mips64el depends on BR2_mips_64r6 depends on BR2_MIPS_NABI32 @@ -2634,11 +2784,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_UCLIBC_BLEEDING_EDGE - bool "mips64r6el-n32 uclibc bleeding-edge 2023.08-1" + bool "mips64r6el-n32 uclibc bleeding-edge 2023.11-1" depends on BR2_mips64el depends on BR2_mips_64r6 depends on BR2_MIPS_NABI32 depends on !BR2_MIPS_SOFT_FLOAT + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 select BR2_USE_WCHAR @@ -2661,7 +2812,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_UCLIBC_STABLE - bool "mips64r6el-n32 uclibc stable 2023.08-1" + bool "mips64r6el-n32 uclibc stable 2023.11-1" depends on BR2_mips64el depends on BR2_mips_64r6 depends on BR2_MIPS_NABI32 @@ -2689,8 +2840,9 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_NIOS2_GLIBC_BLEEDING_EDGE - bool "nios2 glibc bleeding-edge 2023.08-1" + bool "nios2 glibc bleeding-edge 2023.11-1" depends on BR2_nios2 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 @@ -2713,7 +2865,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_NIOS2_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_NIOS2_GLIBC_STABLE - bool "nios2 glibc stable 2023.08-1" + bool "nios2 glibc stable 2023.11-1" depends on BR2_nios2 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU @@ -2738,8 +2890,9 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_NIOS2_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_GLIBC_BLEEDING_EDGE - bool "openrisc glibc bleeding-edge 2023.08-1" + bool "openrisc glibc bleeding-edge 2023.11-1" depends on BR2_or1k + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER select BR2_TOOLCHAIN_GCC_AT_LEAST_13 @@ -2763,7 +2916,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_GLIBC_STABLE - bool "openrisc glibc stable 2023.08-1" + bool "openrisc glibc stable 2023.11-1" depends on BR2_or1k depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU @@ -2789,8 +2942,9 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_BLEEDING_EDGE - bool "openrisc musl bleeding-edge 2023.08-1" + bool "openrisc musl bleeding-edge 2023.11-1" depends on BR2_or1k + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER select BR2_TOOLCHAIN_GCC_AT_LEAST_13 @@ -2814,7 +2968,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_STABLE - bool "openrisc musl stable 2023.08-1" + bool "openrisc musl stable 2023.11-1" depends on BR2_or1k depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 depends on BR2_USE_MMU @@ -2839,8 +2993,9 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_BLEEDING_EDGE - bool "openrisc uclibc bleeding-edge 2023.08-1" + bool "openrisc uclibc bleeding-edge 2023.11-1" depends on BR2_or1k + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 @@ -2864,7 +3019,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_STABLE - bool "openrisc uclibc stable 2023.08-1" + bool "openrisc uclibc stable 2023.11-1" depends on BR2_or1k depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER @@ -2890,9 +3045,10 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_GLIBC_BLEEDING_EDGE - bool "powerpc-440fp glibc bleeding-edge 2023.08-1" + bool "powerpc-440fp glibc bleeding-edge 2023.11-1" depends on BR2_powerpc depends on BR2_powerpc_440fp + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 @@ -2915,7 +3071,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_GLIBC_STABLE - bool "powerpc-440fp glibc stable 2023.08-1" + bool "powerpc-440fp glibc stable 2023.11-1" depends on BR2_powerpc depends on BR2_powerpc_440fp depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 @@ -2941,9 +3097,10 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_MUSL_BLEEDING_EDGE - bool "powerpc-440fp musl bleeding-edge 2023.08-1" + bool "powerpc-440fp musl bleeding-edge 2023.11-1" depends on BR2_powerpc depends on BR2_powerpc_440fp + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 @@ -2965,7 +3122,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_MUSL_STABLE - bool "powerpc-440fp musl stable 2023.08-1" + bool "powerpc-440fp musl stable 2023.11-1" depends on BR2_powerpc depends on BR2_powerpc_440fp depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 @@ -2990,9 +3147,10 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_UCLIBC_BLEEDING_EDGE - bool "powerpc-440fp uclibc bleeding-edge 2023.08-1" + bool "powerpc-440fp uclibc bleeding-edge 2023.11-1" depends on BR2_powerpc depends on BR2_powerpc_440fp + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 select BR2_USE_WCHAR @@ -3015,7 +3173,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_UCLIBC_STABLE - bool "powerpc-440fp uclibc stable 2023.08-1" + bool "powerpc-440fp uclibc stable 2023.11-1" depends on BR2_powerpc depends on BR2_powerpc_440fp depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 @@ -3041,9 +3199,10 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_GLIBC_BLEEDING_EDGE - bool "powerpc-e300c3 glibc bleeding-edge 2023.08-1" + bool "powerpc-e300c3 glibc bleeding-edge 2023.11-1" depends on BR2_powerpc depends on BR2_powerpc_e300c3 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 @@ -3066,7 +3225,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_GLIBC_STABLE - bool "powerpc-e300c3 glibc stable 2023.08-1" + bool "powerpc-e300c3 glibc stable 2023.11-1" depends on BR2_powerpc depends on BR2_powerpc_e300c3 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 @@ -3092,9 +3251,10 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_MUSL_BLEEDING_EDGE - bool "powerpc-e300c3 musl bleeding-edge 2023.08-1" + bool "powerpc-e300c3 musl bleeding-edge 2023.11-1" depends on BR2_powerpc depends on BR2_powerpc_e300c3 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 @@ -3116,7 +3276,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_MUSL_STABLE - bool "powerpc-e300c3 musl stable 2023.08-1" + bool "powerpc-e300c3 musl stable 2023.11-1" depends on BR2_powerpc depends on BR2_powerpc_e300c3 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 @@ -3141,9 +3301,10 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_UCLIBC_BLEEDING_EDGE - bool "powerpc-e300c3 uclibc bleeding-edge 2023.08-1" + bool "powerpc-e300c3 uclibc bleeding-edge 2023.11-1" depends on BR2_powerpc depends on BR2_powerpc_e300c3 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 select BR2_USE_WCHAR @@ -3166,7 +3327,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_UCLIBC_STABLE - bool "powerpc-e300c3 uclibc stable 2023.08-1" + bool "powerpc-e300c3 uclibc stable 2023.11-1" depends on BR2_powerpc depends on BR2_powerpc_e300c3 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 @@ -3192,9 +3353,10 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_GLIBC_BLEEDING_EDGE - bool "powerpc-e500mc glibc bleeding-edge 2023.08-1" + bool "powerpc-e500mc glibc bleeding-edge 2023.11-1" depends on BR2_powerpc depends on BR2_powerpc_e500mc + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 @@ -3217,7 +3379,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_GLIBC_STABLE - bool "powerpc-e500mc glibc stable 2023.08-1" + bool "powerpc-e500mc glibc stable 2023.11-1" depends on BR2_powerpc depends on BR2_powerpc_e500mc depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 @@ -3243,9 +3405,10 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_MUSL_BLEEDING_EDGE - bool "powerpc-e500mc musl bleeding-edge 2023.08-1" + bool "powerpc-e500mc musl bleeding-edge 2023.11-1" depends on BR2_powerpc depends on BR2_powerpc_e500mc + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 @@ -3267,7 +3430,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_MUSL_STABLE - bool "powerpc-e500mc musl stable 2023.08-1" + bool "powerpc-e500mc musl stable 2023.11-1" depends on BR2_powerpc depends on BR2_powerpc_e500mc depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 @@ -3292,9 +3455,10 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_UCLIBC_BLEEDING_EDGE - bool "powerpc-e500mc uclibc bleeding-edge 2023.08-1" + bool "powerpc-e500mc uclibc bleeding-edge 2023.11-1" depends on BR2_powerpc depends on BR2_powerpc_e500mc + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 select BR2_USE_WCHAR @@ -3317,7 +3481,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_UCLIBC_STABLE - bool "powerpc-e500mc uclibc stable 2023.08-1" + bool "powerpc-e500mc uclibc stable 2023.11-1" depends on BR2_powerpc depends on BR2_powerpc_e500mc depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 @@ -3343,9 +3507,10 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E5500_GLIBC_BLEEDING_EDGE - bool "powerpc64-e5500 glibc bleeding-edge 2023.08-1" + bool "powerpc64-e5500 glibc bleeding-edge 2023.11-1" depends on BR2_powerpc64 depends on BR2_powerpc_e5500 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 @@ -3368,7 +3533,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E5500_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E5500_GLIBC_STABLE - bool "powerpc64-e5500 glibc stable 2023.08-1" + bool "powerpc64-e5500 glibc stable 2023.11-1" depends on BR2_powerpc64 depends on BR2_powerpc_e5500 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 @@ -3394,9 +3559,10 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E5500_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E6500_GLIBC_BLEEDING_EDGE - bool "powerpc64-e6500 glibc bleeding-edge 2023.08-1" + bool "powerpc64-e6500 glibc bleeding-edge 2023.11-1" depends on BR2_powerpc64 depends on BR2_powerpc_e6500 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 @@ -3419,7 +3585,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E6500_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E6500_GLIBC_STABLE - bool "powerpc64-e6500 glibc stable 2023.08-1" + bool "powerpc64-e6500 glibc stable 2023.11-1" depends on BR2_powerpc64 depends on BR2_powerpc_e6500 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 @@ -3445,9 +3611,10 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E6500_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E6500_MUSL_BLEEDING_EDGE - bool "powerpc64-e6500 musl bleeding-edge 2023.08-1" + bool "powerpc64-e6500 musl bleeding-edge 2023.11-1" depends on BR2_powerpc64 depends on BR2_powerpc_e6500 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 @@ -3470,7 +3637,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E6500_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E6500_MUSL_STABLE - bool "powerpc64-e6500 musl stable 2023.08-1" + bool "powerpc64-e6500 musl stable 2023.11-1" depends on BR2_powerpc64 depends on BR2_powerpc_e6500 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 @@ -3496,9 +3663,10 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E6500_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_POWER8_GLIBC_BLEEDING_EDGE - bool "powerpc64-power8 glibc bleeding-edge 2023.08-1" + bool "powerpc64-power8 glibc bleeding-edge 2023.11-1" depends on BR2_powerpc64 depends on BR2_powerpc_power8 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 @@ -3521,7 +3689,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_POWER8_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_POWER8_GLIBC_STABLE - bool "powerpc64-power8 glibc stable 2023.08-1" + bool "powerpc64-power8 glibc stable 2023.11-1" depends on BR2_powerpc64 depends on BR2_powerpc_power8 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 @@ -3547,9 +3715,10 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_POWER8_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_POWER8_MUSL_BLEEDING_EDGE - bool "powerpc64-power8 musl bleeding-edge 2023.08-1" + bool "powerpc64-power8 musl bleeding-edge 2023.11-1" depends on BR2_powerpc64 depends on BR2_powerpc_power8 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 @@ -3572,7 +3741,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_POWER8_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_POWER8_MUSL_STABLE - bool "powerpc64-power8 musl stable 2023.08-1" + bool "powerpc64-power8 musl stable 2023.11-1" depends on BR2_powerpc64 depends on BR2_powerpc_power8 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 @@ -3598,9 +3767,10 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_POWER8_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_GLIBC_BLEEDING_EDGE - bool "powerpc64le-power8 glibc bleeding-edge 2023.08-1" + bool "powerpc64le-power8 glibc bleeding-edge 2023.11-1" depends on BR2_powerpc64le depends on BR2_powerpc_power8 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 @@ -3623,7 +3793,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_GLIBC_STABLE - bool "powerpc64le-power8 glibc stable 2023.08-1" + bool "powerpc64le-power8 glibc stable 2023.11-1" depends on BR2_powerpc64le depends on BR2_powerpc_power8 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 @@ -3649,9 +3819,10 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_MUSL_BLEEDING_EDGE - bool "powerpc64le-power8 musl bleeding-edge 2023.08-1" + bool "powerpc64le-power8 musl bleeding-edge 2023.11-1" depends on BR2_powerpc64le depends on BR2_powerpc_power8 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 @@ -3674,7 +3845,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_MUSL_STABLE - bool "powerpc64le-power8 musl stable 2023.08-1" + bool "powerpc64le-power8 musl stable 2023.11-1" depends on BR2_powerpc64le depends on BR2_powerpc_power8 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 @@ -3700,11 +3871,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV32_ILP32D_GLIBC_BLEEDING_EDGE - bool "riscv32-ilp32d glibc bleeding-edge 2023.08-1" + bool "riscv32-ilp32d glibc bleeding-edge 2023.11-1" depends on BR2_riscv depends on BR2_riscv_g depends on BR2_RISCV_32 depends on BR2_RISCV_ABI_ILP32D + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 @@ -3727,12 +3899,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV32_ILP32D_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_GLIBC_BLEEDING_EDGE - bool "riscv64-lp64d glibc bleeding-edge 2023.08-1" + bool "riscv64-lp64d glibc bleeding-edge 2023.11-1" depends on BR2_riscv depends on BR2_riscv_g depends on BR2_RISCV_64 depends on BR2_RISCV_ABI_LP64D depends on BR2_USE_MMU + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 select BR2_INSTALL_LIBSTDCPP @@ -3754,7 +3927,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_GLIBC_STABLE - bool "riscv64-lp64d glibc stable 2023.08-1" + bool "riscv64-lp64d glibc stable 2023.11-1" depends on BR2_riscv depends on BR2_riscv_g depends on BR2_RISCV_64 @@ -3782,12 +3955,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_MUSL_BLEEDING_EDGE - bool "riscv64-lp64d musl bleeding-edge 2023.08-1" + bool "riscv64-lp64d musl bleeding-edge 2023.11-1" depends on BR2_riscv depends on BR2_riscv_g depends on BR2_RISCV_64 depends on BR2_RISCV_ABI_LP64D depends on BR2_USE_MMU + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 select BR2_INSTALL_LIBSTDCPP @@ -3809,7 +3983,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_MUSL_STABLE - bool "riscv64-lp64d musl stable 2023.08-1" + bool "riscv64-lp64d musl stable 2023.11-1" depends on BR2_riscv depends on BR2_riscv_g depends on BR2_RISCV_64 @@ -3837,12 +4011,13 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_UCLIBC_BLEEDING_EDGE - bool "riscv64-lp64d uclibc bleeding-edge 2023.08-1" + bool "riscv64-lp64d uclibc bleeding-edge 2023.11-1" depends on BR2_riscv depends on BR2_riscv_g depends on BR2_RISCV_64 depends on BR2_RISCV_ABI_LP64D depends on BR2_USE_MMU + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 select BR2_USE_WCHAR @@ -3865,7 +4040,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_UCLIBC_STABLE - bool "riscv64-lp64d uclibc stable 2023.08-1" + bool "riscv64-lp64d uclibc stable 2023.11-1" depends on BR2_riscv depends on BR2_riscv_g depends on BR2_RISCV_64 @@ -3894,9 +4069,10 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_S390X_Z13_GLIBC_BLEEDING_EDGE - bool "s390x-z13 glibc bleeding-edge 2023.08-1" + bool "s390x-z13 glibc bleeding-edge 2023.11-1" depends on BR2_s390x depends on BR2_s390x_z13 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 @@ -3919,7 +4095,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_S390X_Z13_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_S390X_Z13_GLIBC_STABLE - bool "s390x-z13 glibc stable 2023.08-1" + bool "s390x-z13 glibc stable 2023.11-1" depends on BR2_s390x depends on BR2_s390x_z13 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 @@ -3945,9 +4121,10 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_S390X_Z13_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_GLIBC_BLEEDING_EDGE - bool "sh-sh4 glibc bleeding-edge 2023.08-1" + bool "sh-sh4 glibc bleeding-edge 2023.11-1" depends on BR2_sh depends on BR2_sh4 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 @@ -3970,7 +4147,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_GLIBC_STABLE - bool "sh-sh4 glibc stable 2023.08-1" + bool "sh-sh4 glibc stable 2023.11-1" depends on BR2_sh depends on BR2_sh4 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 @@ -3996,9 +4173,10 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_MUSL_BLEEDING_EDGE - bool "sh-sh4 musl bleeding-edge 2023.08-1" + bool "sh-sh4 musl bleeding-edge 2023.11-1" depends on BR2_sh depends on BR2_sh4 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 @@ -4021,7 +4199,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_MUSL_STABLE - bool "sh-sh4 musl stable 2023.08-1" + bool "sh-sh4 musl stable 2023.11-1" depends on BR2_sh depends on BR2_sh4 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 @@ -4046,9 +4224,10 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_UCLIBC_BLEEDING_EDGE - bool "sh-sh4 uclibc bleeding-edge 2023.08-1" + bool "sh-sh4 uclibc bleeding-edge 2023.11-1" depends on BR2_sh depends on BR2_sh4 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 select BR2_USE_WCHAR @@ -4071,7 +4250,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_UCLIBC_STABLE - bool "sh-sh4 uclibc stable 2023.08-1" + bool "sh-sh4 uclibc stable 2023.11-1" depends on BR2_sh depends on BR2_sh4 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 @@ -4097,9 +4276,10 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4AEB_GLIBC_BLEEDING_EDGE - bool "sh-sh4aeb glibc bleeding-edge 2023.08-1" + bool "sh-sh4aeb glibc bleeding-edge 2023.11-1" depends on BR2_sh depends on BR2_sh4aeb + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 @@ -4122,7 +4302,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4AEB_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4AEB_GLIBC_STABLE - bool "sh-sh4aeb glibc stable 2023.08-1" + bool "sh-sh4aeb glibc stable 2023.11-1" depends on BR2_sh depends on BR2_sh4aeb depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 @@ -4148,9 +4328,10 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4AEB_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4AEB_MUSL_BLEEDING_EDGE - bool "sh-sh4aeb musl bleeding-edge 2023.08-1" + bool "sh-sh4aeb musl bleeding-edge 2023.11-1" depends on BR2_sh depends on BR2_sh4aeb + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 @@ -4173,7 +4354,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4AEB_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4AEB_MUSL_STABLE - bool "sh-sh4aeb musl stable 2023.08-1" + bool "sh-sh4aeb musl stable 2023.11-1" depends on BR2_sh depends on BR2_sh4aeb depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 @@ -4198,9 +4379,10 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4AEB_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SPARC64_GLIBC_BLEEDING_EDGE - bool "sparc64 glibc bleeding-edge 2023.08-1" + bool "sparc64 glibc bleeding-edge 2023.11-1" depends on BR2_sparc64 depends on BR2_sparc_v9 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 @@ -4223,7 +4405,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SPARC64_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SPARC64_GLIBC_STABLE - bool "sparc64 glibc stable 2023.08-1" + bool "sparc64 glibc stable 2023.11-1" depends on BR2_sparc64 depends on BR2_sparc_v9 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 @@ -4301,11 +4483,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SPARCV8_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_GLIBC_BLEEDING_EDGE - bool "x86-64 glibc bleeding-edge 2023.08-1" + bool "x86-64 glibc bleeding-edge 2023.11-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE depends on BR2_X86_CPU_HAS_SSE2 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 @@ -4328,7 +4511,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_GLIBC_STABLE - bool "x86-64 glibc stable 2023.08-1" + bool "x86-64 glibc stable 2023.11-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -4356,11 +4539,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_MUSL_BLEEDING_EDGE - bool "x86-64 musl bleeding-edge 2023.08-1" + bool "x86-64 musl bleeding-edge 2023.11-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE depends on BR2_X86_CPU_HAS_SSE2 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 @@ -4383,7 +4567,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_MUSL_STABLE - bool "x86-64 musl stable 2023.08-1" + bool "x86-64 musl stable 2023.11-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -4410,11 +4594,12 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_UCLIBC_BLEEDING_EDGE - bool "x86-64 uclibc bleeding-edge 2023.08-1" + bool "x86-64 uclibc bleeding-edge 2023.11-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE depends on BR2_X86_CPU_HAS_SSE2 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 select BR2_USE_WCHAR @@ -4437,7 +4622,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_UCLIBC_STABLE - bool "x86-64 uclibc stable 2023.08-1" + bool "x86-64 uclibc stable 2023.11-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -4465,7 +4650,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_GLIBC_BLEEDING_EDGE - bool "x86-64-v2 glibc bleeding-edge 2023.08-1" + bool "x86-64-v2 glibc bleeding-edge 2023.11-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -4474,6 +4659,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_GLIBC_BLEEDING_EDGE depends on BR2_X86_CPU_HAS_SSSE3 depends on BR2_X86_CPU_HAS_SSE4 depends on BR2_X86_CPU_HAS_SSE42 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 @@ -4496,7 +4682,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_GLIBC_STABLE - bool "x86-64-v2 glibc stable 2023.08-1" + bool "x86-64-v2 glibc stable 2023.11-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -4528,7 +4714,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_MUSL_BLEEDING_EDGE - bool "x86-64-v2 musl bleeding-edge 2023.08-1" + bool "x86-64-v2 musl bleeding-edge 2023.11-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -4537,6 +4723,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_MUSL_BLEEDING_EDGE depends on BR2_X86_CPU_HAS_SSSE3 depends on BR2_X86_CPU_HAS_SSE4 depends on BR2_X86_CPU_HAS_SSE42 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 @@ -4559,7 +4746,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_MUSL_STABLE - bool "x86-64-v2 musl stable 2023.08-1" + bool "x86-64-v2 musl stable 2023.11-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -4590,7 +4777,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_UCLIBC_BLEEDING_EDGE - bool "x86-64-v2 uclibc bleeding-edge 2023.08-1" + bool "x86-64-v2 uclibc bleeding-edge 2023.11-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -4599,6 +4786,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_UCLIBC_BLEEDING_EDGE depends on BR2_X86_CPU_HAS_SSSE3 depends on BR2_X86_CPU_HAS_SSE4 depends on BR2_X86_CPU_HAS_SSE42 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 select BR2_USE_WCHAR @@ -4621,7 +4809,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_UCLIBC_STABLE - bool "x86-64-v2 uclibc stable 2023.08-1" + bool "x86-64-v2 uclibc stable 2023.11-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -4653,7 +4841,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_GLIBC_BLEEDING_EDGE - bool "x86-64-v3 glibc bleeding-edge 2023.08-1" + bool "x86-64-v3 glibc bleeding-edge 2023.11-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -4664,6 +4852,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_GLIBC_BLEEDING_EDGE depends on BR2_X86_CPU_HAS_SSE42 depends on BR2_X86_CPU_HAS_AVX depends on BR2_X86_CPU_HAS_AVX2 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 @@ -4686,7 +4875,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_GLIBC_STABLE - bool "x86-64-v3 glibc stable 2023.08-1" + bool "x86-64-v3 glibc stable 2023.11-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -4720,7 +4909,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_MUSL_BLEEDING_EDGE - bool "x86-64-v3 musl bleeding-edge 2023.08-1" + bool "x86-64-v3 musl bleeding-edge 2023.11-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -4731,6 +4920,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_MUSL_BLEEDING_EDGE depends on BR2_X86_CPU_HAS_SSE42 depends on BR2_X86_CPU_HAS_AVX depends on BR2_X86_CPU_HAS_AVX2 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 @@ -4753,7 +4943,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_MUSL_STABLE - bool "x86-64-v3 musl stable 2023.08-1" + bool "x86-64-v3 musl stable 2023.11-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -4786,7 +4976,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_UCLIBC_BLEEDING_EDGE - bool "x86-64-v3 uclibc bleeding-edge 2023.08-1" + bool "x86-64-v3 uclibc bleeding-edge 2023.11-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -4797,6 +4987,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_UCLIBC_BLEEDING_EDGE depends on BR2_X86_CPU_HAS_SSE42 depends on BR2_X86_CPU_HAS_AVX depends on BR2_X86_CPU_HAS_AVX2 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 select BR2_USE_WCHAR @@ -4819,7 +5010,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_UCLIBC_STABLE - bool "x86-64-v3 uclibc stable 2023.08-1" + bool "x86-64-v3 uclibc stable 2023.11-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -4853,7 +5044,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_GLIBC_BLEEDING_EDGE - bool "x86-64-v4 glibc bleeding-edge 2023.08-1" + bool "x86-64-v4 glibc bleeding-edge 2023.11-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -4865,6 +5056,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_GLIBC_BLEEDING_EDGE depends on BR2_X86_CPU_HAS_AVX depends on BR2_X86_CPU_HAS_AVX2 depends on BR2_X86_CPU_HAS_AVX512 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 @@ -4887,7 +5079,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_GLIBC_STABLE - bool "x86-64-v4 glibc stable 2023.08-1" + bool "x86-64-v4 glibc stable 2023.11-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -4922,7 +5114,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_MUSL_BLEEDING_EDGE - bool "x86-64-v4 musl bleeding-edge 2023.08-1" + bool "x86-64-v4 musl bleeding-edge 2023.11-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -4934,6 +5126,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_MUSL_BLEEDING_EDGE depends on BR2_X86_CPU_HAS_AVX depends on BR2_X86_CPU_HAS_AVX2 depends on BR2_X86_CPU_HAS_AVX512 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 @@ -4956,7 +5149,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_MUSL_STABLE - bool "x86-64-v4 musl stable 2023.08-1" + bool "x86-64-v4 musl stable 2023.11-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -4990,7 +5183,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_UCLIBC_BLEEDING_EDGE - bool "x86-64-v4 uclibc bleeding-edge 2023.08-1" + bool "x86-64-v4 uclibc bleeding-edge 2023.11-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -5002,6 +5195,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_UCLIBC_BLEEDING_EDGE depends on BR2_X86_CPU_HAS_AVX depends on BR2_X86_CPU_HAS_AVX2 depends on BR2_X86_CPU_HAS_AVX512 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 select BR2_USE_WCHAR @@ -5024,7 +5218,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_UCLIBC_STABLE - bool "x86-64-v4 uclibc stable 2023.08-1" + bool "x86-64-v4 uclibc stable 2023.11-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -5059,7 +5253,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_GLIBC_BLEEDING_EDGE - bool "x86-64-core-i7 glibc bleeding-edge 2023.08-1" + bool "x86-64-core-i7 glibc bleeding-edge 2023.11-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -5068,6 +5262,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_GLIBC_BLEEDING_EDGE depends on BR2_X86_CPU_HAS_SSSE3 depends on BR2_X86_CPU_HAS_SSE4 depends on BR2_X86_CPU_HAS_SSE42 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 @@ -5090,7 +5285,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_GLIBC_STABLE - bool "x86-64-core-i7 glibc stable 2023.08-1" + bool "x86-64-core-i7 glibc stable 2023.11-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -5122,7 +5317,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_MUSL_BLEEDING_EDGE - bool "x86-64-core-i7 musl bleeding-edge 2023.08-1" + bool "x86-64-core-i7 musl bleeding-edge 2023.11-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -5131,6 +5326,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_MUSL_BLEEDING_EDGE depends on BR2_X86_CPU_HAS_SSSE3 depends on BR2_X86_CPU_HAS_SSE4 depends on BR2_X86_CPU_HAS_SSE42 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 @@ -5153,7 +5349,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_MUSL_STABLE - bool "x86-64-core-i7 musl stable 2023.08-1" + bool "x86-64-core-i7 musl stable 2023.11-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -5185,7 +5381,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_UCLIBC_BLEEDING_EDGE - bool "x86-64-core-i7 uclibc bleeding-edge 2023.08-1" + bool "x86-64-core-i7 uclibc bleeding-edge 2023.11-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -5194,6 +5390,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_UCLIBC_BLEEDING_EDGE depends on BR2_X86_CPU_HAS_SSSE3 depends on BR2_X86_CPU_HAS_SSE4 depends on BR2_X86_CPU_HAS_SSE42 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 select BR2_USE_WCHAR @@ -5216,7 +5413,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_UCLIBC_STABLE - bool "x86-64-core-i7 uclibc stable 2023.08-1" + bool "x86-64-core-i7 uclibc stable 2023.11-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -5248,13 +5445,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_GLIBC_BLEEDING_EDGE - bool "x86-core2 glibc bleeding-edge 2023.08-1" + bool "x86-core2 glibc bleeding-edge 2023.11-1" depends on BR2_i386 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE depends on BR2_X86_CPU_HAS_SSE2 depends on BR2_X86_CPU_HAS_SSE3 depends on BR2_X86_CPU_HAS_SSSE3 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 @@ -5277,7 +5475,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_GLIBC_STABLE - bool "x86-core2 glibc stable 2023.08-1" + bool "x86-core2 glibc stable 2023.11-1" depends on BR2_i386 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -5307,13 +5505,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_MUSL_BLEEDING_EDGE - bool "x86-core2 musl bleeding-edge 2023.08-1" + bool "x86-core2 musl bleeding-edge 2023.11-1" depends on BR2_i386 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE depends on BR2_X86_CPU_HAS_SSE2 depends on BR2_X86_CPU_HAS_SSE3 depends on BR2_X86_CPU_HAS_SSSE3 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 @@ -5335,7 +5534,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_MUSL_STABLE - bool "x86-core2 musl stable 2023.08-1" + bool "x86-core2 musl stable 2023.11-1" depends on BR2_i386 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -5363,13 +5562,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_UCLIBC_BLEEDING_EDGE - bool "x86-core2 uclibc bleeding-edge 2023.08-1" + bool "x86-core2 uclibc bleeding-edge 2023.11-1" depends on BR2_i386 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE depends on BR2_X86_CPU_HAS_SSE2 depends on BR2_X86_CPU_HAS_SSE3 depends on BR2_X86_CPU_HAS_SSSE3 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 select BR2_USE_WCHAR @@ -5392,7 +5592,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_UCLIBC_STABLE - bool "x86-core2 uclibc stable 2023.08-1" + bool "x86-core2 uclibc stable 2023.11-1" depends on BR2_i386 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -5422,7 +5622,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_GLIBC_BLEEDING_EDGE - bool "x86-i686 glibc bleeding-edge 2023.08-1" + bool "x86-i686 glibc bleeding-edge 2023.11-1" depends on BR2_i386 depends on !BR2_x86_i486 depends on !BR2_x86_i586 @@ -5432,6 +5632,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_GLIBC_BLEEDING_EDGE depends on !BR2_x86_c3 depends on !BR2_x86_winchip_c6 depends on !BR2_x86_winchip2 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 @@ -5454,7 +5655,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_GLIBC_STABLE - bool "x86-i686 glibc stable 2023.08-1" + bool "x86-i686 glibc stable 2023.11-1" depends on BR2_i386 depends on !BR2_x86_i486 depends on !BR2_x86_i586 @@ -5487,7 +5688,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_MUSL_BLEEDING_EDGE - bool "x86-i686 musl bleeding-edge 2023.08-1" + bool "x86-i686 musl bleeding-edge 2023.11-1" depends on BR2_i386 depends on !BR2_x86_i486 depends on !BR2_x86_i586 @@ -5497,6 +5698,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_MUSL_BLEEDING_EDGE depends on !BR2_x86_c3 depends on !BR2_x86_winchip_c6 depends on !BR2_x86_winchip2 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 @@ -5518,7 +5720,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_MUSL_STABLE - bool "x86-i686 musl stable 2023.08-1" + bool "x86-i686 musl stable 2023.11-1" depends on BR2_i386 depends on !BR2_x86_i486 depends on !BR2_x86_i586 @@ -5549,7 +5751,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_MUSL_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_UCLIBC_BLEEDING_EDGE - bool "x86-i686 uclibc bleeding-edge 2023.08-1" + bool "x86-i686 uclibc bleeding-edge 2023.11-1" depends on BR2_i386 depends on !BR2_x86_i486 depends on !BR2_x86_i586 @@ -5559,6 +5761,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_UCLIBC_BLEEDING_EDGE depends on !BR2_x86_c3 depends on !BR2_x86_winchip_c6 depends on !BR2_x86_winchip2 + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 select BR2_USE_WCHAR @@ -5581,7 +5784,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_UCLIBC_STABLE - bool "x86-i686 uclibc stable 2023.08-1" + bool "x86-i686 uclibc stable 2023.11-1" depends on BR2_i386 depends on !BR2_x86_i486 depends on !BR2_x86_i586 @@ -5614,10 +5817,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_XTENSA_LX60_UCLIBC_BLEEDING_EDGE - bool "xtensa-lx60 uclibc bleeding-edge 2023.08-1" + bool "xtensa-lx60 uclibc bleeding-edge 2023.11-1" depends on BR2_xtensa depends on BR2_XTENSA_CUSTOM depends on BR2_XTENSA_LITTLE_ENDIAN + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14 select BR2_TOOLCHAIN_GCC_AT_LEAST_13 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 select BR2_USE_WCHAR @@ -5640,7 +5844,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_XTENSA_LX60_UCLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_XTENSA_LX60_UCLIBC_STABLE - bool "xtensa-lx60 uclibc stable 2023.08-1" + bool "xtensa-lx60 uclibc stable 2023.11-1" depends on BR2_xtensa depends on BR2_XTENSA_CUSTOM depends on BR2_XTENSA_LITTLE_ENDIAN diff --git a/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.hash b/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.hash index 29bbdf56c2..38cdba5d7d 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.hash +++ b/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.hash @@ -1,420 +1,428 @@ # This file was auto-generated by support/scripts/gen-bootlin-toolchains # Do not edit -# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--glibc--bleeding-edge-2023.08-1.sha256 -sha256 62094460b853970dcba91cae4314bfd1210bb2963be540f7b69be882f5f795ba aarch64--glibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--glibc--stable-2023.08-1.sha256 -sha256 aed4223eadef27c1a84676333cbbdb75cbb5ee5a4a0cfc3ec5a491c6a6179de8 aarch64--glibc--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--musl--bleeding-edge-2023.08-1.sha256 -sha256 6e3f69eb9b85d8672805220c7af10bc7a761eb67504931b092d840dc4e1afa90 aarch64--musl--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--musl--stable-2023.08-1.sha256 -sha256 25767ae9ca70a76e9a71a13c6bc145532066a36d118d8f0ef14bd474784095ce aarch64--musl--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--uclibc--bleeding-edge-2023.08-1.sha256 -sha256 7ca79cbebf0143d89734765b259b5b261a22ecd4cde37f8dda0a02a152f49296 aarch64--uclibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--uclibc--stable-2023.08-1.sha256 -sha256 4c05602d75bc97a9acdcba3e94ed14d6452f176970a1e446bdb5a672fe2b77fb aarch64--uclibc--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs/aarch64be--glibc--bleeding-edge-2023.08-1.sha256 -sha256 a1df95eb94350b77c32d84dc9a1730f541d29ce6679331ea6eebe803a28427c7 aarch64be--glibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs/aarch64be--glibc--stable-2023.08-1.sha256 -sha256 f03d955da294083b62505d7c0d0093fb289ab51377b8be980b537f8a3da6f34e aarch64be--glibc--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs/aarch64be--musl--bleeding-edge-2023.08-1.sha256 -sha256 b2b30d563559664d0efc23eb00bc469c808bdfd400198967ba1255863301efc0 aarch64be--musl--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs/aarch64be--musl--stable-2023.08-1.sha256 -sha256 d24322115bffa3bde073a39149527cb212a9d07b2bc8cfad57145c13ec60ece5 aarch64be--musl--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs/aarch64be--uclibc--bleeding-edge-2023.08-1.sha256 -sha256 8d3f1b453643a80331543688e08c2a979a83eef59f7a9db1ec9a4dab8fe868a5 aarch64be--uclibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs/aarch64be--uclibc--stable-2023.08-1.sha256 -sha256 6f92269995e4e028a3b0d7982827fcff415b56fae34a61d845775332f981061d aarch64be--uclibc--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-750d/tarballs/arcle-750d--uclibc--bleeding-edge-2023.08-1.sha256 -sha256 7129cef2a9c3c511c6c7f025cfe526be9d30150707e1e400780c611369b5ed02 arcle-750d--uclibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-750d/tarballs/arcle-750d--uclibc--stable-2023.08-1.sha256 -sha256 1e1ce3fb4eda609dc73df731a7192cf1fcaabade8ea65f9bce6d9e9be41633b9 arcle-750d--uclibc--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-hs38/tarballs/arcle-hs38--glibc--bleeding-edge-2023.08-1.sha256 -sha256 69e9c144a86931eba4b56873e8973f018d4edc2151aa8fdbefb4f2948a1af8f9 arcle-hs38--glibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-hs38/tarballs/arcle-hs38--glibc--stable-2023.08-1.sha256 -sha256 71a078574d1ab044a04b1e79d10af46a6334ad43d82ff4b76b5547d70b9ef4b7 arcle-hs38--glibc--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-hs38/tarballs/arcle-hs38--uclibc--bleeding-edge-2023.08-1.sha256 -sha256 ce56ea212cad7d23fd9544d60916808762c21a32b2492ca96e94b07d1762bbcd arcle-hs38--uclibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-hs38/tarballs/arcle-hs38--uclibc--stable-2023.08-1.sha256 -sha256 b0835a1eda4c9a0b82fcfe053a7f879dbb2518fc9311229d015ac43354413479 arcle-hs38--uclibc--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs/armv5-eabi--glibc--bleeding-edge-2023.08-1.sha256 -sha256 79e017a9f7455a679eeb734c029cf17b32c62c30e85e39d48154645f2bef7f11 armv5-eabi--glibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs/armv5-eabi--glibc--stable-2023.08-1.sha256 -sha256 65eee9d2e60a2ad78a4bb852eaf1039f26ede6bb04292999b384b1cc0178ec58 armv5-eabi--glibc--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs/armv5-eabi--musl--bleeding-edge-2023.08-1.sha256 -sha256 7ad1405bb5407f890d1958abaab0c9ae47ab30c4120aed98d3ed88e9915c749d armv5-eabi--musl--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs/armv5-eabi--musl--stable-2023.08-1.sha256 -sha256 15c5e09b21328e1a8bfa641fac208934b32bc2e4c1ebab9e9343ad59ed30e869 armv5-eabi--musl--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs/armv5-eabi--uclibc--bleeding-edge-2023.08-1.sha256 -sha256 d7be53ed9bdf7c56c8cba39580d1528aad6fa4dd79d75a836adfe454b3cfd5ab armv5-eabi--uclibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs/armv5-eabi--uclibc--stable-2023.08-1.sha256 -sha256 b8e4a8426819eb226d30facf93288855b7710165b5aecc2224b65936b64bc3ad armv5-eabi--uclibc--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs/armv6-eabihf--glibc--bleeding-edge-2023.08-1.sha256 -sha256 7d72017f0e8da2f9804ffe913d1e7a9b1fe8629c107354cb3c84bc08acf58f0b armv6-eabihf--glibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs/armv6-eabihf--glibc--stable-2023.08-1.sha256 -sha256 fc2bc606081754dbfb8fbb955d66a9d07bce844777ba6501d2c31763a17cc86f armv6-eabihf--glibc--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs/armv6-eabihf--musl--bleeding-edge-2023.08-1.sha256 -sha256 23bb6e3ded0399604cb810d903f3d7bbdde13274575f8e91da094045044cd910 armv6-eabihf--musl--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs/armv6-eabihf--musl--stable-2023.08-1.sha256 -sha256 7f8a93f39d7470e5587c05e74780fcdcb49165fcaf7436ff4e4fe301a0ff3f93 armv6-eabihf--musl--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs/armv6-eabihf--uclibc--bleeding-edge-2023.08-1.sha256 -sha256 f06216aa73f8d02a34e09a3db79d3d34fbc31ecde7883896d497dbc10c60a636 armv6-eabihf--uclibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs/armv6-eabihf--uclibc--stable-2023.08-1.sha256 -sha256 f0f77ddb287d64a0ddcf07241dab9afeeda7cf02f0959e85f7048564c0b1bcff armv6-eabihf--uclibc--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--glibc--bleeding-edge-2023.08-1.sha256 -sha256 fe0b14d6c92ab939d47dcff1f39552aa299d9bbdf0a4571428c56daf69246e70 armv7-eabihf--glibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--glibc--stable-2023.08-1.sha256 -sha256 8b87e1694e3554260d31583d19201a5d420c4c0a903396aea2d29bbce104c8ec armv7-eabihf--glibc--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--musl--bleeding-edge-2023.08-1.sha256 -sha256 6422c3fe6cb66694a0c3384e39ffe352b3e69cf4035e64180765a23973bb00d1 armv7-eabihf--musl--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--musl--stable-2023.08-1.sha256 -sha256 4f06ed760d3b2e779f0d8aec73becd21edce9d04560d2fba53549ca8c12f51ba armv7-eabihf--musl--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--uclibc--bleeding-edge-2023.08-1.sha256 -sha256 4a5b34842986fb0c2e08c67ecb2c35ddf9576ae0b575ae40ab7d887d4ef24a42 armv7-eabihf--uclibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--uclibc--stable-2023.08-1.sha256 -sha256 45b079fe0bb57ce5d8ae2d0e8d675b7abac7f5de58570a084df61a992224a961 armv7-eabihf--uclibc--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs/armebv7-eabihf--glibc--bleeding-edge-2023.08-1.sha256 -sha256 c70e70ae5ed56752ad55b5b989f385378d5a11e8f0e3e6ee88476db81c459ab0 armebv7-eabihf--glibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs/armebv7-eabihf--glibc--stable-2023.08-1.sha256 -sha256 d762a7abeac58dad63f6beec5e867243259779124531c1d7507ea95b68e884d3 armebv7-eabihf--glibc--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs/armebv7-eabihf--musl--bleeding-edge-2023.08-1.sha256 -sha256 57aaad8d2d8f6b28d95132f7dff3963264d441155e06d4605c11a32e62e255a0 armebv7-eabihf--musl--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs/armebv7-eabihf--musl--stable-2023.08-1.sha256 -sha256 c707a9ba4bedc4db3e23653038c17ee7ee55e1d8c8bb2cc14cf47d5c3dcc4b9d armebv7-eabihf--musl--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs/armebv7-eabihf--uclibc--bleeding-edge-2023.08-1.sha256 -sha256 bf69352181139d7c206841e5a3d6d671b75db42c6311e5ec6825d574317c637f armebv7-eabihf--uclibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs/armebv7-eabihf--uclibc--stable-2023.08-1.sha256 -sha256 8223fd5853298060e253b595615bedaa0c43a957d630133e99cd63c0d600e402 armebv7-eabihf--uclibc--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7m/tarballs/armv7m--uclibc--bleeding-edge-2023.08-1.sha256 -sha256 94583517119f1d02ca205787bda91252a7693a3c1895e34057fcb48b66115032 armv7m--uclibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7m/tarballs/armv7m--uclibc--stable-2023.08-1.sha256 -sha256 e903697238d4c75595bf9ca112e2b09c3a1457f0142d39c5bab523650a327994 armv7m--uclibc--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs/m68k-68xxx--uclibc--bleeding-edge-2023.08-1.sha256 -sha256 61c7953c741113f30ff643fa846713c8b88bd2c4a91de26349e504d553e8ca9c m68k-68xxx--uclibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs/m68k-68xxx--uclibc--stable-2023.08-1.sha256 -sha256 e631e9fea5fad6db056e9028c17e41abca9f7bb6463950045756d040dfb34a6f m68k-68xxx--uclibc--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-coldfire/tarballs/m68k-coldfire--uclibc--bleeding-edge-2023.08-1.sha256 -sha256 59dc6c063a9e982042bbfde36b5cbe263b3130e6ee04df8b8503cfde0cbcc43d m68k-coldfire--uclibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-coldfire/tarballs/m68k-coldfire--uclibc--stable-2023.08-1.sha256 -sha256 25d516ad069fd64f6d891606455cc9e5584b002a658e2dbbfbb1cdd2fa2cddd4 m68k-coldfire--uclibc--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--glibc--bleeding-edge-2023.08-1.sha256 -sha256 52964e876701c8d8cceaf241720741b290b32cf3aeff04e5c0a9b2bb8867e00c microblazebe--glibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--glibc--stable-2023.08-1.sha256 -sha256 f83fe1e9788c43c502322d7b1dff57030718fd461b9df06d27ce69653b234489 microblazebe--glibc--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--musl--bleeding-edge-2023.08-1.sha256 -sha256 66455c641d0d7dd61c01a9791d9225e4a02d9f33571993bdf53b07f5ce85d112 microblazebe--musl--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--musl--stable-2023.08-1.sha256 -sha256 0605fcdc0b8be08a1737b73f090782b16c5f905996a14a2a587c99d3bf6a76b2 microblazebe--musl--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--uclibc--bleeding-edge-2023.08-1.sha256 -sha256 384f1b9573e9e187407b2b2afc88ca5161de866ef792928b856972bfb6abc3b3 microblazebe--uclibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--uclibc--stable-2023.08-1.sha256 -sha256 8e432dd0fbc4c4ea0e64bd8bfa37c17cdcc4f6b1ccb6a78a68dc21bfc00590f1 microblazebe--uclibc--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--glibc--bleeding-edge-2023.08-1.sha256 -sha256 5abe0a6cc448284bc0442b49e7266acf73cffe2c10e7c4472346c3a4ac810ce9 microblazeel--glibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--glibc--stable-2023.08-1.sha256 -sha256 72f0efd879d97cbdfb2b362d2f1f7f53cfaf5254ebb4928e503e74f65ab578de microblazeel--glibc--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--musl--bleeding-edge-2023.08-1.sha256 -sha256 923616f2c14a571cc9257f81b9373a49b86997c6cbe8ecf5cd816527d04dd321 microblazeel--musl--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--musl--stable-2023.08-1.sha256 -sha256 69cef52cf75cb9c1b127a3c7a657aef98d0c419188b3cbb1a3a79b61a7327b30 microblazeel--musl--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--uclibc--bleeding-edge-2023.08-1.sha256 -sha256 f9f41a97c6a3278d6d9c62280f40c13684addf31a29cc81813fa899ccd2aacc4 microblazeel--uclibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--uclibc--stable-2023.08-1.sha256 -sha256 cccb9cd740adb524d144967d5bd2382a88b5f1c737c6dd38981c462dc86ea162 microblazeel--uclibc--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs/mips32--glibc--bleeding-edge-2023.08-1.sha256 -sha256 93a266be4d77df50112274830358160252c618217a28b5bdc1a2944e97e1bc9b mips32--glibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs/mips32--glibc--stable-2023.08-1.sha256 -sha256 6b84446398d4c3241fdec0f8f4933b88df9b2c119845390a6d3afc76c092c750 mips32--glibc--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs/mips32--musl--bleeding-edge-2023.08-1.sha256 -sha256 4dbb260e89f95c851ccf29a729f15725112b361d9ab93ba4f732548c76bc6c39 mips32--musl--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs/mips32--musl--stable-2023.08-1.sha256 -sha256 4b7004efce6d23b4c90e2ac1e8ba98d835ea61b1c36adddf688efe891c75fe9b mips32--musl--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs/mips32--uclibc--bleeding-edge-2023.08-1.sha256 -sha256 b243c072465bee94cdac3af715eab513d07fc41fe067dc5d19cec0cb8acc53c8 mips32--uclibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs/mips32--uclibc--stable-2023.08-1.sha256 -sha256 dd5b0a4ae492e5023029cef073e43621c83d6b4858cda4cdf148b0e2e9ad468b mips32--uclibc--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs/mips32el--glibc--bleeding-edge-2023.08-1.sha256 -sha256 190300b5a7056f3b5cc5de1637fe8f52d74aad1b0335b2291c46341c6e4589e4 mips32el--glibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs/mips32el--glibc--stable-2023.08-1.sha256 -sha256 5594d9f0ab8c14b4eed181c7a383399fadeb56b84e4fa5f22460dfaf68ab819e mips32el--glibc--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs/mips32el--musl--bleeding-edge-2023.08-1.sha256 -sha256 d267cbc5ecb9e22bab2edd95450ae314f7d75d2eac34574f8df87d5778d8ae07 mips32el--musl--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs/mips32el--musl--stable-2023.08-1.sha256 -sha256 818b57f58b2b03b2246a561c1ec427bab87158cbb99e1ccce5c814774cdc791b mips32el--musl--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs/mips32el--uclibc--bleeding-edge-2023.08-1.sha256 -sha256 5ba6bab76c827870f5da94cc125b77144e5e7abf2bbbea348ccebdb60084a857 mips32el--uclibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs/mips32el--uclibc--stable-2023.08-1.sha256 -sha256 98ec0d45de93f531896f4273f206ff1fe10d87bd728d11945c5a9f8cfff3de16 mips32el--uclibc--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs/mips32r5el--glibc--bleeding-edge-2023.08-1.sha256 -sha256 ddf0f8b760422ceebb1a797ae9e75001a77b8a67cb5ba8737e409d1a3491c9ae mips32r5el--glibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs/mips32r5el--glibc--stable-2023.08-1.sha256 -sha256 18127d0728f1200483ec6739357e4d19cc2df9de33f76bf70598b78b43ff2496 mips32r5el--glibc--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs/mips32r5el--musl--bleeding-edge-2023.08-1.sha256 -sha256 7a8e20d4dfb7e75f4d1c032ebb0ee36aab321797ed21a2cc325ea819fd569c3b mips32r5el--musl--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs/mips32r5el--musl--stable-2023.08-1.sha256 -sha256 8b8e6b402ac3343d37e766907d4871512b1ffe3cd9079a3ca226eeba290d2a5d mips32r5el--musl--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs/mips32r5el--uclibc--bleeding-edge-2023.08-1.sha256 -sha256 e0d320e1bb1c4d7f0f6724368cbd4f79868123e1b8cfd06ee14c2a20d69484ff mips32r5el--uclibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs/mips32r5el--uclibc--stable-2023.08-1.sha256 -sha256 883d72f17f040410b9ff05aaee6cf6ccda46ae2e99fe9ffbc03a72f0a4789096 mips32r5el--uclibc--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs/mips32r6el--glibc--bleeding-edge-2023.08-1.sha256 -sha256 4924db22355c9f797dc6776b426ce72618a1803b225370519e7dfe44c2957094 mips32r6el--glibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs/mips32r6el--glibc--stable-2023.08-1.sha256 -sha256 2f4b44733eb26884a4d941dcd5f5ea88f7b17f8b1b68cf799e047a55ab7b7e65 mips32r6el--glibc--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs/mips32r6el--musl--bleeding-edge-2023.08-1.sha256 -sha256 1a3c850dd6619791ca32042e3b3f52f25e33c8b050a6f102efb2a3568a63a43f mips32r6el--musl--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs/mips32r6el--musl--stable-2023.08-1.sha256 -sha256 ec544f499dc7f1713f09c2424844228183cf68ff77061bc6c65821855a7228cd mips32r6el--musl--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs/mips32r6el--uclibc--bleeding-edge-2023.08-1.sha256 -sha256 9e046c31cd9d59fb7126693644a722cd9141381ddeda69a7c8e648aa65037c41 mips32r6el--uclibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs/mips32r6el--uclibc--stable-2023.08-1.sha256 -sha256 901d78b12dcab01006616ccc8797d593c53d361752b4cd04791495a3470dfe12 mips32r6el--uclibc--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs/mips64-n32--glibc--bleeding-edge-2023.08-1.sha256 -sha256 94a2afea880a378a82c3f146671ad9b86f6e05bb13f97573d26c9214adb5b064 mips64-n32--glibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs/mips64-n32--glibc--stable-2023.08-1.sha256 -sha256 83f673bebab7df55324362f97a483490a27199faf336780866d2de84b9f76895 mips64-n32--glibc--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs/mips64-n32--musl--bleeding-edge-2023.08-1.sha256 -sha256 178b2702d652bffd8d8f7ca7e0a756ce044485b7e26f29db47d19c9a3b700869 mips64-n32--musl--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs/mips64-n32--musl--stable-2023.08-1.sha256 -sha256 49fb59b0ce83ce0f60fda437c43f107519f538aadaf0c029f65c32f279852a6e mips64-n32--musl--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs/mips64-n32--uclibc--bleeding-edge-2023.08-1.sha256 -sha256 6d3825d31c0f91f0d319517ebbf67bb9c44d779224ebd8e90e88c9a7d75bc07b mips64-n32--uclibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs/mips64-n32--uclibc--stable-2023.08-1.sha256 -sha256 b2d87b8d501570fc07e19d6fd78d41c7be891c64cb9565c827eaa4b16a4212ae mips64-n32--uclibc--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs/mips64el-n32--glibc--bleeding-edge-2023.08-1.sha256 -sha256 d7ed3131fc1eab9dde7a242652043756caa09848f7c63cb283f79f42e38ffdab mips64el-n32--glibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs/mips64el-n32--glibc--stable-2023.08-1.sha256 -sha256 d23f56b610be40774f41af5b96cffdd8dd35b983a0e5ed42b2a1a88ddafce6c9 mips64el-n32--glibc--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs/mips64el-n32--musl--bleeding-edge-2023.08-1.sha256 -sha256 f1d63dfa8615d6ffec4d66751e483623de0ccdf1fdb70d1981104457ba5cf4ff mips64el-n32--musl--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs/mips64el-n32--musl--stable-2023.08-1.sha256 -sha256 2a558c0665497bb7976d02a3fd5c1e7b8a61c753373cebbef799b1aae2e7d307 mips64el-n32--musl--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs/mips64el-n32--uclibc--bleeding-edge-2023.08-1.sha256 -sha256 25599336b65c1d0ede5d02b128bac0f4d3b21ec5d21c260c702849e94317adfc mips64el-n32--uclibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs/mips64el-n32--uclibc--stable-2023.08-1.sha256 -sha256 220d8dbbd81d71cb4d6345757ea78ab03a263bf664bc7a1732450da3555c18b1 mips64el-n32--uclibc--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs/mips64r6el-n32--glibc--bleeding-edge-2023.08-1.sha256 -sha256 09d36c965e88e413604820c53118f999ad0552422e15c27d34b0ef182c620c89 mips64r6el-n32--glibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs/mips64r6el-n32--glibc--stable-2023.08-1.sha256 -sha256 ef65c7717cd1560c08097f669244515b8261e5f4df4cda1780c507f43b98ada7 mips64r6el-n32--glibc--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs/mips64r6el-n32--musl--bleeding-edge-2023.08-1.sha256 -sha256 b6d673e2e742dda1e2865759737419781190df06f57db4d6a3945dd4be161bd9 mips64r6el-n32--musl--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs/mips64r6el-n32--musl--stable-2023.08-1.sha256 -sha256 cd879a9cba5ebb5ad1e5ea93dc0465661a38af8a5b968c06043ce259f612f903 mips64r6el-n32--musl--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs/mips64r6el-n32--uclibc--bleeding-edge-2023.08-1.sha256 -sha256 46471513a3ed2fe2b5f18e27d6f314d50b2799e85714ee2610276c01caeb3580 mips64r6el-n32--uclibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs/mips64r6el-n32--uclibc--stable-2023.08-1.sha256 -sha256 c6525bb93fcac16a354e039abd47ebdd33c379a364c812bab3b8dd69ab27dcb2 mips64r6el-n32--uclibc--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/nios2/tarballs/nios2--glibc--bleeding-edge-2023.08-1.sha256 -sha256 b4278214069a381ac8979e0d957ca6a122b92e54bf3d443845ae421f96259b59 nios2--glibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/nios2/tarballs/nios2--glibc--stable-2023.08-1.sha256 -sha256 427c9c52209927883865b74d0c1310b47148013832069359da6d9fd23654b2be nios2--glibc--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--glibc--bleeding-edge-2023.08-1.sha256 -sha256 6d94154ffcce33d0f24fc7bf0a0ac3dcf794aecabc42d126e8fca772d55dcec3 openrisc--glibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--glibc--stable-2023.08-1.sha256 -sha256 bae2a29dcff4606c40766da9cae88be0846b5bdc870e83e282ffde1f93be1c1b openrisc--glibc--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--musl--bleeding-edge-2023.08-1.sha256 -sha256 c663809a5f5ec6c23eefd85f0eb0b341d3ca5b782adb243c16ab3cd6ef3db93d openrisc--musl--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--musl--stable-2023.08-1.sha256 -sha256 88fd3eb838a2527980aba33403c7654b156665aafe825a4f86f1af2007277e15 openrisc--musl--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--uclibc--bleeding-edge-2023.08-1.sha256 -sha256 6fd48b14f900ef94cb7763eef9e2a4cd5f55a02591050be9bf7286fb53f7a073 openrisc--uclibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--uclibc--stable-2023.08-1.sha256 -sha256 6857723b0fc53465d2d2a7a32efc694443dd0a1ba4d1abebc5b9d2f7a9389b76 openrisc--uclibc--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--glibc--bleeding-edge-2023.08-1.sha256 -sha256 860e79fd5e3e65094e26af8c08273b5cb25b416ed33d95f0d30ce01751c61bc6 powerpc-440fp--glibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--glibc--stable-2023.08-1.sha256 -sha256 e8b0ecf725c48794f8fa33b05725cbb8f988b364c66a371c414c6cf0118669f4 powerpc-440fp--glibc--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--musl--bleeding-edge-2023.08-1.sha256 -sha256 bb55c1a0b4cce5ea40b6fbbd81259bb295c31e71e150dfd4df8f27add4fd75fb powerpc-440fp--musl--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--musl--stable-2023.08-1.sha256 -sha256 c95aafaf7257a9ba125d2ff7a126c5f31123db45c200a63549e13b17526e091f powerpc-440fp--musl--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--uclibc--bleeding-edge-2023.08-1.sha256 -sha256 ca1f56e00b2b4163fb82a011e1ca9d7d2463332aa483321b850395cb8f8686fd powerpc-440fp--uclibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--uclibc--stable-2023.08-1.sha256 -sha256 94f5cdc6aed04d46d8bec86e7109b8195c0f8d373478724f9af2bedeac57543d powerpc-440fp--uclibc--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs/powerpc-e300c3--glibc--bleeding-edge-2023.08-1.sha256 -sha256 6fa51b33d4ee181f82179e56c410e752dddc809dd2dac748686d1a414ae4dfb1 powerpc-e300c3--glibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs/powerpc-e300c3--glibc--stable-2023.08-1.sha256 -sha256 c997956cb53d65491557aeca2fcff951348b12d07764057d4942d58accad4925 powerpc-e300c3--glibc--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs/powerpc-e300c3--musl--bleeding-edge-2023.08-1.sha256 -sha256 f158d1d49b1578ce36261a26d82e221937e2c11575bb25133e69fd3dfc43a8d9 powerpc-e300c3--musl--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs/powerpc-e300c3--musl--stable-2023.08-1.sha256 -sha256 49bf91af733b5efc107f8d1764959feeb5de0fa10b3f80e60cbb167aaef3d1ab powerpc-e300c3--musl--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs/powerpc-e300c3--uclibc--bleeding-edge-2023.08-1.sha256 -sha256 b4b0d05b9b81be8ab0b0bfc2aae08aeb7adf1c9dbf9f78a7311c5caf30f03869 powerpc-e300c3--uclibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs/powerpc-e300c3--uclibc--stable-2023.08-1.sha256 -sha256 75acfa5021ba296b069aa787cf3cf84c950eaff87e201494dea530bf4d503556 powerpc-e300c3--uclibc--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs/powerpc-e500mc--glibc--bleeding-edge-2023.08-1.sha256 -sha256 ca322217020237d0c728119654337857e2643ae848f808eb575a2223f191f89b powerpc-e500mc--glibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs/powerpc-e500mc--glibc--stable-2023.08-1.sha256 -sha256 7c767173e9d96c11927be890fd34052873406c5c707ac031aaf5c6f956c2fee9 powerpc-e500mc--glibc--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs/powerpc-e500mc--musl--bleeding-edge-2023.08-1.sha256 -sha256 a47518b65c9d866b7d61b1382149b7c63da1a5166e3291096b34cb6407f5382d powerpc-e500mc--musl--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs/powerpc-e500mc--musl--stable-2023.08-1.sha256 -sha256 b65e2912928838d6bee32a724bf25a53810ee2dfcff2954702057d2f9fce3f72 powerpc-e500mc--musl--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs/powerpc-e500mc--uclibc--bleeding-edge-2023.08-1.sha256 -sha256 4281a38e79f2a32dcb9b51f379c78ca98cd982d4272449a9c7a4890d8402f7c2 powerpc-e500mc--uclibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs/powerpc-e500mc--uclibc--stable-2023.08-1.sha256 -sha256 4a37d3dd4eee82fcc5d2d0fcf71831d8efca601abfee236c49a5a7bd064d27f4 powerpc-e500mc--uclibc--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e5500/tarballs/powerpc64-e5500--glibc--bleeding-edge-2023.08-1.sha256 -sha256 2e6b3d79ddd8de8a4e99b39dbf9990deacf1c2b6114d1686f49cbcfd949f229c powerpc64-e5500--glibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e5500/tarballs/powerpc64-e5500--glibc--stable-2023.08-1.sha256 -sha256 f3094cb9cc065c36ae6407c80002dc22b996c895ce74261902e5a3e5bca12579 powerpc64-e5500--glibc--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e6500/tarballs/powerpc64-e6500--glibc--bleeding-edge-2023.08-1.sha256 -sha256 7761a61fc413683f1190275ef6d7438351da133bbfaaa83af336432ec2b2a0a4 powerpc64-e6500--glibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e6500/tarballs/powerpc64-e6500--glibc--stable-2023.08-1.sha256 -sha256 e95b5afc2cbb7b510009e552477e20c806262615a85e03d0e89330574eab7330 powerpc64-e6500--glibc--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e6500/tarballs/powerpc64-e6500--musl--bleeding-edge-2023.08-1.sha256 -sha256 18572cbbfd25426666594c1f4758beb57983e457487bcf0036b57e31b92d41bd powerpc64-e6500--musl--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e6500/tarballs/powerpc64-e6500--musl--stable-2023.08-1.sha256 -sha256 596b2369457e6155420d97c3d67646eb94e5cace277aa943010cd1bc29191322 powerpc64-e6500--musl--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-power8/tarballs/powerpc64-power8--glibc--bleeding-edge-2023.08-1.sha256 -sha256 7af62a63e0e9ebec8d020f017e8053c44e9c3bbdb418de5b1a7a6bf6b6ebb958 powerpc64-power8--glibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-power8/tarballs/powerpc64-power8--glibc--stable-2023.08-1.sha256 -sha256 ee974fe55cd465145efb0ffe01e64f9488bf4d4c3d6abe17c74b4822e8158415 powerpc64-power8--glibc--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-power8/tarballs/powerpc64-power8--musl--bleeding-edge-2023.08-1.sha256 -sha256 680c70daafe2f19a450d5a64694f758407abc71cfeaa385c7bb8af428ef0d11a powerpc64-power8--musl--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-power8/tarballs/powerpc64-power8--musl--stable-2023.08-1.sha256 -sha256 c1116ad8c2c34ab964fee09e2cb95537701ec65f11b40ea8da08ba9140928af5 powerpc64-power8--musl--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64le-power8/tarballs/powerpc64le-power8--glibc--bleeding-edge-2023.08-1.sha256 -sha256 6b0f83a79375774eeff1c67de6b22610833be9f4ef75535368f2c6d1e14ec4ca powerpc64le-power8--glibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64le-power8/tarballs/powerpc64le-power8--glibc--stable-2023.08-1.sha256 -sha256 b9ed7a538472df2c727f8133ccd8166f5ea26fbd09ec0729b577c89ced0a87c4 powerpc64le-power8--glibc--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64le-power8/tarballs/powerpc64le-power8--musl--bleeding-edge-2023.08-1.sha256 -sha256 69dd5562fe86154a7d749bd414949cbca5e9e6eda370cb4188de5493b682431f powerpc64le-power8--musl--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64le-power8/tarballs/powerpc64le-power8--musl--stable-2023.08-1.sha256 -sha256 f01de6d7ea263e1343b771b95a9b8848c767be45d43e10550c3d23a15e749d83 powerpc64le-power8--musl--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv32-ilp32d/tarballs/riscv32-ilp32d--glibc--bleeding-edge-2023.08-1.sha256 -sha256 b5a674b07be757639885bde165244ab85c26db2d7e39284d897175701f6f16c3 riscv32-ilp32d--glibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs/riscv64-lp64d--glibc--bleeding-edge-2023.08-1.sha256 -sha256 9eda527aea5ce7da27957c3b8e4adb65430be046b713dca25432a09cb6675976 riscv64-lp64d--glibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs/riscv64-lp64d--glibc--stable-2023.08-1.sha256 -sha256 97d7f95ced5852e3fa0119fd5370356df0b652844a76ad9a1c88caa8dd09f367 riscv64-lp64d--glibc--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs/riscv64-lp64d--musl--bleeding-edge-2023.08-1.sha256 -sha256 3687ddfbc6d4008e6b5fa2533a6e651d6db7281014917de8d2200b320f440633 riscv64-lp64d--musl--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs/riscv64-lp64d--musl--stable-2023.08-1.sha256 -sha256 09e2fa682043c4ac6378887468085a333d07734edac2b784ade2aacc0a815bb3 riscv64-lp64d--musl--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs/riscv64-lp64d--uclibc--bleeding-edge-2023.08-1.sha256 -sha256 612ddd98eacb4bd1e575c3376bbc709e16d4617b49789f8b9663eaa1e13799b6 riscv64-lp64d--uclibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs/riscv64-lp64d--uclibc--stable-2023.08-1.sha256 -sha256 47830bb06baaf351735729672a3b866c123ef6ad6151869a1fc0135396e7a360 riscv64-lp64d--uclibc--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/s390x-z13/tarballs/s390x-z13--glibc--bleeding-edge-2023.08-1.sha256 -sha256 38edb78e044ce8c47214452084d5ce38c8b94a2484b296972a764da701ca738a s390x-z13--glibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/s390x-z13/tarballs/s390x-z13--glibc--stable-2023.08-1.sha256 -sha256 a31927e8331f986ee753edbb931495d03ff00290e5b61618b1e897ed980481b9 s390x-z13--glibc--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--glibc--bleeding-edge-2023.08-1.sha256 -sha256 11da1e48d2a7aebfd0f0280d830bd98423620afc82a7bd62671333661e9cb438 sh-sh4--glibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--glibc--stable-2023.08-1.sha256 -sha256 91f6eeb80d4ceb5ee49221708e543a0d312a7e16d7b9bdd47db48098a034b17d sh-sh4--glibc--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--musl--bleeding-edge-2023.08-1.sha256 -sha256 cff9a006550ca7f6d5e71b10043b2ade1d379ad5859202f7ff9dc460348c7f82 sh-sh4--musl--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--musl--stable-2023.08-1.sha256 -sha256 e76eee2ac9b04926d0cd8699c11abe09194e235117985fa6f65b16221889823f sh-sh4--musl--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--uclibc--bleeding-edge-2023.08-1.sha256 -sha256 0b8b94a26d66168173797d212fc8a5da0c8d239607208661201c413c61056c00 sh-sh4--uclibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--uclibc--stable-2023.08-1.sha256 -sha256 d08f583f45f61c72c187754a330d82d4ac9f81a91c998820663d884363a27877 sh-sh4--uclibc--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4aeb/tarballs/sh-sh4aeb--glibc--bleeding-edge-2023.08-1.sha256 -sha256 32efc818e2a09ae5af5756c3fac89832743b6f03ad7414c5f6c6abb238cbcc64 sh-sh4aeb--glibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4aeb/tarballs/sh-sh4aeb--glibc--stable-2023.08-1.sha256 -sha256 4b5f36bcb32a23b40c04117b549fc571c0f1b40ae29c7a69a78e9d014efb55ea sh-sh4aeb--glibc--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4aeb/tarballs/sh-sh4aeb--musl--bleeding-edge-2023.08-1.sha256 -sha256 16f82d8ce61fe30b26ad75e716418c57d8669d7a7fbc63a131f8be00ba7ec305 sh-sh4aeb--musl--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4aeb/tarballs/sh-sh4aeb--musl--stable-2023.08-1.sha256 -sha256 2f4af8a25bd24888149f5772413c3f8ce1ee40a16b2a4aec5fc4b4382d021d4f sh-sh4aeb--musl--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/sparc64/tarballs/sparc64--glibc--bleeding-edge-2023.08-1.sha256 -sha256 8c29c6f65204a2940012384b769fb5d5848498c47d243a9accf530fe74665dc2 sparc64--glibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/sparc64/tarballs/sparc64--glibc--stable-2023.08-1.sha256 -sha256 643acebd4fd6ed1b1ee8dfcb6ab3066e4f2c42aee7754ebea7825ecfeabf32ed sparc64--glibc--stable-2023.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--glibc--bleeding-edge-2023.11-1.sha256 +sha256 9d4c3a45e5f781060b81779ba116b2118805f214c3b1042ce8ecde5c4aeb12c3 aarch64--glibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--glibc--stable-2023.11-1.sha256 +sha256 5b1fde169c9ed678ee75a729286531a291c6ce5ee9d8a8b598b3abbef35c05f2 aarch64--glibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--musl--bleeding-edge-2023.11-1.sha256 +sha256 f63c27eabff2b3e733ad132866a5301d90a9068f2b83ff5d36e907bd958951dc aarch64--musl--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--musl--stable-2023.11-1.sha256 +sha256 3554391a9ae82cc1fe35a6ab0c9efa34a5bac5474b6d527474997256e148c297 aarch64--musl--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--uclibc--bleeding-edge-2023.11-1.sha256 +sha256 02100c2670b441bcd54481bf731215e0d7c9be671407fe15678a9ad03b5056d5 aarch64--uclibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--uclibc--stable-2023.11-1.sha256 +sha256 82fe36e1c02f9662bd3ad59267ba3ae850d67e9e09a1d229ec3f25b691da0065 aarch64--uclibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs/aarch64be--glibc--bleeding-edge-2023.11-1.sha256 +sha256 0594958f0e4822adcd5dcdddc6feec3a23d37afd2dc86c80edd7cef5094c02cf aarch64be--glibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs/aarch64be--glibc--stable-2023.11-1.sha256 +sha256 f622cacaed216dac40461653329dde6f4391f9339ea4b848118f7eff92018b5a aarch64be--glibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs/aarch64be--musl--bleeding-edge-2023.11-1.sha256 +sha256 c495eb4bf875934502e36005499bc28a47b3762b199dcfff57516ce70fe1c0a6 aarch64be--musl--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs/aarch64be--musl--stable-2023.11-1.sha256 +sha256 72016bafd0e0b70c05f5b3f71302b8cd6cd3fce54b4dd9acfb3fb6560af9f30f aarch64be--musl--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs/aarch64be--uclibc--bleeding-edge-2023.11-1.sha256 +sha256 f956f0aec2e6e46cab1e92f0cd7b0fa691eb4202b087758e668d6bcfe773532e aarch64be--uclibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs/aarch64be--uclibc--stable-2023.11-1.sha256 +sha256 39fb6f1d32ad9baa664832d5633d04e2991898a173a4133ed73a36ccbae33f9f aarch64be--uclibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-750d/tarballs/arcle-750d--uclibc--bleeding-edge-2023.11-1.sha256 +sha256 b2a39fc18a3c2b3e10c61ce862fb1c90d53e38ccb21323a7f808ed4004c89d0c arcle-750d--uclibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-750d/tarballs/arcle-750d--uclibc--stable-2023.11-1.sha256 +sha256 1be435efc78ee2ca8d97ba64e45c21f669a3d6f8bad7850f921fdac249e93472 arcle-750d--uclibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-hs38/tarballs/arcle-hs38--glibc--bleeding-edge-2023.11-1.sha256 +sha256 ede78dd37096f3b13ef6797059c7be5d771ffb2361cfeb97be4ce46f90c69309 arcle-hs38--glibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-hs38/tarballs/arcle-hs38--glibc--stable-2023.11-1.sha256 +sha256 91c048fb79152969253a3bb96a9cd77c79c2ba5a3081d2da7cf103069661e303 arcle-hs38--glibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-hs38/tarballs/arcle-hs38--uclibc--bleeding-edge-2023.11-1.sha256 +sha256 970c5176001abac9746f21922b56f9628c8bb1bef8596a5badba1efb05decf33 arcle-hs38--uclibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-hs38/tarballs/arcle-hs38--uclibc--stable-2023.11-1.sha256 +sha256 b6c98633c33fe0ce5d7ba03c0a9bb55ab9a0ded69f3ed3d3813a5c133aa4e3ca arcle-hs38--uclibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs/armv5-eabi--glibc--bleeding-edge-2023.11-1.sha256 +sha256 80b67f939e5cbd1d2fa13fe063fd5d8aca1f5a702adf010547d8904864fe2209 armv5-eabi--glibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs/armv5-eabi--glibc--stable-2023.11-1.sha256 +sha256 06837abc0a4bd7f163d2c1697d1e3d13f4d37f486c3a827f259fe7d3219c9a22 armv5-eabi--glibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs/armv5-eabi--musl--bleeding-edge-2023.11-1.sha256 +sha256 10f67c422fc926c38824e3606e955a37373ca5f337aecd06998e65803379ac3c armv5-eabi--musl--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs/armv5-eabi--musl--stable-2023.11-1.sha256 +sha256 c6bd48c4341bc496fdb37dbda2caef5d2bba69d764aab3c317eaf20554474a38 armv5-eabi--musl--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs/armv5-eabi--uclibc--bleeding-edge-2023.11-1.sha256 +sha256 95f17ecd4de11130b818146fb236ca30d0a0e86eba55bd18b1264d16f45020ff armv5-eabi--uclibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs/armv5-eabi--uclibc--stable-2023.11-1.sha256 +sha256 4ec295deb930584a3da8baab7b23438180195d8bddf03fe9a93ca08ce4bd4a22 armv5-eabi--uclibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs/armv6-eabihf--glibc--bleeding-edge-2023.11-1.sha256 +sha256 8f1ef62275d34c556e4cbe14af429fac250132d2191f4ff86c77f8395edf9e4a armv6-eabihf--glibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs/armv6-eabihf--glibc--stable-2023.11-1.sha256 +sha256 dc71ac978e3e9ec25832decf8490472b3a0998c8d2214468f20bf546ab833ee2 armv6-eabihf--glibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs/armv6-eabihf--musl--bleeding-edge-2023.11-1.sha256 +sha256 48cd51a76e8068c78312ed022d31d12831d9ae8da4d0f23f76429c8f9760663f armv6-eabihf--musl--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs/armv6-eabihf--musl--stable-2023.11-1.sha256 +sha256 3620458bb0fe685d78b0c6645aae547b16df0e7966f4d66d672500c96aafd787 armv6-eabihf--musl--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs/armv6-eabihf--uclibc--bleeding-edge-2023.11-1.sha256 +sha256 3aee5156a27adb30311a3878fa8028fa103dfad08dda4f417087c5b2f271aee9 armv6-eabihf--uclibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs/armv6-eabihf--uclibc--stable-2023.11-1.sha256 +sha256 07df70ed0812549bb4e8b8ff930e6a5ce0952e00a19b534223b469728412bf29 armv6-eabihf--uclibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--glibc--bleeding-edge-2023.11-1.sha256 +sha256 609ac558671aa69e1200dc27204136efbef4bbc6dd98f4b77f24717e38797a77 armv7-eabihf--glibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--glibc--stable-2023.11-1.sha256 +sha256 d0a575b156e5c481dbe079cd3e292fb8eefed39392a90cdde871e7b9e77fd420 armv7-eabihf--glibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--musl--bleeding-edge-2023.11-1.sha256 +sha256 fcc4421b04ede8996d350a3517890c48ba200a9102787ddd288f2c5037b3de4c armv7-eabihf--musl--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--musl--stable-2023.11-1.sha256 +sha256 c01a2b2a762b0e19a7847f4877ba5b35d90bd7e23704956dfe575e8113a1ad7a armv7-eabihf--musl--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--uclibc--bleeding-edge-2023.11-1.sha256 +sha256 ded310ccbe78d411f9e027d7b8e4029746b86aa0d66a7151dcf50f49ebcbf85b armv7-eabihf--uclibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--uclibc--stable-2023.11-1.sha256 +sha256 39fcb1928454392112f0a5168b2e284d3564a24dff116efdcb71c67b672682ca armv7-eabihf--uclibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs/armebv7-eabihf--glibc--bleeding-edge-2023.11-1.sha256 +sha256 d16d65752cc6ea0f81661aac23322cd48fb3b5608bb30588667d8191fecf8fab armebv7-eabihf--glibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs/armebv7-eabihf--glibc--stable-2023.11-1.sha256 +sha256 8294077f6be32fc4a3a76d8802d179e30a35bcf104ac90e6bdfe1d51827e11a9 armebv7-eabihf--glibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs/armebv7-eabihf--musl--bleeding-edge-2023.11-1.sha256 +sha256 a6c478cf6916d82589628d35d1317415bcd6f86455facc1453f8cffdf524092d armebv7-eabihf--musl--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs/armebv7-eabihf--musl--stable-2023.11-1.sha256 +sha256 cb316d86590f49c29fe1a99988d8a71001a6b76cf996a7c0c15b648b017899f8 armebv7-eabihf--musl--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs/armebv7-eabihf--uclibc--bleeding-edge-2023.11-1.sha256 +sha256 f88e930fdb895aaf9edf5d168c57a8672e46900f326e9c3c2146b81c2a3807b6 armebv7-eabihf--uclibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs/armebv7-eabihf--uclibc--stable-2023.11-1.sha256 +sha256 fc20f9c0e9551b2d5e0ffd1154aa8d282589503c8e239b049fc719974f338e76 armebv7-eabihf--uclibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7m/tarballs/armv7m--uclibc--bleeding-edge-2023.11-1.sha256 +sha256 ffacf7a1e9d376a487e5d2fb0788a3f2a37d9da3b8daab5cdecc0a502cc0cd37 armv7m--uclibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7m/tarballs/armv7m--uclibc--stable-2023.11-1.sha256 +sha256 3baeaa139d8263477baaa51da8ad2e5e8129c71bf0a7b956543b3c4f7a40b36a armv7m--uclibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs/m68k-68xxx--glibc--bleeding-edge-2023.11-1.sha256 +sha256 f7a41da2a2765d67ee3184df876741a459c6f85024dcc7434bd10f27451f6ecd m68k-68xxx--glibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs/m68k-68xxx--glibc--stable-2023.11-1.sha256 +sha256 79b120e67b7f17a1f265f5a5685b602ee3755f32047c657d837e9fc5c9ac7afa m68k-68xxx--glibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs/m68k-68xxx--musl--bleeding-edge-2023.11-1.sha256 +sha256 20c700a7c16b7fec587cd2b2269875ee53d33f1141e29900c53c5855f59acf9e m68k-68xxx--musl--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs/m68k-68xxx--musl--stable-2023.11-1.sha256 +sha256 83ce067a39a6c6e5b1771b6ccfc2e7028bb479b8bcb28694ad96b5595767ac4d m68k-68xxx--musl--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs/m68k-68xxx--uclibc--bleeding-edge-2023.11-1.sha256 +sha256 8c9d1628519b233c8377d9a6906c31ea08a2df73ec72f5b368b23318aeea8dbc m68k-68xxx--uclibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs/m68k-68xxx--uclibc--stable-2023.11-1.sha256 +sha256 17bec666be6c4d7d796055fa04c180dd41dc8f85898e1177c36585642fbb1496 m68k-68xxx--uclibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-coldfire/tarballs/m68k-coldfire--uclibc--bleeding-edge-2023.11-1.sha256 +sha256 3bf997d9333430de431811c09b7b47551b134b70a6bce7f93aea86b39efd75fc m68k-coldfire--uclibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-coldfire/tarballs/m68k-coldfire--uclibc--stable-2023.11-1.sha256 +sha256 87e6f40abe2a17eca8c60b3fa15dab7c2f6cbda34a2bc79f5228d71927337158 m68k-coldfire--uclibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--glibc--bleeding-edge-2023.11-1.sha256 +sha256 d05a6bdd547ca1b8f72a64989af3fa46db2ec054d319310dc3219a2414f11e67 microblazebe--glibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--glibc--stable-2023.11-1.sha256 +sha256 cdb5de2bd88c0ec95f24d56550b47eb256e74f10f7e579da4bcb486d0198d138 microblazebe--glibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--musl--bleeding-edge-2023.11-1.sha256 +sha256 55c14a3b40036029aedad93e64e7e33f590808608eb446cc641e6bf28b4bea58 microblazebe--musl--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--musl--stable-2023.11-1.sha256 +sha256 93fe4e169b35e84dbd55e1ac97722b0f685e88701171ee4af24e89f54aa647ff microblazebe--musl--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--uclibc--bleeding-edge-2023.11-1.sha256 +sha256 ebbafd02b80bbd65c79644aba48da3ef471fe43c89e7c257b57c881048f35033 microblazebe--uclibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--uclibc--stable-2023.11-1.sha256 +sha256 cee44f3c1f87dfaac941df61a27ab854e1e0898978d484214782369b5a324029 microblazebe--uclibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--glibc--bleeding-edge-2023.11-1.sha256 +sha256 04f90560bb9bf8905ac2f5ca7b3d9484fcb29b25e296612cc28a9d6551c3363c microblazeel--glibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--glibc--stable-2023.11-1.sha256 +sha256 d3ab9b6ef87c793c236b599e93e39df001faeb4f8f402fb496e4f456a4aa709a microblazeel--glibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--musl--bleeding-edge-2023.11-1.sha256 +sha256 bf539dda6f5793c8d5b64add457f72bac4aa41c27369e67c79079ef683c653d3 microblazeel--musl--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--musl--stable-2023.11-1.sha256 +sha256 2f2018e378a0f6c7075766239217b268fd45a0103ac5af5143869ca49db3cb56 microblazeel--musl--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--uclibc--bleeding-edge-2023.11-1.sha256 +sha256 24c1687ae24ad115129261ba34be831d65e5aae4f0f1536fd5df7ed9c1e53da6 microblazeel--uclibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--uclibc--stable-2023.11-1.sha256 +sha256 40c25f81998bf10e73f9a8f5934d8c8028adfb1ff8436abd8e8ecccdc25ad82d microblazeel--uclibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs/mips32--glibc--bleeding-edge-2023.11-1.sha256 +sha256 fb7fb26666b9d8d2cac1aadb18f2cb7819b8b3a1ec26800b12594791bfa72604 mips32--glibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs/mips32--glibc--stable-2023.11-1.sha256 +sha256 062d5df972b7b628337fdecba84cbe2b33f9c863e59c9702556ef252e7b44750 mips32--glibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs/mips32--musl--bleeding-edge-2023.11-1.sha256 +sha256 91b6680324773afad77a211acf1357cd06526faa860943267fdb0ffa61a845f0 mips32--musl--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs/mips32--musl--stable-2023.11-1.sha256 +sha256 c0053f5475d960a7a1a2872ebddaf7f054aa55337dd2d6c4e81c25758244a75f mips32--musl--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs/mips32--uclibc--bleeding-edge-2023.11-1.sha256 +sha256 66edf00bd30bb1ac0885aeb891679f2e2ba33910d99e7cd85bab4400ffc014f3 mips32--uclibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs/mips32--uclibc--stable-2023.11-1.sha256 +sha256 5f4f81dbc9b7faff25dc4e3223562d5f064cf31e628eec7902b3b00c66153ed1 mips32--uclibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs/mips32el--glibc--bleeding-edge-2023.11-1.sha256 +sha256 90afdb045301503974a7337822645c975766b1749472a4b98de8251737e97434 mips32el--glibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs/mips32el--glibc--stable-2023.11-1.sha256 +sha256 60fc28d1521dfeefbfedb20776eeadec5b9bade7a55d0ea0c901766f722da3bd mips32el--glibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs/mips32el--musl--bleeding-edge-2023.11-1.sha256 +sha256 b22b3eb247529eb320f2d5d1cec0b903c2509ef11b16ca77715f62bba0d687b0 mips32el--musl--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs/mips32el--musl--stable-2023.11-1.sha256 +sha256 a76bdda55776c0b1a546ef20652b78134b96bdefa4f8cc792eb46d913df9138b mips32el--musl--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs/mips32el--uclibc--bleeding-edge-2023.11-1.sha256 +sha256 4106d5a4c45b6200cfaccb78a61344120d2e4610cea5e14168a9ab7a50e869c3 mips32el--uclibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs/mips32el--uclibc--stable-2023.11-1.sha256 +sha256 9aa9b2d99778ae8848ba629690cda55a9fee4175016b551c7726995a57b80478 mips32el--uclibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs/mips32r5el--glibc--bleeding-edge-2023.11-1.sha256 +sha256 c50c257de4ed262fb2a82b3eaa973d927d3a36506214918e4b7a9c4b208f5622 mips32r5el--glibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs/mips32r5el--glibc--stable-2023.11-1.sha256 +sha256 58a7b63b8a957d99146218aaa28bdf5d01bd64cb6e97c50592f6bbe09b0d76a0 mips32r5el--glibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs/mips32r5el--musl--bleeding-edge-2023.11-1.sha256 +sha256 3ad2cef7e834c565a9cb9ccfb3576c87ecbc7f0a7d460b071cecfeb6b867704e mips32r5el--musl--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs/mips32r5el--musl--stable-2023.11-1.sha256 +sha256 571abc2312dae8b4e49effbd0e81bdf48523427512f5a24744c0c4d3d6a9af35 mips32r5el--musl--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs/mips32r5el--uclibc--bleeding-edge-2023.11-1.sha256 +sha256 047296dbb1a33a98ec7b4b7ef7e34fca97cb44d86f7f1e6832bb0490471263b4 mips32r5el--uclibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs/mips32r5el--uclibc--stable-2023.11-1.sha256 +sha256 7c92a47bd9e22445ec4bde739866f5ab75dfacac8a73d687165774c5a124b7cf mips32r5el--uclibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs/mips32r6el--glibc--bleeding-edge-2023.11-1.sha256 +sha256 114c1b6cfc6b0eae974fb1141b40ec4fc49f10c398fd345845afbcc34a345e22 mips32r6el--glibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs/mips32r6el--glibc--stable-2023.11-1.sha256 +sha256 6dd4457db666b58707f5e2d36d5c3045506f6f90d8f754d6321fa6758be3aa0e mips32r6el--glibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs/mips32r6el--musl--bleeding-edge-2023.11-1.sha256 +sha256 d1e03c69e1365582c2ab8962a4279c0f83753dc95b754d9deec96aa18eec54ce mips32r6el--musl--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs/mips32r6el--musl--stable-2023.11-1.sha256 +sha256 35d831a96647305ed674e5127e1f8dc6fc4b14d3f94aa867ef47eeef8c0becb6 mips32r6el--musl--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs/mips32r6el--uclibc--bleeding-edge-2023.11-1.sha256 +sha256 22e09f0d9c69a4dbe3bc0602579fff19dc3820d92aed73b202714a8728b4d0d6 mips32r6el--uclibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs/mips32r6el--uclibc--stable-2023.11-1.sha256 +sha256 383c82e3c0accba7b0b5b1c3bfd5e4ee4521932f525823a95724aa3ff796d0be mips32r6el--uclibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs/mips64-n32--glibc--bleeding-edge-2023.11-1.sha256 +sha256 dd43c76fa9d5b0894582912cf3c1a562e0b8f401910952aadcec856c209b055c mips64-n32--glibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs/mips64-n32--glibc--stable-2023.11-1.sha256 +sha256 e17670f46efcac70105bd360573fcee3b9e2410a688806ec90f6012a419b88d2 mips64-n32--glibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs/mips64-n32--musl--bleeding-edge-2023.11-1.sha256 +sha256 bf442bd32f0a7cb0fe0e2ea229f08bd65af6f471478599aa0b80ab484186a56f mips64-n32--musl--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs/mips64-n32--musl--stable-2023.11-1.sha256 +sha256 a7c733e4695d9851bb70d03b40e84ae75383bffd20894293718f24a6284bd071 mips64-n32--musl--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs/mips64-n32--uclibc--bleeding-edge-2023.11-1.sha256 +sha256 10b53c93acb9a8cb29137156dc859fd10ccb8a2edee12fbd70e11658fd0c3643 mips64-n32--uclibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs/mips64-n32--uclibc--stable-2023.11-1.sha256 +sha256 e6fe6d734c2c2044b48413d19b75af3dd8b9e8d470f29c98001ab1d833d7c5bf mips64-n32--uclibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs/mips64el-n32--glibc--bleeding-edge-2023.11-1.sha256 +sha256 d3f022b9a550a4c132b7b569ffee1450ba9aa3821b937df9acb4a5a50e9c0404 mips64el-n32--glibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs/mips64el-n32--glibc--stable-2023.11-1.sha256 +sha256 e2d1a56763c8680f458f66962749b14992985721fb63621dd3907096205fdf5b mips64el-n32--glibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs/mips64el-n32--musl--bleeding-edge-2023.11-1.sha256 +sha256 688a5749fad712ca241f64be4b6e96cbfab98dbd528eb0e6c477f2d466215b2a mips64el-n32--musl--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs/mips64el-n32--musl--stable-2023.11-1.sha256 +sha256 c108ccfd651d89af088777b5cc1aebb6a2be24107875c93c00af94da3edcec53 mips64el-n32--musl--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs/mips64el-n32--uclibc--bleeding-edge-2023.11-1.sha256 +sha256 c0fe0e58eff17318fd7783b85d9b7586dfa67cea60d7ff0b245af07e55a8334a mips64el-n32--uclibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs/mips64el-n32--uclibc--stable-2023.11-1.sha256 +sha256 66f8c87c8649a32c597863791cfec8c44c1edc0a3438dc6919fd164541318fc0 mips64el-n32--uclibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs/mips64r6el-n32--glibc--bleeding-edge-2023.11-1.sha256 +sha256 10b1215c32c441d004c0020c3512ff23447da89fe0a24e86de35590fa8ea74d3 mips64r6el-n32--glibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs/mips64r6el-n32--glibc--stable-2023.11-1.sha256 +sha256 30aa25c3bcbd085d8bd22a1055f083e9bf7d37dcf91847651dda802d1ee99295 mips64r6el-n32--glibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs/mips64r6el-n32--musl--bleeding-edge-2023.11-1.sha256 +sha256 ba6a72fdb04b5b4741ad5562a7baf881b83bdad245cdc5cc7ba2b2f1fc481dae mips64r6el-n32--musl--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs/mips64r6el-n32--musl--stable-2023.11-1.sha256 +sha256 7efe8e663f909e382bfa1035c231051757c3d66a79640864db3b2182b6d122ca mips64r6el-n32--musl--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs/mips64r6el-n32--uclibc--bleeding-edge-2023.11-1.sha256 +sha256 d259f6b0b78da1296106b070630cc08f7d346af4b57d15f348b53a3a531e4e23 mips64r6el-n32--uclibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs/mips64r6el-n32--uclibc--stable-2023.11-1.sha256 +sha256 f55e95fb54c7d71274f5050941925c11d180fe7e98c0f0d1b91e8b36672e235e mips64r6el-n32--uclibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/nios2/tarballs/nios2--glibc--bleeding-edge-2023.11-1.sha256 +sha256 aef966d00fde3297115ac0ae52226b61f8d8f89efc46c15ebf796d8d9a64b951 nios2--glibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/nios2/tarballs/nios2--glibc--stable-2023.11-1.sha256 +sha256 d9d6137443055c1e7ae086ab746ab1246d0772aec85db61b04e0fcc0acdf655e nios2--glibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--glibc--bleeding-edge-2023.11-1.sha256 +sha256 cd9489ab73dbcf7a2f915b4c75021c22d43cb4bd3c8a2bd95f324040a2d548c1 openrisc--glibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--glibc--stable-2023.11-1.sha256 +sha256 35eb515b554a8dcb60cae731aba49b9588cfec379f434d106de9a971015d7cf1 openrisc--glibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--musl--bleeding-edge-2023.11-1.sha256 +sha256 7efab1b6d4ef49f0c4be87992567a510f7147a0e131bbfc7f88c06ac399048ff openrisc--musl--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--musl--stable-2023.11-1.sha256 +sha256 2ece0d83ae58072d8ca22043b19f1121ecefadd456ca4d33737696c667307a47 openrisc--musl--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--uclibc--bleeding-edge-2023.11-1.sha256 +sha256 04e0941036df0478c809c9bda56d2425ccaf48665c311de6605a8b050107665a openrisc--uclibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--uclibc--stable-2023.11-1.sha256 +sha256 a83587690bef62c3d45458db20efb101b41c55695da2f38fdb2998e4b3ccadc9 openrisc--uclibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--glibc--bleeding-edge-2023.11-1.sha256 +sha256 78aca713c2aaf75b176a5334cf3af8387037bcce5960d8638f728feb90c84d84 powerpc-440fp--glibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--glibc--stable-2023.11-1.sha256 +sha256 12760035aa457b31b58eefb1b4c0b76b87021b8fddee721c390a536adcc308aa powerpc-440fp--glibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--musl--bleeding-edge-2023.11-1.sha256 +sha256 49ae0f78dd343c5b40b2d732b58d34f1203e3e50f13b767d160c98efeda404f4 powerpc-440fp--musl--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--musl--stable-2023.11-1.sha256 +sha256 9bfd63773d1cd8e1cf6f83c12dbe0ecf9759df2858da46cc3dac2bfb4c8a7c67 powerpc-440fp--musl--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--uclibc--bleeding-edge-2023.11-1.sha256 +sha256 b7f5407567e636c6efc765f4a1e32cb64a166c6a863b9ac42589f8834e4ed6d8 powerpc-440fp--uclibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--uclibc--stable-2023.11-1.sha256 +sha256 e60268e6826db3574cf2bc74c53daa92db2dd48de2884f3c25be41656bd4e5ef powerpc-440fp--uclibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs/powerpc-e300c3--glibc--bleeding-edge-2023.11-1.sha256 +sha256 0b5d51e7b5d991025d934a30711f07cfe482ad3ccccdb4608638eec0910f0d7b powerpc-e300c3--glibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs/powerpc-e300c3--glibc--stable-2023.11-1.sha256 +sha256 cafdd55bd0f82aaef09203eeee1a7294f6cf8cf6b4cc669f8a5cdd01e897d4e7 powerpc-e300c3--glibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs/powerpc-e300c3--musl--bleeding-edge-2023.11-1.sha256 +sha256 9ddec25bccd33ccbabdfa3140a7f1b7283ff2443e83ef5f3be12e95b9a256d7f powerpc-e300c3--musl--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs/powerpc-e300c3--musl--stable-2023.11-1.sha256 +sha256 fcf15c1bb605abb906b7f6b7d2d5ba1a16de9b2eb03ae4d57d8b4480ce295371 powerpc-e300c3--musl--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs/powerpc-e300c3--uclibc--bleeding-edge-2023.11-1.sha256 +sha256 db57a356f63111d7c615cb1f1095f6193c453709facd41c3d492a423f5ff5070 powerpc-e300c3--uclibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs/powerpc-e300c3--uclibc--stable-2023.11-1.sha256 +sha256 e27984bbee08d4f1a794ce90e1b78e68ee8750403666452525e7360655d99f32 powerpc-e300c3--uclibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs/powerpc-e500mc--glibc--bleeding-edge-2023.11-1.sha256 +sha256 07b26929d9f2a8d0225a1df4b4f01497e475478c4f5d5465a810585dd4b44a4a powerpc-e500mc--glibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs/powerpc-e500mc--glibc--stable-2023.11-1.sha256 +sha256 e0b50deb4ffba15fcead9ecea75a6f4af6feca6012a60ddd76591874a47e5338 powerpc-e500mc--glibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs/powerpc-e500mc--musl--bleeding-edge-2023.11-1.sha256 +sha256 89302d5660e58e68fdf75d238ead582c586d26c0aa717bb5cd3d1f024420c400 powerpc-e500mc--musl--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs/powerpc-e500mc--musl--stable-2023.11-1.sha256 +sha256 59274e8641885915e226083f4474606f17600cc09e8a097129e9e04ee29a672a powerpc-e500mc--musl--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs/powerpc-e500mc--uclibc--bleeding-edge-2023.11-1.sha256 +sha256 5f9db756eeb6d8c76574a578f823368a78e437204534d071fed63fe967156dd6 powerpc-e500mc--uclibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs/powerpc-e500mc--uclibc--stable-2023.11-1.sha256 +sha256 7b6921f004698556681aa26ea0091931b5bd71bf0a785ff947d5b02c86d77f37 powerpc-e500mc--uclibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e5500/tarballs/powerpc64-e5500--glibc--bleeding-edge-2023.11-1.sha256 +sha256 814de1a235c805ec6a0035cf8633e5a31fdcec93a3aaaabf44cb0ca23eaa1d93 powerpc64-e5500--glibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e5500/tarballs/powerpc64-e5500--glibc--stable-2023.11-1.sha256 +sha256 3e55842372cfb4ac35ccfb4a1cf1ccc1a207eaa27fa0c8d32641cda07316b93b powerpc64-e5500--glibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e6500/tarballs/powerpc64-e6500--glibc--bleeding-edge-2023.11-1.sha256 +sha256 1e4e9684763822079cc3df10b290510cb4241706f287835ec1a07ec309d2b8a7 powerpc64-e6500--glibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e6500/tarballs/powerpc64-e6500--glibc--stable-2023.11-1.sha256 +sha256 ef93463f56824079cc4cc849892004d9d06316011c51063d6c88838369065717 powerpc64-e6500--glibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e6500/tarballs/powerpc64-e6500--musl--bleeding-edge-2023.11-1.sha256 +sha256 facb722bb19e7bf837a65a3ff15d4d80918dc36fe3a3f87a760d759f616d1d91 powerpc64-e6500--musl--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e6500/tarballs/powerpc64-e6500--musl--stable-2023.11-1.sha256 +sha256 fff880e6fc09efe3d5aaaa6a561fb6af3885dbeae8a73b1981c072196c3abc4a powerpc64-e6500--musl--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-power8/tarballs/powerpc64-power8--glibc--bleeding-edge-2023.11-1.sha256 +sha256 d8c135613d6d75d9974c3da437628bea05d93c7db3a86bc092979621621cb773 powerpc64-power8--glibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-power8/tarballs/powerpc64-power8--glibc--stable-2023.11-1.sha256 +sha256 cd74cbce020c82966bdf2d4a1cb3de682043939c6dd3ad211d45ddfe56edcaaa powerpc64-power8--glibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-power8/tarballs/powerpc64-power8--musl--bleeding-edge-2023.11-1.sha256 +sha256 6dbcdd017bbb21179f47e17298b3de78a44d6991f51f57b584f30bb76817c76f powerpc64-power8--musl--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-power8/tarballs/powerpc64-power8--musl--stable-2023.11-1.sha256 +sha256 f8496ecc9019cabb3fc1515da26a051abae4cc60c530619f0bef5d82c56f8a7a powerpc64-power8--musl--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64le-power8/tarballs/powerpc64le-power8--glibc--bleeding-edge-2023.11-1.sha256 +sha256 04effeaf9d9e1961fe65f54015b92e329ce2cbe6c66af10b21519d0cd06a7236 powerpc64le-power8--glibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64le-power8/tarballs/powerpc64le-power8--glibc--stable-2023.11-1.sha256 +sha256 606f82f3b218791f4411082ff7f6c7ab6e8955b5a3537f0f61646b9594402458 powerpc64le-power8--glibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64le-power8/tarballs/powerpc64le-power8--musl--bleeding-edge-2023.11-1.sha256 +sha256 79ae7450434e969643018e4ddb249716c9c631a2a39937b5cd183393477d5410 powerpc64le-power8--musl--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64le-power8/tarballs/powerpc64le-power8--musl--stable-2023.11-1.sha256 +sha256 c9402692c883f5512b966fe517038d9b30b93de328dd5dd2e7af20d25e4509ca powerpc64le-power8--musl--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv32-ilp32d/tarballs/riscv32-ilp32d--glibc--bleeding-edge-2023.11-1.sha256 +sha256 19bd2ecfd1f7a56795ed1807ddadbbe3d0807fc19bb95625ca5a126810bd3fc4 riscv32-ilp32d--glibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs/riscv64-lp64d--glibc--bleeding-edge-2023.11-1.sha256 +sha256 7a53268f429109ee416df5ed6ef47b1a2d88d7760371aabaf8f4f24481dfb89e riscv64-lp64d--glibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs/riscv64-lp64d--glibc--stable-2023.11-1.sha256 +sha256 80e84af7ebed4e8e52fc2d17994f7bcb2e7bdc069e2d1f1c4656977cd73d9d5d riscv64-lp64d--glibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs/riscv64-lp64d--musl--bleeding-edge-2023.11-1.sha256 +sha256 023dadabe58ff6079b27ebfde9495440180dc473b8c5da2c55e95ce68e095c15 riscv64-lp64d--musl--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs/riscv64-lp64d--musl--stable-2023.11-1.sha256 +sha256 09522ec60b13766090acaa715402cb11edaa39217642fbd7315fbe37b6032275 riscv64-lp64d--musl--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs/riscv64-lp64d--uclibc--bleeding-edge-2023.11-1.sha256 +sha256 fcfa3624eb6024b55c264ec87790265beab393cfc8f867afda8954e4c3b744c4 riscv64-lp64d--uclibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs/riscv64-lp64d--uclibc--stable-2023.11-1.sha256 +sha256 aebb6034d3512e3c29337c368dcf4a1e58756c725032d814047a3635178cb5ad riscv64-lp64d--uclibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/s390x-z13/tarballs/s390x-z13--glibc--bleeding-edge-2023.11-1.sha256 +sha256 716031aaa6b2d566b0c9abf3992f1b7dabc845eb81934ec97ce0ff37157c9269 s390x-z13--glibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/s390x-z13/tarballs/s390x-z13--glibc--stable-2023.11-1.sha256 +sha256 4ff3c21eb060c9df2e795fab18fa267300a581ba3fa55e62084e9233c386515f s390x-z13--glibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--glibc--bleeding-edge-2023.11-1.sha256 +sha256 96b9082e3ee2b7c7b8170fa8d93f50629d170f4dfc345978327ed562d0efe42b sh-sh4--glibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--glibc--stable-2023.11-1.sha256 +sha256 e957c0854780cb48b0fcb54eddf9ef40ed496b8fb3d0c905f9c36dd8263f3cf0 sh-sh4--glibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--musl--bleeding-edge-2023.11-1.sha256 +sha256 57e28d5a164fdcaed5a6cfd1225e346e873d4e48f8f1ced8153af0c8669bd081 sh-sh4--musl--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--musl--stable-2023.11-1.sha256 +sha256 b6847ac7355ad469d752799ffa08df4eef2a7ba49974242e1cefa9d9720bc894 sh-sh4--musl--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--uclibc--bleeding-edge-2023.11-1.sha256 +sha256 ee15660db075af19c7e768da73c6f57336b4201bd397e20fdd0357630fdf4e40 sh-sh4--uclibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--uclibc--stable-2023.11-1.sha256 +sha256 8d0e0f3a54cb5b601d7c9c093138ba537e11f400a3e44ee0b10d28b96f9704fb sh-sh4--uclibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4aeb/tarballs/sh-sh4aeb--glibc--bleeding-edge-2023.11-1.sha256 +sha256 760b5970d4c9b82bd6d469a142713bc70564a83d86123b1c5ae1fb0ccf9711d7 sh-sh4aeb--glibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4aeb/tarballs/sh-sh4aeb--glibc--stable-2023.11-1.sha256 +sha256 e734eeba730881e1135abb94797ece8865b924ff31c918df93fcfbf21dddba7d sh-sh4aeb--glibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4aeb/tarballs/sh-sh4aeb--musl--bleeding-edge-2023.11-1.sha256 +sha256 d2a7024ca6869117118e136c8577d11c954acfd4aa71112f431be0c76fffea2f sh-sh4aeb--musl--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4aeb/tarballs/sh-sh4aeb--musl--stable-2023.11-1.sha256 +sha256 3e48605bbf9407f9625cc367b55ab35f20a308cb44c69e85583b2fe10c9c604d sh-sh4aeb--musl--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sparc64/tarballs/sparc64--glibc--bleeding-edge-2023.11-1.sha256 +sha256 8ee180782f8094d90e28e4977ea018094363d0678c1d149838098bedcab4aa71 sparc64--glibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sparc64/tarballs/sparc64--glibc--stable-2023.11-1.sha256 +sha256 78eeafc8c9b28dbf5a90d2f8ebc4e1a0623147e5f4bdbcd29b32d6ee760c9d1b sparc64--glibc--stable-2023.11-1.tar.bz2 # From https://toolchains.bootlin.com/downloads/releases/toolchains/sparcv8/tarballs/sparcv8--uclibc--bleeding-edge-2022.08-2.sha256 sha256 ccd4110fa574d2323f038394c0603245384002fbe906204db36fe200c9c8f886 sparcv8--uclibc--bleeding-edge-2022.08-2.tar.bz2 # From https://toolchains.bootlin.com/downloads/releases/toolchains/sparcv8/tarballs/sparcv8--uclibc--stable-2022.08-1.sha256 sha256 da3b9f0a936401cbd3cc305b86d3611531391354cc0226a0eeb3ce4ddcc7b7dc sparcv8--uclibc--stable-2022.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--glibc--bleeding-edge-2023.08-1.sha256 -sha256 e896274d4c540a45da02c1a167264116314b5e3afd298b79f28554b0f4eb498d x86-64--glibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--glibc--stable-2023.08-1.sha256 -sha256 d6eca7f1ea736ef6f868a027a9d0baa875f9513755026aed2badc04a2b9cd7bd x86-64--glibc--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--musl--bleeding-edge-2023.08-1.sha256 -sha256 cdef47dd21b099c0b3d97e89ce2a2eb3939e6021ca8f77b8adb0f7ae36f01dc4 x86-64--musl--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--musl--stable-2023.08-1.sha256 -sha256 e07d11f32a7552bd5155530333d7b3ac9ef5627e10072fd05fbc093cd1f88c50 x86-64--musl--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--uclibc--bleeding-edge-2023.08-1.sha256 -sha256 8f35f75ce07f76a776dc08fa4b5f36bb0295c62aa70db0b4eca51a99a80b3bba x86-64--uclibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--uclibc--stable-2023.08-1.sha256 -sha256 cd6ead4a50380fa3346d1d20697f9ad4f3ca93f52d9e5c4000d06f340d766580 x86-64--uclibc--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs/x86-64-v2--glibc--bleeding-edge-2023.08-1.sha256 -sha256 dbb470879dff87a6a99f6736959f5b38f6cce665b1f9c56c1c6450663c0f07de x86-64-v2--glibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs/x86-64-v2--glibc--stable-2023.08-1.sha256 -sha256 fd5a2031e1ef2d01de8ba26ce7c445ba7c7fd9ddae9507dfdde8a784d32c7bb7 x86-64-v2--glibc--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs/x86-64-v2--musl--bleeding-edge-2023.08-1.sha256 -sha256 0fca4c4eb07abd94535a961304af89a9a0e805f7f208b51d806e8ff1817e9f01 x86-64-v2--musl--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs/x86-64-v2--musl--stable-2023.08-1.sha256 -sha256 dcb7044492f51a5bc7920b78f377d37b48dedb9082cc38c6d6ad4058373f2616 x86-64-v2--musl--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs/x86-64-v2--uclibc--bleeding-edge-2023.08-1.sha256 -sha256 8fa29561f0b783c88a9929cd909fdc86ca4430656c6a7887ac412fbc38892b02 x86-64-v2--uclibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs/x86-64-v2--uclibc--stable-2023.08-1.sha256 -sha256 8c412f719f30ce1ea1f7123cdbc72a432e46d47596fb55c35d6db64e571e3c05 x86-64-v2--uclibc--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs/x86-64-v3--glibc--bleeding-edge-2023.08-1.sha256 -sha256 8c2a9de04b56a33ca55190e4479d5ebea17e853fd1ad38eb4750868f2bf459ee x86-64-v3--glibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs/x86-64-v3--glibc--stable-2023.08-1.sha256 -sha256 fc3be4d3e6f04f48c11cd33689b9fad37af2c7b23ffc23bc2d72108b012e9b81 x86-64-v3--glibc--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs/x86-64-v3--musl--bleeding-edge-2023.08-1.sha256 -sha256 ee3c55397a4dacb12ce8dad82e9e1da6aec3014458385665892524125882a82c x86-64-v3--musl--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs/x86-64-v3--musl--stable-2023.08-1.sha256 -sha256 b714633981e49954f0164795508710183ddfeb471c748328e5088809ca3cc588 x86-64-v3--musl--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs/x86-64-v3--uclibc--bleeding-edge-2023.08-1.sha256 -sha256 1954fdc6a49d0f5c784fa270269c908138518106b4e445d0961fe245b9f408a9 x86-64-v3--uclibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs/x86-64-v3--uclibc--stable-2023.08-1.sha256 -sha256 addce3971dd028ea8772e3f683d2b65e5703de1279d4f5d0c82269570dfb98c2 x86-64-v3--uclibc--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs/x86-64-v4--glibc--bleeding-edge-2023.08-1.sha256 -sha256 59cc1a8d860fd63a597efa863a47dfdecb489723678dfee6386e0970fb556693 x86-64-v4--glibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs/x86-64-v4--glibc--stable-2023.08-1.sha256 -sha256 48e8c2095b065a658f55a19ecf2e3c15533b5e8d4d3b7cf1676305c6b660a135 x86-64-v4--glibc--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs/x86-64-v4--musl--bleeding-edge-2023.08-1.sha256 -sha256 03ad7a76121551bce3645835286c43d75e73d397f715fb41e60635f9139711f2 x86-64-v4--musl--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs/x86-64-v4--musl--stable-2023.08-1.sha256 -sha256 e8c74dfe36a4e6c79808d7fe10ddcee546fdbdcb2994bd60bfbf8e6a14ab7abd x86-64-v4--musl--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs/x86-64-v4--uclibc--bleeding-edge-2023.08-1.sha256 -sha256 6220868a0f3ba104a21eb6bdecaed30fb5e625a39899abd753b1d60ef3204196 x86-64-v4--uclibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs/x86-64-v4--uclibc--stable-2023.08-1.sha256 -sha256 1cddc357e6af9f10814e628b92acdb3142a305f5050541eeb82463060295bc63 x86-64-v4--uclibc--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--glibc--bleeding-edge-2023.08-1.sha256 -sha256 64aa0e9a7face18330aee47f4314229c10c559fea9d0ff4ccf0f8a5dbee81b94 x86-64-core-i7--glibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--glibc--stable-2023.08-1.sha256 -sha256 78360790108be258bd5f9d4a0dfbc7fc51159cff9943d25b2bf40db0b6530593 x86-64-core-i7--glibc--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--musl--bleeding-edge-2023.08-1.sha256 -sha256 4c49c759c7371330df3e83a28f9428a832455c9efab8450b30d124e766815ebc x86-64-core-i7--musl--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--musl--stable-2023.08-1.sha256 -sha256 7e16c0e6f2924e0c57c3c7f7ebe48af42f97bab77978fbe72dbee49eddbbdc73 x86-64-core-i7--musl--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--uclibc--bleeding-edge-2023.08-1.sha256 -sha256 3a2aabaf3287f2c2149809cd4bfa335730edfaed13a93dcc3a3550d7a00e09d1 x86-64-core-i7--uclibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--uclibc--stable-2023.08-1.sha256 -sha256 4fd2aa823492307e840152cc5d0b56dac22b2891975c465a83e14cb42bc0caa1 x86-64-core-i7--uclibc--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--glibc--bleeding-edge-2023.08-1.sha256 -sha256 4c6fa3c7f43ae68f7bff28f609176e8cd06985dd90582c27e81b2ed5f0a69dd4 x86-core2--glibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--glibc--stable-2023.08-1.sha256 -sha256 63a868a1813f67a1f54c6213fe2514e7f5c94bf440cff7941442e5ebe3aa0a8b x86-core2--glibc--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--musl--bleeding-edge-2023.08-1.sha256 -sha256 1d2c421fe9f2f4fb8fffb427264c7be39b9fcba1e4cb56486a6676082f07dbe3 x86-core2--musl--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--musl--stable-2023.08-1.sha256 -sha256 74a544e52bebd8bd1aeb30838bc59c86dc220648f324a7a7b61d2cdea8fdae50 x86-core2--musl--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--uclibc--bleeding-edge-2023.08-1.sha256 -sha256 21efd75d421e72d5612b4f8b7a1daa649e5fa78c73ad47ec55629df5d486a137 x86-core2--uclibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--uclibc--stable-2023.08-1.sha256 -sha256 f161582dda7a8d4cd8fabb728dda0844f70aa0008d94be1b91d012a0a7966315 x86-core2--uclibc--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--glibc--bleeding-edge-2023.08-1.sha256 -sha256 97041d43941afefc4b950623be6a364434adc6a31f5a506ea578c9530a6e0f04 x86-i686--glibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--glibc--stable-2023.08-1.sha256 -sha256 bba2e990fa8cd6a156c0a4acd909e9f8265708772f2b2c438fe2c294bdbae313 x86-i686--glibc--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--musl--bleeding-edge-2023.08-1.sha256 -sha256 f2efb6b34c5b04940163fa2c91b9fcc9f76c5a5532bca2f44279fd318f460123 x86-i686--musl--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--musl--stable-2023.08-1.sha256 -sha256 5109b0d57432800a34a402cea789993f0670cfeda5f174b61e0bc19c69e98078 x86-i686--musl--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--uclibc--bleeding-edge-2023.08-1.sha256 -sha256 2222e4ef0e26185c4c6f39d08eacb4ce3a1dab3e0dbc09d37708d72d5df39417 x86-i686--uclibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--uclibc--stable-2023.08-1.sha256 -sha256 294d84dbc6043e17a2e357b2a1377b2b57039dffd6d766a2851adec7d2d5da21 x86-i686--uclibc--stable-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/xtensa-lx60/tarballs/xtensa-lx60--uclibc--bleeding-edge-2023.08-1.sha256 -sha256 79b002a8d1d6dee72c75a336e0fb3b07cdf4cd373de842e5f3f6c67e502f9c94 xtensa-lx60--uclibc--bleeding-edge-2023.08-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/xtensa-lx60/tarballs/xtensa-lx60--uclibc--stable-2023.08-1.sha256 -sha256 f9f8d55ef6c29c69174084f05310cd69a1cb3626831e5c806f30d9b5a842a35a xtensa-lx60--uclibc--stable-2023.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--glibc--bleeding-edge-2023.11-1.sha256 +sha256 c97b280a36ae4411ec97717b2c67622912ef436efa55a31f888187492d4e5e4b x86-64--glibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--glibc--stable-2023.11-1.sha256 +sha256 e3c0ef1618df3a3100a8a167066e7b19fdd25ee2c4285cf2cfe3ef34f0456867 x86-64--glibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--musl--bleeding-edge-2023.11-1.sha256 +sha256 b362a4b12a19e2baa3590386a531d8b65abad0d323aba317aea5146da13b8659 x86-64--musl--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--musl--stable-2023.11-1.sha256 +sha256 d1df97230234a52c60e53fa7d1a6f14721295b8b49f40801c0e3ca1017b5bee3 x86-64--musl--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--uclibc--bleeding-edge-2023.11-1.sha256 +sha256 e32b885a41257dd5809f99d6d165994da3d1ce9efe2051f5c223a8243aaa37d9 x86-64--uclibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--uclibc--stable-2023.11-1.sha256 +sha256 1b77c4238b3e1958472094f46f866cfe7eab6c25d728db8c3ece8121e2095035 x86-64--uclibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs/x86-64-v2--glibc--bleeding-edge-2023.11-1.sha256 +sha256 6b8cc256ccc35777b4d5b6a2baaa2d9a4cbb48f4e111860d20b310f983cf00e0 x86-64-v2--glibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs/x86-64-v2--glibc--stable-2023.11-1.sha256 +sha256 45b1749ac5473f4ef629a32dcc423419b608c9cb80840b49501afb8af008c381 x86-64-v2--glibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs/x86-64-v2--musl--bleeding-edge-2023.11-1.sha256 +sha256 ef2e717b55f34ad320c532a21782c308fdff5a462b413af868f52543dee043cf x86-64-v2--musl--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs/x86-64-v2--musl--stable-2023.11-1.sha256 +sha256 ae070e245dfc0bf882b6dcc4ad6c080b11f0b8d2f235f65c0cc1069a06f5e4a0 x86-64-v2--musl--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs/x86-64-v2--uclibc--bleeding-edge-2023.11-1.sha256 +sha256 530f31ce5f8d002eb7e044f61b49e242d1e15a182e7e09ccf9f64080e6a28ac9 x86-64-v2--uclibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs/x86-64-v2--uclibc--stable-2023.11-1.sha256 +sha256 a11189869ca3636abd12691758ab08dd41ef54c3cdcf936a141d48c4f2903237 x86-64-v2--uclibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs/x86-64-v3--glibc--bleeding-edge-2023.11-1.sha256 +sha256 49031a3567c018a94d8158f8f5767d3438da21c8ad493c90c641d11e55f44d81 x86-64-v3--glibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs/x86-64-v3--glibc--stable-2023.11-1.sha256 +sha256 19376ffd5187f2c96d99a9f12d15ae51c8bf351d25a7186e379fae815feedd22 x86-64-v3--glibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs/x86-64-v3--musl--bleeding-edge-2023.11-1.sha256 +sha256 6817017e68cb3d8e09eb048ccd70ee66e5cd72e49fb77806825614802a62077e x86-64-v3--musl--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs/x86-64-v3--musl--stable-2023.11-1.sha256 +sha256 05f73caedf28c257d66e4365b9e496069bdc1294bfa1b9697e64a380d63eaf99 x86-64-v3--musl--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs/x86-64-v3--uclibc--bleeding-edge-2023.11-1.sha256 +sha256 45ee398da5195584062e573eed27a660d99a10e8f129c6fb27b2d6b418a05bae x86-64-v3--uclibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs/x86-64-v3--uclibc--stable-2023.11-1.sha256 +sha256 9848d205bcbdba3fd2e1c61cdd5d33ed03f842639d4f4e0a0057c410811bed79 x86-64-v3--uclibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs/x86-64-v4--glibc--bleeding-edge-2023.11-1.sha256 +sha256 d57fc66d8ae7e7aedf543bf4993fa36be68aeb1020c30d32d26d0fad8952db63 x86-64-v4--glibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs/x86-64-v4--glibc--stable-2023.11-1.sha256 +sha256 095220c834fb1c1a796e6db7847c9dc191fedca6ae731708a9864f1c0ec0f752 x86-64-v4--glibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs/x86-64-v4--musl--bleeding-edge-2023.11-1.sha256 +sha256 50757334efcabf2d35083498df04a945cb7e3730dd3893cc478832a02d21147b x86-64-v4--musl--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs/x86-64-v4--musl--stable-2023.11-1.sha256 +sha256 437516c415eacd377946df6167196dd4337da030f304d8c81b5b6889317b136c x86-64-v4--musl--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs/x86-64-v4--uclibc--bleeding-edge-2023.11-1.sha256 +sha256 f6e25121564440796a9cb196bf9de87e1ed51456d508deb8b061ab4727971ff6 x86-64-v4--uclibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs/x86-64-v4--uclibc--stable-2023.11-1.sha256 +sha256 a35e650c422e64939c8d4578b39fce5c73995688420e51aa6c0f553ba97ba838 x86-64-v4--uclibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--glibc--bleeding-edge-2023.11-1.sha256 +sha256 00e1992817c73d2df99f188240e244442f3d50a2a9a994d95ade453916c16ac3 x86-64-core-i7--glibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--glibc--stable-2023.11-1.sha256 +sha256 a3cd2806008fd2bd75bee34d098003ef2cfb06665d15e92d305617d4e021b74e x86-64-core-i7--glibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--musl--bleeding-edge-2023.11-1.sha256 +sha256 cf084bdf1f62c35996dc922d9c794a08d53ff0d71e888a0bbc4717431aa7c2c6 x86-64-core-i7--musl--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--musl--stable-2023.11-1.sha256 +sha256 38a7be51cdeb738f7d724ba3efe207fddab523c8b128bbbb33f9b7a56d0e70f1 x86-64-core-i7--musl--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--uclibc--bleeding-edge-2023.11-1.sha256 +sha256 4f08c426b0ebb88a1e66831db780168c5716e319e905b8d41c5f5dba1e98d543 x86-64-core-i7--uclibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--uclibc--stable-2023.11-1.sha256 +sha256 92ee30927596669f133982681010edaaf63100fde41ffea6a778aae367b2ca86 x86-64-core-i7--uclibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--glibc--bleeding-edge-2023.11-1.sha256 +sha256 76135ed57c361ac9c3722ff8db64332cffa77669b7051469eb3ef169df790bb6 x86-core2--glibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--glibc--stable-2023.11-1.sha256 +sha256 adde0a7579bd8c7c6b4dd7af2997a6841a541d1e94426d2ad7ebdbb26105b536 x86-core2--glibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--musl--bleeding-edge-2023.11-1.sha256 +sha256 26206a934621b95ccf5380fe3f69e2218a9531a850dd05f9cdee5cc66e23963e x86-core2--musl--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--musl--stable-2023.11-1.sha256 +sha256 7202c3eb1f71ebbef5db2b042ba7e803574ccf66987c406f3711d98878dbbe24 x86-core2--musl--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--uclibc--bleeding-edge-2023.11-1.sha256 +sha256 4d73fbe36e86263679a4d5f7331977657cf793fe1ef337ffb6492aedf9d86e1b x86-core2--uclibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--uclibc--stable-2023.11-1.sha256 +sha256 825c95bf3f28a950f90f9f8827c3ee4536729285603ff53611ae260c4beb2ce8 x86-core2--uclibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--glibc--bleeding-edge-2023.11-1.sha256 +sha256 007266510779d041524cc1fce4eac2af1ffe38db50d2221cbe09a519c61190c3 x86-i686--glibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--glibc--stable-2023.11-1.sha256 +sha256 13afd0f9b7fd7e3c1c598b294494e23ddacb39df23e30a999fbadff31a97c514 x86-i686--glibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--musl--bleeding-edge-2023.11-1.sha256 +sha256 02c465b5612607931c9f0f7eec0239b0ecebab2af3cef79c28993c7ce7f5b079 x86-i686--musl--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--musl--stable-2023.11-1.sha256 +sha256 5d0a0abd6f6227622b217183ab06bcdf63fd6834bcb2a2335666bbb734f3fb11 x86-i686--musl--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--uclibc--bleeding-edge-2023.11-1.sha256 +sha256 6a40f5bb22f1fb1de6cc6986f31afdfbef5c5c866f3a3a387e1dfc567ed98b8e x86-i686--uclibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--uclibc--stable-2023.11-1.sha256 +sha256 c23e32f9616df27a1b8f77700d7b988c55dce6443598907ceface720c6e960a3 x86-i686--uclibc--stable-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/xtensa-lx60/tarballs/xtensa-lx60--uclibc--bleeding-edge-2023.11-1.sha256 +sha256 9434e3522601c9b494bd223fa04376b9b489db47e823266b124f5b7a3b97486c xtensa-lx60--uclibc--bleeding-edge-2023.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/xtensa-lx60/tarballs/xtensa-lx60--uclibc--stable-2023.11-1.sha256 +sha256 aa28cb17b03d7fa29c8911a8f9c7b26c2d90c222b1b0a1c727ecc5533b14023e xtensa-lx60--uclibc--stable-2023.11-1.tar.bz2 diff --git a/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.mk b/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.mk index 6f4be09793..4a09fd8825 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.mk +++ b/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.mk @@ -7,979 +7,1003 @@ # This file was auto-generated by support/scripts/gen-bootlin-toolchains # Do not edit ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64be--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64be--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64be--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64be--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64be--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64be--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_750D_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = arcle-750d--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-750d/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_750D_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = arcle-750d--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-750d/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_HS38_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = arcle-hs38--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-hs38/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_HS38_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = arcle-hs38--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-hs38/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_HS38_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = arcle-hs38--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-hs38/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCLE_HS38_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = arcle-hs38--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-hs38/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv5-eabi--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv5-eabi--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv5-eabi--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv5-eabi--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv5-eabi--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv5-eabi--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv6-eabihf--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv6-eabihf--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv6-eabihf--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv6-eabihf--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv6-eabihf--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv6-eabihf--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv7-eabihf--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv7-eabihf--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv7-eabihf--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv7-eabihf--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv7-eabihf--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv7-eabihf--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armebv7-eabihf--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armebv7-eabihf--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armebv7-eabihf--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armebv7-eabihf--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armebv7-eabihf--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armebv7-eabihf--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7M_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv7m--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv7m/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7M_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv7m--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv7m/tarballs endif +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_GLIBC_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = m68k-68xxx--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_GLIBC_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = m68k-68xxx--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_MUSL_BLEEDING_EDGE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = m68k-68xxx--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_MUSL_STABLE),y) +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = m68k-68xxx--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs +endif + ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = m68k-68xxx--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = m68k-68xxx--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_COLDFIRE_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = m68k-coldfire--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-coldfire/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_COLDFIRE_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = m68k-coldfire--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-coldfire/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazebe--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazebe--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazebe--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazebe--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazebe--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazebe--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazeel--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazeel--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazeel--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazeel--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazeel--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazeel--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32el--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32el--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32el--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32el--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32el--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32el--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r5el--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r5el--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r5el--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r5el--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r5el--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r5el--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r6el--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r6el--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r6el--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r6el--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r6el--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r6el--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64-n32--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64-n32--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64-n32--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64-n32--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64-n32--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64-n32--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64el-n32--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64el-n32--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64el-n32--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64el-n32--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64el-n32--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64el-n32--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64r6el-n32--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64r6el-n32--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64r6el-n32--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64r6el-n32--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64r6el-n32--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64r6el-n32--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_NIOS2_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = nios2--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/nios2/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_NIOS2_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = nios2--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/nios2/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = openrisc--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = openrisc--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = openrisc--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = openrisc--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = openrisc--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = openrisc--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-440fp--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-440fp--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-440fp--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-440fp--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-440fp--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-440fp--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e300c3--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e300c3--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e300c3--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e300c3--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e300c3--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e300c3--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e500mc--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e500mc--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e500mc--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e500mc--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e500mc--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e500mc--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E5500_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64-e5500--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e5500/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E5500_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64-e5500--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e5500/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E6500_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64-e6500--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e6500/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E6500_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64-e6500--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e6500/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E6500_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64-e6500--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e6500/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E6500_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64-e6500--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e6500/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_POWER8_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64-power8--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-power8/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_POWER8_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64-power8--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-power8/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_POWER8_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64-power8--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-power8/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_POWER8_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64-power8--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-power8/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64le-power8--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64le-power8/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64le-power8--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64le-power8/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64le-power8--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64le-power8/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64le-power8--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64le-power8/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV32_ILP32D_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = riscv32-ilp32d--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/riscv32-ilp32d/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = riscv64-lp64d--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = riscv64-lp64d--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = riscv64-lp64d--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = riscv64-lp64d--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = riscv64-lp64d--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = riscv64-lp64d--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_S390X_Z13_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = s390x-z13--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/s390x-z13/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_S390X_Z13_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = s390x-z13--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/s390x-z13/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4AEB_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4aeb--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4aeb/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4AEB_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4aeb--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4aeb/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4AEB_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4aeb--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4aeb/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4AEB_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4aeb--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4aeb/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SPARC64_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sparc64--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/sparc64/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SPARC64_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sparc64--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/sparc64/tarballs endif @@ -997,265 +1021,265 @@ TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/relea endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v2--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v2--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v2--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v2--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v2--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v2--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v3--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v3--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v3--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v3--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v3--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v3--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v4--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v4--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v4--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v4--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v4--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v4--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-core-i7--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-core-i7--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-core-i7--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-core-i7--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-core-i7--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-core-i7--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-core2--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-core2--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-core2--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-core2--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-core2--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-core2--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-i686--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_GLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-i686--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-i686--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_MUSL_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-i686--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-i686--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-i686--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_XTENSA_LX60_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = xtensa-lx60--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/xtensa-lx60/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_XTENSA_LX60_UCLIBC_STABLE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2023.11-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = xtensa-lx60--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/xtensa-lx60/tarballs endif From 5cd74d6a4e347ff3807d49b6b6b8817009b26a17 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Fri, 29 Dec 2023 15:50:25 +0100 Subject: [PATCH 4382/5754] support/testing: test_python_ml_dtypes: remove BR2_PACKAGE_PYTHON3_ZLIB The test_python_ml_dtypes.py enabled BR2_PACKAGE_PYTHON3_ZLIB=y in its configuration to workaround the fact that the toolchain used to testing was tainted with zlib. The commit 7e0e6e3 "toolchain/toolchain-external/toolchain-external-bootlin: update to 2023.11-1" updated the toolchains which are no longer tainted with zlib. The workaround is no longer needed and this commit removes this config, for consistency. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- support/testing/tests/package/test_python_ml_dtypes.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/support/testing/tests/package/test_python_ml_dtypes.py b/support/testing/tests/package/test_python_ml_dtypes.py index 8d2369576b..8367107247 100644 --- a/support/testing/tests/package/test_python_ml_dtypes.py +++ b/support/testing/tests/package/test_python_ml_dtypes.py @@ -4,16 +4,9 @@ class TestPythonPy3MlDtypes(TestPythonPackageBase): __test__ = True - # Note: BR2_PACKAGE_PYTHON3_ZLIB=y is needed as a runtime - # dependency because the Bootlin toolchain used for this test is - # tainted with zlib (and gets detected by python3/numpy). - # See commit 8ce33fed "package/gdb: gdbserver does not need zlib". - # This config entry can be removed as soon as the toolchain is - # updated without zlib in its sysroot. config = TestPythonPackageBase.config + \ """ BR2_PACKAGE_PYTHON3=y - BR2_PACKAGE_PYTHON3_ZLIB=y BR2_PACKAGE_PYTHON_ML_DTYPES=y """ sample_scripts = ["tests/package/sample_python_ml_dtypes.py"] From 4d21ec5021f6ec9ba40a9f71a9028b7b55bc6aea Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 26 Dec 2023 17:55:19 +0100 Subject: [PATCH 4383/5754] package/libcap-ng: disable python3 python3 is an optional dependency (enabled by default) since bump to version 0.7.7 in commit 4314c86b0b932c3d381ae59b641366697906868f and https://github.com/stevegrubb/libcap-ng/commit/02fc25f9d3a00c7d7ccd619d8d678511a73b940b Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libcap-ng/libcap-ng.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libcap-ng/libcap-ng.mk b/package/libcap-ng/libcap-ng.mk index 46f72c702e..c33460d951 100644 --- a/package/libcap-ng/libcap-ng.mk +++ b/package/libcap-ng/libcap-ng.mk @@ -12,10 +12,10 @@ LIBCAP_NG_CPE_ID_VENDOR = libcap-ng_project LIBCAP_NG_INSTALL_STAGING = YES LIBCAP_NG_CONF_ENV = ac_cv_prog_swig_found=no -LIBCAP_NG_CONF_OPTS = --without-python +LIBCAP_NG_CONF_OPTS = --without-python --without-python3 HOST_LIBCAP_NG_CONF_ENV = ac_cv_prog_swig_found=no -HOST_LIBCAP_NG_CONF_OPTS = --without-python +HOST_LIBCAP_NG_CONF_OPTS = --without-python --without-python3 $(eval $(autotools-package)) $(eval $(host-autotools-package)) From 9a94e85fff629b73cc3b02605793806fb9ce97dd Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 26 Dec 2023 17:55:20 +0100 Subject: [PATCH 4384/5754] package/libcap-ng: bump to version 0.8.4 python2 support has been dropped with https://github.com/stevegrubb/libcap-ng/commit/868a82672a398aec96eba60e73b9a8e8892c4d4a https://github.com/stevegrubb/libcap-ng/blob/v0.8.4/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libcap-ng/libcap-ng.hash | 2 +- package/libcap-ng/libcap-ng.mk | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libcap-ng/libcap-ng.hash b/package/libcap-ng/libcap-ng.hash index d4590dd739..bb4280368d 100644 --- a/package/libcap-ng/libcap-ng.hash +++ b/package/libcap-ng/libcap-ng.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 bed6f6848e22bb2f83b5f764b2aef0ed393054e803a8e3a8711cb2a39e6b492d libcap-ng-0.8.3.tar.gz +sha256 68581d3b38e7553cb6f6ddf7813b1fc99e52856f21421f7b477ce5abd2605a8a libcap-ng-0.8.4.tar.gz sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING sha256 f18a0811fa0e220ccbc42f661545e77f0388631e209585ed582a1c693029c6aa COPYING.LIB diff --git a/package/libcap-ng/libcap-ng.mk b/package/libcap-ng/libcap-ng.mk index c33460d951..5e3ca20029 100644 --- a/package/libcap-ng/libcap-ng.mk +++ b/package/libcap-ng/libcap-ng.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCAP_NG_VERSION = 0.8.3 +LIBCAP_NG_VERSION = 0.8.4 LIBCAP_NG_SITE = http://people.redhat.com/sgrubb/libcap-ng LIBCAP_NG_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (library) LIBCAP_NG_LICENSE_FILES = COPYING COPYING.LIB @@ -12,10 +12,10 @@ LIBCAP_NG_CPE_ID_VENDOR = libcap-ng_project LIBCAP_NG_INSTALL_STAGING = YES LIBCAP_NG_CONF_ENV = ac_cv_prog_swig_found=no -LIBCAP_NG_CONF_OPTS = --without-python --without-python3 +LIBCAP_NG_CONF_OPTS = --without-python3 HOST_LIBCAP_NG_CONF_ENV = ac_cv_prog_swig_found=no -HOST_LIBCAP_NG_CONF_OPTS = --without-python --without-python3 +HOST_LIBCAP_NG_CONF_OPTS = --without-python3 $(eval $(autotools-package)) $(eval $(host-autotools-package)) From 7a5f153f9cf9751b4840dc0ce40d9a535e87737f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 26 Dec 2023 16:32:44 +0100 Subject: [PATCH 4385/5754] package/assimp: bump to version 5.3.1 https://github.com/assimp/assimp/releases/tag/v5.3.1 https://github.com/assimp/assimp/releases/tag/v5.3.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/assimp/assimp.hash | 2 +- package/assimp/assimp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/assimp/assimp.hash b/package/assimp/assimp.hash index 86a90927ed..79415706f9 100644 --- a/package/assimp/assimp.hash +++ b/package/assimp/assimp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b5219e63ae31d895d60d98001ee5bb809fb2c7b2de1e7f78ceeb600063641e1a assimp-5.2.5.tar.gz +sha256 a07666be71afe1ad4bc008c2336b7c688aca391271188eb9108d0c6db1be53f1 assimp-5.3.1.tar.gz sha256 147874443d242b4e2bae97036e26ec9d6b37f706174c1bd5ecfcc8c1294cef51 LICENSE diff --git a/package/assimp/assimp.mk b/package/assimp/assimp.mk index 0b6034fb8e..2765cc7171 100644 --- a/package/assimp/assimp.mk +++ b/package/assimp/assimp.mk @@ -4,7 +4,7 @@ # ################################################################################ -ASSIMP_VERSION = 5.2.5 +ASSIMP_VERSION = 5.3.1 ASSIMP_SITE = $(call github,assimp,assimp,v$(ASSIMP_VERSION)) ASSIMP_LICENSE = BSD-3-Clause ASSIMP_LICENSE_FILES = LICENSE From c67de80597c830f8b8d92b469bf71457aa42c742 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 26 Dec 2023 16:37:28 +0100 Subject: [PATCH 4386/5754] package/libraw: bump to version 0.21.2 Drop patch (already in version) https://github.com/LibRaw/LibRaw/blob/0.21.2/Changelog.txt Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...shrink-flag-for-3-4-component-images.patch | 24 ------------------- package/libraw/libraw.hash | 2 +- package/libraw/libraw.mk | 5 +--- 3 files changed, 2 insertions(+), 29 deletions(-) delete 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 deleted file mode 100644 index ef93e0901b..0000000000 --- a/package/libraw/0001-do-not-set-shrink-flag-for-3-4-component-images.patch +++ /dev/null @@ -1,24 +0,0 @@ -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.hash b/package/libraw/libraw.hash index 58bb1b4753..838c598d78 100644 --- a/package/libraw/libraw.hash +++ b/package/libraw/libraw.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 630a6bcf5e65d1b1b40cdb8608bdb922316759bfb981c65091fec8682d1543cd LibRaw-0.21.1.tar.gz +sha256 fe7288013206854baf6e4417d0fb63ba4ed7227bf36fff021992671c2dd34b03 LibRaw-0.21.2.tar.gz sha256 eea173a556abac0370461e57e12aab266894ea6be3874c2be05fd87871f75449 LICENSE.LGPL sha256 0e3098d2d54a12434715f6679ea408d57da5e8d613c385c58ecc6fe5d30cc81f LICENSE.CDDL sha256 7d6650cef6cf892abe95e55a6bda1e1c42f221fd411b807deb2fc0b805b868d4 README.md diff --git a/package/libraw/libraw.mk b/package/libraw/libraw.mk index 63b50e340d..211b67f935 100644 --- a/package/libraw/libraw.mk +++ b/package/libraw/libraw.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBRAW_VERSION = 0.21.1 +LIBRAW_VERSION = 0.21.2 LIBRAW_SOURCE = LibRaw-$(LIBRAW_VERSION).tar.gz LIBRAW_SITE = http://www.libraw.org/data LIBRAW_INSTALL_STAGING = YES @@ -18,9 +18,6 @@ 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 += CVE-2023-1729 - ifeq ($(BR2_PACKAGE_JASPER),y) LIBRAW_CONF_OPTS += --enable-jasper LIBRAW_DEPENDENCIES += jasper From b917b4621022635dca8b02f24e2954107c8c0f77 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 26 Dec 2023 17:27:42 +0100 Subject: [PATCH 4387/5754] package/rtl_433: bump to version 23.11 Drop patches (already in version) https://github.com/merbanan/rtl_433/releases/tag/23.11 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- .checkpackageignore | 2 - ...se-pkg-config-to-detect-openssl-when.patch | 42 ------------------- ...r-Fix-mongoose-build-without-threads.patch | 42 ------------------- package/rtl_433/rtl_433.hash | 2 +- package/rtl_433/rtl_433.mk | 2 +- 5 files changed, 2 insertions(+), 88 deletions(-) delete mode 100644 package/rtl_433/0001-CMakeLists.txt-use-pkg-config-to-detect-openssl-when.patch delete mode 100644 package/rtl_433/0002-minor-Fix-mongoose-build-without-threads.patch diff --git a/.checkpackageignore b/.checkpackageignore index 599abafd2f..0bad49c223 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1210,8 +1210,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/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 diff --git a/package/rtl_433/0001-CMakeLists.txt-use-pkg-config-to-detect-openssl-when.patch b/package/rtl_433/0001-CMakeLists.txt-use-pkg-config-to-detect-openssl-when.patch deleted file mode 100644 index 00858c8ff9..0000000000 --- a/package/rtl_433/0001-CMakeLists.txt-use-pkg-config-to-detect-openssl-when.patch +++ /dev/null @@ -1,42 +0,0 @@ -From b860de9e207d8fe2ea37dad28fdd014493d87703 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 27 Dec 2022 16:29:16 +0100 -Subject: [PATCH] build: Fix CMake to use pkg-config openssl when possible - (#2290) - -In order to take into account the libraries used by openssl when -building statically, using pkg-config is recommended. This patch -therefore improves the CMakeLists.txt to use pkg-config to detect -openssl when pkg-config is available. This will avoid -static build failure when openssl needs to link with -latomic. - -Fixes: - - http://autobuild.buildroot.org/results/417c86963ffe038aa052ea3cf19fd52c3e9b7396 - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/merbanan/rtl_433/commit/b860de9e207d8fe2ea37dad28fdd014493d87703] ---- - CMakeLists.txt | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d47a3eda2..cf30d8be2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -175,7 +175,14 @@ set(ENABLE_OPENSSL AUTO CACHE STRING "Enable OpenSSL TLS support") - set_property(CACHE ENABLE_OPENSSL PROPERTY STRINGS AUTO ON OFF) - if(ENABLE_OPENSSL) # AUTO / ON - --find_package(OpenSSL) -+find_package(PkgConfig) -+if(PKG_CONFIG_FOUND) -+ pkg_check_modules(OPENSSL openssl) -+ set(OPENSSL_LIBRARIES ${OPENSSL_LINK_LIBRARIES}) -+ set(OPENSSL_INCLUDE_DIR ${OPENSSL_INCLUDE_DIRS}) -+else() -+ find_package(OpenSSL) -+endif() - if(OPENSSL_FOUND) - message(STATUS "OpenSSL TLS support will be compiled. Found version ${OPENSSL_VERSION}") - include_directories(${OPENSSL_INCLUDE_DIR}) diff --git a/package/rtl_433/0002-minor-Fix-mongoose-build-without-threads.patch b/package/rtl_433/0002-minor-Fix-mongoose-build-without-threads.patch deleted file mode 100644 index 85bc45147a..0000000000 --- a/package/rtl_433/0002-minor-Fix-mongoose-build-without-threads.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 707b51ecbc5598eed2fb67962232bf3fe0e96f81 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 27 Dec 2022 21:30:54 +0100 -Subject: [PATCH] minor: Fix mongoose build without threads (#2291) - -Fix the following build failure without threads: - -In file included from /home/buildroot/autobuild/instance-3/output-1/build/rtl_433-22.11/src/data_tag.c:17: -/home/buildroot/autobuild/instance-3/output-1/build/rtl_433-22.11/include/mongoose.h:407:10: fatal error: pthread.h: No such file or directory - 407 | #include - | ^~~~~~~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/9f1677fc5a4568be0b9c121060c5d821ac2ae21b - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/merbanan/rtl_433/commit/707b51ecbc5598eed2fb67962232bf3fe0e96f81] ---- - include/mongoose.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/mongoose.h b/include/mongoose.h -index 1173b3fc7..b111ea34e 100644 ---- a/include/mongoose.h -+++ b/include/mongoose.h -@@ -404,7 +404,6 @@ unsigned int sleep(unsigned int seconds); - #include - #include - #include --#include - #include - #include - #include -@@ -4658,6 +4657,7 @@ size_t mg_fwrite(const void *ptr, size_t size, size_t count, FILE *f); - #endif /* MG_ENABLE_FILESYSTEM */ - - #if MG_ENABLE_THREADS -+#include - /* - * Starts a new detached thread. - * Arguments and semantics are the same as pthead's `pthread_create()`. diff --git a/package/rtl_433/rtl_433.hash b/package/rtl_433/rtl_433.hash index 51fb29c78e..3a00e0cae7 100644 --- a/package/rtl_433/rtl_433.hash +++ b/package/rtl_433/rtl_433.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 61a9163d69cc4b1da46aebbcaf969bd180a055a6b90f42ad281218cc4fbefb86 rtl_433-22.11.tar.gz +sha256 1260c58400bf35832ac1b76cb3cccf3dc1335ffa2416909c63c7d7060c74663b rtl_433-23.11.tar.gz # License file, locally calculated sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/rtl_433/rtl_433.mk b/package/rtl_433/rtl_433.mk index e3be0e5ecf..7c33a71f31 100644 --- a/package/rtl_433/rtl_433.mk +++ b/package/rtl_433/rtl_433.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL_433_VERSION = 22.11 +RTL_433_VERSION = 23.11 RTL_433_SITE = $(call github,merbanan,rtl_433,$(RTL_433_VERSION)) RTL_433_LICENSE = GPL-2.0+ RTL_433_LICENSE_FILES = COPYING From b628e867722a0bdfac3224e3624cc4d1b916d5b6 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 26 Dec 2023 17:32:19 +0100 Subject: [PATCH 4388/5754] package/motion: bump to version 4.6.0 Drop patches (already in version) https://github.com/Motion-Project/motion/releases/tag/release-4.6.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/motion/0001-Gettext-0-22.patch | 164 ------------------ ...Include-libwebp-when-WEBP-is-enabled.patch | 26 --- package/motion/motion.hash | 2 +- package/motion/motion.mk | 2 +- 4 files changed, 2 insertions(+), 192 deletions(-) delete mode 100644 package/motion/0001-Gettext-0-22.patch delete mode 100644 package/motion/0002-Include-libwebp-when-WEBP-is-enabled.patch diff --git a/package/motion/0001-Gettext-0-22.patch b/package/motion/0001-Gettext-0-22.patch deleted file mode 100644 index aeacd0e2ec..0000000000 --- a/package/motion/0001-Gettext-0-22.patch +++ /dev/null @@ -1,164 +0,0 @@ -From 2d8d68cfcc1cf4fc8861671e185fdf235dcf9740 Mon Sep 17 00:00:00 2001 -From: David Seifert <16636962+SoapGentoo@users.noreply.github.com> -Date: Fri, 30 Jun 2023 05:37:50 +0200 -Subject: [PATCH] Gettext 0.22 (#1681) - -* po: fix gettext 0.22 format specifier - -Bug: https://bugs.gentoo.org/908965 -Bug: https://savannah.gnu.org/bugs/index.php?64334#comment1 - -* Autotools: fix `make distcheck` - -* use correct `dist_` specifiers for including files in tarball -* do not override `docdir`, since this is a user variable -* include headers in tarball - -Upstream: https://github.com/Motion-Project/motion/commit/2d8d68cfcc1cf4fc8861671e185fdf235dcf9740 -Signed-off-by: Fabrice Fontaine ---- - Makefile.am | 11 +++++------ - configure.ac | 1 - - man/Makefile.am | 1 - - po/de.po | 2 +- - po/fi.po | 2 +- - src/Makefile.am | 52 ++++++++++++++++++++++++++++++++++++------------- - 6 files changed, 46 insertions(+), 23 deletions(-) - delete mode 100644 man/Makefile.am - -diff --git a/Makefile.am b/Makefile.am -index 3d2f968e2..5ae03cd2c 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,19 +1,18 @@ - ACLOCAL_AMFLAGS = -I m4 - --SUBDIRS = src po man -+SUBDIRS = src po - --sysconfdir = @sysconfdir@/$(PACKAGE) --sysconf_DATA = \ -+pkgsysconfdir = $(sysconfdir)/@PACKAGE@ -+dist_pkgsysconf_DATA = \ - data/motion-dist.conf \ - data/camera1-dist.conf \ - data/camera2-dist.conf \ - data/camera3-dist.conf \ - data/camera4-dist.conf - --man_MANS = man/motion.1 -+dist_man_MANS = man/motion.1 - --docdir = $(datadir)/doc/@PACKAGE@ --doc_DATA = \ -+dist_doc_DATA = \ - doc/mask1.png \ - doc/normal.jpg \ - doc/outputmotion1.jpg \ -diff --git a/configure.ac b/configure.ac -index dfcf5eae2..ce588f65b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -496,7 +496,6 @@ AC_CONFIG_FILES([ - Makefile - src/Makefile - po/Makefile.in -- man/Makefile - data/camera1-dist.conf - data/camera2-dist.conf - data/camera3-dist.conf -diff --git a/man/Makefile.am b/man/Makefile.am -deleted file mode 100644 -index 14aa069f0..000000000 ---- a/man/Makefile.am -+++ /dev/null -@@ -1 +0,0 @@ --man_MANS = motion.1 -\ No newline at end of file -diff --git a/po/de.po b/po/de.po -index 9142c9195..ccd5f09d7 100644 ---- a/po/de.po -+++ b/po/de.po -@@ -3458,7 +3458,7 @@ msgstr "Sprache: Deutsch" - #: src/util.c - #, c-format - msgid "Could not allocate %llu bytes of memory!" --msgstr "%Llu Bytes Speicher konnten nicht zugeordnet werden!" -+msgstr "%llu Bytes Speicher konnten nicht zugeordnet werden!" - - #: src/util.c - #, c-format -diff --git a/po/fi.po b/po/fi.po -index 1afbdb68b..d3117a922 100644 ---- a/po/fi.po -+++ b/po/fi.po -@@ -3432,7 +3432,7 @@ msgstr "Kieli: englanti" - #: src/util.c - #, c-format - msgid "Could not allocate %llu bytes of memory!" --msgstr "%Llu-tavua muistia ei voitu varata!" -+msgstr "%llu-tavua muistia ei voitu varata!" - - #: src/util.c - #, c-format -diff --git a/src/Makefile.am b/src/Makefile.am -index f93decf55..6f9d02e6b 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -1,17 +1,43 @@ --AM_CPPFLAGS= -Dsysconfdir=\"$(sysconfdir)/motion\" -DLOCALEDIR=\"$(DESTDIR)$(localedir)\" -- --if INC_MMAL_SRC --MMAL_SRC=raspicam/RaspiCamControl.c raspicam/RaspiCLI.c --endif -- --LIBS = @LIBINTL@ @LIBS@ -+AM_CPPFLAGS= -Dsysconfdir=\"$(sysconfdir)/motion\" -DLOCALEDIR=\"$(localedir)\" -+LDADD = $(LIBINTL) - - bin_PROGRAMS = motion - --motion_SOURCES = motion.c logger.c conf.c draw.c jpegutils.c video_loopback.c \ -- video_v4l2.c video_common.c video_bktr.c netcam.c netcam_http.c netcam_ftp.c \ -- netcam_jpeg.c netcam_wget.c netcam_rtsp.c track.c alg.c event.c picture.c \ -- rotate.c translate.c ffmpeg.c util.c dbse.c webu_status.c \ -- webu.c webu_html.c webu_stream.c webu_text.c mmalcam.c $(MMAL_SRC) -- -+motion_SOURCES = \ -+ alg.h alg.c \ -+ conf.h conf.c \ -+ dbse.h dbse.c \ -+ draw.h draw.c \ -+ event.h event.c \ -+ ffmpeg.h ffmpeg.c \ -+ jpegutils.h jpegutils.c \ -+ logger.h logger.c \ -+ mmalcam.h mmalcam.c \ -+ motion.h motion.c \ -+ netcam.h netcam.c \ -+ netcam_ftp.h netcam_ftp.c \ -+ netcam_http.h netcam_http.c \ -+ netcam_jpeg.h netcam_jpeg.c \ -+ netcam_rtsp.h netcam_rtsp.c \ -+ netcam_wget.h netcam_wget.c \ -+ picture.h picture.c \ -+ rotate.h rotate.c \ -+ track.h track.c \ -+ translate.h translate.c \ -+ util.h util.c \ -+ video_bktr.h video_bktr.c \ -+ video_common.h video_common.c \ -+ video_loopback.h video_loopback.c \ -+ video_v4l2.h video_v4l2.c \ -+ webu.h webu.c \ -+ webu_html.h webu_html.c \ -+ webu_status.h webu_status.c \ -+ webu_stream.h webu_stream.c \ -+ webu_text.h webu_text.c \ -+ mmx.h pwc-ioctl.h - -+if INC_MMAL_SRC -+motion_SOURCES += \ -+ raspicam/RaspiCamControl.h raspicam/RaspiCamControl.c \ -+ raspicam/RaspiCLI.h raspicam/RaspiCLI.c -+endif diff --git a/package/motion/0002-Include-libwebp-when-WEBP-is-enabled.patch b/package/motion/0002-Include-libwebp-when-WEBP-is-enabled.patch deleted file mode 100644 index a1536a7d2f..0000000000 --- a/package/motion/0002-Include-libwebp-when-WEBP-is-enabled.patch +++ /dev/null @@ -1,26 +0,0 @@ -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) - ] diff --git a/package/motion/motion.hash b/package/motion/motion.hash index 21f74b481f..e8bbfbcbcb 100644 --- a/package/motion/motion.hash +++ b/package/motion/motion.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 0c824276bb23565b7cf10409ebdcb46b85fb1f6abca957252e52290bb1fe473e motion-4.5.1.tar.gz +sha256 9268df31a5ebeaf8daca4747cdcd01c86e223625b6f971e9bcec98edf35ec06f motion-4.6.0.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/motion/motion.mk b/package/motion/motion.mk index 2cce6cd1ff..554d056999 100644 --- a/package/motion/motion.mk +++ b/package/motion/motion.mk @@ -4,7 +4,7 @@ # ################################################################################ -MOTION_VERSION = 4.5.1 +MOTION_VERSION = 4.6.0 MOTION_SITE = $(call github,Motion-Project,motion,release-$(MOTION_VERSION)) MOTION_LICENSE = GPL-2.0 MOTION_LICENSE_FILES = LICENSE From 70e3b5a800f86e08dce14cb4ac14a3d4d7679904 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 26 Dec 2023 17:36:11 +0100 Subject: [PATCH 4389/5754] package/liburing: bump to version 2.5 https://github.com/axboe/liburing/blob/liburing-2.5/CHANGELOG Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/liburing/liburing.hash | 2 +- package/liburing/liburing.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/liburing/liburing.hash b/package/liburing/liburing.hash index eaee8fcfa1..30458c6b9f 100644 --- a/package/liburing/liburing.hash +++ b/package/liburing/liburing.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 ca260e7a5820c2d0e737ec1e9b999f10776dbe84a169a02a0eff10c8eeaf3394 liburing-2.4.tar.bz2 +sha256 319ff9096a5655362a9741c5145b45494db810e38679a1de82e2f440c17181a6 liburing-2.5.tar.bz2 # Hash for license files sha256 592987e8510228d546540b84a22444bde98e48d03078d3b2eefcd889bec5ce8c COPYING diff --git a/package/liburing/liburing.mk b/package/liburing/liburing.mk index c35fb39390..2c448d6a87 100644 --- a/package/liburing/liburing.mk +++ b/package/liburing/liburing.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBURING_VERSION = 2.4 +LIBURING_VERSION = 2.5 LIBURING_SOURCE = liburing-$(LIBURING_VERSION).tar.bz2 LIBURING_SITE = https://git.kernel.dk/cgit/liburing/snapshot LIBURING_LICENSE = (GPL-2.0 with exceptions and LGPL-2.1+) or MIT From 5338da0771a119a16e105f168affa7d0d902b97d Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 26 Dec 2023 17:42:47 +0100 Subject: [PATCH 4390/5754] package/lcms2: bump to version 2.16 License file has been renamed and year updated with: https://github.com/mm2/Little-CMS/commit/120410b92498478405ec571dc304d9c192e50a98 https://github.com/mm2/Little-CMS/commit/6bf0713c1c1155c3299bdee3b896f005170a4226 https://github.com/mm2/Little-CMS/releases/tag/lcms2.16 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/lcms2/lcms2.hash | 8 ++++---- package/lcms2/lcms2.mk | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/lcms2/lcms2.hash b/package/lcms2/lcms2.hash index 45728a36f1..362412e3c4 100644 --- a/package/lcms2/lcms2.hash +++ b/package/lcms2/lcms2.hash @@ -1,5 +1,5 @@ -# From https://sourceforge.net/projects/lcms/files/lcms/2.15 -sha1 b143ff29b03676119dbca30f13cbed72af15cce8 lcms2-2.15.tar.gz +# From https://sourceforge.net/projects/lcms/files/lcms/2.16 +sha1 751d32ba11809e3591c118be9aae8ac2dbd41cb7 lcms2-2.16.tar.gz # Locally computed: -sha256 b20cbcbd0f503433be2a4e81462106fa61050a35074dc24a4e356792d971ab39 lcms2-2.15.tar.gz -sha256 46d4e05af3bce75332a12d01f19bcce7e32b6bac544be28a64043d0231291e31 COPYING +sha256 d873d34ad8b9b4cea010631f1a6228d2087475e4dc5e763eb81acc23d9d45a51 lcms2-2.16.tar.gz +sha256 6dbd60437f8ef91d8de1f08ad75882547fd4931bfcc3566a0735f28db1484d31 LICENSE diff --git a/package/lcms2/lcms2.mk b/package/lcms2/lcms2.mk index 3892dbfbdc..92aeff8890 100644 --- a/package/lcms2/lcms2.mk +++ b/package/lcms2/lcms2.mk @@ -4,10 +4,10 @@ # ################################################################################ -LCMS2_VERSION = 2.15 +LCMS2_VERSION = 2.16 LCMS2_SITE = http://downloads.sourceforge.net/project/lcms/lcms/$(LCMS2_VERSION) LCMS2_LICENSE = MIT -LCMS2_LICENSE_FILES = COPYING +LCMS2_LICENSE_FILES = LICENSE LCMS2_CPE_ID_VENDOR = littlecms LCMS2_CPE_ID_PRODUCT = little_cms LCMS2_INSTALL_STAGING = YES From 90c3ed83164deaece8b136d98ce0d82954f892c5 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 26 Dec 2023 17:58:51 +0100 Subject: [PATCH 4391/5754] package/libcgicc: bump to version 3.2.20 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libcgicc/libcgicc.hash | 2 +- package/libcgicc/libcgicc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libcgicc/libcgicc.hash b/package/libcgicc/libcgicc.hash index 87540c8144..699a0dbfd4 100644 --- a/package/libcgicc/libcgicc.hash +++ b/package/libcgicc/libcgicc.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 2a17b976248de03447f9e36d6ce18a80749990d8543e2dfeea09c413eb67f7f0 cgicc-3.2.19.tar.gz +sha256 0f91c5ce8adf406ad35a46152ffb2b9c8d6079604b796d81f48b66d1f068ad4e cgicc-3.2.20.tar.gz # Hash for license files: sha256 a2e480f5e8afd7c587a3c0ac2ed3b73ed4b10fa3a553dea26e7b661c7cedda72 COPYING.LIB diff --git a/package/libcgicc/libcgicc.mk b/package/libcgicc/libcgicc.mk index e9ce4043f5..3d651aefc0 100644 --- a/package/libcgicc/libcgicc.mk +++ b/package/libcgicc/libcgicc.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCGICC_VERSION = 3.2.19 +LIBCGICC_VERSION = 3.2.20 LIBCGICC_SITE = $(BR2_GNU_MIRROR)/cgicc LIBCGICC_SOURCE = cgicc-$(LIBCGICC_VERSION).tar.gz LIBCGICC_LICENSE = LGPL-3.0+ (library), GFDL-1.2+ (docs) From f78086f6694d6ce1504b91a2854397b39ba37eb7 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 26 Dec 2023 18:16:16 +0100 Subject: [PATCH 4392/5754] package/libmpdclient: bump to version 2.22 COPYING has been replaced by BSD-2-Clause.txt and BSD-3-Clause.txt: https://github.com/MusicPlayerDaemon/libmpdclient/commit/0fbe45a419a8a826c8b55741ddf2ad92adcfd63b https://raw.githubusercontent.com/MusicPlayerDaemon/libmpdclient/v2.22/NEWS Signed-off-by: Fabrice Fontaine [yann.morin.1998@free.fr: licenses is a comma separated list] Signed-off-by: Yann E. MORIN --- package/libmpdclient/libmpdclient.hash | 9 ++++++--- package/libmpdclient/libmpdclient.mk | 7 ++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/package/libmpdclient/libmpdclient.hash b/package/libmpdclient/libmpdclient.hash index 8219183c87..626c383402 100644 --- a/package/libmpdclient/libmpdclient.hash +++ b/package/libmpdclient/libmpdclient.hash @@ -1,3 +1,6 @@ -# Verified against http://www.musicpd.org/download/libmpdclient/2/libmpdclient-2.20.tar.xz.sig, sha256 locally computed -sha256 18793f68e939c3301e34d8fcadea1f7daa24143941263cecadb80126194e277d libmpdclient-2.20.tar.xz -sha256 9574c3b0a9c31723cc3d5f32af4655a015fff5ec6ec8115b7906cd7d9623cf32 COPYING +# Verified against http://www.musicpd.org/download/libmpdclient/2/libmpdclient-2.22.tar.xz.sig, sha256 locally computed +sha256 eac15b82b5ba5ed0648af580221eb74657394f7fe768e966d9e9ebb27435429f libmpdclient-2.22.tar.xz + +# Hash for license files: +sha256 fd38b2c053c0cce46d9c5ef3545a6e34d157a240ba99c9b8dca5d37a8147da6c LICENSES/BSD-2-Clause.txt +sha256 e11af671c491efac2f94c1d752bea92f4308ca2450c7d11e582e4b48c40e4de1 LICENSES/BSD-3-Clause.txt diff --git a/package/libmpdclient/libmpdclient.mk b/package/libmpdclient/libmpdclient.mk index 2103ef163e..371bc20dbf 100644 --- a/package/libmpdclient/libmpdclient.mk +++ b/package/libmpdclient/libmpdclient.mk @@ -5,11 +5,12 @@ ################################################################################ LIBMPDCLIENT_VERSION_MAJOR = 2 -LIBMPDCLIENT_VERSION = $(LIBMPDCLIENT_VERSION_MAJOR).20 +LIBMPDCLIENT_VERSION = $(LIBMPDCLIENT_VERSION_MAJOR).22 LIBMPDCLIENT_SOURCE = libmpdclient-$(LIBMPDCLIENT_VERSION).tar.xz LIBMPDCLIENT_SITE = http://www.musicpd.org/download/libmpdclient/$(LIBMPDCLIENT_VERSION_MAJOR) LIBMPDCLIENT_INSTALL_STAGING = YES -LIBMPDCLIENT_LICENSE = BSD-3-Clause -LIBMPDCLIENT_LICENSE_FILES = COPYING +LIBMPDCLIENT_LICENSE = BSD-2-Clause, BSD-3-Clause +LIBMPDCLIENT_LICENSE_FILES = \ + LICENSES/BSD-2-Clause.txt LICENSES/BSD-3-Clause.txt $(eval $(meson-package)) From af5da8f1292bc9839df4ab52ce8d8a64bc8c5f2b Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 26 Dec 2023 18:20:41 +0100 Subject: [PATCH 4393/5754] package/minizip: bump to version 4.0.3 https://github.com/zlib-ng/minizip-ng/releases/tag/4.0.3 https://github.com/zlib-ng/minizip-ng/releases/tag/4.0.2 https://github.com/zlib-ng/minizip-ng/compare/4.0.1...4.0.3 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/minizip/minizip.hash | 2 +- package/minizip/minizip.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/minizip/minizip.hash b/package/minizip/minizip.hash index 5e00881ce3..b21a8490aa 100644 --- a/package/minizip/minizip.hash +++ b/package/minizip/minizip.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 63e47a2b4dbac0da501f43f4da74f118dfb3ef0dee0ffbbe89428271002260f8 minizip-4.0.1.tar.gz +sha256 e39a736d4f55c22fa548e68225b2e92bc22aedd9ab90d002b0c5851e3a7bdace minizip-4.0.3.tar.gz sha256 675181c03fc1302a1c8554c00f7be9bb420c5dbc9dcc2013433cec144413de03 LICENSE diff --git a/package/minizip/minizip.mk b/package/minizip/minizip.mk index d3e539d0e9..5a4d920369 100644 --- a/package/minizip/minizip.mk +++ b/package/minizip/minizip.mk @@ -4,7 +4,7 @@ # ################################################################################ -MINIZIP_VERSION = 4.0.1 +MINIZIP_VERSION = 4.0.3 MINIZIP_SITE = $(call github,zlib-ng,minizip-ng,$(MINIZIP_VERSION)) MINIZIP_DEPENDENCIES = host-pkgconf MINIZIP_INSTALL_STAGING = YES From 5caa16bd70a3d0d50fddfd1c0e0d2fb00bdfcd3a Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 26 Dec 2023 18:23:59 +0100 Subject: [PATCH 4394/5754] package/ncmpc: bump to version 0.49 https://raw.githubusercontent.com/MusicPlayerDaemon/ncmpc/v0.49/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/ncmpc/ncmpc.hash | 2 +- package/ncmpc/ncmpc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ncmpc/ncmpc.hash b/package/ncmpc/ncmpc.hash index 17bc6e3ace..1d288294d1 100644 --- a/package/ncmpc/ncmpc.hash +++ b/package/ncmpc/ncmpc.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 61da23b1bc6c7a593fdc28611932cd7a30fcf6803830e01764c29b8abed2249c ncmpc-0.47.tar.xz +sha256 65bbec0ede9e6bcf62ac647b0c706485beb2bdd5db70ca8d60103f32f162cf29 ncmpc-0.49.tar.xz # Hash for license file: sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/ncmpc/ncmpc.mk b/package/ncmpc/ncmpc.mk index 5d4702de78..bc8a62daea 100644 --- a/package/ncmpc/ncmpc.mk +++ b/package/ncmpc/ncmpc.mk @@ -5,7 +5,7 @@ ################################################################################ NCMPC_VERSION_MAJOR = 0 -NCMPC_VERSION = $(NCMPC_VERSION_MAJOR).47 +NCMPC_VERSION = $(NCMPC_VERSION_MAJOR).49 NCMPC_SOURCE = ncmpc-$(NCMPC_VERSION).tar.xz NCMPC_SITE = http://www.musicpd.org/download/ncmpc/$(NCMPC_VERSION_MAJOR) NCMPC_DEPENDENCIES = \ From 4908332d51fb68a3473d4fb9bbfb34eeb31e2929 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 26 Dec 2023 19:23:38 +0100 Subject: [PATCH 4395/5754] package/gnuplot: bump to version 5.4.10 Drop second patch (already in version) http://www.gnuplot.info/ReleaseNotes_5_4_10.html Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...-unbreak-HAVE_DEFLATE_ENCODER-builds.patch | 51 ------------------- package/gnuplot/gnuplot.hash | 8 +-- package/gnuplot/gnuplot.mk | 2 +- 3 files changed, 5 insertions(+), 56 deletions(-) delete mode 100644 package/gnuplot/0002-term-post.trm-unbreak-HAVE_DEFLATE_ENCODER-builds.patch diff --git a/package/gnuplot/0002-term-post.trm-unbreak-HAVE_DEFLATE_ENCODER-builds.patch b/package/gnuplot/0002-term-post.trm-unbreak-HAVE_DEFLATE_ENCODER-builds.patch deleted file mode 100644 index c3edb39cc6..0000000000 --- a/package/gnuplot/0002-term-post.trm-unbreak-HAVE_DEFLATE_ENCODER-builds.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 84002a5bd7f4cb10e9beffab88ae55b4e982bcea Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -Date: Sun, 1 Oct 2023 10:20:31 +0200 -Subject: [PATCH] term/post.trm: unbreak !HAVE_DEFLATE_ENCODER builds - -Commit 2f2cf617808 (post: handle RGBA images (only current use is to render -a pixmap)) added an extra '}' outside the HAVE_DEFLATE_ENCODER (gd support) -conditional, leading to build breakage: - -In file included from term.h:298, - from term.c:1211: -../term/post.trm:4016:11: error: expected declaration specifiers or '...' before string constant - 4016 | fputs("%%%%BeginImage\n", gppsfile); - -http://autobuild.buildroot.net/results/5676609b6331b645f2e557aca67afe4c3a087433/build-end.log - -Fix it by dropping the extra { } added by the above commit. - -Signed-off-by: Peter Korsgaard -Upstream: https://sourceforge.net/p/gnuplot/gnuplot-main/merge-requests/28/ ---- - term/post.trm | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/term/post.trm b/term/post.trm -index 186eb9d3c..100811b86 100644 ---- a/term/post.trm -+++ b/term/post.trm -@@ -4000,17 +4000,16 @@ PS_image (unsigned int M, unsigned int N, coordval *image, gpiPoint *corner, t_i - cscale = 1.0; - - #ifdef HAVE_DEFLATE_ENCODER -- if (ps_params->level3) { -+ if (ps_params->level3) - encoded_image = (void *)PS_encode_png_image(M, N, image, color_mode, - bits_per_component, max_colors, cscale, - &num_encoded_bytes); -- } else { -+ else - #endif - encoded_image = PS_encode_image(M, N, image, color_mode, - bits_per_component, max_colors, cscale, - (ps_params->level1 ? PS_ASCII_HEX : PS_ASCII85), - &num_encoded_bytes); -- } - - - fputs("%%%%BeginImage\n", gppsfile); --- -2.30.2 - diff --git a/package/gnuplot/gnuplot.hash b/package/gnuplot/gnuplot.hash index 6ed24b6d3c..39dacd50a4 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.9/ -md5 345533e461e41c263b3293f46651f0b2 gnuplot-5.4.9.tar.gz -sha1 1a3953660656a38178ae2b368efa895af55a5001 gnuplot-5.4.9.tar.gz +# From https://sourceforge.net/projects/gnuplot/files/gnuplot/5.4.10/ +md5 334851e63450362bdb95e67fa8a23665 gnuplot-5.4.10.tar.gz +sha1 9981e5b0111c07d376deef571ccc75ce4b4ebbd2 gnuplot-5.4.10.tar.gz # Locally computed -sha256 a328a021f53dc05459be6066020e9a71e8eab6255d3381e22696120d465c6a97 gnuplot-5.4.9.tar.gz +sha256 975d8c1cc2c41c7cedc4e323aff035d977feb9a97f0296dd2a8a66d197a5b27c gnuplot-5.4.10.tar.gz sha256 895928ec0735cca1c8cec42656c7e314a065d0242813bb8693c0c1bf61fd4e4d Copyright diff --git a/package/gnuplot/gnuplot.mk b/package/gnuplot/gnuplot.mk index b98da4267a..825863d080 100644 --- a/package/gnuplot/gnuplot.mk +++ b/package/gnuplot/gnuplot.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNUPLOT_VERSION = 5.4.9 +GNUPLOT_VERSION = 5.4.10 GNUPLOT_SITE = http://downloads.sourceforge.net/project/gnuplot/gnuplot/$(GNUPLOT_VERSION) GNUPLOT_LICENSE = gnuplot license (open source) GNUPLOT_LICENSE_FILES = Copyright From 08c1ed5b6e9b475949bc087a783bceff58fbac7a Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Tue, 26 Dec 2023 21:03:20 +0100 Subject: [PATCH 4396/5754] package/xr819-xradio: bump to version 2023-12-25 With this patch package builds with Linux up to version 6.7 Signed-off-by: Giulio Benetti 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 1ff36368ec..388a3a3cd4 100644 --- a/package/xr819-xradio/xr819-xradio.hash +++ b/package/xr819-xradio/xr819-xradio.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 e27b6b5fb35ef44a93eb1f5b29bd61c06109e951c8a5ea2cc3e0310663f22001 xr819-xradio-547521df27d1a80fb5542e93fa13bd09fb2259a2.tar.gz +sha256 8bc3d745ed08b7f3a9c0413c2635d0faf647362b41494d04edc98709b869deef xr819-xradio-3a1f77fb2db248b7d18d93b67b16e0d6c91db184.tar.gz # Locally computed sha256 db296f2f7f35bca3a174efb0eb392b3b17bd94b341851429a3dff411b1c2fc73 LICENSE diff --git a/package/xr819-xradio/xr819-xradio.mk b/package/xr819-xradio/xr819-xradio.mk index 1e4cdb6872..8b576a347a 100644 --- a/package/xr819-xradio/xr819-xradio.mk +++ b/package/xr819-xradio/xr819-xradio.mk @@ -4,7 +4,7 @@ # ################################################################################ -XR819_XRADIO_VERSION = 547521df27d1a80fb5542e93fa13bd09fb2259a2 +XR819_XRADIO_VERSION = 3a1f77fb2db248b7d18d93b67b16e0d6c91db184 XR819_XRADIO_SITE = $(call github,fifteenhex,xradio,$(XR819_XRADIO_VERSION)) XR819_XRADIO_LICENSE = GPL-2.0 XR819_XRADIO_LICENSE_FILES = LICENSE From 0a8d669f8ea35a4c486834b49cca112e57125c93 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 26 Dec 2023 21:21:16 +0100 Subject: [PATCH 4397/5754] package/shapelib: bump to version 1.6.0 - Drop patch (already in version) - Update hash of web/license.html because SPDX identifier is used since https://github.com/OSGeo/shapelib/commit/6bf68d3086f49245470fc24b121afbbeb8e9c4f2 - COPYING has been replaced by LICENSE-LGPL and LICENSE-MIT since https://github.com/OSGeo/shapelib/commit/1638416feefcee4a1eeef9aab573a5ce44be1f3e https://github.com/OSGeo/shapelib/releases/tag/v1.6.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- .checkpackageignore | 1 - ...Remove-double-free-in-contrib-shpsrt.patch | 26 ------------------- package/shapelib/shapelib.hash | 7 ++--- package/shapelib/shapelib.mk | 7 ++--- 4 files changed, 6 insertions(+), 35 deletions(-) delete mode 100644 package/shapelib/0001-Remove-double-free-in-contrib-shpsrt.patch diff --git a/.checkpackageignore b/.checkpackageignore index 0bad49c223..7c14305284 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1256,7 +1256,6 @@ 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 diff --git a/package/shapelib/0001-Remove-double-free-in-contrib-shpsrt.patch b/package/shapelib/0001-Remove-double-free-in-contrib-shpsrt.patch deleted file mode 100644 index a565874b8c..0000000000 --- a/package/shapelib/0001-Remove-double-free-in-contrib-shpsrt.patch +++ /dev/null @@ -1,26 +0,0 @@ -From c75b9281a5b9452d92e1682bdfe6019a13ed819f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Albin=20Eldst=C3=A5l-Ahrens?= -Date: Mon, 3 Jan 2022 12:34:41 +0100 -Subject: [PATCH] Remove double free() in contrib/shpsrt, issue #39 - -This fixes issue #39 - -[Retrieved from: -https://github.com/OSGeo/shapelib/commit/c75b9281a5b9452d92e1682bdfe6019a13ed819f] -Signed-off-by: Fabrice Fontaine ---- - contrib/shpsort.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/contrib/shpsort.c b/contrib/shpsort.c -index e21e9e0..920cd8c 100644 ---- a/contrib/shpsort.c -+++ b/contrib/shpsort.c -@@ -113,7 +113,6 @@ static char ** split(const char *arg, const char *delim) { - free(result[--i]); - } - free(result); -- free(copy); - return NULL; - } - result = tmp; diff --git a/package/shapelib/shapelib.hash b/package/shapelib/shapelib.hash index b016fef5cf..f542ee79ac 100644 --- a/package/shapelib/shapelib.hash +++ b/package/shapelib/shapelib.hash @@ -1,4 +1,5 @@ # Locally computed -sha256 1fc0a480982caef9e7b9423070b47750ba34cd0ba82668f2e638fab1d07adae1 shapelib-1.5.0.tar.gz -sha256 7eb803a70990017a1c4e38a8342d7413c5dfeec3ed1ac407e15ae2c274e560ff COPYING -sha256 a638278f7f1cb7d0cdc73b47a6c87261b882e356a8e79922e90d44d7ef1dd2c7 web/license.html +sha256 19528b24377241705637320c367943031ad5088665d1fb0e1eaa52a71264a6c4 shapelib-1.6.0.tar.gz +sha256 681e386e44a19d7d0674b4320272c90e66b6610b741e7e6305f8219c42e85366 LICENSE-LGPL +sha256 67f1348ec73ef6343f0dbb3fa0612c321da4073e1ee68ffc99fcd3f2d2a65813 LICENSE-MIT +sha256 15e1205bb007d4d7821f7b1cc461ba8d051647e86dbc9baf1bb6f68b10588eeb web/license.html diff --git a/package/shapelib/shapelib.mk b/package/shapelib/shapelib.mk index 37d2d9ae64..a36a65f80e 100644 --- a/package/shapelib/shapelib.mk +++ b/package/shapelib/shapelib.mk @@ -4,14 +4,11 @@ # ################################################################################ -SHAPELIB_VERSION = 1.5.0 +SHAPELIB_VERSION = 1.6.0 SHAPELIB_SITE = http://download.osgeo.org/shapelib SHAPELIB_LICENSE = MIT or LGPL-2.0 -SHAPELIB_LICENSE_FILES = web/license.html COPYING +SHAPELIB_LICENSE_FILES = LICENSE-LGPL LICENSE-MIT web/license.html SHAPELIB_CPE_ID_VENDOR = osgeo SHAPELIB_INSTALL_STAGING = YES -# 0001-Remove-double-free-in-contrib-shpsrt.patch -SHAPELIB_IGNORE_CVES += CVE-2022-0699 - $(eval $(autotools-package)) From b50c3a431a1e17beb5597d2516c1ac388ba3301a Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 26 Dec 2023 21:36:47 +0100 Subject: [PATCH 4398/5754] package/pkcs11-helper: bump to version 1.30.0 Drop patch (already in version) and so drop autoreconf https://github.com/OpenSC/pkcs11-helper/releases/tag/pkcs11-helper-1.30.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- .checkpackageignore | 1 - ...5-0-does-not-have-DSA_meth_set1_name.patch | 69 ------------------- package/pkcs11-helper/pkcs11-helper.hash | 2 +- package/pkcs11-helper/pkcs11-helper.mk | 4 +- 4 files changed, 2 insertions(+), 74 deletions(-) delete mode 100644 package/pkcs11-helper/0001-openssl-libressl-3-5-0-does-not-have-DSA_meth_set1_name.patch diff --git a/.checkpackageignore b/.checkpackageignore index 7c14305284..fccfb82ade 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1063,7 +1063,6 @@ 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 diff --git a/package/pkcs11-helper/0001-openssl-libressl-3-5-0-does-not-have-DSA_meth_set1_name.patch b/package/pkcs11-helper/0001-openssl-libressl-3-5-0-does-not-have-DSA_meth_set1_name.patch deleted file mode 100644 index 21ce66ae79..0000000000 --- a/package/pkcs11-helper/0001-openssl-libressl-3-5-0-does-not-have-DSA_meth_set1_name.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 17d10b0dfb2b56a047db307687640adcd560e199 Mon Sep 17 00:00:00 2001 -From: Alon Bar-Lev -Date: Mon, 2 May 2022 21:26:58 +0300 -Subject: [PATCH] openssl: libressl-3.5.0 does not have DSA_meth_set1_name - -while it does not expose the DSA_METHOD structure. - -[Retrieved (and updated to remove ChangeLog update) from: -https://github.com/OpenSC/pkcs11-helper/commit/17d10b0dfb2b56a047db307687640adcd560e199] -Signed-off-by: Fabrice Fontaine ---- - ChangeLog | 1 + - configure.ac | 16 ++++++++++++++++ - lib/pkcs11h-openssl.c | 4 ++++ - 3 files changed, 21 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 716bb8d8..57697a3b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -300,7 +300,9 @@ if test "${have_openssl}" = "no"; then - fi - - if test "${have_openssl}" = "yes"; then -+ old_CFLAGS="${CFLAGS}" - old_LIBS="${LIBS}" -+ CFLAGS="${CFLAGS} ${OPENSSL_CFLAGS}" - LIBS="${LIBS} ${OPENSSL_LIBS}" - AC_CHECK_FUNCS([ \ - RSA_meth_dup RSA_meth_free \ -@@ -344,6 +346,20 @@ if test "${have_openssl}" = "yes"; then - ) - AC_MSG_CHECKING([for OpenSSL ec support]) - AC_MSG_RESULT([${openssl_ec}]) -+ # https://github.com/OpenSC/pkcs11-helper/pull/55 -+ AC_COMPILE_IFELSE( -+ [AC_LANG_PROGRAM( -+ [[#include ]], -+ [[ -+ int foo() { -+ DSA_METHOD *meth = NULL; -+ sizeof(meth->name); -+ } -+ ]] -+ )], -+ [AC_DEFINE([HAVE_DSA_METHOD_NAME], [1], [Have DSA_METHOD->name])] -+ ) -+ CFLAGS="${old_CFLAGS}" - LIBS="${old_LIBS}" - fi - -diff --git a/lib/pkcs11h-openssl.c b/lib/pkcs11h-openssl.c -index 961c955c..38ee8e2d 100644 ---- a/lib/pkcs11h-openssl.c -+++ b/lib/pkcs11h-openssl.c -@@ -235,9 +235,13 @@ DSA_meth_free (DSA_METHOD *meth) - static int - DSA_meth_set1_name (DSA_METHOD *meth, const char *name) - { -+#ifdef HAVE_DSA_METHOD_NAME - CK_RV rv; - rv = _pkcs11h_mem_strdup ((void *)&meth->name, name); - return rv == CKR_OK ? 1 : 0; -+#else -+ return 0; -+#endif - } - #endif - diff --git a/package/pkcs11-helper/pkcs11-helper.hash b/package/pkcs11-helper/pkcs11-helper.hash index 0614e8aed4..bc9cf3478b 100644 --- a/package/pkcs11-helper/pkcs11-helper.hash +++ b/package/pkcs11-helper/pkcs11-helper.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 996846a3c8395e03d8c0515111dc84d82e6e3648d44ba28cb2dbbbca2d4db7d6 pkcs11-helper-1.29.0.tar.bz2 +sha256 4c5815ba910cabf26df08d449ca2909daf4538c9899aa7f7fadc61229d3488a9 pkcs11-helper-1.30.0.tar.bz2 sha256 808705ac1daafe07a76431929575c5712a8693977a39ec9102aed25f030754d9 COPYING sha256 865496cf23a6c792739ff2f9ea11e95ac99db89cfe3780a295b4e1495a9c19fe COPYING.BSD sha256 cd2e7d63a11058f19c58b06fb8c759140ce70788369dce6e6e9db40d3475021e COPYING.GPL diff --git a/package/pkcs11-helper/pkcs11-helper.mk b/package/pkcs11-helper/pkcs11-helper.mk index d1a1e38d4e..de192493ea 100644 --- a/package/pkcs11-helper/pkcs11-helper.mk +++ b/package/pkcs11-helper/pkcs11-helper.mk @@ -4,15 +4,13 @@ # ################################################################################ -PKCS11_HELPER_VERSION = 1.29.0 +PKCS11_HELPER_VERSION = 1.30.0 PKCS11_HELPER_SOURCE = pkcs11-helper-$(PKCS11_HELPER_VERSION).tar.bz2 PKCS11_HELPER_SITE = https://github.com/OpenSC/pkcs11-helper/releases/download/pkcs11-helper-$(PKCS11_HELPER_VERSION) PKCS11_HELPER_LICENSE = GPL-2.0 or BSD-3-Clause PKCS11_HELPER_LICENSE_FILES = COPYING COPYING.BSD COPYING.GPL PKCS11_HELPER_DEPENDENCIES = host-pkgconf PKCS11_HELPER_INSTALL_STAGING = YES -# We're patching configure.ac -PKCS11_HELPER_AUTORECONF = YES PKCS11_HELPER_CONF_OPTS = \ --disable-crypto-engine-polarssl \ From c0275ce343c223c078c770f58bf841f9bcdcab33 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 26 Dec 2023 21:50:08 +0100 Subject: [PATCH 4399/5754] package/ell: bump to version 0.61 https://git.kernel.org/pub/scm/libs/ell/ell.git/tree/ChangeLog?h=0.61 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- 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 dd4722480c..8bc61ee293 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 7603928ee584b758ca27c67e4dc513049a09b038d7d28459a9440f8443c91018 ell-0.57.tar.xz +sha256 c21ba3530d530c736f9b3e6acc954d4404c1ce4abaf2a4694e46ecec17653fa0 ell-0.61.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/ell/ell.mk b/package/ell/ell.mk index 08deb62abe..300c1eee88 100644 --- a/package/ell/ell.mk +++ b/package/ell/ell.mk @@ -4,7 +4,7 @@ # ################################################################################ -ELL_VERSION = 0.57 +ELL_VERSION = 0.61 ELL_SOURCE = ell-$(ELL_VERSION).tar.xz ELL_SITE = $(BR2_KERNEL_MIRROR)/linux/libs/ell ELL_LICENSE = LGPL-2.1+ From 030108ba132acab36e9cf06d28a4a5da33fd9a7d Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 26 Dec 2023 21:51:44 +0100 Subject: [PATCH 4400/5754] package/ofono: bump to version 2.2 https://git.kernel.org/pub/scm/network/ofono/ofono.git/tree/ChangeLog?h=2.2 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/ofono/ofono.hash | 2 +- package/ofono/ofono.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ofono/ofono.hash b/package/ofono/ofono.hash index f1760d6f13..9e2fd413f9 100644 --- a/package/ofono/ofono.hash +++ b/package/ofono/ofono.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/linux/network/ofono/sha256sums.asc -sha256 92913dcce9a15cac2174daca249457716a0ec036878d22035e83af0e19e79c52 ofono-2.1.tar.xz +sha256 5e13121c0f885a81ad882db065549ea13477abbcc219f150b38a8d2ac92521de ofono-2.2.tar.xz # Locally computed sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING diff --git a/package/ofono/ofono.mk b/package/ofono/ofono.mk index 5f91e4985d..1ff43092c4 100644 --- a/package/ofono/ofono.mk +++ b/package/ofono/ofono.mk @@ -4,7 +4,7 @@ # ################################################################################ -OFONO_VERSION = 2.1 +OFONO_VERSION = 2.2 OFONO_SOURCE = ofono-$(OFONO_VERSION).tar.xz OFONO_SITE = $(BR2_KERNEL_MIRROR)/linux/network/ofono OFONO_LICENSE = GPL-2.0 From 885cda7e0d67eff56bf803e85185f9f86f02120f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 26 Dec 2023 22:24:31 +0100 Subject: [PATCH 4401/5754] package/lldpd: bump to version 1.0.17 Drop patch (already in version) https://github.com/lldpd/lldpd/blob/1.0.17/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...-overflow-when-parsing-CDP-addresses.patch | 24 ------------------- package/lldpd/lldpd.hash | 4 ++-- package/lldpd/lldpd.mk | 5 +--- 3 files changed, 3 insertions(+), 30 deletions(-) delete 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 deleted file mode 100644 index 05d882a07a..0000000000 --- a/package/lldpd/0001-daemon-fix-read-overflow-when-parsing-CDP-addresses.patch +++ /dev/null @@ -1,24 +0,0 @@ -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.hash b/package/lldpd/lldpd.hash index 6db5ca98f1..e798e2beb2 100644 --- a/package/lldpd/lldpd.hash +++ b/package/lldpd/lldpd.hash @@ -1,5 +1,5 @@ # Locally computed after checking gpg key -# https://media.luffy.cx/files/lldpd/lldpd-1.0.15.tar.gz.gpg +# https://media.luffy.cx/files/lldpd/lldpd-1.0.17.tar.gz.gpg # using key AEF2348766F371C689A7360095A42FE8353525F9 -sha256 f7fe3a130be98a19c491479ef60f36b8ee41a9e6bc4d7f2c41033f63956a3126 lldpd-1.0.15.tar.gz +sha256 9343177f145d2bca66ef03d59528079d3f1663c624b1e2b9d08268efdc6127ce lldpd-1.0.17.tar.gz sha256 0e96a5aea65f16e2239231ce4ab90497f8bc3bb8fe6abe9299aade4726ff7c8d LICENSE diff --git a/package/lldpd/lldpd.mk b/package/lldpd/lldpd.mk index d4abfade81..75457a25e3 100644 --- a/package/lldpd/lldpd.mk +++ b/package/lldpd/lldpd.mk @@ -4,7 +4,7 @@ # ################################################################################ -LLDPD_VERSION = 1.0.15 +LLDPD_VERSION = 1.0.17 LLDPD_SITE = https://media.luffy.cx/files/lldpd LLDPD_DEPENDENCIES = \ $(if $(BR2_PACKAGE_CHECK),check) \ @@ -16,9 +16,6 @@ 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 397bb854299c3548d83e5ff53d6c8d3fddc7331c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 26 Dec 2023 23:28:27 +0100 Subject: [PATCH 4402/5754] package/empty: bump to version 0.6.23c Update hash of COPYRIGHT (update in year with https://sourceforge.net/p/empty/code/ci/203ac90eaf90c01bc210697b8dcef7836d27b802/) https://sourceforge.net/p/empty/code/ci/master/tree/CHANGELOG Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/empty/empty.hash | 4 ++-- package/empty/empty.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/empty/empty.hash b/package/empty/empty.hash index cc74254a7a..5c7daa0052 100644 --- a/package/empty/empty.hash +++ b/package/empty/empty.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 f581d560e1fa857f5304586e3c2107b5838bcf11dedcccec4a7191fa9e261b69 empty-0.6.22b.tgz -sha256 db6b65f5eaf782a92715887ac107f3477d64016301a66194a92312b13ff89be1 COPYRIGHT +sha256 8a7ca8c7099dc6d6743ac7eafc0be3b1f8991d2c8f20cf66ce900c7f08e010bd empty-0.6.23c.tgz +sha256 6433f4490a82b80ddac37f24cebfe8f3cd7de5686ebb9737281d47997a9941d6 COPYRIGHT diff --git a/package/empty/empty.mk b/package/empty/empty.mk index 91d9476445..24135b2f8d 100644 --- a/package/empty/empty.mk +++ b/package/empty/empty.mk @@ -4,7 +4,7 @@ # ################################################################################ -EMPTY_VERSION = 0.6.22b +EMPTY_VERSION = 0.6.23c EMPTY_SOURCE = empty-$(EMPTY_VERSION).tgz EMPTY_SITE = http://downloads.sourceforge.net/project/empty/empty/empty-$(EMPTY_VERSION) EMPTY_LICENSE = BSD-3-Clause From 3ec81b61db7a61e56be81c1f8e85bc776d171fac Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 26 Dec 2023 23:47:33 +0100 Subject: [PATCH 4403/5754] package/wavpack: bump to version 5.6.0 https://github.com/dbry/WavPack/releases/tag/5.6.0 https://github.com/dbry/WavPack/blob/5.6.0/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/wavpack/wavpack.hash | 2 +- package/wavpack/wavpack.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/wavpack/wavpack.hash b/package/wavpack/wavpack.hash index 021703df74..2a2317a86c 100644 --- a/package/wavpack/wavpack.hash +++ b/package/wavpack/wavpack.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 ef749d98df46925bc2916993e601cc7ee9114d99653e63e0e304f031ba73b8e6 wavpack-5.5.0.tar.xz +sha256 af8035f457509c3d338b895875228a9b81de276c88c79bb2d3e31d9b605da9a9 wavpack-5.6.0.tar.xz sha256 275d65ec11a78d552d078b9c26d950e3075892bca895a415ceaaec33bcfabff9 COPYING diff --git a/package/wavpack/wavpack.mk b/package/wavpack/wavpack.mk index a3d952e29b..b393a75197 100644 --- a/package/wavpack/wavpack.mk +++ b/package/wavpack/wavpack.mk @@ -4,7 +4,7 @@ # ################################################################################ -WAVPACK_VERSION = 5.5.0 +WAVPACK_VERSION = 5.6.0 WAVPACK_SITE = \ https://github.com/dbry/WavPack/releases/download/$(WAVPACK_VERSION) WAVPACK_SOURCE = wavpack-$(WAVPACK_VERSION).tar.xz From 0cd1096eb067542070a991120c953811d6e5e4d1 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 27 Dec 2023 11:01:57 +0100 Subject: [PATCH 4404/5754] package/gssdp: bump to version 1.6.3 - libsoup has been replaced by libsoup3 with https://gitlab.gnome.org/GNOME/gssdp/-/commit/e223e6f75e370c3d9b2b402586521fe005f1a0da - Disable manpages which are enabled by default since their addition: https://gitlab.gnome.org/GNOME/gssdp/-/commit/1970906319eefa0bf48553e60ee67b5a75b9e1c5 https://gitlab.gnome.org/GNOME/gssdp/-/blob/gssdp-1.6.3/NEWS Signed-off-by: Fabrice Fontaine [yann.morin.1998@free.fr: multiline assignment is entirely multiline] Signed-off-by: Yann E. MORIN --- package/gssdp/Config.in | 8 ++++---- package/gssdp/gssdp.hash | 4 ++-- package/gssdp/gssdp.mk | 12 ++++++++---- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/package/gssdp/Config.in b/package/gssdp/Config.in index 80c5edfffc..5a9317f486 100644 --- a/package/gssdp/Config.in +++ b/package/gssdp/Config.in @@ -1,10 +1,10 @@ config BR2_PACKAGE_GSSDP bool "gssdp" - depends on BR2_USE_WCHAR # glib2, libsoup - depends on BR2_TOOLCHAIN_HAS_THREADS # glib2, libsoup - depends on BR2_USE_MMU # glib2, libsoup + depends on BR2_USE_WCHAR # glib2, libsoup3 + depends on BR2_TOOLCHAIN_HAS_THREADS # glib2, libsoup3 + depends on BR2_USE_MMU # glib2, libsoup3 select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_LIBSOUP + select BR2_PACKAGE_LIBSOUP3 help GSSDP implements resource discovery and announcement over SSDP. diff --git a/package/gssdp/gssdp.hash b/package/gssdp/gssdp.hash index 34ccfa8044..06bf51090f 100644 --- a/package/gssdp/gssdp.hash +++ b/package/gssdp/gssdp.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.gnome.org/sources/gssdp/1.4/gssdp-1.4.0.1.sha256sum: -sha256 8676849d57fb822b8728856dbadebf3867f89ee47a0ec47a20045d011f431582 gssdp-1.4.0.1.tar.xz +# Hash from: https://download.gnome.org/sources/gssdp/1.6/gssdp-1.6.3.sha256sum: +sha256 2fedb5afdb22cf14d5498a39a773ca89788a250fcf70118783df821e1f3f3446 gssdp-1.6.3.tar.xz # Hash for license file: sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gssdp/gssdp.mk b/package/gssdp/gssdp.mk index f7ebb44acd..3b446496ea 100644 --- a/package/gssdp/gssdp.mk +++ b/package/gssdp/gssdp.mk @@ -4,15 +4,19 @@ # ################################################################################ -GSSDP_VERSION_MAJOR = 1.4 -GSSDP_VERSION = $(GSSDP_VERSION_MAJOR).0.1 +GSSDP_VERSION_MAJOR = 1.6 +GSSDP_VERSION = $(GSSDP_VERSION_MAJOR).3 GSSDP_SOURCE = gssdp-$(GSSDP_VERSION).tar.xz GSSDP_SITE = https://download.gnome.org/sources/gssdp/$(GSSDP_VERSION_MAJOR) GSSDP_LICENSE = LGPL-2.1+ GSSDP_LICENSE_FILES = COPYING GSSDP_INSTALL_STAGING = YES -GSSDP_DEPENDENCIES = host-pkgconf libglib2 libsoup -GSSDP_CONF_OPTS = -Dexamples=false -Dgtk_doc=false -Dsniffer=false +GSSDP_DEPENDENCIES = host-pkgconf libglib2 libsoup3 +GSSDP_CONF_OPTS = \ + -Dexamples=false \ + -Dgtk_doc=false \ + -Dmanpages=false \ + -Dsniffer=false ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) GSSDP_CONF_OPTS += -Dintrospection=true -Dvapi=true From b7938d2ae78ace5bffcf523f06304b27cd4edc0b Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 27 Dec 2023 11:01:58 +0100 Subject: [PATCH 4405/5754] package/gupnp: bump to version 1.6.6 - Drop patches (already in version) - Add patch to fix build with libxml2 2.12 https://gitlab.gnome.org/GNOME/gupnp/-/blob/gupnp-1.6.6/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- .../0001-all-Drop-xmlRecoverMemory.patch | 113 ------------------ ...ix-compatibility-with-libxml2-2-12-x.patch | 84 +++++++++++++ ...properly-spell-provide-in-wrap-files.patch | 30 ----- package/gupnp/gupnp.hash | 4 +- package/gupnp/gupnp.mk | 4 +- 5 files changed, 88 insertions(+), 147 deletions(-) delete mode 100644 package/gupnp/0001-all-Drop-xmlRecoverMemory.patch create mode 100644 package/gupnp/0001-all-Fix-compatibility-with-libxml2-2-12-x.patch delete mode 100644 package/gupnp/0002-build-properly-spell-provide-in-wrap-files.patch diff --git a/package/gupnp/0001-all-Drop-xmlRecoverMemory.patch b/package/gupnp/0001-all-Drop-xmlRecoverMemory.patch deleted file mode 100644 index 46e09c267e..0000000000 --- a/package/gupnp/0001-all-Drop-xmlRecoverMemory.patch +++ /dev/null @@ -1,113 +0,0 @@ -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 - diff --git a/package/gupnp/0001-all-Fix-compatibility-with-libxml2-2-12-x.patch b/package/gupnp/0001-all-Fix-compatibility-with-libxml2-2-12-x.patch new file mode 100644 index 0000000000..14f696ca80 --- /dev/null +++ b/package/gupnp/0001-all-Fix-compatibility-with-libxml2-2-12-x.patch @@ -0,0 +1,84 @@ +From 00514fb62ebd341803fa44e26a6482a8c25dbd34 Mon Sep 17 00:00:00 2001 +From: Jens Georg +Date: Sat, 25 Nov 2023 17:56:02 +0100 +Subject: [PATCH] all: Fix compatibility with libxml2 2.12.x + +Upstream: https://gitlab.gnome.org/GNOME/gupnp/-/commit/00514fb62ebd341803fa44e26a6482a8c25dbd34 +Signed-off-by: Fabrice Fontaine +--- + libgupnp/gupnp-control-point.c | 2 ++ + libgupnp/gupnp-service-proxy-action.c | 2 ++ + libgupnp/gupnp-service-proxy.c | 2 ++ + libgupnp/gupnp-xml-doc.c | 3 +++ + libgupnp/xml-util.h | 2 ++ + 5 files changed, 11 insertions(+) + +diff --git a/libgupnp/gupnp-control-point.c b/libgupnp/gupnp-control-point.c +index d4b44721..4374f726 100644 +--- a/libgupnp/gupnp-control-point.c ++++ b/libgupnp/gupnp-control-point.c +@@ -27,6 +27,8 @@ + #include + #include + ++#include ++ + #include "gupnp-control-point.h" + #include "gupnp-context-private.h" + #include "gupnp-resource-factory-private.h" +diff --git a/libgupnp/gupnp-service-proxy-action.c b/libgupnp/gupnp-service-proxy-action.c +index b241d86c..6ea241ad 100644 +--- a/libgupnp/gupnp-service-proxy-action.c ++++ b/libgupnp/gupnp-service-proxy-action.c +@@ -9,6 +9,8 @@ + + #include + ++#include ++ + #include "gupnp-error.h" + #include "gupnp-service-proxy.h" + #include "gvalue-util.h" +diff --git a/libgupnp/gupnp-service-proxy.c b/libgupnp/gupnp-service-proxy.c +index adba5ab0..3f1a4454 100644 +--- a/libgupnp/gupnp-service-proxy.c ++++ b/libgupnp/gupnp-service-proxy.c +@@ -16,6 +16,8 @@ + #include + #include + ++#include ++ + #include "gena-protocol.h" + #include "gupnp-context-private.h" + #include "gupnp-error-private.h" +diff --git a/libgupnp/gupnp-xml-doc.c b/libgupnp/gupnp-xml-doc.c +index 627f1a28..66f9b3dd 100644 +--- a/libgupnp/gupnp-xml-doc.c ++++ b/libgupnp/gupnp-xml-doc.c +@@ -15,6 +15,9 @@ + #include + #include + #include ++ ++#include ++ + #include "gupnp-xml-doc.h" + #include "gupnp-error.h" + +diff --git a/libgupnp/xml-util.h b/libgupnp/xml-util.h +index a02eb3d4..d0dcaeba 100644 +--- a/libgupnp/xml-util.h ++++ b/libgupnp/xml-util.h +@@ -10,6 +10,8 @@ + #define GUPNP_XML_UTIL_H + + #include ++#include ++ + #include + #include + +-- +GitLab + diff --git a/package/gupnp/0002-build-properly-spell-provide-in-wrap-files.patch b/package/gupnp/0002-build-properly-spell-provide-in-wrap-files.patch deleted file mode 100644 index 0632469a98..0000000000 --- a/package/gupnp/0002-build-properly-spell-provide-in-wrap-files.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 884639bd29323cbb8fbd36bc69d08097a2ae2cd1 Mon Sep 17 00:00:00 2001 -From: Jan Beich -Date: Sun, 9 Jul 2023 03:30:47 +0000 -Subject: [PATCH] build: properly spell [provide] in *.wrap files - -meson.build:1:0: ERROR: Unexpected "[provides]" section, did you mean "[provide]"? - -Upstream: https://gitlab.gnome.org/GNOME/gupnp/-/commit/884639bd29323cbb8fbd36bc69d08097a2ae2cd1 - -Signed-off-by: Bernd Kuhls -[Bernd: backported to branch gupnp-1.4] ---- - subprojects/gssdp-1.6.wrap | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/subprojects/gssdp-1.6.wrap b/subprojects/gssdp-1.6.wrap -index b0b6504..8adc1a2 100644 ---- a/subprojects/gssdp-1.2.wrap -+++ b/subprojects/gssdp-1.2.wrap -@@ -3,6 +3,6 @@ url = https://gitlab.gnome.org/GNOME/gssdp.git - revision = gssdp-1.4 - depth = 1 - --[provides] -+[provide] - dependency_name = gssdp-1.2 - --- -GitLab - diff --git a/package/gupnp/gupnp.hash b/package/gupnp/gupnp.hash index 823dbd7927..b8a3fa082e 100644 --- a/package/gupnp/gupnp.hash +++ b/package/gupnp/gupnp.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.gnome.org/sources/gupnp/1.4/gupnp-1.4.3.sha256sum: -sha256 14eda777934da2df743d072489933bd9811332b7b5bf41626b8032efb28b33ba gupnp-1.4.3.tar.xz +# Hash from: https://download.gnome.org/sources/gupnp/1.6/gupnp-1.6.6.sha256sum: +sha256 c9dc50e8c78b3792d1b0e6c5c5f52c93e9345d3dae2891e311a993a574f5a04f gupnp-1.6.6.tar.xz # Hash for license file: sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gupnp/gupnp.mk b/package/gupnp/gupnp.mk index f41f26d2dd..cfcc114189 100644 --- a/package/gupnp/gupnp.mk +++ b/package/gupnp/gupnp.mk @@ -4,8 +4,8 @@ # ################################################################################ -GUPNP_VERSION_MAJOR = 1.4 -GUPNP_VERSION = $(GUPNP_VERSION_MAJOR).3 +GUPNP_VERSION_MAJOR = 1.6 +GUPNP_VERSION = $(GUPNP_VERSION_MAJOR).6 GUPNP_SOURCE = gupnp-$(GUPNP_VERSION).tar.xz GUPNP_SITE = https://download.gnome.org/sources/gupnp/$(GUPNP_VERSION_MAJOR) GUPNP_LICENSE = LGPL-2.1+ From 2d61c7dba8d016d91b1fe1c33bcaae8b161de46f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 30 Dec 2023 18:34:04 +0100 Subject: [PATCH 4406/5754] package/ipcalc: bump to version 1.0.3 https://gitlab.com/ipcalc/ipcalc/-/blob/1.0.3/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/ipcalc/ipcalc.hash | 2 +- package/ipcalc/ipcalc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ipcalc/ipcalc.hash b/package/ipcalc/ipcalc.hash index 50d08239fa..dec69d2abf 100644 --- a/package/ipcalc/ipcalc.hash +++ b/package/ipcalc/ipcalc.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 47c866941916800270fca23496acc9976ca9488ce9053aeaedc5f47c5929b772 ipcalc-1.0.2.tar.bz2 +sha256 5ed8f20819a5bdb089829fc62c9a2c685252759d5c3ec289492e6ef5762f4e3b ipcalc-1.0.3.tar.bz2 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/ipcalc/ipcalc.mk b/package/ipcalc/ipcalc.mk index e63e174ce2..c1eba5d59f 100644 --- a/package/ipcalc/ipcalc.mk +++ b/package/ipcalc/ipcalc.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPCALC_VERSION = 1.0.2 +IPCALC_VERSION = 1.0.3 IPCALC_SITE = $(call gitlab,ipcalc,ipcalc,$(IPCALC_VERSION)) IPCALC_SOURCE = ipcalc-$(IPCALC_VERSION).tar.bz2 IPCALC_LICENSE = GPL-2.0+ From 699888a49ba14873408bc6dbb34f56d2c29c3692 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 30 Dec 2023 18:47:27 +0100 Subject: [PATCH 4407/5754] package/libhttpserver: bump to version 0.19.0 C++17 is mandatory since https://github.com/etr/libhttpserver/commit/17772843eac42bbd15e13659f96596d59e622872 https://github.com/etr/libhttpserver/releases/tag/0.19.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libhttpserver/Config.in | 6 +++--- package/libhttpserver/libhttpserver.hash | 2 +- package/libhttpserver/libhttpserver.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/libhttpserver/Config.in b/package/libhttpserver/Config.in index dcdf30566d..3120059a08 100644 --- a/package/libhttpserver/Config.in +++ b/package/libhttpserver/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_LIBHTTPSERVER bool "libhttpserver" - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++11 PR59526 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_LIBMICROHTTPD @@ -12,6 +12,6 @@ config BR2_PACKAGE_LIBHTTPSERVER https://github.com/etr/libhttpserver -comment "libhttpserver needs a toolchain w/ C++, threads, gcc >= 5" +comment "libhttpserver needs a toolchain w/ C++, threads, gcc >= 7" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_5 + !BR2_TOOLCHAIN_GCC_AT_LEAST_7 diff --git a/package/libhttpserver/libhttpserver.hash b/package/libhttpserver/libhttpserver.hash index 19ad63bde2..03ebdc4a76 100644 --- a/package/libhttpserver/libhttpserver.hash +++ b/package/libhttpserver/libhttpserver.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 1dfe548ac2add77fcb6c05bd00222c55650ffd02b209f4e3f133a6e3eb29c89d libhttpserver-0.18.2.tar.gz +sha256 b108769ed68d72c58961c517ab16c3a64e4efdc4c45687723bb45bb9e04c5193 libhttpserver-0.19.0.tar.gz sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING.LESSER diff --git a/package/libhttpserver/libhttpserver.mk b/package/libhttpserver/libhttpserver.mk index bd3ecbd416..54774e763b 100644 --- a/package/libhttpserver/libhttpserver.mk +++ b/package/libhttpserver/libhttpserver.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBHTTPSERVER_VERSION = 0.18.2 +LIBHTTPSERVER_VERSION = 0.19.0 LIBHTTPSERVER_SITE = $(call github,etr,libhttpserver,$(LIBHTTPSERVER_VERSION)) LIBHTTPSERVER_LICENSE = LGPL-2.1+ LIBHTTPSERVER_LICENSE_FILES = COPYING.LESSER From 091036dc84c580691e77100f456d24f3e58337ec Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 30 Dec 2023 10:50:51 +0100 Subject: [PATCH 4408/5754] package/upx: bump to version 4.2.1 https://github.com/upx/upx/blob/v4.2.1/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/upx/upx.hash | 2 +- package/upx/upx.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/upx/upx.hash b/package/upx/upx.hash index 072bc0656e..545eb29af9 100644 --- a/package/upx/upx.hash +++ b/package/upx/upx.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 0582f78b517ea87ba1caa6e8c111474f58edd167e5f01f074d7d9ca2f81d47d0 upx-4.1.0-src.tar.xz +sha256 cc562ea7dbd8cec4505edea68736e04030ec5891c1e2a300e3c0d0eac6364479 upx-4.2.1-src.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/upx/upx.mk b/package/upx/upx.mk index 0a0e9086e5..d6c068fc3b 100644 --- a/package/upx/upx.mk +++ b/package/upx/upx.mk @@ -4,7 +4,7 @@ # ################################################################################ -UPX_VERSION = 4.1.0 +UPX_VERSION = 4.2.1 UPX_SITE = https://github.com/upx/upx/releases/download/v$(UPX_VERSION) UPX_SOURCE = upx-$(UPX_VERSION)-src.tar.xz UPX_LICENSE = GPL-2.0+ From 5efd903ef0b92c7ef0deca8b4f050df5c19c31f4 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 30 Dec 2023 16:16:50 +0100 Subject: [PATCH 4409/5754] package/atest: bump to latest commit Drop patch (already in version) Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - .../0001-seq.h-fix-build-with-gcc-10.patch | 40 ------------------- package/atest/atest.hash | 2 +- package/atest/atest.mk | 2 +- 4 files changed, 2 insertions(+), 43 deletions(-) delete mode 100644 package/atest/0001-seq.h-fix-build-with-gcc-10.patch diff --git a/.checkpackageignore b/.checkpackageignore index fccfb82ade..e76f6e829e 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -163,7 +163,6 @@ package/asterisk/0005-configure-fix-detection-of-re-entrant-resolver-funct.patch package/asterisk/0006-main-iostream.c-fix-build-with-libressl.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 diff --git a/package/atest/0001-seq.h-fix-build-with-gcc-10.patch b/package/atest/0001-seq.h-fix-build-with-gcc-10.patch deleted file mode 100644 index c0ae042b01..0000000000 --- a/package/atest/0001-seq.h-fix-build-with-gcc-10.patch +++ /dev/null @@ -1,40 +0,0 @@ -From fb374e0775fd9772a2cd7b99a5c21f96f7fe2a9a Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 10 Aug 2020 12:12:07 +0200 -Subject: [PATCH] seq.h: fix build with gcc 10 - -Rename state structure to avoid the following build failure with gcc -10.0: - -/bin/bash ./libtool --tag=CC --mode=link /home/test/autobuild/run/instance-0/output-1/host/bin/arm-buildroot-linux-gnueabihf-gcc -include config.h -Wall -Wno-sign-compare -Wno-strict-aliasing -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -o atest atest.o seq.o alsa.o capture.o playback.o loopback_delay.o -L/home/test/autobuild/run/instance-0/output-1/host/bin/../arm-buildroot-linux-gnueabihf/sysroot/usr/lib -lasound -lev -libtool: link: /home/test/autobuild/run/instance-0/output-1/host/bin/arm-buildroot-linux-gnueabihf-gcc -include config.h -Wall -Wno-sign-compare -Wno-strict-aliasing -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -o atest atest.o seq.o alsa.o capture.o playback.o loopback_delay.o -L/home/test/autobuild/run/instance-0/output-1/host/bin/../arm-buildroot-linux-gnueabihf/sysroot/usr/lib /home/test/autobuild/run/instance-0/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/libasound.so -ldl -lpthread -lrt /home/test/autobuild/run/instance-0/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/libev.so -lm -Wl,-rpath -Wl,/home/test/autobuild/run/instance-0/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib -Wl,-rpath -Wl,/home/test/autobuild/run/instance-0/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib -/home/test/autobuild/run/instance-0/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: seq.o:(.bss+0x8): multiple definition of `state'; atest.o:(.bss+0xbc): first defined here -/home/test/autobuild/run/instance-0/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: capture.o:(.bss+0x0): multiple definition of `state'; atest.o:(.bss+0xbc): first defined here -/home/test/autobuild/run/instance-0/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: playback.o:(.bss+0x0): multiple definition of `state'; atest.o:(.bss+0xbc): first defined here -/home/test/autobuild/run/instance-0/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: loopback_delay.o:(.bss+0x0): multiple definition of `state'; atest.o:(.bss+0xbc): first defined here - -Fixes: - - http://autobuild.buildroot.org/results/887c466b3703449239eedaf86f3f4dd2a2dc8afe - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/amouiche/atest/pull/3] ---- - seq.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/seq.h b/seq.h -index 0fa1a95..b7ba8d1 100644 ---- a/seq.h -+++ b/seq.h -@@ -30,7 +30,7 @@ enum seq_stat_e { - NULL_FRAME = 0, - INVALID_FRAME, - VALID_FRAME, --} state; -+}; - - - struct seq_info { --- -2.27.0 - diff --git a/package/atest/atest.hash b/package/atest/atest.hash index e411a934e5..a7ade8ad37 100644 --- a/package/atest/atest.hash +++ b/package/atest/atest.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 91da5a6d4d0b0a8d4bae156a40e91a6dccf62863bfa7acae948efbbd2b4154ca atest-895b0183a89c15f5e2305a6795bb1667753cd3f0.tar.gz +sha256 53980d44af542cc02cbcecba1f10c8a16523aa80196fbb8fc257ff6e949344de atest-9ff52ee5d7764984e21fe40a381b41ecd2d63548.tar.gz sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/package/atest/atest.mk b/package/atest/atest.mk index 68def46cf9..e9f338acf2 100644 --- a/package/atest/atest.mk +++ b/package/atest/atest.mk @@ -4,7 +4,7 @@ # ################################################################################ -ATEST_VERSION = 895b0183a89c15f5e2305a6795bb1667753cd3f0 +ATEST_VERSION = 9ff52ee5d7764984e21fe40a381b41ecd2d63548 ATEST_SITE = $(call github,amouiche,atest,$(ATEST_VERSION)) ATEST_LICENSE = GPL-2.0+ ATEST_LICENSE_FILES = COPYING From 132c71798c6e9c47c61e8a8a45db2d0266ac92f7 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 30 Dec 2023 16:26:27 +0100 Subject: [PATCH 4410/5754] package/audit: bump to version 3.1.2 Drop patch (already in version) https://github.com/linux-audit/audit-userspace/blob/v3.1.2/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...ine-__attribute_malloc__-when-needed.patch | 35 ------------------- package/audit/audit.hash | 2 +- package/audit/audit.mk | 2 +- 3 files changed, 2 insertions(+), 37 deletions(-) delete mode 100644 package/audit/0001-Define-__attribute_malloc__-when-needed.patch diff --git a/package/audit/0001-Define-__attribute_malloc__-when-needed.patch b/package/audit/0001-Define-__attribute_malloc__-when-needed.patch deleted file mode 100644 index 3dd5359bfc..0000000000 --- a/package/audit/0001-Define-__attribute_malloc__-when-needed.patch +++ /dev/null @@ -1,35 +0,0 @@ -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/audit.hash b/package/audit/audit.hash index 310b0a0f6a..5743b3a13a 100644 --- a/package/audit/audit.hash +++ b/package/audit/audit.hash @@ -1,4 +1,4 @@ #Locally computed -sha256 46e46b37623cce09e6ee134e78d668afc34f4e1c870c853ef12e4193078cfe87 audit-3.1.1.tar.gz +sha256 c0b1792d1f0a88c6f1828710509cbb987059fc68712c97669ca90eae103d287d audit-3.1.2.tar.gz sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING sha256 f18a0811fa0e220ccbc42f661545e77f0388631e209585ed582a1c693029c6aa COPYING.LIB diff --git a/package/audit/audit.mk b/package/audit/audit.mk index e77e06bd6b..76828571ca 100644 --- a/package/audit/audit.mk +++ b/package/audit/audit.mk @@ -4,7 +4,7 @@ # ################################################################################ -AUDIT_VERSION = 3.1.1 +AUDIT_VERSION = 3.1.2 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 15515ed0cd7efe586dd488a91d66ca6133de9f86 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 30 Dec 2023 17:21:11 +0100 Subject: [PATCH 4411/5754] package/catatonit: bump to version 0.2.0 - Drop first patch (already in version) - Update second patch - License changed to GPL-2.0+: https://github.com/openSUSE/catatonit/commit/fe191ef859c6365d44a4d7f4ac9765dee825d78c https://github.com/openSUSE/catatonit/releases/tag/v0.2.0 https://github.com/openSUSE/catatonit/compare/v0.1.7...v0.2.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - ...e.ac-call-AM_INIT_AUTOMAKE-only-once.patch | 41 ------------------- ...h => 0001-fix-build-with-kernel-5.9.patch} | 15 +++---- package/catatonit/catatonit.hash | 4 +- package/catatonit/catatonit.mk | 4 +- 5 files changed, 10 insertions(+), 55 deletions(-) delete mode 100644 package/catatonit/0001-configure.ac-call-AM_INIT_AUTOMAKE-only-once.patch rename package/catatonit/{0002-fix-build-with-kernel-5.9.patch => 0001-fix-build-with-kernel-5.9.patch} (83%) diff --git a/.checkpackageignore b/.checkpackageignore index e76f6e829e..def465e802 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -237,7 +237,6 @@ package/cairo/0002-ft-Use-FT_Done_MM_Var-instead-of-free-when-available-in-cairo 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 diff --git a/package/catatonit/0001-configure.ac-call-AM_INIT_AUTOMAKE-only-once.patch b/package/catatonit/0001-configure.ac-call-AM_INIT_AUTOMAKE-only-once.patch deleted file mode 100644 index b978a827a1..0000000000 --- a/package/catatonit/0001-configure.ac-call-AM_INIT_AUTOMAKE-only-once.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 99bb9048f532257f3a2c3856cfa19fe957ab6cec Mon Sep 17 00:00:00 2001 -From: Antonio Terceiro -Date: Thu, 4 Nov 2021 07:37:13 -0300 -Subject: [PATCH] configure.ac: call AM_INIT_AUTOMAKE only once - -That second call seems to be there since the beginning, and autoconf -2.69 was fine with it. autoconf 2.71 doesn't allow it anymore: - - $ ./autogen.sh - autoreconf: export WARNINGS= - autoreconf: Entering directory '.' - autoreconf: configure.ac: not using Gettext - autoreconf: running: aclocal --force - configure.ac:34: error: AM_INIT_AUTOMAKE expanded multiple times - /usr/share/aclocal-1.16/init.m4:29: AM_INIT_AUTOMAKE is expanded from... - configure.ac:19: the top level - /usr/share/aclocal-1.16/init.m4:29: AM_INIT_AUTOMAKE is expanded from... - configure.ac:34: the top level - autom4te: error: /usr/bin/m4 failed with exit status: 1 - aclocal: error: /usr/bin/autom4te failed with exit status: 1 - autoreconf: error: aclocal failed with exit status: 1 - -Signed-off-by: Antonio Terceiro -Upstream: https://github.com/openSUSE/catatonit/commit/99bb9048f532257f3a2c3856cfa19fe957ab6cec -Signed-off-by: Christian Stewart ---- - configure.ac | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 12c9186..94c5c84 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -31,4 +31,3 @@ AC_FUNC_FORK - - AC_CONFIG_FILES([Makefile config.h]) - AC_OUTPUT --AM_INIT_AUTOMAKE --- -2.37.2 - diff --git a/package/catatonit/0002-fix-build-with-kernel-5.9.patch b/package/catatonit/0001-fix-build-with-kernel-5.9.patch similarity index 83% rename from package/catatonit/0002-fix-build-with-kernel-5.9.patch rename to package/catatonit/0001-fix-build-with-kernel-5.9.patch index a4c66389db..37def8e546 100644 --- a/package/catatonit/0002-fix-build-with-kernel-5.9.patch +++ b/package/catatonit/0001-fix-build-with-kernel-5.9.patch @@ -1,4 +1,4 @@ -From 1fefcbffe4ade02d625bf058a7c07aeaf9fa7a2f Mon Sep 17 00:00:00 2001 +From 65e1b96bd40cb14b3729ac56bb9f1fcb77254403 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 1 Nov 2022 14:16:01 +0100 Subject: [PATCH] fix build with kernel < 5.9 @@ -15,17 +15,17 @@ Fixes: - http://autobuild.buildroot.org/results/ed9a847905083175c7fcb2f2df28f9ac5b9c3313 Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/openSUSE/catatonit/pull/24] +Upstream: https://github.com/openSUSE/catatonit/commit/663ad1670689143f65af3a288f90cecb7feed54f --- catatonit.c | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/catatonit.c b/catatonit.c -index a38263a..474c525 100644 +index a33f4cd..b10d9b0 100644 --- a/catatonit.c +++ b/catatonit.c -@@ -35,7 +35,7 @@ +@@ -36,7 +36,7 @@ #include #include @@ -35,10 +35,10 @@ index a38263a..474c525 100644 #else # include diff --git a/configure.ac b/configure.ac -index 94c5c84..a746ea1 100644 +index 69e89f0..b37f146 100644 --- a/configure.ac +++ b/configure.ac -@@ -22,7 +22,7 @@ LT_PREREQ([2.4.2]) +@@ -24,7 +24,7 @@ LT_PREREQ([2.4.2]) LT_INIT([disable-shared]) AC_CHECK_HEADERS([errno.h fcntl.h signal.h stdarg.h stdio.h stdlib.h unistd.h]) @@ -47,6 +47,3 @@ index 94c5c84..a746ea1 100644 AC_CHECK_FUNCS([close_range]) --- -2.35.1 - diff --git a/package/catatonit/catatonit.hash b/package/catatonit/catatonit.hash index 9b7420cdb7..9940309c76 100644 --- a/package/catatonit/catatonit.hash +++ b/package/catatonit/catatonit.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e22bc72ebc23762dad8f5d2ed9d5ab1aaad567bdd54422f1d1da775277a93296 catatonit-0.1.7.tar.gz -sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING +sha256 d0cf1feffdc89c9fb52af20fc10127887a408bbd99e0424558d182b310a3dc92 catatonit-0.2.0.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/catatonit/catatonit.mk b/package/catatonit/catatonit.mk index 3dd58eff1d..a308ea6471 100644 --- a/package/catatonit/catatonit.mk +++ b/package/catatonit/catatonit.mk @@ -4,9 +4,9 @@ # ################################################################################ -CATATONIT_VERSION = 0.1.7 +CATATONIT_VERSION = 0.2.0 CATATONIT_SITE = $(call github,openSUSE,catatonit,v$(CATATONIT_VERSION)) -CATATONIT_LICENSE = GPL-3.0+ +CATATONIT_LICENSE = GPL-2.0+ CATATONIT_LICENSE_FILES = COPYING CATATONIT_AUTORECONF = YES From 00e5f52f2f3caf8f125bae400be026e7c7747c83 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 30 Dec 2023 17:38:44 +0100 Subject: [PATCH 4412/5754] package/cracklib: bump to version 2.9.11 https://github.com/cracklib/cracklib/blob/v2.9.11/src/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/cracklib/cracklib.hash | 4 ++-- package/cracklib/cracklib.mk | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/cracklib/cracklib.hash b/package/cracklib/cracklib.hash index ff527d517a..a97818cbdd 100644 --- a/package/cracklib/cracklib.hash +++ b/package/cracklib/cracklib.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 1f9d34385ea3aa7cd7c07fa388dc25810aea9d3c33e260c713a3a5873d70e386 cracklib-2.9.8.tar.bz2 -sha256 ec25ac4a474588c58d901715512d8902b276542b27b8dd197e9c2ad373739ec4 cracklib-words-2.9.8.bz2 +sha256 2c83a91dd21d035eab98bded764eb4579b73fd837b683e1a447b11ef604ee130 cracklib-2.9.11.tar.xz +sha256 b3d1e0e0ae9bc7ffed65c0042d7c68bdb903368aa6b918f94572453c6ea874dc cracklib-words-2.9.11.xz sha256 f18a0811fa0e220ccbc42f661545e77f0388631e209585ed582a1c693029c6aa COPYING.LIB diff --git a/package/cracklib/cracklib.mk b/package/cracklib/cracklib.mk index bb7c18d5be..c1834b4730 100644 --- a/package/cracklib/cracklib.mk +++ b/package/cracklib/cracklib.mk @@ -4,8 +4,8 @@ # ################################################################################ -CRACKLIB_VERSION = 2.9.8 -CRACKLIB_SOURCE = cracklib-$(CRACKLIB_VERSION).tar.bz2 +CRACKLIB_VERSION = 2.9.11 +CRACKLIB_SOURCE = cracklib-$(CRACKLIB_VERSION).tar.xz CRACKLIB_SITE = https://github.com/cracklib/cracklib/releases/download/v$(CRACKLIB_VERSION) CRACKLIB_LICENSE = LGPL-2.1 CRACKLIB_LICENSE_FILES = COPYING.LIB @@ -34,8 +34,8 @@ endif HOST_CRACKLIB_CONF_OPTS += --without-python --without-zlib ifeq ($(BR2_PACKAGE_CRACKLIB_FULL_DICT),y) -CRACKLIB_EXTRA_DOWNLOADS = cracklib-words-$(CRACKLIB_VERSION).bz2 -CRACKLIB_DICT_SOURCE = $(CRACKLIB_DL_DIR)/cracklib-words-$(CRACKLIB_VERSION).bz2 +CRACKLIB_EXTRA_DOWNLOADS = cracklib-words-$(CRACKLIB_VERSION).xz +CRACKLIB_DICT_SOURCE = $(CRACKLIB_DL_DIR)/cracklib-words-$(CRACKLIB_VERSION).xz else CRACKLIB_DICT_SOURCE = $(@D)/dicts/cracklib-small endif From 55c80fdfb379c74c7f7e8c260dea02e0150d7614 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 30 Dec 2023 17:58:08 +0100 Subject: [PATCH 4413/5754] package/cups: bump to version 2.4.7 Drop fifth patch (already in version) https://github.com/OpenPrinting/cups/releases/tag/v2.4.7 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...raster-interpret.c-Fix-CVE-2023-4504.patch | 45 ------------------- package/cups/cups.hash | 2 +- package/cups/cups.mk | 5 +-- 3 files changed, 2 insertions(+), 50 deletions(-) delete mode 100644 package/cups/0005-raster-interpret.c-Fix-CVE-2023-4504.patch diff --git a/package/cups/0005-raster-interpret.c-Fix-CVE-2023-4504.patch b/package/cups/0005-raster-interpret.c-Fix-CVE-2023-4504.patch deleted file mode 100644 index d1dff4e1fa..0000000000 --- a/package/cups/0005-raster-interpret.c-Fix-CVE-2023-4504.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 2431caddb7e6a87f04ac90b5c6366ad268b6ff31 Mon Sep 17 00:00:00 2001 -From: Zdenek Dohnal -Date: Wed, 20 Sep 2023 14:45:17 +0200 -Subject: [PATCH] raster-interpret.c: Fix CVE-2023-4504 - -We didn't check for end of buffer if it looks there is an escaped -character - check for NULL terminator there and if found, return NULL -as return value and in `ptr`, because a lone backslash is not -a valid PostScript character. - -Upstream: https://github.com/OpenPrinting/cups/commit/2431caddb7e6a87f04ac90b5c6366ad268b6ff31 -[Peter: drop CHANGES hunk] -Signed-off-by: Peter Korsgaard ---- - cups/raster-interpret.c | 14 +++++++++++++- - 1 file changed, 14 insertions(+), 1 deletion(-) - -diff --git a/cups/raster-interpret.c b/cups/raster-interpret.c -index 6fcf731b5..b8655c8c6 100644 ---- a/cups/raster-interpret.c -+++ b/cups/raster-interpret.c -@@ -1116,7 +1116,19 @@ scan_ps(_cups_ps_stack_t *st, /* I - Stack */ - - cur ++; - -- if (*cur == 'b') -+ /* -+ * Return NULL if we reached NULL terminator, a lone backslash -+ * is not a valid character in PostScript. -+ */ -+ -+ if (!*cur) -+ { -+ *ptr = NULL; -+ -+ return (NULL); -+ } -+ -+ if (*cur == 'b') - *valptr++ = '\b'; - else if (*cur == 'f') - *valptr++ = '\f'; --- -2.30.2 - diff --git a/package/cups/cups.hash b/package/cups/cups.hash index 501d8c12a6..2d7bbf1aa9 100644 --- a/package/cups/cups.hash +++ b/package/cups/cups.hash @@ -1,4 +1,4 @@ # Locally calculated: -sha256 58e970cf1955e1cc87d0847c32526d9c2ccee335e5f0e3882b283138ba0e7262 cups-2.4.6-source.tar.gz +sha256 dd54228dd903526428ce7e37961afaed230ad310788141da75cebaa08362cf6c cups-2.4.7-source.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE sha256 5320b6e3c252423e4153eb2dd63e57e3b630afb21139f44e43b02d85fe33e279 NOTICE diff --git a/package/cups/cups.mk b/package/cups/cups.mk index 4bc5eeedee..2ad5eeb5cf 100644 --- a/package/cups/cups.mk +++ b/package/cups/cups.mk @@ -4,7 +4,7 @@ # ################################################################################ -CUPS_VERSION = 2.4.6 +CUPS_VERSION = 2.4.7 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 @@ -13,9 +13,6 @@ CUPS_CPE_ID_VENDOR = openprinting CUPS_SELINUX_MODULES = cups CUPS_INSTALL_STAGING = YES -# 0005-raster-interpret.c-Fix-CVE-2023-4504.patch -CUPS_IGNORE_CVES += CVE-2023-4504 - # Using autoconf, not autoheader, so we cannot use AUTORECONF = YES. define CUPS_RUN_AUTOCONF cd $(@D); $(AUTOCONF) -f From 0040b2ec0f4829f6d0e30ecea3ba24d424ef1980 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 30 Dec 2023 18:06:33 +0100 Subject: [PATCH 4414/5754] package/dump1090: bump to version 9.0 https://github.com/flightaware/dump1090/compare/v8.2...v9.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/dump1090/dump1090.hash | 2 +- package/dump1090/dump1090.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dump1090/dump1090.hash b/package/dump1090/dump1090.hash index 8a4c3a4818..a493e76560 100644 --- a/package/dump1090/dump1090.hash +++ b/package/dump1090/dump1090.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 1ab8a5acd891bdbba586e2e9f2d9b056210940bd47b5c1a19d133eb091f31555 dump1090-8.2.tar.gz +sha256 6190622c3625713ec9cff882a9d6f6a51b6d2f83ef20e6e1905a3902c7b08483 dump1090-9.0.tar.gz sha256 804f68c803eb5c127c53ad17c4f4e5033ef158e514bb76950dc7b1773f9ce4b0 LICENSE diff --git a/package/dump1090/dump1090.mk b/package/dump1090/dump1090.mk index 60ef4a9bcb..e06babb082 100644 --- a/package/dump1090/dump1090.mk +++ b/package/dump1090/dump1090.mk @@ -4,7 +4,7 @@ # ################################################################################ -DUMP1090_VERSION = 8.2 +DUMP1090_VERSION = 9.0 DUMP1090_SITE = $(call github,flightaware,dump1090,v$(DUMP1090_VERSION)) DUMP1090_LICENSE = GPL-2.0+ DUMP1090_LICENSE_FILES = LICENSE From 075554bbb828c0a67990cd933d9b3d7557454440 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 27 Dec 2023 23:59:39 +0100 Subject: [PATCH 4415/5754] package/libostree: switch to libsoup3 libsoup3 is supported since bump to version 2023.3 in commit 618eb375a046cc4ff007758510c883788e6ff690 and https://github.com/ostreedev/ostree/commit/d0ea2db4300eb7871b59d0b997a7f06869120297 So switch to libsoup3 and drop libsoup2 as: - libsoup2 is unmaintained (as stated by commit b45c2a048d02a0e30da8534b5c048d048b252452) - libsoup2 will be removed at some point (as stated by commit f93380ab1a36bdd019cfbc651a9df5904096e189) Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libostree/libostree.mk | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/package/libostree/libostree.mk b/package/libostree/libostree.mk index d13f484041..a737dc047f 100644 --- a/package/libostree/libostree.mk +++ b/package/libostree/libostree.mk @@ -17,6 +17,7 @@ LIBOSTREE_CONF_ENV = \ GPG_ERROR_CONFIG=$(STAGING_DIR)/usr/bin/gpg-error-config LIBOSTREE_CONF_OPTS += \ --with-gpgme-prefix=$(STAGING_DIR)/usr \ + --without-soup \ --disable-gtk-doc \ --disable-gtk-doc-html \ --disable-gtk-doc-pdf \ @@ -44,10 +45,10 @@ else LIBOSTREE_CONF_OPTS += --without-avahi endif -#cURL support depends on libsoup -ifeq ($(BR2_PACKAGE_LIBSOUP),y) -LIBOSTREE_CONF_OPTS += --with-soup -LIBOSTREE_DEPENDENCIES += libsoup +# cURL support depends on libsoup3 +ifeq ($(BR2_PACKAGE_LIBSOUP3),y) +LIBOSTREE_CONF_OPTS += --with-soup3 +LIBOSTREE_DEPENDENCIES += libsoup3 ifeq ($(BR2_PACKAGE_LIBCURL),y) LIBOSTREE_CONF_OPTS += --with-curl LIBOSTREE_DEPENDENCIES += libcurl @@ -55,7 +56,7 @@ else LIBOSTREE_CONF_OPTS += --without-curl endif else -LIBOSTREE_CONF_OPTS += --without-soup --without-curl +LIBOSTREE_CONF_OPTS += --without-soup3 --without-curl endif ifeq ($(BR2_PACKAGE_LIBARCHIVE),y) From 5a977b50beabbbfd07a9730be71059cb336771e6 Mon Sep 17 00:00:00 2001 From: Michael Nosthoff Date: Thu, 28 Dec 2023 10:47:24 +0100 Subject: [PATCH 4416/5754] package/catch2: bump to version 3.5.0 Signed-off-by: Michael Nosthoff Signed-off-by: Thomas Petazzoni --- 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 88a6a06df2..d118feadf8 100644 --- a/package/catch2/catch2.hash +++ b/package/catch2/catch2.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 122928b814b75717316c71af69bd2b43387643ba076a6ec16e7882bfb2dfacbb catch2-3.4.0.tar.gz +sha256 f6d4f8d78a9b59ec72a81d49f58d18eb317372ac07f8d9432710a079e69fd66a catch2-3.5.0.tar.gz sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE.txt diff --git a/package/catch2/catch2.mk b/package/catch2/catch2.mk index 580ddca5da..49ac5fff2d 100644 --- a/package/catch2/catch2.mk +++ b/package/catch2/catch2.mk @@ -4,7 +4,7 @@ # ################################################################################ -CATCH2_VERSION = 3.4.0 +CATCH2_VERSION = 3.5.0 CATCH2_SITE = $(call github,catchorg,Catch2,v$(CATCH2_VERSION)) CATCH2_INSTALL_STAGING = YES CATCH2_INSTALL_TARGET = NO From 05392a5eae61c2855bc8d94f5bf9677ebbc5462a Mon Sep 17 00:00:00 2001 From: Antoine Coutant Date: Thu, 28 Dec 2023 16:26:55 +0100 Subject: [PATCH 4417/5754] package/{rust, rust-bin}: bump to version 1.74.1 Link to Rust 1.74.1 announcement: https://blog.rust-lang.org/2023/12/07/Rust-1.74.1.html The mips*-unknown-linux-gnu* targets were removed from stage 2 with host tools in version 1.72.0. Release note: https://github.com/rust-lang/rust/releases/tag/1.72.0 Signed-off-by: Antoine Coutant Signed-off-by: Thomas Petazzoni --- package/rust-bin/rust-bin.hash | 236 +++++++++++++++------------------ package/rust-bin/rust-bin.mk | 2 +- package/rust/rust.hash | 6 +- package/rust/rust.mk | 2 +- package/rustc/Config.in.host | 10 -- 5 files changed, 114 insertions(+), 142 deletions(-) diff --git a/package/rust-bin/rust-bin.hash b/package/rust-bin/rust-bin.hash index a11a964a90..d44cb2cb67 100644 --- a/package/rust-bin/rust-bin.hash +++ b/package/rust-bin/rust-bin.hash @@ -1,129 +1,111 @@ -# 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 +# From https://static.rust-lang.org/dist/rust-1.74.1-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.74.1-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 88d0cd0407ca5bb73b5d72956d85e31e057657c7ec09a58ca634cf36bd5cf626 rust-1.74.1-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.74.1-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.74.1-i686-unknown-linux-gnu.tar.xz.asc +sha256 f58cdf15717e7f6506088e753ffef3ec655a4ccd932eae280d6cb68b0ee3feca rust-1.74.1-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.74.1-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.74.1-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 d272cec30f3461647861d120af53946142fa2f969f43040c2685425cb67c7d79 rust-1.74.1-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.74.1-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.74.1-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 17df1fa64083fa508576062a651577e0741d02f4ae5771518a72fd4ea483b00f rust-1.74.1-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.74.1-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.74.1-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 054a98e8e85e94c187ff8bc16bac8011747839c9ad73584fdd87b904f137eb23 rust-1.74.1-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.74.1-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.74.1-riscv64gc-unknown-linux-gnu.tar.xz.asc +sha256 4abc1499e91cfadf7610a08271d1f5ff9284a54ba4a0ba60f105bb9b2413169e rust-1.74.1-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.74.1-s390x-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.74.1-s390x-unknown-linux-gnu.tar.xz.asc +sha256 3196fd6e4453cd2191e5f8c4f63eaffd045cc1884cf4b64d94990aa81232f85f rust-1.74.1-s390x-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.74.1-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.74.1-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 5483e32fe962e9123cf49c9cf169e60640d4c9d0aad1a054dd4bf232f0f012be rust-1.74.1-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.74.1-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 a776e7b41991ef7a50706d1f9b7752a8d963e67297bfc22471d6e68d544349cc rust-std-1.74.1-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.74.1-aarch64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-aarch64-unknown-linux-musl.tar.xz.asc +sha256 d712e44d57f3732c294affb26c07d8fb79f25c716b16a4bde910390f34cc9959 rust-std-1.74.1-aarch64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.74.1-arm-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-arm-unknown-linux-gnueabi.tar.xz.asc +sha256 38ccd7eeb30e481a27533ec1450c1eb4f3c3fee284f702ee64676b3831bde425 rust-std-1.74.1-arm-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.74.1-arm-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-arm-unknown-linux-gnueabihf.tar.xz.asc +sha256 5f1b890faa083afd97ed53c67d859f4de89abe9a059b48c98217d8ee015bedeb rust-std-1.74.1-arm-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.74.1-arm-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-arm-unknown-linux-musleabi.tar.xz.asc +sha256 9b57973a9d23e713799169c3b39282655b742c9182e21270f53a3bb46af516f3 rust-std-1.74.1-arm-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.74.1-arm-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-arm-unknown-linux-musleabihf.tar.xz.asc +sha256 26bad270c96de6ca0abbad4a2be63f994fede26b19cfab3362479668f3d1d5c5 rust-std-1.74.1-arm-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.74.1-armv5te-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-armv5te-unknown-linux-gnueabi.tar.xz.asc +sha256 c567bf8e062daead8a256ee3097e724e1f70a4be5f69a74c3722719fb338af27 rust-std-1.74.1-armv5te-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.74.1-armv5te-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-armv5te-unknown-linux-musleabi.tar.xz.asc +sha256 96c81d327c4cd5cd35541dae3db4ed6eef6a943c78b0595396e88264a692b5e2 rust-std-1.74.1-armv5te-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.74.1-armv7-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-armv7-unknown-linux-gnueabi.tar.xz.asc +sha256 339b4bf274ba569245a3e7bc1c9e238ce64c1942c5510fb19a4cacae37aa8aa9 rust-std-1.74.1-armv7-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.74.1-armv7-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-armv7-unknown-linux-gnueabihf.tar.xz.asc +sha256 915c3648772d1b00b491a204239362aac33b213e95ac7e818b2001a40aae800a rust-std-1.74.1-armv7-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.74.1-armv7-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-armv7-unknown-linux-musleabi.tar.xz.asc +sha256 e0a61bd2f33e5929a47654dccc5387c56aa847ab028ff2f1992b4dc82da677f0 rust-std-1.74.1-armv7-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.74.1-armv7-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-armv7-unknown-linux-musleabihf.tar.xz.asc +sha256 7402c633f1a765053ca9bd4c03d65ece67651af9ce3698781a8d2a271e76cbaa rust-std-1.74.1-armv7-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.74.1-i586-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-i586-unknown-linux-gnu.tar.xz.asc +sha256 7c01117e7db5b77880d2ed5f3874ae10cdf9a3d2d042fc06011a8f5f8346b66c rust-std-1.74.1-i586-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.74.1-i586-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-i586-unknown-linux-musl.tar.xz.asc +sha256 b2781008ab93083970d5bf18782f6611f80d5b2a0aa1eaf6e6a44e8b0c146d9b rust-std-1.74.1-i586-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.74.1-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-i686-unknown-linux-gnu.tar.xz.asc +sha256 de7bfa755339d81d0f375c04a6b5432fba8452fdc72154fbe5cd5e1147902b90 rust-std-1.74.1-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.74.1-i686-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-i686-unknown-linux-musl.tar.xz.asc +sha256 1d0a2aa7fc04896bb73d08ec6b7247d9f8e2db46532c31adff3d7944d66dfb4b rust-std-1.74.1-i686-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.74.1-mips-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-mips-unknown-linux-musl.tar.xz.asc +sha256 c1721bb1f47941b1e6acc2f91b326d9172bf401dd88e92abacbb8084ecbc568f rust-std-1.74.1-mips-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.74.1-mips64-unknown-linux-muslabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-mips64-unknown-linux-muslabi64.tar.xz.asc +sha256 d2680c31aabfa896301689a0a03206aad31a59111a3c041c357ba5508f56dcfc rust-std-1.74.1-mips64-unknown-linux-muslabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.74.1-mips64el-unknown-linux-muslabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-mips64el-unknown-linux-muslabi64.tar.xz.asc +sha256 7a8b6f7cc454efb57f575ba50956f2530e192ab50c622acf38b29a42a5bb31e0 rust-std-1.74.1-mips64el-unknown-linux-muslabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.74.1-mipsel-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-mipsel-unknown-linux-musl.tar.xz.asc +sha256 733995dec75a90d4039bc3a6e11c44e256bfc4cb074e46a67e2aebfe1ec69a26 rust-std-1.74.1-mipsel-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.74.1-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 7fb458560bccae13f6558df43d5e17f177a084fdcb605d500eda63bc1ac3eb58 rust-std-1.74.1-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.74.1-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 931f975a4a4c8dc17552d965b276c7211e25f8c5deec1f41f5db5c181fa15320 rust-std-1.74.1-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.74.1-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 40781d07bb9a23d57c2440d70fee6385d8d40553b739d835c38fd0abe96d7ec5 rust-std-1.74.1-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.74.1-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-riscv64gc-unknown-linux-gnu.tar.xz.asc +sha256 2c4de6689f5008289b791ad15b8cdc2d69947985b81b77d4dbe5d31632532e1d rust-std-1.74.1-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.74.1-s390x-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-s390x-unknown-linux-gnu.tar.xz.asc +sha256 781403a12fef605250869aeb843be6b7f98ed6c0a62f0349fda53ee4d9d8e296 rust-std-1.74.1-s390x-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.74.1-sparc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-sparc64-unknown-linux-gnu.tar.xz.asc +sha256 e19c0d79b385454a8e8c9f27c3ca9779ffac778d8b7cd8de701ce413f492d9f1 rust-std-1.74.1-sparc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.74.1-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 df435e3254c03ccbfc9e733ae33b399f5f99bd488974bc07d8b1db91a12ee95b rust-std-1.74.1-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.74.1-x86_64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-x86_64-unknown-linux-musl.tar.xz.asc +sha256 98f190039c7e7922838f9716443b7ddfec2aa3dc229f5b1813a26591c557997e rust-std-1.74.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 db31e26a70..ca35d27d1c 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.1 +RUST_BIN_VERSION = 1.74.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 59270e1957..175fa71baf 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.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 +# From https://static.rust-lang.org/dist/rustc-1.74.1-src.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rustc-1.74.1-src.tar.xz.asc +sha256 b98c09d968529212fb29eec7d6d3e9bdaa869810679b7fb86a1ca69469d75f5e rustc-1.74.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 a55bc447f4..f7a5c0fcd5 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.1 +RUST_VERSION = 1.74.1 RUST_SOURCE = rustc-$(RUST_VERSION)-src.tar.xz RUST_SITE = https://static.rust-lang.org/dist RUST_LICENSE = Apache-2.0 or MIT diff --git a/package/rustc/Config.in.host b/package/rustc/Config.in.host index 822de68dbb..6beaad0425 100644 --- a/package/rustc/Config.in.host +++ b/package/rustc/Config.in.host @@ -2,8 +2,6 @@ config BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS bool default y if BR2_HOSTARCH = "aarch64" - default y if BR2_HOSTARCH = "mips" - default y if BR2_HOSTARCH = "mipsel" default y if BR2_HOSTARCH = "powerpc" default y if BR2_HOSTARCH = "powerpc64" default y if BR2_HOSTARCH = "powerpc64le" @@ -45,14 +43,6 @@ config BR2_PACKAGE_HOST_RUSTC_TARGET_TIER2_HOST_TOOLS_PLATFORMS # armv7-unknown-linux-gnueabihf for armv8 hardware with 32-bit # userspace default y if BR2_arm && BR2_ARM_CPU_ARMV8A && BR2_ARM_EABIHF && BR2_TOOLCHAIN_USES_GLIBC - # mips-unknown-linux-gnu - default y if BR2_mips && BR2_TOOLCHAIN_USES_GLIBC && !BR2_MIPS_CPU_MIPS32R6 - # mips64-unknown-linux-gnuabi64 - default y if BR2_mips64 && BR2_TOOLCHAIN_USES_GLIBC && BR2_MIPS_NABI64 && !BR2_MIPS_CPU_MIPS64R6 - # mipsel-unknown-linux-gnu - default y if BR2_mipsel && BR2_TOOLCHAIN_USES_GLIBC && !BR2_MIPS_CPU_MIPS32R6 - # mips64el-unknown-linux-gnuabi64 - default y if BR2_mips64el && BR2_TOOLCHAIN_USES_GLIBC && BR2_MIPS_NABI64 && !BR2_MIPS_CPU_MIPS64R6 # powerpc-unknown-linux-gnu default y if BR2_powerpc && BR2_TOOLCHAIN_USES_GLIBC # powerpc64-unknown-linux-gnu From a6a587b537cd5827d73529da7d71932b3fcf0333 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 28 Dec 2023 18:20:31 +0100 Subject: [PATCH 4418/5754] package/libxmlpp: fix build with libxml2 >= 2.12 Fix the following build failure raised since bump of libxml2 to version 2.12.1 in commit d8ac52108c12f0fcc9641b63e7922009270f96c6: ../libxml++/nodes/entityreference.cc: In member function 'xmlpp::ustring xmlpp::EntityReference::get_resolved_text() const': ../libxml++/nodes/entityreference.cc:30:35: error: invalid use of incomplete type 'struct _xmlEntity' 30 | const xmlChar* pch = cEntity->content; | ^~ Fixes: - http://autobuild.buildroot.org/results/f3cef04950eeaa744ebe9409561d505606375787 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...e-it-compatible-with-libxml2--2-12-0.patch | 145 ++++++++++++++++++ 1 file changed, 145 insertions(+) create mode 100644 package/libxmlpp/0001-Make-it-compatible-with-libxml2--2-12-0.patch diff --git a/package/libxmlpp/0001-Make-it-compatible-with-libxml2--2-12-0.patch b/package/libxmlpp/0001-Make-it-compatible-with-libxml2--2-12-0.patch new file mode 100644 index 0000000000..b9100b4966 --- /dev/null +++ b/package/libxmlpp/0001-Make-it-compatible-with-libxml2--2-12-0.patch @@ -0,0 +1,145 @@ +From 49471812d57adfb22dcce3cbea1a8956658731b9 Mon Sep 17 00:00:00 2001 +From: Kjell Ahlstedt +Date: Sat, 18 Nov 2023 18:34:07 +0100 +Subject: [PATCH] Make it compatible with libxml2 >= 2.12.0 + +* libxml++/document.cc: +* libxml++/dtd.cc: +* libxml++/nodes/entitydeclaration.cc: +* libxml++/nodes/entityreference.cc: +* libxml++/validators/relaxngvalidator.cc: Modify #include directives. +* libxml++/keepblanks.cc: Ignore deprecation of xmlKeepBlanksDefault(). +* tests/saxparser_chunk_parsing_inconsistent_state/main.cc: +Accept that MySaxParser::on_start_document() can be called before +MySaxParser::on_error(). + +Upstream: https://github.com/libxmlplusplus/libxmlplusplus/commit/49471812d57adfb22dcce3cbea1a8956658731b9 +Signed-off-by: Fabrice Fontaine +--- + libxml++/document.cc | 1 + + libxml++/dtd.cc | 2 +- + libxml++/keepblanks.cc | 5 ++++- + libxml++/nodes/entitydeclaration.cc | 2 +- + libxml++/nodes/entityreference.cc | 2 +- + libxml++/validators/relaxngvalidator.cc | 1 + + .../saxparser_chunk_parsing_inconsistent_state/main.cc | 10 +++++++++- + 7 files changed, 18 insertions(+), 5 deletions(-) + +diff --git a/libxml++/document.cc b/libxml++/document.cc +index da0a8f5..d5476c6 100644 +--- a/libxml++/document.cc ++++ b/libxml++/document.cc +@@ -16,6 +16,7 @@ + + #include + #include ++#include + #include // XML_PARSE_NOXINCNODE, XML_PARSE_NOBASEFIX + + #include +diff --git a/libxml++/dtd.cc b/libxml++/dtd.cc +index 238b3a0..8014c07 100644 +--- a/libxml++/dtd.cc ++++ b/libxml++/dtd.cc +@@ -8,7 +8,7 @@ + #include + #include + +-#include ++#include + + #include + +diff --git a/libxml++/keepblanks.cc b/libxml++/keepblanks.cc +index 4228b8d..56b00cf 100644 +--- a/libxml++/keepblanks.cc ++++ b/libxml++/keepblanks.cc +@@ -5,8 +5,11 @@ + * included with libxml++ as the file COPYING. + */ + +-#include ++// xmlKeepBlanksDefault() is deprecated since libxml2 2.12.0. ++// Ignore deprecations here. ++#define XML_DEPRECATED + ++#include + #include + + namespace xmlpp +diff --git a/libxml++/nodes/entitydeclaration.cc b/libxml++/nodes/entitydeclaration.cc +index 0a6390e..d5bfa75 100644 +--- a/libxml++/nodes/entitydeclaration.cc ++++ b/libxml++/nodes/entitydeclaration.cc +@@ -5,7 +5,7 @@ + */ + + #include +-#include ++#include + + namespace xmlpp + { +diff --git a/libxml++/nodes/entityreference.cc b/libxml++/nodes/entityreference.cc +index 19b1b22..278a126 100644 +--- a/libxml++/nodes/entityreference.cc ++++ b/libxml++/nodes/entityreference.cc +@@ -6,7 +6,7 @@ + + #include + +-#include ++#include + + namespace xmlpp + { +diff --git a/libxml++/validators/relaxngvalidator.cc b/libxml++/validators/relaxngvalidator.cc +index 9bb10c2..68a814c 100644 +--- a/libxml++/validators/relaxngvalidator.cc ++++ b/libxml++/validators/relaxngvalidator.cc +@@ -22,6 +22,7 @@ + #include "libxml++/parsers/domparser.h" + #include "libxml++/relaxngschema.h" + ++#include + #include + + namespace xmlpp +diff --git a/tests/saxparser_chunk_parsing_inconsistent_state/main.cc b/tests/saxparser_chunk_parsing_inconsistent_state/main.cc +index 07cc3ef..53f55b3 100644 +--- a/tests/saxparser_chunk_parsing_inconsistent_state/main.cc ++++ b/tests/saxparser_chunk_parsing_inconsistent_state/main.cc +@@ -24,10 +24,14 @@ + + class MySaxParser : public xmlpp::SaxParser + { ++public: ++ bool throw_on_start_doc = true; ++ + protected: + void on_start_document() override + { +- throw std::runtime_error("some custom runtime exception"); ++ if (throw_on_start_doc) ++ throw std::runtime_error("some custom runtime exception"); + } + void on_error(const xmlpp::ustring& /* text */) override + { +@@ -43,6 +47,9 @@ int main() + bool exceptionThrown = false; + try + { ++ // Depending on the libxml2 version, MySaxParser::on_start_document() ++ // may or may not be called before MySaxParser::on_error(). ++ parser.throw_on_start_doc = false; + parser.parse_chunk(""); + parser.parse_stream(ss); + } From 27e35b95ca1c7cd5156201935b8d1c11fa921581 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 29 Dec 2023 22:47:17 +0100 Subject: [PATCH 4419/5754] package/gupnp-av: bump to version 0.14.1 Add patch to fix build with libxml2 2.12 https://gitlab.gnome.org/GNOME/gupnp-av/-/blob/gupnp-av-0.14.1/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...ix-compatibility-with-libxml2-2-12-x.patch | 26 +++++++++++++++++++ package/gupnp-av/gupnp-av.hash | 4 +-- package/gupnp-av/gupnp-av.mk | 2 +- 3 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 package/gupnp-av/0002-xml-Fix-compatibility-with-libxml2-2-12-x.patch diff --git a/package/gupnp-av/0002-xml-Fix-compatibility-with-libxml2-2-12-x.patch b/package/gupnp-av/0002-xml-Fix-compatibility-with-libxml2-2-12-x.patch new file mode 100644 index 0000000000..358098fbc4 --- /dev/null +++ b/package/gupnp-av/0002-xml-Fix-compatibility-with-libxml2-2-12-x.patch @@ -0,0 +1,26 @@ +From 1e10a41fcef6ae0d3e89958db89bc22398f3b4f1 Mon Sep 17 00:00:00 2001 +From: Jens Georg +Date: Sat, 25 Nov 2023 17:58:49 +0100 +Subject: [PATCH] xml: Fix compatibility with libxml2 2.12.x + +Upstream: https://gitlab.gnome.org/GNOME/gupnp-av/-/commit/1e10a41fcef6ae0d3e89958db89bc22398f3b4f1 +Signed-off-by: Fabrice Fontaine +--- + libgupnp-av/xml-util.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libgupnp-av/xml-util.h b/libgupnp-av/xml-util.h +index e0e49f7..0bbe0f8 100644 +--- a/libgupnp-av/xml-util.h ++++ b/libgupnp-av/xml-util.h +@@ -16,6 +16,7 @@ + + #include + #include ++#include + #include + #include + +-- +GitLab + diff --git a/package/gupnp-av/gupnp-av.hash b/package/gupnp-av/gupnp-av.hash index ab1739aaa4..c8ed0db2a4 100644 --- a/package/gupnp-av/gupnp-av.hash +++ b/package/gupnp-av/gupnp-av.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.gnome.org/sources/gupnp-av/0.14/gupnp-av-0.14.0.sha256sum: -sha256 20aed546fc882e78a3f186a0c8bce5c841cc3a44b7ea528298fbdc82596fb156 gupnp-av-0.14.0.tar.xz +# Hash from: https://download.gnome.org/sources/gupnp-av/0.14/gupnp-av-0.14.1.sha256sum: +sha256 b79ce0cc4b0c66d9c54bc22183a10e5709a0011d2af272025948efcab33a3e4f gupnp-av-0.14.1.tar.xz # Hash for license file: sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gupnp-av/gupnp-av.mk b/package/gupnp-av/gupnp-av.mk index e83aa57bda..3821c4e170 100644 --- a/package/gupnp-av/gupnp-av.mk +++ b/package/gupnp-av/gupnp-av.mk @@ -5,7 +5,7 @@ ################################################################################ GUPNP_AV_VERSION_MAJOR = 0.14 -GUPNP_AV_VERSION = $(GUPNP_AV_VERSION_MAJOR).0 +GUPNP_AV_VERSION = $(GUPNP_AV_VERSION_MAJOR).1 GUPNP_AV_SOURCE = gupnp-av-$(GUPNP_AV_VERSION).tar.xz GUPNP_AV_SITE = https://download.gnome.org/sources/gupnp-av/$(GUPNP_AV_VERSION_MAJOR) GUPNP_AV_LICENSE = LGPL-2.1+ From 498925bc0ee318d6093d44668ad7d6b74849c837 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 29 Dec 2023 22:49:18 +0100 Subject: [PATCH 4420/5754] package/gupnp-tools: bump to version 0.12.1 - libsoup has been replaced by libsoup3 - Add patches to fix build with libxml2 2.12 https://gitlab.gnome.org/GNOME/gupnp-tools/-/blob/gupnp-tools-0.12.1/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...mon-Drop-deprecated-xmlRecoverMemory.patch | 33 +++++++++++++++++++ ...-Fix-compatibility-with-libxml2-2-12.patch | 28 ++++++++++++++++ package/gupnp-tools/Config.in | 4 +-- package/gupnp-tools/gupnp-tools.hash | 4 +-- package/gupnp-tools/gupnp-tools.mk | 6 ++-- 5 files changed, 68 insertions(+), 7 deletions(-) create mode 100644 package/gupnp-tools/0001-common-Drop-deprecated-xmlRecoverMemory.patch create mode 100644 package/gupnp-tools/0002-common-Fix-compatibility-with-libxml2-2-12.patch diff --git a/package/gupnp-tools/0001-common-Drop-deprecated-xmlRecoverMemory.patch b/package/gupnp-tools/0001-common-Drop-deprecated-xmlRecoverMemory.patch new file mode 100644 index 0000000000..c81d1b01fe --- /dev/null +++ b/package/gupnp-tools/0001-common-Drop-deprecated-xmlRecoverMemory.patch @@ -0,0 +1,33 @@ +From f675ac7e0afe67a86f3f1191d3274d6ffbd4e5d7 Mon Sep 17 00:00:00 2001 +From: Jens Georg +Date: Thu, 3 Aug 2023 23:44:15 +0200 +Subject: [PATCH] common: Drop deprecated xmlRecoverMemory + +Fixes #27 + +Upstream: https://gitlab.gnome.org/GNOME/gupnp-tools/-/commit/f675ac7e0afe67a86f3f1191d3274d6ffbd4e5d7 +Signed-off-by: Fabrice Fontaine +--- + src/common/pretty-print.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/common/pretty-print.c b/src/common/pretty-print.c +index c692664..c8ebc9a 100644 +--- a/src/common/pretty-print.c ++++ b/src/common/pretty-print.c +@@ -34,7 +34,11 @@ pretty_print_xml (const char *xml) + char *text; + int length; + +- doc = xmlRecoverMemory (xml, strlen (xml)); ++ doc = xmlReadMemory (xml, ++ strlen (xml), ++ NULL, ++ NULL, ++ XML_PARSE_NONET | XML_PARSE_RECOVER); + + if (!doc) + return NULL; +-- +GitLab + diff --git a/package/gupnp-tools/0002-common-Fix-compatibility-with-libxml2-2-12.patch b/package/gupnp-tools/0002-common-Fix-compatibility-with-libxml2-2-12.patch new file mode 100644 index 0000000000..c76d440b5d --- /dev/null +++ b/package/gupnp-tools/0002-common-Fix-compatibility-with-libxml2-2-12.patch @@ -0,0 +1,28 @@ +From 4e06104df81fba2cda06d4747b33e75f4cade458 Mon Sep 17 00:00:00 2001 +From: Jens Georg +Date: Fri, 24 Nov 2023 18:12:50 +0100 +Subject: [PATCH] common: Fix compatibility with libxml2 2.12 + +Fixes #28 + +Upstream: https://gitlab.gnome.org/GNOME/gupnp-tools/-/commit/4e06104df81fba2cda06d4747b33e75f4cade458 +Signed-off-by: Fabrice Fontaine +--- + src/common/pretty-print.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/common/pretty-print.c b/src/common/pretty-print.c +index c8ebc9a..1519cb0 100644 +--- a/src/common/pretty-print.c ++++ b/src/common/pretty-print.c +@@ -22,6 +22,7 @@ + + #include "pretty-print.h" + ++#include + #include + + #include +-- +GitLab + diff --git a/package/gupnp-tools/Config.in b/package/gupnp-tools/Config.in index af662417c2..5bce5cabeb 100644 --- a/package/gupnp-tools/Config.in +++ b/package/gupnp-tools/Config.in @@ -1,13 +1,13 @@ config BR2_PACKAGE_GUPNP_TOOLS bool "gupnp-tools" depends on BR2_PACKAGE_LIBGTK3 - # gssdp, gupnp, libsoup all select on libglib2, so they have + # gssdp, gupnp, libsoup3 all select on libglib2, so they have # the same dependencies as libgtk3, which we depend on. So for # the same of simplicity, we don't replicate all those # (complex) dependencies. select BR2_PACKAGE_GSSDP select BR2_PACKAGE_GUPNP - select BR2_PACKAGE_LIBSOUP + select BR2_PACKAGE_LIBSOUP3 select BR2_PACKAGE_LIBXML2 help GUPnP Tools are free replacements of Intel UPnP tools that diff --git a/package/gupnp-tools/gupnp-tools.hash b/package/gupnp-tools/gupnp-tools.hash index c3808de6e2..28e2661360 100644 --- a/package/gupnp-tools/gupnp-tools.hash +++ b/package/gupnp-tools/gupnp-tools.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.gnome.org/sources/gupnp-tools/0.10/gupnp-tools-0.10.3.sha256sum: -sha256 457f4d923935b078415cd2ba88d78db60079b725926b7ee106e4565efe3204de gupnp-tools-0.10.3.tar.xz +# Hash from: https://download.gnome.org/sources/gupnp-tools/0.12/gupnp-tools-0.12.1.sha256sum: +sha256 53cf93123f397e8f8f0b8e9e4364c86a7502a5334f4c0be2e054a824478bd5ba gupnp-tools-0.12.1.tar.xz # Locally computed: sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/gupnp-tools/gupnp-tools.mk b/package/gupnp-tools/gupnp-tools.mk index f87e98ef03..99fdf54f13 100644 --- a/package/gupnp-tools/gupnp-tools.mk +++ b/package/gupnp-tools/gupnp-tools.mk @@ -4,8 +4,8 @@ # ################################################################################ -GUPNP_TOOLS_VERSION_MAJOR = 0.10 -GUPNP_TOOLS_VERSION = $(GUPNP_TOOLS_VERSION_MAJOR).3 +GUPNP_TOOLS_VERSION_MAJOR = 0.12 +GUPNP_TOOLS_VERSION = $(GUPNP_TOOLS_VERSION_MAJOR).1 GUPNP_TOOLS_SOURCE = gupnp-tools-$(GUPNP_TOOLS_VERSION).tar.xz GUPNP_TOOLS_SITE = \ https://download.gnome.org/sources/gupnp-tools/$(GUPNP_TOOLS_VERSION_MAJOR) @@ -18,7 +18,7 @@ GUPNP_TOOLS_DEPENDENCIES = \ libxml2 \ gssdp \ gupnp \ - libsoup \ + libsoup3 \ libgtk3 \ $(TARGET_NLS_DEPENDENCIES) From 745e1ca054d466618c1cbe82bee6c9af5a405fdf Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 29 Dec 2023 22:53:06 +0100 Subject: [PATCH 4421/5754] package/nbd: bump to version 3.25 Switch site to github to get latest release https://github.com/NetworkBlockDevice/nbd/releases/tag/nbd-3.25 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/nbd/nbd.hash | 6 +----- package/nbd/nbd.mk | 4 ++-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/package/nbd/nbd.hash b/package/nbd/nbd.hash index f58a89bf9a..9fe95441af 100644 --- a/package/nbd/nbd.hash +++ b/package/nbd/nbd.hash @@ -1,7 +1,3 @@ -# From http://sourceforge.net/projects/nbd/files/nbd/3.24/ -md5 a6d9e7bbc311a2ed07ef84a58b82b5dd nbd-3.24.tar.xz -sha1 72c59ef5186ae355de6f539a1b348e18cbb8314e nbd-3.24.tar.xz - # Locally calculated -sha256 6877156d23a7b33f75eee89d2f5c2c91c542afc3cdcb636dea5a88539a58d10c nbd-3.24.tar.xz +sha256 f5c8fd0fcb57b1c926594d0e57f356432ee08678bef1d40d088f0830f0cbdd0a nbd-3.25.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/nbd/nbd.mk b/package/nbd/nbd.mk index 50f698dd24..b077e43624 100644 --- a/package/nbd/nbd.mk +++ b/package/nbd/nbd.mk @@ -4,9 +4,9 @@ # ################################################################################ -NBD_VERSION = 3.24 +NBD_VERSION = 3.25 NBD_SOURCE = nbd-$(NBD_VERSION).tar.xz -NBD_SITE = http://downloads.sourceforge.net/project/nbd/nbd/$(NBD_VERSION) +NBD_SITE = https://github.com/NetworkBlockDevice/nbd/releases/download/nbd-$(NBD_VERSION) NBD_CONF_OPTS = --enable-lfs NBD_DEPENDENCIES = host-bison host-pkgconf libglib2 NBD_LICENSE = GPL-2.0 From 7738907cc62f3aa166411353cfe22ebaf32007e7 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 29 Dec 2023 22:54:01 +0100 Subject: [PATCH 4422/5754] package/ncdu: bump to version 1.19 Update hash of COPYING (update in year: https://code.blicky.net/yorhel/ncdu/commit/c08340ee08120244834adb59fcee2abfeb8456a6) https://dev.yorhel.nl/ncdu/changes Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/ncdu/ncdu.hash | 8 ++++---- package/ncdu/ncdu.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/ncdu/ncdu.hash b/package/ncdu/ncdu.hash index 1e31eaea8e..553e128ed1 100644 --- a/package/ncdu/ncdu.hash +++ b/package/ncdu/ncdu.hash @@ -1,7 +1,7 @@ # From https://dev.yorhel.nl/ncdu -md5 4186b5be477cc3a0944619ade81f123b ncdu-1.18.tar.gz -sha1 d47ce3cdf317adadc1426817d07899c90b767aba ncdu-1.18.tar.gz -sha256 3c37a1a96580c9c5d2cc352dc3c5eef0d909158c05f1cc29db4712544c8b9f95 ncdu-1.18.tar.gz +md5 7986451d5b222b8a99b5382f33a30831 ncdu-1.19.tar.gz +sha1 3ee7aff60bdaa1c79eb4f27e3d277fc2d76e0043 ncdu-1.19.tar.gz +sha256 30363019180cde0752c7fb006c12e154920412f4e1b5dc3090654698496bb17d ncdu-1.19.tar.gz # computed locally -sha256 4590cb935ff8a50cee76ce12c2cb0411c0b06e84c267b478579785dcf328660d COPYING +sha256 40372b6016a489b69a5d198526e0a1c284680900f48a8b725de440452098a97b COPYING diff --git a/package/ncdu/ncdu.mk b/package/ncdu/ncdu.mk index 240ef9d8ea..f14f61fec5 100644 --- a/package/ncdu/ncdu.mk +++ b/package/ncdu/ncdu.mk @@ -4,7 +4,7 @@ # ################################################################################ -NCDU_VERSION = 1.18 +NCDU_VERSION = 1.19 NCDU_SITE = http://dev.yorhel.nl/download NCDU_DEPENDENCIES = ncurses From a92c0efb9f37e6c8d5eae19fbce38d1a49cf44a5 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 29 Dec 2023 23:04:27 +0100 Subject: [PATCH 4423/5754] package/libiio: fix build with libxml2 >= 2.12 Fix the following build failure raised since bump of libxml2 to version 2.12.1 in commit d8ac52108c12f0fcc9641b63e7922009270f96c6: /home/buildroot/autobuild/instance-1/output-1/build/libiio-0.25/xml.c: In function 'xml_create_context': /home/buildroot/autobuild/instance-1/output-1/build/libiio-0.25/xml.c:481:15: warning: implicit declaration of function 'xmlReadFile' [-Wimplicit-function-declaration] 481 | doc = xmlReadFile(xml_file, NULL, XML_PARSE_DTDVALID); | ^~~~~~~~~~~ /home/buildroot/autobuild/instance-1/output-1/build/libiio-0.25/xml.c:481:43: error: 'XML_PARSE_DTDVALID' undeclared (first use in this function); did you mean 'XML_DOC_DTDVALID'? 481 | doc = xmlReadFile(xml_file, NULL, XML_PARSE_DTDVALID); | ^~~~~~~~~~~~~~~~~~ | XML_DOC_DTDVALID Fixes: - http://autobuild.buildroot.org/results/f97c2db33e07a02699e4650caf97de5f3c475eb8 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...l-Fix-compatibility-with-libxml-2-12.patch | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 package/libiio/0001-xml-Fix-compatibility-with-libxml-2-12.patch diff --git a/package/libiio/0001-xml-Fix-compatibility-with-libxml-2-12.patch b/package/libiio/0001-xml-Fix-compatibility-with-libxml-2-12.patch new file mode 100644 index 0000000000..56c272aad3 --- /dev/null +++ b/package/libiio/0001-xml-Fix-compatibility-with-libxml-2-12.patch @@ -0,0 +1,33 @@ +From b1170cacff24cdfd3858edc2285c51cadef11488 Mon Sep 17 00:00:00 2001 +From: Jan Tojnar +Date: Sun, 10 Dec 2023 21:52:05 +0100 +Subject: [PATCH] xml: Fix compatibility with libxml 2.12 + +libxml 2.12.0 reorganized includes, resulting in the following no longer being in scope: + +- XML_PARSE_DTDVALID +- xmlReadMemory +- xmlReadFile +- xmlCleanupParser + +Signed-off-by: Jan Tojnar +(cherry picked from commit bb688d04294dda45e68dfaf13e3bc1187841e52a) + +Upstream: https://github.com/analogdevicesinc/libiio/commit/b1170cacff24cdfd3858edc2285c51cadef11488 +Signed-off-by: Fabrice Fontaine +--- + xml.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/xml.c b/xml.c +index 33f026103..3eaed92b3 100644 +--- a/xml.c ++++ b/xml.c +@@ -10,6 +10,7 @@ + #include "iio-private.h" + + #include ++#include + #include + #include + From 4d07864d4c1b7d964e23f8ab75f5c6f828a674c5 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 30 Dec 2023 19:13:19 +0100 Subject: [PATCH 4424/5754] package/libiec61850: add mbedtls optional dependency mbedtls is an optional dependency since bump to version 1.5.0 in commit a42e0e4600be785fa750c6b481c41a76d041df03 and https://github.com/mz-automation/libiec61850/commit/19f2cbf0e7066753476ff8c38c07a6f0df73a622 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libiec61850/libiec61850.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/libiec61850/libiec61850.mk b/package/libiec61850/libiec61850.mk index 4b61e40c6d..a3cfb74b03 100644 --- a/package/libiec61850/libiec61850.mk +++ b/package/libiec61850/libiec61850.mk @@ -15,4 +15,11 @@ LIBIEC61850_CONF_OPTS = -DBUILD_PYTHON_BINDINGS=OFF # https://github.com/mz-automation/libiec61850/issues/442 LIBIEC61850_IGNORE_CVES += CVE-2023-27772 +ifeq ($(BR2_PACKAGE_MBEDTLS),y) +LIBIEC61850_DEPENDENCIES += mbedtls +LIBIEC61850_CONF_OPTS += -DCONFIG_USE_EXTERNAL_MBEDTLS_DYNLIB=ON +else +LIBIEC61850_CONF_OPTS += -DCONFIG_USE_EXTERNAL_MBEDTLS_DYNLIB=OFF +endif + $(eval $(cmake-package)) From 8adc37e979aeae192bc4002187385d3c9e66f0b6 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 30 Dec 2023 19:13:20 +0100 Subject: [PATCH 4425/5754] package/libiec61850: bump to version 1.5.3 - Switch site to github to get latest release - Drop LIBIEC61850_IGNORE_CVES as CVE-2023-27772 only affects version 1.5.1 https://github.com/mz-automation/libiec61850/blob/v1.5.3/CHANGELOG Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libiec61850/libiec61850.hash | 2 +- package/libiec61850/libiec61850.mk | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/package/libiec61850/libiec61850.hash b/package/libiec61850/libiec61850.hash index a416ecdb4d..be662bebaf 100644 --- a/package/libiec61850/libiec61850.hash +++ b/package/libiec61850/libiec61850.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b6d7ffac831e7d9aec3470e45e2f1734071859c95cab4cfe99ffd1091776b3cc libiec61850-1.5.1.tar.gz +sha256 a0f396a5e2249398f2432bb9698e3aecdb9de11b28e5af68f7fb8b14bc3b2f44 libiec61850-1.5.3.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/libiec61850/libiec61850.mk b/package/libiec61850/libiec61850.mk index a3cfb74b03..276acce1a8 100644 --- a/package/libiec61850/libiec61850.mk +++ b/package/libiec61850/libiec61850.mk @@ -4,16 +4,13 @@ # ################################################################################ -LIBIEC61850_VERSION = 1.5.1 -LIBIEC61850_SITE = https://libiec61850.com/wp-content/uploads/2022/03 +LIBIEC61850_VERSION = 1.5.3 +LIBIEC61850_SITE = $(call github,mz-automation,libiec61850,v$(LIBIEC61850_VERSION)) LIBIEC61850_INSTALL_STAGING = YES 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 ifeq ($(BR2_PACKAGE_MBEDTLS),y) LIBIEC61850_DEPENDENCIES += mbedtls From 9b62f5905e9f9d47363983a5bd7ef8672b21cca6 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 27 Dec 2023 17:20:38 +0100 Subject: [PATCH 4426/5754] package/x11r7/xserver_xorg-server: security bump to version 21.1.10 Fixes the following security issues: 1) CVE-2023-6377: X.Org server: Out-of-bounds memory write in XKB button actions A device has XKB button actions for each button on the device. When a logical device switch happens (e.g. moving from a touchpad to a mouse), the server re-calculates the information available on the respective master device (typically the Virtual Core Pointer). This re-calculation only allocated enough memory for a single XKB action rather instead of enough for the newly active physical device's number of button. As a result, querying or changing the XKB button actions results in out-of-bounds memory reads and writes. This may lead to local privilege escalation if the server is run as root or remote code execution (e.g. x11 over ssh). 2) CVE-2023-6478: X.Org server: Out-of-bounds memory read in RRChangeOutputProperty and RRChangeProviderProperty This fixes an OOB read and the resulting information disclosure. Length calculation for the request was clipped to a 32-bit integer. With the correct stuff->nUnits value the expected request size was truncated, passing the REQUEST_FIXED_SIZE check. The server then proceeded with reading at least stuff->nUnits bytes (depending on stuff->format) from the request and stuffing whatever it finds into the property. In the process it would also allocate at least stuff->nUnits bytes, i.e. 4GB. See also CVE-2022-46344 where this issue was fixed for other requests. For more details, see the advisory: https://lists.x.org/archives/xorg-announce/2023-December/003435.html Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- 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 ccd7cc74fa..de93b11927 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-October/003431.html -sha256 ff697be2011b4c4966b7806929e51b7a08e9d33800d505305d26d9ccde4b533a xorg-server-21.1.9.tar.xz -sha512 9044e1b9222616fb63aea444b75f4ca6582edb7d899018f8ea30359e57edf04b1555e69397ebc4d288f7e36d6b82a54dde3895f11d414573d229e908ac17bfe8 xorg-server-21.1.9.tar.xz +# From https://lists.x.org/archives/xorg-announce/2023-December/003436.html +sha256 ceb0b3a2efc57ac3ccf388d3dc88b97615068639fb284d469689ae3d105611d0 xorg-server-21.1.10.tar.xz +sha512 8135d9b7c0c71f427ba0a3b80741fee4f6ae195779399b73261a00858882f3516e367a08e2da1403734b04eacabae9aa231e5375eff23b57a3ff764e9caf8926 xorg-server-21.1.10.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 cf0e688c36..4ac4283e4b 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.9 +XSERVER_XORG_SERVER_VERSION = 21.1.10 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 5cb3981129e74075f7244fecf76edbfc15f25986 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 30 Dec 2023 19:18:29 +0100 Subject: [PATCH 4427/5754] package/autofs: bump to version 5.1.9 https://git.kernel.org/pub/scm/linux/storage/autofs/autofs.git/tree/CHANGELOG?h=release_5_1_9 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/autofs/autofs.hash | 2 +- package/autofs/autofs.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/autofs/autofs.hash b/package/autofs/autofs.hash index 97bc757d6b..67d09e859a 100644 --- a/package/autofs/autofs.hash +++ b/package/autofs/autofs.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/daemons/autofs/v5/sha256sums.asc -sha256 b33d1059855664b20eeda26f3e28ff518fb0c3d58f565570af2ae569dc73c0fd autofs-5.1.8.tar.xz +sha256 87e6af6a03794b9462ea519781e50e7d23b5f7c92cd59e1142c85d2493b3c24b autofs-5.1.9.tar.xz # Hash for license files sha256 458028929f712b4795bc5adc31a1d6a2151364ce1b372ac43f613f56c8448fed COPYING diff --git a/package/autofs/autofs.mk b/package/autofs/autofs.mk index 97b1b6b3e4..e9eff98a0a 100644 --- a/package/autofs/autofs.mk +++ b/package/autofs/autofs.mk @@ -4,7 +4,7 @@ # ################################################################################ -AUTOFS_VERSION = 5.1.8 +AUTOFS_VERSION = 5.1.9 AUTOFS_SOURCE = autofs-$(AUTOFS_VERSION).tar.xz AUTOFS_SITE = $(BR2_KERNEL_MIRROR)/linux/daemons/autofs/v5 AUTOFS_LICENSE = GPL-2.0+ From bd3c51a295dca94d781dced8cacfbd0ca51ecba5 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 30 Dec 2023 19:21:29 +0100 Subject: [PATCH 4428/5754] package/neard: bump to version 0.19 https://git.kernel.org/pub/scm/network/nfc/neard.git/tree/ChangeLog?h=v0.19 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/neard/neard.hash | 2 +- package/neard/neard.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/neard/neard.hash b/package/neard/neard.hash index 1ea95c938a..b739d7289b 100644 --- a/package/neard/neard.hash +++ b/package/neard/neard.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c013e3115315e2e11d16b5f0f1c8ce9afbcdba26800aad91245fd9b4a5dc938b neard-0.18.tar.gz +sha256 129bbf69488fdb599d480356765941f111d7799495d0d64095b25e893c4d2be7 neard-0.19.tar.gz sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING diff --git a/package/neard/neard.mk b/package/neard/neard.mk index 51ba52fb90..c1804c48a2 100644 --- a/package/neard/neard.mk +++ b/package/neard/neard.mk @@ -4,7 +4,7 @@ # ################################################################################ -NEARD_VERSION = 0.18 +NEARD_VERSION = 0.19 NEARD_SITE = https://git.kernel.org/pub/scm/network/nfc/neard.git/snapshot NEARD_LICENSE = GPL-2.0 NEARD_LICENSE_FILES = COPYING From 53630c2026fa8540bdee64ebf39352171adb5c77 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 30 Dec 2023 19:35:25 +0100 Subject: [PATCH 4429/5754] package/libxml2: bump to version 2.12.3 This bump will fix the following build failure with libmodsecurity (and a lot of other packages) raised since bump of libxml2 to version 2.12.1 in commit d8ac52108c12f0fcc9641b63e7922009270f96c6: modsecurity.cc: In constructor 'modsecurity::ModSecurity::ModSecurity()': modsecurity.cc:89:5: error: 'xmlInitParser' was not declared in this scope 89 | xmlInitParser(); | ^~~~~~~~~~~~~ https://gitlab.gnome.org/GNOME/libxml2/-/blob/v2.12.3/NEWS Fixes: - http://autobuild.buildroot.org/results/d6749bacf6c7c04a74e136585d36bc731716f6fd Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- 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 a3b2230b8a..670ff80a41 100644 --- a/package/libxml2/libxml2.hash +++ b/package/libxml2/libxml2.hash @@ -1,4 +1,4 @@ -# From https://download.gnome.org/sources/libxml2/2.12/libxml2-2.12.1.sha256sum -sha256 8982b9ccdf7f456e30d8f7012d50858c6623e495333b6191def455c7e95427eb libxml2-2.12.1.tar.xz +# From https://download.gnome.org/sources/libxml2/2.12/libxml2-2.12.3.sha256sum +sha256 8c8f1092340a89ff32bc44ad5c9693aff9bc8a7a3e161bb239666e5d15ac9aaa libxml2-2.12.3.tar.xz # License files, locally calculated sha256 7fb0a66f3989f9bd5c7e5438a3de02cd4a7a47dde0aea2f7ea2ba2ff454ee6a4 Copyright diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk index 5606532b62..1893206ccb 100644 --- a/package/libxml2/libxml2.mk +++ b/package/libxml2/libxml2.mk @@ -5,7 +5,7 @@ ################################################################################ LIBXML2_VERSION_MAJOR = 2.12 -LIBXML2_VERSION = $(LIBXML2_VERSION_MAJOR).1 +LIBXML2_VERSION = $(LIBXML2_VERSION_MAJOR).3 LIBXML2_SOURCE = libxml2-$(LIBXML2_VERSION).tar.xz LIBXML2_SITE = \ https://download.gnome.org/sources/libxml2/$(LIBXML2_VERSION_MAJOR) From 5328e02cf78a055fdfa81384780bd43771f34a06 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 30 Dec 2023 19:42:10 +0100 Subject: [PATCH 4430/5754] package/libnl: bump to version 3.9.0 https://github.com/thom311/libnl/compare/libnl3_7_0...libnl3_9_0 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libnl/libnl.hash | 4 ++-- package/libnl/libnl.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libnl/libnl.hash b/package/libnl/libnl.hash index 8a1bd56780..77d7781493 100644 --- a/package/libnl/libnl.hash +++ b/package/libnl/libnl.hash @@ -1,4 +1,4 @@ -# From https://github.com/thom311/libnl/releases/download/libnl3_7_0/libnl-3.7.0.tar.gz.sha256sum -sha256 9fe43ccbeeea72c653bdcf8c93332583135cda46a79507bfd0a483bb57f65939 libnl-3.7.0.tar.gz +# From https://github.com/thom311/libnl/releases/download/libnl3_9_0/libnl-3.9.0.tar.gz.sha256sum +sha256 aed507004d728a5cf11eab48ca4bf9e6e1874444e33939b9d3dfed25018ee9bb libnl-3.9.0.tar.gz # Locally calculated sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libnl/libnl.mk b/package/libnl/libnl.mk index 6896188f4d..8fbea3db5f 100644 --- a/package/libnl/libnl.mk +++ b/package/libnl/libnl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNL_VERSION = 3.7.0 +LIBNL_VERSION = 3.9.0 LIBNL_SITE = https://github.com/thom311/libnl/releases/download/libnl$(subst .,_,$(LIBNL_VERSION)) LIBNL_LICENSE = LGPL-2.1+ LIBNL_LICENSE_FILES = COPYING From bdeaa933fbe899c515edf80602ce4128b3a3cf45 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 30 Dec 2023 21:33:28 +0100 Subject: [PATCH 4431/5754] package/libopenh264: bump to version 2.4.0 https://github.com/cisco/openh264/blob/v2.4.0/RELEASES Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libopenh264/libopenh264.hash | 2 +- package/libopenh264/libopenh264.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libopenh264/libopenh264.hash b/package/libopenh264/libopenh264.hash index eecb0b9625..fe98b7773f 100644 --- a/package/libopenh264/libopenh264.hash +++ b/package/libopenh264/libopenh264.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 453afa66dacb560bc5fd0468aabee90c483741571bca820a39a1c07f0362dc32 libopenh264-2.3.1.tar.gz +sha256 a44d1ccc348a790f9a272bba2d1c2eb9a9bbd0302e4e9b655d709e1c32f92691 libopenh264-2.4.0.tar.gz sha256 dd5c1c9668512530fa5a96e4c29ac4033d70a7eeb0eed7a42fddb6dd794ebdbb LICENSE diff --git a/package/libopenh264/libopenh264.mk b/package/libopenh264/libopenh264.mk index 750ec41e4d..478c29d7a8 100644 --- a/package/libopenh264/libopenh264.mk +++ b/package/libopenh264/libopenh264.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOPENH264_VERSION = 2.3.1 +LIBOPENH264_VERSION = 2.4.0 LIBOPENH264_SITE = $(call github,cisco,openh264,v$(LIBOPENH264_VERSION)) LIBOPENH264_LICENSE = BSD-2-Clause LIBOPENH264_LICENSE_FILES = LICENSE From f8470817bdacc810d7cfc2dd6c37fd4c0c9f17fe Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 30 Dec 2023 21:39:42 +0100 Subject: [PATCH 4432/5754] package/librelp: bump to version 1.11.0 https://github.com/rsyslog/librelp/blob/v1.11.0/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/librelp/librelp.hash | 2 +- package/librelp/librelp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/librelp/librelp.hash b/package/librelp/librelp.hash index 23ce8c15f8..8dcc502583 100644 --- a/package/librelp/librelp.hash +++ b/package/librelp/librelp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 148db4e4d1a23e8136e9ec08810929a55faf5d45e24c2e3186d5ab34355dab31 librelp-1.10.0.tar.gz +sha256 7719b5f31e07cbb9872289ad32b787c613b5355d407982a0a2c4d69938457fd6 librelp-1.11.0.tar.gz sha256 1ed76f935566e93e3c3c0d9f8fad22eb6d8bbe406e2eb8470a4a2764d9fd9685 COPYING diff --git a/package/librelp/librelp.mk b/package/librelp/librelp.mk index f8bbdb131c..cf2e391f34 100644 --- a/package/librelp/librelp.mk +++ b/package/librelp/librelp.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBRELP_VERSION = 1.10.0 +LIBRELP_VERSION = 1.11.0 LIBRELP_SITE = http://download.rsyslog.com/librelp LIBRELP_LICENSE = GPL-3.0+ LIBRELP_LICENSE_FILES = COPYING From 79206b0ab90ab519319d741e69d6d0ed05dd232c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 30 Dec 2023 21:43:24 +0100 Subject: [PATCH 4433/5754] package/libseccomp: bump to version 2.5.5 https://github.com/seccomp/libseccomp/blob/v2.5.5/CHANGELOG Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libseccomp/libseccomp.hash | 4 ++-- package/libseccomp/libseccomp.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libseccomp/libseccomp.hash b/package/libseccomp/libseccomp.hash index 8337f33f3e..b80efd68f5 100644 --- a/package/libseccomp/libseccomp.hash +++ b/package/libseccomp/libseccomp.hash @@ -1,4 +1,4 @@ -# From https://github.com/seccomp/libseccomp/releases/tag/v2.5.4 -sha256 d82902400405cf0068574ef3dc1fe5f5926207543ba1ae6f8e7a1576351dcbdb libseccomp-2.5.4.tar.gz +# From https://github.com/seccomp/libseccomp/releases/tag/v2.5.5 +sha256 248a2c8a4d9b9858aa6baf52712c34afefcf9c9e94b76dce02c1c9aa25fb3375 libseccomp-2.5.5.tar.gz # Locally calculated sha256 102900208eef27b766380135906d431dba87edaa7ec6aa72e6ebd3dd67f3a97b LICENSE diff --git a/package/libseccomp/libseccomp.mk b/package/libseccomp/libseccomp.mk index 7d7f33618e..ff295e986a 100644 --- a/package/libseccomp/libseccomp.mk +++ b/package/libseccomp/libseccomp.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSECCOMP_VERSION = 2.5.4 +LIBSECCOMP_VERSION = 2.5.5 LIBSECCOMP_SITE = https://github.com/seccomp/libseccomp/releases/download/v$(LIBSECCOMP_VERSION) LIBSECCOMP_LICENSE = LGPL-2.1 LIBSECCOMP_LICENSE_FILES = LICENSE From e619785d79880a5ae24c6cf4db4c642a555facf6 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 30 Dec 2023 21:54:59 +0100 Subject: [PATCH 4434/5754] package/libucl: bump to version 0.8.2 https://github.com/vstakhov/libucl/releases/tag/0.8.2 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libucl/libucl.hash | 2 +- package/libucl/libucl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libucl/libucl.hash b/package/libucl/libucl.hash index 164b00276f..4ad166dc7d 100644 --- a/package/libucl/libucl.hash +++ b/package/libucl/libucl.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a6397e179672f0e8171a0f9a2cfc37e01432b357fd748b13f4394436689d24ef libucl-0.8.1.tar.gz +sha256 d95a0e2151cc167a0f3e51864fea4e8977a0f4c473faa805269a347f7fb4e165 libucl-0.8.2.tar.gz sha256 1bf976835764c1d827e07472a0a75adb098682df56681878af05fc0db7439b03 COPYING diff --git a/package/libucl/libucl.mk b/package/libucl/libucl.mk index 9f0378ad9c..bf5e368f2b 100644 --- a/package/libucl/libucl.mk +++ b/package/libucl/libucl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUCL_VERSION = 0.8.1 +LIBUCL_VERSION = 0.8.2 LIBUCL_SITE = $(call github,vstakhov,libucl,$(LIBUCL_VERSION)) LIBUCL_INSTALL_STAGING = YES LIBUCL_AUTORECONF = YES From 4b2e01cc492b05383ce4be12240e47ab3e9009d4 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 30 Dec 2023 22:09:13 +0100 Subject: [PATCH 4435/5754] package/log4cpp: bump to version 1.1.4 configure script has been fixed and so autoreconf can be dropped https://log4cpp.sourceforge.net/#releases Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/log4cpp/log4cpp.hash | 6 +++--- package/log4cpp/log4cpp.mk | 5 +---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/package/log4cpp/log4cpp.hash b/package/log4cpp/log4cpp.hash index f4084c8112..20b5ade32d 100644 --- a/package/log4cpp/log4cpp.hash +++ b/package/log4cpp/log4cpp.hash @@ -1,6 +1,6 @@ # From http://sourceforge.net/projects/log4cpp/files/log4cpp-1.1.x%20%28new%29/log4cpp-1.1/ -md5 b9e2cee932da987212f2c74b767b4d8b log4cpp-1.1.3.tar.gz -sha1 74f0fea7931dc1bc4e5cd34a6318cd2a51322041 log4cpp-1.1.3.tar.gz +md5 d56ef8240014528c354da5b7e93015ca log4cpp-1.1.4.tar.gz +sha1 b32e6ec981a5d75864e1097525e1f502cc242d17 log4cpp-1.1.4.tar.gz # Locally computed -sha256 2cbbea55a5d6895c9f0116a9a9ce3afb86df383cd05c9d6c1a4238e5e5c8f51d log4cpp-1.1.3.tar.gz +sha256 696113659e426540625274a8b251052cc04306d8ee5c42a0c7639f39ca90c9d6 log4cpp-1.1.4.tar.gz sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 log4cpp/COPYING diff --git a/package/log4cpp/log4cpp.mk b/package/log4cpp/log4cpp.mk index 8664a54385..53c97e554d 100644 --- a/package/log4cpp/log4cpp.mk +++ b/package/log4cpp/log4cpp.mk @@ -5,7 +5,7 @@ ################################################################################ LOG4CPP_VERSION_MAJOR = 1.1 -LOG4CPP_VERSION = $(LOG4CPP_VERSION_MAJOR).3 +LOG4CPP_VERSION = $(LOG4CPP_VERSION_MAJOR).4 LOG4CPP_SITE = http://downloads.sourceforge.net/project/log4cpp/log4cpp-1.1.x%20%28new%29/log4cpp-$(LOG4CPP_VERSION_MAJOR) LOG4CPP_SUBDIR = log4cpp # The "or later" is indicated in the HTML documentation @@ -13,9 +13,6 @@ LOG4CPP_LICENSE = LGPL-2.1+ LOG4CPP_LICENSE_FILES = log4cpp/COPYING LOG4CPP_INSTALL_STAGING = YES LOG4CPP_CONF_OPTS = --enable-doxygen=no --enable-dot=no -# needed to fix broken configure script -LOG4CPP_AUTORECONF = YES -LOG4CPP_AUTORECONF_OPTS = -I m4 # The default _CONFIG_SCRIPTS handling does not apply define LOG4CPP_STAGING_CONFIG_SCRIPT_FIXUP From 2e26e9e5aa7604aafbe0197c91b7e3f59a2585c2 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 30 Dec 2023 22:28:37 +0100 Subject: [PATCH 4436/5754] package/logrotate: bump to version 3.21.0 https://github.com/logrotate/logrotate/releases/tag/3.21.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/logrotate/logrotate.hash | 2 +- package/logrotate/logrotate.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/logrotate/logrotate.hash b/package/logrotate/logrotate.hash index 9c8e73f738..cc466a6f4e 100644 --- a/package/logrotate/logrotate.hash +++ b/package/logrotate/logrotate.hash @@ -1,3 +1,3 @@ # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING -sha256 742f6d6e18eceffa49a4bacd933686d3e42931cfccfb694d7f6369b704e5d094 logrotate-3.20.1.tar.xz +sha256 8fa12015e3b8415c121fc9c0ca53aa872f7b0702f543afda7e32b6c4900f6516 logrotate-3.21.0.tar.xz diff --git a/package/logrotate/logrotate.mk b/package/logrotate/logrotate.mk index 453dbe477a..37c48121f1 100644 --- a/package/logrotate/logrotate.mk +++ b/package/logrotate/logrotate.mk @@ -4,7 +4,7 @@ # ################################################################################ -LOGROTATE_VERSION = 3.20.1 +LOGROTATE_VERSION = 3.21.0 LOGROTATE_SOURCE = logrotate-$(LOGROTATE_VERSION).tar.xz LOGROTATE_SITE = https://github.com/logrotate/logrotate/releases/download/$(LOGROTATE_VERSION) LOGROTATE_LICENSE = GPL-2.0+ From 292bb525c7957324c6eed3eaa56a61aed9cbcb16 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 30 Dec 2023 22:36:22 +0100 Subject: [PATCH 4437/5754] package/scrypt: bump to version 1.3.2 Update hash of COPYRIGHT (update in year: https://github.com/Tarsnap/scrypt/commit/c6e440c4f51eeb4aaf5e490734f46cdb06f4b4c8) https://github.com/Tarsnap/scrypt/compare/1.3.1...1.3.2 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/scrypt/scrypt.hash | 6 +++--- package/scrypt/scrypt.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/scrypt/scrypt.hash b/package/scrypt/scrypt.hash index 4004b89737..fb78909b3f 100644 --- a/package/scrypt/scrypt.hash +++ b/package/scrypt/scrypt.hash @@ -1,4 +1,4 @@ -# From http://www.tarsnap.com/scrypt/scrypt-sigs-1.3.1.asc -sha256 df2f23197c9589963267f85f9c5307ecf2b35a98b83a551bf1b1fb7a4d06d4c2 scrypt-1.3.1.tgz +# From http://www.tarsnap.com/scrypt/scrypt-sigs-1.3.2.asc +sha256 d632c1193420ac6faebf9482e65e33d3a5664eccd643b09a509d21d1c1f29be2 scrypt-1.3.2.tgz # Locally computed -sha256 1fb4da0e9000287414066a238f378528d5652f89b72b4a1d6b89fdd20031b22d COPYRIGHT +sha256 277ba0da6001b6c53c1da3f0d0d9107cf847eed49280e2cf4ca1421b8f707119 COPYRIGHT diff --git a/package/scrypt/scrypt.mk b/package/scrypt/scrypt.mk index fb305faf41..977045b8e6 100644 --- a/package/scrypt/scrypt.mk +++ b/package/scrypt/scrypt.mk @@ -4,7 +4,7 @@ # ################################################################################ -SCRYPT_VERSION = 1.3.1 +SCRYPT_VERSION = 1.3.2 SCRYPT_SOURCE = scrypt-$(SCRYPT_VERSION).tgz SCRYPT_SITE = http://www.tarsnap.com/scrypt SCRYPT_LICENSE = BSD-2-Clause From f9b465c66c42e936a80292f7854f605d4c88564e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 30 Dec 2023 23:09:11 +0100 Subject: [PATCH 4438/5754] package/rhash: bump to version 1.4.4 build-shared has been replaced by "build" with https://github.com/rhash/RHash/commit/851d459dbf530b7e1f64d4140d3c314ad054c70a https://github.com/rhash/RHash/releases/tag/v1.4.4 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/rhash/rhash.hash | 6 +++--- package/rhash/rhash.mk | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/rhash/rhash.hash b/package/rhash/rhash.hash index 355b5c275b..4e03de8722 100644 --- a/package/rhash/rhash.hash +++ b/package/rhash/rhash.hash @@ -1,5 +1,5 @@ -# From https://sourceforge.net/projects/rhash/files/rhash/1.4.3/ -sha1 6e698e6d5b13aeac55076d6a53dc4dab55f2114e rhash-1.4.3-src.tar.gz +# From https://sourceforge.net/projects/rhash/files/rhash/1.4.4/ +sha1 feaee551aec9cc9a303a45aa8c864f97ece9ed2d rhash-1.4.4-src.tar.gz # Locally calculated -sha256 1e40fa66966306920f043866cbe8612f4b939b033ba5e2708c3f41be257c8a3e rhash-1.4.3-src.tar.gz +sha256 8e7d1a8ccac0143c8fe9b68ebac67d485df119ea17a613f4038cda52f84ef52a rhash-1.4.4-src.tar.gz sha256 953e55838353335148c90b5a38a4894292680b1d4c37228ffddddbf18ce54bf5 COPYING diff --git a/package/rhash/rhash.mk b/package/rhash/rhash.mk index 1f7456e4e7..99762ec0c7 100644 --- a/package/rhash/rhash.mk +++ b/package/rhash/rhash.mk @@ -4,7 +4,7 @@ # ################################################################################ -RHASH_VERSION = 1.4.3 +RHASH_VERSION = 1.4.4 RHASH_SOURCE = rhash-$(RHASH_VERSION)-src.tar.gz RHASH_SITE = https://sourceforge.net/projects/rhash/files/rhash/$(RHASH_VERSION) RHASH_LICENSE = 0BSD @@ -36,13 +36,13 @@ define RHASH_CONFIGURE_CMDS endef ifeq ($(BR2_SHARED_LIBS),y) -RHASH_BUILD_TARGETS = lib-shared build-shared +RHASH_BUILD_TARGETS = lib-shared build RHASH_INSTALL_TARGETS = install-lib-shared install-so-link else ifeq ($(BR2_STATIC_LIBS),y) RHASH_BUILD_TARGETS = lib-static RHASH_INSTALL_TARGETS = install-lib-static else -RHASH_BUILD_TARGETS = lib-static lib-shared build-shared +RHASH_BUILD_TARGETS = lib-static lib-shared build RHASH_INSTALL_TARGETS = install-lib-static install-lib-shared install-so-link endif From 9cbffdf9be622c8ddad3b28106851b3101b3d201 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 31 Dec 2023 16:37:48 +0100 Subject: [PATCH 4439/5754] package/libsoup3: enable vala bindings vala bindings are needed to build gssdp 1.6 vapi bindings and avoid the following build failure since commit 0cd1096eb067542070a991120c953811d6e5e4d1: FAILED: vala/gssdp-1.6.vapi /home/buildroot/autobuild/instance-2/output-1/host/bin/vapigen --quiet --library=gssdp-1.6 --directory=/home/buildroot/autobuild/instance-2/output-1/build/gssdp-1.6.3/build/vala --pkg=gio-2.0 --pkg=libsoup-3.0 --metadatadir=/home/buildroot/autobuild/instance-2/output-1/build/gssdp-1.6.3/vala /home/buildroot/autobuild/instance-2/output-1/build/gssdp-1.6.3/build/libgssdp/GSSDP-1.6.gir error: Package `libsoup-3.0' not found in specified Vala API directories or GObject-Introspection GIR directories Fixes: - http://autobuild.buildroot.org/results/e5fbfc95964beac314c9faffc2c12541d0a10a48 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libsoup3/libsoup3.mk | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/package/libsoup3/libsoup3.mk b/package/libsoup3/libsoup3.mk index 76105cec4e..10caa5bea4 100644 --- a/package/libsoup3/libsoup3.mk +++ b/package/libsoup3/libsoup3.mk @@ -28,8 +28,7 @@ LIBSOUP3_CONF_OPTS = \ -Dntlm=disabled \ -Dsysprof=disabled \ -Dtests=false \ - -Dtls_check=false \ - -Dvapi=disabled + -Dtls_check=false ifeq ($(BR2_PACKAGE_BROTLI),y) LIBSOUP3_CONF_OPTS += -Dbrotli=enabled @@ -39,10 +38,10 @@ LIBSOUP3_CONF_OPTS += -Dbrotli=disabled endif ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) -LIBSOUP3_CONF_OPTS += -Dintrospection=enabled -LIBSOUP3_DEPENDENCIES += gobject-introspection +LIBSOUP3_CONF_OPTS += -Dintrospection=enabled -Dvapi=enabled +LIBSOUP3_DEPENDENCIES += host-vala gobject-introspection else -LIBSOUP3_CONF_OPTS += -Dintrospection=disabled +LIBSOUP3_CONF_OPTS += -Dintrospection=disabled -Dvapi=disabled endif ifeq ($(BR2_PACKAGE_LIBKRB5),y) From 44af6938fb7f3e19492cdf722534e5e8a9fff0d0 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 31 Dec 2023 19:14:37 +0100 Subject: [PATCH 4440/5754] boot/edk2: unset MAKEFLAGS in build environment Yann reported in [1] that edk2 build could sometimes fail. The issue can be reproduced when per-package directories is enabled, or also when building on a system with GNU Make >= 4.4 using the "--shuffle=reverse" option (such as Fedora 39). Those are pointing toward a Makefile dependency issue. The issue can be reproduced with commands: cat > .config < Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- boot/edk2/edk2.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/boot/edk2/edk2.mk b/boot/edk2/edk2.mk index efdb4d02ce..87ac80c88f 100644 --- a/boot/edk2/edk2.mk +++ b/boot/edk2/edk2.mk @@ -150,7 +150,13 @@ EDK2_BASETOOLS_OPTS = \ EDK2_PACKAGES_PATH = $(subst $(space),:,$(strip $(EDK2_PACKAGES_PATHS))) +# EDK2 "build" script internally uses and calls "make", which controls +# its own flags. It is mainly tested while not being a sub-make. In +# order to stay in that configuration, we avoid leaking top-level +# Buildroot make flags into EDK2 build by clearing the MAKEFLAGS +# environment variable. EDK2_BUILD_ENV += \ + MAKEFLAGS= \ WORKSPACE=$(@D) \ PACKAGES_PATH=$(EDK2_PACKAGES_PATH) \ PYTHON_COMMAND=$(HOST_DIR)/bin/python3 \ From 1d5d9279ca47e123ac91a0b7f04cbc231ef4b8a7 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 1 Jan 2024 22:59:31 +0100 Subject: [PATCH 4441/5754] package/domoticz: bump to version 2024.1 openzwave is not a dependency since https://github.com/domoticz/domoticz/commit/62c95f24305f18734cf5ebb3f6517b225fddc36f https://github.com/domoticz/domoticz/blob/2024.1/History.txt Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/domoticz/domoticz.hash | 2 +- package/domoticz/domoticz.mk | 12 +----------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/package/domoticz/domoticz.hash b/package/domoticz/domoticz.hash index b54d0229fc..546177332e 100644 --- a/package/domoticz/domoticz.hash +++ b/package/domoticz/domoticz.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 32bcf49df8c80c470352e63004a82d9601b90ccf406096099656250a4515ac28 domoticz-2023.2.tar.gz +sha256 9effa792f856d8d9036c53b9ae500ee3bffa1488addf9d6f1fe4bf960f73f740 domoticz-2024.1.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 License.txt diff --git a/package/domoticz/domoticz.mk b/package/domoticz/domoticz.mk index 3fbff5f4d8..d0856b71af 100644 --- a/package/domoticz/domoticz.mk +++ b/package/domoticz/domoticz.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOMOTICZ_VERSION = 2023.2 +DOMOTICZ_VERSION = 2024.1 DOMOTICZ_SITE = $(call github,domoticz,domoticz,$(DOMOTICZ_VERSION)) DOMOTICZ_LICENSE = GPL-3.0 DOMOTICZ_LICENSE_FILES = License.txt @@ -53,16 +53,6 @@ else DOMOTICZ_CONF_OPTS += -DWITH_LIBUSB=OFF endif -ifeq ($(BR2_PACKAGE_OPENZWAVE),y) -DOMOTICZ_DEPENDENCIES += openzwave - -# Due to the dependency on mosquitto, domoticz depends on -# !BR2_STATIC_LIBS so set USE_STATIC_OPENZWAVE to OFF otherwise -# domoticz will not find the openzwave library as it searches by -# default a static library. -DOMOTICZ_CONF_OPTS += -DUSE_STATIC_OPENZWAVE=OFF -endif - ifeq ($(BR2_PACKAGE_PYTHON3),y) DOMOTICZ_DEPENDENCIES += python3 DOMOTICZ_CONF_OPTS += -DUSE_PYTHON=ON From f83443e2fc4e44a8deb38d35a27975bb34ca380e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 1 Jan 2024 23:02:13 +0100 Subject: [PATCH 4442/5754] package/tinyssh: security bump to version 20240101 - License changed from public domain to CC0: https://github.com/janmojzis/tinyssh/commit/39dfb96613660d67ced44cc3995a08797e6c999a - Mitigates CVE-2023-48795: https://github.com/advisories/GHSA-45x7-px36-x8w8 https://github.com/janmojzis/tinyssh/releases/tag/20230101 https://github.com/janmojzis/tinyssh/releases/tag/20240101 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/tinyssh/tinyssh.hash | 4 ++-- package/tinyssh/tinyssh.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/tinyssh/tinyssh.hash b/package/tinyssh/tinyssh.hash index 462ffb9002..bdb1504234 100644 --- a/package/tinyssh/tinyssh.hash +++ b/package/tinyssh/tinyssh.hash @@ -1,3 +1,3 @@ # locally computed -sha256 234656fc8d369608eb5d0f3a26280e0e38e2e6b134cfc610b6e24bce176acd4f tinyssh-20220801.tar.gz -sha256 b5dc19477e29f4111e1c16cd89ec0782f5a07b1a30e3bdb7c155425b81b12c46 LICENCE +sha256 d2cd49d0e5e8bdb808d86f07f946a0cfbf2dc9a449a4b8243a82be267d852b62 tinyssh-20240101.tar.gz +sha256 a2010f343487d3f7618affe54f789f5487602331c0a8d03f49e9a7c547cf0499 LICENCE diff --git a/package/tinyssh/tinyssh.mk b/package/tinyssh/tinyssh.mk index 1472f7ead1..80b6ccb850 100644 --- a/package/tinyssh/tinyssh.mk +++ b/package/tinyssh/tinyssh.mk @@ -4,9 +4,9 @@ # ################################################################################ -TINYSSH_VERSION = 20220801 +TINYSSH_VERSION = 20240101 TINYSSH_SITE = $(call github,janmojzis,tinyssh,$(TINYSSH_VERSION)) -TINYSSH_LICENSE = Public Domain, CC0-1.0 +TINYSSH_LICENSE = CC0-1.0 TINYSSH_LICENSE_FILES = LICENCE define TINYSSH_BUILD_CMDS From e83793705b5436feffc087c7f33e3f455439ede7 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 1 Jan 2024 23:03:45 +0100 Subject: [PATCH 4443/5754] package/proftpd: security bump to version 1.3.8b 1.3.8b - Released 19-Dec-2023 -------------------------------- - Issue 1735 - Compiling ProFTPD 1.3.8a mod_sftp, mod_tls using libressl 3.7.3 fails. - Issue 1756 - Build system fails for specific module names. - Issue 1760 - mod_sftp is affected by "Terrapin" Prefix Truncation Attacks in SSH Specification (CVE-2023-48795). https://github.com/proftpd/proftpd/blob/1.3.8/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/proftpd/proftpd.hash | 2 +- package/proftpd/proftpd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/proftpd/proftpd.hash b/package/proftpd/proftpd.hash index f950f26b86..5a7d153a31 100644 --- a/package/proftpd/proftpd.hash +++ b/package/proftpd/proftpd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f7139e7377a2cb059b8b9b14d76a6df5f440e3181cb15ae890d43bbcae574748 proftpd-1.3.8.tar.gz +sha256 183ab7c6107de271a2959ff268f55c9b6c76b2cf0029e6584fccc019686601e0 proftpd-1.3.8b.tar.gz sha256 391a473d755c29b5326fb726326ff3c37e42512f53a8f5789fc310232150bf80 COPYING diff --git a/package/proftpd/proftpd.mk b/package/proftpd/proftpd.mk index 398155222d..0820822e17 100644 --- a/package/proftpd/proftpd.mk +++ b/package/proftpd/proftpd.mk @@ -4,7 +4,7 @@ # ################################################################################ -PROFTPD_VERSION = 1.3.8 +PROFTPD_VERSION = 1.3.8b PROFTPD_SITE = ftp://ftp.proftpd.org/distrib/source PROFTPD_LICENSE = GPL-2.0+ PROFTPD_LICENSE_FILES = COPYING From f0c21dd4888ce63469595836390606ec24ac0119 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 1 Jan 2024 23:06:01 +0100 Subject: [PATCH 4444/5754] package/libssh2: fix CVE-2023-48795 https://github.com/advisories/GHSA-45x7-px36-x8w8 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...o-fix-CVE-2023-48795-Terrapin-Attack.patch | 462 ++++++++++++++++++ package/libssh2/libssh2.mk | 3 + 2 files changed, 465 insertions(+) create mode 100644 package/libssh2/0002-src-add-strict-KEX-to-fix-CVE-2023-48795-Terrapin-Attack.patch diff --git a/package/libssh2/0002-src-add-strict-KEX-to-fix-CVE-2023-48795-Terrapin-Attack.patch b/package/libssh2/0002-src-add-strict-KEX-to-fix-CVE-2023-48795-Terrapin-Attack.patch new file mode 100644 index 0000000000..2ccedee19e --- /dev/null +++ b/package/libssh2/0002-src-add-strict-KEX-to-fix-CVE-2023-48795-Terrapin-Attack.patch @@ -0,0 +1,462 @@ +From d34d9258b8420b19ec3f97b4cc5bf7aa7d98e35a Mon Sep 17 00:00:00 2001 +From: Michael Buckley +Date: Thu, 30 Nov 2023 15:08:02 -0800 +Subject: [PATCH] src: add 'strict KEX' to fix CVE-2023-48795 "Terrapin Attack" + +Refs: +https://terrapin-attack.com/ +https://seclists.org/oss-sec/2023/q4/292 +https://osv.dev/list?ecosystem=&q=CVE-2023-48795 +https://github.com/advisories/GHSA-45x7-px36-x8w8 +https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2023-48795 + +Fixes #1290 +Closes #1291 + +Upstream: https://github.com/libssh2/libssh2/commit/d34d9258b8420b19ec3f97b4cc5bf7aa7d98e35a +Signed-off-by: Fabrice Fontaine +--- + src/kex.c | 63 +++++++++++++++++++++++------------ + src/libssh2_priv.h | 18 +++++++--- + src/packet.c | 83 +++++++++++++++++++++++++++++++++++++++++++--- + src/packet.h | 2 +- + src/session.c | 3 ++ + src/transport.c | 12 ++++++- + 6 files changed, 149 insertions(+), 32 deletions(-) + +diff --git a/src/kex.c b/src/kex.c +index 8e7b7f0af3..a7b301e157 100644 +--- a/src/kex.c ++++ b/src/kex.c +@@ -3032,6 +3032,13 @@ kex_method_extension_negotiation = { + 0, + }; + ++static const LIBSSH2_KEX_METHOD ++kex_method_strict_client_extension = { ++ "kex-strict-c-v00@openssh.com", ++ NULL, ++ 0, ++}; ++ + static const LIBSSH2_KEX_METHOD *libssh2_kex_methods[] = { + #if LIBSSH2_ED25519 + &kex_method_ssh_curve25519_sha256, +@@ -3050,6 +3057,7 @@ static const LIBSSH2_KEX_METHOD *libssh2_kex_methods[] = { + &kex_method_diffie_helman_group1_sha1, + &kex_method_diffie_helman_group_exchange_sha1, + &kex_method_extension_negotiation, ++ &kex_method_strict_client_extension, + NULL + }; + +@@ -3302,13 +3310,13 @@ static int kexinit(LIBSSH2_SESSION * session) + return 0; + } + +-/* kex_agree_instr ++/* _libssh2_kex_agree_instr + * Kex specific variant of strstr() + * Needle must be preceded by BOL or ',', and followed by ',' or EOL + */ +-static unsigned char * +-kex_agree_instr(unsigned char *haystack, size_t haystack_len, +- const unsigned char *needle, size_t needle_len) ++unsigned char * ++_libssh2_kex_agree_instr(unsigned char *haystack, size_t haystack_len, ++ const unsigned char *needle, size_t needle_len) + { + unsigned char *s; + unsigned char *end_haystack; +@@ -3393,7 +3401,7 @@ static int kex_agree_hostkey(LIBSSH2_SESSION * session, + while(s && *s) { + unsigned char *p = (unsigned char *) strchr((char *) s, ','); + size_t method_len = (p ? (size_t)(p - s) : strlen((char *) s)); +- if(kex_agree_instr(hostkey, hostkey_len, s, method_len)) { ++ if(_libssh2_kex_agree_instr(hostkey, hostkey_len, s, method_len)) { + const LIBSSH2_HOSTKEY_METHOD *method = + (const LIBSSH2_HOSTKEY_METHOD *) + kex_get_method_by_name((char *) s, method_len, +@@ -3427,9 +3435,9 @@ static int kex_agree_hostkey(LIBSSH2_SESSION * session, + } + + while(hostkeyp && (*hostkeyp) && (*hostkeyp)->name) { +- s = kex_agree_instr(hostkey, hostkey_len, +- (unsigned char *) (*hostkeyp)->name, +- strlen((*hostkeyp)->name)); ++ s = _libssh2_kex_agree_instr(hostkey, hostkey_len, ++ (unsigned char *) (*hostkeyp)->name, ++ strlen((*hostkeyp)->name)); + if(s) { + /* So far so good, but does it suit our purposes? (Encrypting vs + Signing) */ +@@ -3463,6 +3471,12 @@ static int kex_agree_kex_hostkey(LIBSSH2_SESSION * session, unsigned char *kex, + { + const LIBSSH2_KEX_METHOD **kexp = libssh2_kex_methods; + unsigned char *s; ++ const unsigned char *strict = ++ (unsigned char *)"kex-strict-s-v00@openssh.com"; ++ ++ if(_libssh2_kex_agree_instr(kex, kex_len, strict, 28)) { ++ session->kex_strict = 1; ++ } + + if(session->kex_prefs) { + s = (unsigned char *) session->kex_prefs; +@@ -3470,7 +3484,7 @@ static int kex_agree_kex_hostkey(LIBSSH2_SESSION * session, unsigned char *kex, + while(s && *s) { + unsigned char *q, *p = (unsigned char *) strchr((char *) s, ','); + size_t method_len = (p ? (size_t)(p - s) : strlen((char *) s)); +- q = kex_agree_instr(kex, kex_len, s, method_len); ++ q = _libssh2_kex_agree_instr(kex, kex_len, s, method_len); + if(q) { + const LIBSSH2_KEX_METHOD *method = (const LIBSSH2_KEX_METHOD *) + kex_get_method_by_name((char *) s, method_len, +@@ -3504,9 +3518,9 @@ static int kex_agree_kex_hostkey(LIBSSH2_SESSION * session, unsigned char *kex, + } + + while(*kexp && (*kexp)->name) { +- s = kex_agree_instr(kex, kex_len, +- (unsigned char *) (*kexp)->name, +- strlen((*kexp)->name)); ++ s = _libssh2_kex_agree_instr(kex, kex_len, ++ (unsigned char *) (*kexp)->name, ++ strlen((*kexp)->name)); + if(s) { + /* We've agreed on a key exchange method, + * Can we agree on a hostkey that works with this kex? +@@ -3550,7 +3564,7 @@ static int kex_agree_crypt(LIBSSH2_SESSION * session, + unsigned char *p = (unsigned char *) strchr((char *) s, ','); + size_t method_len = (p ? (size_t)(p - s) : strlen((char *) s)); + +- if(kex_agree_instr(crypt, crypt_len, s, method_len)) { ++ if(_libssh2_kex_agree_instr(crypt, crypt_len, s, method_len)) { + const LIBSSH2_CRYPT_METHOD *method = + (const LIBSSH2_CRYPT_METHOD *) + kex_get_method_by_name((char *) s, method_len, +@@ -3572,9 +3586,9 @@ static int kex_agree_crypt(LIBSSH2_SESSION * session, + } + + while(*cryptp && (*cryptp)->name) { +- s = kex_agree_instr(crypt, crypt_len, +- (unsigned char *) (*cryptp)->name, +- strlen((*cryptp)->name)); ++ s = _libssh2_kex_agree_instr(crypt, crypt_len, ++ (unsigned char *) (*cryptp)->name, ++ strlen((*cryptp)->name)); + if(s) { + endpoint->crypt = *cryptp; + return 0; +@@ -3614,7 +3628,7 @@ static int kex_agree_mac(LIBSSH2_SESSION * session, + unsigned char *p = (unsigned char *) strchr((char *) s, ','); + size_t method_len = (p ? (size_t)(p - s) : strlen((char *) s)); + +- if(kex_agree_instr(mac, mac_len, s, method_len)) { ++ if(_libssh2_kex_agree_instr(mac, mac_len, s, method_len)) { + const LIBSSH2_MAC_METHOD *method = (const LIBSSH2_MAC_METHOD *) + kex_get_method_by_name((char *) s, method_len, + (const LIBSSH2_COMMON_METHOD **) +@@ -3635,8 +3649,9 @@ static int kex_agree_mac(LIBSSH2_SESSION * session, + } + + while(*macp && (*macp)->name) { +- s = kex_agree_instr(mac, mac_len, (unsigned char *) (*macp)->name, +- strlen((*macp)->name)); ++ s = _libssh2_kex_agree_instr(mac, mac_len, ++ (unsigned char *) (*macp)->name, ++ strlen((*macp)->name)); + if(s) { + endpoint->mac = *macp; + return 0; +@@ -3667,7 +3682,7 @@ static int kex_agree_comp(LIBSSH2_SESSION *session, + unsigned char *p = (unsigned char *) strchr((char *) s, ','); + size_t method_len = (p ? (size_t)(p - s) : strlen((char *) s)); + +- if(kex_agree_instr(comp, comp_len, s, method_len)) { ++ if(_libssh2_kex_agree_instr(comp, comp_len, s, method_len)) { + const LIBSSH2_COMP_METHOD *method = + (const LIBSSH2_COMP_METHOD *) + kex_get_method_by_name((char *) s, method_len, +@@ -3689,8 +3704,9 @@ static int kex_agree_comp(LIBSSH2_SESSION *session, + } + + while(*compp && (*compp)->name) { +- s = kex_agree_instr(comp, comp_len, (unsigned char *) (*compp)->name, +- strlen((*compp)->name)); ++ s = _libssh2_kex_agree_instr(comp, comp_len, ++ (unsigned char *) (*compp)->name, ++ strlen((*compp)->name)); + if(s) { + endpoint->comp = *compp; + return 0; +@@ -3871,6 +3887,7 @@ _libssh2_kex_exchange(LIBSSH2_SESSION * session, int reexchange, + session->local.kexinit = key_state->oldlocal; + session->local.kexinit_len = key_state->oldlocal_len; + key_state->state = libssh2_NB_state_idle; ++ session->state &= ~LIBSSH2_STATE_INITIAL_KEX; + session->state &= ~LIBSSH2_STATE_KEX_ACTIVE; + session->state &= ~LIBSSH2_STATE_EXCHANGING_KEYS; + return -1; +@@ -3896,6 +3913,7 @@ _libssh2_kex_exchange(LIBSSH2_SESSION * session, int reexchange, + session->local.kexinit = key_state->oldlocal; + session->local.kexinit_len = key_state->oldlocal_len; + key_state->state = libssh2_NB_state_idle; ++ session->state &= ~LIBSSH2_STATE_INITIAL_KEX; + session->state &= ~LIBSSH2_STATE_KEX_ACTIVE; + session->state &= ~LIBSSH2_STATE_EXCHANGING_KEYS; + return -1; +@@ -3944,6 +3962,7 @@ _libssh2_kex_exchange(LIBSSH2_SESSION * session, int reexchange, + session->remote.kexinit = NULL; + } + ++ session->state &= ~LIBSSH2_STATE_INITIAL_KEX; + session->state &= ~LIBSSH2_STATE_KEX_ACTIVE; + session->state &= ~LIBSSH2_STATE_EXCHANGING_KEYS; + +diff --git a/src/libssh2_priv.h b/src/libssh2_priv.h +index 7660366954..18d9ab2130 100644 +--- a/src/libssh2_priv.h ++++ b/src/libssh2_priv.h +@@ -736,6 +736,9 @@ struct _LIBSSH2_SESSION + /* key signing algorithm preferences -- NULL yields server order */ + char *sign_algo_prefs; + ++ /* Whether to use the OpenSSH Strict KEX extension */ ++ int kex_strict; ++ + /* (remote as source of data -- packet_read ) */ + libssh2_endpoint_data remote; + +@@ -908,6 +911,7 @@ struct _LIBSSH2_SESSION + int fullpacket_macstate; + size_t fullpacket_payload_len; + int fullpacket_packet_type; ++ uint32_t fullpacket_required_type; + + /* State variables used in libssh2_sftp_init() */ + libssh2_nonblocking_states sftpInit_state; +@@ -948,10 +952,11 @@ struct _LIBSSH2_SESSION + }; + + /* session.state bits */ +-#define LIBSSH2_STATE_EXCHANGING_KEYS 0x00000001 +-#define LIBSSH2_STATE_NEWKEYS 0x00000002 +-#define LIBSSH2_STATE_AUTHENTICATED 0x00000004 +-#define LIBSSH2_STATE_KEX_ACTIVE 0x00000008 ++#define LIBSSH2_STATE_INITIAL_KEX 0x00000001 ++#define LIBSSH2_STATE_EXCHANGING_KEYS 0x00000002 ++#define LIBSSH2_STATE_NEWKEYS 0x00000004 ++#define LIBSSH2_STATE_AUTHENTICATED 0x00000008 ++#define LIBSSH2_STATE_KEX_ACTIVE 0x00000010 + + /* session.flag helpers */ + #ifdef MSG_NOSIGNAL +@@ -1182,6 +1187,11 @@ ssize_t _libssh2_send(libssh2_socket_t socket, const void *buffer, + int _libssh2_kex_exchange(LIBSSH2_SESSION * session, int reexchange, + key_exchange_state_t * state); + ++unsigned char *_libssh2_kex_agree_instr(unsigned char *haystack, ++ size_t haystack_len, ++ const unsigned char *needle, ++ size_t needle_len); ++ + /* Let crypt.c/hostkey.c expose their method structs */ + const LIBSSH2_CRYPT_METHOD **libssh2_crypt_methods(void); + const LIBSSH2_HOSTKEY_METHOD **libssh2_hostkey_methods(void); +diff --git a/src/packet.c b/src/packet.c +index eccb8c56a8..6da14e9fa1 100644 +--- a/src/packet.c ++++ b/src/packet.c +@@ -624,14 +624,13 @@ packet_authagent_open(LIBSSH2_SESSION * session, + * layer when it has received a packet. + * + * The input pointer 'data' is pointing to allocated data that this function +- * is asked to deal with so on failure OR success, it must be freed fine. +- * The only exception is when the return code is LIBSSH2_ERROR_EAGAIN. ++ * will be freed unless return the code is LIBSSH2_ERROR_EAGAIN. + * + * This function will always be called with 'datalen' greater than zero. + */ + int + _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, +- size_t datalen, int macstate) ++ size_t datalen, int macstate, uint32_t seq) + { + int rc = 0; + unsigned char *message = NULL; +@@ -676,6 +675,70 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, + break; + } + ++ if(session->state & LIBSSH2_STATE_INITIAL_KEX) { ++ if(msg == SSH_MSG_KEXINIT) { ++ if(!session->kex_strict) { ++ if(datalen < 17) { ++ LIBSSH2_FREE(session, data); ++ session->packAdd_state = libssh2_NB_state_idle; ++ return _libssh2_error(session, ++ LIBSSH2_ERROR_BUFFER_TOO_SMALL, ++ "Data too short extracting kex"); ++ } ++ else { ++ const unsigned char *strict = ++ (unsigned char *)"kex-strict-s-v00@openssh.com"; ++ struct string_buf buf; ++ unsigned char *algs = NULL; ++ size_t algs_len = 0; ++ ++ buf.data = (unsigned char *)data; ++ buf.dataptr = buf.data; ++ buf.len = datalen; ++ buf.dataptr += 17; /* advance past type and cookie */ ++ ++ if(_libssh2_get_string(&buf, &algs, &algs_len)) { ++ LIBSSH2_FREE(session, data); ++ session->packAdd_state = libssh2_NB_state_idle; ++ return _libssh2_error(session, ++ LIBSSH2_ERROR_BUFFER_TOO_SMALL, ++ "Algs too short"); ++ } ++ ++ if(algs_len == 0 || ++ _libssh2_kex_agree_instr(algs, algs_len, strict, 28)) { ++ session->kex_strict = 1; ++ } ++ } ++ } ++ ++ if(session->kex_strict && seq) { ++ LIBSSH2_FREE(session, data); ++ session->socket_state = LIBSSH2_SOCKET_DISCONNECTED; ++ session->packAdd_state = libssh2_NB_state_idle; ++ libssh2_session_disconnect(session, "strict KEX violation: " ++ "KEXINIT was not the first packet"); ++ ++ return _libssh2_error(session, LIBSSH2_ERROR_SOCKET_DISCONNECT, ++ "strict KEX violation: " ++ "KEXINIT was not the first packet"); ++ } ++ } ++ ++ if(session->kex_strict && session->fullpacket_required_type && ++ session->fullpacket_required_type != msg) { ++ LIBSSH2_FREE(session, data); ++ session->socket_state = LIBSSH2_SOCKET_DISCONNECTED; ++ session->packAdd_state = libssh2_NB_state_idle; ++ libssh2_session_disconnect(session, "strict KEX violation: " ++ "unexpected packet type"); ++ ++ return _libssh2_error(session, LIBSSH2_ERROR_SOCKET_DISCONNECT, ++ "strict KEX violation: " ++ "unexpected packet type"); ++ } ++ } ++ + if(session->packAdd_state == libssh2_NB_state_allocated) { + /* A couple exceptions to the packet adding rule: */ + switch(msg) { +@@ -1364,6 +1427,15 @@ _libssh2_packet_ask(LIBSSH2_SESSION * session, unsigned char packet_type, + + return 0; + } ++ else if(session->kex_strict && ++ (session->state & LIBSSH2_STATE_INITIAL_KEX)) { ++ libssh2_session_disconnect(session, "strict KEX violation: " ++ "unexpected packet type"); ++ ++ return _libssh2_error(session, LIBSSH2_ERROR_SOCKET_DISCONNECT, ++ "strict KEX violation: " ++ "unexpected packet type"); ++ } + packet = _libssh2_list_next(&packet->node); + } + return -1; +@@ -1425,7 +1497,10 @@ _libssh2_packet_require(LIBSSH2_SESSION * session, unsigned char packet_type, + } + + while(session->socket_state == LIBSSH2_SOCKET_CONNECTED) { +- int ret = _libssh2_transport_read(session); ++ int ret; ++ session->fullpacket_required_type = packet_type; ++ ret = _libssh2_transport_read(session); ++ session->fullpacket_required_type = 0; + if(ret == LIBSSH2_ERROR_EAGAIN) + return ret; + else if(ret < 0) { +diff --git a/src/packet.h b/src/packet.h +index 1d90b8af12..955351e5f6 100644 +--- a/src/packet.h ++++ b/src/packet.h +@@ -72,6 +72,6 @@ int _libssh2_packet_burn(LIBSSH2_SESSION * session, + int _libssh2_packet_write(LIBSSH2_SESSION * session, unsigned char *data, + unsigned long data_len); + int _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, +- size_t datalen, int macstate); ++ size_t datalen, int macstate, uint32_t seq); + + #endif /* LIBSSH2_PACKET_H */ +diff --git a/src/session.c b/src/session.c +index 35e7929fe7..9d89ade8ec 100644 +--- a/src/session.c ++++ b/src/session.c +@@ -469,6 +469,8 @@ libssh2_session_init_ex(LIBSSH2_ALLOC_FUNC((*my_alloc)), + session->abstract = abstract; + session->api_timeout = 0; /* timeout-free API by default */ + session->api_block_mode = 1; /* blocking API by default */ ++ session->state = LIBSSH2_STATE_INITIAL_KEX; ++ session->fullpacket_required_type = 0; + session->packet_read_timeout = LIBSSH2_DEFAULT_READ_TIMEOUT; + session->flag.quote_paths = 1; /* default behavior is to quote paths + for the scp subsystem */ +@@ -1223,6 +1225,7 @@ libssh2_session_disconnect_ex(LIBSSH2_SESSION *session, int reason, + const char *desc, const char *lang) + { + int rc; ++ session->state &= ~LIBSSH2_STATE_INITIAL_KEX; + session->state &= ~LIBSSH2_STATE_EXCHANGING_KEYS; + BLOCK_ADJUST(rc, session, + session_disconnect(session, reason, desc, lang)); +diff --git a/src/transport.c b/src/transport.c +index 21be9d2b80..a8bb588a4b 100644 +--- a/src/transport.c ++++ b/src/transport.c +@@ -186,6 +186,7 @@ fullpacket(LIBSSH2_SESSION * session, int encrypted /* 1 or 0 */ ) + struct transportpacket *p = &session->packet; + int rc; + int compressed; ++ uint32_t seq = session->remote.seqno; + + if(session->fullpacket_state == libssh2_NB_state_idle) { + session->fullpacket_macstate = LIBSSH2_MAC_CONFIRMED; +@@ -317,7 +318,7 @@ fullpacket(LIBSSH2_SESSION * session, int encrypted /* 1 or 0 */ ) + if(session->fullpacket_state == libssh2_NB_state_created) { + rc = _libssh2_packet_add(session, p->payload, + session->fullpacket_payload_len, +- session->fullpacket_macstate); ++ session->fullpacket_macstate, seq); + if(rc == LIBSSH2_ERROR_EAGAIN) + return rc; + if(rc) { +@@ -328,6 +329,11 @@ fullpacket(LIBSSH2_SESSION * session, int encrypted /* 1 or 0 */ ) + + session->fullpacket_state = libssh2_NB_state_idle; + ++ if(session->kex_strict && ++ session->fullpacket_packet_type == SSH_MSG_NEWKEYS) { ++ session->remote.seqno = 0; ++ } ++ + return session->fullpacket_packet_type; + } + +@@ -1093,6 +1099,10 @@ int _libssh2_transport_send(LIBSSH2_SESSION *session, + + session->local.seqno++; + ++ if(session->kex_strict && data[0] == SSH_MSG_NEWKEYS) { ++ session->local.seqno = 0; ++ } ++ + ret = LIBSSH2_SEND(session, p->outbuf, total_length, + LIBSSH2_SOCKET_SEND_FLAGS(session)); + if(ret < 0) diff --git a/package/libssh2/libssh2.mk b/package/libssh2/libssh2.mk index a42be46a7a..b2c07cbf30 100644 --- a/package/libssh2/libssh2.mk +++ b/package/libssh2/libssh2.mk @@ -13,6 +13,9 @@ LIBSSH2_CPE_ID_VENDOR = libssh2 LIBSSH2_INSTALL_STAGING = YES LIBSSH2_CONF_OPTS = --disable-examples-build --disable-rpath +# 0002-src-add-strict-KEX-to-fix-CVE-2023-48795-Terrapin-Attack.patch +LIBSSH2_IGNORE_CVES += CVE-2023-48795 + ifeq ($(BR2_PACKAGE_LIBSSH2_MBEDTLS),y) LIBSSH2_DEPENDENCIES += mbedtls LIBSSH2_CONF_OPTS += --with-libmbedcrypto-prefix=$(STAGING_DIR)/usr \ From 391a442cc350cec07c7e056bf498c8d03e9396ae Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 1 Jan 2024 23:08:18 +0100 Subject: [PATCH 4445/5754] package/dropbear: fix CVE-2023-48795 https://github.com/advisories/GHSA-45x7-px36-x8w8 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0001-Implement-Strict-KEX-mode.patch | 232 ++++++++++++++++++ package/dropbear/dropbear.mk | 3 + 2 files changed, 235 insertions(+) create mode 100644 package/dropbear/0001-Implement-Strict-KEX-mode.patch diff --git a/package/dropbear/0001-Implement-Strict-KEX-mode.patch b/package/dropbear/0001-Implement-Strict-KEX-mode.patch new file mode 100644 index 0000000000..ce7b84861c --- /dev/null +++ b/package/dropbear/0001-Implement-Strict-KEX-mode.patch @@ -0,0 +1,232 @@ +From 6e43be5c7b99dbee49dc72b6f989f29fdd7e9356 Mon Sep 17 00:00:00 2001 +From: Matt Johnston +Date: Mon, 20 Nov 2023 14:02:47 +0800 +Subject: [PATCH] Implement Strict KEX mode + +As specified by OpenSSH with kex-strict-c-v00@openssh.com and +kex-strict-s-v00@openssh.com. + +Upstream: https://github.com/mkj/dropbear/commit/6e43be5c7b99dbee49dc72b6f989f29fdd7e9356 +Signed-off-by: Fabrice Fontaine +--- + src/cli-session.c | 11 +++++++++++ + src/common-algo.c | 6 ++++++ + src/common-kex.c | 26 +++++++++++++++++++++++++- + src/kex.h | 3 +++ + src/process-packet.c | 34 +++++++++++++++++++--------------- + src/ssh.h | 4 ++++ + src/svr-session.c | 3 +++ + 7 files changed, 71 insertions(+), 16 deletions(-) + +diff --git a/cli-session.c b/cli-session.c +index 5981b2470..d261c8f82 100644 +--- a/cli-session.c ++++ b/cli-session.c +@@ -46,6 +46,7 @@ static void cli_finished(void) ATTRIB_NORETURN; + static void recv_msg_service_accept(void); + static void cli_session_cleanup(void); + static void recv_msg_global_request_cli(void); ++static void cli_algos_initialise(void); + + struct clientsession cli_ses; /* GLOBAL */ + +@@ -117,6 +118,7 @@ void cli_session(int sock_in, int sock_out, struct dropbear_progress_connection + } + + chaninitialise(cli_chantypes); ++ cli_algos_initialise(); + + /* Set up cli_ses vars */ + cli_session_init(proxy_cmd_pid); +@@ -487,3 +489,12 @@ void cli_dropbear_log(int priority, const char* format, va_list param) { + fflush(stderr); + } + ++static void cli_algos_initialise(void) { ++ algo_type *algo; ++ for (algo = sshkex; algo->name; algo++) { ++ if (strcmp(algo->name, SSH_STRICT_KEX_S) == 0) { ++ algo->usable = 0; ++ } ++ } ++} ++ +diff --git a/common-algo.c b/common-algo.c +index 378f0ca8e..f9d46ebb6 100644 +--- a/common-algo.c ++++ b/common-algo.c +@@ -307,6 +307,12 @@ algo_type sshkex[] = { + /* Set unusable by svr_algos_initialise() */ + {SSH_EXT_INFO_C, 0, NULL, 1, NULL}, + #endif ++#endif ++#if DROPBEAR_CLIENT ++ {SSH_STRICT_KEX_C, 0, NULL, 1, NULL}, ++#endif ++#if DROPBEAR_SERVER ++ {SSH_STRICT_KEX_S, 0, NULL, 1, NULL}, + #endif + {NULL, 0, NULL, 0, NULL} + }; +diff --git a/common-kex.c b/common-kex.c +index ac8844246..8e33b12a6 100644 +--- a/common-kex.c ++++ b/common-kex.c +@@ -183,6 +183,10 @@ void send_msg_newkeys() { + gen_new_keys(); + switch_keys(); + ++ if (ses.kexstate.strict_kex) { ++ ses.transseq = 0; ++ } ++ + TRACE(("leave send_msg_newkeys")) + } + +@@ -193,7 +197,11 @@ void recv_msg_newkeys() { + + ses.kexstate.recvnewkeys = 1; + switch_keys(); +- ++ ++ if (ses.kexstate.strict_kex) { ++ ses.recvseq = 0; ++ } ++ + TRACE(("leave recv_msg_newkeys")) + } + +@@ -550,6 +558,10 @@ void recv_msg_kexinit() { + + ses.kexstate.recvkexinit = 1; + ++ if (ses.kexstate.strict_kex && !ses.kexstate.donefirstkex && ses.recvseq != 1) { ++ dropbear_exit("First packet wasn't kexinit"); ++ } ++ + TRACE(("leave recv_msg_kexinit")) + } + +@@ -859,6 +871,18 @@ static void read_kex_algos() { + } + #endif + ++ if (!ses.kexstate.donefirstkex) { ++ const char* strict_name; ++ if (IS_DROPBEAR_CLIENT) { ++ strict_name = SSH_STRICT_KEX_S; ++ } else { ++ strict_name = SSH_STRICT_KEX_C; ++ } ++ if (buf_has_algo(ses.payload, strict_name) == DROPBEAR_SUCCESS) { ++ ses.kexstate.strict_kex = 1; ++ } ++ } ++ + algo = buf_match_algo(ses.payload, sshkex, kexguess2, &goodguess); + allgood &= goodguess; + if (algo == NULL || algo->data == NULL) { +diff --git a/kex.h b/kex.h +index 77cf21a37..7fcc3c252 100644 +--- a/kex.h ++++ b/kex.h +@@ -83,6 +83,9 @@ struct KEXState { + + unsigned our_first_follows_matches : 1; + ++ /* Boolean indicating that strict kex mode is in use */ ++ unsigned int strict_kex; ++ + time_t lastkextime; /* time of the last kex */ + unsigned int datatrans; /* data transmitted since last kex */ + unsigned int datarecv; /* data received since last kex */ +diff --git a/process-packet.c b/process-packet.c +index 945416023..133a152d0 100644 +--- a/process-packet.c ++++ b/process-packet.c +@@ -44,6 +44,7 @@ void process_packet() { + + unsigned char type; + unsigned int i; ++ unsigned int first_strict_kex = ses.kexstate.strict_kex && !ses.kexstate.donefirstkex; + time_t now; + + TRACE2(("enter process_packet")) +@@ -54,22 +55,24 @@ void process_packet() { + now = monotonic_now(); + ses.last_packet_time_keepalive_recv = now; + +- /* These packets we can receive at any time */ +- switch(type) { + +- case SSH_MSG_IGNORE: +- goto out; +- case SSH_MSG_DEBUG: +- goto out; ++ if (type == SSH_MSG_DISCONNECT) { ++ /* Allowed at any time */ ++ dropbear_close("Disconnect received"); ++ } + +- case SSH_MSG_UNIMPLEMENTED: +- /* debugging XXX */ +- TRACE(("SSH_MSG_UNIMPLEMENTED")) +- goto out; +- +- case SSH_MSG_DISCONNECT: +- /* TODO cleanup? */ +- dropbear_close("Disconnect received"); ++ /* These packets may be received at any time, ++ except during first kex with strict kex */ ++ if (!first_strict_kex) { ++ switch(type) { ++ case SSH_MSG_IGNORE: ++ goto out; ++ case SSH_MSG_DEBUG: ++ goto out; ++ case SSH_MSG_UNIMPLEMENTED: ++ TRACE(("SSH_MSG_UNIMPLEMENTED")) ++ goto out; ++ } + } + + /* Ignore these packet types so that keepalives don't interfere with +@@ -98,7 +101,8 @@ void process_packet() { + if (type >= 1 && type <= 49 + && type != SSH_MSG_SERVICE_REQUEST + && type != SSH_MSG_SERVICE_ACCEPT +- && type != SSH_MSG_KEXINIT) ++ && type != SSH_MSG_KEXINIT ++ && !first_strict_kex) + { + TRACE(("unknown allowed packet during kexinit")) + recv_unimplemented(); +diff --git a/ssh.h b/ssh.h +index 1b4fec65f..ef3efdca0 100644 +--- a/ssh.h ++++ b/ssh.h +@@ -100,6 +100,10 @@ + #define SSH_EXT_INFO_C "ext-info-c" + #define SSH_SERVER_SIG_ALGS "server-sig-algs" + ++/* OpenSSH strict KEX feature */ ++#define SSH_STRICT_KEX_S "kex-strict-s-v00@openssh.com" ++#define SSH_STRICT_KEX_C "kex-strict-c-v00@openssh.com" ++ + /* service types */ + #define SSH_SERVICE_USERAUTH "ssh-userauth" + #define SSH_SERVICE_USERAUTH_LEN 12 +diff --git a/svr-session.c b/svr-session.c +index 769f0731d..a538e2c5c 100644 +--- a/svr-session.c ++++ b/svr-session.c +@@ -370,6 +370,9 @@ static void svr_algos_initialise(void) { + algo->usable = 0; + } + #endif ++ if (strcmp(algo->name, SSH_STRICT_KEX_C) == 0) { ++ algo->usable = 0; ++ } + } + } + diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk index 36eb7898ba..7ac8a38559 100644 --- a/package/dropbear/dropbear.mk +++ b/package/dropbear/dropbear.mk @@ -14,6 +14,9 @@ DROPBEAR_PROGRAMS = dropbear $(DROPBEAR_TARGET_BINS) DROPBEAR_CPE_ID_VENDOR = dropbear_ssh_project DROPBEAR_CPE_ID_PRODUCT = dropbear_ssh +# 0001-Implement-Strict-KEX-mode.patch +DROPBEAR_IGNORE_CVES += CVE-2023-48795 + # Disable hardening flags added by dropbear configure.ac, and let # Buildroot add them when the relevant options are enabled. This # prevents dropbear from using SSP support when not available. From 6febe37bacf87b56f9f0330ed01dc800232199cf Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 1 Jan 2024 23:13:17 +0100 Subject: [PATCH 4446/5754] package/python-paramiko: security bump to version 3.4.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Address CVE 2023-48795 (aka the “Terrapin Attack”), a vulnerability found in the SSH protocol. https://github.com/paramiko/paramiko/blob/3.4.0/sites/www/changelog.rst Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/python-paramiko/python-paramiko.hash | 4 ++-- package/python-paramiko/python-paramiko.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-paramiko/python-paramiko.hash b/package/python-paramiko/python-paramiko.hash index abc62fc8c2..893aac074e 100644 --- a/package/python-paramiko/python-paramiko.hash +++ b/package/python-paramiko/python-paramiko.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/paramiko/json -md5 08b1610e3ba9fa89e13973710cd48e35 paramiko-3.3.1.tar.gz -sha256 6a3777a961ac86dbef375c5f5b8d50014a1a96d0fd7f054a43bc880134b0ff77 paramiko-3.3.1.tar.gz +md5 be485ba66b576d8bc7e1c0ad96e87108 paramiko-3.4.0.tar.gz +sha256 aac08f26a31dc4dffd92821527d1682d99d52f9ef6851968114a8728f3c274d3 paramiko-3.4.0.tar.gz # Locally computed sha256 checksums sha256 5fa25bf5f395fd26e701c2e1de4ca7d162816986dc791c22f8f4226857ad1bb2 LICENSE diff --git a/package/python-paramiko/python-paramiko.mk b/package/python-paramiko/python-paramiko.mk index 512a4630f5..8d921486c7 100644 --- a/package/python-paramiko/python-paramiko.mk +++ b/package/python-paramiko/python-paramiko.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PARAMIKO_VERSION = 3.3.1 +PYTHON_PARAMIKO_VERSION = 3.4.0 PYTHON_PARAMIKO_SOURCE = paramiko-$(PYTHON_PARAMIKO_VERSION).tar.gz -PYTHON_PARAMIKO_SITE = https://files.pythonhosted.org/packages/44/03/158ae1dcb950bd96f04038502238159e116fafb27addf5df1ba35068f2d6 +PYTHON_PARAMIKO_SITE = https://files.pythonhosted.org/packages/cc/af/11996c4df4f9caff87997ad2d3fd8825078c277d6a928446d2b6cf249889 PYTHON_PARAMIKO_SETUP_TYPE = setuptools PYTHON_PARAMIKO_LICENSE = LGPL-2.1+ PYTHON_PARAMIKO_LICENSE_FILES = LICENSE From 950881da9997af650b59f88110f11b338124cc67 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 1 Jan 2024 23:15:21 +0100 Subject: [PATCH 4447/5754] package/python-asyncssh: security bump to version 2.14.2 Implemented "strict kex" support and other countermeasures to protect against the Terrapin Attack described in CVE-2023-48795 https://github.com/advisories/GHSA-hfmc-7525-mj55 https://github.com/ronf/asyncssh/blob/v2.14.2/docs/changes.rst Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/python-asyncssh/python-asyncssh.hash | 4 ++-- package/python-asyncssh/python-asyncssh.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-asyncssh/python-asyncssh.hash b/package/python-asyncssh/python-asyncssh.hash index d72b5329c5..f74cbe9c83 100644 --- a/package/python-asyncssh/python-asyncssh.hash +++ b/package/python-asyncssh/python-asyncssh.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/asyncssh/json -md5 4194feb9e0d17a0750f107f3445ff9f7 asyncssh-2.14.1.tar.gz -sha256 1ac31c333a0d83c88831523245500caa814503423741b0e465339ef6da5b5e29 asyncssh-2.14.1.tar.gz +md5 3b22a39fa9d638b277c9441187b73c5c asyncssh-2.14.2.tar.gz +sha256 e956bf8988d07a06ba3305f6604e261f4ca014c4a232f0873f1c7692fbe3cfc2 asyncssh-2.14.2.tar.gz # Locally computed sha256 checksums sha256 0becf16567beb77fa252b7664631dd177c8f9a1889e48995b45379c7130e5303 LICENSE sha256 68c286b0cf4507bec8922103efe861adb0bd3218003b1ec1b25e2e64bdd76bd3 COPYRIGHT diff --git a/package/python-asyncssh/python-asyncssh.mk b/package/python-asyncssh/python-asyncssh.mk index 51e2e1973c..1f6b9d79a2 100644 --- a/package/python-asyncssh/python-asyncssh.mk +++ b/package/python-asyncssh/python-asyncssh.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ASYNCSSH_VERSION = 2.14.1 +PYTHON_ASYNCSSH_VERSION = 2.14.2 PYTHON_ASYNCSSH_SOURCE = asyncssh-$(PYTHON_ASYNCSSH_VERSION).tar.gz -PYTHON_ASYNCSSH_SITE = https://files.pythonhosted.org/packages/5f/86/59278fefc49ddcc10567e52a8e0e1553fc936584e241d516b5682d55ea17 +PYTHON_ASYNCSSH_SITE = https://files.pythonhosted.org/packages/6c/f9/849f158fe50cdb0b1bf75009861865c9a30c3b5a0d62ad43bb5e00b10feb PYTHON_ASYNCSSH_SETUP_TYPE = setuptools PYTHON_ASYNCSSH_LICENSE = EPL-2.0 or GPL-2.0+ PYTHON_ASYNCSSH_LICENSE_FILES = LICENSE COPYRIGHT From 0db3c08daf335571a2b2d18a16d8980ddf4567ab Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 1 Jan 2024 23:21:56 +0100 Subject: [PATCH 4448/5754] package/highway: bump to version 1.0.7 Drop patches (already in version) https://github.com/google/highway/releases/tag/1.0.7 https://github.com/google/highway/releases/tag/1.0.6 https://github.com/google/highway/releases/tag/1.0.5 https://github.com/google/highway/releases/tag/1.0.4 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 2 - ...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 | 2 +- 5 files changed, 2 insertions(+), 168 deletions(-) delete mode 100644 package/highway/0001-Fix-compilation-for-armv7-with-gcc-8.patch delete mode 100644 package/highway/0002-Fix-compilation-for-armv7-targets-with-vfp-v4-and-gc.patch diff --git a/.checkpackageignore b/.checkpackageignore index def465e802..2348f7ec52 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -527,8 +527,6 @@ 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/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 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 deleted file mode 100644 index 0634460453..0000000000 --- a/package/highway/0001-Fix-compilation-for-armv7-with-gcc-8.patch +++ /dev/null @@ -1,46 +0,0 @@ -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 deleted file mode 100644 index f29b385501..0000000000 --- a/package/highway/0002-Fix-compilation-for-armv7-targets-with-vfp-v4-and-gc.patch +++ /dev/null @@ -1,118 +0,0 @@ -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 16a9282176..55b1bca774 100644 --- a/package/highway/highway.hash +++ b/package/highway/highway.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 566fc77315878473d9a6bd815f7de78c73734acdcb745c3dde8579560ac5440e highway-1.0.3.tar.gz +sha256 5434488108186c170a5e2fca5e3c9b6ef59a1caa4d520b008a9b8be6b8abe6c5 highway-1.0.7.tar.gz sha256 43070e2d4e532684de521b885f385d0841030efa2b1a20bafb76133a5e1379c1 LICENSE diff --git a/package/highway/highway.mk b/package/highway/highway.mk index 56d63a83f9..692794959a 100644 --- a/package/highway/highway.mk +++ b/package/highway/highway.mk @@ -4,7 +4,7 @@ # ################################################################################ -HIGHWAY_VERSION = 1.0.3 +HIGHWAY_VERSION = 1.0.7 HIGHWAY_SITE = $(call github,google,highway,$(HIGHWAY_VERSION)) HIGHWAY_LICENSE = Apache-2.0 HIGHWAY_LICENSE_FILES = LICENSE From de8256e3f823307a65494decca8b1cd152819af6 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 1 Jan 2024 23:24:59 +0100 Subject: [PATCH 4449/5754] package/libjxl: bump to version 0.9.0 - Drop first patch (not needed since https://github.com/libjxl/libjxl/commit/c3a4f9ca89ae59c6265a2f1bf2a6d2a87a71fc16) - Drop second patch (already in version) - Add JPEGXL_ENABLE_JPEGLI=OFF: https://github.com/libjxl/libjxl/issues/3069 https://github.com/libjxl/libjxl/releases/tag/v0.9.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - ...entation-fault-when-JPEG-is-disabled.patch | 44 ----------------- ...ic-content-to-fix-gcc-compilation-fo.patch | 47 ------------------- package/libjxl/libjxl.hash | 2 +- package/libjxl/libjxl.mk | 3 +- 5 files changed, 3 insertions(+), 94 deletions(-) delete mode 100644 package/libjxl/0001-djxl-fix-segmentation-fault-when-JPEG-is-disabled.patch delete mode 100644 package/libjxl/0002-Add-missing-atomic-content-to-fix-gcc-compilation-fo.patch diff --git a/.checkpackageignore b/.checkpackageignore index 2348f7ec52..aa8a6abc4f 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -661,7 +661,6 @@ 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 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 diff --git a/package/libjxl/0001-djxl-fix-segmentation-fault-when-JPEG-is-disabled.patch b/package/libjxl/0001-djxl-fix-segmentation-fault-when-JPEG-is-disabled.patch deleted file mode 100644 index 3d709c956b..0000000000 --- a/package/libjxl/0001-djxl-fix-segmentation-fault-when-JPEG-is-disabled.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 504f35c8204248ae6f97278e8b7c6cc5853a1b94 Mon Sep 17 00:00:00 2001 -From: Julien Olivain -Date: Fri, 10 Feb 2023 21:31:30 +0100 -Subject: [PATCH] djxl: fix segmentation fault when JPEG is disabled - -When libjxl is compiled without JPEG support, by configuring for example -with: - - cmake -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=TRUE ... - -djxl crashes with a segmentation fault at: -https://github.com/libjxl/libjxl/blob/v0.8.1/tools/djxl_main.cc#L367 - -The crash can be reproduced with the sequence: - - gm convert IMAGE:LOGO ref.ppm - cjxl ref.ppm enc.jxl - djxl enc.jxl dec.ppm - -The crash happen because opt_jpeg_quality_id does not get -initialized at: -https://github.com/libjxl/libjxl/blob/v0.8.1/tools/djxl_main.cc#L107 - -This commit fixes the crash by adding a test on opt_jpeg_quality_id. - -Signed-off-by: Julien Olivain -[Retrieved from: -https://github.com/libjxl/libjxl/pull/2178/commits/504f35c8204248ae6f97278e8b7c6cc5853a1b94] ---- - tools/djxl_main.cc | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tools/djxl_main.cc b/tools/djxl_main.cc -index b755301fcb..42b889e7ce 100644 ---- a/tools/djxl_main.cc -+++ b/tools/djxl_main.cc -@@ -370,6 +370,7 @@ int main(int argc, const char* argv[]) { - args.color_space = force_colorspace; - } - if (codec == jxl::extras::Codec::kPNM && extension != ".pfm" && -+ args.opt_jpeg_quality_id != -1 && - !cmdline.GetOption(args.opt_jpeg_quality_id)->matched()) { - args.bits_per_sample = 0; - } 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 deleted file mode 100644 index b856b00728..0000000000 --- a/package/libjxl/0002-Add-missing-atomic-content-to-fix-gcc-compilation-fo.patch +++ /dev/null @@ -1,47 +0,0 @@ -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 - diff --git a/package/libjxl/libjxl.hash b/package/libjxl/libjxl.hash index c8f98d10ea..0766c24a53 100644 --- a/package/libjxl/libjxl.hash +++ b/package/libjxl/libjxl.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 c70916fb3ed43784eb840f82f05d390053a558e2da106e40863919238fa7b420 libjxl-0.8.2.tar.gz +sha256 d83bbe188d8fa9725bb75109c922c37fcff8c3b802808f3a6c2c14aaf8337d9f libjxl-0.9.0.tar.gz sha256 8405932022a556380c2d8c272eff154a923feb197233f348ce5f7334fb0a5ede LICENSE sha256 91915f8ae056a68a3c5bdf05d9f6f78bb6903e27a8ca3a8434c9e4ac87300575 PATENTS diff --git a/package/libjxl/libjxl.mk b/package/libjxl/libjxl.mk index 47c110eb53..d2c5e70c98 100644 --- a/package/libjxl/libjxl.mk +++ b/package/libjxl/libjxl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBJXL_VERSION = 0.8.2 +LIBJXL_VERSION = 0.9.0 LIBJXL_SITE = $(call github,libjxl,libjxl,v$(LIBJXL_VERSION)) LIBJXL_LICENSE = BSD-3-Clause LIBJXL_LICENSE_FILES = LICENSE PATENTS @@ -27,6 +27,7 @@ LIBJXL_CONF_OPTS = \ -DJPEGXL_ENABLE_DOXYGEN=OFF \ -DJPEGXL_ENABLE_EXAMPLES=OFF \ -DJPEGXL_ENABLE_JNI=OFF \ + -DJPEGXL_ENABLE_JPEGLI=OFF \ -DJPEGXL_ENABLE_MANPAGES=OFF \ -DJPEGXL_ENABLE_OPENEXR=OFF \ -DJPEGXL_ENABLE_SJPEG=OFF \ From 280d06236e25a01b7985e2e7951948533306a60e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 1 Jan 2024 23:45:52 +0100 Subject: [PATCH 4450/5754] package/python-validators: bump to version 0.22.0 - python-decorator is not a runtime dependency since https://github.com/python-validators/validators/commit/b6255c49088cbe6563eb93a7224c86eee04be06a - Replace https://github.com/kvesteri/validators by https://python-validators.github.io/validators - Update hash of LICENSE file (update in year with https://github.com/python-validators/validators/commit/2e0d0ec703eab5c9b0d303d8d318d5389dcef9fa) https://github.com/python-validators/validators/blob/0.22.0/CHANGES.md Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/python-validators/Config.in | 3 +-- package/python-validators/python-validators.hash | 6 +++--- package/python-validators/python-validators.mk | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/package/python-validators/Config.in b/package/python-validators/Config.in index 8a2ddb49fb..6eb6913ab6 100644 --- a/package/python-validators/Config.in +++ b/package/python-validators/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_VALIDATORS bool "python-validators" - select BR2_PACKAGE_PYTHON_DECORATOR # runtime help Python Data Validation for Humans. - https://github.com/kvesteri/validators + https://python-validators.github.io/validators diff --git a/package/python-validators/python-validators.hash b/package/python-validators/python-validators.hash index 4f4e1c21f8..3682850cb3 100644 --- a/package/python-validators/python-validators.hash +++ b/package/python-validators/python-validators.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/validators/json -md5 f03b5acb91079450bae664726ae01948 validators-0.20.0.tar.gz -sha256 24148ce4e64100a2d5e267233e23e7afeb55316b47d30faae7eb6e7292bc226a validators-0.20.0.tar.gz +md5 e7b36d935ebafe149629146cbfe5b0c8 validators-0.22.0.tar.gz +sha256 77b2689b172eeeb600d9605ab86194641670cdb73b60afd577142a9397873370 validators-0.22.0.tar.gz # Locally computed sha256 checksums -sha256 a7fd9d761c7ca1c6508b9baf030f6e21f5752d1caea3e49a270634aa9ef01e6f LICENSE +sha256 7c1bdc4712afecb46d402ec79da0ea2877811711e76dbaf1e425ee0b0e331b1f LICENSE diff --git a/package/python-validators/python-validators.mk b/package/python-validators/python-validators.mk index 731aca11f6..09ccbe6ab7 100644 --- a/package/python-validators/python-validators.mk +++ b/package/python-validators/python-validators.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_VALIDATORS_VERSION = 0.20.0 +PYTHON_VALIDATORS_VERSION = 0.22.0 PYTHON_VALIDATORS_SOURCE = validators-$(PYTHON_VALIDATORS_VERSION).tar.gz -PYTHON_VALIDATORS_SITE = https://files.pythonhosted.org/packages/95/14/ed0af6865d378cfc3c504aed0d278a890cbefb2f1934bf2dbe92ecf9d6b1 +PYTHON_VALIDATORS_SITE = https://files.pythonhosted.org/packages/9b/21/40a249498eee5a244a017582c06c0af01851179e2617928063a3d628bc8f PYTHON_VALIDATORS_SETUP_TYPE = setuptools PYTHON_VALIDATORS_LICENSE = MIT PYTHON_VALIDATORS_LICENSE_FILES = LICENSE From b8bacbfb9762e4c2dc58fd36d2bddc91f033e21e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 1 Jan 2024 23:56:21 +0100 Subject: [PATCH 4451/5754] package/python-werkzeug: security bump to version 2.3.8 Fix slow multipart parsing for large parts potentially enabling DoS attacks (CVE-2023-46136): https://github.com/pallets/werkzeug/security/advisories/GHSA-hrfv-mqp8-q5rw https://werkzeug.palletsprojects.com/en/2.3.x/changes/#version-2-3-8 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/python-werkzeug/python-werkzeug.hash | 4 ++-- package/python-werkzeug/python-werkzeug.mk | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-werkzeug/python-werkzeug.hash b/package/python-werkzeug/python-werkzeug.hash index 07b6f2f40d..34adc67088 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 de26f240d6f95689a8d15170c2d958b6 Werkzeug-2.3.6.tar.gz -sha256 98c774df2f91b05550078891dee5f0eb0cb797a522c757a2452b9cee5b202330 Werkzeug-2.2.3.tar.gz +md5 3bb49cd2f2b51a1c638532e9a935e207 werkzeug-2.3.8.tar.gz +sha256 554b257c74bbeb7a0d254160a4f8ffe185243f52a52035060b761ca62d977f03 werkzeug-2.3.8.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 3b7c663437..e8ef32bb1b 100644 --- a/package/python-werkzeug/python-werkzeug.mk +++ b/package/python-werkzeug/python-werkzeug.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_WERKZEUG_VERSION = 2.3.6 -PYTHON_WERKZEUG_SOURCE = Werkzeug-$(PYTHON_WERKZEUG_VERSION).tar.gz -PYTHON_WERKZEUG_SITE = https://files.pythonhosted.org/packages/d1/7e/c35cea5749237d40effc50ed1a1c7518d9f2e768fcf30b4e9ea119e74975 +PYTHON_WERKZEUG_VERSION = 2.3.8 +PYTHON_WERKZEUG_SOURCE = werkzeug-$(PYTHON_WERKZEUG_VERSION).tar.gz +PYTHON_WERKZEUG_SITE = https://files.pythonhosted.org/packages/3d/4b/d746f1000782c89d6c97df9df43ba8f4d126038608843d3560ae88d201b5 PYTHON_WERKZEUG_SETUP_TYPE = setuptools PYTHON_WERKZEUG_LICENSE = BSD-3-Clause PYTHON_WERKZEUG_LICENSE_FILES = LICENSE.rst From 3e91de6428bf3dde303ed41b55b4cfe739b353f9 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 2 Jan 2024 20:41:55 +0100 Subject: [PATCH 4452/5754] Revert "package/docker: enable selinux module" This reverts commit 245b13a0778ec6ad061555b0b994e7649ef01006 as docker selinux module is for docker-engine, not for "a system tray dock for X" Moreover, it raises the following build failure: Compiling targeted policy.33 env LD_LIBRARY_PATH="/home/buildroot/autobuild/instance-0/output-1/per-package/refpolicy/host/lib:/home/buildroot/autobuild/instance-0/output-1/per-package/refpolicy/host/usr/lib" /home/buildroot/autobuild/instance-0/output-1/per-package/refpolicy/host/usr/bin/checkpolicy -c 33 -U deny -S -O -E policy.conf -o policy.33 policy.conf:1912:ERROR 'attribute container_engine_domain is not declared' at token ';' on line 1912: type dockerd_t, container_engine_domain; type dockerd_exec_t; Fixes: - http://autobuild.buildroot.org/results/87d78b6f15875f0fa3e6fc85e352db14ab0383bb Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/docker/docker.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/docker/docker.mk b/package/docker/docker.mk index 39f7ee4580..4a8c6fcd8d 100644 --- a/package/docker/docker.mk +++ b/package/docker/docker.mk @@ -7,7 +7,7 @@ DOCKER_VERSION = 1.5 DOCKER_SITE = http://icculus.org/openbox/2/docker DOCKER_DEPENDENCIES = host-pkgconf libglib2 xlib_libX11 -DOCKER_SELINUX_MODULES = docker + DOCKER_LICENSE = GPL-2.0+ # The 'or later' is specified at the end of the README, so include that one too. DOCKER_LICENSE_FILES = COPYING README From 2c81cee61a5d6d477b1081cab7dfba7157c18155 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 2 Jan 2024 14:46:52 +0100 Subject: [PATCH 4453/5754] package/hawktracer: bump to version 0.11.0 https://github.com/amzn/hawktracer/releases/tag/v0.11.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/hawktracer/hawktracer.hash | 2 +- package/hawktracer/hawktracer.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/hawktracer/hawktracer.hash b/package/hawktracer/hawktracer.hash index 29d00e29ec..585b612c49 100644 --- a/package/hawktracer/hawktracer.hash +++ b/package/hawktracer/hawktracer.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 099f76d5be18ad5d714fded0c6f889f588986cdde2b31f2c0058413698a5f35c hawktracer-3c22b3908912e2ec727fd2ddc5dbfe7464e6b4a5.tar.gz +sha256 12a689a1cfb2ae25ad777b1b2275dbba5cd64905627b0a20d17d6e26de003cef hawktracer-0.11.0.tar.gz sha256 2f377333e64ad08ad3afec8ed6c2c96ced2a6d7d67443eb2784a931bb7b3fd59 LICENSE diff --git a/package/hawktracer/hawktracer.mk b/package/hawktracer/hawktracer.mk index 462d073755..8e722080f5 100644 --- a/package/hawktracer/hawktracer.mk +++ b/package/hawktracer/hawktracer.mk @@ -4,8 +4,8 @@ # ################################################################################ -HAWKTRACER_VERSION = 3c22b3908912e2ec727fd2ddc5dbfe7464e6b4a5 -HAWKTRACER_SITE = $(call github,amzn,hawktracer,$(HAWKTRACER_VERSION)) +HAWKTRACER_VERSION = 0.11.0 +HAWKTRACER_SITE = $(call github,amzn,hawktracer,v$(HAWKTRACER_VERSION)) HAWKTRACER_LICENSE = MIT HAWKTRACER_LICENSE_FILES = LICENSE HAWKTRACER_INSTALL_STAGING = YES From 01ad11343172ea698e4dcc1c64cb02ce26671e49 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 2 Jan 2024 14:57:41 +0100 Subject: [PATCH 4454/5754] package/glm: bump to version 0.9.9.8 License is in a separate file since https://github.com/g-truc/glm/commit/347f422b9fda328a4eecfdc0e5bf5b19bc5c37e4 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/glm/glm.hash | 4 ++-- package/glm/glm.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/glm/glm.hash b/package/glm/glm.hash index b0c1d92c74..c4e2101604 100644 --- a/package/glm/glm.hash +++ b/package/glm/glm.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 5e33b6131cea6a904339734b015110d4342b7dc02d995164fdb86332d28a5aa4 glm-0.9.9.5.tar.gz -sha256 337130631a714eeae017556cad101d5324c2961214120b6214741d3d43667086 manual.md +sha256 7d508ab72cb5d43227a3711420f06ff99b0a0cb63ee2f93631b162bfe1fe9592 glm-0.9.9.8.tar.gz +sha256 62d2d642c7d054d4fb4c9b42faad617d6c88fcd91e317f8035aa9f277cc159c3 copying.txt diff --git a/package/glm/glm.mk b/package/glm/glm.mk index 3ef106a943..ef549931f6 100644 --- a/package/glm/glm.mk +++ b/package/glm/glm.mk @@ -4,10 +4,10 @@ # ################################################################################ -GLM_VERSION = 0.9.9.5 +GLM_VERSION = 0.9.9.8 GLM_SITE = $(call github,g-truc,glm,$(GLM_VERSION)) GLM_LICENSE = MIT -GLM_LICENSE_FILES = manual.md +GLM_LICENSE_FILES = copying.txt # GLM is a header-only library, it only makes sense # to have it installed into the staging directory. From 92040c4bf762d4a5e836cb04bc457839fb57f7f9 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 2 Jan 2024 15:05:26 +0100 Subject: [PATCH 4455/5754] package/gli: bump to latest commit - Drop patch (already in version) - Update hash of manual.md (update in year: https://github.com/g-truc/gli/commit/53106f0b8a3adc4fc6417024c1c90de69753361f) Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - .../gli/0001-Optional-building-tests.patch | 45 ------------------- package/gli/gli.hash | 4 +- package/gli/gli.mk | 2 +- 4 files changed, 3 insertions(+), 49 deletions(-) delete mode 100644 package/gli/0001-Optional-building-tests.patch diff --git a/.checkpackageignore b/.checkpackageignore index aa8a6abc4f..8337c80c11 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -491,7 +491,6 @@ package/gerbera/S99gerbera Indent 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/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 diff --git a/package/gli/0001-Optional-building-tests.patch b/package/gli/0001-Optional-building-tests.patch deleted file mode 100644 index c085e5060b..0000000000 --- a/package/gli/0001-Optional-building-tests.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 629fc81ce73114a5925484937df796467adbe8c7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jo=C3=A3o=20Pereira?= -Date: Fri, 22 Mar 2019 22:58:17 +0000 -Subject: [PATCH] Optional building tests - -[Retrieved from: -https://github.com/g-truc/gli/commit/629fc81ce73114a5925484937df796467adbe8c7] -Signed-off-by: Fabrice Fontaine ---- - CMakeLists.txt | 1 + - test/CMakeLists.txt | 8 +++++--- - 2 files changed, 6 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6eb1a68b..bcff7ef0 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -13,6 +13,7 @@ include(GNUInstallDirs) - include(CMakePackageConfigHelpers) - - enable_testing() -+option(GLI_TEST_ENABLE "Build unit tests" ON) - - add_definitions(-D_CRT_SECURE_NO_WARNINGS) - add_definitions(-DSOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}") -diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt -index 6b1d4826..e51a3181 100644 ---- a/test/CMakeLists.txt -+++ b/test/CMakeLists.txt -@@ -19,10 +19,12 @@ function(glmCreateTestGTC NAME) - set(SAMPLE_NAME test-${NAME}) - add_executable(${SAMPLE_NAME} ${NAME}.cpp) - target_link_libraries(${SAMPLE_NAME} gli) -- add_test( -+ add_test( - NAME ${SAMPLE_NAME} - COMMAND $ ) - endfunction() - --add_subdirectory(bug) --add_subdirectory(core) -+if(GLI_TEST_ENABLE) -+ add_subdirectory(bug) -+ add_subdirectory(core) -+endif() diff --git a/package/gli/gli.hash b/package/gli/gli.hash index deef901af9..b6f9317f94 100644 --- a/package/gli/gli.hash +++ b/package/gli/gli.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9374f3cf6441dac0154f7e5ae9ad9ae99f4c4a36f8eb6de23f54a1996b9f2769 gli-559cbe1ec38878e182507d331e0780fbae5baf15.tar.gz -sha256 e26459f62353e631d18379668c82b85f9fd2fd993f2818277e4fce21e957f87a manual.md +sha256 2f4f67ac4d1673216f03ff37e406bb403689b39a2df3d2efad501448705bbb3f gli-779b99ac6656e4d30c3b24e96e0136a59649a869.tar.gz +sha256 474c5f04064507cf5ac991fc3d4b990e5e34b15705d38d2062f8844c102113cf manual.md diff --git a/package/gli/gli.mk b/package/gli/gli.mk index 9b9990910a..a789209452 100644 --- a/package/gli/gli.mk +++ b/package/gli/gli.mk @@ -4,7 +4,7 @@ # ################################################################################ -GLI_VERSION = 559cbe1ec38878e182507d331e0780fbae5baf15 +GLI_VERSION = 779b99ac6656e4d30c3b24e96e0136a59649a869 GLI_SITE = $(call github,g-truc,gli,$(GLI_VERSION)) GLI_LICENSE = MIT GLI_LICENSE_FILES = manual.md From a5cacb63082b9e58194c4b9f8b2af2c3e38ff15c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 2 Jan 2024 17:32:48 +0100 Subject: [PATCH 4456/5754] package/libopenssl: fix s390x build Use linux64-s390x configure target to fix the following s390x build failure raised since bump to version 3.2.0 in commit 973b1eba5a4ee72f040bd471b147267e36be73ad and https://github.com/openssl/openssl/commit/79040cf29e011c21789563d74da626b7465a0540: /home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/s390x-buildroot-linux-gnu/13.2.0/../../../../s390x-buildroot-linux-gnu/bin/ld: libcrypto.a(libcrypto-lib-dh_key.o): in function `dh_bn_mod_exp': dh_key.c:(.text+0x3c8): undefined reference to `s390x_mod_exp' /home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/s390x-buildroot-linux-gnu/13.2.0/../../../../s390x-buildroot-linux-gnu/bin/ld: libcrypto.a(libcrypto-lib-rsa_ossl.o): in function `rsa_ossl_s390x_mod_exp': rsa_ossl.c:(.text+0xd2c): undefined reference to `s390x_crt' Fixes: - http://autobuild.buildroot.org/results/77c5e13127de67a69782f138aa28c8b0ad951941 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libopenssl/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libopenssl/Config.in b/package/libopenssl/Config.in index 49958d9fd6..0c8db52e2e 100644 --- a/package/libopenssl/Config.in +++ b/package/libopenssl/Config.in @@ -25,6 +25,7 @@ config BR2_PACKAGE_LIBOPENSSL_TARGET_ARCH default "linux-x86_64" if BR2_x86_64 default "linux64-riscv64" if BR2_riscv && BR2_ARCH_IS_64 default "linux32-riscv32" if BR2_riscv && !BR2_ARCH_IS_64 + default "linux64-s390x" if BR2_s390x # no-asm is needed with generic architectures such as # linux-generic{32,64}, see # https://github.com/openssl/openssl/issues/9839 From 98684ba7885b9a62ba05af9093aa0f1010d1ee02 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 2 Jan 2024 18:08:01 +0100 Subject: [PATCH 4457/5754] package/libopenssl: fix build without MMU Commit 973b1eba5a4ee72f040bd471b147267e36be73ad removed third patch because of https://github.com/openssl/openssl/commit/78634e8ac253a8edf338d329965724dfa8e033ab however OPENSSL_NO_MADVISE wasn't updated to reflect the new HAVE_MADVISE logic resulting in the following build failure without MMU: /home/buildroot/autobuild/instance-2/output-1/host/riscv64-buildroot-linux-uclibc/bin/ld.real: libcrypto.a(libcrypto-lib-mem_sec.o): in function `sh_init': /home/buildroot/autobuild/instance-2/output-1/build/libopenssl-3.2.0/crypto/mem_sec.c:557: undefined reference to `madvise' Fixes: - http://autobuild.buildroot.org/results/4328c025f6f2bcd2ebc5a4368c78e00da0aea1ae Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libopenssl/libopenssl.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index 928f3379f8..7dc6d93256 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -26,7 +26,7 @@ LIBOPENSSL_CFLAGS += -DOPENSSL_SMALL_FOOTPRINT endif ifeq ($(BR2_USE_MMU),) -LIBOPENSSL_CFLAGS += -DHAVE_FORK=0 -DOPENSSL_NO_MADVISE +LIBOPENSSL_CFLAGS += -DHAVE_FORK=0 -DHAVE_MADVISE=0 endif ifeq ($(BR2_PACKAGE_CRYPTODEV_LINUX),y) From b25176ee9a373d00ab18e46d3e39f6a56dfbbfcf Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 2 Jan 2024 18:17:59 +0100 Subject: [PATCH 4458/5754] package/python-contourpy: needs C++ C++ is mandatory resulting in the following build failure since the addition of the package in commit 1e7f0794bbb0075285dc3b4dab8484f12adbb886: ../output-1/build/python-contourpy-1.1.0/meson.build:1:0: ERROR: Unable to detect GNU compiler type: Fixes: - http://autobuild.buildroot.org/results/6b50f9621b00aab384cc2dde77fae7daff46d08b Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/python-contourpy/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/python-contourpy/Config.in b/package/python-contourpy/Config.in index 4843884a97..313d270dda 100644 --- a/package/python-contourpy/Config.in +++ b/package/python-contourpy/Config.in @@ -1,8 +1,12 @@ config BR2_PACKAGE_PYTHON_CONTOURPY bool "python-contourpy" + depends on BR2_INSTALL_LIBSTDCPP select BR2_PACKAGE_PYTHON_PYBIND help Python library for calculating contours of 2D quadrilateral grids. https://github.com/contourpy/contourpy + +comment "python-contourpy needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP From 17fb3f966d400943466440704500fd401080f443 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 2 Jan 2024 18:37:50 +0100 Subject: [PATCH 4459/5754] package/pax-utils: bump to version 1.3.7 - Switch site to get latest release - autotools has been replaced by meson since https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=063fcaeaa05074a9d90acec2f68b25dfb8ecd279 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/pax-utils/pax-utils.hash | 2 +- package/pax-utils/pax-utils.mk | 23 +++++++++++++---------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/package/pax-utils/pax-utils.hash b/package/pax-utils/pax-utils.hash index 0ef8fad643..464dd14a5b 100644 --- a/package/pax-utils/pax-utils.hash +++ b/package/pax-utils/pax-utils.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9742d2a31d53a4e0f6df0d3721ab6f7cf8b0404c95fee3b00e678c1ff6db7f21 pax-utils-1.2.6.tar.xz +sha256 907fdcfc6c6c2913a8e42847f8096027b0a953b9344208d14daf2324fd711638 pax-utils-1.3.7.tar.bz2 sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING diff --git a/package/pax-utils/pax-utils.mk b/package/pax-utils/pax-utils.mk index 704e50e738..5dd1842df3 100644 --- a/package/pax-utils/pax-utils.mk +++ b/package/pax-utils/pax-utils.mk @@ -4,28 +4,31 @@ # ################################################################################ -PAX_UTILS_VERSION = 1.2.6 -PAX_UTILS_SITE = http://distfiles.gentoo.org/distfiles -PAX_UTILS_SOURCE = pax-utils-$(PAX_UTILS_VERSION).tar.xz +PAX_UTILS_VERSION = 1.3.7 +PAX_UTILS_SITE = https://gitweb.gentoo.org/proj/pax-utils.git/snapshot +PAX_UTILS_SOURCE = pax-utils-$(PAX_UTILS_VERSION).tar.bz2 PAX_UTILS_LICENSE = GPL-2.0 PAX_UTILS_LICENSE_FILES = COPYING PAX_UTILS_CPE_ID_VENDOR = gentoo PAX_UTILS_DEPENDENCIES = host-pkgconf -PAX_UTILS_CONF_OPTS = --without-python +PAX_UTILS_CONF_OPTS = \ + -Dbuild_manpages=disabled \ + -Dlddtree_implementation=sh \ + -Dtests=false ifeq ($(BR2_PACKAGE_LIBCAP),y) PAX_UTILS_DEPENDENCIES += libcap -PAX_UTILS_CONF_OPTS += --with-caps +PAX_UTILS_CONF_OPTS += -Duse_libcap=enabled else -PAX_UTILS_CONF_OPTS += --without-caps +PAX_UTILS_CONF_OPTS += -Duse_libcap=disabled endif ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) PAX_UTILS_DEPENDENCIES += libseccomp -PAX_UTILS_CONF_OPTS += --with-seccomp +PAX_UTILS_CONF_OPTS += -Duse_seccomp=true else -PAX_UTILS_CONF_OPTS += --without-seccomp +PAX_UTILS_CONF_OPTS += -Duse_seccomp=false endif # lddtree and symtree need bash @@ -36,5 +39,5 @@ endef endif PAX_UTILS_POST_INSTALL_TARGET_HOOKS += PAX_UTILS_REMOVE_BASH_TOOLS -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) +$(eval $(meson-package)) +$(eval $(host-meson-package)) From 8cd52a4d8127f31d8e8900c14e90f4bb9634ba11 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 2 Jan 2024 18:46:35 +0100 Subject: [PATCH 4460/5754] package/p11-kit: bump to version 0.25.3 https://github.com/p11-glue/p11-kit/blob/0.25.3/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/p11-kit/p11-kit.hash | 2 +- package/p11-kit/p11-kit.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/p11-kit/p11-kit.hash b/package/p11-kit/p11-kit.hash index e950060c91..81d209b2c2 100644 --- a/package/p11-kit/p11-kit.hash +++ b/package/p11-kit/p11-kit.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 d8be783efd5cd4ae534cee4132338e3f40f182c3205d23b200094ec85faaaef8 p11-kit-0.24.1.tar.xz +sha256 d8ddce1bb7e898986f9d250ccae7c09ce14d82f1009046d202a0eb1b428b2adc p11-kit-0.25.3.tar.xz # Locally computed sha256 2e1ba993904df807a10c3eda1e5c272338edc35674b679773a8b3ad460731054 COPYING diff --git a/package/p11-kit/p11-kit.mk b/package/p11-kit/p11-kit.mk index 868e3a7c9b..8547ee33c2 100644 --- a/package/p11-kit/p11-kit.mk +++ b/package/p11-kit/p11-kit.mk @@ -4,7 +4,7 @@ # ################################################################################ -P11_KIT_VERSION = 0.24.1 +P11_KIT_VERSION = 0.25.3 P11_KIT_SOURCE = p11-kit-$(P11_KIT_VERSION).tar.xz P11_KIT_SITE = https://github.com/p11-glue/p11-kit/releases/download/$(P11_KIT_VERSION) P11_KIT_INSTALL_STAGING = YES From 39a2e7b219ec87e380004ec3f3795652872b9553 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 2 Jan 2024 18:50:17 +0100 Subject: [PATCH 4461/5754] package/orc: bump to version 0.4.34 https://gitlab.freedesktop.org/gstreamer/orc/-/blob/0.4.34/RELEASE Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/orc/orc.hash | 4 ++-- package/orc/orc.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/orc/orc.hash b/package/orc/orc.hash index 136fc3ece4..1e584c1190 100644 --- a/package/orc/orc.hash +++ b/package/orc/orc.hash @@ -1,5 +1,5 @@ -# From https://gstreamer.freedesktop.org/data/src/orc/orc-0.4.33.tar.xz.sha256sum -sha256 844e6d7db8086f793f57618d3d4b68d29d99b16034e71430df3c21cfd3c3542a orc-0.4.33.tar.xz +# From https://gstreamer.freedesktop.org/data/src/orc/orc-0.4.34.tar.xz.sha256sum +sha256 8f47abb3f097171e44eb807adcdabd860fba2effd37d8d3c4fbd5f341cadd41f orc-0.4.34.tar.xz # Locally calculated sha256 4f5dabb1b44bb6fc5cd53820b1f103147ad61b395a57903991325bd1b85d97bf COPYING diff --git a/package/orc/orc.mk b/package/orc/orc.mk index be718e6f85..b2d2bb461b 100644 --- a/package/orc/orc.mk +++ b/package/orc/orc.mk @@ -4,7 +4,7 @@ # ################################################################################ -ORC_VERSION = 0.4.33 +ORC_VERSION = 0.4.34 ORC_SOURCE = orc-$(ORC_VERSION).tar.xz ORC_SITE = http://gstreamer.freedesktop.org/data/src/orc ORC_LICENSE = BSD-2-Clause, BSD-3-Clause From fa3a97c8041ab157e912e50e5eaad1a7e4a10465 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 2 Jan 2024 19:02:20 +0100 Subject: [PATCH 4462/5754] package/matio: bump to version 1.5.26 - Use xz tarball - Use https as http is translated to https due to HSTS - Update hash of COPYING (update in year: https://github.com/tbeu/matio/commit/47a7a3340ed3bbedd3c456f8254f9c5441a11127) https://github.com/tbeu/matio/blob/v1.5.26/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/matio/matio.hash | 6 +++--- package/matio/matio.mk | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/package/matio/matio.hash b/package/matio/matio.hash index 94e0e48f69..976e9f03e8 100644 --- a/package/matio/matio.hash +++ b/package/matio/matio.hash @@ -1,4 +1,4 @@ -# From https://sourceforge.net/projects/matio/files/matio/1.5.23/ -sha512 e125278dcb25695affb7c576d0e2a86c0eff4225aa866b81536c9e4d7b2aea2c554f5389e96d534a8b559f5554b6cbecff4b44fe8915173cd64b2da6d1dc2629 matio-1.5.23.tar.gz +# From https://sourceforge.net/projects/matio/files/matio/1.5.26/ +sha512 725f5287a1bb9367828ede5071da82892327fb8edd51f5a21d1370614d9ea81034c3bb4d16c87e80dc9e800086800ce14e3c4ad636255ea45b7741453e6cbb4c matio-1.5.26.tar.xz # Locally computed -sha256 3ed9a50d754fcc92d4accb8448e397eafeab686796b2a7445557ce782806e239 COPYING +sha256 b3da766592f242fd5cdd4dfd15ac5e6119e88fd6844c3c0e7acb8ad3178280a3 COPYING diff --git a/package/matio/matio.mk b/package/matio/matio.mk index 2ba9c8f568..d8268a109f 100644 --- a/package/matio/matio.mk +++ b/package/matio/matio.mk @@ -4,8 +4,10 @@ # ################################################################################ -MATIO_VERSION = 1.5.23 -MATIO_SITE = http://downloads.sourceforge.net/project/matio/matio/$(MATIO_VERSION) +MATIO_VERSION = 1.5.26 +MATIO_SOURCE = matio-$(MATIO_VERSION).tar.xz +MATIO_SITE = \ + https://downloads.sourceforge.net/project/matio/matio/$(MATIO_VERSION) MATIO_LICENSE = BSD-2-Clause MATIO_LICENSE_FILES = COPYING MATIO_CPE_ID_VENDOR = matio_project From 0aa56a81641862a3613d679bc662bc62cfc6b1e4 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 2 Jan 2024 20:49:21 +0100 Subject: [PATCH 4463/5754] package/perl: fix static build Fix the following static build failure raised since bump to version 5.38.2 in commit 41e2828c4163c7480dd31d6c8c3955c123a0f2e7: /home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/arc-buildroot-linux-uclibc/10.2.0/../../../../arc-buildroot-linux-uclibc/bin/ld: lib/auto/re/re.a(re_comp.o): in function `Perl_reg_add_data': re_comp.c:(.text+0x9a24): multiple definition of `Perl_reg_add_data'; libperl.a(regcomp.o):regcomp.c:(.text+0x4f7c): first defined here Fixes: - http://autobuild.buildroot.org/results/c61b60430d36c5c63bd3cf0257f2193a40fb0b60 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...ixup-regex-engine-build-under-Uusedl.patch | 554 ++++++++++++++++++ 1 file changed, 554 insertions(+) create mode 100644 package/perl/0001-regcomp-c-regexec-c-fixup-regex-engine-build-under-Uusedl.patch diff --git a/package/perl/0001-regcomp-c-regexec-c-fixup-regex-engine-build-under-Uusedl.patch b/package/perl/0001-regcomp-c-regexec-c-fixup-regex-engine-build-under-Uusedl.patch new file mode 100644 index 0000000000..f0837c2d33 --- /dev/null +++ b/package/perl/0001-regcomp-c-regexec-c-fixup-regex-engine-build-under-Uusedl.patch @@ -0,0 +1,554 @@ +From ba6e2c38aafc23cf114f3ba0d0ff3baead34328b Mon Sep 17 00:00:00 2001 +From: Yves Orton +Date: Tue, 1 Aug 2023 23:12:46 +0200 +Subject: [PATCH] regcomp*.c, regexec.c - fixup regex engine build under + -Uusedl + +The regex engine is built a bit different from most of the perl +codebase. It is compiled as part of the main libperl.so and it is +also compiled (with DEBUGGING enabled) as part of the re extension. +When perl itself is compiled with DEBUGGING enabled then the code +in the re.so extension and the code in libperl.so is the same. + +This all works fine and dandy until you have a static build where the +re.so is linked into libperl.so, which results in duplicate symbols +being defined. These symbols come in two flaviours: "auxiliary" and +"debugging" related symbols. + +We have basically three cases: + +1. USE_DYNAMIC_LOADING is defined. In this case we are doing a dynamic + build and re.so will be separate from libperl.so, so it even if this + is a DEBUGGING enabled build debug and auxiliary functions can be + compiled into *both* re.so and libperl.so. This is basically the + "standard build". + +2. USE_DYNAMIC_LOADING is not defined, and DEBUGGING is not defined + either. In this case auxiliary functions should only be compiled in + libperl.so, and the debug functions should only be compiled into + re.so + +3. USE_DYNAMIC_LOADING is not defined, and DEBUGGING *is* defined. In + this case auxiliary functions AND debug functions should only be + compiled into libperl.so + +It is possible to detect the different build options by looking at the +defines 'USE_DYNAMIC_LOADING', 'PERL_EXT_RE_DEBUG' and +'DEBUGGING_RE_ONLY'. 'USE_DYNAMIC_LOADING' is NOT defined when we are +building a static perl. 'PERL_EXT_RE_DEBUG' is defined only when we are +building re.so, and 'DEBUGGING_RE_ONLY' is defined only when we are +building re.so in a perl that is not itself already a DEBUGGING enabled +perl. The file ext/re/re_top.h responsible for setting up +DEBUGGING_RE_ONLY. + +This patch uses 'PERL_EXT_RE_DEBUG', 'DEBUGGING_RE_ONLY' and +'USE_DYNAMIC_LOADING' to define in regcomp.h two further define flags +'PERL_RE_BUILD_DEBUG' and 'PERL_RE_BUILD_AUX'. + +The 'PERL_RE_BUILD_DEBUG' flag determines if the debugging functions +should be compiled into libperl.so or re.so or both. The +'PERL_RE_BUILD_AUX' flag determines if the auxiliary functions should be +compiled into just libperl.so or into it and re.so. We then use these +flags to guard the different types of functions so that we can build in +all three modes without duplicate symbols. + +Upstream: https://github.com/Perl/perl5/commit/ba6e2c38aafc23cf114f3ba0d0ff3baead34328b +Signed-off-by: Fabrice Fontaine +--- + regcomp.c | 13 +- + regcomp.h | 14 ++- + regcomp_debug.c | 308 +++++++++++++++++++++++----------------------- + regcomp_invlist.c | 3 +- + regexec.c | 3 +- + 5 files changed, 181 insertions(+), 160 deletions(-) + +diff --git a/regcomp.c b/regcomp.c +index d3c135fbfad1..6e35d95d2ac6 100644 +--- a/regcomp.c ++++ b/regcomp.c +@@ -290,6 +290,7 @@ S_edit_distance(const UV* src, + /* END of edit_distance() stuff + * ========================================================= */ + ++#ifdef PERL_RE_BUILD_AUX + /* add a data member to the struct reg_data attached to this regex, it should + * always return a non-zero return. the 's' argument is the type of the items + * being added and the n is the number of items. The length of 's' should match +@@ -340,6 +341,7 @@ Perl_reg_add_data(RExC_state_t* const pRExC_state, const char* const s, const U3 + assert(count>0); + return count; + } ++#endif /* PERL_RE_BUILD_AUX */ + + /*XXX: todo make this not included in a non debugging perl, but appears to be + * used anyway there, in 'use re' */ +@@ -7443,6 +7445,7 @@ S_regatom(pTHX_ RExC_state_t *pRExC_state, I32 *flagp, U32 depth) + } + + ++#ifdef PERL_RE_BUILD_AUX + void + Perl_populate_anyof_bitmap_from_invlist(pTHX_ regnode *node, SV** invlist_ptr) + { +@@ -7502,6 +7505,7 @@ Perl_populate_anyof_bitmap_from_invlist(pTHX_ regnode *node, SV** invlist_ptr) + } + } + } ++#endif /* PERL_RE_BUILD_AUX */ + + /* Parse POSIX character classes: [[:foo:]], [[=foo=]], [[.foo.]]. + Character classes ([:foo:]) can also be negated ([:^foo:]). +@@ -9095,6 +9099,7 @@ S_dump_regex_sets_structures(pTHX_ RExC_state_t *pRExC_state, + #undef IS_OPERATOR + #undef IS_OPERAND + ++#ifdef PERL_RE_BUILD_AUX + void + Perl_add_above_Latin1_folds(pTHX_ RExC_state_t *pRExC_state, const U8 cp, SV** invlist) + { +@@ -9182,6 +9187,8 @@ Perl_add_above_Latin1_folds(pTHX_ RExC_state_t *pRExC_state, const U8 cp, SV** i + } + } + } ++#endif /* PERL_RE_BUILD_AUX */ ++ + + STATIC void + S_output_posix_warnings(pTHX_ RExC_state_t *pRExC_state, AV* posix_warnings) +@@ -12105,6 +12112,7 @@ S_optimize_regclass(pTHX_ + + #undef HAS_NONLOCALE_RUNTIME_PROPERTY_DEFINITION + ++#ifdef PERL_RE_BUILD_AUX + void + Perl_set_ANYOF_arg(pTHX_ RExC_state_t* const pRExC_state, + regnode* const node, +@@ -12261,6 +12269,7 @@ Perl_set_ANYOF_arg(pTHX_ RExC_state_t* const pRExC_state, + RExC_rxi->data->data[n] = (void*)rv; + ARG1u_SET(node, n); + } ++#endif /* PERL_RE_BUILD_AUX */ + + SV * + +@@ -12999,6 +13008,8 @@ S_regtail_study(pTHX_ RExC_state_t *pRExC_state, regnode_offset p, + } + #endif + ++ ++#ifdef PERL_RE_BUILD_AUX + SV* + Perl_get_ANYOFM_contents(pTHX_ const regnode * n) { + +@@ -13047,7 +13058,7 @@ Perl_get_ANYOFHbbm_contents(pTHX_ const regnode * n) { + UTF_CONTINUATION_MARK | 0)); + return cp_list; + } +- ++#endif /* PERL_RE_BUILD_AUX */ + + + SV * +diff --git a/regcomp.h b/regcomp.h +index 31c91e6a68e8..017a9f843514 100644 +--- a/regcomp.h ++++ b/regcomp.h +@@ -1554,7 +1554,19 @@ typedef enum { + #define EVAL_OPTIMISTIC_FLAG 128 + #define EVAL_FLAGS_MASK (EVAL_OPTIMISTIC_FLAG-1) + +- ++/* We define PERL_RE_BUILD_DEBUG if we are NOT compiling the re extension and ++ * we are under DEBUGGING, or if we are ARE compiling the re extension ++ * and this is not a DEBUGGING enabled build (identified by ++ * DEBUGGING_RE_ONLY being defined) ++ */ ++#if ( defined(USE_DYNAMIC_LOADING) && defined(DEBUGGING)) || \ ++ ( defined(PERL_EXT_RE_BUILD) && defined(DEBUGGING_RE_ONLY)) || \ ++ (!defined(PERL_EXT_RE_BUILD) && defined(DEBUGGING)) ++#define PERL_RE_BUILD_DEBUG ++#endif ++#if ( defined(USE_DYNAMIC_LOADING) || !defined(PERL_EXT_RE_BUILD) ) ++#define PERL_RE_BUILD_AUX ++#endif + + #endif /* PERL_REGCOMP_H_ */ + +diff --git a/regcomp_debug.c b/regcomp_debug.c +index 93db7a89cf48..96598c49c0bc 100644 +--- a/regcomp_debug.c ++++ b/regcomp_debug.c +@@ -18,8 +18,7 @@ + #include "unicode_constants.h" + #include "regcomp_internal.h" + +-#ifdef DEBUGGING +- ++#ifdef PERL_RE_BUILD_DEBUG + int + Perl_re_printf(pTHX_ const char *fmt, ...) + { +@@ -159,13 +158,160 @@ Perl_debug_peep(pTHX_ const char *str, const RExC_state_t *pRExC_state, + }); + } + +-#endif /* DEBUGGING */ ++const regnode * ++Perl_dumpuntil(pTHX_ const regexp *r, const regnode *start, const regnode *node, ++ const regnode *last, const regnode *plast, ++ SV* sv, I32 indent, U32 depth) ++{ ++ const regnode *next; ++ const regnode *optstart= NULL; ++ ++ RXi_GET_DECL(r, ri); ++ DECLARE_AND_GET_RE_DEBUG_FLAGS; ++ ++ PERL_ARGS_ASSERT_DUMPUNTIL; ++ ++#ifdef DEBUG_DUMPUNTIL ++ Perl_re_printf( aTHX_ "--- %d : %d - %d - %d\n", indent, node-start, ++ last ? last-start : 0, plast ? plast-start : 0); ++#endif ++ ++ if (plast && plast < last) ++ last= plast; ++ ++ while (node && (!last || node < last)) { ++ const U8 op = OP(node); ++ ++ if (op == CLOSE || op == SRCLOSE || op == WHILEM) ++ indent--; ++ next = regnext((regnode *)node); ++ const regnode *after = regnode_after((regnode *)node,0); ++ ++ /* Where, what. */ ++ if (op == OPTIMIZED) { ++ if (!optstart && RE_DEBUG_FLAG(RE_DEBUG_COMPILE_OPTIMISE)) ++ optstart = node; ++ else ++ goto after_print; ++ } else ++ CLEAR_OPTSTART; ++ ++ regprop(r, sv, node, NULL, NULL); ++ Perl_re_printf( aTHX_ "%4" IVdf ":%*s%s", (IV)(node - start), ++ (int)(2*indent + 1), "", SvPVX_const(sv)); ++ ++ if (op != OPTIMIZED) { ++ if (next == NULL) /* Next ptr. */ ++ Perl_re_printf( aTHX_ " (0)"); ++ else if (REGNODE_TYPE(op) == BRANCH ++ && REGNODE_TYPE(OP(next)) != BRANCH ) ++ Perl_re_printf( aTHX_ " (FAIL)"); ++ else ++ Perl_re_printf( aTHX_ " (%" IVdf ")", (IV)(next - start)); ++ Perl_re_printf( aTHX_ "\n"); ++ } ++ ++ after_print: ++ if (REGNODE_TYPE(op) == BRANCHJ) { ++ assert(next); ++ const regnode *nnode = (OP(next) == LONGJMP ++ ? regnext((regnode *)next) ++ : next); ++ if (last && nnode > last) ++ nnode = last; ++ DUMPUNTIL(after, nnode); ++ } ++ else if (REGNODE_TYPE(op) == BRANCH) { ++ assert(next); ++ DUMPUNTIL(after, next); ++ } ++ else if ( REGNODE_TYPE(op) == TRIE ) { ++ const regnode *this_trie = node; ++ const U32 n = ARG1u(node); ++ const reg_ac_data * const ac = op>=AHOCORASICK ? ++ (reg_ac_data *)ri->data->data[n] : ++ NULL; ++ const reg_trie_data * const trie = ++ (reg_trie_data*)ri->data->data[optrie]; ++#ifdef DEBUGGING ++ AV *const trie_words ++ = MUTABLE_AV(ri->data->data[n + TRIE_WORDS_OFFSET]); ++#endif ++ const regnode *nextbranch= NULL; ++ I32 word_idx; ++ SvPVCLEAR(sv); ++ for (word_idx= 0; word_idx < (I32)trie->wordcount; word_idx++) { ++ SV ** const elem_ptr = av_fetch_simple(trie_words, word_idx, 0); ++ ++ Perl_re_indentf( aTHX_ "%s ", ++ indent+3, ++ elem_ptr ++ ? pv_pretty(sv, SvPV_nolen_const(*elem_ptr), ++ SvCUR(*elem_ptr), PL_dump_re_max_len, ++ PL_colors[0], PL_colors[1], ++ (SvUTF8(*elem_ptr) ++ ? PERL_PV_ESCAPE_UNI ++ : 0) ++ | PERL_PV_PRETTY_ELLIPSES ++ | PERL_PV_PRETTY_LTGT ++ ) ++ : "???" ++ ); ++ if (trie->jump) { ++ U16 dist= trie->jump[word_idx+1]; ++ Perl_re_printf( aTHX_ "(%" UVuf ")\n", ++ (UV)((dist ? this_trie + dist : next) - start)); ++ if (dist) { ++ if (!nextbranch) ++ nextbranch= this_trie + trie->jump[0]; ++ DUMPUNTIL(this_trie + dist, nextbranch); ++ } ++ if (nextbranch && REGNODE_TYPE(OP(nextbranch))==BRANCH) ++ nextbranch= regnext((regnode *)nextbranch); ++ } else { ++ Perl_re_printf( aTHX_ "\n"); ++ } ++ } ++ if (last && next > last) ++ node= last; ++ else ++ node= next; ++ } ++ else if ( op == CURLY ) { /* "next" might be very big: optimizer */ ++ DUMPUNTIL(after, after + 1); /* +1 is NOT a REGNODE_AFTER */ ++ } ++ else if (REGNODE_TYPE(op) == CURLY && op != CURLYX) { ++ assert(next); ++ DUMPUNTIL(after, next); ++ } ++ else if ( op == PLUS || op == STAR) { ++ DUMPUNTIL(after, after + 1); /* +1 NOT a REGNODE_AFTER */ ++ } ++ else if (REGNODE_TYPE(op) == EXACT || op == ANYOFHs) { ++ /* Literal string, where present. */ ++ node = (const regnode *)REGNODE_AFTER_varies(node); ++ } ++ else { ++ node = REGNODE_AFTER_opcode(node,op); ++ } ++ if (op == CURLYX || op == OPEN || op == SROPEN) ++ indent++; ++ if (REGNODE_TYPE(op) == END) ++ break; ++ } ++ CLEAR_OPTSTART; ++#ifdef DEBUG_DUMPUNTIL ++ Perl_re_printf( aTHX_ "--- %d\n", (int)indent); ++#endif ++ return node; ++} ++ ++#endif /* PERL_RE_BUILD_DEBUG */ + + /* + - regdump - dump a regexp onto Perl_debug_log in vaguely comprehensible form + */ + #ifdef DEBUGGING +- + static void + S_regdump_intflags(pTHX_ const char *lead, const U32 flags) + { +@@ -907,8 +1053,8 @@ Perl_regprop(pTHX_ const regexp *prog, SV *sv, const regnode *o, const regmatch_ + #endif /* DEBUGGING */ + } + +-#ifdef DEBUGGING + ++#ifdef DEBUGGING + STATIC void + S_put_code_point(pTHX_ SV *sv, UV c) + { +@@ -1517,154 +1663,4 @@ S_put_charclass_bitmap_innards(pTHX_ SV *sv, + + return did_output_something; + } +- +- +-const regnode * +-Perl_dumpuntil(pTHX_ const regexp *r, const regnode *start, const regnode *node, +- const regnode *last, const regnode *plast, +- SV* sv, I32 indent, U32 depth) +-{ +- const regnode *next; +- const regnode *optstart= NULL; +- +- RXi_GET_DECL(r, ri); +- DECLARE_AND_GET_RE_DEBUG_FLAGS; +- +- PERL_ARGS_ASSERT_DUMPUNTIL; +- +-#ifdef DEBUG_DUMPUNTIL +- Perl_re_printf( aTHX_ "--- %d : %d - %d - %d\n", indent, node-start, +- last ? last-start : 0, plast ? plast-start : 0); +-#endif +- +- if (plast && plast < last) +- last= plast; +- +- while (node && (!last || node < last)) { +- const U8 op = OP(node); +- +- if (op == CLOSE || op == SRCLOSE || op == WHILEM) +- indent--; +- next = regnext((regnode *)node); +- const regnode *after = regnode_after((regnode *)node,0); +- +- /* Where, what. */ +- if (op == OPTIMIZED) { +- if (!optstart && RE_DEBUG_FLAG(RE_DEBUG_COMPILE_OPTIMISE)) +- optstart = node; +- else +- goto after_print; +- } else +- CLEAR_OPTSTART; +- +- regprop(r, sv, node, NULL, NULL); +- Perl_re_printf( aTHX_ "%4" IVdf ":%*s%s", (IV)(node - start), +- (int)(2*indent + 1), "", SvPVX_const(sv)); +- +- if (op != OPTIMIZED) { +- if (next == NULL) /* Next ptr. */ +- Perl_re_printf( aTHX_ " (0)"); +- else if (REGNODE_TYPE(op) == BRANCH +- && REGNODE_TYPE(OP(next)) != BRANCH ) +- Perl_re_printf( aTHX_ " (FAIL)"); +- else +- Perl_re_printf( aTHX_ " (%" IVdf ")", (IV)(next - start)); +- Perl_re_printf( aTHX_ "\n"); +- } +- +- after_print: +- if (REGNODE_TYPE(op) == BRANCHJ) { +- assert(next); +- const regnode *nnode = (OP(next) == LONGJMP +- ? regnext((regnode *)next) +- : next); +- if (last && nnode > last) +- nnode = last; +- DUMPUNTIL(after, nnode); +- } +- else if (REGNODE_TYPE(op) == BRANCH) { +- assert(next); +- DUMPUNTIL(after, next); +- } +- else if ( REGNODE_TYPE(op) == TRIE ) { +- const regnode *this_trie = node; +- const U32 n = ARG1u(node); +- const reg_ac_data * const ac = op>=AHOCORASICK ? +- (reg_ac_data *)ri->data->data[n] : +- NULL; +- const reg_trie_data * const trie = +- (reg_trie_data*)ri->data->data[optrie]; +-#ifdef DEBUGGING +- AV *const trie_words +- = MUTABLE_AV(ri->data->data[n + TRIE_WORDS_OFFSET]); +-#endif +- const regnode *nextbranch= NULL; +- I32 word_idx; +- SvPVCLEAR(sv); +- for (word_idx= 0; word_idx < (I32)trie->wordcount; word_idx++) { +- SV ** const elem_ptr = av_fetch_simple(trie_words, word_idx, 0); +- +- Perl_re_indentf( aTHX_ "%s ", +- indent+3, +- elem_ptr +- ? pv_pretty(sv, SvPV_nolen_const(*elem_ptr), +- SvCUR(*elem_ptr), PL_dump_re_max_len, +- PL_colors[0], PL_colors[1], +- (SvUTF8(*elem_ptr) +- ? PERL_PV_ESCAPE_UNI +- : 0) +- | PERL_PV_PRETTY_ELLIPSES +- | PERL_PV_PRETTY_LTGT +- ) +- : "???" +- ); +- if (trie->jump) { +- U16 dist= trie->jump[word_idx+1]; +- Perl_re_printf( aTHX_ "(%" UVuf ")\n", +- (UV)((dist ? this_trie + dist : next) - start)); +- if (dist) { +- if (!nextbranch) +- nextbranch= this_trie + trie->jump[0]; +- DUMPUNTIL(this_trie + dist, nextbranch); +- } +- if (nextbranch && REGNODE_TYPE(OP(nextbranch))==BRANCH) +- nextbranch= regnext((regnode *)nextbranch); +- } else { +- Perl_re_printf( aTHX_ "\n"); +- } +- } +- if (last && next > last) +- node= last; +- else +- node= next; +- } +- else if ( op == CURLY ) { /* "next" might be very big: optimizer */ +- DUMPUNTIL(after, after + 1); /* +1 is NOT a REGNODE_AFTER */ +- } +- else if (REGNODE_TYPE(op) == CURLY && op != CURLYX) { +- assert(next); +- DUMPUNTIL(after, next); +- } +- else if ( op == PLUS || op == STAR) { +- DUMPUNTIL(after, after + 1); /* +1 NOT a REGNODE_AFTER */ +- } +- else if (REGNODE_TYPE(op) == EXACT || op == ANYOFHs) { +- /* Literal string, where present. */ +- node = (const regnode *)REGNODE_AFTER_varies(node); +- } +- else { +- node = REGNODE_AFTER_opcode(node,op); +- } +- if (op == CURLYX || op == OPEN || op == SROPEN) +- indent++; +- if (REGNODE_TYPE(op) == END) +- break; +- } +- CLEAR_OPTSTART; +-#ifdef DEBUG_DUMPUNTIL +- Perl_re_printf( aTHX_ "--- %d\n", (int)indent); +-#endif +- return node; +-} +- +-#endif /* DEBUGGING */ ++#endif /* DEBUGGING */ +diff --git a/regcomp_invlist.c b/regcomp_invlist.c +index 9ea3f431817d..82f82305846a 100644 +--- a/regcomp_invlist.c ++++ b/regcomp_invlist.c +@@ -18,7 +18,7 @@ + #include "unicode_constants.h" + #include "regcomp_internal.h" + +- ++#ifdef PERL_RE_BUILD_AUX + void + Perl_populate_bitmap_from_invlist(pTHX_ SV * invlist, const UV offset, const U8 * bitmap, const Size_t len) + { +@@ -70,6 +70,7 @@ Perl_populate_invlist_from_bitmap(pTHX_ const U8 * bitmap, const Size_t bitmap_l + } + } + } ++#endif /* PERL_RE_BUILD_AUX */ + + /* This section of code defines the inversion list object and its methods. The + * interfaces are highly subject to change, so as much as possible is static to +diff --git a/regexec.c b/regexec.c +index c404d9aa3d73..de0b7c461918 100644 +--- a/regexec.c ++++ b/regexec.c +@@ -4428,7 +4428,8 @@ S_regtry(pTHX_ regmatch_info *reginfo, char **startposp) + */ + #define REPORT_CODE_OFF 29 + #define INDENT_CHARS(depth) ((int)(depth) % 20) +-#ifdef DEBUGGING ++ ++#ifdef PERL_RE_BUILD_DEBUG + int + Perl_re_exec_indentf(pTHX_ const char *fmt, U32 depth, ...) + { From 1a287945306b8617e144dfb31f4dc4c5af21b256 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 2 Jan 2024 14:12:08 +0100 Subject: [PATCH 4464/5754] package/hidapi: bump to version 0.14.0 https://github.com/libusb/hidapi/releases/tag/hidapi-0.14.0 https://github.com/libusb/hidapi/releases/tag/hidapi-0.13.1 https://github.com/libusb/hidapi/releases/tag/hidapi-0.13.0 https://github.com/libusb/hidapi/releases/tag/hidapi-0.12.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/hidapi/hidapi.hash | 2 +- package/hidapi/hidapi.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/hidapi/hidapi.hash b/package/hidapi/hidapi.hash index 95046386a7..cc2d13214d 100644 --- a/package/hidapi/hidapi.hash +++ b/package/hidapi/hidapi.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 391d8e52f2d6a5cf76e2b0c079cfefe25497ba1d4659131297081fc0cd744632 hidapi-0.11.0.tar.gz +sha256 a5714234abe6e1f53647dd8cba7d69f65f71c558b7896ed218864ffcf405bcbd hidapi-0.14.0.tar.gz sha256 7d3b087c34f35d4d538e3bcddd1ff8f66e92f9ef336881999482800ddf840913 LICENSE.txt sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE-gpl3.txt sha256 30eb1bef29b46f8ba7ab8b416035dbd93cb034a45481dd97815b944284582cd2 LICENSE-bsd.txt diff --git a/package/hidapi/hidapi.mk b/package/hidapi/hidapi.mk index 9341f0186c..9f5c0a3df2 100644 --- a/package/hidapi/hidapi.mk +++ b/package/hidapi/hidapi.mk @@ -4,7 +4,7 @@ # ################################################################################ -HIDAPI_VERSION = 0.11.0 +HIDAPI_VERSION = 0.14.0 HIDAPI_SITE = $(call github,libusb,hidapi,hidapi-$(HIDAPI_VERSION)) HIDAPI_INSTALL_STAGING = YES # No configure provided, so we need to autoreconf. From 7f618fb81ab3638995158a12d9bfd5c578f9d58c Mon Sep 17 00:00:00 2001 From: Michael Nosthoff Date: Tue, 2 Jan 2024 13:45:41 +0100 Subject: [PATCH 4465/5754] package/fmt: bump to version 1.2.0 - LICENSE file dropped the .rst suffix Signed-off-by: Michael Nosthoff Signed-off-by: Thomas Petazzoni --- package/fmt/fmt.hash | 4 ++-- package/fmt/fmt.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/fmt/fmt.hash b/package/fmt/fmt.hash index 5f0e06ef30..f9928820ce 100644 --- a/package/fmt/fmt.hash +++ b/package/fmt/fmt.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b84e58a310c9b50196cda48d5678d5fa0849bca19e5fdba6b684f0ee93ed9d1b fmt-10.1.1.zip -sha256 07580f2a3b35709ce703d523f447b242f6dfec7582a8c0df102c7fa2849375f8 LICENSE.rst +sha256 8a942861a94f8461a280f823041cde8f620a6d8b0e0aacc98c15bb5a9dd92399 fmt-10.2.0.zip +sha256 07580f2a3b35709ce703d523f447b242f6dfec7582a8c0df102c7fa2849375f8 LICENSE diff --git a/package/fmt/fmt.mk b/package/fmt/fmt.mk index 8f8ba4837f..2512657727 100644 --- a/package/fmt/fmt.mk +++ b/package/fmt/fmt.mk @@ -4,11 +4,11 @@ # ################################################################################ -FMT_VERSION = 10.1.1 +FMT_VERSION = 10.2.0 FMT_SITE = https://github.com/fmtlib/fmt/releases/download/$(FMT_VERSION) FMT_SOURCE = fmt-$(FMT_VERSION).zip FMT_LICENSE = MIT with exception -FMT_LICENSE_FILES = LICENSE.rst +FMT_LICENSE_FILES = LICENSE FMT_CPE_ID_VENDOR = fmt FMT_INSTALL_STAGING = YES From 6b25c3dad2e340f944a977a5ea51ee9d1f8a63f6 Mon Sep 17 00:00:00 2001 From: Alexey Brodkin Date: Tue, 2 Jan 2024 05:28:43 -0800 Subject: [PATCH 4466/5754] package/gcc: enable ARC HS rel 3.10 in vanilla GCC 13+ For quite some time a special tuning for ARC HS release 3.10 was only implemented in ARC fork of GCC, thus there was a dependency introduced back in the day, see [1]. But finally that tuning got merged upstream (see [2]) and so could be used with vanilla GCC starting from version 13.1. [1] https://git.buildroot.net/buildroot/commit/?id=770c9e5ce3de4ef1743948898a37e9a2ad76ca8f [2] https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=7501eec65c60701f72621d04eeb5342bad2fe4fb Signed-off-by: Alexey Brodkin Cc: Yann E. MORIN Cc: Romain Naour Signed-off-by: Thomas Petazzoni --- package/gcc/Config.in.host | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index fd721088ec..ebdcdba62e 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -47,8 +47,6 @@ config BR2_GCC_VERSION_13_X # powerpc spe support has been deprecated since gcc 8.x. # https://gcc.gnu.org/ml/gcc/2018-04/msg00102.html depends on !BR2_POWERPC_CPU_HAS_SPE - # ARC HS48 rel 31 only supported by gcc arc fork. - depends on !BR2_archs4x_rel31 select BR2_TOOLCHAIN_GCC_AT_LEAST_13 endchoice From 6257fa486013538a47313f16e51b8515d189c17b Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 2 Jan 2024 12:00:30 +0100 Subject: [PATCH 4467/5754] package/vala: bump to version 0.56.14 This bump will fix the following libsoup3 build failure raised since commit 9cbffdf9be622c8ddad3b28106851b3101b3d201: FAILED: libsoup/libsoup-3.0.vapi /home/buildroot/autobuild/instance-1/output-1/host/bin/vapigen --quiet --library=libsoup-3.0 --directory=/home/buildroot/autobuild/instance-1/output-1/build/libsoup3-3.4.4/build/libsoup --pkg=gio-2.0 --metadatadir=/home/buildroot/autobuild/instance-1/output-1/build/libsoup3-3.4.4/libsoup /home/buildroot/autobuild/instance-1/output-1/build/libsoup3-3.4.4/build/libsoup/Soup-3.0.gir /home/buildroot/autobuild/instance-1/output-1/build/libsoup3-3.4.4/libsoup/Soup-3.0-custom.vala Soup-3.0.gir:6877.95-6877.95: error: The type name `GLib.TlsProtocolVersion' could not be found https://gitlab.gnome.org/GNOME/vala/-/blob/0.56.14/NEWS Fixes: - http://autobuild.buildroot.org/results/732fcd20c2998e7d7b6b8f61871ad104f8d243df Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/vala/vala.hash | 4 ++-- package/vala/vala.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/vala/vala.hash b/package/vala/vala.hash index 7f3a099940..b3716f0854 100644 --- a/package/vala/vala.hash +++ b/package/vala/vala.hash @@ -1,4 +1,4 @@ -# From https://download.gnome.org/sources/vala/0.52/vala-0.52.4.sha256sum -sha256 ecde520e5160e659ee699f8b1cdc96065edbd44bbd08eb48ef5f2506751fdf31 vala-0.52.4.tar.xz +# From https://download.gnome.org/sources/vala/0.56/vala-0.56.14.sha256sum +sha256 9382c268ca9bdc02aaedc8152a9818bf3935273041f629c56de410e360a3f557 vala-0.56.14.tar.xz # Locally computed sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING diff --git a/package/vala/vala.mk b/package/vala/vala.mk index 94e18d349b..415d996faa 100644 --- a/package/vala/vala.mk +++ b/package/vala/vala.mk @@ -4,8 +4,8 @@ # ################################################################################ -VALA_VERSION_MAJOR = 0.52 -VALA_VERSION = $(VALA_VERSION_MAJOR).4 +VALA_VERSION_MAJOR = 0.56 +VALA_VERSION = $(VALA_VERSION_MAJOR).14 VALA_SITE = http://download.gnome.org/sources/vala/$(VALA_VERSION_MAJOR) VALA_SOURCE = vala-$(VALA_VERSION).tar.xz VALA_LICENSE = LGPL-2.1+ From 7077476c8c85f23897ce14a203cc91596a63b202 Mon Sep 17 00:00:00 2001 From: Alexey Brodkin Date: Tue, 2 Jan 2024 07:55:52 -0800 Subject: [PATCH 4468/5754] package/gdb: Remove special handling of libstdc++ for ARC Effectively that's a revert of a very old fix [1] which is no longer needed. [1] https://git.buildroot.net/buildroot/commit/?id=ca99d0ea925e5a8e42bd270402b0171a39d1d955 Signed-off-by: Alexey Brodkin Cc: Thomas Petazzoni Cc: Yann E. MORIN Signed-off-by: Yann E. MORIN --- package/gdb/gdb.mk | 7 ------- 1 file changed, 7 deletions(-) diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk index af40f7f986..c67a292619 100644 --- a/package/gdb/gdb.mk +++ b/package/gdb/gdb.mk @@ -182,13 +182,6 @@ else GDB_CONF_OPTS += --disable-gdbserver endif -# When gdb is built as C++ application for ARC it segfaults at runtime -# So we pass --disable-build-with-cxx config option to force gdb not to -# be built as C++ app. -ifeq ($(BR2_arc),y) -GDB_CONF_OPTS += --disable-build-with-cxx -endif - # gdb 7.12+ by default builds with a C++ compiler, which doesn't work # when we don't have C++ support in the toolchain ifneq ($(BR2_INSTALL_LIBSTDCPP),y) From 46fcdf07be310a49d9731031e2c3676c12e2d7f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Tue, 2 Jan 2024 11:42:58 +0100 Subject: [PATCH 4469/5754] configs/broadcom_northstar_defconfig: adjust DTS paths MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Starting with kernel release v6.5 ARM DTS files are placed in vendor subdirectories (Linux commit 724ba6751532 ("ARM: dts: Move .dts files to vendor sub-directories")). This fixes: make[3]: *** No rule to make target 'arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dtb'. Stop. make[2]: *** [Makefile:1384: bcm4708-smartrg-sr400ac.dtb] Error 2 make[3]: *** No rule to make target 'arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dtb'. Stop. make[2]: *** [Makefile:1384: bcm47094-luxul-xwr-3150-v1.dtb] Error 2 Signed-off-by: Rafał Miłecki Signed-off-by: Thomas Petazzoni --- configs/broadcom_northstar_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/broadcom_northstar_defconfig b/configs/broadcom_northstar_defconfig index 1008de168f..9ae716726d 100644 --- a/configs/broadcom_northstar_defconfig +++ b/configs/broadcom_northstar_defconfig @@ -5,7 +5,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/broadcom/northstar/linux.config" BR2_LINUX_KERNEL_APPENDED_ZIMAGE=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm4708-smartrg-sr400ac bcm47094-luxul-xwr-3150-v1" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm4708-smartrg-sr400ac broadcom/bcm47094-luxul-xwr-3150-v1" # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ROOTFS_UBI=y BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048 From 951c9a8ebce22f5ff00003fea5ee1ed5d9856fef Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Sun, 24 Dec 2023 12:18:16 -0700 Subject: [PATCH 4470/5754] DEVELOPERS: remove aduskett@gmail.com I will only be supporting Buildroot in a professional capacity from now on. Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 5 ----- 1 file changed, 5 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index cc089e8ff6..42a8ed2993 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -26,11 +26,6 @@ # infrastructure, and will be CC'ed on all patches that add or # modify packages that use this infrastructure. -N: Adam Duskett -F: package/firewalld/ -F: package/vulkan-loader/ -F: package/vulkan-tools/ - N: Adam Duskett F: package/depot-tools/ F: package/dmenu-wayland/ From 00d55c07306b385eea41d4bf98350d0e2405c3bf Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Sun, 24 Dec 2023 12:18:17 -0700 Subject: [PATCH 4471/5754] DEVELOPERS: Remove adam.duskett@amarulasolutions non-flutter related packages I will only be supporting Flutter and other packages needed by Amarula Solution in a professional related capacity from now on. Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 --- 1 file changed, 3 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 42a8ed2993..646b8ee5a2 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -36,10 +36,7 @@ F: package/flutter-gallery/ F: package/flutter-pi/ F: package/flutter-sdk-bin/ F: package/libutempter/ -F: package/python-kmod/ -F: package/python-versioneer/ F: package/tllist/ -F: support/testing/tests/package/test_firewalld.py F: support/testing/tests/package/test_flutter.py N: Adam Heinrich From 4c6ff16cf26acff45ac5a8bdedffe2df5696c416 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 2 Jan 2024 21:47:55 +0100 Subject: [PATCH 4472/5754] package/gdal: giflib and qhull are mandatory giflib and qhull are mandatory since the addition of the package in commit 1e64fa2956171cdc9d6e6c8896b4b589ce573513 and https://github.com/OSGeo/gdal/commit/cb136fc051341ab99579daae3c8d8246fe918a76 Indeed, as explained in above commit, internal (bundled) libraries will be used if GDAL_USE_GIF and GDAL_USE_QHULL are set to OFF Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/gdal/Config.in | 4 +++- package/gdal/gdal.mk | 16 +++++++++++++--- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/package/gdal/Config.in b/package/gdal/Config.in index ee7209566a..24a1f06af2 100644 --- a/package/gdal/Config.in +++ b/package/gdal/Config.in @@ -1,18 +1,20 @@ config BR2_PACKAGE_GDAL bool "gdal" depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c - depends on BR2_INSTALL_LIBSTDCPP # proj + depends on BR2_INSTALL_LIBSTDCPP # proj, qhull # configure can't find proj, when linking statically depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11, proj depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 depends on BR2_TOOLCHAIN_HAS_THREADS # proj depends on BR2_USE_WCHAR # proj + select BR2_PACKAGE_GIFLIB select BR2_PACKAGE_JPEG select BR2_PACKAGE_JSON_C select BR2_PACKAGE_LIBGEOTIFF select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_PROJ + select BR2_PACKAGE_QHULL select BR2_PACKAGE_ZLIB help GDAL is a translator library for raster and vector geospatial diff --git a/package/gdal/gdal.mk b/package/gdal/gdal.mk index 3f39aa657a..7ab4f1a331 100644 --- a/package/gdal/gdal.mk +++ b/package/gdal/gdal.mk @@ -20,16 +20,28 @@ GDAL_SUPPORTS_IN_SOURCE_BUILD = NO # enabled but it seems, in contrast to mrf driver support, that they # can be implicitly disabled, by configuring gdal without their # respectively needed dependencies. -GDAL_DEPENDENCIES = host-pkgconf jpeg json-c libgeotiff libpng proj tiff zlib +GDAL_DEPENDENCIES = \ + giflib \ + host-pkgconf \ + jpeg \ + json-c \ + libgeotiff \ + libpng \ + proj \ + qhull \ + tiff \ + zlib # Yes, even though they have -DDGDAL_USE options, a few libraries are # mandatory. If we don't provide them, bundled versions are used. GDAL_CONF_OPTS = \ -DGDAL_USE_GEOTIFF=ON \ + -DGDAL_USE_GIF=ON \ -DGDAL_USE_JPEG=ON \ -DGDAL_USE_JSONC=ON \ -DGDAL_USE_ZLIB=ON \ -DGDAL_USE_PNG=ON \ + -DGDAL_USE_QHULL=ON \ -DGDAL_USE_ARMADILLO=OFF \ -DGDAL_USE_BLOSC=OFF \ -DGDAL_USE_BRUNSLI=OFF \ @@ -57,7 +69,6 @@ GDAL_CONF_OPTS = \ -DGDAL_USE_KDU=OFF \ -DGDAL_USE_KEA=OFF \ -DGDAL_USE_LERC=OFF \ - -DGDAL_USE_GIF=OFF \ -DGDAL_USE_LIBLZMA=OFF \ -DGDAL_USE_DEFLATE=OFF \ -DGDAL_USE_MONGOCXX=OFF \ @@ -76,7 +87,6 @@ GDAL_CONF_OPTS = \ -DGDAL_USE_PDFIUM=OFF \ -DGDAL_USE_PODOFO=OFF \ -DGDAL_USE_POPPLER=OFF \ - -DGDAL_USE_QHULL=OFF \ -DGDAL_USE_RASDAMAN=OFF \ -DGDAL_USE_RASTERLITE2=OFF \ -DGDAL_USE_RDB=OFF \ From d2e349301b79ad3a1840083714ee396f4302b68a Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 2 Jan 2024 21:47:56 +0100 Subject: [PATCH 4473/5754] package/gdal: bump to version 3.8.2 - Drop patch (already in version) - Rasdaman driver has been removed with https://github.com/OSGeo/gdal/commit/2464c7699271a413832256a823cd9340a6010ddf - This bump will fix the following build failure with libxml2 >= 2.12 raised since commit d8ac52108c12f0fcc9641b63e7922009270f96c6 thanks to https://github.com/OSGeo/gdal/commit/cbed9fc91dffba30d0f9a6a06a412a04d9cd36fa: /home/buildroot/autobuild/instance-3/output-1/build/gdal-3.6.2/port/cpl_xml_validate.cpp: In function 'void CPLLibXMLWarningErrorCallback(void*, const char*, ...)': /home/buildroot/autobuild/instance-3/output-1/build/gdal-3.6.2/port/cpl_xml_validate.cpp:917:48: error: invalid conversion from 'const xmlError*' {aka 'const _xmlError*'} to 'xmlErrorPtr' {aka '_xmlError*'} [-fpermissive] 917 | xmlErrorPtr pErrorPtr = xmlGetLastError(); | ~~~~~~~~~~~~~~~^~ | | | const xmlError* {aka const _xmlError*} https://github.com/OSGeo/gdal/blob/v3.8.2/NEWS.md Fixes: - http://autobuild.buildroot.org/results/e258305b42dcfdbefec656015929c384444f49b5 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - .../0001-fix-uclibc-build-without-NPTL.patch | 102 ------------------ package/gdal/gdal.hash | 6 +- package/gdal/gdal.mk | 3 +- 4 files changed, 4 insertions(+), 108 deletions(-) delete mode 100644 package/gdal/0001-fix-uclibc-build-without-NPTL.patch diff --git a/.checkpackageignore b/.checkpackageignore index 8337c80c11..5ff39e6f37 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -455,7 +455,6 @@ package/gcc/arc-2020.09-release/0001-arc-Refurbish-adc-sbc-patterns.patch Upstre 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/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 diff --git a/package/gdal/0001-fix-uclibc-build-without-NPTL.patch b/package/gdal/0001-fix-uclibc-build-without-NPTL.patch deleted file mode 100644 index 6ecbfc7f95..0000000000 --- a/package/gdal/0001-fix-uclibc-build-without-NPTL.patch +++ /dev/null @@ -1,102 +0,0 @@ -From 0d3ee8a7661dcd85a9d7b636124af32de8d1b2f1 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 26 Feb 2023 11:31:23 +0100 -Subject: [PATCH] fix uclibc build without NPTL - -Check for pthread_spin_lock instead of pthread_spin_lock_t to avoid the -following uclibc build failure: - -/tmp/instance-7/output-1/build/gdal-3.5.2/port/cpl_multiproc.cpp: In function 'CPLSpinLock* CPLCreateSpinLock()': -/tmp/instance-7/output-1/build/gdal-3.5.2/port/cpl_multiproc.cpp:2265:9: error: 'pthread_spin_init' was not declared in this scope; did you mean 'pthread_cond_init'? - 2265 | pthread_spin_init(&(psSpin->spin), PTHREAD_PROCESS_PRIVATE) == 0 ) - | ^~~~~~~~~~~~~~~~~ - | pthread_cond_init -/tmp/instance-7/output-1/build/gdal-3.5.2/port/cpl_multiproc.cpp: In function 'int CPLAcquireSpinLock(CPLSpinLock*)': -/tmp/instance-7/output-1/build/gdal-3.5.2/port/cpl_multiproc.cpp:2283:12: error: 'pthread_spin_lock' was not declared in this scope; did you mean 'pthread_spinlock_t'? - 2283 | return pthread_spin_lock( &(psSpin->spin) ) == 0; - | ^~~~~~~~~~~~~~~~~ - | pthread_spinlock_t - -Fixes: - - http://autobuild.buildroot.org/results/aa2a88990a07e551c40efb0c2180768add600c4f - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/OSGeo/gdal/pull/7318] ---- - cmake/helpers/configure.cmake | 4 ++-- - cmake/template/cpl_config.h.in | 4 ++-- - port/cpl_config.h.in | 4 ++-- - port/cpl_multiproc.cpp | 4 ++-- - 4 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/cmake/helpers/configure.cmake b/cmake/helpers/configure.cmake -index 08549df434..62a4f636ba 100644 ---- a/cmake/helpers/configure.cmake -+++ b/cmake/helpers/configure.cmake -@@ -110,9 +110,9 @@ else () - " - #define _GNU_SOURCE - #include -- int main() { pthread_spinlock_t spin; return 1; } -+ int main() { pthread_spinlock_t spin; return pthread_spin_lock(&spin); } - " -- HAVE_PTHREAD_SPINLOCK) -+ HAVE_PTHREAD_SPIN_LOCK) - - check_c_source_compiles( - " -diff --git a/cmake/template/cpl_config.h.in b/cmake/template/cpl_config.h.in -index cfa7da94aa..d1fd80bda9 100644 ---- a/cmake/template/cpl_config.h.in -+++ b/cmake/template/cpl_config.h.in -@@ -61,8 +61,8 @@ - /* Define to 1 if you have the `PTHREAD_MUTEX_ADAPTIVE_NP' constant. */ - #cmakedefine HAVE_PTHREAD_MUTEX_ADAPTIVE_NP 1 - --/* Define to 1 if you have the `pthread_spinlock_t' type. */ --#cmakedefine HAVE_PTHREAD_SPINLOCK 1 -+/* Define to 1 if you have the `pthread_spin_lock' function. */ -+#cmakedefine HAVE_PTHREAD_SPIN_LOCK 1 - - /* Define to 1 if you have the `pthread_atfork' function. */ - #cmakedefine HAVE_PTHREAD_ATFORK 1 -diff --git a/port/cpl_config.h.in b/port/cpl_config.h.in -index ea28efb3f0..09a48f242d 100644 ---- a/port/cpl_config.h.in -+++ b/port/cpl_config.h.in -@@ -51,8 +51,8 @@ - /* Define to 1 if you have the `PTHREAD_MUTEX_ADAPTIVE_NP' constant. */ - #undef HAVE_PTHREAD_MUTEX_ADAPTIVE_NP - --/* Define to 1 if you have the `pthread_spinlock_t' type. */ --#undef HAVE_PTHREAD_SPINLOCK -+/* Define to 1 if you have the `pthread_spin_lock' function. */ -+#undef HAVE_PTHREAD_SPIN_LOCK - - /* Define to 1 if you have the 5 args `mremap' function. */ - #undef HAVE_5ARGS_MREMAP -diff --git a/port/cpl_multiproc.cpp b/port/cpl_multiproc.cpp -index 7f5bcd9127..474ff5bb29 100644 ---- a/port/cpl_multiproc.cpp -+++ b/port/cpl_multiproc.cpp -@@ -2232,7 +2232,7 @@ void CPLCleanupTLS() - /* CPLCreateSpinLock() */ - /************************************************************************/ - --#if defined(HAVE_PTHREAD_SPINLOCK) -+#if defined(HAVE_PTHREAD_SPIN_LOCK) - #define HAVE_SPINLOCK_IMPL - - struct _CPLSpinLock -@@ -2310,7 +2310,7 @@ void CPLDestroySpinLock(CPLSpinLock *psSpin) - pthread_spin_destroy(&(psSpin->spin)); - free(psSpin); - } --#endif // HAVE_PTHREAD_SPINLOCK -+#endif // HAVE_PTHREAD_SPIN_LOCK - - #endif // def CPL_MULTIPROC_PTHREAD - --- -2.39.1 - diff --git a/package/gdal/gdal.hash b/package/gdal/gdal.hash index d0b08b4535..baec7c910e 100644 --- a/package/gdal/gdal.hash +++ b/package/gdal/gdal.hash @@ -1,6 +1,6 @@ -# md5 from: https://download.osgeo.org/gdal/3.6.2/gdal-3.6.2.tar.gz.md5, sha256 locally computed: -md5 6f22ffdbd8e00059ddb2b825c5920c4c gdal-3.6.2.tar.xz -sha256 35f40d2e08061b342513cdcddc2b997b3814ef8254514f0ef1e8bc7aa56cf681 gdal-3.6.2.tar.xz +# md5 from: https://download.osgeo.org/gdal/3.8.2/gdal-3.8.2.tar.gz.md5, sha256 locally computed: +md5 178461c9c1cd4503e36559a1063bb752 gdal-3.8.2.tar.xz +sha256 dc2921ee1cf7a5c0498e94d15fb9ab9c9689c296363a1d021fc3293dd242b4db gdal-3.8.2.tar.xz # Hashes of license files: sha256 1dae3468e81d00da56e2936f74d33b8b3ad09d726437f19ce209a5dabea41f77 LICENSE.TXT diff --git a/package/gdal/gdal.mk b/package/gdal/gdal.mk index 7ab4f1a331..13f38173fa 100644 --- a/package/gdal/gdal.mk +++ b/package/gdal/gdal.mk @@ -4,7 +4,7 @@ # ################################################################################ -GDAL_VERSION = 3.6.2 +GDAL_VERSION = 3.8.2 GDAL_SITE = https://download.osgeo.org/gdal/$(GDAL_VERSION) GDAL_SOURCE = gdal-$(GDAL_VERSION).tar.xz GDAL_LICENSE = Apache-2.0, ISC, MIT, many others @@ -87,7 +87,6 @@ GDAL_CONF_OPTS = \ -DGDAL_USE_PDFIUM=OFF \ -DGDAL_USE_PODOFO=OFF \ -DGDAL_USE_POPPLER=OFF \ - -DGDAL_USE_RASDAMAN=OFF \ -DGDAL_USE_RASTERLITE2=OFF \ -DGDAL_USE_RDB=OFF \ -DGDAL_USE_SFCGAL=OFF \ From 70935d6585bb211a0eba2effbd51d75c12258602 Mon Sep 17 00:00:00 2001 From: Maxim Kochetkov Date: Tue, 2 Jan 2024 12:34:26 +0300 Subject: [PATCH 4474/5754] package/postgresql: add ICU support PostgreSQL has optional ICU support. So enable it if library are available. Signed-off-by: Maxim Kochetkov Signed-off-by: Thomas Petazzoni --- package/postgresql/postgresql.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index 3108fe65e1..89ba80557d 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -87,6 +87,13 @@ else POSTGRESQL_CONF_OPTS += --without-ldap endif +ifeq ($(BR2_PACKAGE_ICU),y) +POSTGRESQL_DEPENDENCIES += icu +POSTGRESQL_CONF_OPTS += --with-icu +else +POSTGRESQL_CONF_OPTS += --without-icu +endif + ifeq ($(BR2_PACKAGE_LIBXML2),y) POSTGRESQL_DEPENDENCIES += libxml2 POSTGRESQL_CONF_OPTS += --with-libxml From 2a8065ebe20607d659af5e25a3b8220606d606ab Mon Sep 17 00:00:00 2001 From: Maxim Kochetkov Date: Tue, 2 Jan 2024 12:34:27 +0300 Subject: [PATCH 4475/5754] package/postgresql: bump version to 16.1 Release notes: https://www.postgresql.org/docs/release/16.1/ Signed-off-by: Maxim Kochetkov 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 4fc3bfcff0..cf859e3505 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.5.tar.bz2.sha256 -sha256 8f53aa95d78eb8e82536ea46b68187793b42bba3b4f65aa342f540b23c9b10a6 postgresql-15.5.tar.bz2 +# From https://ftp.postgresql.org/pub/source/v16.1/postgresql-16.1.tar.bz2.sha256 +sha256 ce3c4d85d19b0121fe0d3f8ef1fa601f71989e86f8a66f7dc3ad546dd5564fec postgresql-16.1.tar.bz2 # License file, Locally calculated sha256 1a7d13c3ab31961b91ba256f77d6e82e0b54bf992253060fe93bdb5466df416a COPYRIGHT diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index 89ba80557d..ec5b61b932 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -4,7 +4,7 @@ # ################################################################################ -POSTGRESQL_VERSION = 15.5 +POSTGRESQL_VERSION = 16.1 POSTGRESQL_SOURCE = postgresql-$(POSTGRESQL_VERSION).tar.bz2 POSTGRESQL_SITE = https://ftp.postgresql.org/pub/source/v$(POSTGRESQL_VERSION) POSTGRESQL_LICENSE = PostgreSQL From 74f401025d7ffbc5be9191b9c31208e501759edb Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 2 Jan 2024 21:42:08 +0100 Subject: [PATCH 4476/5754] package/libsigsegv: fix musl build with powerpc Fix the following musl build failure with powerpc raised since bump to version 2.14 in commit c6addf4606c3a41cdad5c6ac4c6508b298b6e92a: In file included from fault.h:36, from handler-unix.c:77, from handler.c:19: handler-unix.c: In function 'sigsegv_handler': fault-linux-powerpc.h:35:73: error: 'mcontext_t' has no member named 'uc_regs'; did you mean 'gregs'? 35 | # define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.uc_regs->gregs[1] | ^~~~~~~ handler-unix.c:157:43: note: in expansion of macro 'SIGSEGV_FAULT_STACKPOINTER' 157 | uintptr_t old_sp = (uintptr_t) (SIGSEGV_FAULT_STACKPOINTER); | ^~~~~~~~~~~~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/77b600071f07605be3ec28e2da46d6938e240087 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...-Linux-PowerPC-32-bit-with-musl-libc.patch | 114 ++++++++++++++++++ package/libsigsegv/0002-add-musl.m4.patch | 47 ++++++++ package/libsigsegv/libsigsegv.mk | 2 + 3 files changed, 163 insertions(+) create mode 100644 package/libsigsegv/0001-Add-support-for-Linux-PowerPC-32-bit-with-musl-libc.patch create mode 100644 package/libsigsegv/0002-add-musl.m4.patch diff --git a/package/libsigsegv/0001-Add-support-for-Linux-PowerPC-32-bit-with-musl-libc.patch b/package/libsigsegv/0001-Add-support-for-Linux-PowerPC-32-bit-with-musl-libc.patch new file mode 100644 index 0000000000..dcc2f7c9cb --- /dev/null +++ b/package/libsigsegv/0001-Add-support-for-Linux-PowerPC-32-bit-with-musl-libc.patch @@ -0,0 +1,114 @@ +From a6ff69873110c0a8ba6f7fd90532dbc11224828c Mon Sep 17 00:00:00 2001 +From: Bruno Haible +Date: Sun, 13 Mar 2022 15:04:06 +0100 +Subject: [PATCH] Add support for Linux/PowerPC (32-bit) with musl libc. + +Reported by Khem Raj in +. + +* autogen.sh: Copy also musl.m4. +* configure.ac: Invoke gl_MUSL_LIBC. +* src/fault-linux-powerpc.h (SIGSEGV_FAULT_STACKPOINTER): In the 32-bit +case, handle musl libc differently. +* NEWS: Mention it. + +Upstream: https://git.savannah.gnu.org/gitweb/?p=libsigsegv.git;a=commit;h=a6ff69873110c0a8ba6f7fd90532dbc11224828c +Signed-off-by: Fabrice Fontaine +--- + ChangeLog | 11 +++++++++++ + NEWS | 4 ++++ + autogen.sh | 3 ++- + configure.ac | 2 ++ + src/fault-linux-powerpc.h | 27 ++++++++++++++++++++++----- + 5 files changed, 41 insertions(+), 6 deletions(-) + +diff --git a/ChangeLog b/ChangeLog +index c52b227..7c0a8fa 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,14 @@ ++2022-03-13 Bruno Haible ++ ++ Add support for Linux/PowerPC (32-bit) with musl libc. ++ Reported by Khem Raj in ++ . ++ * autogen.sh: Copy also musl.m4. ++ * configure.ac: Invoke gl_MUSL_LIBC. ++ * src/fault-linux-powerpc.h (SIGSEGV_FAULT_STACKPOINTER): In the 32-bit ++ case, handle musl libc differently. ++ * NEWS: Mention it. ++ + 2022-01-07 Bruno Haible + + Prepare for version 2.14. +diff --git a/NEWS b/NEWS +index 4d012f8..82cc0f4 100644 +--- a/NEWS ++++ b/NEWS +@@ -1,3 +1,7 @@ ++New in 2.15: ++ ++* Added support for Linux/PowerPC (32-bit) with musl libc. ++ + New in 2.14: + + * Added support for 64-bit Cygwin. +diff --git a/configure.ac b/configure.ac +index e87f13b..164786f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -75,6 +75,8 @@ AC_MSG_RESULT([$sv_cv_host]) + PLATFORM="$sv_cv_host" + AC_SUBST([PLATFORM]) + ++gl_MUSL_LIBC ++ + dnl ========================== Done with PLATFORM ========================== + + +diff --git a/src/fault-linux-powerpc.h b/src/fault-linux-powerpc.h +index cba6ea7..b3f922a 100644 +--- a/src/fault-linux-powerpc.h ++++ b/src/fault-linux-powerpc.h +@@ -1,5 +1,5 @@ + /* Fault handler information. Linux/PowerPC version when it supports POSIX. +- Copyright (C) 2002, 2009, 2017 Bruno Haible ++ Copyright (C) 2002, 2009, 2017, 2022 Bruno Haible + + 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 +@@ -28,10 +28,27 @@ + #if defined(__powerpc64__) || defined(_ARCH_PPC64) /* 64-bit */ + # define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.gp_regs[1] + #else /* 32-bit */ +-/* both should be equivalent */ +-# if 0 +-# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.regs->gpr[1] ++# if MUSL_LIBC ++/* musl libc has a different structure of ucontext_t in ++ musl/arch/powerpc/bits/signal.h. */ ++/* The glibc comments say: ++ "Different versions of the kernel have stored the registers on signal ++ delivery at different offsets from the ucontext struct. Programs should ++ thus use the uc_mcontext.uc_regs pointer to find where the registers are ++ actually stored." */ ++# if 0 ++# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.gregs[1] ++# else ++# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_regs->gregs[1] ++# endif + # else +-# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.uc_regs->gregs[1] ++/* Assume the structure of ucontext_t in ++ glibc/sysdeps/unix/sysv/linux/powerpc/sys/ucontext.h. */ ++/* Because of the union, both definitions should be equivalent. */ ++# if 0 ++# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.regs->gpr[1] ++# else ++# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.uc_regs->gregs[1] ++# endif + # endif + #endif +-- +2.17.1 + diff --git a/package/libsigsegv/0002-add-musl.m4.patch b/package/libsigsegv/0002-add-musl.m4.patch new file mode 100644 index 0000000000..d6f06d8400 --- /dev/null +++ b/package/libsigsegv/0002-add-musl.m4.patch @@ -0,0 +1,47 @@ +From a9b07220b986500cfee7777a543494d360964306 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 2 Jan 2024 21:39:24 +0100 +Subject: [PATCH] add musl.m4 + +Add musl.m4 (retrieved from +https://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob;f=m4/musl.m4;h=34d2c1ff22a148eeb76936410ac497d68b228f59;hb=HEAD) + +musl.m4 is needed for gl_MUSL_LIBC since +https://git.savannah.gnu.org/gitweb/?p=libsigsegv.git;a=commit;h=a6ff69873110c0a8ba6f7fd90532dbc11224828c + +Signed-off-by: Fabrice Fontaine +Upstream: sent to Bruno Haible +--- + m4/musl.m4 | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) + create mode 100644 m4/musl.m4 + +diff --git a/m4/musl.m4 b/m4/musl.m4 +new file mode 100644 +index 0000000..34d2c1f +--- /dev/null ++++ b/m4/musl.m4 +@@ -0,0 +1,20 @@ ++# musl.m4 serial 4 ++dnl Copyright (C) 2019-2024 Free Software Foundation, Inc. ++dnl This file is free software; the Free Software Foundation ++dnl gives unlimited permission to copy and/or distribute it, ++dnl with or without modifications, as long as this notice is preserved. ++ ++# Test for musl libc, despite the musl libc authors don't like it ++# ++# . ++# From Bruno Haible. ++ ++AC_DEFUN_ONCE([gl_MUSL_LIBC], ++[ ++ AC_REQUIRE([AC_CANONICAL_HOST]) ++ case "$host_os" in ++ *-musl* | midipix*) ++ AC_DEFINE([MUSL_LIBC], [1], [Define to 1 on musl libc.]) ++ ;; ++ esac ++]) +-- +2.43.0 + diff --git a/package/libsigsegv/libsigsegv.mk b/package/libsigsegv/libsigsegv.mk index 98bcd55c8c..0d5875aa95 100644 --- a/package/libsigsegv/libsigsegv.mk +++ b/package/libsigsegv/libsigsegv.mk @@ -10,5 +10,7 @@ LIBSIGSEGV_INSTALL_STAGING = YES LIBSIGSEGV_CONF_ENV = sv_cv_fault_posix=yes LIBSIGSEGV_LICENSE = GPL-2.0+ LIBSIGSEGV_LICENSE_FILES = COPYING +# We're patching configure.ac +LIBSIGSEGV_AUTORECONF = YES $(eval $(autotools-package)) From 8649be9fa6dff661069af6479fc11a7f2208810d Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 2 Jan 2024 22:07:51 +0100 Subject: [PATCH 4477/5754] package/libcgroup: needs threads threads are mandatory since the addition of the package in commit and https://github.com/libcgroup/libcgroup/commit/99ccdf671e9df5b13f646e1487393d562aa7fa62 resulting in the following build failure since commit 9d58b525fcfd0d92fcdd3c66d7858213c4b139c6 which enables build on uclibc and musl: In file included from config.c:30: ./libcgroup-internal.h:29:10: fatal error: pthread.h: No such file or directory 29 | #include | ^~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/87c4454aee97b6955f461651c41c4186a8838c4d Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libcgroup/Config.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/libcgroup/Config.in b/package/libcgroup/Config.in index b9333be2a2..4f9ec074b4 100644 --- a/package/libcgroup/Config.in +++ b/package/libcgroup/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_LIBCGROUP bool "libcgroup" depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC help libcgroup is a library that abstracts the control @@ -17,5 +18,5 @@ config BR2_PACKAGE_LIBCGROUP_TOOLS endif -comment "libcgroup needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP +comment "libcgroup needs a toolchain w/ C++, threads" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS From 3a10a8bf45a5f83d624aed5cc772e21a267a50ae Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 2 Jan 2024 22:38:22 +0100 Subject: [PATCH 4478/5754] package/ipmiutil: bump to version 3.1.9 Update site to avoid redirections https://ipmiutil.sourceforge.net/ Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/ipmiutil/ipmiutil.hash | 6 +++--- package/ipmiutil/ipmiutil.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/ipmiutil/ipmiutil.hash b/package/ipmiutil/ipmiutil.hash index c1a813ad1f..ecefdac547 100644 --- a/package/ipmiutil/ipmiutil.hash +++ b/package/ipmiutil/ipmiutil.hash @@ -1,6 +1,6 @@ # From https://sourceforge.net/projects/ipmiutil/files/ -md5 b38ef567b6bb8a24418e448f23115190 ipmiutil-3.1.8.tar.gz -sha1 0697fc2342c55ba4374e31dcd38e58a00d1287e8 ipmiutil-3.1.8.tar.gz +md5 332f688084510771ed79946c815a2ba7 ipmiutil-3.1.9.tar.gz +sha1 3959d22d6c83b2452d087b1c325f47e6bc2b08ac ipmiutil-3.1.9.tar.gz # Locally computed -sha256 b14357b9723e38a19c24df2771cff63d5f15f8682cd8a5b47235044b767b1888 ipmiutil-3.1.8.tar.gz +sha256 5ae99bdd1296a8e25cea839784ec39ebca57b0e3701b2d440b8e02e22dc4bc95 ipmiutil-3.1.9.tar.gz sha256 7e0ec8238aa1431e95a4950032a4483fe33fec3fac348eaade5856cdc5ae3e39 COPYING diff --git a/package/ipmiutil/ipmiutil.mk b/package/ipmiutil/ipmiutil.mk index b48eaa7cb2..b5a83b8042 100644 --- a/package/ipmiutil/ipmiutil.mk +++ b/package/ipmiutil/ipmiutil.mk @@ -4,8 +4,8 @@ # ################################################################################ -IPMIUTIL_VERSION = 3.1.8 -IPMIUTIL_SITE = https://sourceforge.net/projects/ipmiutil/files +IPMIUTIL_VERSION = 3.1.9 +IPMIUTIL_SITE = https://downloads.sourceforge.net/project/ipmiutil IPMIUTIL_LICENSE = BSD-3-Clause IPMIUTIL_LICENSE_FILES = COPYING From d0a27c030af11b6dcaea06f20a1a2d6e8f72ce55 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 2 Jan 2024 22:57:46 +0100 Subject: [PATCH 4479/5754] package/iperf: bump to version 2.1.9 - Update site to use https instead of http because of HSTS - Drop patch (already in version) https://sourceforge.net/projects/iperf2/files/ Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - ...fix-single-threaded-compile-breakage.patch | 32 ------------------- package/iperf/iperf.hash | 4 +-- package/iperf/iperf.mk | 4 +-- 4 files changed, 4 insertions(+), 37 deletions(-) delete mode 100644 package/iperf/0001-fix-single-threaded-compile-breakage.patch diff --git a/.checkpackageignore b/.checkpackageignore index 5ff39e6f37..40d9fb1ed4 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -564,7 +564,6 @@ package/intel-mediasdk/0001-Don-t-force-fstack-protector.patch Upstream package/intltool/0001-perl-5.26-compatibility.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 diff --git a/package/iperf/0001-fix-single-threaded-compile-breakage.patch b/package/iperf/0001-fix-single-threaded-compile-breakage.patch deleted file mode 100644 index 85baf76ea4..0000000000 --- a/package/iperf/0001-fix-single-threaded-compile-breakage.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 6405b7a005bb2364466b56f480d50af0be423d76 Mon Sep 17 00:00:00 2001 -From: Robert McMahon -Date: Tue, 27 Sep 2022 20:31:04 -0700 -Subject: [PATCH] fix single threaded compile breakage - -[Retrieved (and backported) from: -https://sourceforge.net/p/iperf2/code/ci/6405b7a005bb2364466b56f480d50af0be423d76] -Signed-off-by: Fabrice Fontaine ---- - include/version.h | 2 +- - src/Settings.cpp | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/Settings.cpp b/src/Settings.cpp -index aac1b5f..fc5a181 100644 ---- a/src/Settings.cpp -+++ b/src/Settings.cpp -@@ -1160,10 +1160,10 @@ void Settings_Interpret (char option, const char *optarg, struct thread_Settings - delete [] tmp; - } - } -+ } - #else - fprintf(stderr, "bounceback-congest option requires a platform that supports threads\n"); - #endif -- } - } - if (bouncebackdelaystart) { - bouncebackdelaystart = 0; --- -2.35.1 - diff --git a/package/iperf/iperf.hash b/package/iperf/iperf.hash index 34218bcf3b..eb6088649d 100644 --- a/package/iperf/iperf.hash +++ b/package/iperf/iperf.hash @@ -1,6 +1,6 @@ # From https://sourceforge.net/projects/iperf2/files/ -sha1 7725efffc6ef46fe5247ee326c39e5fa2eadf1eb iperf-2.1.8.tar.gz +sha1 e7b669c2e8747df95b59956e83ff53d3971d7a5f iperf-2.1.9.tar.gz # Locally computed: -sha256 8e2cf2fbc9d0d4d1cf9d109b1e328459f9622993dc9a4c5a7dc8a2088fb7beaf iperf-2.1.8.tar.gz +sha256 5c0771aab00ef14520013aef01675977816e23bb8f5d9fde016f90eb2f1be788 iperf-2.1.9.tar.gz sha256 5f9f5c4feca3347c3b3c0ada8b16b4e6b698aac4e6f016a24adf61a5915336d1 COPYING diff --git a/package/iperf/iperf.mk b/package/iperf/iperf.mk index 47944880a3..1347f766d1 100644 --- a/package/iperf/iperf.mk +++ b/package/iperf/iperf.mk @@ -4,8 +4,8 @@ # ################################################################################ -IPERF_VERSION = 2.1.8 -IPERF_SITE = http://downloads.sourceforge.net/project/iperf2 +IPERF_VERSION = 2.1.9 +IPERF_SITE = https://downloads.sourceforge.net/project/iperf2 IPERF_LICENSE = MIT-like IPERF_LICENSE_FILES = COPYING IPERF_CPE_ID_VENDOR = iperf2_project From f4abda15d3ca3ebd40d9de9cc808e605a71a0733 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 2 Jan 2024 22:59:15 +0100 Subject: [PATCH 4480/5754] package/gdal: add expat optional dependency Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/gdal/gdal.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/gdal/gdal.mk b/package/gdal/gdal.mk index 13f38173fa..5690f55c00 100644 --- a/package/gdal/gdal.mk +++ b/package/gdal/gdal.mk @@ -51,7 +51,6 @@ GDAL_CONF_OPTS = \ -DGDAL_USE_CRNLIB=OFF \ -DGDAL_USE_CURL=OFF \ -DGDAL_USE_ECW=OFF \ - -DGDAL_USE_EXPAT=OFF \ -DGDAL_USE_FILEGDB=OFF \ -DGDAL_USE_FREEXL=OFF \ -DGDAL_USE_GEOS=OFF \ @@ -107,6 +106,13 @@ GDAL_CONF_OPTS = \ -DBUILD_JAVA_BINDINGS=OFF \ -DBUILD_PYTHON_BINDINGS=OFF +ifeq ($(BR2_PACKAGE_EXPAT),y) +GDAL_DEPENDENCIES += expat +GDAL_CONF_OPTS += -DGDAL_USE_EXPAT=ON +else +GDAL_CONF_OPTS += -DGDAL_USE_EXPAT=OFF +endif + ifeq ($(BR2_PACKAGE_LIBXML2),y) GDAL_DEPENDENCIES += libxml2 GDAL_CONF_OPTS += -DGDAL_USE_LIBXML2=ON From 52d405de45d77a737a78fdc3340df0cf32610903 Mon Sep 17 00:00:00 2001 From: Petr Vorel Date: Mon, 18 Dec 2023 22:59:49 +0100 Subject: [PATCH 4481/5754] package/nfs-utils: bump version to 2.6.4 Remove patches backported from this release. Backport 2 patches from upstream ML needed for uClibc-ng on mips. Require kernel 3.17 due getrandom() dependency. Add host-util-linux to HOST_NFS_UTILS_DEPENDENCIES (new uuid.h dependency). Fixes: http://autobuild.buildroot.net/results/c5fde6099a8b228a8bdc3154d1e47dfa192e94ed/ Reviewed-by: Giulio Benetti Signed-off-by: Petr Vorel Signed-off-by: Thomas Petazzoni --- ...event-and-libsqlite3-checked-when-nf.patch | 79 ------------------- ...-reexport-.c-Re-add-missing-includes.patch | 44 +++++++++++ ...d_sqlite.c-Add-missing-sys-syscall.h.patch | 31 ++++++++ ...-guard-dlfcn.h-include-with-HAVE_DLF.patch | 44 ----------- package/nfs-utils/Config.in | 5 +- package/nfs-utils/nfs-utils.hash | 4 +- package/nfs-utils/nfs-utils.mk | 4 +- 7 files changed, 82 insertions(+), 129 deletions(-) delete mode 100644 package/nfs-utils/0001-configure.ac-libevent-and-libsqlite3-checked-when-nf.patch create mode 100644 package/nfs-utils/0001-reexport-fsidd-reexport-.c-Re-add-missing-includes.patch create mode 100644 package/nfs-utils/0002-support-backend_sqlite.c-Add-missing-sys-syscall.h.patch delete mode 100644 package/nfs-utils/0002-support-reexport-guard-dlfcn.h-include-with-HAVE_DLF.patch diff --git a/package/nfs-utils/0001-configure.ac-libevent-and-libsqlite3-checked-when-nf.patch b/package/nfs-utils/0001-configure.ac-libevent-and-libsqlite3-checked-when-nf.patch deleted file mode 100644 index a6a6d56d7f..0000000000 --- a/package/nfs-utils/0001-configure.ac-libevent-and-libsqlite3-checked-when-nf.patch +++ /dev/null @@ -1,79 +0,0 @@ -From bc4a5deef9f820c55fdac3c0070364c17cd91cca Mon Sep 17 00:00:00 2001 -From: Wiktor Jaskulski -Date: Thu, 11 May 2023 15:28:23 -0400 -Subject: [PATCH] configure.ac: libevent and libsqlite3 checked when nfsv4 is - disabled - -Upstream: https://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=bc4a5deef9f820c55fdac3c0070364c17cd91cca - -Signed-off-by: Steve Dickson -Signed-off-by: Giulio Benetti ---- - configure.ac | 38 +++++++++++++++----------------------- - 1 file changed, 15 insertions(+), 23 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 9df52e9c..6fbcb974 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -338,42 +338,34 @@ CPPFLAGS="${nfsutils_save_CPPFLAGS}" - AC_CHECK_HEADER(uuid/uuid.h, , - AC_MSG_ERROR([Cannot find needed header file uuid/uuid.h. Install libuuid-devel])) - -+dnl check for libevent libraries and headers -+AC_LIBEVENT -+ -+dnl Check for sqlite3 -+AC_SQLITE3_VERS -+ -+case $libsqlite3_cv_is_recent in -+yes) ;; -+unknown) -+ dnl do not fail when cross-compiling -+ AC_MSG_WARN([assuming sqlite is at least v3.3]) ;; -+*) -+ AC_MSG_ERROR([nfsdcld requires sqlite-devel]) ;; -+esac -+ - if test "$enable_nfsv4" = yes; then -- dnl check for libevent libraries and headers -- AC_LIBEVENT - - dnl check for the keyutils libraries and headers - AC_KEYUTILS - -- dnl Check for sqlite3 -- AC_SQLITE3_VERS -- - if test "$enable_nfsdcld" = "yes"; then - AC_CHECK_HEADERS([libgen.h sys/inotify.h], , - AC_MSG_ERROR([Cannot find header needed for nfsdcld])) -- -- case $libsqlite3_cv_is_recent in -- yes) ;; -- unknown) -- dnl do not fail when cross-compiling -- AC_MSG_WARN([assuming sqlite is at least v3.3]) ;; -- *) -- AC_MSG_ERROR([nfsdcld requires sqlite-devel]) ;; -- esac - fi - - if test "$enable_nfsdcltrack" = "yes"; then - AC_CHECK_HEADERS([libgen.h sys/inotify.h], , - AC_MSG_ERROR([Cannot find header needed for nfsdcltrack])) -- -- case $libsqlite3_cv_is_recent in -- yes) ;; -- unknown) -- dnl do not fail when cross-compiling -- AC_MSG_WARN([assuming sqlite is at least v3.3]) ;; -- *) -- AC_MSG_ERROR([nfsdcltrack requires sqlite-devel]) ;; -- esac - fi - - else --- -2.34.1 - diff --git a/package/nfs-utils/0001-reexport-fsidd-reexport-.c-Re-add-missing-includes.patch b/package/nfs-utils/0001-reexport-fsidd-reexport-.c-Re-add-missing-includes.patch new file mode 100644 index 0000000000..4f79af450e --- /dev/null +++ b/package/nfs-utils/0001-reexport-fsidd-reexport-.c-Re-add-missing-includes.patch @@ -0,0 +1,44 @@ +From 4710e469cd0f512ac5e2c3c4335d8e21b97f21b0 Mon Sep 17 00:00:00 2001 +From: Petr Vorel +Date: Tue, 5 Dec 2023 20:40:36 +0100 +Subject: [PATCH] reexport/{fsidd,reexport}.c: Re-add missing includes + +Older uClibc-ng requires for close(2), unlink(2) and write(2), + for struct sockaddr_un. + +Fixes: 1a4edb2a ("reexport/fsidd.c: Remove unused headers") +Fixes: bdc79f02 ("support/reexport.c: Remove unused headers") +Signed-off-by: Petr Vorel +Upstream: https://lore.kernel.org/linux-nfs/20231205223543.31443-1-pvorel@suse.cz/ +--- + support/reexport/fsidd.c | 2 ++ + support/reexport/reexport.c | 1 + + 2 files changed, 3 insertions(+) + +diff --git a/support/reexport/fsidd.c b/support/reexport/fsidd.c +index 3e62b3fc..814fb48e 100644 +--- a/support/reexport/fsidd.c ++++ b/support/reexport/fsidd.c +@@ -7,6 +7,8 @@ + #include + #endif + #include ++#include ++#include + + #include "conffile.h" + #include "reexport_backend.h" +diff --git a/support/reexport/reexport.c b/support/reexport/reexport.c +index 78516586..1900b336 100644 +--- a/support/reexport/reexport.c ++++ b/support/reexport/reexport.c +@@ -7,6 +7,7 @@ + #endif + #include + #include ++#include + #include + + #include "nfsd_path.h" +-- +2.43.0 diff --git a/package/nfs-utils/0002-support-backend_sqlite.c-Add-missing-sys-syscall.h.patch b/package/nfs-utils/0002-support-backend_sqlite.c-Add-missing-sys-syscall.h.patch new file mode 100644 index 0000000000..88e1a9068d --- /dev/null +++ b/package/nfs-utils/0002-support-backend_sqlite.c-Add-missing-sys-syscall.h.patch @@ -0,0 +1,31 @@ +From aee92881ba80cf2ae7381d19f09e7fbeda57974c Mon Sep 17 00:00:00 2001 +From: Petr Vorel +Date: Tue, 5 Dec 2023 23:20:33 +0100 +Subject: [PATCH] support/backend_sqlite.c: Add missing + +This fixes build on systems which actually needs getrandom() +(to get SYS_getrandom). + +Fixes: f92fd6ca ("support/backend_sqlite.c: Add getrandom() fallback") +Fixes: http://autobuild.buildroot.net/results/c5fde6099a8b228a8bdc3154d1e47dfa192e94ed/ +Reported-by: Giulio Benetti +Signed-off-by: Petr Vorel +Upstream: https://lore.kernel.org/linux-nfs/20231205223543.31443-2-pvorel@suse.cz/ +--- + support/reexport/backend_sqlite.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/support/reexport/backend_sqlite.c b/support/reexport/backend_sqlite.c +index 0eb5ea37..54dfe447 100644 +--- a/support/reexport/backend_sqlite.c ++++ b/support/reexport/backend_sqlite.c +@@ -7,6 +7,7 @@ + #include + #include + #include ++#include + #include + + #ifdef HAVE_GETRANDOM +-- +2.43.0 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 deleted file mode 100644 index 6612847be7..0000000000 --- a/package/nfs-utils/0002-support-reexport-guard-dlfcn.h-include-with-HAVE_DLF.patch +++ /dev/null @@ -1,44 +0,0 @@ -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 - diff --git a/package/nfs-utils/Config.in b/package/nfs-utils/Config.in index b4568dc6f3..02cc7e78cc 100644 --- a/package/nfs-utils/Config.in +++ b/package/nfs-utils/Config.in @@ -1,11 +1,12 @@ -comment "nfs-utils needs a toolchain w/ threads" +comment "nfs-utils needs a toolchain w/ threads, headers >= 3.17" depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 config BR2_PACKAGE_NFS_UTILS bool "nfs-utils" depends on BR2_TOOLCHAIN_HAS_THREADS # libtirpc, rpcbind depends on BR2_USE_MMU # fork() + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 # getrandom() select BR2_PACKAGE_LIBEVENT select BR2_PACKAGE_LIBTIRPC # IPv6 requires libtirpc select BR2_PACKAGE_SQLITE diff --git a/package/nfs-utils/nfs-utils.hash b/package/nfs-utils/nfs-utils.hash index 015906553d..9d74991df1 100644 --- a/package/nfs-utils/nfs-utils.hash +++ b/package/nfs-utils/nfs-utils.hash @@ -1,4 +1,4 @@ -# From https://www.kernel.org/pub/linux/utils/nfs-utils/2.6.3/sha256sums.asc -sha256 38d89e853a71d3c560ff026af3d969d75e24f782ff68324e76261fe0344459e1 nfs-utils-2.6.3.tar.xz +# From https://www.kernel.org/pub/linux/utils/nfs-utils/2.6.4/sha256sums.asc +sha256 01b3b0fb9c7d0bbabf5114c736542030748c788ec2fd9734744201e9b0a1119d nfs-utils-2.6.4.tar.xz # Locally computed sha256 576540abf5e95029ad4ad90e32071385a5e95b2c30708c706116f3eb87b9a3de COPYING diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk index 3c85be0558..a11ba154ad 100644 --- a/package/nfs-utils/nfs-utils.mk +++ b/package/nfs-utils/nfs-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -NFS_UTILS_VERSION = 2.6.3 +NFS_UTILS_VERSION = 2.6.4 NFS_UTILS_SOURCE = nfs-utils-$(NFS_UTILS_VERSION).tar.xz NFS_UTILS_SITE = https://www.kernel.org/pub/linux/utils/nfs-utils/$(NFS_UTILS_VERSION) NFS_UTILS_LICENSE = GPL-2.0+ @@ -22,7 +22,7 @@ NFS_UTILS_CONF_OPTS = \ --with-statedir=/run/nfs \ --with-rpcgen=$(HOST_DIR)/bin/rpcgen -HOST_NFS_UTILS_DEPENDENCIES = host-pkgconf host-libtirpc host-libevent host-sqlite +HOST_NFS_UTILS_DEPENDENCIES = host-pkgconf host-libtirpc host-libevent host-sqlite host-util-linux HOST_NFS_UTILS_CONF_OPTS = \ --enable-tirpc \ From ea45b95c0e54866134c63e88e60489a012b3d134 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Thu, 14 Dec 2023 12:24:33 -0700 Subject: [PATCH 4482/5754] package/python-grpcio: new package Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-grpcio/Config.in | 6 ++++++ package/python-grpcio/python-grpcio.hash | 5 +++++ package/python-grpcio/python-grpcio.mk | 14 ++++++++++++++ 4 files changed, 26 insertions(+) create mode 100644 package/python-grpcio/Config.in create mode 100644 package/python-grpcio/python-grpcio.hash create mode 100644 package/python-grpcio/python-grpcio.mk diff --git a/package/Config.in b/package/Config.in index d5d89c50aa..69516c8705 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1105,6 +1105,7 @@ menu "External python modules" source "package/python-gobject/Config.in" source "package/python-gpiozero/Config.in" source "package/python-greenlet/Config.in" + source "package/python-grpcio/Config.in" source "package/python-gunicorn/Config.in" source "package/python-h11/Config.in" source "package/python-h2/Config.in" diff --git a/package/python-grpcio/Config.in b/package/python-grpcio/Config.in new file mode 100644 index 0000000000..e63ac2ae34 --- /dev/null +++ b/package/python-grpcio/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_GRPCIO + bool "python-grpcio" + help + HTTP/2-based RPC framework. + + https://grpc.io diff --git a/package/python-grpcio/python-grpcio.hash b/package/python-grpcio/python-grpcio.hash new file mode 100644 index 0000000000..39366f576e --- /dev/null +++ b/package/python-grpcio/python-grpcio.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/grpcio/json +md5 480bfb7435426de392a883e6516aae79 grpcio-1.60.0.tar.gz +sha256 2199165a1affb666aa24adf0c97436686d0a61bc5fc113c037701fb7c7fceb96 grpcio-1.60.0.tar.gz +# Locally computed sha256 checksums +sha256 590198e3f305f2c347fde64d637c65492bbef554db6c8364e149cd375e3797ee LICENSE diff --git a/package/python-grpcio/python-grpcio.mk b/package/python-grpcio/python-grpcio.mk new file mode 100644 index 0000000000..3d264de4af --- /dev/null +++ b/package/python-grpcio/python-grpcio.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-grpcio +# +################################################################################ + +PYTHON_GRPCIO_VERSION = 1.60.0 +PYTHON_GRPCIO_SOURCE = grpcio-$(PYTHON_GRPCIO_VERSION).tar.gz +PYTHON_GRPCIO_SITE = https://files.pythonhosted.org/packages/61/38/c615b5c2be690fb31871f294cc08a96e598b085b8d07c5967a5018e0b90c +PYTHON_GRPCIO_SETUP_TYPE = setuptools +PYTHON_GRPCIO_LICENSE = Apache-2.0 +PYTHON_GRPCIO_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From 3217fedcb8c8006809c1a3d214c97597677a07fd Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Thu, 14 Dec 2023 12:24:34 -0700 Subject: [PATCH 4483/5754] package/python-grpcio-reflection: new package Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-grpcio-reflection/Config.in | 8 ++++++++ .../python-grpcio-reflection.hash | 5 +++++ .../python-grpcio-reflection.mk | 14 ++++++++++++++ 4 files changed, 28 insertions(+) create mode 100644 package/python-grpcio-reflection/Config.in create mode 100644 package/python-grpcio-reflection/python-grpcio-reflection.hash create mode 100644 package/python-grpcio-reflection/python-grpcio-reflection.mk diff --git a/package/Config.in b/package/Config.in index 69516c8705..d538083b76 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1106,6 +1106,7 @@ menu "External python modules" source "package/python-gpiozero/Config.in" source "package/python-greenlet/Config.in" source "package/python-grpcio/Config.in" + source "package/python-grpcio-reflection/Config.in" source "package/python-gunicorn/Config.in" source "package/python-h11/Config.in" source "package/python-h2/Config.in" diff --git a/package/python-grpcio-reflection/Config.in b/package/python-grpcio-reflection/Config.in new file mode 100644 index 0000000000..d2ee039c5f --- /dev/null +++ b/package/python-grpcio-reflection/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_GRPCIO_REFLECTION + bool "python-grpcio-reflection" + select BR2_PACKAGE_PYTHON_GRPCIO # runtime + select BR2_PACKAGE_PYTHON_PROTOBUF # runtime + help + Standard Protobuf Reflection Service for gRPC. + + https://grpc.io diff --git a/package/python-grpcio-reflection/python-grpcio-reflection.hash b/package/python-grpcio-reflection/python-grpcio-reflection.hash new file mode 100644 index 0000000000..d17087d4bb --- /dev/null +++ b/package/python-grpcio-reflection/python-grpcio-reflection.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/grpcio-reflection/json +md5 f93b042f8092cf1818f249518668a78a grpcio-reflection-1.60.0.tar.gz +sha256 3f6c0c73ba8f20d1420c5e72fc4dd0389fac346ed8fb32a28e6e1967b44fff35 grpcio-reflection-1.60.0.tar.gz +# Locally computed sha256 checksums +sha256 590198e3f305f2c347fde64d637c65492bbef554db6c8364e149cd375e3797ee LICENSE diff --git a/package/python-grpcio-reflection/python-grpcio-reflection.mk b/package/python-grpcio-reflection/python-grpcio-reflection.mk new file mode 100644 index 0000000000..b3d2fdffa8 --- /dev/null +++ b/package/python-grpcio-reflection/python-grpcio-reflection.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-grpcio-reflection +# +################################################################################ + +PYTHON_GRPCIO_REFLECTION_VERSION = 1.60.0 +PYTHON_GRPCIO_REFLECTION_SOURCE = grpcio-reflection-$(PYTHON_GRPCIO_REFLECTION_VERSION).tar.gz +PYTHON_GRPCIO_REFLECTION_SITE = https://files.pythonhosted.org/packages/33/3a/e257225b8fd9f05d2af3e363459f0d074ca684438667892ea3215e2162ca +PYTHON_GRPCIO_REFLECTION_SETUP_TYPE = setuptools +PYTHON_GRPCIO_REFLECTION_LICENSE = Apache-2.0 +PYTHON_GRPCIO_REFLECTION_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From 34b9fa1caaddf11e52953f087eeb9cf9c26cbd62 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Thu, 14 Dec 2023 12:24:35 -0700 Subject: [PATCH 4484/5754] package/python-cachetools: new package Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-cachetools/Config.in | 6 ++++++ package/python-cachetools/python-cachetools.hash | 5 +++++ package/python-cachetools/python-cachetools.mk | 14 ++++++++++++++ 4 files changed, 26 insertions(+) create mode 100644 package/python-cachetools/Config.in create mode 100644 package/python-cachetools/python-cachetools.hash create mode 100644 package/python-cachetools/python-cachetools.mk diff --git a/package/Config.in b/package/Config.in index d538083b76..af330eeacf 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1015,6 +1015,7 @@ menu "External python modules" source "package/python-brotli/Config.in" source "package/python-bsdiff4/Config.in" source "package/python-cached-property/Config.in" + source "package/python-cachetools/Config.in" source "package/python-can/Config.in" source "package/python-canopen/Config.in" source "package/python-cbor/Config.in" diff --git a/package/python-cachetools/Config.in b/package/python-cachetools/Config.in new file mode 100644 index 0000000000..550e3d2560 --- /dev/null +++ b/package/python-cachetools/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_CACHETOOLS + bool "python-cachetools" + help + Extensible memoizing collections and decorators. + + https://github.com/tkem/cachetools/ diff --git a/package/python-cachetools/python-cachetools.hash b/package/python-cachetools/python-cachetools.hash new file mode 100644 index 0000000000..7b6b939191 --- /dev/null +++ b/package/python-cachetools/python-cachetools.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/cachetools/json +md5 5317c13b69c4021e925a2fbbc199bcc9 cachetools-5.3.2.tar.gz +sha256 086ee420196f7b2ab9ca2db2520aca326318b68fe5ba8bc4d49cca91add450f2 cachetools-5.3.2.tar.gz +# Locally computed sha256 checksums +sha256 76260c1370a7d41d5fac71a27d781f3add5d7249adfbbfa930846d2d9e47dbd5 LICENSE diff --git a/package/python-cachetools/python-cachetools.mk b/package/python-cachetools/python-cachetools.mk new file mode 100644 index 0000000000..c841e0761f --- /dev/null +++ b/package/python-cachetools/python-cachetools.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-cachetools +# +################################################################################ + +PYTHON_CACHETOOLS_VERSION = 5.3.2 +PYTHON_CACHETOOLS_SOURCE = cachetools-$(PYTHON_CACHETOOLS_VERSION).tar.gz +PYTHON_CACHETOOLS_SITE = https://files.pythonhosted.org/packages/10/21/1b6880557742c49d5b0c4dcf0cf544b441509246cdd71182e0847ac859d5 +PYTHON_CACHETOOLS_SETUP_TYPE = setuptools +PYTHON_CACHETOOLS_LICENSE = MIT +PYTHON_CACHETOOLS_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From 9ffb74fd91bd301f1ec0cc0fbd30da9bbd0f1eac Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Thu, 14 Dec 2023 12:24:36 -0700 Subject: [PATCH 4485/5754] package/python-google-auth: new package Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-google-auth/Config.in | 9 +++++++++ package/python-google-auth/python-google-auth.hash | 5 +++++ package/python-google-auth/python-google-auth.mk | 14 ++++++++++++++ 4 files changed, 29 insertions(+) create mode 100644 package/python-google-auth/Config.in create mode 100644 package/python-google-auth/python-google-auth.hash create mode 100644 package/python-google-auth/python-google-auth.mk diff --git a/package/Config.in b/package/Config.in index af330eeacf..422e8a8b40 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1104,6 +1104,7 @@ menu "External python modules" source "package/python-gitdb2/Config.in" source "package/python-gnupg/Config.in" source "package/python-gobject/Config.in" + source "package/python-google-auth/Config.in" source "package/python-gpiozero/Config.in" source "package/python-greenlet/Config.in" source "package/python-grpcio/Config.in" diff --git a/package/python-google-auth/Config.in b/package/python-google-auth/Config.in new file mode 100644 index 0000000000..eb5be9cda5 --- /dev/null +++ b/package/python-google-auth/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_PYTHON_GOOGLE_AUTH + bool "python-google-auth" + select BR2_PACKAGE_PYTHON_CACHETOOLS # runtime + select BR2_PACKAGE_PYTHON_PYASN1_MODULES # runtime + select BR2_PACKAGE_PYTHON_RSA # runtime + help + Google Authentication Library. + + https://github.com/googleapis/google-auth-library-python diff --git a/package/python-google-auth/python-google-auth.hash b/package/python-google-auth/python-google-auth.hash new file mode 100644 index 0000000000..2f965edc91 --- /dev/null +++ b/package/python-google-auth/python-google-auth.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/google-auth/json +md5 40413bc699c6e02d7732e7e09e8cec0c google-auth-2.25.2.tar.gz +sha256 42f707937feb4f5e5a39e6c4f343a17300a459aaf03141457ba505812841cc40 google-auth-2.25.2.tar.gz +# Locally computed sha256 checksums +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/python-google-auth/python-google-auth.mk b/package/python-google-auth/python-google-auth.mk new file mode 100644 index 0000000000..8638a2ca46 --- /dev/null +++ b/package/python-google-auth/python-google-auth.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-google-auth +# +################################################################################ + +PYTHON_GOOGLE_AUTH_VERSION = 2.25.2 +PYTHON_GOOGLE_AUTH_SOURCE = google-auth-$(PYTHON_GOOGLE_AUTH_VERSION).tar.gz +PYTHON_GOOGLE_AUTH_SITE = https://files.pythonhosted.org/packages/05/77/84608894384e02f3b0b2621b09ecb0b85e57ba368f13eecbbc43cd1b8719 +PYTHON_GOOGLE_AUTH_SETUP_TYPE = setuptools +PYTHON_GOOGLE_AUTH_LICENSE = Apache-2.0 +PYTHON_GOOGLE_AUTH_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From d37766a886a8dc3d49d45e14955411700a5efd26 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Thu, 14 Dec 2023 12:24:37 -0700 Subject: [PATCH 4486/5754] package/python-googleapis-common-protos: new package Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-googleapis-common-protos/Config.in | 7 +++++++ .../python-googleapis-common-protos.hash | 5 +++++ .../python-googleapis-common-protos.mk | 14 ++++++++++++++ 4 files changed, 27 insertions(+) create mode 100644 package/python-googleapis-common-protos/Config.in create mode 100644 package/python-googleapis-common-protos/python-googleapis-common-protos.hash create mode 100644 package/python-googleapis-common-protos/python-googleapis-common-protos.mk diff --git a/package/Config.in b/package/Config.in index 422e8a8b40..dd59baad06 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1105,6 +1105,7 @@ menu "External python modules" source "package/python-gnupg/Config.in" source "package/python-gobject/Config.in" source "package/python-google-auth/Config.in" + source "package/python-googleapis-common-protos/Config.in" source "package/python-gpiozero/Config.in" source "package/python-greenlet/Config.in" source "package/python-grpcio/Config.in" diff --git a/package/python-googleapis-common-protos/Config.in b/package/python-googleapis-common-protos/Config.in new file mode 100644 index 0000000000..8f487f5ee6 --- /dev/null +++ b/package/python-googleapis-common-protos/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_GOOGLEAPIS_COMMON_PROTOS + bool "python-googleapis-common-protos" + select BR2_PACKAGE_PYTHON_PROTOBUF # runtime + help + Common protobufs used in Google APIs. + + https://github.com/googleapis/python-api-common-protos diff --git a/package/python-googleapis-common-protos/python-googleapis-common-protos.hash b/package/python-googleapis-common-protos/python-googleapis-common-protos.hash new file mode 100644 index 0000000000..1169e945e9 --- /dev/null +++ b/package/python-googleapis-common-protos/python-googleapis-common-protos.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/googleapis-common-protos/json +md5 148bfe9b5a92663c5ff0a6700453ebad googleapis-common-protos-1.62.0.tar.gz +sha256 83f0ece9f94e5672cced82f592d2a5edf527a96ed1794f0bab36d5735c996277 googleapis-common-protos-1.62.0.tar.gz +# Locally computed sha256 checksums +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/python-googleapis-common-protos/python-googleapis-common-protos.mk b/package/python-googleapis-common-protos/python-googleapis-common-protos.mk new file mode 100644 index 0000000000..ca943a1cd3 --- /dev/null +++ b/package/python-googleapis-common-protos/python-googleapis-common-protos.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-googleapis-common-protos +# +################################################################################ + +PYTHON_GOOGLEAPIS_COMMON_PROTOS_VERSION = 1.62.0 +PYTHON_GOOGLEAPIS_COMMON_PROTOS_SOURCE = googleapis-common-protos-$(PYTHON_GOOGLEAPIS_COMMON_PROTOS_VERSION).tar.gz +PYTHON_GOOGLEAPIS_COMMON_PROTOS_SITE = https://files.pythonhosted.org/packages/4a/5f/eb12d721b45d20a977289d674e179995a0ddab1684d2c61b29a63d43a5f1 +PYTHON_GOOGLEAPIS_COMMON_PROTOS_SETUP_TYPE = setuptools +PYTHON_GOOGLEAPIS_COMMON_PROTOS_LICENSE = Apache-2.0 +PYTHON_GOOGLEAPIS_COMMON_PROTOS_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From 9553dc98d30edaeb7a7ab4b7d8bc8c6fbb17b9fb Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Thu, 14 Dec 2023 12:24:38 -0700 Subject: [PATCH 4487/5754] package/python-google-api-core: new package Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-google-api-core/Config.in | 10 ++++++++++ .../python-google-api-core.hash | 5 +++++ .../python-google-api-core.mk | 14 ++++++++++++++ 4 files changed, 30 insertions(+) create mode 100644 package/python-google-api-core/Config.in create mode 100644 package/python-google-api-core/python-google-api-core.hash create mode 100644 package/python-google-api-core/python-google-api-core.mk diff --git a/package/Config.in b/package/Config.in index dd59baad06..3cd91beaf2 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1104,6 +1104,7 @@ menu "External python modules" source "package/python-gitdb2/Config.in" source "package/python-gnupg/Config.in" source "package/python-gobject/Config.in" + source "package/python-google-api-core/Config.in" source "package/python-google-auth/Config.in" source "package/python-googleapis-common-protos/Config.in" source "package/python-gpiozero/Config.in" diff --git a/package/python-google-api-core/Config.in b/package/python-google-api-core/Config.in new file mode 100644 index 0000000000..689923a2f4 --- /dev/null +++ b/package/python-google-api-core/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_PYTHON_GOOGLE_API_CORE + bool "python-google-api-core" + select BR2_PACKAGE_PYTHON_GOOGLE_AUTH # runtime + select BR2_PACKAGE_PYTHON_GOOGLEAPIS_COMMON_PROTOS # runtime + select BR2_PACKAGE_PYTHON_PROTOBUF # runtime + select BR2_PACKAGE_PYTHON_REQUESTS # runtime + help + Google API client core library. + + https://github.com/googleapis/python-api-core diff --git a/package/python-google-api-core/python-google-api-core.hash b/package/python-google-api-core/python-google-api-core.hash new file mode 100644 index 0000000000..5a1cd7f1cb --- /dev/null +++ b/package/python-google-api-core/python-google-api-core.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/google-api-core/json +md5 58a4ce34a405e514cdb5295c80834cfd google-api-core-2.15.0.tar.gz +sha256 abc978a72658f14a2df1e5e12532effe40f94f868f6e23d95133bd6abcca35ca google-api-core-2.15.0.tar.gz +# Locally computed sha256 checksums +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/python-google-api-core/python-google-api-core.mk b/package/python-google-api-core/python-google-api-core.mk new file mode 100644 index 0000000000..84042d8d7a --- /dev/null +++ b/package/python-google-api-core/python-google-api-core.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-google-api-core +# +################################################################################ + +PYTHON_GOOGLE_API_CORE_VERSION = 2.15.0 +PYTHON_GOOGLE_API_CORE_SOURCE = google-api-core-$(PYTHON_GOOGLE_API_CORE_VERSION).tar.gz +PYTHON_GOOGLE_API_CORE_SITE = https://files.pythonhosted.org/packages/2c/e4/56b14d35057a23cab9067dd8fb841407d05d32b5d6c7a3c66c1360e8a7c0 +PYTHON_GOOGLE_API_CORE_SETUP_TYPE = setuptools +PYTHON_GOOGLE_API_CORE_LICENSE = Apache-2.0 +PYTHON_GOOGLE_API_CORE_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From ed74b4cc5326ff75319067b914c1b46852a85fde Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Thu, 14 Dec 2023 12:24:39 -0700 Subject: [PATCH 4488/5754] package/python-grpc-requests: new package Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-grpc-requests/Config.in | 11 +++++++++++ .../python-grpc-requests/python-grpc-requests.hash | 5 +++++ .../python-grpc-requests/python-grpc-requests.mk | 14 ++++++++++++++ 4 files changed, 31 insertions(+) create mode 100644 package/python-grpc-requests/Config.in create mode 100644 package/python-grpc-requests/python-grpc-requests.hash create mode 100644 package/python-grpc-requests/python-grpc-requests.mk diff --git a/package/Config.in b/package/Config.in index 3cd91beaf2..38c36428b9 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1109,6 +1109,7 @@ menu "External python modules" source "package/python-googleapis-common-protos/Config.in" source "package/python-gpiozero/Config.in" source "package/python-greenlet/Config.in" + source "package/python-grpc-requests/Config.in" source "package/python-grpcio/Config.in" source "package/python-grpcio-reflection/Config.in" source "package/python-gunicorn/Config.in" diff --git a/package/python-grpc-requests/Config.in b/package/python-grpc-requests/Config.in new file mode 100644 index 0000000000..3c266e5976 --- /dev/null +++ b/package/python-grpc-requests/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_PYTHON_GRPC_REQUESTS + bool "python-grpc-requests" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-cryptography + select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime + select BR2_PACKAGE_PYTHON_GOOGLE_API_CORE # runtime + select BR2_PACKAGE_PYTHON_GRPCIO # runtime + select BR2_PACKAGE_PYTHON_GRPCIO_REFLECTION # runtime + help + grpc for Humans. grpc reflection support client. + + https://github.com/wesky93/grpc_requests diff --git a/package/python-grpc-requests/python-grpc-requests.hash b/package/python-grpc-requests/python-grpc-requests.hash new file mode 100644 index 0000000000..c816a65b50 --- /dev/null +++ b/package/python-grpc-requests/python-grpc-requests.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/grpc-requests/json +md5 39f0d7ef45ab3620d8b63c2408af35b0 grpc_requests-0.1.13.tar.gz +sha256 30a00493b206156b94be21f641edcbef5ea69fb43daf503390da661123520521 grpc_requests-0.1.13.tar.gz +# Locally computed sha256 checksums +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/python-grpc-requests/python-grpc-requests.mk b/package/python-grpc-requests/python-grpc-requests.mk new file mode 100644 index 0000000000..9ffd73d424 --- /dev/null +++ b/package/python-grpc-requests/python-grpc-requests.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-grpc-requests +# +################################################################################ + +PYTHON_GRPC_REQUESTS_VERSION = 0.1.13 +PYTHON_GRPC_REQUESTS_SOURCE = grpc_requests-$(PYTHON_GRPC_REQUESTS_VERSION).tar.gz +PYTHON_GRPC_REQUESTS_SITE = https://files.pythonhosted.org/packages/46/51/8981bce4ca61bce1c7b7a12dd04f6cbd35c4ea874842b06283f6bbc9a0e8 +PYTHON_GRPC_REQUESTS_SETUP_TYPE = setuptools +PYTHON_GRPC_REQUESTS_LICENSE = Apache-2.0 +PYTHON_GRPC_REQUESTS_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From a1dce92c728a8df097dee7400305e116485a120a Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 3 Jan 2024 18:41:10 +0100 Subject: [PATCH 4489/5754] package/valijson: drop unrecognized option Commit d264b6e81e1a03c36df55c66771ed26dd767a522 forgot to drop valijson_INSTALL_HEADERS option which has been removed with https://github.com/tristanpenman/valijson/commit/c7d5f2cbec08b0e649fdeee6a99f2f1343baaa75 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/valijson/valijson.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/valijson/valijson.mk b/package/valijson/valijson.mk index 51a9353960..875c913b09 100644 --- a/package/valijson/valijson.mk +++ b/package/valijson/valijson.mk @@ -11,6 +11,6 @@ VALIJSON_LICENSE_FILES = LICENSE VALIJSON_CPE_ID_VENDOR = valijson_project VALIJSON_INSTALL_STAGING = YES VALIJSON_INSTALL_TARGET = NO -VALIJSON_CONF_OPTS = -Dvalijson_INSTALL_HEADERS=TRUE -Dvalijson_BUILD_TESTS=FALSE +VALIJSON_CONF_OPTS = -Dvalijson_BUILD_TESTS=FALSE $(eval $(cmake-package)) From fd835c3ef667195d5369b8806471293c81a43515 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 3 Jan 2024 18:41:11 +0100 Subject: [PATCH 4490/5754] package/valijson: bump to version 1.0.2 Update hash of LICENSE file (typo fixed by https://github.com/tristanpenman/valijson/commit/c0ce4cde7e89c1a88a82ddc4ae32727e1a01998f) https://github.com/tristanpenman/valijson/releases/tag/v1.0.2 https://github.com/tristanpenman/valijson/releases/tag/v1.0.1 https://github.com/tristanpenman/valijson/releases/tag/v1.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/valijson/valijson.hash | 4 ++-- package/valijson/valijson.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/valijson/valijson.hash b/package/valijson/valijson.hash index aacdf7dedc..592d2c900e 100644 --- a/package/valijson/valijson.hash +++ b/package/valijson/valijson.hash @@ -1,3 +1,3 @@ # Locally Computed: -sha256 bc24736709acfb252a5fdcb5145f1f2670c7aecaba3356f6f8ba54903800fa5c valijson-0.7.tar.gz -sha256 1a0f99926a2dbec30eba3db820236d9953fbe3048976923ac24980e655fbe991 LICENSE +sha256 35d86e54fc727f1265226434dc996e33000a570f833537a25c8b702b0b824431 valijson-1.0.2.tar.gz +sha256 61b5766db38eaa3f320c366357956d7743424bfbf90fd78f5943866ba237589e LICENSE diff --git a/package/valijson/valijson.mk b/package/valijson/valijson.mk index 875c913b09..5b68dc9864 100644 --- a/package/valijson/valijson.mk +++ b/package/valijson/valijson.mk @@ -4,7 +4,7 @@ # ################################################################################ -VALIJSON_VERSION = 0.7 +VALIJSON_VERSION = 1.0.2 VALIJSON_SITE = $(call github,tristanpenman,valijson,v$(VALIJSON_VERSION)) VALIJSON_LICENSE = BSD-2-Clause VALIJSON_LICENSE_FILES = LICENSE From 5810e9db8b72417e34c2b644f3d82c5e155ca567 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 3 Jan 2024 18:42:38 +0100 Subject: [PATCH 4491/5754] package/vnstat: bump to version 2.11 https://github.com/vergoh/vnstat/releases/tag/v2.11 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/vnstat/vnstat.hash | 2 +- package/vnstat/vnstat.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/vnstat/vnstat.hash b/package/vnstat/vnstat.hash index bad4325d90..87d2a6d687 100644 --- a/package/vnstat/vnstat.hash +++ b/package/vnstat/vnstat.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a9c61744e5cd8c366e2db4d282badc74021ddb614bd65b41240937997e457d25 vnstat-2.10.tar.gz +sha256 babc3f1583cc40e4e8ffb2f53296d93d308cb5a5043e85054f6eaf7b4ae57856 vnstat-2.11.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/vnstat/vnstat.mk b/package/vnstat/vnstat.mk index 3b2951b8c9..665c0feaf3 100644 --- a/package/vnstat/vnstat.mk +++ b/package/vnstat/vnstat.mk @@ -4,7 +4,7 @@ # ################################################################################ -VNSTAT_VERSION = 2.10 +VNSTAT_VERSION = 2.11 VNSTAT_SITE = http://humdi.net/vnstat VNSTAT_LICENSE = GPL-2.0 VNSTAT_LICENSE_FILES = COPYING From ce151f52d1543d7e56ea374d44cc2ead3bf9a883 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 3 Jan 2024 19:18:26 +0100 Subject: [PATCH 4492/5754] package/utf8proc: bump to version 2.9.0 Use official tarball https://github.com/JuliaStrings/utf8proc/blob/v2.9.0/NEWS.md Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/utf8proc/utf8proc.hash | 2 +- package/utf8proc/utf8proc.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/utf8proc/utf8proc.hash b/package/utf8proc/utf8proc.hash index 658ffa1f7c..7fee89968d 100644 --- a/package/utf8proc/utf8proc.hash +++ b/package/utf8proc/utf8proc.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a0a60a79fe6f6d54e7d411facbfcc867a6e198608f2cd992490e46f04b1bcecc utf8proc-2.8.0.tar.gz +sha256 bd215d04313b5bc42c1abedbcb0a6574667e31acee1085543a232204e36384c4 utf8proc-2.9.0.tar.gz sha256 3b510150d34f248a221bb88e1d811238d6c6c18b51231822c42974c39bb07256 LICENSE.md diff --git a/package/utf8proc/utf8proc.mk b/package/utf8proc/utf8proc.mk index b08c6e7109..42ec48e0a8 100644 --- a/package/utf8proc/utf8proc.mk +++ b/package/utf8proc/utf8proc.mk @@ -4,8 +4,8 @@ # ################################################################################ -UTF8PROC_VERSION = 2.8.0 -UTF8PROC_SITE = $(call github,JuliaStrings,utf8proc,v$(UTF8PROC_VERSION)) +UTF8PROC_VERSION = 2.9.0 +UTF8PROC_SITE = https://github.com/JuliaStrings/utf8proc/releases/download/v$(UTF8PROC_VERSION) UTF8PROC_LICENSE = MIT UTF8PROC_LICENSE_FILES = LICENSE.md UTF8PROC_INSTALL_STAGING = YES From 7b7bac9bb2c1c977e4791c4430e2fff54522f257 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 3 Jan 2024 19:19:34 +0100 Subject: [PATCH 4493/5754] package/gdal: add sqlite optional dependency Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/gdal/gdal.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/gdal/gdal.mk b/package/gdal/gdal.mk index 5690f55c00..e9dcc826b5 100644 --- a/package/gdal/gdal.mk +++ b/package/gdal/gdal.mk @@ -91,7 +91,6 @@ GDAL_CONF_OPTS = \ -DGDAL_USE_SFCGAL=OFF \ -DGDAL_USE_FYBA=OFF \ -DGDAL_USE_SPATIALITE=OFF \ - -DGDAL_USE_SQLITE3=OFF \ -DGDAL_USE_TEIGHA=OFF \ -DGDAL_USE_TILEDB=OFF \ -DGDAL_USE_WEBP=OFF \ @@ -127,4 +126,11 @@ else GDAL_CONF_OPTS += -DGDAL_USE_POSTGRESQL=OFF endif +ifeq ($(BR2_PACKAGE_SQLITE),y) +GDAL_DEPENDENCIES += sqlite +GDAL_CONF_OPTS += -DGDAL_USE_SQLITE3=ON +else +GDAL_CONF_OPTS += -DGDAL_USE_SQLITE3=OFF +endif + $(eval $(cmake-package)) From 0ff1235c8ddd33807f263736c46b91d9cc8a7af8 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 3 Jan 2024 19:20:26 +0100 Subject: [PATCH 4494/5754] package/usbutils: bump to version 017 https://github.com/gregkh/usbutils/blob/v017/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/usbutils/usbutils.hash | 2 +- package/usbutils/usbutils.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/usbutils/usbutils.hash b/package/usbutils/usbutils.hash index caedf5fd80..2c863543f6 100644 --- a/package/usbutils/usbutils.hash +++ b/package/usbutils/usbutils.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/utils/usb/usbutils/sha256sums.asc -sha256 c3b451bb1f4ff9f6356cac5a6956a9ac8e85d81651af56a29e689f94fa6fda6e usbutils-015.tar.xz +sha256 a6a25ffdcf9103e38d7a44732aca17073f4e602b92e4ae55625231a82702e05b usbutils-017.tar.xz # Locally calculated sha256 91412672119c72352b76c1d48fa1a8b7cdc7f70be7929e468c8805db468e23e4 LICENSES/GPL-2.0-only.txt sha256 4631da83311d27f99078d0d102e31bd34a4fcbcc2dae2aa40f1454a5b48125dc LICENSES/GPL-3.0-only.txt diff --git a/package/usbutils/usbutils.mk b/package/usbutils/usbutils.mk index 84a6a625cf..c2073df3b3 100644 --- a/package/usbutils/usbutils.mk +++ b/package/usbutils/usbutils.mk @@ -4,7 +4,7 @@ # ################################################################################ -USBUTILS_VERSION = 015 +USBUTILS_VERSION = 017 USBUTILS_SOURCE = usbutils-$(USBUTILS_VERSION).tar.xz USBUTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/usb/usbutils USBUTILS_DEPENDENCIES = host-pkgconf libusb udev From a4536589d3989e7324e61fd3f4ccbad547564f1c Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 3 Jan 2024 20:02:58 +0100 Subject: [PATCH 4495/5754] package/exim: security bump version to 4.97.1 Fixes CVE-2023-51766: https://seclists.org/oss-sec/2023/q4/348 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/exim/exim.hash | 4 ++-- package/exim/exim.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/exim/exim.hash b/package/exim/exim.hash index 6336a40427..a3822302fb 100644 --- a/package/exim/exim.hash +++ b/package/exim/exim.hash @@ -1,6 +1,6 @@ # From https://ftp.exim.org/pub/exim/exim4/00-sha256sums.txt -sha256 428150e67c494fa14fe5195d81b972c1b23e651ee4f9f2ff1788250266d31e9c exim-4.97.tar.xz +sha256 bd782057509a793593508528590626d185ea160ce32cb34beda262e99cefdfa9 exim-4.97.1.tar.xz # From https://ftp.exim.org/pub/exim/exim4/00-sha512sums.txt -sha512 b28cbb49fa7e143dfcc94e004d57cf98a1945013e676cd103c1ee4cf52933d49d378baa13bea2663353dba97745d6b2ab8b7b66cde870788a2d85d7abd716968 exim-4.97.tar.xz +sha512 eab7ca28b37f1635c48f5e963ab69fcbad539b2c35a84286ecaad7d7ff5210bbefce86452302e08099afdc0710f9cb7ca6d9b152b0ba88a19292f7c5541e0cfc exim-4.97.1.tar.xz # Locally calculated sha256 49240db527b7e55b312a46fc59794fde5dd006422e422257f4f057bfd27b3c8f LICENCE diff --git a/package/exim/exim.mk b/package/exim/exim.mk index 23d888e6f2..fb9eecd71b 100644 --- a/package/exim/exim.mk +++ b/package/exim/exim.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXIM_VERSION = 4.97 +EXIM_VERSION = 4.97.1 EXIM_SOURCE = exim-$(EXIM_VERSION).tar.xz EXIM_SITE = https://ftp.exim.org/pub/exim/exim4 EXIM_LICENSE = GPL-2.0+ From d8e19f8de8dc7f0e1389515044d584aa4733682a Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 3 Jan 2024 20:22:00 +0100 Subject: [PATCH 4496/5754] package/tinyxml2: bump to version 10.0.0 https://github.com/leethomason/tinyxml2/releases/tag/10.0.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/tinyxml2/tinyxml2.hash | 2 +- package/tinyxml2/tinyxml2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tinyxml2/tinyxml2.hash b/package/tinyxml2/tinyxml2.hash index ff799bc2eb..a131b8624d 100644 --- a/package/tinyxml2/tinyxml2.hash +++ b/package/tinyxml2/tinyxml2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 cc2f1417c308b1f6acc54f88eb70771a0bf65f76282ce5c40e54cfe52952702c tinyxml2-9.0.0.tar.gz +sha256 3bdf15128ba16686e69bce256cc468e76c7b94ff2c7f391cc5ec09e40bff3839 tinyxml2-10.0.0.tar.gz sha256 9332252e9b9e46db8285d4a3f0bf25f139bf1dca6781b956d57f2302efca6432 LICENSE.txt diff --git a/package/tinyxml2/tinyxml2.mk b/package/tinyxml2/tinyxml2.mk index 0a857e5732..5ea9e13a4b 100644 --- a/package/tinyxml2/tinyxml2.mk +++ b/package/tinyxml2/tinyxml2.mk @@ -4,7 +4,7 @@ # ################################################################################ -TINYXML2_VERSION = 9.0.0 +TINYXML2_VERSION = 10.0.0 TINYXML2_SITE = $(call github,leethomason,tinyxml2,$(TINYXML2_VERSION)) TINYXML2_LICENSE = Zlib TINYXML2_LICENSE_FILES = LICENSE.txt From 620cd04da4ae7027923b7be2e071c59ed900897e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 3 Jan 2024 20:23:11 +0100 Subject: [PATCH 4497/5754] package/stress: bump to version 1.0.7 Use official tarball and so drop autoreconf https://github.com/resurrecting-open-source-projects/stress/blob/1.0.7/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/stress/stress.hash | 2 +- package/stress/stress.mk | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package/stress/stress.hash b/package/stress/stress.hash index dc1785b6c7..ac36122594 100644 --- a/package/stress/stress.hash +++ b/package/stress/stress.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 1798e49ca365d928fb194ba1b8e8d1e09963b49e9edb0a78bcbba15750bb5027 stress-1.0.5.tar.gz +sha256 e63adb57597e617c14ecb0d841b5d990460796d9e9ec69bd56fe645ef02eb239 stress-1.0.7.tar.bz2 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/stress/stress.mk b/package/stress/stress.mk index 99a50f349e..53f01b3b0a 100644 --- a/package/stress/stress.mk +++ b/package/stress/stress.mk @@ -4,12 +4,11 @@ # ################################################################################ -STRESS_VERSION = 1.0.5 -STRESS_SITE = $(call github,resurrecting-open-source-projects,stress,$(STRESS_VERSION)) +STRESS_VERSION = 1.0.7 +STRESS_SOURCE = stress-$(STRESS_VERSION).tar.bz2 +STRESS_SITE = https://github.com/resurrecting-open-source-projects/stress/releases/download/$(STRESS_VERSION) STRESS_LICENSE = GPL-2.0+ STRESS_LICENSE_FILES = COPYING -# From git -STRESS_AUTORECONF = YES # Stress is linked statically if the --enable-static is specified. # However, this option is always specified in the global From cd9eaf192035281aea1972d817a36a4708105e62 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 3 Jan 2024 20:26:25 +0100 Subject: [PATCH 4498/5754] package/tvheadend: bump version Updated license hash due to upstream commit https://github.com/tvheadend/tvheadend/commit/3cf5acdc714dc025b2246d2395478fcfd058afeb Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/tvheadend/tvheadend.hash | 4 ++-- package/tvheadend/tvheadend.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/tvheadend/tvheadend.hash b/package/tvheadend/tvheadend.hash index 5a9ec3df23..62c954234d 100644 --- a/package/tvheadend/tvheadend.hash +++ b/package/tvheadend/tvheadend.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 98a27a6a5ce2fc800df6d154534f494582418f6b24b3a1c30267785d191e50df tvheadend-62adbebfd062d7b97829268274aad92df2033784.tar.gz -sha256 54dc3cbc00bf126bcba43e2af7f3ad1dc00f335985da1409fa943c7b7256d942 LICENSE.md +sha256 99a2fd954d8e620029759f5a65dc09271c168cd047a6a152a0fe643de64823cf tvheadend-b40a62b31e809523d2fe2f7f3f331cc55dfdbd0f.tar.gz +sha256 16aaf037a2d00e6e7804de64619887fc7539f1ede99e3282c86dfbc61c2af63e LICENSE.md diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk index 1d4e6ee30c..816ec6e161 100644 --- a/package/tvheadend/tvheadend.mk +++ b/package/tvheadend/tvheadend.mk @@ -4,7 +4,7 @@ # ################################################################################ -TVHEADEND_VERSION = 62adbebfd062d7b97829268274aad92df2033784 +TVHEADEND_VERSION = b40a62b31e809523d2fe2f7f3f331cc55dfdbd0f TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION)) TVHEADEND_LICENSE = GPL-3.0+ TVHEADEND_LICENSE_FILES = LICENSE.md From f6cf18303119f5c481a135abaee67867b03d8d54 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Wed, 3 Jan 2024 10:26:19 -0700 Subject: [PATCH 4499/5754] package/fcft: disable uClibc support fcft needs ISO C threads, aka C11 threads, which are different from POSIX threads, and are available in both glibc and musl, but not in uClibc-ng. Add a dependency on glibc or musl, and since both imply threads, drop the dependency on threads. Propagate the new dependency to the foot package, and adapt the comments accordingly. Fixes: http://autobuild.buildroot.net/results/1b2dda32a90d7db8117eede09f46d44cffe60993 http://autobuild.buildroot.net/results/5f03bb5c0c107a2b908be974421ae0a032d4dd89 http://autobuild.buildroot.net/results/31a1f022414a8a1888cac4a5cd1761257d0f2196 http://autobuild.buildroot.net/results/4522781e0448b325b54e93bbfb20f8295ea7061d Signed-off-by: Adam Duskett [yann.morin.1998@free.fr; - drop the dependencies on threads, implied by glibc or musl - fix dependencies on comments - reword the commit log to refer to ICO C threads ] Signed-off-by: Yann E. MORIN --- package/fcft/Config.in | 6 +++--- package/foot/Config.in | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/package/fcft/Config.in b/package/fcft/Config.in index b65515a3f1..5393b95db3 100644 --- a/package/fcft/Config.in +++ b/package/fcft/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_FCFT bool "fcft" - depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # C11 threads select BR2_PACKAGE_FONTCONFIG select BR2_PACKAGE_FREETYPE select BR2_PACKAGE_PIXMAN @@ -48,5 +48,5 @@ config BR2_PACKAGE_FCFT_SVG_SUPPORT endif # BR2_PACKAGE_FCFT -comment "fcft needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "fcft needs a glibc or musl toolchain" + depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) diff --git a/package/foot/Config.in b/package/foot/Config.in index 24b3f78821..b0ec2e3926 100644 --- a/package/foot/Config.in +++ b/package/foot/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_FOOT bool "foot" + depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # fcft depends on !BR2_STATIC_LIBS # wayland - depends on BR2_TOOLCHAIN_HAS_THREADS # fcft, wayland select BR2_PACKAGE_FCFT select BR2_PACKAGE_FONTCONFIG select BR2_PACKAGE_FREETYPE @@ -32,5 +32,6 @@ config BR2_PACKAGE_FOOT_THEMES endif # BR2_PACKAGE_FOOT -comment "foot needs a toolchain w/ dynamic library, threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS +comment "foot needs a glibc or musl toolchain w/ dynamic library" + depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) || \ + BR2_STATIC_LIBS From 206a9c11ac09d4264539b11ed0d45e6089d001a1 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Wed, 3 Jan 2024 20:32:48 -0700 Subject: [PATCH 4500/5754] package/python-trafaret: new package Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-trafaret/Config.in | 7 +++++++ package/python-trafaret/python-trafaret.hash | 5 +++++ package/python-trafaret/python-trafaret.mk | 14 ++++++++++++++ 4 files changed, 27 insertions(+) create mode 100644 package/python-trafaret/Config.in create mode 100644 package/python-trafaret/python-trafaret.hash create mode 100644 package/python-trafaret/python-trafaret.mk diff --git a/package/Config.in b/package/Config.in index 38c36428b9..a2cc80aa27 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1375,6 +1375,7 @@ menu "External python modules" source "package/python-tomli/Config.in" source "package/python-tornado/Config.in" source "package/python-tqdm/Config.in" + source "package/python-trafaret/Config.in" source "package/python-traitlets/Config.in" source "package/python-treq/Config.in" source "package/python-trio/Config.in" diff --git a/package/python-trafaret/Config.in b/package/python-trafaret/Config.in new file mode 100644 index 0000000000..73c7216b1e --- /dev/null +++ b/package/python-trafaret/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_TRAFARET + bool "python-trafaret" + help + Ultimate transformation library that supports validation, + contexts and aiohttp. + + https://github.com/Deepwalker/trafaret/ diff --git a/package/python-trafaret/python-trafaret.hash b/package/python-trafaret/python-trafaret.hash new file mode 100644 index 0000000000..d0d54c9ff2 --- /dev/null +++ b/package/python-trafaret/python-trafaret.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/trafaret/json +md5 85085fe18dd133d3622a2f7a3b0acf6a trafaret-2.1.1.tar.gz +sha256 d9d00800318fbd343fdfb3353e947b2ebb5557159c844696c5ac24846f76d41c trafaret-2.1.1.tar.gz +# Locally computed sha256 checksums +sha256 724f8da8a7161f07d9448aa37d1d5c4eb44b14727021c3b5d60a50ecf9a24771 LICENSE.txt diff --git a/package/python-trafaret/python-trafaret.mk b/package/python-trafaret/python-trafaret.mk new file mode 100644 index 0000000000..74d87a3d13 --- /dev/null +++ b/package/python-trafaret/python-trafaret.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-trafaret +# +################################################################################ + +PYTHON_TRAFARET_VERSION = 2.1.1 +PYTHON_TRAFARET_SOURCE = trafaret-$(PYTHON_TRAFARET_VERSION).tar.gz +PYTHON_TRAFARET_SITE = https://files.pythonhosted.org/packages/c9/ed/aac034e566f8846aee6472dcc90da6011a0b1829e3ffc768407df519a3b0 +PYTHON_TRAFARET_SETUP_TYPE = setuptools +PYTHON_TRAFARET_LICENSE = BSD-2-Clause +PYTHON_TRAFARET_LICENSE_FILES = LICENSE.txt + +$(eval $(python-package)) From 7ff27f44ac6d3b01826819ec5c3ebabee6314e91 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Wed, 3 Jan 2024 20:32:49 -0700 Subject: [PATCH 4501/5754] package/python-aiomonitor: bump to version 0.7.0 Add new runtime dependencies: - python-attrs - python-aiohttp - python-click - python-janus - python-trafaret - python-typing-extensions - python-prompt-toolkit Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-aiomonitor/Config.in | 10 +++++++++- package/python-aiomonitor/python-aiomonitor.hash | 4 ++-- package/python-aiomonitor/python-aiomonitor.mk | 4 ++-- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/package/python-aiomonitor/Config.in b/package/python-aiomonitor/Config.in index 435900ae32..9f3787f9b3 100644 --- a/package/python-aiomonitor/Config.in +++ b/package/python-aiomonitor/Config.in @@ -1,7 +1,15 @@ config BR2_PACKAGE_PYTHON_AIOMONITOR bool "python-aiomonitor" - select BR2_PACKAGE_PYTHON_TERMINALTABLES # runtime select BR2_PACKAGE_PYTHON_AIOCONSOLE # runtime + select BR2_PACKAGE_PYTHON_AIOHTTP # runtime + select BR2_PACKAGE_PYTHON_ATTRS # runtime + select BR2_PACKAGE_PYTHON_CLICK # runtime + select BR2_PACKAGE_PYTHON_JANUS # runtime + select BR2_PACKAGE_PYTHON_JINJA2 # runtime + select BR2_PACKAGE_PYTHON_PROMPT_TOOLKIT # runtime + select BR2_PACKAGE_PYTHON_TERMINALTABLES # runtime + select BR2_PACKAGE_PYTHON_TRAFARET # runtime + select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime help aiomonitor adds monitor and python REPL capabilities for asyncio application. diff --git a/package/python-aiomonitor/python-aiomonitor.hash b/package/python-aiomonitor/python-aiomonitor.hash index b67d68e478..f1c0e37667 100644 --- a/package/python-aiomonitor/python-aiomonitor.hash +++ b/package/python-aiomonitor/python-aiomonitor.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiomonitor/json -md5 0f786c8278a68e7df8b24317e7d33271 aiomonitor-0.6.0.tar.gz -sha256 31d30d1e9c0a23926edba2a2242b8572c6e8639af9aae2692dee863064d27e48 aiomonitor-0.6.0.tar.gz +md5 75fc8f84c0ff385931d76c46265cfc0d aiomonitor-0.7.0.tar.gz +sha256 109b9ad309a44c0c5db1219d106f4062615151ad3f0e288a0c104fbb004d0398 aiomonitor-0.7.0.tar.gz # Locally computed sha256 checksums sha256 98397c300949e0cc1ddc68b0e48e67b10f2d0a4ffada4903d891a1315fe04156 LICENSE diff --git a/package/python-aiomonitor/python-aiomonitor.mk b/package/python-aiomonitor/python-aiomonitor.mk index 1a3b999b90..8eaddcbfa6 100644 --- a/package/python-aiomonitor/python-aiomonitor.mk +++ b/package/python-aiomonitor/python-aiomonitor.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOMONITOR_VERSION = 0.6.0 +PYTHON_AIOMONITOR_VERSION = 0.7.0 PYTHON_AIOMONITOR_SOURCE = aiomonitor-$(PYTHON_AIOMONITOR_VERSION).tar.gz -PYTHON_AIOMONITOR_SITE = https://files.pythonhosted.org/packages/13/ab/36fbaf36c1c7cb4d5a81b945faf69e95a48dd38cbc9b57915d41d9445f55 +PYTHON_AIOMONITOR_SITE = https://files.pythonhosted.org/packages/50/30/1d903b716489c2b5d0a92baccf172f972e97c2de94d4ea41c154287e9b60 PYTHON_AIOMONITOR_SETUP_TYPE = setuptools PYTHON_AIOMONITOR_LICENSE = Apache-2.0 PYTHON_AIOMONITOR_LICENSE_FILES = LICENSE From f46b472aeb5302251346fb0cfbc179dea0e14877 Mon Sep 17 00:00:00 2001 From: Heiko Thiery Date: Thu, 4 Jan 2024 08:00:25 +0100 Subject: [PATCH 4502/5754] package/rauc: bump version to 1.11 Release notes: https://github.com/rauc/rauc/releases/tag/v1.11 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 38fea45b8a..8de309f8c7 100644 --- a/package/rauc/rauc.hash +++ b/package/rauc/rauc.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 aa99164c5f54fd29b5c8456221b51f92c900884af66de3e1b7f15a25b7db98a7 rauc-1.10.1.tar.xz +sha256 a28f415c580390dd9e65016a5d90a63ee1cfd7e1b3e864cbb13cb3ac3513391f rauc-1.11.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/rauc/rauc.mk b/package/rauc/rauc.mk index 4211abdcc4..aff5ead281 100644 --- a/package/rauc/rauc.mk +++ b/package/rauc/rauc.mk @@ -4,7 +4,7 @@ # ################################################################################ -RAUC_VERSION = 1.10.1 +RAUC_VERSION = 1.11 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 c67954bb4f30c8bf2957b4a0a76ceabab3a732cd Mon Sep 17 00:00:00 2001 From: Heiko Thiery Date: Thu, 4 Jan 2024 08:22:39 +0100 Subject: [PATCH 4503/5754] package/linuxptp: bump version to 4.2 Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- package/linuxptp/linuxptp.hash | 2 +- package/linuxptp/linuxptp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/linuxptp/linuxptp.hash b/package/linuxptp/linuxptp.hash index edbfb44553..1d5c590ea7 100644 --- a/package/linuxptp/linuxptp.hash +++ b/package/linuxptp/linuxptp.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 d27d5ef296bb3d285e22e69f75ae023b4b42a2f4655130d6d390d8afcbc3d933 linuxptp-4.0.tgz +sha256 70e38e5d2764e0217443da6f14e8846fe401a472293ac138d8419c07a665447a linuxptp-4.2.tgz # Hash for license file: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/linuxptp/linuxptp.mk b/package/linuxptp/linuxptp.mk index 054442d569..e0ab82a2c4 100644 --- a/package/linuxptp/linuxptp.mk +++ b/package/linuxptp/linuxptp.mk @@ -4,7 +4,7 @@ # ################################################################################ -LINUXPTP_VERSION = 4.0 +LINUXPTP_VERSION = 4.2 LINUXPTP_SOURCE = linuxptp-$(LINUXPTP_VERSION).tgz LINUXPTP_SITE = http://downloads.sourceforge.net/linuxptp LINUXPTP_LICENSE = GPL-2.0+ From e6ef64d955f34db773addad52c7af17e111d7f13 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 4 Jan 2024 17:56:33 +0100 Subject: [PATCH 4504/5754] boot/arm-trusted-firmware: fix fiptool linking issue on hosts without openssl Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/5834758777 Commit e7d16c35a (boot/arm-trusted-firmware: fix the RPATH of fiptool) tried to fix the build of host-fiptool, but forgot to pass HOST_CFLAGS. On hosts without (compatible) openssl development headers, this breaks the build when it cannot find the openssl headers: fiptool_platform.h:19:11: fatal error: openssl/sha.h: No such file or directory Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- boot/arm-trusted-firmware/arm-trusted-firmware.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm-trusted-firmware/arm-trusted-firmware.mk index bed873a182..7f9c896387 100644 --- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk @@ -64,7 +64,7 @@ ARM_TRUSTED_FIRMWARE_MAKE_OPTS += \ $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES)) \ PLAT=$(ARM_TRUSTED_FIRMWARE_PLATFORM) \ TARGET_BOARD=$(ARM_TRUSTED_FIRMWARE_TARGET_BOARD) \ - HOSTCC="$(HOSTCC) $(HOST_LDFLAGS)" + HOSTCC="$(HOSTCC) $(HOST_CFLAGS) $(HOST_LDFLAGS)" ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_SSP),y) ARM_TRUSTED_FIRMWARE_MAKE_OPTS += \ From f5eba2ef3a5930cd05ad33741b83af02c1dbf42e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 4 Jan 2024 18:14:47 +0100 Subject: [PATCH 4505/5754] package/cryptodev-linux: fix build with linux >= 6.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix the following build failure with linux >= 6.4: /home/autobuild/autobuild/instance-15/output-1/build/cryptodev-linux-1.13/./ioctl.c:1249:18: error: ‘struct ctl_table’ has no member named ‘child’ 1249 | .child = verbosity_ctl_dir, | ^~~~~ Fixes: - http://autobuild.buildroot.org/results/ecbf426f6b0ff920a51c1674b080c35edf5db859 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...01-zero-copy-Fix-build-for-Linux-6-4.patch | 37 ++++++++++++++++ ...ev_verbosity-Fix-build-for-Linux-6-4.patch | 44 +++++++++++++++++++ 2 files changed, 81 insertions(+) create mode 100644 package/cryptodev-linux/0001-zero-copy-Fix-build-for-Linux-6-4.patch create mode 100644 package/cryptodev-linux/0002-cryptodev_verbosity-Fix-build-for-Linux-6-4.patch diff --git a/package/cryptodev-linux/0001-zero-copy-Fix-build-for-Linux-6-4.patch b/package/cryptodev-linux/0001-zero-copy-Fix-build-for-Linux-6-4.patch new file mode 100644 index 0000000000..4bea55311c --- /dev/null +++ b/package/cryptodev-linux/0001-zero-copy-Fix-build-for-Linux-6-4.patch @@ -0,0 +1,37 @@ +From 592017c3a910a3905b1925aee88c4674e9a596b7 Mon Sep 17 00:00:00 2001 +From: Gaurav Jain +Date: Tue, 30 May 2023 17:09:42 +0530 +Subject: [PATCH] zero copy: Fix build for Linux 6.4 + +get_user_pages_remote api prototype is changed in kernel. +struct vm_area_struct **vmas argument is removed. +Migrate to the new API. + +Signed-off-by: Gaurav Jain + +Upstream: https://github.com/cryptodev-linux/cryptodev-linux/commit/592017c3a910a3905b1925aee88c4674e9a596b7 +Signed-off-by: Fabrice Fontaine +--- + zc.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/zc.c b/zc.c +index fdf7da17..6637945a 100644 +--- a/zc.c ++++ b/zc.c +@@ -80,10 +80,14 @@ int __get_userbuf(uint8_t __user *addr, uint32_t len, int write, + ret = get_user_pages_remote(task, mm, + (unsigned long)addr, pgcount, write ? FOLL_WRITE : 0, + pg, NULL, NULL); +-#else ++#elif (LINUX_VERSION_CODE < KERNEL_VERSION(6, 4, 0)) + ret = get_user_pages_remote(mm, + (unsigned long)addr, pgcount, write ? FOLL_WRITE : 0, + pg, NULL, NULL); ++#else ++ ret = get_user_pages_remote(mm, ++ (unsigned long)addr, pgcount, write ? FOLL_WRITE : 0, ++ pg, NULL); + #endif + #if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)) + up_read(&mm->mmap_sem); diff --git a/package/cryptodev-linux/0002-cryptodev_verbosity-Fix-build-for-Linux-6-4.patch b/package/cryptodev-linux/0002-cryptodev_verbosity-Fix-build-for-Linux-6-4.patch new file mode 100644 index 0000000000..e6022c686f --- /dev/null +++ b/package/cryptodev-linux/0002-cryptodev_verbosity-Fix-build-for-Linux-6-4.patch @@ -0,0 +1,44 @@ +From 99ae2a39ddc3f89c66d9f09783b591c0f2dbf2e9 Mon Sep 17 00:00:00 2001 +From: Gaurav Jain +Date: Wed, 28 Jun 2023 12:44:32 +0530 +Subject: [PATCH] cryptodev_verbosity: Fix build for Linux 6.4 + +register_sysctl_table api is removed in kernel. +migrate to the new api register_sysctl. + +child is also removed in linux 6.4 ctl_table struct. + +Signed-off-by: Gaurav Jain + +Upstream: https://github.com/cryptodev-linux/cryptodev-linux/commit/99ae2a39ddc3f89c66d9f09783b591c0f2dbf2e9 +Signed-off-by: Fabrice Fontaine +--- + ioctl.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/ioctl.c b/ioctl.c +index 8f241b86..4262bbd5 100644 +--- a/ioctl.c ++++ b/ioctl.c +@@ -1246,7 +1246,9 @@ static struct ctl_table verbosity_ctl_root[] = { + { + .procname = "ioctl", + .mode = 0555, ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 4, 0)) + .child = verbosity_ctl_dir, ++#endif + }, + {}, + }; +@@ -1267,7 +1269,11 @@ static int __init init_cryptodev(void) + return rc; + } + ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 4, 0)) + verbosity_sysctl_header = register_sysctl_table(verbosity_ctl_root); ++#else ++ verbosity_sysctl_header = register_sysctl(verbosity_ctl_root->procname, verbosity_ctl_dir); ++#endif + + pr_info(PFX "driver %s loaded.\n", VERSION); + From d6a5bcf9063fec7e626867636bbe3c3adde9086a Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Wed, 3 Jan 2024 18:49:06 +0200 Subject: [PATCH 4506/5754] package/picocom: bump to version 2023-04 Switch to new upstream. Drop upstream patch. Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - ...-with-libc-s-without-cispeed-cospeed.patch | 49 ------------------- package/picocom/Config.in | 2 +- package/picocom/picocom.hash | 2 +- package/picocom/picocom.mk | 4 +- 5 files changed, 4 insertions(+), 54 deletions(-) delete mode 100644 package/picocom/0001-Compile-with-libc-s-without-cispeed-cospeed.patch diff --git a/.checkpackageignore b/.checkpackageignore index 40d9fb1ed4..7e15db0d29 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1047,7 +1047,6 @@ 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 diff --git a/package/picocom/0001-Compile-with-libc-s-without-cispeed-cospeed.patch b/package/picocom/0001-Compile-with-libc-s-without-cispeed-cospeed.patch deleted file mode 100644 index 5143e31102..0000000000 --- a/package/picocom/0001-Compile-with-libc-s-without-cispeed-cospeed.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 30c712c5f14306460c44bea70e24419db9d44f8c Mon Sep 17 00:00:00 2001 -From: Nick Patavalis -Date: Thu, 12 Apr 2018 15:16:04 +0300 -Subject: [PATCH] Compile with libc's without cispeed / cospeed - -Some libc implementations (e.g. musl) do not define the cispeed and -cospeed struct termios fields. So we have to check the -_HAVE_STRUCT_TERMIOS_C_ISPEED and _HAVE_STRUCT_TERMIOS_C_OSPEED -macros. If not defined, we disable custom baudrate support. - -[baruch: backported from upstream master to 3.1] -Signed-off-by: Baruch Siach ---- -Upstream status: commit 1acf1ddabaf3 - - custbaud.h | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/custbaud.h b/custbaud.h -index 48151a4a4e84..ae4ae8daf49e 100644 ---- a/custbaud.h -+++ b/custbaud.h -@@ -26,6 +26,8 @@ - #ifndef CUSTBAUD_H - #define CUSTBAUD_H - -+#include -+ - #ifndef NO_CUSTOM_BAUD - - #if defined (__linux__) -@@ -33,7 +35,13 @@ - /* Enable by-default for kernels > 2.6.0 on x86 and x86_64 only */ - #include - #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0) --#if defined (__i386__) || defined (__x86_64__) || defined (USE_CUSTOM_BAUD) -+/* Some libc implementations (e.g. musl) do not define the cispeed and -+ cospeed struct termios fields. We do not support custom baudrates -+ on them. */ -+#if ( (defined (__i386__) || defined (__x86_64__)) \ -+ && defined (_HAVE_STRUCT_TERMIOS_C_ISPEED) \ -+ && defined (_HAVE_STRUCT_TERMIOS_C_OSPEED) ) \ -+ || defined (USE_CUSTOM_BAUD) - #ifndef USE_CUSTOM_BAUD - #define USE_CUSTOM_BAUD - #endif --- -2.16.3 - diff --git a/package/picocom/Config.in b/package/picocom/Config.in index 9f8efc4a9a..6db71e1791 100644 --- a/package/picocom/Config.in +++ b/package/picocom/Config.in @@ -6,4 +6,4 @@ config BR2_PACKAGE_PICOCOM in principle, very much like minicom, only it's pico instead of mini! - https://github.com/npat-efault/picocom/ + https://gitlab.com/wsakernel/picocom diff --git a/package/picocom/picocom.hash b/package/picocom/picocom.hash index 77c270408c..8107f5633a 100644 --- a/package/picocom/picocom.hash +++ b/package/picocom/picocom.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e6761ca932ffc6d09bd6b11ff018bdaf70b287ce518b3282d29e0270e88420bb picocom-3.1.tar.gz +sha256 107d3e49e502ce63f826525f587826990451bcb39492efe2e0463dd62d64f3ea picocom-2023-04.tar.gz sha256 9273c6b2c55be95f0f0df292d87e8900e5bfdf5b510a6ea09e80306cf45c10f6 LICENSE.txt diff --git a/package/picocom/picocom.mk b/package/picocom/picocom.mk index 2d585bb2f5..2828c98fb7 100644 --- a/package/picocom/picocom.mk +++ b/package/picocom/picocom.mk @@ -4,8 +4,8 @@ # ################################################################################ -PICOCOM_VERSION = 3.1 -PICOCOM_SITE = $(call github,npat-efault,picocom,$(PICOCOM_VERSION)) +PICOCOM_VERSION = 2023-04 +PICOCOM_SITE = $(call gitlab,wsakernel,picocom,$(PICOCOM_VERSION)) PICOCOM_LICENSE = GPL-2.0+ PICOCOM_LICENSE_FILES = LICENSE.txt PICOCOM_CPE_ID_VENDOR = picocom_project From f74609cf9678f4b5d63eafa235d3be365b0048da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fl=C3=A1vio=20Tapaj=C3=B3s?= Date: Wed, 3 Jan 2024 11:32:10 -0300 Subject: [PATCH 4507/5754] configs/asus_tinker-s_rk3288: bump Linux to 6.1.70 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Flávio Tapajós Signed-off-by: Thomas Petazzoni --- configs/asus_tinker-s_rk3288_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/asus_tinker-s_rk3288_defconfig b/configs/asus_tinker-s_rk3288_defconfig index 00b42990f8..ad2ccec9f9 100644 --- a/configs/asus_tinker-s_rk3288_defconfig +++ b/configs/asus_tinker-s_rk3288_defconfig @@ -23,7 +23,7 @@ BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl-dtb.bin tpl/u-boot-tpl.bin" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.65" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.70" BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="rk3288-tinker-s" From 0f2f090892914e3b04ff217d1ea10cceafc70515 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fl=C3=A1vio=20Tapaj=C3=B3s?= Date: Wed, 3 Jan 2024 11:28:30 -0300 Subject: [PATCH 4508/5754] package/python-sqlalchemy: bump version to 2.0.25 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Hash of license file is changed due to: -Copyright 2005-2022 SQLAlchemy authors and contributors . +Copyright 2005-2024 SQLAlchemy authors and contributors . Signed-off-by: Flávio Tapajós Signed-off-by: Thomas Petazzoni --- package/python-sqlalchemy/Config.in | 1 + package/python-sqlalchemy/python-sqlalchemy.hash | 6 +++--- package/python-sqlalchemy/python-sqlalchemy.mk | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/python-sqlalchemy/Config.in b/package/python-sqlalchemy/Config.in index f7ec3a6ad4..974393bb5c 100644 --- a/package/python-sqlalchemy/Config.in +++ b/package/python-sqlalchemy/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_SQLALCHEMY bool "python-sqlalchemy" + select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime help SQLAlchemy is the Python SQL toolkit and Object Relational Mapper that gives application developers the full power and diff --git a/package/python-sqlalchemy/python-sqlalchemy.hash b/package/python-sqlalchemy/python-sqlalchemy.hash index 9f479d8f7b..7951a32978 100644 --- a/package/python-sqlalchemy/python-sqlalchemy.hash +++ b/package/python-sqlalchemy/python-sqlalchemy.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/sqlalchemy/json -md5 52318b83e8931c5f5a459f54fe4be3e8 SQLAlchemy-1.4.42.tar.gz -sha256 177e41914c476ed1e1b77fd05966ea88c094053e17a85303c4ce007f88eff363 SQLAlchemy-1.4.42.tar.gz +md5 7abfc2972d7e16315c8b7492ea0e0fdb SQLAlchemy-2.0.25.tar.gz +sha256 a2c69a7664fb2d54b8682dd774c3b54f67f84fa123cf84dda2a5f40dcaa04e08 SQLAlchemy-2.0.25.tar.gz # Locally computed sha256 checksums -sha256 859ded25da34c1eb73e6e736df4c5f8ce3ed2ed5290663176f06e7720d9c9a20 LICENSE +sha256 3c0f59ab887d041de6a4e52ffe3e9edb5d9522de909fae9a6cd7adb6e7be3293 LICENSE diff --git a/package/python-sqlalchemy/python-sqlalchemy.mk b/package/python-sqlalchemy/python-sqlalchemy.mk index a94b9eca92..400ad92f63 100644 --- a/package/python-sqlalchemy/python-sqlalchemy.mk +++ b/package/python-sqlalchemy/python-sqlalchemy.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SQLALCHEMY_VERSION = 1.4.42 +PYTHON_SQLALCHEMY_VERSION = 2.0.25 PYTHON_SQLALCHEMY_SOURCE = SQLAlchemy-$(PYTHON_SQLALCHEMY_VERSION).tar.gz -PYTHON_SQLALCHEMY_SITE = https://files.pythonhosted.org/packages/e4/56/8ea85eaab7d93b58f9c213ad8fc5882838189a29fc8cc401d80710a12969 +PYTHON_SQLALCHEMY_SITE = https://files.pythonhosted.org/packages/7b/bb/85bd8e211f54983e927c7cd9b2ad66773fbef507957156fc72e481a62681 PYTHON_SQLALCHEMY_SETUP_TYPE = setuptools PYTHON_SQLALCHEMY_LICENSE = MIT PYTHON_SQLALCHEMY_LICENSE_FILES = LICENSE From 21f4717e09827c59225451f28d24c5b311452cb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fl=C3=A1vio=20Tapaj=C3=B3s?= Date: Wed, 3 Jan 2024 11:28:31 -0300 Subject: [PATCH 4509/5754] =?UTF-8?q?DEVELOPERS:=20add=20Fl=C3=A1vio=20Tap?= =?UTF-8?q?aj=C3=B3s=20for=20python-sqlalchemy?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Flávio Tapajós Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 646b8ee5a2..2b67c616fa 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1077,6 +1077,7 @@ F: package/python-pymodbus/ N: Flávio Tapajós F: configs/asus_tinker-s_rk3288_defconfig F: board/asus/tinker-s/ +F: package/python-sqlalchemy/ F: package/rsyslog/ N: Florian Fainelli From 001986db10db0d630e0cd41251233df921916ece Mon Sep 17 00:00:00 2001 From: Kory Maincent Date: Tue, 21 Nov 2023 11:26:31 +0100 Subject: [PATCH 4510/5754] package/gcnano-binaries: bump version to 6.4.13 Update to the latest version of the gcnano-binaries blobs, which are compatible with the last v6.1-stm32mp-r1 kernel from the STMicroelectronics BSP. The location of the driver has changed it is now in the gcnano-driver-stm32mp directory instead of an archive. The VERSION and PREFIX temporary variable in pkgconfig file came back therefore the sed replacement also came back. The EULA license file has changed due to copyright year update, so its hash has changed. Signed-off-by: Kory Maincent Signed-off-by: Thomas Petazzoni --- package/gcnano-binaries/gcnano-binaries.hash | 4 ++-- package/gcnano-binaries/gcnano-binaries.mk | 18 +++++++++++------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/package/gcnano-binaries/gcnano-binaries.hash b/package/gcnano-binaries/gcnano-binaries.hash index 7bb942e6da..3192b0d854 100644 --- a/package/gcnano-binaries/gcnano-binaries.hash +++ b/package/gcnano-binaries/gcnano-binaries.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b122a0cd7a1bd2cee8c6117b259ef977a765d24e48655f639694cbef471da99b gcnano-binaries-0ac1a89d7a59d040a69745a85f0da7e98644cc4b.tar.gz -sha256 7d209718473d18f69f75adb7caf9cb5d4b0a31da068756aa011bea617de3dc57 EULA +sha256 8bb1f6ee633f3c30e16b33ff6913286edf31f77b69105a14d147509beba3ea94 gcnano-binaries-5d02efd5cb4cfa85307633891f3cf87550a8bc1d.tar.gz +sha256 29c78804b097b5cfee0e802bef9f60348a635640eadd8a91b7ce82ddf17fbf5a EULA diff --git a/package/gcnano-binaries/gcnano-binaries.mk b/package/gcnano-binaries/gcnano-binaries.mk index 83261f3b7c..c3aa5d48d2 100644 --- a/package/gcnano-binaries/gcnano-binaries.mk +++ b/package/gcnano-binaries/gcnano-binaries.mk @@ -4,10 +4,10 @@ # ################################################################################ -GCNANO_BINARIES_LIB_VERSION = 6.4.9 +GCNANO_BINARIES_LIB_VERSION = 6.4.13 GCNANO_BINARIES_DRIVER_VERSION = $(GCNANO_BINARIES_LIB_VERSION) -GCNANO_BINARIES_USERLAND_VERSION = $(GCNANO_BINARIES_LIB_VERSION)-20221206 -GCNANO_BINARIES_VERSION = 0ac1a89d7a59d040a69745a85f0da7e98644cc4b +GCNANO_BINARIES_USERLAND_VERSION = $(GCNANO_BINARIES_LIB_VERSION)-20230517 +GCNANO_BINARIES_VERSION = 5d02efd5cb4cfa85307633891f3cf87550a8bc1d GCNANO_BINARIES_SITE = $(call github,STMicroelectronics,gcnano-binaries,$(GCNANO_BINARIES_VERSION)) GCNANO_BINARIES_LICENSE = MIT, Vivante End User Software License Terms @@ -25,7 +25,6 @@ GCNANO_BINARIES_PROVIDES = libegl libgles libgbm # self-extractible binary for the user-space parts. So we extract both # below, and also extract the EULA text from the self-extractible binary define GCNANO_BINARIES_EXTRACT_HELPER - tar --strip-components=1 -xJf $(@D)/gcnano-driver-$(GCNANO_BINARIES_DRIVER_VERSION).tar.xz -C $(@D) awk 'BEGIN { start = 0; } \ /^EOEULA/ { start = 0; } \ { if (start) print; } \ @@ -36,10 +35,12 @@ endef GCNANO_BINARIES_POST_EXTRACT_HOOKS += GCNANO_BINARIES_EXTRACT_HELPER +GCNANO_BINARIES_MODULE_SUBDIRS = gcnano-driver-stm32mp + GCNANO_BINARIES_MODULE_MAKE_OPTS = \ KERNEL_DIR=$(LINUX_DIR) \ SOC_PLATFORM=st-mp1 \ - AQROOT=$(@D) \ + AQROOT=$(@D)/gcnano-driver-stm32mp \ DEBUG=0 GCNANO_BINARIES_USERLAND_SUBDIR = gcnano-userland-multi-$(GCNANO_BINARIES_USERLAND_VERSION) @@ -55,8 +56,11 @@ define GCNANO_BINARIES_INSTALL done mkdir -p $(1)/usr/include cp -a $(@D)/$(GCNANO_BINARIES_USERLAND_SUBDIR)/release/include/* $(1)/usr/include/ - mkdir -p $(1)/usr/lib/pkgconfig/ - cp -a $(@D)/$(GCNANO_BINARIES_USERLAND_SUBDIR)/pkgconfig/* $(1)/usr/lib/pkgconfig/ + cd $(@D)/$(GCNANO_BINARIES_USERLAND_SUBDIR)/pkgconfig/ ; \ + for file in *.pc ; do \ + sed -e "s|#PREFIX#|/usr|" -e "s|#VERSION#|22.0.3|" $$file > $$file.temp ; \ + $(INSTALL) -D -m 0644 $$file.temp $(1)/usr/lib/pkgconfig/$$file ; \ + done endef define GCNANO_BINARIES_INSTALL_TARGET_CMDS From 045ab73702b8bc09f94ca1f3b8e5bf3acb0b0843 Mon Sep 17 00:00:00 2001 From: Alexey Brodkin Date: Thu, 4 Jan 2024 09:12:24 -0800 Subject: [PATCH 4511/5754] toolchain: bump ARC toolchain components to arc-2023.09-release With the most recent ARC GNU toolchain version released [1] we may switch to its stable and verified components for Buildroot's built-in toolchian. And while for ARCompact (i.e. ARC700) & ARCv2 (ARC HS38 & HS48) processors upstream components work just fine, in this new release of ARC GNU toolchain we have also support for newer ARCv3 procesors. And so that update is more of an enabler for introduction of ARCv3 in the next series of patches. [1] https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/releases/tag/arc-2023.09-release Signed-off-by: Alexey Brodkin Cc: Giulio Benetti Cc: Thomas Petazzoni Cc: Waldemar Brodkorb Cc: Yann E. MORIN Cc: Romain Naour Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 4 - package/binutils/Config.in.host | 5 +- .../0001-poison-system-directories.patch | 310 ------------------ package/binutils/binutils.hash | 2 +- package/binutils/binutils.mk | 4 +- package/gcc/Config.in.host | 4 +- .../0001-arc-Refurbish-adc-sbc-patterns.patch | 243 -------------- ...er-Remove-cyclades-from-libsanitizer.patch | 121 ------- ...-machine-names-in-__has_include-.-PR.patch | 124 ------- .../0100-uclibc-conf.patch | 29 -- package/gcc/gcc.hash | 2 +- package/gdb/Config.in | 4 +- package/gdb/Config.in.host | 2 +- ...t-define-basic_string_view-to_string.patch | 114 ------- package/gdb/gdb.hash | 2 +- package/gdb/gdb.mk | 20 +- 16 files changed, 22 insertions(+), 968 deletions(-) delete mode 100644 package/binutils/arc-2020.09-release/0001-poison-system-directories.patch delete mode 100644 package/gcc/arc-2020.09-release/0001-arc-Refurbish-adc-sbc-patterns.patch delete mode 100644 package/gcc/arc-2020.09-release/0002-libsanitizer-Remove-cyclades-from-libsanitizer.patch delete mode 100644 package/gcc/arc-2020.09-release/0003-fixinc-don-t-fix-machine-names-in-__has_include-.-PR.patch delete mode 100644 package/gcc/arc-2020.09-release/0100-uclibc-conf.patch delete mode 100644 package/gdb/arc-2020.09-release-gdb/0001-Do-not-define-basic_string_view-to_string.patch diff --git a/.checkpackageignore b/.checkpackageignore index 7e15db0d29..9551ed23ae 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -202,7 +202,6 @@ package/bind/S81named Indent Shellcheck Variables 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 @@ -451,9 +450,6 @@ 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/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 diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index bc7dc4443c..2f1ddf4bdc 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -26,15 +26,14 @@ config BR2_BINUTILS_VERSION_2_41_X bool "binutils 2.41" config BR2_BINUTILS_VERSION_ARC - bool "binutils arc (2.34.50)" + bool "binutils arc (2.41)" depends on BR2_arc - select BR2_PACKAGE_BINUTILS_HAS_NO_LIBSFRAME endchoice config BR2_BINUTILS_VERSION string - default "arc-2020.09-release" if BR2_BINUTILS_VERSION_ARC + default "arc-2023.09-release" if BR2_BINUTILS_VERSION_ARC default "2.39" if BR2_BINUTILS_VERSION_2_39_X default "2.40" if BR2_BINUTILS_VERSION_2_40_X default "2.41" if BR2_BINUTILS_VERSION_2_41_X diff --git a/package/binutils/arc-2020.09-release/0001-poison-system-directories.patch b/package/binutils/arc-2020.09-release/0001-poison-system-directories.patch deleted file mode 100644 index 7a76ef2963..0000000000 --- a/package/binutils/arc-2020.09-release/0001-poison-system-directories.patch +++ /dev/null @@ -1,310 +0,0 @@ -From 5f62ad7ce534e3384d6ed8892614979da297bd70 Mon Sep 17 00:00:00 2001 -From: Evgeniy Didin -Date: Mon, 14 Oct 2019 16:45:15 +0300 -Subject: [PATCH] [PATCH] poison-system-directories - -Patch adapted to arc-binutils-gdb-2019.09 -Signed-off-by: Evgeniy Didin - -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.26] -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 d93c9b08300..5da2742beac 100644 ---- a/ld/config.in -+++ b/ld/config.in -@@ -31,6 +31,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 2d6ca5c0445..563f9921f7f 100755 ---- a/ld/configure -+++ b/ld/configure -@@ -823,6 +823,7 @@ with_lib_path - enable_targets - enable_64_bit_bfd - with_sysroot -+enable_poison_system_directories - enable_gold - enable_got - enable_compressed_debug_sections -@@ -1487,6 +1488,8 @@ Optional Features: - --disable-largefile omit support for large files - --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) -@@ -15804,7 +15807,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 41a51bbb7e9..dbaa98a9e17 100644 ---- a/ld/configure.ac -+++ b/ld/configure.ac -@@ -94,6 +94,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 55078a9637b..511e9bc34b7 100644 ---- a/ld/ld.h -+++ b/ld/ld.h -@@ -180,6 +180,14 @@ typedef struct - in the linker script. */ - bfd_boolean force_group_allocation; - -+ /* If TRUE (the default) warn for uses of system directories when -+ cross linking. */ -+ bfd_boolean poison_system_directories; -+ -+ /* If TRUE (default FALSE) give an error for uses of system -+ directories when cross linking instead of a warning. */ -+ bfd_boolean 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 fcbc335c95e..6ba7ebdb32a 100644 ---- a/ld/ld.texi -+++ b/ld/ld.texi -@@ -2557,6 +2557,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 7f60319390e..0bcc06db964 100644 ---- a/ld/ldfile.c -+++ b/ld/ldfile.c -@@ -116,6 +116,23 @@ ldfile_add_library_path (const char *name, bfd_boolean 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 32a7a6409e8..c02b64bf92f 100644 ---- a/ld/ldlex.h -+++ b/ld/ldlex.h -@@ -152,6 +152,8 @@ enum option_values - OPTION_NO_PRINT_MAP_DISCARDED, - OPTION_NON_CONTIGUOUS_REGIONS, - OPTION_NON_CONTIGUOUS_REGIONS_WARNINGS, -+ 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 34c19223137..66d2c3f4bcf 100644 ---- a/ld/ldmain.c -+++ b/ld/ldmain.c -@@ -270,6 +270,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 1c15ac29c0c..8b714e10a40 100644 ---- a/ld/lexsup.c -+++ b/ld/lexsup.c -@@ -549,6 +549,14 @@ static const struct ld_option ld_options[] = - { {"no-print-map-discarded", no_argument, NULL, OPTION_NO_PRINT_MAP_DISCARDED}, - '\0', NULL, N_("Do not show discarded sections in map file output"), - 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) -@@ -561,6 +569,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; -@@ -1549,6 +1558,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), -@@ -1600,6 +1617,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.16.2 - diff --git a/package/binutils/binutils.hash b/package/binutils/binutils.hash index 564a4c3bd7..519a0ca887 100644 --- a/package/binutils/binutils.hash +++ b/package/binutils/binutils.hash @@ -4,7 +4,7 @@ sha512 a37e042523bc46494d99d5637c3f3d8f9956d9477b748b3b1f6d7dfbb8d968ed52c932e8 sha512 5df45d0bd6ddabdce4f35878c041e46a92deef01e7dea5facc97fd65cc06b59abc6fba0eb454b68e571c7e14038dc823fe7f2263843e6e627b7444eaf0fe9374 binutils-2.41.tar.xz # Locally calculated (fetched from Github) -sha512 76a8227a19218435319c660e4983ea17985194b7f496f163e97543e7f6fd3e9249241fdc05a16ba512fba96a1d846c1f7b080983404d821d6215f10e7f11e238 binutils-gdb-arc-2020.09-release.tar.gz +sha512 3518b47d5c11d1fb478ee152bde1719363f9391db73f3b9f5491217c17742bef8ebca6a51a40302dfaa9476c5a32a8b8f70a4bf64289422dea5f750ae53ab88d binutils-gdb-arc-2023.09-release.tar.gz # locally computed sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING3 diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk index 4bc1b69fa0..6846933646 100644 --- a/package/binutils/binutils.mk +++ b/package/binutils/binutils.mk @@ -9,13 +9,13 @@ BINUTILS_VERSION = $(call qstrip,$(BR2_BINUTILS_VERSION)) ifeq ($(BINUTILS_VERSION),) ifeq ($(BR2_arc),y) -BINUTILS_VERSION = arc-2020.09-release +BINUTILS_VERSION = arc-2023.09-release else BINUTILS_VERSION = 2.40 endif endif # BINUTILS_VERSION -ifeq ($(BINUTILS_VERSION),arc-2020.09-release) +ifeq ($(BINUTILS_VERSION),arc-2023.09-release) BINUTILS_SITE = $(call github,foss-for-synopsys-dwc-arc-processors,binutils-gdb,$(BINUTILS_VERSION)) BINUTILS_SOURCE = binutils-gdb-$(BINUTILS_VERSION).tar.gz BINUTILS_FROM_GIT = y diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index ebdcdba62e..fabc6173f5 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -10,7 +10,7 @@ choice Select the version of gcc you wish to use. config BR2_GCC_VERSION_ARC - bool "gcc arc (10.x)" + bool "gcc arc (13.1)" # Only supported architecture depends on BR2_arc select BR2_TOOLCHAIN_GCC_AT_LEAST_10 @@ -79,7 +79,7 @@ config BR2_GCC_VERSION default "11.4.0" if BR2_GCC_VERSION_11_X default "12.3.0" if BR2_GCC_VERSION_12_X default "13.2.0" if BR2_GCC_VERSION_13_X - default "arc-2020.09-release" if BR2_GCC_VERSION_ARC + default "arc-2023.09-release" if BR2_GCC_VERSION_ARC config BR2_EXTRA_GCC_CONFIG_OPTIONS string "Additional gcc options" diff --git a/package/gcc/arc-2020.09-release/0001-arc-Refurbish-adc-sbc-patterns.patch b/package/gcc/arc-2020.09-release/0001-arc-Refurbish-adc-sbc-patterns.patch deleted file mode 100644 index 3292b26a4e..0000000000 --- a/package/gcc/arc-2020.09-release/0001-arc-Refurbish-adc-sbc-patterns.patch +++ /dev/null @@ -1,243 +0,0 @@ -From b92c22b144d063c4436a6693045ceb57d344c495 Mon Sep 17 00:00:00 2001 -From: Claudiu Zissulescu -Date: Wed, 11 Nov 2020 12:31:10 +0200 -Subject: [PATCH] arc: Refurbish adc/sbc patterns - -The adc/sbc patterns were unecessary spliting, remove that and -associated functions. - -gcc/ChangeLog: - -2020-10-11 Claudiu Zissulescu - - * config/arc/arc-protos.h (arc_scheduling_not_expected): Remove - it. - (arc_sets_cc_p): Likewise. - (arc_need_delay): Likewise. - * config/arc/arc.c (arc_sets_cc_p): Likewise. - (arc_need_delay): Likewise. - (arc_scheduling_not_expected): Likewise. - * config/arc/arc.md: Convert adc/sbc patterns to simple - instruction definitions. - -Signed-off-by: Claudiu Zissulescu - -Downloaded from upstream commit -https://github.com/foss-for-synopsys-dwc-arc-processors/gcc/commit/b92c22b144d063c4436a6693045ceb57d344c495 - -Signed-off-by: Bernd Kuhls ---- - gcc/config/arc/arc-protos.h | 3 -- - gcc/config/arc/arc.c | 53 --------------------- - gcc/config/arc/arc.md | 95 +++++++++++-------------------------- - 3 files changed, 29 insertions(+), 122 deletions(-) - -diff --git a/gcc/config/arc/arc-protos.h b/gcc/config/arc/arc-protos.h -index c72d78e3b9e..de4cf47c818 100644 ---- a/gcc/config/arc/arc-protos.h -+++ b/gcc/config/arc/arc-protos.h -@@ -90,10 +90,7 @@ extern void split_subsi (rtx *); - extern void arc_split_move (rtx *); - extern const char *arc_short_long (rtx_insn *insn, const char *, const char *); - extern rtx arc_regno_use_in (unsigned int, rtx); --extern bool arc_scheduling_not_expected (void); --extern bool arc_sets_cc_p (rtx_insn *insn); - extern int arc_label_align (rtx_insn *label); --extern bool arc_need_delay (rtx_insn *insn); - extern bool arc_text_label (rtx_insn *insn); - - extern bool arc_short_comparison_p (rtx, int); -diff --git a/gcc/config/arc/arc.c b/gcc/config/arc/arc.c -index 5a7b0cb6696..c3ee9181f93 100644 ---- a/gcc/config/arc/arc.c -+++ b/gcc/config/arc/arc.c -@@ -10341,59 +10341,6 @@ arc_attr_type (rtx_insn *insn) - return get_attr_type (insn); - } - --/* Return true if insn sets the condition codes. */ -- --bool --arc_sets_cc_p (rtx_insn *insn) --{ -- if (NONJUMP_INSN_P (insn)) -- if (rtx_sequence *seq = dyn_cast (PATTERN (insn))) -- insn = seq->insn (seq->len () - 1); -- return arc_attr_type (insn) == TYPE_COMPARE; --} -- --/* Return true if INSN is an instruction with a delay slot we may want -- to fill. */ -- --bool --arc_need_delay (rtx_insn *insn) --{ -- rtx_insn *next; -- -- if (!flag_delayed_branch) -- return false; -- /* The return at the end of a function needs a delay slot. */ -- if (NONJUMP_INSN_P (insn) && GET_CODE (PATTERN (insn)) == USE -- && (!(next = next_active_insn (insn)) -- || ((!NONJUMP_INSN_P (next) || GET_CODE (PATTERN (next)) != SEQUENCE) -- && arc_attr_type (next) == TYPE_RETURN)) -- && (!TARGET_PAD_RETURN -- || (prev_active_insn (insn) -- && prev_active_insn (prev_active_insn (insn)) -- && prev_active_insn (prev_active_insn (prev_active_insn (insn)))))) -- return true; -- if (NONJUMP_INSN_P (insn) -- ? (GET_CODE (PATTERN (insn)) == USE -- || GET_CODE (PATTERN (insn)) == CLOBBER -- || GET_CODE (PATTERN (insn)) == SEQUENCE) -- : JUMP_P (insn) -- ? (GET_CODE (PATTERN (insn)) == ADDR_VEC -- || GET_CODE (PATTERN (insn)) == ADDR_DIFF_VEC) -- : !CALL_P (insn)) -- return false; -- return num_delay_slots (insn) != 0; --} -- --/* Return true if the scheduling pass(es) has/have already run, -- i.e. where possible, we should try to mitigate high latencies -- by different instruction selection. */ -- --bool --arc_scheduling_not_expected (void) --{ -- return cfun->machine->arc_reorg_started; --} -- - /* Code has a minimum p2 alignment of 1, which we must restore after - an ADDR_DIFF_VEC. */ - -diff --git a/gcc/config/arc/arc.md b/gcc/config/arc/arc.md -index f91adbc0d94..c635b69ddd5 100644 ---- a/gcc/config/arc/arc.md -+++ b/gcc/config/arc/arc.md -@@ -2847,43 +2847,25 @@ archs4x, archs4xd" - (set_attr "type" "compare") - (set_attr "length" "4,4,8")]) - --; w/c/c comes first (rather than w/0/C_0) to prevent the middle-end --; needlessly prioritizing the matching constraint. --; Rcw/0/C_0 comes before w/c/L so that the lower latency conditional --; execution is used where possible. --(define_insn_and_split "adc" -- [(set (match_operand:SI 0 "dest_reg_operand" "=w,Rcw,w,Rcw,w") -- (plus:SI (plus:SI (ltu:SI (reg:CC_C CC_REG) (const_int 0)) -- (match_operand:SI 1 "nonmemory_operand" -- "%c,0,c,0,cCal")) -- (match_operand:SI 2 "nonmemory_operand" "c,C_0,L,I,cCal")))] -+(define_insn "adc" -+ [(set (match_operand:SI 0 "register_operand" "=r, r,r,r, r,r") -+ (plus:SI -+ (plus:SI -+ (ltu:SI (reg:CC_C CC_REG) (const_int 0)) -+ (match_operand:SI 1 "nonmemory_operand" "%r, 0,r,0,Cal,r")) -+ (match_operand:SI 2 "nonmemory_operand" "r,C_0,L,I, r,Cal")))] - "register_operand (operands[1], SImode) - || register_operand (operands[2], SImode)" - "@ -- adc %0,%1,%2 -- add.cs %0,%1,1 -- adc %0,%1,%2 -- adc %0,%1,%2 -- adc %0,%1,%2" -- ; if we have a bad schedule after sched2, split. -- "reload_completed -- && !optimize_size && (!TARGET_ARC600_FAMILY) -- && arc_scheduling_not_expected () -- && arc_sets_cc_p (prev_nonnote_insn (insn)) -- /* If next comes a return or other insn that needs a delay slot, -- expect the adc to get into the delay slot. */ -- && next_nonnote_insn (insn) -- && !arc_need_delay (next_nonnote_insn (insn)) -- /* Restore operands before emitting. */ -- && (extract_insn_cached (insn), 1)" -- [(set (match_dup 0) (match_dup 3)) -- (cond_exec -- (ltu (reg:CC_C CC_REG) (const_int 0)) -- (set (match_dup 0) (plus:SI (match_dup 0) (const_int 1))))] -- "operands[3] = simplify_gen_binary (PLUS, SImode, operands[1], operands[2]);" -+ adc\\t%0,%1,%2 -+ add.cs\\t%0,%1,1 -+ adc\\t%0,%1,%2 -+ adc\\t%0,%1,%2 -+ adc\\t%0,%1,%2 -+ adc\\t%0,%1,%2" - [(set_attr "cond" "use") - (set_attr "type" "cc_arith") -- (set_attr "length" "4,4,4,4,8")]) -+ (set_attr "length" "4,4,4,4,8,8")]) - - ; combiner-splitter cmp / scc -> cmp / adc - (define_split -@@ -3015,7 +2997,7 @@ archs4x, archs4xd" - DONE; - } - emit_insn (gen_sub_f (l0, l1, l2)); -- emit_insn (gen_sbc (h0, h1, h2, gen_rtx_REG (CCmode, CC_REG))); -+ emit_insn (gen_sbc (h0, h1, h2)); - DONE; - ") - -@@ -3030,44 +3012,25 @@ archs4x, archs4xd" - (set_attr "type" "cc_arith") - (set_attr "length" "4")]) - --; w/c/c comes first (rather than Rcw/0/C_0) to prevent the middle-end --; needlessly prioritizing the matching constraint. --; Rcw/0/C_0 comes before w/c/L so that the lower latency conditional execution --; is used where possible. --(define_insn_and_split "sbc" -- [(set (match_operand:SI 0 "dest_reg_operand" "=w,Rcw,w,Rcw,w") -- (minus:SI (minus:SI (match_operand:SI 1 "nonmemory_operand" -- "c,0,c,0,cCal") -- (ltu:SI (match_operand:CC_C 3 "cc_use_register") -- (const_int 0))) -- (match_operand:SI 2 "nonmemory_operand" "c,C_0,L,I,cCal")))] -+(define_insn "sbc" -+ [(set (match_operand:SI 0 "dest_reg_operand" "=r,r,r,r,r,r") -+ (minus:SI -+ (minus:SI -+ (match_operand:SI 1 "nonmemory_operand" "r, 0,r,0, r,Cal") -+ (ltu:SI (reg:CC_C CC_REG) (const_int 0))) -+ (match_operand:SI 2 "nonmemory_operand" "r,C_0,L,I,Cal,r")))] - "register_operand (operands[1], SImode) - || register_operand (operands[2], SImode)" - "@ -- sbc %0,%1,%2 -- sub.cs %0,%1,1 -- sbc %0,%1,%2 -- sbc %0,%1,%2 -- sbc %0,%1,%2" -- ; if we have a bad schedule after sched2, split. -- "reload_completed -- && !optimize_size && (!TARGET_ARC600_FAMILY) -- && arc_scheduling_not_expected () -- && arc_sets_cc_p (prev_nonnote_insn (insn)) -- /* If next comes a return or other insn that needs a delay slot, -- expect the adc to get into the delay slot. */ -- && next_nonnote_insn (insn) -- && !arc_need_delay (next_nonnote_insn (insn)) -- /* Restore operands before emitting. */ -- && (extract_insn_cached (insn), 1)" -- [(set (match_dup 0) (match_dup 4)) -- (cond_exec -- (ltu (reg:CC_C CC_REG) (const_int 0)) -- (set (match_dup 0) (plus:SI (match_dup 0) (const_int -1))))] -- "operands[4] = simplify_gen_binary (MINUS, SImode, operands[1], operands[2]);" -+ sbc\\t%0,%1,%2 -+ sub.cs\\t%0,%1,1 -+ sbc\\t%0,%1,%2 -+ sbc\\t%0,%1,%2 -+ sbc\\t%0,%1,%2 -+ sbc\\t%0,%1,%2" - [(set_attr "cond" "use") - (set_attr "type" "cc_arith") -- (set_attr "length" "4,4,4,4,8")]) -+ (set_attr "length" "4,4,4,4,8,8")]) - - (define_insn "sub_f" - [(set (reg:CC CC_REG) diff --git a/package/gcc/arc-2020.09-release/0002-libsanitizer-Remove-cyclades-from-libsanitizer.patch b/package/gcc/arc-2020.09-release/0002-libsanitizer-Remove-cyclades-from-libsanitizer.patch deleted file mode 100644 index 051d4db341..0000000000 --- a/package/gcc/arc-2020.09-release/0002-libsanitizer-Remove-cyclades-from-libsanitizer.patch +++ /dev/null @@ -1,121 +0,0 @@ -From 1557c3d919623a95c2aa090d3018c31401f63f88 Mon Sep 17 00:00:00 2001 -From: Tamar Christina -Date: Fri, 21 May 2021 12:16:56 +0100 -Subject: [PATCH] libsanitizer: Remove cyclades from libsanitizer - -The Linux kernel has removed the interface to cyclades from -the latest kernel headers[1] due to them being orphaned for the -past 13 years. - -libsanitizer uses this header when compiling against glibc, but -glibcs itself doesn't seem to have any references to cyclades. - -Further more it seems that the driver is broken in the kernel and -the firmware doesn't seem to be available anymore. - -As such since this is breaking the build of libsanitizer (and so the -GCC bootstrap[2]) I propose to remove this. - -[1] https://lkml.org/lkml/2021/3/2/153 -[2] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100379 - -libsanitizer/ChangeLog: - - PR sanitizer/100379 - * sanitizer_common/sanitizer_common_interceptors_ioctl.inc: Cherry-pick - llvm-project revision f7c5351552387bd43f6ca3631016d7f0dfe0f135. - * sanitizer_common/sanitizer_platform_limits_posix.cc: Likewise. - * sanitizer_common/sanitizer_platform_limits_posix.h: Likewise. ---- - .../sanitizer_common_interceptors_ioctl.inc | 9 --------- - .../sanitizer_platform_limits_posix.cpp | 11 ----------- - .../sanitizer_platform_limits_posix.h | 10 ---------- - 3 files changed, 30 deletions(-) - -diff --git a/libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc b/libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc -index 490a04b2181..42e43a04441 100644 ---- a/libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc -+++ b/libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc -@@ -366,15 +366,6 @@ static void ioctl_table_fill() { - - #if SANITIZER_LINUX && !SANITIZER_ANDROID - // _(SIOCDEVPLIP, WRITE, struct_ifreq_sz); // the same as EQL_ENSLAVE -- _(CYGETDEFTHRESH, WRITE, sizeof(int)); -- _(CYGETDEFTIMEOUT, WRITE, sizeof(int)); -- _(CYGETMON, WRITE, struct_cyclades_monitor_sz); -- _(CYGETTHRESH, WRITE, sizeof(int)); -- _(CYGETTIMEOUT, WRITE, sizeof(int)); -- _(CYSETDEFTHRESH, NONE, 0); -- _(CYSETDEFTIMEOUT, NONE, 0); -- _(CYSETTHRESH, NONE, 0); -- _(CYSETTIMEOUT, NONE, 0); - _(EQL_EMANCIPATE, WRITE, struct_ifreq_sz); - _(EQL_ENSLAVE, WRITE, struct_ifreq_sz); - _(EQL_GETMASTRCFG, WRITE, struct_ifreq_sz); -diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp -index aa845df4dde..badf6a401cc 100644 ---- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp -+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp -@@ -130,7 +130,6 @@ typedef struct user_fpregs elf_fpregset_t; - # include - #endif - #include --#include - #include - #include - #include -@@ -443,7 +442,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); - - #if SANITIZER_LINUX && !SANITIZER_ANDROID - unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct); -- unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor); - #if EV_VERSION > (0x010000) - unsigned struct_input_keymap_entry_sz = sizeof(struct input_keymap_entry); - #else -@@ -809,15 +807,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); - #endif // SANITIZER_LINUX - - #if SANITIZER_LINUX && !SANITIZER_ANDROID -- unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH; -- unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT; -- unsigned IOCTL_CYGETMON = CYGETMON; -- unsigned IOCTL_CYGETTHRESH = CYGETTHRESH; -- unsigned IOCTL_CYGETTIMEOUT = CYGETTIMEOUT; -- unsigned IOCTL_CYSETDEFTHRESH = CYSETDEFTHRESH; -- unsigned IOCTL_CYSETDEFTIMEOUT = CYSETDEFTIMEOUT; -- unsigned IOCTL_CYSETTHRESH = CYSETTHRESH; -- unsigned IOCTL_CYSETTIMEOUT = CYSETTIMEOUT; - unsigned IOCTL_EQL_EMANCIPATE = EQL_EMANCIPATE; - unsigned IOCTL_EQL_ENSLAVE = EQL_ENSLAVE; - unsigned IOCTL_EQL_GETMASTRCFG = EQL_GETMASTRCFG; -diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h -index d82fd5e4005..dc6423bc297 100644 ---- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h -+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h -@@ -974,7 +974,6 @@ extern unsigned struct_vt_mode_sz; - - #if SANITIZER_LINUX && !SANITIZER_ANDROID - extern unsigned struct_ax25_parms_struct_sz; --extern unsigned struct_cyclades_monitor_sz; - extern unsigned struct_input_keymap_entry_sz; - extern unsigned struct_ipx_config_data_sz; - extern unsigned struct_kbdiacrs_sz; -@@ -1319,15 +1318,6 @@ extern unsigned IOCTL_VT_WAITACTIVE; - #endif // SANITIZER_LINUX - - #if SANITIZER_LINUX && !SANITIZER_ANDROID --extern unsigned IOCTL_CYGETDEFTHRESH; --extern unsigned IOCTL_CYGETDEFTIMEOUT; --extern unsigned IOCTL_CYGETMON; --extern unsigned IOCTL_CYGETTHRESH; --extern unsigned IOCTL_CYGETTIMEOUT; --extern unsigned IOCTL_CYSETDEFTHRESH; --extern unsigned IOCTL_CYSETDEFTIMEOUT; --extern unsigned IOCTL_CYSETTHRESH; --extern unsigned IOCTL_CYSETTIMEOUT; - extern unsigned IOCTL_EQL_EMANCIPATE; - extern unsigned IOCTL_EQL_ENSLAVE; - extern unsigned IOCTL_EQL_GETMASTRCFG; --- -2.31.1 - diff --git a/package/gcc/arc-2020.09-release/0003-fixinc-don-t-fix-machine-names-in-__has_include-.-PR.patch b/package/gcc/arc-2020.09-release/0003-fixinc-don-t-fix-machine-names-in-__has_include-.-PR.patch deleted file mode 100644 index 8b6be49e68..0000000000 --- a/package/gcc/arc-2020.09-release/0003-fixinc-don-t-fix-machine-names-in-__has_include-.-PR.patch +++ /dev/null @@ -1,124 +0,0 @@ -From 65754c50a57e5a891cee75bb744eb93fdb3c443e 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(...) - [PR91085] - -fixincludes/ - - PR other/91085 - * fixfixes.c (check_has_inc): New static function. - (machine_name_fix): Don't replace header names in - __has_include(...). - * inclhack.def (machine_name): Adjust test. - * tests/base/testing.h: Update. - -Upstream: 6bf383c37e6131a8e247e8a0997d55d65c830b6d -Signed-off-by: Thomas Petazzoni ---- - fixincludes/fixfixes.c | 45 ++++++++++++++++++++++++++++++-- - fixincludes/inclhack.def | 3 ++- - fixincludes/tests/base/testing.h | 2 +- - 3 files changed, 46 insertions(+), 4 deletions(-) - -diff --git a/fixincludes/fixfixes.c b/fixincludes/fixfixes.c -index 034e15d9985..3ff87812036 100644 ---- a/fixincludes/fixfixes.c -+++ b/fixincludes/fixfixes.c -@@ -477,6 +477,39 @@ FIX_PROC_HEAD( char_macro_def_fix ) - fputs (text, stdout); - } - -+/* Check if the pattern at pos is actually in a "__has_include(...)" -+ directive. Return the pointer to the ')' of this -+ "__has_include(...)" if it is, NULL otherwise. */ -+static const char * -+check_has_inc (const char *begin, const char *pos, const char *end) -+{ -+ static const char has_inc[] = "__has_include"; -+ const size_t has_inc_len = sizeof (has_inc) - 1; -+ const char *p; -+ -+ for (p = memmem (begin, pos - begin, has_inc, has_inc_len); -+ p != NULL; -+ p = memmem (p, pos - p, has_inc, has_inc_len)) -+ { -+ p += has_inc_len; -+ while (p < end && ISSPACE (*p)) -+ p++; -+ -+ /* "__has_include" may appear as "defined(__has_include)", -+ search for the next appearance then. */ -+ if (*p != '(') -+ continue; -+ -+ /* To avoid too much complexity, just hope there is never a -+ ')' in a header name. */ -+ p = memchr (p, ')', end - p); -+ if (p == NULL || p > pos) -+ return p; -+ } -+ -+ return NULL; -+} -+ - /* Fix for machine name #ifdefs that are not in the namespace reserved - by the C standard. They won't be defined if compiling with -ansi, - and the headers will break. We go to some trouble to only change -@@ -524,7 +557,7 @@ FIX_PROC_HEAD( machine_name_fix ) - /* If the 'name_pat' matches in between base and limit, we have - a bogon. It is not worth the hassle of excluding comments - because comments on #if/#ifdef lines are rare, and strings on -- such lines are illegal. -+ such lines are only legal in a "__has_include" directive. - - REG_NOTBOL means 'base' is not at the beginning of a line, which - shouldn't matter since the name_re has no ^ anchor, but let's -@@ -544,8 +577,16 @@ FIX_PROC_HEAD( machine_name_fix ) - break; - - p = base + match[0].rm_so; -- base += match[0].rm_eo; - -+ /* Check if the match is in __has_include(...) (PR 91085). */ -+ q = check_has_inc (base, p, limit); -+ if (q) -+ { -+ base = q + 1; -+ goto again; -+ } -+ -+ base += match[0].rm_eo; - /* One more test: if on the same line we have the same string - 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 f58e7771e1c..71bd717c233 100644 ---- a/fixincludes/inclhack.def -+++ b/fixincludes/inclhack.def -@@ -3114,7 +3114,8 @@ fix = { - c_fix = machine_name; - - test_text = "/* MACH_DIFF: */\n" -- "#if defined( i386 ) || defined( sparc ) || defined( vax )" -+ "#if defined( i386 ) || defined( sparc ) || defined( vax ) || " -+ "defined( linux ) || __has_include ( )" - "\n/* no uniform test, so be careful :-) */"; - }; - -diff --git a/fixincludes/tests/base/testing.h b/fixincludes/tests/base/testing.h -index cf95321fb86..8b3accaf04e 100644 ---- a/fixincludes/tests/base/testing.h -+++ b/fixincludes/tests/base/testing.h -@@ -64,7 +64,7 @@ BSD43__IOWR('T', 1) /* Some are multi-line */ - - #if defined( MACHINE_NAME_CHECK ) - /* MACH_DIFF: */ --#if defined( i386 ) || defined( sparc ) || defined( vax ) -+#if defined( i386 ) || defined( sparc ) || defined( vax ) || defined( linux ) || __has_include ( ) - /* no uniform test, so be careful :-) */ - #endif /* MACHINE_NAME_CHECK */ - --- -2.37.3 - diff --git a/package/gcc/arc-2020.09-release/0100-uclibc-conf.patch b/package/gcc/arc-2020.09-release/0100-uclibc-conf.patch deleted file mode 100644 index d354baf81f..0000000000 --- a/package/gcc/arc-2020.09-release/0100-uclibc-conf.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 326b880b20e5f8187dbda736b4c4c662cbfb00ca Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Tue, 2 May 2017 22:36:15 +0200 -Subject: [PATCH] uclibc-conf - -[Romain: convert to git patch] -Signed-off-by: Romain Naour ---- - contrib/regression/objs-gcc.sh | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/contrib/regression/objs-gcc.sh b/contrib/regression/objs-gcc.sh -index 60b0497..6dc7ead 100755 ---- a/contrib/regression/objs-gcc.sh -+++ b/contrib/regression/objs-gcc.sh -@@ -106,6 +106,10 @@ if [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-gnu ] - then - make all-gdb all-dejagnu all-ld || exit 1 - make install-gdb install-dejagnu install-ld || exit 1 -+elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ] -+ then -+ make all-gdb all-dejagnu all-ld || exit 1 -+ make install-gdb install-dejagnu install-ld || exit 1 - elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then - make bootstrap || exit 1 - make install || exit 1 --- -2.9.3 - diff --git a/package/gcc/gcc.hash b/package/gcc/gcc.hash index 478b0b1620..5061a603bc 100644 --- a/package/gcc/gcc.hash +++ b/package/gcc/gcc.hash @@ -10,7 +10,7 @@ sha512 8fb799dfa2e5de5284edf8f821e3d40c2781e4c570f5adfdb1ca0671fcae3fb7f794ea78 sha512 d99e4826a70db04504467e349e9fbaedaa5870766cda7c5cab50cdebedc4be755ebca5b789e1232a34a20be1a0b60097de9280efe47bdb71c73251e30b0862a2 gcc-13.2.0.tar.xz # Locally calculated (fetched from Github) -sha512 b0853e2b1c5998044392023fa653e399e74118c46e616504ac59e1a2cf27620f94434767ce06b6cf4ca3dfb57f81d6eda92752befaf095ea5e564a9181b4659c gcc-arc-2020.09-release.tar.gz +sha512 4dca20f517a42bb027fec605965b09fb917a535eebf3fe3e811d93476b02b1962df5ad4665f117bd44c2ec8e8015d51a44c00591761fe5f259c201ac5c7d920f gcc-arc-2023.09-release.tar.gz # Locally calculated (fetched from Github) sha512 2de7cf47333a4092b02d3bb98f4206f14966f1d139a724d09cf3b22f8a43ae0c704f33e6477d6367a03c29b265480dc900169e9d417006c5d46f0ae446b8c6f1 gcc-or1k-musl-5.4.0-20170218.tar.gz diff --git a/package/gdb/Config.in b/package/gdb/Config.in index 7251dce668..574ad5462f 100644 --- a/package/gdb/Config.in +++ b/package/gdb/Config.in @@ -58,8 +58,8 @@ config BR2_PACKAGE_GDB_DEBUGGER bool "full debugger" depends on BR2_USE_WCHAR depends on !BR2_sh - select BR2_PACKAGE_GMP if !BR2_arc - select BR2_PACKAGE_MPFR if BR2_GDB_VERSION_14 + select BR2_PACKAGE_GMP + select BR2_PACKAGE_MPFR if (BR2_GDB_VERSION_14 || BR2_arc) select BR2_PACKAGE_NCURSES select BR2_PACKAGE_ZLIB diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host index da35fd94f7..891e45948e 100644 --- a/package/gdb/Config.in.host +++ b/package/gdb/Config.in.host @@ -62,7 +62,7 @@ endif # If cross-gdb is not enabled, the latest stable version is chosen. config BR2_GDB_VERSION string - default "arc-2020.09-release-gdb" if BR2_arc + default "arc-2023.09-release" if BR2_arc default "12.1" if BR2_GDB_VERSION_12 default "13.2" if BR2_GDB_VERSION_13 || !BR2_PACKAGE_HOST_GDB # When making 14.x the default, or 14.x becomes the oldest version, diff --git a/package/gdb/arc-2020.09-release-gdb/0001-Do-not-define-basic_string_view-to_string.patch b/package/gdb/arc-2020.09-release-gdb/0001-Do-not-define-basic_string_view-to_string.patch deleted file mode 100644 index 210ba6d609..0000000000 --- a/package/gdb/arc-2020.09-release-gdb/0001-Do-not-define-basic_string_view-to_string.patch +++ /dev/null @@ -1,114 +0,0 @@ -From 5ac588997c3c2d032d5d5145d9245eb37354c23b Mon Sep 17 00:00:00 2001 -From: Tom Tromey -Date: Tue, 30 Jun 2020 07:53:03 -0600 -Subject: [PATCH] Do not define basic_string_view::to_string - -gdb's copy of basic_string_view includes a to_string method. However, -according to cppreference, this is not a method on the real -std::basic_string_view: - -https://en.cppreference.com/w/cpp/string/basic_string_view - -This difference matters because gdb_string_view.h will use the -standard implementation when built with a C++17 or later. This caused -PR build/26183. - -This patch fixes the problem by changing the method to be a standalone -helper function, and then rewriting the uses. Tested by rebuilding -with a version of GCC that defaults to C++17. - -(Note that the build still is not clean; and also I noticed that the -libstdc++ string_view forbids the use of nullptr ... I wonder if gdb -violates that.) - -gdb/ChangeLog -2020-06-30 Tom Tromey - - PR build/26183: - * ada-lang.c (ada_lookup_name_info::ada_lookup_name_info): Use - gdb::to_string. - -gdbsupport/ChangeLog -2020-06-30 Tom Tromey - - PR build/26183: - * gdb_string_view.h (basic_string_view::to_string): Remove. - (gdb::to_string): New function. - -Upstream: https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=5ac588997c3c2d032d5d5145d9245eb37354c23b -Bug report: https://sourceware.org/bugzilla/show_bug.cgi?id=26183 - -Signed-off-by: Bernd Kuhls ---- - gdb/ChangeLog | 6 ++++++ - gdb/ada-lang.c | 8 ++++---- - gdbsupport/ChangeLog | 6 ++++++ - gdbsupport/gdb_string_view.h | 17 ++++++++++------- - 4 files changed, 26 insertions(+), 11 deletions(-) - -diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c -index 9b0c2efbfe2..98508c168bc 100644 ---- a/gdb/ada-lang.c -+++ b/gdb/ada-lang.c -@@ -13553,10 +13553,10 @@ ada_lookup_name_info::ada_lookup_name_info (const lookup_name_info &lookup_name) - { - if (user_name.back () == '>') - m_encoded_name -- = user_name.substr (1, user_name.size () - 2).to_string (); -+ = gdb::to_string (user_name.substr (1, user_name.size () - 2)); - else - m_encoded_name -- = user_name.substr (1, user_name.size () - 1).to_string (); -+ = gdb::to_string (user_name.substr (1, user_name.size () - 1)); - m_encoded_p = true; - m_verbatim_p = true; - m_wild_match_p = false; -@@ -13575,10 +13575,10 @@ ada_lookup_name_info::ada_lookup_name_info (const lookup_name_info &lookup_name) - if (encoded != NULL) - m_encoded_name = encoded; - else -- m_encoded_name = user_name.to_string (); -+ m_encoded_name = gdb::to_string (user_name); - } - else -- m_encoded_name = user_name.to_string (); -+ m_encoded_name = gdb::to_string (user_name); - - /* Handle the 'package Standard' special case. See description - of m_standard_p. */ -diff --git a/gdbsupport/gdb_string_view.h b/gdbsupport/gdb_string_view.h -index c0ae7a8a2d9..65124e67e54 100644 ---- a/gdbsupport/gdb_string_view.h -+++ b/gdbsupport/gdb_string_view.h -@@ -245,13 +245,6 @@ namespace gdb { - return { this->_M_str, this->_M_len }; - } - -- template> -- std::basic_string<_CharT, _Traits, _Allocator> -- to_string(const _Allocator& __alloc = _Allocator()) const -- { -- return { this->_M_str, this->_M_len, __alloc }; -- } -- - size_type - copy(_CharT* __str, size_type __n, size_type __pos = 0) const - { -@@ -560,4 +553,14 @@ namespace gdb { - - #endif // __cplusplus < 201703L - -+namespace gdb { -+ -+static inline std::string -+to_string(const gdb::string_view &view) -+{ -+ return { view.data (), view.size () }; -+} -+ -+} -+ - #endif /* COMMON_GDB_STRING_VIEW_H */ --- -2.39.3 - diff --git a/package/gdb/gdb.hash b/package/gdb/gdb.hash index ba90bff5d6..c62da28cbf 100644 --- a/package/gdb/gdb.hash +++ b/package/gdb/gdb.hash @@ -6,4 +6,4 @@ sha512 8185d3e11ab60dafff5860a5016577bfe7dd7547ef01ebc867bc247603d82b74ff74c4f2 sha512 575e198105076fc4a88f68591aa114ab9c1196e84386a3f7b9b58fe5f30cdeed33f6a5f957b68f08c47284ec922bb60c964627e238471419673fd913575ce427 gdb-14.1.tar.xz # Locally calculated (fetched from Github) -sha512 5a2acf2fd33ab2ff589e1037ca40abda54328997dcff26b2b49b874bd3be980be5a63342962254f3c3bda98e32ce7a33af704d37353352833dee193135600458 gdb-arc-2020.09-release-gdb.tar.gz +sha512 3518b47d5c11d1fb478ee152bde1719363f9391db73f3b9f5491217c17742bef8ebca6a51a40302dfaa9476c5a32a8b8f70a4bf64289422dea5f750ae53ab88d gdb-arc-2023.09-release.tar.gz diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk index c67a292619..141fcfc005 100644 --- a/package/gdb/gdb.mk +++ b/package/gdb/gdb.mk @@ -8,7 +8,7 @@ GDB_VERSION = $(call qstrip,$(BR2_GDB_VERSION)) GDB_SITE = $(BR2_GNU_MIRROR)/gdb GDB_SOURCE = gdb-$(GDB_VERSION).tar.xz -ifeq ($(BR2_arc),y) +ifeq ($(GDB_VERSION),arc-2023.09-release) GDB_SITE = $(call github,foss-for-synopsys-dwc-arc-processors,binutils-gdb,$(GDB_VERSION)) GDB_SOURCE = gdb-$(GDB_VERSION).tar.gz GDB_FROM_GIT = y @@ -56,11 +56,8 @@ GDB_DEPENDENCIES += host-flex host-bison HOST_GDB_DEPENDENCIES += host-flex host-bison endif -# All newer versions of GDB need host-gmp, so it's only for older -# versions that the dependency can be avoided. -ifeq ($(BR2_arc),) +# All newer versions of GDB need host-gmp HOST_GDB_DEPENDENCIES += host-gmp -endif # When gdb sources are fetched from the binutils-gdb repository, they # also contain the binutils sources, but binutils shouldn't be built, @@ -158,9 +155,8 @@ 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 the special version used on -# ARC. -ifeq ($(BR2_arc):$(BR2_PACKAGE_GDB_DEBUGGER),:y) +# gdb. +ifeq ($(BR2_PACKAGE_GDB_DEBUGGER),y) GDB_CONF_OPTS += \ --with-libgmp-prefix=$(STAGING_DIR)/usr GDB_DEPENDENCIES += gmp @@ -168,7 +164,9 @@ endif # Starting from GDB 14.x, mpfr is needed as a dependency to build full # gdb. -ifeq ($(BR2_GDB_VERSION_14)$(BR2_PACKAGE_GDB_DEBUGGER),yy) +# GDB fork from ARC GNU tools 2023.09 is based on GDB14 branch and so +# requires MPFR as well. +ifeq ($(BR2_GDB_VERSION_14)$(BR2_arc):$(BR2_PACKAGE_GDB_DEBUGGER),y:y) GDB_DEPENDENCIES += mpfr GDB_CONF_OPTS += --with-mpfr=$(STAGING_DIR) else @@ -272,7 +270,9 @@ HOST_GDB_CONF_OPTS = \ $(GDB_DISABLE_BINUTILS_CONF_OPTS) # GDB newer than 14.x need host-mpfr -ifeq ($(BR2_GDB_VERSION_14),y) +# GDB fork from ARC GNU tools 2023.09 is based on GDB14 branch and so +# requires MPFR as well. +ifeq ($(BR2_GDB_VERSION_14)$(BR2_arc),y) HOST_GDB_DEPENDENCIES += host-mpfr HOST_GDB_CONF_OPTS += --with-mpfr=$(HOST_DIR) else From a608e519a028a8218c5190c8fd417df33173347c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 4 Jan 2024 22:07:00 +0100 Subject: [PATCH 4512/5754] package/dahdi-linux: bump to version 3.3.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Drop all patches except first one (already in version) - This bump will fix the following build failure with kernel >= 6.6: /home/autobuild/autobuild/instance-2/output-1/build/dahdi-linux-3.2.0/drivers/dahdi/wct4xxp/base.c: In function ‘free_wc’: ./include/linux/workqueue.h:639:9: error: call to ‘__warn_flushing_systemwide_wq’ declared with attribute warning: Please avoid flushing system-wide workqueues. [-Werror=attribute-warning] 639 | __warn_flushing_systemwide_wq(); \ | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /home/autobuild/autobuild/instance-2/output-1/build/dahdi-linux-3.2.0/drivers/dahdi/wct4xxp/base.c:2025:9: note: in expansion of macro ‘flush_scheduled_work’ 2025 | flush_scheduled_work(); | ^~~~~~~~~~~~~~~~~~~~ cc1: all warnings being treated as errors https://github.com/asterisk/dahdi-linux/releases/tag/v3.3.0 Fixes: - http://autobuild.buildroot.org/results/e9755e1f4814b6b0c151c590b5c34acfd89556ad Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 4 - ...uild-fix-HOTPLUG_FIRMWARE-definition.patch | 64 ---------- ... 0001-fix-build-with-32-bits-kernel.patch} | 1 + ...lation-issues-on-linux-kernel-5-18-0.patch | 58 --------- .../0004-next-fix-kernel-6-1-build.patch | 32 ----- .../0005-Fix-build-on-Linux-6.3.patch | 116 ------------------ .../0006-Fix-build-on-Linux-6.4.patch | 69 ----------- package/dahdi-linux/dahdi-linux.hash | 4 +- package/dahdi-linux/dahdi-linux.mk | 2 +- 9 files changed, 4 insertions(+), 346 deletions(-) delete mode 100644 package/dahdi-linux/0001-drivers-dahdi-Kbuild-fix-HOTPLUG_FIRMWARE-definition.patch rename package/dahdi-linux/{0002-fix-build-with-32-bits-kernel.patch => 0001-fix-build-with-32-bits-kernel.patch} (99%) delete mode 100644 package/dahdi-linux/0003-Fixed-compilation-issues-on-linux-kernel-5-18-0.patch delete mode 100644 package/dahdi-linux/0004-next-fix-kernel-6-1-build.patch delete mode 100644 package/dahdi-linux/0005-Fix-build-on-Linux-6.3.patch delete mode 100644 package/dahdi-linux/0006-Fix-build-on-Linux-6.4.patch diff --git a/.checkpackageignore b/.checkpackageignore index 9551ed23ae..24780870e5 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -273,10 +273,6 @@ 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 diff --git a/package/dahdi-linux/0001-drivers-dahdi-Kbuild-fix-HOTPLUG_FIRMWARE-definition.patch b/package/dahdi-linux/0001-drivers-dahdi-Kbuild-fix-HOTPLUG_FIRMWARE-definition.patch deleted file mode 100644 index 82fd9bdc59..0000000000 --- a/package/dahdi-linux/0001-drivers-dahdi-Kbuild-fix-HOTPLUG_FIRMWARE-definition.patch +++ /dev/null @@ -1,64 +0,0 @@ -From dc0a646a460e6da10ddbe7bf02794051d76f8751 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 4 Nov 2021 17:30:06 +0100 -Subject: [PATCH] drivers/dahdi/Kbuild: fix HOTPLUG_FIRMWARE definition - -HOTPLUG_FIRMWARE is used before being defined resulting in the following -build failure since version 2.7.0 and -https://git.asterisk.org/gitweb/?p=dahdi/linux.git;a=commit;h=e2f492595c9191ba6d556ccac1bde4c1bb892938: - - MODPOST /home/fabrice/buildroot/output/build/dahdi-linux-5c840cf43838e0690873e73409491c392333b3b8/drivers/dahdi/Module.symvers -ERROR: modpost: "_binary_dahdi_fw_oct6114_032_bin_start" [/home/fabrice/buildroot/output/build/dahdi-linux-5c840cf43838e0690873e73409491c392333b3b8/drivers/dahdi/wcaxx.ko] undefined! -ERROR: modpost: "_binary_dahdi_fw_oct6114_032_bin_size" [/home/fabrice/buildroot/output/build/dahdi-linux-5c840cf43838e0690873e73409491c392333b3b8/drivers/dahdi/wcaxx.ko] undefined! -ERROR: modpost: "_binary_dahdi_fw_oct6114_128_bin_start" [/home/fabrice/buildroot/output/build/dahdi-linux-5c840cf43838e0690873e73409491c392333b3b8/drivers/dahdi/wcte43x.ko] undefined! -ERROR: modpost: "_binary_dahdi_fw_oct6114_064_bin_start" [/home/fabrice/buildroot/output/build/dahdi-linux-5c840cf43838e0690873e73409491c392333b3b8/drivers/dahdi/wcte43x.ko] undefined! -ERROR: modpost: "_binary_dahdi_fw_oct6114_128_bin_size" [/home/fabrice/buildroot/output/build/dahdi-linux-5c840cf43838e0690873e73409491c392333b3b8/drivers/dahdi/wcte43x.ko] undefined! -ERROR: modpost: "_binary_dahdi_fw_oct6114_064_bin_size" [/home/fabrice/buildroot/output/build/dahdi-linux-5c840cf43838e0690873e73409491c392333b3b8/drivers/dahdi/wcte43x.ko] undefined! -ERROR: modpost: "_binary_dahdi_fw_oct6114_032_bin_start" [/home/fabrice/buildroot/output/build/dahdi-linux-5c840cf43838e0690873e73409491c392333b3b8/drivers/dahdi/wcte13xp.ko] undefined! -ERROR: modpost: "_binary_dahdi_fw_oct6114_032_bin_size" [/home/fabrice/buildroot/output/build/dahdi-linux-5c840cf43838e0690873e73409491c392333b3b8/drivers/dahdi/wcte13xp.ko] undefined! - -Signed-off-by: Fabrice Fontaine -[Upstream status: sent to "Shaun Ruffell "] ---- - drivers/dahdi/Kbuild | 18 +++++++++--------- - 1 file changed, 9 insertions(+), 9 deletions(-) - -diff --git a/drivers/dahdi/Kbuild b/drivers/dahdi/Kbuild -index 855e5bf..b1a8481 100644 ---- a/drivers/dahdi/Kbuild -+++ b/drivers/dahdi/Kbuild -@@ -13,6 +13,15 @@ obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_WCTC4XXP) += wctc4xxp/ - obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_WCTDM24XXP) += wctdm24xxp/ - obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_WCTE13XP) += wcte13xp.o - -+ifndef HOTPLUG_FIRMWARE -+ifneq (,$(filter y m,$(CONFIG_FW_LOADER))) -+HOTPLUG_FIRMWARE := yes -+else -+HOTPLUG_FIRMWARE := no -+endif -+export HOTPLUG_FIRMWARE -+endif -+ - wcte13xp-objs := wcte13xp-base.o wcxb_spi.o wcxb.o wcxb_flash.o - CFLAGS_wcte13xp-base.o += -I$(src)/oct612x -I$(src)/oct612x/include -I$(src)/oct612x/octdeviceapi -I$(src)/oct612x/octdeviceapi/oct6100api - ifeq ($(HOTPLUG_FIRMWARE),yes) -@@ -61,15 +70,6 @@ endif - - CFLAGS_MODULE += -I$(DAHDI_INCLUDE) -I$(src) -Wno-format-truncation - --ifndef HOTPLUG_FIRMWARE --ifneq (,$(filter y m,$(CONFIG_FW_LOADER))) --HOTPLUG_FIRMWARE := yes --else --HOTPLUG_FIRMWARE := no --endif --export HOTPLUG_FIRMWARE --endif -- - # fix typo present in CentOS and RHEL 2.6.9 kernels - BAD_KERNELS_VERS := 22 34 34.0.1 34.0.2 - BAD_KERNELS := $(foreach ver,$(BAD_KERNELS_VERS),2.6.9-$(ver).EL 2.6.9-$(ver).ELsmp) --- -2.33.0 - diff --git a/package/dahdi-linux/0002-fix-build-with-32-bits-kernel.patch b/package/dahdi-linux/0001-fix-build-with-32-bits-kernel.patch similarity index 99% rename from package/dahdi-linux/0002-fix-build-with-32-bits-kernel.patch rename to package/dahdi-linux/0001-fix-build-with-32-bits-kernel.patch index ddaf6b4e7a..df09149679 100644 --- a/package/dahdi-linux/0002-fix-build-with-32-bits-kernel.patch +++ b/package/dahdi-linux/0001-fix-build-with-32-bits-kernel.patch @@ -12,6 +12,7 @@ ERROR: modpost: "__moddi3" [/home/fabrice/buildroot/output/build/dahdi-linux-5c8 ERROR: modpost: "__divdi3" [/home/fabrice/buildroot/output/build/dahdi-linux-5c840cf43838e0690873e73409491c392333b3b8/drivers/dahdi/xpp/xpp.ko] undefined! Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/asterisk/dahdi-linux/pull/32 --- drivers/dahdi/xpp/xbus-core.c | 9 ++++++--- drivers/dahdi/xpp/xbus-pcm.c | 4 ++-- diff --git a/package/dahdi-linux/0003-Fixed-compilation-issues-on-linux-kernel-5-18-0.patch b/package/dahdi-linux/0003-Fixed-compilation-issues-on-linux-kernel-5-18-0.patch deleted file mode 100644 index a896def375..0000000000 --- a/package/dahdi-linux/0003-Fixed-compilation-issues-on-linux-kernel-5-18-0.patch +++ /dev/null @@ -1,58 +0,0 @@ -From dbb43101c2a9205b67223b006bf75c29ebadced9 Mon Sep 17 00:00:00 2001 -From: Pushkar Singh -Date: Tue, 2 Aug 2022 19:40:00 +0530 -Subject: [PATCH] Fixed compilation issues on linux kernel >= 5.18.0 - -With kernel 5.18 and higher -PCI: Remove the deprecated "pci-dma-compat.h" API - -The commit will make sure to impplement pci dma related api's -[Retrieved from: -https://github.com/asterisk/dahdi-linux/commit/dbb43101c2a9205b67223b006bf75c29ebadced9] -Signed-off-by: Fabrice Fontaine ---- - include/dahdi/kernel.h | 31 +++++++++++++++++++++++++++++++ - 1 file changed, 31 insertions(+) - -diff --git a/include/dahdi/kernel.h b/include/dahdi/kernel.h -index ed81e9e3..35e93bc4 100644 ---- a/include/dahdi/kernel.h -+++ b/include/dahdi/kernel.h -@@ -58,6 +58,37 @@ - - #include - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0) -+#include -+#include -+ -+static inline void *pci_alloc_consistent(struct pci_dev *hwdev, size_t size, dma_addr_t *dma_handle) -+{ -+ return dma_alloc_coherent(hwdev == NULL ? NULL : &hwdev->dev, size, dma_handle, GFP_ATOMIC); -+} -+ -+static inline void pci_free_consistent(struct pci_dev *hwdev, size_t size, void *vaddr, dma_addr_t dma_handle) -+{ -+ dma_free_coherent(hwdev == NULL ? NULL : &hwdev->dev, size, vaddr, dma_handle); -+} -+ -+static inline dma_addr_t pci_map_single(struct pci_dev *hwdev, void *ptr, size_t size, int direction) -+{ -+ return dma_map_single(&hwdev->dev, ptr, size, (enum dma_data_direction)direction); -+} -+ -+static inline void pci_unmap_single(struct pci_dev *hwdev, dma_addr_t dma_addr, size_t size, int direction) -+{ -+ dma_unmap_single(&hwdev->dev, dma_addr, size, (enum dma_data_direction)direction); -+} -+ -+static inline int pci_set_dma_mask(struct pci_dev *dev, u64 mask) -+{ -+ return dma_set_mask(&dev->dev, mask); -+} -+ -+#endif -+ - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) - #define HAVE_NET_DEVICE_OPS - #endif diff --git a/package/dahdi-linux/0004-next-fix-kernel-6-1-build.patch b/package/dahdi-linux/0004-next-fix-kernel-6-1-build.patch deleted file mode 100644 index b910c4b775..0000000000 --- a/package/dahdi-linux/0004-next-fix-kernel-6-1-build.patch +++ /dev/null @@ -1,32 +0,0 @@ -From a759a578277bde98eba7ef4bf86bdf819a900de9 Mon Sep 17 00:00:00 2001 -From: John Thomson -Date: Sun, 23 Oct 2022 13:42:52 +1000 -Subject: [PATCH] fix kernel 6.1 build - -kernel 6.1 includes b48b89f9c189 ("net: drop the weight argument from netif_napi_add") [0] - -[0]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=b48b89f9c189d24eb5e2b4a0ac067da5a24ee86d - -Signed-off-by: John Thomson -[Retrieved from: -https://github.com/asterisk/dahdi-linux/pull/14/commits/a759a578277bde98eba7ef4bf86bdf819a900de9] -Signed-off-by: Fabrice Fontaine ---- - include/dahdi/kernel.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/include/dahdi/kernel.h b/include/dahdi/kernel.h -index 35e93bc4..fd64a15e 100644 ---- a/include/dahdi/kernel.h -+++ b/include/dahdi/kernel.h -@@ -58,6 +58,10 @@ - - #include - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0) -+#define netif_napi_add netif_napi_add_weight -+#endif -+ - #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0) - #include - #include diff --git a/package/dahdi-linux/0005-Fix-build-on-Linux-6.3.patch b/package/dahdi-linux/0005-Fix-build-on-Linux-6.3.patch deleted file mode 100644 index f2ac4d2dc3..0000000000 --- a/package/dahdi-linux/0005-Fix-build-on-Linux-6.3.patch +++ /dev/null @@ -1,116 +0,0 @@ -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 - -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 - -[Bernd: updated patch for compatibility with kernel < 6.3] -Signed-off-by: Bernd Kuhls ---- - 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..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) - 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,11 @@ static inline struct dahdi_span *dev_to_span(struct device *dev) - return err; \ - } while (0) - -+#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 +419,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 +442,11 @@ static inline struct dahdi_device *to_ddev(struct device *dev) - return err; \ - } while (0) - -+#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; - -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..11b3ed3e 100644 ---- a/drivers/dahdi/xpp/xbus-sysfs.c -+++ b/drivers/dahdi/xpp/xbus-sysfs.c -@@ -418,7 +418,11 @@ static int astribank_match(struct device *dev, struct device_driver *driver) - return err; \ - } while (0) - -+#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; 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 deleted file mode 100644 index 992cb4d513..0000000000 --- a/package/dahdi-linux/0006-Fix-build-on-Linux-6.4.patch +++ /dev/null @@ -1,69 +0,0 @@ -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 - diff --git a/package/dahdi-linux/dahdi-linux.hash b/package/dahdi-linux/dahdi-linux.hash index 2d3f336777..e250850630 100644 --- a/package/dahdi-linux/dahdi-linux.hash +++ b/package/dahdi-linux/dahdi-linux.hash @@ -1,5 +1,5 @@ -# From http://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/dahdi-linux-3.2.0.sha256 -sha256 e2ef9b3f6769f60f432cfa09c39c9a0d7ab5bddff59229f385056915c65f9f13 dahdi-linux-3.2.0.tar.gz +# From http://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/dahdi-linux-3.3.0.sha256 +sha256 f9528a82b5e88c1d92d737efd65bd571bef2cd1b1b44d43b857a76e38e01a7c0 dahdi-linux-3.3.0.tar.gz # Firmware files have no upstream hash, so sha56 locally computed sha256 3ff26cf80555fd7470b43a87c51d03c1db2a75abcd4561d79f69b6c48298e4a1 dahdi-fwload-vpmadt032-1.25.0.tar.gz diff --git a/package/dahdi-linux/dahdi-linux.mk b/package/dahdi-linux/dahdi-linux.mk index 88519b5106..c688d3877c 100644 --- a/package/dahdi-linux/dahdi-linux.mk +++ b/package/dahdi-linux/dahdi-linux.mk @@ -4,7 +4,7 @@ # ################################################################################ -DAHDI_LINUX_VERSION = 3.2.0 +DAHDI_LINUX_VERSION = 3.3.0 DAHDI_LINUX_SITE = \ http://downloads.asterisk.org/pub/telephony/dahdi-linux/releases From 5594570a0c2ebb162ae304d7dca92aadf8f439ad Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 4 Jan 2024 22:35:34 +0100 Subject: [PATCH 4513/5754] package/dahdi-tools: bump to version 3.3.0 https://github.com/asterisk/dahdi-tools/releases/tag/v3.3.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/dahdi-tools/dahdi-tools.hash | 4 ++-- package/dahdi-tools/dahdi-tools.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/dahdi-tools/dahdi-tools.hash b/package/dahdi-tools/dahdi-tools.hash index c119ff4ee1..1251617286 100644 --- a/package/dahdi-tools/dahdi-tools.hash +++ b/package/dahdi-tools/dahdi-tools.hash @@ -1,5 +1,5 @@ -# From http://downloads.asterisk.org/pub/telephony/dahdi-tools/releases/dahdi-tools-3.2.0.sha256 -sha256 2bc269887fcd42d2486572611934d713e603734cc658b3b517fc9f3bdea7262f dahdi-tools-3.2.0.tar.gz +# From http://downloads.asterisk.org/pub/telephony/dahdi-tools/releases/dahdi-tools-3.3.0.sha256 +sha256 5706b37df5840ecdc524d4c86df2ad34a31f83db552a8519b4ccf61bac75d2e4 dahdi-tools-3.3.0.tar.gz # License files, locally computed sha256 fa5fc1d1eec39532ea517518eeefd7b6e3c14341a55e5880a0e2a49eee47a5b7 LICENSE diff --git a/package/dahdi-tools/dahdi-tools.mk b/package/dahdi-tools/dahdi-tools.mk index 7d4de645a2..056b29156d 100644 --- a/package/dahdi-tools/dahdi-tools.mk +++ b/package/dahdi-tools/dahdi-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -DAHDI_TOOLS_VERSION = 3.2.0 +DAHDI_TOOLS_VERSION = 3.3.0 DAHDI_TOOLS_SITE = http://downloads.asterisk.org/pub/telephony/dahdi-tools/releases DAHDI_TOOLS_LICENSE = GPLv2, LGPLv2.1 From 2d0327c802557bdf892a6aaf3abac57ed15fd80e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 4 Jan 2024 22:42:45 +0100 Subject: [PATCH 4514/5754] package/easy-rsa: bump to version 3.1.7 https://github.com/OpenVPN/easy-rsa/blob/v3.1.7/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/easy-rsa/easy-rsa.hash | 2 +- package/easy-rsa/easy-rsa.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/easy-rsa/easy-rsa.hash b/package/easy-rsa/easy-rsa.hash index 5be651bde0..de19d8b693 100644 --- a/package/easy-rsa/easy-rsa.hash +++ b/package/easy-rsa/easy-rsa.hash @@ -1,5 +1,5 @@ # Locally computed: (after verifying gpg sig) -sha512 8c8d1f4baf90475d4cce334d116b7f12b82687157796b25560600b5098769226ae2f60f02982c75266b625d66b465360ffa815260ad44850923e3fbc9ba8540a EasyRSA-3.1.1.tgz +sha512 eb3978b07c313af148c6ae94b60e213c8b810c5974242855560b22ad949cfc094d311e4cc04a95ddd0f817bfec54971caa5289e5fc532895e1e58499d265c705 EasyRSA-3.1.7.tgz # Hash for license files sha256 7c4a4fc71745d93a87278801f1bca555562ca23f21e18293add64b9e6f6b7bf1 COPYING.md diff --git a/package/easy-rsa/easy-rsa.mk b/package/easy-rsa/easy-rsa.mk index 4ea45506dd..7266943f5b 100644 --- a/package/easy-rsa/easy-rsa.mk +++ b/package/easy-rsa/easy-rsa.mk @@ -4,7 +4,7 @@ # ################################################################################ -EASY_RSA_VERSION = 3.1.1 +EASY_RSA_VERSION = 3.1.7 EASY_RSA_SOURCE = EasyRSA-$(EASY_RSA_VERSION).tgz EASY_RSA_SITE = https://github.com/OpenVPN/easy-rsa/releases/download/v$(EASY_RSA_VERSION) EASY_RSA_LICENSE = GPL-2.0 From 5b12863107cb73d8263dd24eab1fb15bd9cb5e0f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 5 Jan 2024 12:02:01 +0100 Subject: [PATCH 4515/5754] package/lsof: fix build without wchar or locale Fix the following build failure without wchar or locale raised since bump to version 4.99.3 in commit 1edafc4b483e82b045d3a0cc9cbbd000d6183ac7 and https://github.com/lsof-org/lsof/commit/898fe0eceec98ca71198de7d9c18e7ce6144ee13: In file included from common.h:42, from misc.c:31: ../machine.h:415:26: fatal error: wctype.h: No such file or directory 415 | # define WIDECHARINCL | ^ Fixes: - http://autobuild.buildroot.org/results/aa98b10e8eff5cc4fd03b4a64224cdfb6a0324a5 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/lsof/lsof.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lsof/lsof.mk b/package/lsof/lsof.mk index bb6eacb696..1831080b17 100644 --- a/package/lsof/lsof.mk +++ b/package/lsof/lsof.mk @@ -16,14 +16,14 @@ endif ifeq ($(BR2_USE_WCHAR),) define LSOF_CONFIGURE_WCHAR_FIXUPS - $(SED) 's,^#define[[:space:]]*HASWIDECHAR.*,#undef HASWIDECHAR,' \ + $(SED) 's,^#[[:space:]]*define HASWIDECHAR.*,#undef HASWIDECHAR,' \ $(@D)/machine.h endef endif ifeq ($(BR2_ENABLE_LOCALE),) define LSOF_CONFIGURE_LOCALE_FIXUPS - $(SED) 's,^#define[[:space:]]*HASSETLOCALE.*,#undef HASSETLOCALE,' \ + $(SED) 's,^#[[:space:]]*define HASSETLOCALE.*,#undef HASSETLOCALE,' \ $(@D)/machine.h endef endif From d1eea4f90ce9238cae36a8d4ae0161a8a3748616 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 4 Jan 2024 18:17:36 +0100 Subject: [PATCH 4516/5754] package/python-pysensors: fix build without host lm-sensors Fix the following build failure raised since the addition of the package in commit c8ff8d41c06f6b1cbc5cf8702a516411084ead16: File "/home/buildroot/autobuild/instance-2/output-1/build/python-pysensors-0.0.4/setup.py", line 3, in import sensors File "/home/buildroot/autobuild/instance-2/output-1/build/python-pysensors-0.0.4/sensors/__init__.py", line 20, in raise ImportError("can't find the sensors library.") Fixes: - http://autobuild.buildroot.org/results/acd8583fb635ea27811405a2478182ddcd5642f7 Signed-off-by: Fabrice Fontaine Tested-by: Brandon Maier Signed-off-by: Thomas Petazzoni --- ...-Remove-import-sensors-from-setup-py.patch | 55 +++++++++++++++++++ package/python-pysensors/Config.in | 2 +- 2 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 package/python-pysensors/0001-Remove-import-sensors-from-setup-py.patch diff --git a/package/python-pysensors/0001-Remove-import-sensors-from-setup-py.patch b/package/python-pysensors/0001-Remove-import-sensors-from-setup-py.patch new file mode 100644 index 0000000000..737f194fd4 --- /dev/null +++ b/package/python-pysensors/0001-Remove-import-sensors-from-setup-py.patch @@ -0,0 +1,55 @@ +Remove import sensors from setup.py + +Don't import sensors in setup.py to avoid adding a dependency on host +lm-sensors. Instead, move __version__, __author__, __contact__ and +__license__ to setup.py + +Signed-off-by: Fabrice Fontaine +Upstream: upstream is dead since 2019 + +diff '--color=auto' -Nura PySensors-0.0.4.orig/sensors/__init__.py PySensors-0.0.4/sensors/__init__.py +--- PySensors-0.0.4.orig/sensors/__init__.py 2024-01-04 13:47:07.114179107 +0100 ++++ PySensors-0.0.4/sensors/__init__.py 2024-01-04 14:07:24.701178768 +0100 +@@ -6,12 +6,6 @@ + + from sensors import stdc + +-__version__ = "0.0.4" +-__date__ = "2019-09-19" +-__author__ = "Marc 'BlackJack' Rintsch" +-__contact__ = 'marc@rintsch.de' +-__license__ = 'LGPL v2.1' +- + API_VERSION = 4 + DEFAULT_CONFIG_FILENAME = b"/etc/sensors3.conf" + +diff '--color=auto' -Nura PySensors-0.0.4.orig/setup.py PySensors-0.0.4/setup.py +--- PySensors-0.0.4.orig/setup.py 2024-01-04 13:47:07.114179107 +0100 ++++ PySensors-0.0.4/setup.py 2024-01-04 14:07:04.657260411 +0100 +@@ -1,17 +1,21 @@ + #!/usr/bin/env python3 + from setuptools import setup +-import sensors ++ ++__version__ = "0.0.4" ++__author__ = "Marc 'BlackJack' Rintsch" ++__contact__ = 'marc@rintsch.de' ++__license__ = 'LGPL v2.1' + + setup( + name='PySensors', +- version=sensors.__version__, +- author=sensors.__author__, +- author_email=sensors.__contact__, ++ version=__version__, ++ author=__author__, ++ author_email=__contact__, + packages=['sensors'], + # scripts=[], + url='http://pypi.python.org/pypi/PySensors/', + # download_url='', +- license=sensors.__license__, ++ license=__license__, + description='Python bindings to libsensors (via ctypes)', + long_description=open('README.rst').read(), + long_description_content_type="text/x-rst", diff --git a/package/python-pysensors/Config.in b/package/python-pysensors/Config.in index f8e056506b..952d14c351 100644 --- a/package/python-pysensors/Config.in +++ b/package/python-pysensors/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_PYTHON_PYSENSORS bool "python-pysensors" - select BR2_PACKAGE_LM_SENSORS + select BR2_PACKAGE_LM_SENSORS # runtime help Python bindings for libsensors.so from the lm-sensors project via ctypes. Supports API version 4, i.e. libsensors version From 5e272456d6d5a6196eab7a6a4a858b956ecefd0e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 3 Jan 2024 08:12:09 +0100 Subject: [PATCH 4517/5754] package/freeswitch: security bump version to 1.10.11 Release notes: https://developer.signalwire.com/freeswitch/FreeSWITCH-Explained/Release-Notes/FreeSWITCH-1.10.x-Release-notes_25460878/#11011-release-date-22-dec-2023 https://github.com/signalwire/freeswitch/releases/tag/v1.10.11 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 504be12090..3f16467e22 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.10.-release.tar.xz.sha256 -sha256 d2c702c7f4bd6eca539c3981cf859ad5c1846d9283829e24cd75686f2322b9df freeswitch-1.10.10.-release.tar.xz +# From https://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.11.-release.tar.xz.sha256 +sha256 7f9603a691220d9f47da42f3b19290b629b69dceb2eee56448f0a7cefcf9d1a1 freeswitch-1.10.11.-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 07d436cf0b..5b9dc49c9b 100644 --- a/package/freeswitch/freeswitch.mk +++ b/package/freeswitch/freeswitch.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREESWITCH_VERSION = 1.10.10 +FREESWITCH_VERSION = 1.10.11 FREESWITCH_SOURCE = freeswitch-$(FREESWITCH_VERSION).-release.tar.xz FREESWITCH_SITE = https://files.freeswitch.org/freeswitch-releases # External modules need headers/libs from staging From 639d8d4979d075cda3de9e663f5aecd9ead56c42 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 3 Jan 2024 08:11:41 +0100 Subject: [PATCH 4518/5754] package/libdrm: bump version to 2.4.119 Release notes: https://lists.x.org/archives/xorg-announce/2023-December/003438.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 bcbcdccf30..219c2c0712 100644 --- a/package/libdrm/libdrm.hash +++ b/package/libdrm/libdrm.hash @@ -1,6 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2023-November/003433.html -sha256 a777bd85f2b5fc9c57f886c82058300578317cafdbc77d0a769d7e9a9567ab88 libdrm-2.4.118.tar.xz -sha512 2740ec10dfe96b520345c3f6f0d99a30aac95b1f96656bd9cd11269c2a83a9dac423da29d74a3deb55360e3ae2ca4a1de283e1e443667bedd22673f6629c9920 libdrm-2.4.118.tar.xz +# From https://lists.x.org/archives/xorg-announce/2023-December/003438.html +sha256 0a49f12f09b5b6e68eaaaff3f02ca7cff9aa926939b212d343161d3e8ac56291 libdrm-2.4.119.tar.xz +sha512 c8dd7665e85c01a67fcce1c1c614bc05a3ec311f31cae7de5fb1cd27d0f11f1801be63de3fa3e33b2f505544fd4b1bc292965c5e8de46a3beaaedb10334945ca libdrm-2.4.119.tar.xz # Hash for license file sha256 d0a616a9020dc0271e36e6dd4bad174b4e2c2a42636f13785f8e18dd5f85fd83 data/meson.build diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk index 0db0c51284..fd50f4f22e 100644 --- a/package/libdrm/libdrm.mk +++ b/package/libdrm/libdrm.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBDRM_VERSION = 2.4.118 +LIBDRM_VERSION = 2.4.119 LIBDRM_SOURCE = libdrm-$(LIBDRM_VERSION).tar.xz LIBDRM_SITE = https://dri.freedesktop.org/libdrm LIBDRM_LICENSE = MIT From 38d07349daece6393800619ecb3ef98299711819 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 3 Jan 2024 08:11:15 +0100 Subject: [PATCH 4519/5754] package/cmake: bump version to 3.28.1 Changelog: https://cmake.org/cmake/help/v3.28/release/3.28.html Release notes: https://www.kitware.com/cmake-3-28-0-available-for-download/ https://www.kitware.com/cmake-3-28-1-available-for-download/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/cmake/cmake.hash | 4 ++-- package/cmake/cmake.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/cmake/cmake.hash b/package/cmake/cmake.hash index fbf0786232..51fff6c3ef 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.9-SHA-256.txt -sha256 609a9b98572a6a5ea477f912cffb973109ed4d0a6a6b3f9e2353d2cdc048708e cmake-3.27.9.tar.gz +# From https://cmake.org/files/v3.28/cmake-3.28.1-SHA-256.txt +sha256 15e94f83e647f7d620a140a7a5da76349fc47a1bfed66d0f5cdee8e7344079ad cmake-3.28.1.tar.gz # Locally calculated sha256 4a01ccf2dc580ba570d02bc015bbe0ec92f1f318717aae9540ba841ba7946756 Copyright.txt diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk index 7506e964a9..f56be9ba5c 100644 --- a/package/cmake/cmake.mk +++ b/package/cmake/cmake.mk @@ -5,8 +5,8 @@ ################################################################################ # When updating the version, please also update BR2_HOST_CMAKE_AT_LEAST_X_Y -CMAKE_VERSION_MAJOR = 3.27 -CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).9 +CMAKE_VERSION_MAJOR = 3.28 +CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).1 CMAKE_SITE = https://cmake.org/files/v$(CMAKE_VERSION_MAJOR) CMAKE_LICENSE = BSD-3-Clause CMAKE_LICENSE_FILES = Copyright.txt From 0628ca52f6325e40106315e7545c5181cc825f9c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 2 Jan 2024 23:13:50 +0100 Subject: [PATCH 4520/5754] package/irqbalance: bump to version 1.9.3 https://github.com/Irqbalance/irqbalance/releases/tag/v1.9.3 https://github.com/Irqbalance/irqbalance/releases/tag/v1.9.2 https://github.com/Irqbalance/irqbalance/releases/tag/v1.9.1 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/irqbalance/irqbalance.hash | 2 +- package/irqbalance/irqbalance.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/irqbalance/irqbalance.hash b/package/irqbalance/irqbalance.hash index 3dd83a017f..bf33e71e48 100644 --- a/package/irqbalance/irqbalance.hash +++ b/package/irqbalance/irqbalance.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 883d3f6296f7e4a17e09dc2c91bd972e110fe574c119d9e45ec0c4e35c7317bb irqbalance-1.9.0.tar.gz +sha256 8d698799251ea8518f342f36be26f2f092df51189f6777db33116d40cf0dae6c irqbalance-1.9.3.tar.gz sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/irqbalance/irqbalance.mk b/package/irqbalance/irqbalance.mk index abd64e6b9e..5d1bd48002 100644 --- a/package/irqbalance/irqbalance.mk +++ b/package/irqbalance/irqbalance.mk @@ -4,7 +4,7 @@ # ################################################################################ -IRQBALANCE_VERSION = 1.9.0 +IRQBALANCE_VERSION = 1.9.3 IRQBALANCE_SITE = $(call github,irqbalance,irqbalance,v$(IRQBALANCE_VERSION)) IRQBALANCE_LICENSE = GPL-2.0 IRQBALANCE_LICENSE_FILES = COPYING From 8c2cda500315e50ea28874b2d8970ae9c568baff Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 2 Jan 2024 23:17:34 +0100 Subject: [PATCH 4521/5754] package/isl: bump to version 0.26 https://groups.google.com/g/isl-announce/c/_yQ27dRgf7w Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/isl/isl.hash | 2 +- package/isl/isl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/isl/isl.hash b/package/isl/isl.hash index 46d8e920f3..1f8c998235 100644 --- a/package/isl/isl.hash +++ b/package/isl/isl.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 be7b210647ccadf90a2f0b000fca11a4d40546374a850db67adb32fad4b230d9 isl-0.25.tar.xz +sha256 a0b5cb06d24f9fa9e77b55fabbe9a3c94a336190345c2555f9915bb38e976504 isl-0.26.tar.xz sha256 3a2c398103f6bca0f50a9a9465deca9230b370b0212af5fdf31ed88a36215c30 LICENSE diff --git a/package/isl/isl.mk b/package/isl/isl.mk index ce9aaecebc..42830a2689 100644 --- a/package/isl/isl.mk +++ b/package/isl/isl.mk @@ -4,7 +4,7 @@ # ################################################################################ -ISL_VERSION = 0.25 +ISL_VERSION = 0.26 ISL_SOURCE = isl-$(ISL_VERSION).tar.xz ISL_SITE = https://libisl.sourceforge.io ISL_LICENSE = MIT From 65c8a9b6626de83365865dea6fff1749466a36aa Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 2 Jan 2024 23:28:47 +0100 Subject: [PATCH 4522/5754] package/inih: bump to version 57 https://github.com/benhoyt/inih/releases/tag/r57 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/inih/inih.hash | 2 +- package/inih/inih.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/inih/inih.hash b/package/inih/inih.hash index e2ed923c7a..476b544ce6 100644 --- a/package/inih/inih.hash +++ b/package/inih/inih.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4f2ba6bd122d30281a8c7a4d5723b7af90b56aa828c0e88256d7fceda03a491a inih-56.tar.gz +sha256 f03f98ca35c3adb56b2358573c8d3eda319ccd5287243d691e724b7eafa970b3 inih-57.tar.gz sha256 9ae3b39e83e9158e44b67733baa3bb2d84e80efdcfb14a5820210a42c7abdf7f LICENSE.txt diff --git a/package/inih/inih.mk b/package/inih/inih.mk index c43412894a..93032f1ed5 100644 --- a/package/inih/inih.mk +++ b/package/inih/inih.mk @@ -4,7 +4,7 @@ # ################################################################################ -INIH_VERSION = 56 +INIH_VERSION = 57 INIH_SITE = $(call github,benhoyt,inih,r$(INIH_VERSION)) INIH_INSTALL_STAGING = YES INIH_LICENSE = BSD-3-Clause From 6a65d3881099bd3408bce2f742a6972ec2a1d34f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 2 Jan 2024 23:31:22 +0100 Subject: [PATCH 4523/5754] package/jszip: bump to version 3.10.1 https://github.com/Stuk/jszip/blob/v3.10.1/CHANGES.md Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/jszip/jszip.hash | 2 +- package/jszip/jszip.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/jszip/jszip.hash b/package/jszip/jszip.hash index d0c56a44ab..e90e9cc68b 100644 --- a/package/jszip/jszip.hash +++ b/package/jszip/jszip.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 aa3033c6bb5357a0b0965c92fbdb6d6abe64676e70ffa7933b63c573ab79ee45 jszip-3.10.0.tar.gz +sha256 e873e5d0d8549c78c0eafcab8fba40f4a1e27c5a9d48f4a6b2eb122470d0d88c jszip-3.10.1.tar.gz sha256 566c953c6090b1218ca6217dd7359d45dde46581968586dc607d59a78af6a9c4 LICENSE.markdown diff --git a/package/jszip/jszip.mk b/package/jszip/jszip.mk index 3504368675..b282610a0d 100644 --- a/package/jszip/jszip.mk +++ b/package/jszip/jszip.mk @@ -4,7 +4,7 @@ # ################################################################################ -JSZIP_VERSION = 3.10.0 +JSZIP_VERSION = 3.10.1 JSZIP_SITE = $(call github,Stuk,jszip,v$(JSZIP_VERSION)) JSZIP_LICENSE = MIT or GPL-3.0 JSZIP_LICENSE_FILES = LICENSE.markdown From e39b53dd03c1adf53e5bc204b22382a063b501ce Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 2 Jan 2024 23:41:08 +0100 Subject: [PATCH 4524/5754] package/postgis: drop autoreconf Commit 1718c2ba6a4db1461b2490aa42ca4f0a2112adae removed all patches but forgot to drop autoreconf Signed-off-by: Fabrice Fontaine Reviewed-by: Maxim Kochetkov Signed-off-by: Thomas Petazzoni --- package/postgis/postgis.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/postgis/postgis.mk b/package/postgis/postgis.mk index 2fb98245a3..bb3955ec54 100644 --- a/package/postgis/postgis.mk +++ b/package/postgis/postgis.mk @@ -11,8 +11,6 @@ POSTGIS_MAKE = $(MAKE1) 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 -POSTGIS_AUTORECONF = YES POSTGIS_DEPENDENCIES = postgresql libgeos proj libxml2 From b08f686ec17238712022de11ee1df90c3710eac3 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 2 Jan 2024 23:44:16 +0100 Subject: [PATCH 4525/5754] package/postgis: bump to version 3.4.1 https://github.com/postgis/postgis/blob/3.4.1/NEWS Signed-off-by: Fabrice Fontaine Reviewed-by: Maxim Kochetkov Signed-off-by: Thomas Petazzoni --- package/postgis/postgis.hash | 2 +- package/postgis/postgis.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/postgis/postgis.hash b/package/postgis/postgis.hash index 812d2dc017..2d2676d0d6 100644 --- a/package/postgis/postgis.hash +++ b/package/postgis/postgis.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 aee9b60a6c884d354164b3096c4657f324454186607f859d1ce05d899798af9d postgis-3.4.0.tar.gz +sha256 fef6a141213d0ff27bf45b33b849cc396c22ddb1ffc6fed435469c9e891fc81d postgis-3.4.1.tar.gz sha256 2a3bde0a77224496ea6d8efa686da7e29ab0dd6b1a8f90ba12beaf7ae28e878a LICENSE.TXT diff --git a/package/postgis/postgis.mk b/package/postgis/postgis.mk index bb3955ec54..5f1c643ceb 100644 --- a/package/postgis/postgis.mk +++ b/package/postgis/postgis.mk @@ -4,7 +4,7 @@ # ################################################################################ -POSTGIS_VERSION = 3.4.0 +POSTGIS_VERSION = 3.4.1 POSTGIS_SITE = https://download.osgeo.org/postgis/source # parallel build issues POSTGIS_MAKE = $(MAKE1) From eb74b6054988e51b40dcb0b4b672fd540b37345c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 2 Jan 2024 23:49:00 +0100 Subject: [PATCH 4526/5754] package/pugixml: bump to version 1.14 Update hash of LICENSE.md (year updated with https://github.com/zeux/pugixml/commit/1a9a41b0f455fd94fd9e66bb8a987e807419cd3b) https://github.com/zeux/pugixml/releases/tag/v1.14 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/pugixml/pugixml.hash | 4 ++-- package/pugixml/pugixml.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/pugixml/pugixml.hash b/package/pugixml/pugixml.hash index b828e03561..2446788d89 100644 --- a/package/pugixml/pugixml.hash +++ b/package/pugixml/pugixml.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 40c0b3914ec131485640fa57e55bf1136446026b41db91c1bef678186a12abbe pugixml-1.13.tar.gz -sha256 206f671b6d342557adcc973088c2c638df0ec0b1dabbcd24e65aadd2191778d2 LICENSE.md +sha256 2f10e276870c64b1db6809050a75e11a897a8d7456c4be5c6b2e35a11168a015 pugixml-1.14.tar.gz +sha256 01e13f39d058cca09968f18d423912a18f8bf61b9161c65f8e5bcc418a8aba28 LICENSE.md diff --git a/package/pugixml/pugixml.mk b/package/pugixml/pugixml.mk index 415227a40a..9772788d2d 100644 --- a/package/pugixml/pugixml.mk +++ b/package/pugixml/pugixml.mk @@ -4,7 +4,7 @@ # ################################################################################ -PUGIXML_VERSION = 1.13 +PUGIXML_VERSION = 1.14 PUGIXML_SITE = https://github.com/zeux/pugixml/releases/download/v$(PUGIXML_VERSION) PUGIXML_LICENSE = MIT PUGIXML_LICENSE_FILES = LICENSE.md From 9e2e85df90104cf897378ef4a3b0a59cb8ff9a56 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 3 Jan 2024 00:04:09 +0100 Subject: [PATCH 4527/5754] package/pv: bump to version 1.8.5 - Switch to tar.gz tarball as tar.bz2 is not available anymore - License is GPL-3.0+ since https://codeberg.org/a-j-wood/pv/commit/e5cc71b4d22bd018fa55b8e7c795c7bf94776b2d - workarounds can be dropped as standard gnu automake is used since https://codeberg.org/a-j-wood/pv/commit/e99548ea8a2b1dd4e163036cabf4e26c40fe5170 https://codeberg.org/a-j-wood/pv/src/tag/v1.8.5/docs/NEWS.md Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/pv/pv.hash | 4 ++-- package/pv/pv.mk | 24 +++--------------------- 2 files changed, 5 insertions(+), 23 deletions(-) diff --git a/package/pv/pv.hash b/package/pv/pv.hash index b3dd71f74b..ed4cc21d89 100644 --- a/package/pv/pv.hash +++ b/package/pv/pv.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 e831951eff0718fba9b1ef286128773b9d0e723e1fbfae88d5a3188814fdc603 pv-1.6.20.tar.bz2 +sha256 d22948d06be06a5be37336318de540a2215be10ab0163f8cd23a20149647b780 pv-1.8.5.tar.gz # Hash for license file -sha256 280e182171df3e9bb4a9b407326e88521151fcb8f4f8557255f26177d5900ccf doc/COPYING +sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 docs/COPYING diff --git a/package/pv/pv.mk b/package/pv/pv.mk index 27060cf07e..f7243da8be 100644 --- a/package/pv/pv.mk +++ b/package/pv/pv.mk @@ -4,28 +4,10 @@ # ################################################################################ -PV_VERSION = 1.6.20 -PV_SOURCE = pv-$(PV_VERSION).tar.bz2 +PV_VERSION = 1.8.5 PV_SITE = http://www.ivarch.com/programs/sources -PV_LICENSE = Artistic-2.0 -PV_LICENSE_FILES = doc/COPYING +PV_LICENSE = GPL-3.0+ +PV_LICENSE_FILES = docs/COPYING PV_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) -# --relax linker option is enabled by default on sparc/sparc64 -# architectures, and it can't be used together with -r option, so -# disable it. -ifeq ($(BR2_sparc)$(BR2_sparc64),y) -PV_LDFLAGS = "-Wl,--no-relax" -endif - -# While 'pv' uses autoconf, it does not use automake for its -# makefiles. It uses $(LD) $(LDFLAGS) to achieve partial linking, but -# using 'ld' directly doesn't work well with some toolchain -# configuration, as the ld default emulation may not necessarily be -# the correct one. By passing the below values for LD and LDFLAGS, we -# ensure that 'gcc' is used to do these partial linking steps. -PV_MAKE_OPTS = \ - LD="$(TARGET_CC)" \ - LDFLAGS="-Wl,-r -nostdlib $(PV_LDFLAGS)" - $(eval $(autotools-package)) From 3ab4b55b0a790d4eef105535a0a81410e2c1a842 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Tue, 26 Dec 2023 23:20:13 +0100 Subject: [PATCH 4528/5754] package/efivar: add BR2_RISCV_64 in _ARCH_SUPPORTS A RISC-V 64bit EFI defconfig was added in commit 82199551 "configs/qemu_riscv64_virt_efi: new defconfig". So efivar can now be enabled for this architecture. This commit adds BR2_RISCV_64 in BR2_PACKAGE_EFIVAR_ARCH_SUPPORTS. Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/efivar/Config.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/efivar/Config.in b/package/efivar/Config.in index d4402dbcf7..0a36335c0a 100644 --- a/package/efivar/Config.in +++ b/package/efivar/Config.in @@ -2,7 +2,8 @@ config BR2_PACKAGE_EFIVAR_ARCH_SUPPORTS bool default y depends on BR2_arm || BR2_aarch64 || BR2_i386 || BR2_x86_64 \ - || BR2_powerpc64le || BR2_mipsel || BR2_mips64el + || BR2_powerpc64le || BR2_mipsel || BR2_mips64el \ + || BR2_RISCV_64 config BR2_PACKAGE_EFIVAR bool "efivar" From 55b0434940d46bd16ec1d6063f124c9560e4ceb4 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 27 Dec 2023 12:30:45 +0100 Subject: [PATCH 4529/5754] package/botan: add trousers optional dependency trousers is an optional dependency since version 1.11.26 and https://github.com/randombit/botan/commit/1752f0d522eef9a4a703fccf702b4b026c1c1d01 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/botan/botan.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/botan/botan.mk b/package/botan/botan.mk index 59fbc950b0..52019f36eb 100644 --- a/package/botan/botan.mk +++ b/package/botan/botan.mk @@ -67,6 +67,11 @@ BOTAN_DEPENDENCIES += sqlite BOTAN_CONF_OPTS += --with-sqlite endif +ifeq ($(BR2_PACKAGE_TROUSERS),y) +BOTAN_DEPENDENCIES += trousers +BOTAN_CONF_OPTS += --with-tpm +endif + ifeq ($(BR2_PACKAGE_XZ),y) BOTAN_DEPENDENCIES += xz BOTAN_CONF_OPTS += --with-lzma From 2f8feb66204ff661e9fd5f508e2dfd1ebc0f2813 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 27 Dec 2023 12:32:26 +0100 Subject: [PATCH 4530/5754] package/botan: bump to version 3.2.0 - Drop patches (already in version) - Update hash of license.txt (update in year: https://github.com/randombit/botan/commit/4d0371816763f16ea0b9694155016db591293c8e) https://github.com/randombit/botan/blob/3.2.0/news.rst Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 2 -- ...01-Add-superh-alias-needed-by-Debian.patch | 22 -------------- ...-data-arch-superh.txt-add-sh4-eb-aeb.patch | 30 ------------------- package/botan/botan.hash | 4 +-- package/botan/botan.mk | 2 +- 5 files changed, 3 insertions(+), 57 deletions(-) delete mode 100644 package/botan/0001-Add-superh-alias-needed-by-Debian.patch delete mode 100644 package/botan/0002-src-build-data-arch-superh.txt-add-sh4-eb-aeb.patch diff --git a/.checkpackageignore b/.checkpackageignore index 24780870e5..e13c66f7bb 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -208,8 +208,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/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 diff --git a/package/botan/0001-Add-superh-alias-needed-by-Debian.patch b/package/botan/0001-Add-superh-alias-needed-by-Debian.patch deleted file mode 100644 index c6236849e9..0000000000 --- a/package/botan/0001-Add-superh-alias-needed-by-Debian.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 454c7c04385a47d511cf8999ccff2746afbab06b Mon Sep 17 00:00:00 2001 -From: Jack Lloyd -Date: Sat, 21 Nov 2020 12:37:06 -0500 -Subject: [PATCH] Add superh alias needed by Debian - -[Retrieved from: -https://github.com/randombit/botan/commit/454c7c04385a47d511cf8999ccff2746afbab06b] -Signed-off-by: Fabrice Fontaine ---- - src/build-data/arch/superh.txt | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/build-data/arch/superh.txt b/src/build-data/arch/superh.txt -index 6af6dbe682..8e2833a914 100644 ---- a/src/build-data/arch/superh.txt -+++ b/src/build-data/arch/superh.txt -@@ -1,4 +1,5 @@ - - - sh4 -+sh4a - diff --git a/package/botan/0002-src-build-data-arch-superh.txt-add-sh4-eb-aeb.patch b/package/botan/0002-src-build-data-arch-superh.txt-add-sh4-eb-aeb.patch deleted file mode 100644 index aa9f3ad5ba..0000000000 --- a/package/botan/0002-src-build-data-arch-superh.txt-add-sh4-eb-aeb.patch +++ /dev/null @@ -1,30 +0,0 @@ -From c88897ebaf173b97068811b520a4741039f09dcd Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 20 Aug 2022 15:16:22 +0200 -Subject: [PATCH] src/build-data/arch/superh.txt: add sh4{eb,aeb} - -Fix the following build failure with sh4{eb,aeb}: - - ERROR: Unknown or unidentifiable processor "sh4aeb" - -Fixes: - - http://autobuild.buildroot.org/results/d7750b734736a66e10bc5a8ee06708041b36443a - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/randombit/botan/commit/c88897ebaf173b97068811b520a4741039f09dcd] ---- - src/build-data/arch/superh.txt | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/build-data/arch/superh.txt b/src/build-data/arch/superh.txt -index 8e2833a914..e17edb097a 100644 ---- a/src/build-data/arch/superh.txt -+++ b/src/build-data/arch/superh.txt -@@ -2,4 +2,6 @@ - - sh4 - sh4a -+sh4eb -+sh4aeb - diff --git a/package/botan/botan.hash b/package/botan/botan.hash index 64da04415e..840191aa4b 100644 --- a/package/botan/botan.hash +++ b/package/botan/botan.hash @@ -1,4 +1,4 @@ # From https://botan.randombit.net/releases/sha256sums.txt -sha256 dae047f399c5a47f087db5d3d9d9e8f11ae4985d14c928d71da1aff801802d55 Botan-2.19.3.tar.xz +sha256 049c847835fcf6ef3a9e206b33de05dd38999c325e247482772a5598d9e5ece3 Botan-3.2.0.tar.xz # Locally computed -sha256 472faf6d2231130382779f96de506be19296473750356449fc426ddc9cb03b50 license.txt +sha256 1833cde7c7cc03296b1ef2ddc178b1cd7fd1c476840f32cf6aedb09ab0bc9004 license.txt diff --git a/package/botan/botan.mk b/package/botan/botan.mk index 52019f36eb..74cf6175dd 100644 --- a/package/botan/botan.mk +++ b/package/botan/botan.mk @@ -4,7 +4,7 @@ # ################################################################################ -BOTAN_VERSION = 2.19.3 +BOTAN_VERSION = 3.2.0 BOTAN_SOURCE = Botan-$(BOTAN_VERSION).tar.xz BOTAN_SITE = http://botan.randombit.net/releases BOTAN_LICENSE = BSD-2-Clause From 704e6c5efbdf2c17e3b2fb7d438358584908acbb Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 27 Dec 2023 15:06:51 +0100 Subject: [PATCH 4531/5754] package/mpd-mpc: bump to version 0.35 https://github.com/MusicPlayerDaemon/mpc/blob/v0.35/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/mpd-mpc/mpd-mpc.hash | 2 +- package/mpd-mpc/mpd-mpc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mpd-mpc/mpd-mpc.hash b/package/mpd-mpc/mpd-mpc.hash index 4f4af9a91d..0ccda3c785 100644 --- a/package/mpd-mpc/mpd-mpc.hash +++ b/package/mpd-mpc/mpd-mpc.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 691e3f3654bc10d022bb0310234d0bc2d8c075a698f09924d9ebed8f506fda20 mpc-0.34.tar.xz +sha256 382959c3bfa2765b5346232438650491b822a16607ff5699178aa1386e3878d4 mpc-0.35.tar.xz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/mpd-mpc/mpd-mpc.mk b/package/mpd-mpc/mpd-mpc.mk index 00d1964fe6..a58423b4bc 100644 --- a/package/mpd-mpc/mpd-mpc.mk +++ b/package/mpd-mpc/mpd-mpc.mk @@ -5,7 +5,7 @@ ################################################################################ MPD_MPC_VERSION_MAJOR = 0 -MPD_MPC_VERSION = $(MPD_MPC_VERSION_MAJOR).34 +MPD_MPC_VERSION = $(MPD_MPC_VERSION_MAJOR).35 MPD_MPC_SITE = http://www.musicpd.org/download/mpc/$(MPD_MPC_VERSION_MAJOR) MPD_MPC_SOURCE = mpc-$(MPD_MPC_VERSION).tar.xz MPD_MPC_LICENSE = GPL-2.0+ From e946401406e5cb25e995dc24cd8c9b677aaab76c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 26 Dec 2023 23:19:52 +0100 Subject: [PATCH 4532/5754] package/libwebsockets: fix wolfssl build Fix the following wolfssl build failure raised since commit d6319d97a7864314088dcc6d1199f35029cfcecb: -- Checking for one of the modules 'wolfssl' CMake Error at lib/tls/CMakeLists.txt:79 (message): You must set LWS_WOLFSSL_LIBRARIES and LWS_WOLFSSL_INCLUDE_DIRS when LWS_WITH_WOLFSSL is turned on. Fixes: - http://autobuild.buildroot.org/results/fe062b9f0b330e71309334d7605d64ea73761b59 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...eLists.txt-fix-build-with-pkg-config.patch | 47 +++++++++++++++++++ package/libwebsockets/libwebsockets.mk | 2 +- 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 package/libwebsockets/0002-lib-tls-CMakeLists.txt-fix-build-with-pkg-config.patch diff --git a/package/libwebsockets/0002-lib-tls-CMakeLists.txt-fix-build-with-pkg-config.patch b/package/libwebsockets/0002-lib-tls-CMakeLists.txt-fix-build-with-pkg-config.patch new file mode 100644 index 0000000000..94d643e132 --- /dev/null +++ b/package/libwebsockets/0002-lib-tls-CMakeLists.txt-fix-build-with-pkg-config.patch @@ -0,0 +1,47 @@ +From 786ec9231e402cd4e7621483be6f1837de724e3c Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 26 Dec 2023 22:38:18 +0100 +Subject: [PATCH] lib/tls/CMakeLists.txt: fix build with pkg-config + +Fix the following wolfssl build failure raised since +https://github.com/warmcat/libwebsockets/commit/079726c4b252e795b208209752077c1ae4504b5b: + +-- Checking for one of the modules 'wolfssl' +CMake Error at lib/tls/CMakeLists.txt:79 (message): + You must set LWS_WOLFSSL_LIBRARIES and LWS_WOLFSSL_INCLUDE_DIRS when + LWS_WITH_WOLFSSL is turned on. + +Fixes: + - http://autobuild.buildroot.org/results/fe062b9f0b330e71309334d7605d64ea73761b59 + +Upstream: https://github.com/warmcat/libwebsockets/commit/f18fc2316f9743624ced9ba934595f7b9ba8cd05 +Signed-off-by: Fabrice Fontaine +--- + lib/tls/CMakeLists.txt | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/lib/tls/CMakeLists.txt b/lib/tls/CMakeLists.txt +index 80b46203..230b0d29 100644 +--- a/lib/tls/CMakeLists.txt ++++ b/lib/tls/CMakeLists.txt +@@ -72,12 +72,16 @@ if (LWS_WITH_SSL AND LWS_WITH_WOLFSSL) + include (FindPkgConfig) + PKG_SEARCH_MODULE(LWS_WOLFSSL wolfssl) + +- if (NOT WOLFSSL_FOUND) ++ if (NOT LWS_WOLFSSL_FOUND) + if (LWS_WITH_CYASSL) + message(FATAL_ERROR "You must set LWS_CYASSL_LIBRARIES and LWS_CYASSL_INCLUDE_DIRS when LWS_WITH_CYASSL is turned on.") + else() + message(FATAL_ERROR "You must set LWS_WOLFSSL_LIBRARIES and LWS_WOLFSSL_INCLUDE_DIRS when LWS_WITH_WOLFSSL is turned on.") + endif() ++ else() ++ set(WOLFSSL_LIBRARIES ${LWS_WOLFSSL_LIBRARIES}) ++ set(WOLFSSL_INCLUDE_DIRS ${LWS_WOLFSSL_INCLUDE_DIRS}) ++ set(WOLFSSL_FOUND 1) + endif() + else() + set(WOLFSSL_LIBRARIES ${LWS_WOLFSSL_LIBRARIES}) +-- +2.43.0 + diff --git a/package/libwebsockets/libwebsockets.mk b/package/libwebsockets/libwebsockets.mk index 86756ca612..daf481b3bc 100644 --- a/package/libwebsockets/libwebsockets.mk +++ b/package/libwebsockets/libwebsockets.mk @@ -42,7 +42,7 @@ LIBWEBSOCKETS_CONF_OPTS += \ -DLWS_WITH_SSL=ON \ -DLWS_WITH_MBEDTLS=ON \ -DLWS_WITH_WOLFSSL=OFF -else ifeq ($(BR2_PACKAGE_WOLFSSL),y) +else ifeq ($(BR2_PACKAGE_WOLFSSL_ALL),y) LIBWEBSOCKETS_DEPENDENCIES += host-pkgconf wolfssl LIBWEBSOCKETS_CONF_OPTS += \ -DLWS_WITH_SSL=ON \ From a80d19dea1bef90f3a5d624ddadf78be773be8a2 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 19 Dec 2023 20:10:26 +0100 Subject: [PATCH 4533/5754] package/{mesa3d, mesa3d-headers}: bump version to 23.3.1 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- package/mesa3d/mesa3d.hash | 5 +++-- package/mesa3d/mesa3d.mk | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index 3bc12ca86e..29a6633132 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.2.1 +MESA3D_HEADERS_VERSION = 23.3.1 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 0f4ca05831..41835de461 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,4 +1,5 @@ -# From https://gitlab.freedesktop.org/mesa/mesa/-/blob/23.2/docs/relnotes/23.2.1.rst -sha256 64de0616fc2d801f929ab1ac2a4f16b3e2783c4309a724c8a259b20df8bbc1cc mesa-23.2.1.tar.xz +# From https://lists.freedesktop.org/archives/mesa-dev/2023-December/226085.html +sha256 6e48126d70fdb3f20ffeb246ca0c2e41ffdc835f0663a03d4526b8bf5db41de6 mesa-23.3.1.tar.xz +sha512 0861fb5083e37439ad8cc0a0d8372a7c84d8665ea298dc784e2dd893162e20ae072f5ef0b860be88ecf74bc123714acbc1dec312e139b892ff40ef1887c5f4a5 mesa-23.3.1.tar.xz # License sha256 a00275a53178e2645fb65be99a785c110513446a5071ff2c698ed260ad917d75 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 4b360c8a8f..abefb174f3 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.2.1 +MESA3D_VERSION = 23.3.1 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos From 53494903a86f3c22c9a3b0f841f24a5c04787bca Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 4 Dec 2023 22:17:12 +0100 Subject: [PATCH 4534/5754] package/kodi-pvr-mythtv: bump version 20.5.8-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 2b3a277409..3aad45f4f6 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 321559f9f46a2588bdcfe9be6d6e7439911e548a92e7820dedde6cabccbe72fd kodi-pvr-mythtv-20.5.6-Nexus.tar.gz +sha256 c3eefdb9e12c4ca517709378bfe0b985b808d3dbd2ce75f234c78a88c3a1e411 kodi-pvr-mythtv-20.5.8-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 7708f37b87..bba881755d 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.5.6-Nexus +KODI_PVR_MYTHTV_VERSION = 20.5.8-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 dd548ecda668964138f98dfd31e381cff0d0c756 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 5 Jan 2024 19:38:27 +0100 Subject: [PATCH 4535/5754] package/kodi-peripheral-joystick: bump version to 20.1.14-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 d4ee52c05b..550da61981 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 9fabd0cbb54f6f4acfa16a5fa2c13e37d121bb0774e0b62ad3604a72c99b95e5 kodi-peripheral-joystick-20.1.13-Nexus.tar.gz +sha256 8c3dde851e45549d13ca3fcead9c27c440dfe070d68fb473ae71c522bc54753a kodi-peripheral-joystick-20.1.14-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 0f54d71234..2fe6c29c0d 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.13-Nexus +KODI_PERIPHERAL_JOYSTICK_VERSION = 20.1.14-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 6ccef467ce61220c8b80e8f6dbd283529e5be4e9 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 5 Jan 2024 19:38:28 +0100 Subject: [PATCH 4536/5754] package/kodi-pvr-waipu: bump version to 20.11.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 a7092fa4b8..e0b4dc482c 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 2326c3ed0e57ef8020c1041ea6f25fa325c619588c24c71b5963d8dda1c97604 kodi-pvr-waipu-20.10.2-Nexus.tar.gz +sha256 f43a7ac762b2c8bb7c2a66dc7d2a577fad92119bb4418867ce22369b96b18f8c kodi-pvr-waipu-20.11.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 0da4620f8e..02614552f0 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.10.2-Nexus +KODI_PVR_WAIPU_VERSION = 20.11.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 64414981dd4d9d660e1877a6a8a5dfc620f18616 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 5 Jan 2024 19:45:30 +0100 Subject: [PATCH 4537/5754] {linux, linux-headers}: bump 5.{10, 15}.x / 6.{1, 6}.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 627cfd2130..82d46365e7 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.6.8" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.6.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 e0b7183888..4207bd6b2f 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 5036c434e11e4b36d8da3f489851f7f829cf785fa7f7887468537a9ea4572416 linux-6.6.8.tar.xz -sha256 7e3d2694d18ce502068cc88a430da809abbd17d0773268524ebece442612b541 linux-6.1.69.tar.xz +sha256 9ee627e4c109aec7fca3eda5898e81d201af2c7eb2f7d9d7d94c1f0e1205546c linux-6.6.10.tar.xz +sha256 2df774dd53f9ffd4e57ebf804cf597709295df6a304fe261d25220a134b7f041 linux-6.1.71.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 b2a49d87605f3a9491581150315e22337c1afb599efc1e2737481be3a2d6d620 linux-5.15.145.tar.xz -sha256 c55217a80d74f81b83116289a8bfe4302293390b45aeabb76f64814920788863 linux-5.10.205.tar.xz +sha256 5a807a5fa2a80ada957d8079681dfb5cc196ec26f43244d1c8a4fd7af592d192 linux-5.15.146.tar.xz +sha256 c43d613216e6c5197519a4e979de5c1b510100858ff591963931c99e59c7485b linux-5.10.206.tar.xz sha256 4dae99e49f466d4689e128ec023754908147159d7462019a83c7da1f25df9b15 linux-5.4.265.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc sha256 022dce3935eadec7c31093992cc101c905fd4ffbb8afce92f3e41fdd0fa18b36 linux-4.19.303.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index e593ace5ce..df760326dc 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -411,10 +411,10 @@ config BR2_DEFAULT_KERNEL_HEADERS default "4.14.334" if BR2_KERNEL_HEADERS_4_14 default "4.19.303" if BR2_KERNEL_HEADERS_4_19 default "5.4.265" if BR2_KERNEL_HEADERS_5_4 - default "5.10.205" if BR2_KERNEL_HEADERS_5_10 - default "5.15.145" if BR2_KERNEL_HEADERS_5_15 - default "6.1.69" if BR2_KERNEL_HEADERS_6_1 - default "6.6.8" if BR2_KERNEL_HEADERS_6_6 + default "5.10.206" if BR2_KERNEL_HEADERS_5_10 + default "5.15.146" if BR2_KERNEL_HEADERS_5_15 + default "6.1.71" if BR2_KERNEL_HEADERS_6_1 + default "6.6.10" 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 747dff5a366b6fa37788b0e8fc28781feb918f4f Mon Sep 17 00:00:00 2001 From: Alexey Brodkin Date: Fri, 5 Jan 2024 11:17:10 -0800 Subject: [PATCH 4538/5754] package/gcc: pass toolchain wrapper flags during build With [1], [2] & [3] we made sure Buildroot packages get built with proper MMU page size assumed. This was done nicely through insertion of required flags into the toolchain wrapper so that there's no need to pass these flags to each and every package separately - toolchain wrapper used for real building has all set internally and so proper flags are implicitly used. But there's yet another corner case which is not handled that way - these are binaries or rather libraries which are being used as a part of GCC compilation: libgcc_s.so.1 and libstdc++.so. And so to make sure both the libraries get built properly we need to set TARGET_CFLAGS (cures libgcc_s.so) & TARGET_LDFLAGS (cures libstdc++.so). In case of ARM by defaut 64 KiB page size seems to be used, as w/o that patch we see the following for BR2_ARM64_PAGE_SIZE_4K=y: --------------------------->8---------------------------- $ ./output/host/bin/aarch64-linux-readelf -l ./output/target/lib/libgcc_s.so.1 Elf file type is DYN (Shared object file) Entry point 0x0 There are 6 program headers, starting at offset 64 Program Headers: Type Offset VirtAddr PhysAddr FileSiz MemSiz Flags Align LOAD 0x0000000000000000 0x0000000000000000 0x0000000000000000 0x0000000000013d1c 0x0000000000013d1c R E 0x10000 LOAD 0x000000000001fd98 0x000000000002fd98 0x000000000002fd98 0x0000000000000438 0x00000000000005c8 RW 0x10000 DYNAMIC 0x000000000001fdb8 0x000000000002fdb8 0x000000000002fdb8 0x0000000000000200 0x0000000000000200 RW 0x8 $ ./output/host/bin/aarch64-linux-readelf -l ./output/target/usr/lib/libstdc++.so.6.0.32 Elf file type is DYN (Shared object file) Entry point 0x0 There are 7 program headers, starting at offset 64 Program Headers: Type Offset VirtAddr PhysAddr FileSiz MemSiz Flags Align LOAD 0x0000000000000000 0x0000000000000000 0x0000000000000000 0x00000000001d3462 0x00000000001d3462 R E 0x10000 LOAD 0x00000000001d5760 0x00000000001e5760 0x00000000001e5760 0x000000000000e528 0x0000000000012de8 RW 0x10000 DYNAMIC 0x00000000001deef0 0x00000000001eeef0 0x00000000001eeef0 0x0000000000000240 0x0000000000000240 RW 0x8 --------------------------->8---------------------------- Note alignment of 0x10000 in sections marked for loading. And with the patch applied we get expected alignment of 0x1000 (4 KiB): --------------------------->8---------------------------- $ ./output/host/bin/aarch64-linux-readelf -l ./output/target/lib/libgcc_s.so.1 Elf file type is DYN (Shared object file) Entry point 0x0 There are 6 program headers, starting at offset 64 Program Headers: Type Offset VirtAddr PhysAddr FileSiz MemSiz Flags Align LOAD 0x0000000000000000 0x0000000000000000 0x0000000000000000 0x0000000000013d1c 0x0000000000013d1c R E 0x1000 LOAD 0x0000000000013d98 0x0000000000014d98 0x0000000000014d98 0x0000000000000438 0x00000000000005c8 RW 0x1000 DYNAMIC 0x0000000000013db8 0x0000000000014db8 0x0000000000014db8 0x0000000000000200 0x0000000000000200 RW 0x8 $ ./output/host/bin/aarch64-linux-readelf -l ./output/target/usr/lib/libstdc++.so.6.0.32 Elf file type is DYN (Shared object file) Entry point 0x0 There are 7 program headers, starting at offset 64 Program Headers: Type Offset VirtAddr PhysAddr FileSiz MemSiz Flags Align LOAD 0x0000000000000000 0x0000000000000000 0x0000000000000000 0x00000000001d3462 0x00000000001d3462 R E 0x1000 LOAD 0x00000000001d3760 0x00000000001d4760 0x00000000001d4760 0x000000000000e528 0x0000000000012de8 RW 0x1000 DYNAMIC 0x00000000001dcef0 0x00000000001ddef0 0x00000000001ddef0 0x0000000000000240 0x0000000000000240 RW 0x8 --------------------------->8---------------------------- A nice side effect is that we can get rid of the special handling of "-matomic" as it's already part of ARCH_TOOLCHAIN_WRAPPER_OPTS. [1] https://git.buildroot.net/buildroot/commit/?id=3cc2c6d19ab2e1bb4634f26f9318da9b07df5fff [2] https://git.buildroot.net/buildroot/commit/?id=dcb74db89e74e512e36b32cea6f574a1a1ca84c4 [3] https://git.buildroot.net/buildroot/commit/?id=5e52c28397b79f8c4c99552217cbe95202166626 Signed-off-by: Alexey Brodkin Signed-off-by: Vladimir Isaev Signed-off-by: Pavel Kozlov Cc: Thomas Petazzoni Cc: Yann E. MORIN Cc: Arnout Vandecappelle Signed-off-by: Thomas Petazzoni --- package/gcc/gcc.mk | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk index 93bc46643c..94935d79a2 100644 --- a/package/gcc/gcc.mk +++ b/package/gcc/gcc.mk @@ -98,23 +98,24 @@ HOST_GCC_COMMON_CONF_ENV = \ HOST_GCC_COMMON_MAKE_OPTS = \ gcc_cv_prog_makeinfo_modern=no -GCC_COMMON_TARGET_CFLAGS = $(TARGET_CFLAGS) -GCC_COMMON_TARGET_CXXFLAGS = $(TARGET_CXXFLAGS) +# Target binaries and libraries which are being built as a part of GCC +# don't use Buildroot toolchain wrapper because, instead its very own "xgcc" +# binary is used. And so we need to explicitly propagate ALL the flags +# directly to "xgcc" and that is done via configure-time environment +# variables, see below setup of HOST_GCC_COMMON_CONF_ENV. +GCC_COMMON_TARGET_CFLAGS = $(TARGET_CFLAGS) $(ARCH_TOOLCHAIN_WRAPPER_OPTS) +GCC_COMMON_TARGET_CXXFLAGS = $(TARGET_CXXFLAGS) $(ARCH_TOOLCHAIN_WRAPPER_OPTS) +GCC_COMMON_TARGET_LDFLAGS = $(TARGET_LDFLAGS) $(ARCH_TOOLCHAIN_WRAPPER_OPTS) # used to fix ../../../../libsanitizer/libbacktrace/../../libbacktrace/elf.c:772:21: error: 'st.st_mode' may be used uninitialized in this function [-Werror=maybe-uninitialized] ifeq ($(BR2_ENABLE_DEBUG),y) GCC_COMMON_TARGET_CFLAGS += -Wno-error endif -# Make sure libgcc & libstdc++ always get built with -matomic on ARC700 -ifeq ($(GCC_TARGET_CPU):$(BR2_ARC_ATOMIC_EXT),arc700:y) -GCC_COMMON_TARGET_CFLAGS += -matomic -GCC_COMMON_TARGET_CXXFLAGS += -matomic -endif - # Propagate options used for target software building to GCC target libs HOST_GCC_COMMON_CONF_ENV += CFLAGS_FOR_TARGET="$(GCC_COMMON_TARGET_CFLAGS)" HOST_GCC_COMMON_CONF_ENV += CXXFLAGS_FOR_TARGET="$(GCC_COMMON_TARGET_CXXFLAGS)" +HOST_GCC_COMMON_CONF_ENV += LDFLAGS_FOR_TARGET="$(GCC_COMMON_TARGET_LDFLAGS)" HOST_GCC_COMMON_CONF_ENV += AR_FOR_TARGET=gcc-ar NM_FOR_TARGET=gcc-nm RANLIB_FOR_TARGET=gcc-ranlib # libitm needs sparc V9+ From f259092d363867c0f99ad96edba4a11a9a4c71bb Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 5 Jan 2024 20:49:00 +0100 Subject: [PATCH 4539/5754] package/{mesa3d, mesa3d-headers}: bump version to 23.3.2 Release notes: https://lists.freedesktop.org/archives/mesa-announce/2023-December/000741.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 29a6633132..8e870ac030 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.3.1 +MESA3D_HEADERS_VERSION = 23.3.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/mesa3d.hash b/package/mesa3d/mesa3d.hash index 41835de461..b6c36f1c55 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/mesa-dev/2023-December/226085.html -sha256 6e48126d70fdb3f20ffeb246ca0c2e41ffdc835f0663a03d4526b8bf5db41de6 mesa-23.3.1.tar.xz -sha512 0861fb5083e37439ad8cc0a0d8372a7c84d8665ea298dc784e2dd893162e20ae072f5ef0b860be88ecf74bc123714acbc1dec312e139b892ff40ef1887c5f4a5 mesa-23.3.1.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2023-December/000741.html +sha256 3cfcb81fa16f89c56abe3855d2637d396ee4e03849b659000a6b8e5f57e69adc mesa-23.3.2.tar.xz +sha512 634d2b67ade2121de3f19f2cccd4bf7ceb2ac391b9366587ed1c2412444e010de8ec14a25529fdec1f43f943096422eb23cefcb8a89d2f8b20286850188b65c3 mesa-23.3.2.tar.xz # License sha256 a00275a53178e2645fb65be99a785c110513446a5071ff2c698ed260ad917d75 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index abefb174f3..98fa33febe 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.3.1 +MESA3D_VERSION = 23.3.2 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos From aa10975643f6d779ad21ab6ac9595762a93a70f9 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 5 Jan 2024 19:12:07 +0100 Subject: [PATCH 4540/5754] package/libostree: needs headers >= 5.8 libostree unconditionally uses loop_config since bump to version 2023.5 in commit c64a3e9767757f6bab0ecf2df35871508003f39e and https://github.com/containers/composefs/commit/d7f24100c932cd0da9c315de7c7d44fe7a5005cd which is only available with kernel >= 5.8 and https://github.com/torvalds/linux/commit/3448914e8cc550ba792d4ccc74471d1ca4293aae resulting in the following build failure: composefs/libcomposefs/lcfs-mount.c: In function 'setup_loopback': composefs/libcomposefs/lcfs-mount.c:273:16: error: variable 'loopconfig' has initializer but incomplete type 273 | struct loop_config loopconfig = { 0 }; | ^~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/25d9d4f256861628ddd8e8ce659a39655d27b457 - http://autobuild.buildroot.org/results/5c7e1e47c6eb43f7832ef7820ec2b5ac0f3c3696 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libostree/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libostree/Config.in b/package/libostree/Config.in index 9c59413eb1..49eed6517e 100644 --- a/package/libostree/Config.in +++ b/package/libostree/Config.in @@ -6,7 +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 + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_8 # loop_config select BR2_PACKAGE_E2FSPROGS select BR2_PACKAGE_LIBARCHIVE if BR2_s390x select BR2_PACKAGE_LIBGLIB2 @@ -19,9 +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, headers >= 5.4" +comment "libostree needs a uClibc or glibc toolchain w/ threads, dynamic library, wchar, headers >= 5.8" depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS \ || !BR2_USE_WCHAR || BR2_TOOLCHAIN_USES_MUSL || \ - !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_8 depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS depends on BR2_USE_MMU From a3e72fe95693800f13b0b18dd1c5ce78e92a1281 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 5 Jan 2024 14:20:23 +0100 Subject: [PATCH 4541/5754] package/cups: fix build without gnutls Fix the following build failure without gnutls raised since bump to version 2.4.7 in commit 55c80fdfb379c74c7f7e8c260dea02e0150d7614 and https://github.com/OpenPrinting/cups/commit/b5b1418da7bfb9f81384c7c47cc59890b4d3ff5d hash.c:16:12: fatal error: gnutls/crypto.h: No such file or directory 16 | # include | ^~~~~~~~~~~~~~~~~ Those patches have been requested to upstream by Peter Korsgaard: https://github.com/OpenPrinting/cups/issues/762 Fixes: - http://autobuild.buildroot.org/results/888e9e252821bda1e051400d4aa850cd082e8e76 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...-support-for-MacOS-Win-SSL-libs-back.patch | 349 ++++++++++++++++++ ...sion-does-not-support-several-hashes.patch | 30 ++ 2 files changed, 379 insertions(+) create mode 100644 package/cups/0005-cups-hash-c-Put-support-for-MacOS-Win-SSL-libs-back.patch create mode 100644 package/cups/0006-cups-hash-c-LibreSSL-version-does-not-support-several-hashes.patch diff --git a/package/cups/0005-cups-hash-c-Put-support-for-MacOS-Win-SSL-libs-back.patch b/package/cups/0005-cups-hash-c-Put-support-for-MacOS-Win-SSL-libs-back.patch new file mode 100644 index 0000000000..57c6b61437 --- /dev/null +++ b/package/cups/0005-cups-hash-c-Put-support-for-MacOS-Win-SSL-libs-back.patch @@ -0,0 +1,349 @@ +From c6cd5e9c10edc68caf6936a3d3274f758e9cd03d Mon Sep 17 00:00:00 2001 +From: Zdenek Dohnal +Date: Tue, 3 Oct 2023 13:59:40 +0200 +Subject: [PATCH] cups/hash.c: Put support for MacOS/Win SSL libs back + +- I mustn't remove their support in patch release - this should happen in +2.5 only. +- I have put back support for several hashes as well - they +should be removed in 2.5. +- restrict usage of second block hashing only if OpenSSL/LibreSSL/GnuTLS + is available + +Upstream: https://github.com/OpenPrinting/cups/commit/c6cd5e9c10edc68caf6936a3d3274f758e9cd03d +Signed-off-by: Fabrice Fontaine +--- + cups/hash.c | 271 +++++++++++++++++++++++++++++++++++++++++++++++++--- + 1 file changed, 260 insertions(+), 11 deletions(-) + +diff --git a/cups/hash.c b/cups/hash.c +index 93ca552c8..c447bab4e 100644 +--- a/cups/hash.c ++++ b/cups/hash.c +@@ -12,8 +12,13 @@ + #include "md5-internal.h" + #ifdef HAVE_OPENSSL + # include +-#else // HAVE_GNUTLS ++#elif defined(HAVE_GNUTLS) + # include ++#elif __APPLE__ ++# include ++#elif _WIN32 ++# include ++# include + #endif // HAVE_OPENSSL + + +@@ -193,17 +198,18 @@ hash_data(const char *algorithm, // I - Algorithm + const void *b, // I - Second block or `NULL` for none + size_t blen) // I - Length of second block or `0` for none + { ++#if defined(HAVE_OPENSSL) || defined(HAVE_GNUTLS) + unsigned hashlen; // Length of hash + unsigned char hashtemp[64]; // Temporary hash buffer +-#ifdef HAVE_OPENSSL +- const EVP_MD *md = NULL; // Message digest implementation +- EVP_MD_CTX *ctx; // Context +-#else // HAVE_GNUTLS +- gnutls_digest_algorithm_t alg = GNUTLS_DIG_UNKNOWN; +- // Algorithm +- gnutls_hash_hd_t ctx; // Context +-#endif // HAVE_OPENSSL ++#else ++ if (strcmp(algorithm, "md5") && (b || blen != 0)) ++ { ++ // Second block hashing is not supported without OpenSSL or GnuTLS ++ _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("Unsupported without GnuTLS or OpenSSL/LibreSSL."), 1); + ++ return (-1); ++ } ++#endif + + if (!strcmp(algorithm, "md5")) + { +@@ -223,6 +229,10 @@ hash_data(const char *algorithm, // I - Algorithm + } + + #ifdef HAVE_OPENSSL ++ const EVP_MD *md = NULL; // Message digest implementation ++ EVP_MD_CTX *ctx; // Context ++ ++ + if (!strcmp(algorithm, "sha")) + { + // SHA-1 +@@ -244,6 +254,14 @@ hash_data(const char *algorithm, // I - Algorithm + { + md = EVP_sha512(); + } ++ else if (!strcmp(algorithm, "sha2-512_224")) ++ { ++ md = EVP_sha512_224(); ++ } ++ else if (!strcmp(algorithm, "sha2-512_256")) ++ { ++ md = EVP_sha512_256(); ++ } + + if (md) + { +@@ -262,7 +280,13 @@ hash_data(const char *algorithm, // I - Algorithm + return ((ssize_t)hashlen); + } + +-#else // HAVE_GNUTLS ++#elif defined(HAVE_GNUTLS) ++ gnutls_digest_algorithm_t alg = GNUTLS_DIG_UNKNOWN; // Algorithm ++ gnutls_hash_hd_t ctx; // Context ++ unsigned char temp[64]; // Temporary hash buffer ++ size_t tempsize = 0; // Truncate to this size? ++ ++ + if (!strcmp(algorithm, "sha")) + { + // SHA-1 +@@ -284,9 +308,32 @@ hash_data(const char *algorithm, // I - Algorithm + { + alg = GNUTLS_DIG_SHA512; + } ++ else if (!strcmp(algorithm, "sha2-512_224")) ++ { ++ alg = GNUTLS_DIG_SHA512; ++ tempsize = 28; ++ } ++ else if (!strcmp(algorithm, "sha2-512_256")) ++ { ++ alg = GNUTLS_DIG_SHA512; ++ tempsize = 32; ++ } + + if (alg != GNUTLS_DIG_UNKNOWN) + { ++ if (tempsize > 0) ++ { ++ // Truncate result to tempsize bytes... ++ ++ if (hashsize < tempsize) ++ goto too_small; ++ ++ gnutls_hash_fast(alg, a, alen, temp); ++ memcpy(hash, temp, tempsize); ++ ++ return ((ssize_t)tempsize); ++ } ++ + hashlen = gnutls_hash_get_len(alg); + + if (hashlen > hashsize) +@@ -302,7 +349,209 @@ hash_data(const char *algorithm, // I - Algorithm + + return ((ssize_t)hashlen); + } +-#endif // HAVE_OPENSSL ++ ++#elif __APPLE__ ++ if (!strcmp(algorithm, "sha")) ++ { ++ // SHA-1... ++ ++ CC_SHA1_CTX ctx; // SHA-1 context ++ ++ if (hashsize < CC_SHA1_DIGEST_LENGTH) ++ goto too_small; ++ ++ CC_SHA1_Init(&ctx); ++ CC_SHA1_Update(&ctx, a, (CC_LONG)alen); ++ CC_SHA1_Final(hash, &ctx); ++ ++ return (CC_SHA1_DIGEST_LENGTH); ++ } ++# ifdef CC_SHA224_DIGEST_LENGTH ++ else if (!strcmp(algorithm, "sha2-224")) ++ { ++ CC_SHA256_CTX ctx; // SHA-224 context ++ ++ if (hashsize < CC_SHA224_DIGEST_LENGTH) ++ goto too_small; ++ ++ CC_SHA224_Init(&ctx); ++ CC_SHA224_Update(&ctx, a, (CC_LONG)alen); ++ CC_SHA224_Final(hash, &ctx); ++ ++ return (CC_SHA224_DIGEST_LENGTH); ++ } ++# endif /* CC_SHA224_DIGEST_LENGTH */ ++ else if (!strcmp(algorithm, "sha2-256")) ++ { ++ CC_SHA256_CTX ctx; // SHA-256 context ++ ++ if (hashsize < CC_SHA256_DIGEST_LENGTH) ++ goto too_small; ++ ++ CC_SHA256_Init(&ctx); ++ CC_SHA256_Update(&ctx, a, (CC_LONG)alen); ++ CC_SHA256_Final(hash, &ctx); ++ ++ return (CC_SHA256_DIGEST_LENGTH); ++ } ++ else if (!strcmp(algorithm, "sha2-384")) ++ { ++ CC_SHA512_CTX ctx; // SHA-384 context ++ ++ if (hashsize < CC_SHA384_DIGEST_LENGTH) ++ goto too_small; ++ ++ CC_SHA384_Init(&ctx); ++ CC_SHA384_Update(&ctx, a, (CC_LONG)alen); ++ CC_SHA384_Final(hash, &ctx); ++ ++ return (CC_SHA384_DIGEST_LENGTH); ++ } ++ else if (!strcmp(algorithm, "sha2-512")) ++ { ++ CC_SHA512_CTX ctx; // SHA-512 context ++ ++ if (hashsize < CC_SHA512_DIGEST_LENGTH) ++ goto too_small; ++ ++ CC_SHA512_Init(&ctx); ++ CC_SHA512_Update(&ctx, a, (CC_LONG)alen); ++ CC_SHA512_Final(hash, &ctx); ++ ++ return (CC_SHA512_DIGEST_LENGTH); ++ } ++# ifdef CC_SHA224_DIGEST_LENGTH ++ else if (!strcmp(algorithm, "sha2-512_224")) ++ { ++ CC_SHA512_CTX ctx; // SHA-512 context ++ unsigned char temp[CC_SHA512_DIGEST_LENGTH]; ++ // SHA-512 hash ++ ++ // SHA2-512 truncated to 224 bits (28 bytes)... ++ ++ if (hashsize < CC_SHA224_DIGEST_LENGTH) ++ goto too_small; ++ ++ CC_SHA512_Init(&ctx); ++ CC_SHA512_Update(&ctx, a, (CC_LONG)alen); ++ CC_SHA512_Final(temp, &ctx); ++ ++ memcpy(hash, temp, CC_SHA224_DIGEST_LENGTH); ++ ++ return (CC_SHA224_DIGEST_LENGTH); ++ } ++# endif // CC_SHA224_DIGEST_LENGTH ++ else if (!strcmp(algorithm, "sha2-512_256")) ++ { ++ CC_SHA512_CTX ctx; // SHA-512 context ++ unsigned char temp[CC_SHA512_DIGEST_LENGTH]; ++ // SHA-512 hash ++ ++ // SHA2-512 truncated to 256 bits (32 bytes)... ++ ++ if (hashsize < CC_SHA256_DIGEST_LENGTH) ++ goto too_small; ++ ++ CC_SHA512_Init(&ctx); ++ CC_SHA512_Update(&ctx, a, (CC_LONG)alen); ++ CC_SHA512_Final(temp, &ctx); ++ ++ memcpy(hash, temp, CC_SHA256_DIGEST_LENGTH); ++ ++ return (CC_SHA256_DIGEST_LENGTH); ++ } ++ ++#elif _WIN32 ++ // Use Windows CNG APIs to perform hashing... ++ BCRYPT_ALG_HANDLE alg; // Algorithm handle ++ LPCWSTR algid = NULL; // Algorithm ID ++ ssize_t hashlen; // Hash length ++ NTSTATUS status; // Status of hash ++ unsigned char temp[64]; // Temporary hash buffer ++ size_t tempsize = 0; // Truncate to this size? ++ ++ ++ if (!strcmp(algorithm, "sha")) ++ { ++ algid = BCRYPT_SHA1_ALGORITHM; ++ hashlen = 20; ++ } ++ else if (!strcmp(algorithm, "sha2-256")) ++ { ++ algid = BCRYPT_SHA256_ALGORITHM; ++ hashlen = 32; ++ } ++ else if (!strcmp(algorithm, "sha2-384")) ++ { ++ algid = BCRYPT_SHA384_ALGORITHM; ++ hashlen = 48; ++ } ++ else if (!strcmp(algorithm, "sha2-512")) ++ { ++ algid = BCRYPT_SHA512_ALGORITHM; ++ hashlen = 64; ++ } ++ else if (!strcmp(algorithm, "sha2-512_224")) ++ { ++ algid = BCRYPT_SHA512_ALGORITHM; ++ hashlen = tempsize = 28; ++ } ++ else if (!strcmp(algorithm, "sha2-512_256")) ++ { ++ algid = BCRYPT_SHA512_ALGORITHM; ++ hashlen = tempsize = 32; ++ } ++ ++ if (algid) ++ { ++ if (hashsize < (size_t)hashlen) ++ goto too_small; ++ ++ if ((status = BCryptOpenAlgorithmProvider(&alg, algid, NULL, 0)) < 0) ++ { ++ DEBUG_printf(("2cupsHashData: BCryptOpenAlgorithmProvider returned %d.", status)); ++ ++ if (status == STATUS_INVALID_PARAMETER) ++ _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("Bad algorithm parameter."), 1); ++ else ++ _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("Unable to access cryptographic provider."), 1); ++ ++ return (-1); ++ } ++ ++ if (tempsize > 0) ++ { ++ // Do a truncated SHA2-512 hash... ++ status = BCryptHash(alg, NULL, 0, (PUCHAR)a, (ULONG)alen, temp, sizeof(temp)); ++ memcpy(hash, temp, hashlen); ++ } ++ else ++ { ++ // Hash directly to buffer... ++ status = BCryptHash(alg, NULL, 0, (PUCHAR)a, (ULONG)alen, hash, (ULONG)hashlen); ++ } ++ ++ BCryptCloseAlgorithmProvider(alg, 0); ++ ++ if (status < 0) ++ { ++ DEBUG_printf(("2cupsHashData: BCryptHash returned %d.", status)); ++ ++ if (status == STATUS_INVALID_PARAMETER) ++ _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("Bad hashing parameter."), 1); ++ else ++ _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("Hashing failed."), 1); ++ ++ return (-1); ++ } ++ ++ return (hashlen); ++ } ++ ++#else ++ if (hashsize < 64) ++ goto too_small; ++#endif // __APPLE__ + + // Unknown hash algorithm... + _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("Unknown hash algorithm."), 1); diff --git a/package/cups/0006-cups-hash-c-LibreSSL-version-does-not-support-several-hashes.patch b/package/cups/0006-cups-hash-c-LibreSSL-version-does-not-support-several-hashes.patch new file mode 100644 index 0000000000..be4c6b469d --- /dev/null +++ b/package/cups/0006-cups-hash-c-LibreSSL-version-does-not-support-several-hashes.patch @@ -0,0 +1,30 @@ +From 0dd97fcaeeb16ed836e8542d75e2396fb1d129d9 Mon Sep 17 00:00:00 2001 +From: Zdenek Dohnal +Date: Tue, 3 Oct 2023 14:39:33 +0200 +Subject: [PATCH] cups/hash.c: LibreSSL version does not support several hashes + +Upstream: https://github.com/OpenPrinting/cups/commit/0dd97fcaeeb16ed836e8542d75e2396fb1d129d9 +Signed-off-by: Fabrice Fontaine +--- + cups/hash.c | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/cups/hash.c b/cups/hash.c +index c447bab4e..5eefa1010 100644 +--- a/cups/hash.c ++++ b/cups/hash.c +@@ -254,14 +254,6 @@ hash_data(const char *algorithm, // I - Algorithm + { + md = EVP_sha512(); + } +- else if (!strcmp(algorithm, "sha2-512_224")) +- { +- md = EVP_sha512_224(); +- } +- else if (!strcmp(algorithm, "sha2-512_256")) +- { +- md = EVP_sha512_256(); +- } + + if (md) + { From f2c76fbbfcb5b6bc86b2f9b9bc7a6c890068f61a Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 5 Jan 2024 14:11:16 +0100 Subject: [PATCH 4542/5754] package/cups: add openssl optional dependency openssl is an optional dependency since bump to version 2.4.2 in commit 433fd541eaa37db3241eed16df6ae1f51d81335b and https://github.com/OpenPrinting/cups/commit/3e9f2c04d620cccf2a09c43791ed9d8bb717c9da Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/cups/cups.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package/cups/cups.mk b/package/cups/cups.mk index 2ad5eeb5cf..620b61d748 100644 --- a/package/cups/cups.mk +++ b/package/cups/cups.mk @@ -51,8 +51,11 @@ CUPS_CONF_OPTS += --disable-dbus endif ifeq ($(BR2_PACKAGE_GNUTLS),y) -CUPS_CONF_OPTS += --with-tls=yes +CUPS_CONF_OPTS += --with-tls=gnutls CUPS_DEPENDENCIES += gnutls +else ifeq ($(BR2_PACKAGE_OPENSSL),y) +CUPS_CONF_OPTS += --with-tls=openssl +CUPS_DEPENDENCIES += openssl else CUPS_CONF_OPTS += --with-tls=no endif From 9d9d0cc5c22f6abab30460133cf72c928c71ab8a Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 5 Jan 2024 14:25:08 +0100 Subject: [PATCH 4543/5754] package/bullet: bump to version 3.25 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/bullet/bullet.hash | 2 +- package/bullet/bullet.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/bullet/bullet.hash b/package/bullet/bullet.hash index 5c70c683b0..3160b04572 100644 --- a/package/bullet/bullet.hash +++ b/package/bullet/bullet.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 49d1ee47aa8cbb0bc6bb459f0a4cfb9579b40e28f5c7d9a36c313e3031fb3965 bullet-3.21.tar.gz +sha256 c45afb6399e3f68036ddb641c6bf6f552bf332d5ab6be62f7e6c54eda05ceb77 bullet-3.25.tar.gz sha256 885cd516a8420acb7c3e0b1a7119913b686495001ae564e3229740460e8cff59 LICENSE.txt diff --git a/package/bullet/bullet.mk b/package/bullet/bullet.mk index 9afd922ec9..e112623b79 100644 --- a/package/bullet/bullet.mk +++ b/package/bullet/bullet.mk @@ -4,7 +4,7 @@ # ################################################################################ -BULLET_VERSION = 3.21 +BULLET_VERSION = 3.25 BULLET_SITE = $(call github,bulletphysics,bullet3,$(BULLET_VERSION)) BULLET_INSTALL_STAGING = YES BULLET_LICENSE = Zlib From 7659cb52c569587ec0c73617ea2259293a4c84f2 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 5 Jan 2024 14:26:21 +0100 Subject: [PATCH 4544/5754] package/subversion: bump to version 1.14.3 https://subversion.apache.org/docs/release-notes/1.14 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/subversion/subversion.hash | 4 ++-- package/subversion/subversion.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/subversion/subversion.hash b/package/subversion/subversion.hash index d2239b1b5b..2710e9e3f3 100644 --- a/package/subversion/subversion.hash +++ b/package/subversion/subversion.hash @@ -1,5 +1,5 @@ -# From https://www.apache.org/dist/subversion/subversion-1.14.2.tar.bz2.sha512 -sha512 20ada4688ca07d9fb8da4b7d53b5084568652a3b9418c65e688886bae950a16a3ff37710fcfc9c29ef14a89e75b2ceec4e9cf35d5876a7896ebc2b512cfb9ecc subversion-1.14.2.tar.bz2 +# From https://www.apache.org/dist/subversion/subversion-1.14.3.tar.bz2.sha512 +sha512 40b172492005fd3b0cd9e457b4444af8ea5d8ff8fc161a9a0c6dc3a7314c6ad4ff75a4676f68a1919ae6273ae03e34d04eba8c1c37b8c0b4ec70d6731b527b41 subversion-1.14.3.tar.bz2 # Locally calculated sha256 484aff0cfbb81155a10f903ed756e27e9fc65578c245a295bae295c4bb51eaad LICENSE diff --git a/package/subversion/subversion.mk b/package/subversion/subversion.mk index b27058c024..bc0b9b45ab 100644 --- a/package/subversion/subversion.mk +++ b/package/subversion/subversion.mk @@ -4,7 +4,7 @@ # ################################################################################ -SUBVERSION_VERSION = 1.14.2 +SUBVERSION_VERSION = 1.14.3 SUBVERSION_SOURCE = subversion-$(SUBVERSION_VERSION).tar.bz2 SUBVERSION_SITE = https://downloads.apache.org/subversion SUBVERSION_LICENSE = Apache-2.0 From 059259eabbd8d15c1e60c0c3b8631d0c02b93898 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 5 Jan 2024 14:27:37 +0100 Subject: [PATCH 4545/5754] package/stunnel: bump to version 5.71 Update hash of COPYING.md (update in year: https://github.com/mtrojnar/stunnel/commit/86fdef8fcf07596cdaf333aa318f4d65e0310b4b) https://github.com/mtrojnar/stunnel/blob/stunnel-5.71/NEWS.md Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/stunnel/stunnel.hash | 6 +++--- package/stunnel/stunnel.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/stunnel/stunnel.hash b/package/stunnel/stunnel.hash index 19633b3c18..6bfbc6d0b2 100644 --- a/package/stunnel/stunnel.hash +++ b/package/stunnel/stunnel.hash @@ -1,5 +1,5 @@ -# From https://www.stunnel.org/downloads/stunnel-5.65.tar.gz.sha256 -sha256 60c500063bd1feff2877f5726e38278c086f96c178f03f09d264a2012d6bf7fc stunnel-5.65.tar.gz +# From https://www.stunnel.org/downloads/stunnel-5.71.tar.gz.sha256 +sha256 f023aae837c2d32deb920831a5ee1081e11c78a5d57340f8e6f0829f031017f5 stunnel-5.71.tar.gz # Locally calculated -sha256 f10bcd7ee7b722dce40c9c674761ddb37e7e29a76a6e413e961cd52e361c5d7a COPYING.md +sha256 c172514e95e387eb4c77cdfbb55b635bf96e2dfcb85d785d993f64c40c4f89c4 COPYING.md sha256 62f171d4d8b6726df61f18a6bbc0a70f79c4bc2134d837d35c81fc6289a2d84d COPYRIGHT.md diff --git a/package/stunnel/stunnel.mk b/package/stunnel/stunnel.mk index 95a1530eb8..9e9cf35554 100644 --- a/package/stunnel/stunnel.mk +++ b/package/stunnel/stunnel.mk @@ -5,7 +5,7 @@ ################################################################################ STUNNEL_VERSION_MAJOR = 5 -STUNNEL_VERSION = $(STUNNEL_VERSION_MAJOR).65 +STUNNEL_VERSION = $(STUNNEL_VERSION_MAJOR).71 STUNNEL_SITE = http://www.usenix.org.uk/mirrors/stunnel/archive/$(STUNNEL_VERSION_MAJOR).x STUNNEL_DEPENDENCIES = host-pkgconf openssl STUNNEL_CONF_OPTS = --with-ssl=$(STAGING_DIR)/usr --with-threads=fork \ From 8f1c70441338ba6a8c5214edc9c1072a0356e002 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 5 Jan 2024 14:28:44 +0100 Subject: [PATCH 4546/5754] package/supervisor: bump to version 4.2.5 Drop COPYRIGHT as license text has been removed from this file with https://github.com/Supervisor/supervisor/commit/7fd2842162d026eee929e2673de37039c42aa5a7 http://supervisord.org/changes.html#id1 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/supervisor/supervisor.hash | 3 +-- package/supervisor/supervisor.mk | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package/supervisor/supervisor.hash b/package/supervisor/supervisor.hash index f6e9cf97b1..a61afc4410 100644 --- a/package/supervisor/supervisor.hash +++ b/package/supervisor/supervisor.hash @@ -1,4 +1,3 @@ # Locally calculated -sha256 5b2b8882ec8a3c3733cce6965cc098b6d80b417f21229ab90b18fe551d619f90 supervisor-4.2.2.tar.gz -sha256 7b8dbd54ab1543b07b2fc5f6f5ab50d89d26c1c4952af93a579d8c52c56b8de4 COPYRIGHT.txt +sha256 34761bae1a23c58192281a5115fb07fbf22c9b0133c08166beffc70fed3ebc12 supervisor-4.2.5.tar.gz sha256 4c35fda9f70bb7883fd94e5a4d5addd88ad1a6d5d15e21c9d17c4d96fdc5e369 LICENSES.txt diff --git a/package/supervisor/supervisor.mk b/package/supervisor/supervisor.mk index ad34c031e4..eb2a4990b7 100644 --- a/package/supervisor/supervisor.mk +++ b/package/supervisor/supervisor.mk @@ -4,10 +4,10 @@ # ################################################################################ -SUPERVISOR_VERSION = 4.2.2 -SUPERVISOR_SITE = https://files.pythonhosted.org/packages/d3/7f/c780b7471ba0ff4548967a9f7a8b0bfce222c3a496c3dfad0164172222b0 +SUPERVISOR_VERSION = 4.2.5 +SUPERVISOR_SITE = https://files.pythonhosted.org/packages/ce/37/517989b05849dd6eaa76c148f24517544704895830a50289cbbf53c7efb9 SUPERVISOR_LICENSE = BSD-like, rdflib (http_client.py), PSF (medusa) -SUPERVISOR_LICENSE_FILES = COPYRIGHT.txt LICENSES.txt +SUPERVISOR_LICENSE_FILES = LICENSES.txt SUPERVISOR_CPE_ID_VENDOR = supervisord SUPERVISOR_SETUP_TYPE = setuptools From 634484cdfbf4b2e5bcac141dd289bf62c1f4d90b Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 5 Jan 2024 14:29:34 +0100 Subject: [PATCH 4547/5754] package/gdal: add libcurl optional dependency Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/gdal/gdal.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/gdal/gdal.mk b/package/gdal/gdal.mk index e9dcc826b5..937e28ba20 100644 --- a/package/gdal/gdal.mk +++ b/package/gdal/gdal.mk @@ -49,7 +49,6 @@ GDAL_CONF_OPTS = \ -DGDAL_USE_OPENSSL=OFF \ -DGDAL_USE_CRYPTOPP=OFF \ -DGDAL_USE_CRNLIB=OFF \ - -DGDAL_USE_CURL=OFF \ -DGDAL_USE_ECW=OFF \ -DGDAL_USE_FILEGDB=OFF \ -DGDAL_USE_FREEXL=OFF \ @@ -112,6 +111,13 @@ else GDAL_CONF_OPTS += -DGDAL_USE_EXPAT=OFF endif +ifeq ($(BR2_PACKAGE_LIBCURL),y) +GDAL_DEPENDENCIES += libcurl +GDAL_CONF_OPTS += -DGDAL_USE_CURL=ON +else +GDAL_CONF_OPTS += -DGDAL_USE_CURL=OFF +endif + ifeq ($(BR2_PACKAGE_LIBXML2),y) GDAL_DEPENDENCIES += libxml2 GDAL_CONF_OPTS += -DGDAL_USE_LIBXML2=ON From 81802e263a12e173e0e1028449d1e1e11b2e5974 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 5 Jan 2024 14:31:11 +0100 Subject: [PATCH 4548/5754] package/tcf-agent: bump to version 1.8.0 Use xz tarball Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/tcf-agent/tcf-agent.hash | 2 +- package/tcf-agent/tcf-agent.mk | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package/tcf-agent/tcf-agent.hash b/package/tcf-agent/tcf-agent.hash index 3ff4d9a546..34893d280b 100644 --- a/package/tcf-agent/tcf-agent.hash +++ b/package/tcf-agent/tcf-agent.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 2f8c7be8a0bf7c86c72fd5680bc19a9e8f98792d40c94a0fee30ceb6428b8f33 org.eclipse.tcf.agent-1.7.0.tar.gz +sha256 64131790c7d4636d4abff8516d5b4b6329e4d3e691f44dc604e2c30f55edb0dd org.eclipse.tcf.agent-1.8.0.tar.xz # Hash for license files: sha256 f82d01b74a513bd3504d08136026a5ac2a7e6ff62ebcde391fa74aa222d11ce0 agent/edl-v10.html diff --git a/package/tcf-agent/tcf-agent.mk b/package/tcf-agent/tcf-agent.mk index 2b8a61b66f..9d955d4b6f 100644 --- a/package/tcf-agent/tcf-agent.mk +++ b/package/tcf-agent/tcf-agent.mk @@ -4,9 +4,8 @@ # ################################################################################ -TCF_AGENT_VERSION = 1.7.0 -# the tar.xz link was broken the time this file got authored -TCF_AGENT_SOURCE = org.eclipse.tcf.agent-$(TCF_AGENT_VERSION).tar.gz +TCF_AGENT_VERSION = 1.8.0 +TCF_AGENT_SOURCE = org.eclipse.tcf.agent-$(TCF_AGENT_VERSION).tar.xz TCF_AGENT_SITE = http://git.eclipse.org/c/tcf/org.eclipse.tcf.agent.git/snapshot # see https://wiki.spdx.org/view/Legal_Team/License_List/Licenses_Under_Consideration TCF_AGENT_LICENSE = BSD-3-Clause From f8332fa63d665d69f6f07524f1b320f589e1f23c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 5 Jan 2024 18:47:13 +0100 Subject: [PATCH 4549/5754] package/avahi: fix libavahi-client handling libavahi-client is built without daemon since bump to version 0.6.32 in commit 61c056d40bc51f99f8be19b7e77894a5e6565fd6 and https://github.com/avahi/avahi/commit/54086a11033194e629b6ad7039bcb4fb1628e052 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/avahi/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/avahi/Config.in b/package/avahi/Config.in index 2484d8ce5c..728bc4fdd1 100644 --- a/package/avahi/Config.in +++ b/package/avahi/Config.in @@ -38,7 +38,7 @@ config BR2_PACKAGE_AVAHI_DAEMON # more easily determine if it's available or not. config BR2_PACKAGE_AVAHI_LIBAVAHI_CLIENT bool - default y if BR2_PACKAGE_AVAHI_DAEMON && BR2_PACKAGE_DBUS + default y if BR2_PACKAGE_DBUS config BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY bool "libdns_sd compatibility (Bonjour)" From 3ebd3bf15ee1570b68cf8defe951f3574f3cda86 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 5 Jan 2024 18:49:17 +0100 Subject: [PATCH 4550/5754] package/cups: fix systemd handling --{dis,en}able-systemd is unrecognized since bump to version 2.4.0 in commit 07230bfcbc4b3c760a1d96a2595e3557c5e7278b and https://github.com/OpenPrinting/cups/commit/796bd7cf235b1f738e54ccdcab150ee97827ec23: configure: WARNING: unrecognized options: --disable-gtk-doc, --disable-gtk-doc-html, --disable-doc, --disable-docs, --disable-documentation, --with-xmlto, --with-fop, --disable-dependency-tracking, --enable-ipv6, --disable-nls, --disable-systemd, --disable-avahi Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/cups/cups.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/package/cups/cups.mk b/package/cups/cups.mk index 620b61d748..119a81aa68 100644 --- a/package/cups/cups.mk +++ b/package/cups/cups.mk @@ -37,10 +37,8 @@ CUPS_DEPENDENCIES = \ ifeq ($(BR2_PACKAGE_SYSTEMD),y) CUPS_CONF_OPTS += --with-systemd=/usr/lib/systemd/system \ - --enable-systemd + --with-ondemand=systemd CUPS_DEPENDENCIES += systemd -else -CUPS_CONF_OPTS += --disable-systemd endif ifeq ($(BR2_PACKAGE_DBUS),y) From 36743d61756ec4c8bdf1963a8cfea01724ba78ef Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 5 Jan 2024 18:51:07 +0100 Subject: [PATCH 4551/5754] package/cups: fix avahi handling --{dis,en}able-avahi is unrecognized since bump to version 2.3.3op2 in commit 8cf034ab0f686d0a3891b6fe5bb5a2d1bdf381d5 (which switched upstream location from apple to openprinting): configure: WARNING: unrecognized options: --disable-gtk-doc, --disable-gtk-doc-html, --disable-doc, --disable-docs, --disable-documentation, --with-xmlto, --with-fop, --disable-dependency-tracking, --enable-ipv6, --disable-nls, --disable-systemd, --disable-avahi Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/cups/cups.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/cups/cups.mk b/package/cups/cups.mk index 119a81aa68..a5098b50e9 100644 --- a/package/cups/cups.mk +++ b/package/cups/cups.mk @@ -65,11 +65,11 @@ else CUPS_CONF_OPTS += --disable-libusb endif -ifeq ($(BR2_PACKAGE_AVAHI),y) +ifeq ($(BR2_PACKAGE_AVAHI_LIBAVAHI_CLIENT),y) CUPS_DEPENDENCIES += avahi -CUPS_CONF_OPTS += --enable-avahi +CUPS_CONF_OPTS += --with-dnssd=avahi else -CUPS_CONF_OPTS += --disable-avahi +CUPS_CONF_OPTS += --with-dnssd=no endif ifeq ($(BR2_PACKAGE_HAS_UDEV),y) From cb7c72530f776ab3571d614df4460e02bed0ac97 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 5 Jan 2024 18:53:36 +0100 Subject: [PATCH 4552/5754] package/tcping: bump to version 2.1.0 https://github.com/mkirchner/tcping/releases/tag/2.1.0 https://github.com/mkirchner/tcping/releases/tag/2.0.0 https://github.com/mkirchner/tcping/compare/1.3.6...2.1.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/tcping/tcping.hash | 2 +- package/tcping/tcping.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tcping/tcping.hash b/package/tcping/tcping.hash index c97c0fa2a4..f706599c2d 100644 --- a/package/tcping/tcping.hash +++ b/package/tcping/tcping.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a731f0e48ff931d7b2a0e896e4db40867043740fe901dd225780f2164fdbdcf3 tcping-1.3.6.tar.gz +sha256 b8aa427420fe00173b5a2c0013d78e52b010350f5438bf5903c1942cba7c39c9 tcping-2.1.0.tar.gz sha256 4a35620e27ddb8de27898e4206c8f93633d877c1e128e98e95a035f760d94428 LICENSE diff --git a/package/tcping/tcping.mk b/package/tcping/tcping.mk index 5eaf702ef0..9a068f5668 100644 --- a/package/tcping/tcping.mk +++ b/package/tcping/tcping.mk @@ -4,7 +4,7 @@ # ################################################################################ -TCPING_VERSION = 1.3.6 +TCPING_VERSION = 2.1.0 TCPING_SITE = $(call github,mkirchner,tcping,$(TCPING_VERSION)) TCPING_LICENSE = MIT TCPING_LICENSE_FILES = LICENSE From 377f246375d6a08abb5d9bd425cc1558ac77ef13 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 5 Jan 2024 18:54:43 +0100 Subject: [PATCH 4553/5754] package/tcpreplay: bump to version 4.4.4 https://github.com/appneta/tcpreplay/releases/tag/v4.4.4 https://github.com/appneta/tcpreplay/releases/tag/v4.4.3 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/tcpreplay/tcpreplay.hash | 4 ++-- package/tcpreplay/tcpreplay.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/tcpreplay/tcpreplay.hash b/package/tcpreplay/tcpreplay.hash index 97c2e7ee34..e73e2d2c57 100644 --- a/package/tcpreplay/tcpreplay.hash +++ b/package/tcpreplay/tcpreplay.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://github.com/appneta/tcpreplay/releases/download/v4.4.2/tcpreplay-4.4.2.tar.xz.asc +# https://github.com/appneta/tcpreplay/releases/download/v4.4.4/tcpreplay-4.4.4.tar.xz.asc # using key 84E4FA215C934A7D97DC76D5E9E2149793BDE17E -sha256 91585c247b108ed3c10d3546d18f6a467d44229c9988c97736f953af69a6f438 tcpreplay-4.4.2.tar.xz +sha256 3ff9753cc43bb15e77832cee657e3030dbcdd957fa247e6abacc605689e24051 tcpreplay-4.4.4.tar.xz sha256 07cf5e92d475287a7d1663b33097f40cae5adf03ed8920fcd4374e3dfb48c8ad docs/LICENSE diff --git a/package/tcpreplay/tcpreplay.mk b/package/tcpreplay/tcpreplay.mk index 65eb908932..c5b3f9baa4 100644 --- a/package/tcpreplay/tcpreplay.mk +++ b/package/tcpreplay/tcpreplay.mk @@ -4,7 +4,7 @@ # ################################################################################ -TCPREPLAY_VERSION = 4.4.2 +TCPREPLAY_VERSION = 4.4.4 TCPREPLAY_SITE = https://github.com/appneta/tcpreplay/releases/download/v$(TCPREPLAY_VERSION) TCPREPLAY_SOURCE = tcpreplay-$(TCPREPLAY_VERSION).tar.xz TCPREPLAY_LICENSE = GPL-3.0 From 9ac63a33609fd4fee17874bc9569688c78613e1c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 6 Jan 2024 10:11:49 +0100 Subject: [PATCH 4554/5754] package/libarchive: fix uclibc build with libiconv (again) Commit 7991d2c48a859f9c0333ade8192868c21b1a8a31 wrongly removed patch added by commit 1e8cce6f2b1936dbda9d63ddf4f41acf59a64113, advocating that upstream applied a different "solution", this "solution" was already tested on buildroot with commit 9525bc7e64e8f44c31ab9dfd3f516ecb35982429 and is utterly broken as stated in: https://github.com/libarchive/libarchive/pull/1825#issuecomment-1403537856 https://github.com/libarchive/libarchive/pull/1825#issuecomment-1437451472 https://github.com/libarchive/libarchive/issues/1819#issuecomment-1439962521 https://github.com/libarchive/libarchive/issues/1841#issuecomment-1426628554 https://github.com/libarchive/libarchive/pull/1813#issuecomment-1396373372 As a result, build failures are again raised by uclibc-ng with libiconv on fwup/gvfs/...: configure: error: Requires libarchive. Libarchive must be built with zlib support. [...] Run-time dependency libarchive found: NO (tried cmake) ../output-1/build/gvfs-1.48.1/meson.build:405:2: ERROR: Dependency lookup for libarchive with method 'pkgconfig' failed: Could not generate cargs for libarchive: Package iconv was not found in the pkg-config search path. Perhaps you should add the directory containing `iconv.pc' to the PKG_CONFIG_PATH environment variable Package 'iconv', required by 'libarchive', not found So revert the upstream "solution", put back previous patch and let's hope that upstream improve their skills in pkg-config and static building but they probably don't really care about it... Fixes: - http://autobuild.buildroot.org/results/0f5058634ecc2ffae3993f6f4513d8ce75e6c02f - http://autobuild.buildroot.org/results/20fc291ef7e37ee8bd553976cbe841e53345680b Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...iconv-to-the-.pc-file-if-needed-1825.patch | 31 +++++++++++++++++++ ...o-not-add-iconv-for-Requires.private.patch | 27 ++++++++++++++++ package/libarchive/libarchive.mk | 4 +++ 3 files changed, 62 insertions(+) create mode 100644 package/libarchive/0001-Revert-Only-add-iconv-to-the-.pc-file-if-needed-1825.patch create mode 100644 package/libarchive/0002-autotools-do-not-add-iconv-for-Requires.private.patch diff --git a/package/libarchive/0001-Revert-Only-add-iconv-to-the-.pc-file-if-needed-1825.patch b/package/libarchive/0001-Revert-Only-add-iconv-to-the-.pc-file-if-needed-1825.patch new file mode 100644 index 0000000000..a4dd7dad5c --- /dev/null +++ b/package/libarchive/0001-Revert-Only-add-iconv-to-the-.pc-file-if-needed-1825.patch @@ -0,0 +1,31 @@ +From 3879afd473a256173cc626e16293f3fe8875f2d6 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 6 Jan 2024 09:53:23 +0100 +Subject: [PATCH] Revert "Only add "iconv" to the .pc file if needed (#1825)" + +This reverts commit 1f35c466aaa9444335a1b854b0b7223b0d2346c2. + +Upstream: no dedicated PR for this revert but there is already plenty of PRs/issues to fix iconv build ... +Signed-off-by: Fabrice Fontaine +--- + configure.ac | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 93f7af94..204a4e69 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -434,9 +434,7 @@ if test "x$with_iconv" != "xno"; then + AC_CHECK_HEADERS([localcharset.h]) + am_save_LIBS="$LIBS" + LIBS="${LIBS} ${LIBICONV}" +- if test -n "$LIBICONV"; then +- LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+ }iconv" +- fi ++ LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+ }iconv" + AC_CHECK_FUNCS([locale_charset]) + LIBS="${am_save_LIBS}" + if test "x$ac_cv_func_locale_charset" != "xyes"; then +-- +2.43.0 + diff --git a/package/libarchive/0002-autotools-do-not-add-iconv-for-Requires.private.patch b/package/libarchive/0002-autotools-do-not-add-iconv-for-Requires.private.patch new file mode 100644 index 0000000000..338dad46e0 --- /dev/null +++ b/package/libarchive/0002-autotools-do-not-add-iconv-for-Requires.private.patch @@ -0,0 +1,27 @@ +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") +Upstream: 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.mk b/package/libarchive/libarchive.mk index 2db36156b8..136f7a9c09 100644 --- a/package/libarchive/libarchive.mk +++ b/package/libarchive/libarchive.mk @@ -11,6 +11,10 @@ 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 d1c067e01be4ec60498cc6db263cdd07382a2998 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 6 Jan 2024 10:35:17 +0100 Subject: [PATCH 4555/5754] package/optee-client: fix build with kernel < 4.16 Fix the following build failure with kernel < 4.16 raised since bump to version 4.0.0 in commit 8a8fa2006846cd3480741f03372e17fedb811898 and https://github.com/OP-TEE/optee_client/commit/3ac968ee7c927271e83ea3a4247839649202ab5e: /home/buildroot/autobuild/instance-3/output-1/build/optee-client-4.0.0/tee-supplicant/src/tee_supplicant.c: In function 'register_local_shm': /home/buildroot/autobuild/instance-3/output-1/build/optee-client-4.0.0/tee-supplicant/src/tee_supplicant.c:356:44: error: storage size of 'data' isn't known 356 | struct tee_ioctl_shm_register_data data; | ^~~~ Fixes: - http://autobuild.buildroot.org/results/d63eb7c8574366377760f5ab2eaec02f46173975 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...upplicant-fix-build-with-kernel-4.16.patch | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 package/optee-client/0001-tee-supplicant-fix-build-with-kernel-4.16.patch diff --git a/package/optee-client/0001-tee-supplicant-fix-build-with-kernel-4.16.patch b/package/optee-client/0001-tee-supplicant-fix-build-with-kernel-4.16.patch new file mode 100644 index 0000000000..fa51bd5d5e --- /dev/null +++ b/package/optee-client/0001-tee-supplicant-fix-build-with-kernel-4.16.patch @@ -0,0 +1,56 @@ +From acc5aec37f5f246ebf185d2129e7630eb80bb388 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 5 Jan 2024 09:47:43 +0100 +Subject: [PATCH] tee-supplicant: fix build with kernel < 4.16 + +Commit 3ac968ee7c927271e83ea3a4247839649202ab5e moved linux/tee.h from +libteec/include to libteec/src resulting in the following build failure +with any kernel < 4.16 (i.e before +https://github.com/torvalds/linux/commit/033ddf12bcf5326b93bd604f50a7474a434a35f9): + +/home/buildroot/autobuild/instance-3/output-1/build/optee-client-4.0.0/tee-supplicant/src/tee_supplicant.c: In function 'register_local_shm': +/home/buildroot/autobuild/instance-3/output-1/build/optee-client-4.0.0/tee-supplicant/src/tee_supplicant.c:356:44: error: storage size of 'data' isn't known + 356 | struct tee_ioctl_shm_register_data data; + | ^~~~ + +To fix this build failure, update CMakeLists.txt and Makefile of +tee-supplicant to add libteec/src to the include directories. + +Fixes: 3ac968ee7c92 ("Makefile, cmake: move teec related headers") + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/OP-TEE/optee_client/pull/369 +--- + tee-supplicant/CMakeLists.txt | 5 ++++- + tee-supplicant/Makefile | 2 +- + 2 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/tee-supplicant/CMakeLists.txt b/tee-supplicant/CMakeLists.txt +index 31c6dac5..b44e9e95 100644 +--- a/tee-supplicant/CMakeLists.txt ++++ b/tee-supplicant/CMakeLists.txt +@@ -93,7 +93,10 @@ endif() + ################################################################################ + # Public and private header and library dependencies + ################################################################################ +-target_include_directories(${PROJECT_NAME} PRIVATE src) ++target_include_directories(${PROJECT_NAME} ++ PRIVATE src ++ PRIVATE ../libteec/src ++) + + target_link_libraries(${PROJECT_NAME} + PRIVATE teec +diff --git a/tee-supplicant/Makefile b/tee-supplicant/Makefile +index 06c4b2e5..c3b32252 100644 +--- a/tee-supplicant/Makefile ++++ b/tee-supplicant/Makefile +@@ -40,7 +40,7 @@ TEES_OBJ_DIR := $(OUT_DIR) + TEES_OBJS := $(patsubst %.c,$(TEES_OBJ_DIR)/%.o, $(TEES_SRCS)) + TEES_INCLUDES := ${CURDIR}/../libteec/include \ + ${CURDIR}/src \ +- ${CURDIR}/../libteec/include \ ++ ${CURDIR}/../libteec/src \ + + TEES_CFLAGS := $(addprefix -I, $(TEES_INCLUDES)) $(CFLAGS) \ + -DDEBUGLEVEL_$(CFG_TEE_SUPP_LOG_LEVEL) \ From 1474f1b34b178defca1d16d18a2446fadda9a12b Mon Sep 17 00:00:00 2001 From: Maxime Chevallier Date: Tue, 24 Oct 2023 16:42:53 +0200 Subject: [PATCH 4556/5754] package/libtraceevent: new package Introduce the libtraceevent library, that is used to be bundled with the trace-cmd tool. This library is now used by several tools and libraries such as trace-cmd, libtracefs and rtla. To build with meson, this package requires to disable documentation generation, and since this is not possible add a local patch pending upstream that adds -Ddoc=false support to libtraceevent. Signed-off-by: Maxime Chevallier [Giulio: - bump version to 1.7.3 and add hash file - move to meson build system ] Signed-off-by: Giulio Benetti [yann.morin.1998@free.fr: - bump to 1.8.1, drop patch applied upstream - add "homepage" to help text ] Signed-off-by: Yann E. MORIN --- DEVELOPERS | 4 ++++ package/Config.in | 1 + package/libtraceevent/Config.in | 11 +++++++++++ package/libtraceevent/libtraceevent.hash | 4 ++++ package/libtraceevent/libtraceevent.mk | 17 +++++++++++++++++ 5 files changed, 37 insertions(+) create mode 100644 package/libtraceevent/Config.in create mode 100644 package/libtraceevent/libtraceevent.hash create mode 100644 package/libtraceevent/libtraceevent.mk diff --git a/DEVELOPERS b/DEVELOPERS index 2b67c616fa..4461216122 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1235,6 +1235,7 @@ F: package/libfuse3/ F: package/libnspr/ F: package/libnss/ F: package/libnvme/ +F: package/libtraceevent/ F: package/mali-driver/ F: package/minicom/ F: package/mongoose/ @@ -2131,6 +2132,9 @@ F: package/postgresql/ F: package/protozero/ F: package/timescaledb/ +N: Maxime Chevallier +F: package/libtraceevent/ + N: Michael Durrant F: board/arcturus/ F: configs/arcturus_ucp1020_defconfig diff --git a/package/Config.in b/package/Config.in index a2cc80aa27..a6d76c4b3d 100644 --- a/package/Config.in +++ b/package/Config.in @@ -117,6 +117,7 @@ menu "Debugging, profiling and benchmark" source "package/kyua/Config.in" source "package/latencytop/Config.in" source "package/libbpf/Config.in" + source "package/libtraceevent/Config.in" source "package/lmbench/Config.in" source "package/lsof/Config.in" source "package/ltp-testsuite/Config.in" diff --git a/package/libtraceevent/Config.in b/package/libtraceevent/Config.in new file mode 100644 index 0000000000..399238eef1 --- /dev/null +++ b/package/libtraceevent/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_LIBTRACEEVENT + bool "libtraceevent" + help + libtraceevent is a library that interfaces with the ftrace + subsystem in the linux kernel. + It used to be bundled directly in the trace-cmd + tool, but it was eventually extracted so that it can be used + by multiple other tools and libraries, such as libtracefs and + rtla. + + https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/ diff --git a/package/libtraceevent/libtraceevent.hash b/package/libtraceevent/libtraceevent.hash new file mode 100644 index 0000000000..b2ffbc9c0a --- /dev/null +++ b/package/libtraceevent/libtraceevent.hash @@ -0,0 +1,4 @@ +# Locally computed +sha256 1801f416b317e2ae0430ce964cf22b9ecb9fb5cd9c6c2d1073b29953c3309bca libtraceevent-1.8.1.tar.gz +sha256 f6b78c087c3ebdf0f3c13415070dd480a3f35d8fc76f3d02180a407c1c812f79 GPL-2.0 +sha256 0b9a4febcdee6de55872501d5c1a8f5d8b0d1650cd4d5351995ceb22e889f8ca LGPL-2.1 diff --git a/package/libtraceevent/libtraceevent.mk b/package/libtraceevent/libtraceevent.mk new file mode 100644 index 0000000000..d348fc51f6 --- /dev/null +++ b/package/libtraceevent/libtraceevent.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# libtraceevent +# +################################################################################ + +LIBTRACEEVENT_VERSION = 1.8.1 +LIBTRACEEVENT_SITE = https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/snapshot +LIBTRACEEVENT_LICENSE = GPL-2.0, LGPL-2.1 +LIBTRACEEVENT_LICENSE_FILES = LICENSES/GPL-2.0 LICENSES/LGPL-2.1 + +LIBTRACEEVENT_INSTALL_STAGING = YES + +LIBTRACEEVENT_CONF_OPTS = \ + -Ddoc=false + +$(eval $(meson-package)) From b1dbd3f679e6660325472e3fdca72127d74e6929 Mon Sep 17 00:00:00 2001 From: Maxime Chevallier Date: Tue, 24 Oct 2023 16:42:54 +0200 Subject: [PATCH 4557/5754] package/libtracefs: new package Introduce the libtracefs library, that is used to be bundled with the trace-cmd tool. This library is now used by several tools and libraries such as trace-cmd and rtla, and is used as an interface to the ftrace kernel subsystem through tracefs. To build with meson, this package requires to disable documentation generation, and since this is not possible add a local patch pending upstream that adds -Ddoc=false support to libtracefs. Signed-off-by: Maxime Chevallier [Giulio: - bump version to 1.7.0 and add hash file - move to meson build system ] Signed-off-by: Giulio Benetti Signed-off-by: Yann E. MORIN --- DEVELOPERS | 2 + package/Config.in | 1 + ...-add-option-to-disable-documentation.patch | 51 +++++++++++++++++++ package/libtracefs/Config.in | 8 +++ package/libtracefs/libtracefs.hash | 4 ++ package/libtracefs/libtracefs.mk | 18 +++++++ 6 files changed, 84 insertions(+) create mode 100644 package/libtracefs/0001-libtracefs-add-option-to-disable-documentation.patch create mode 100644 package/libtracefs/Config.in create mode 100644 package/libtracefs/libtracefs.hash create mode 100644 package/libtracefs/libtracefs.mk diff --git a/DEVELOPERS b/DEVELOPERS index 4461216122..86588b1adb 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1236,6 +1236,7 @@ F: package/libnspr/ F: package/libnss/ F: package/libnvme/ F: package/libtraceevent/ +F: package/libtracefs F: package/mali-driver/ F: package/minicom/ F: package/mongoose/ @@ -2134,6 +2135,7 @@ F: package/timescaledb/ N: Maxime Chevallier F: package/libtraceevent/ +F: package/libtracefs N: Michael Durrant F: board/arcturus/ diff --git a/package/Config.in b/package/Config.in index a6d76c4b3d..f5d0c06334 100644 --- a/package/Config.in +++ b/package/Config.in @@ -118,6 +118,7 @@ menu "Debugging, profiling and benchmark" source "package/latencytop/Config.in" source "package/libbpf/Config.in" source "package/libtraceevent/Config.in" + source "package/libtracefs/Config.in" source "package/lmbench/Config.in" source "package/lsof/Config.in" source "package/ltp-testsuite/Config.in" diff --git a/package/libtracefs/0001-libtracefs-add-option-to-disable-documentation.patch b/package/libtracefs/0001-libtracefs-add-option-to-disable-documentation.patch new file mode 100644 index 0000000000..70e7e61310 --- /dev/null +++ b/package/libtracefs/0001-libtracefs-add-option-to-disable-documentation.patch @@ -0,0 +1,51 @@ +From 881e23ed774360f93ca81f820d7897bd9bbd6d63 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Sat, 30 Sep 2023 22:40:08 +0200 +Subject: [PATCH] libtracefs: add option to disable documentation + +On some Linux environment builder(i.e. Buildroot) host asciidoc is not +provided since by default all man/docs are not installed to target but +meson.build at the moment build ascii and html documentation and +requires asciidoc making the building to fail. So let's add doc option +set to true by default to let the user to override it and not produce +the documentation. + +Upstream: https://patchwork.kernel.org/project/linux-trace-devel/patch/20230930204008.2528607-1-giulio.benetti@benettiengineering.com/ + +Signed-off-by: Giulio Benetti +--- + meson.build | 3 +++ + meson_options.txt | 2 ++ + 2 files changed, 5 insertions(+) + +diff --git a/meson.build b/meson.build +index 9d42d78..f1e492e 100644 +--- a/meson.build ++++ b/meson.build +@@ -39,6 +39,8 @@ if cunit_dep.found() + subdir('utest') + endif + subdir('samples') ++ ++if get_option('doc') + subdir('Documentation') + + custom_target( +@@ -46,3 +48,4 @@ custom_target( + output: 'docs', + depends: [html, man], + command: ['echo']) ++endif +diff --git a/meson_options.txt b/meson_options.txt +index 1d92c28..5533a88 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -14,3 +14,5 @@ option('man-bold-literal', type : 'boolean', value : false, + description : 'enable bold literals') + option('docbook-suppress-sp', type : 'boolean', value : false, + description : 'docbook suppress sp') ++option('doc', type : 'boolean', value: true, ++ description : 'produce documentation') +-- +2.34.1 + diff --git a/package/libtracefs/Config.in b/package/libtracefs/Config.in new file mode 100644 index 0000000000..81a2e962ea --- /dev/null +++ b/package/libtracefs/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_LIBTRACEFS + bool "libtracefs" + select BR2_PACKAGE_LIBTRACEEVENT + help + libtracefs is used to easily interface with the ftrace + interface through the tracefs virtual filesystem. + + https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/ diff --git a/package/libtracefs/libtracefs.hash b/package/libtracefs/libtracefs.hash new file mode 100644 index 0000000000..676fcf1111 --- /dev/null +++ b/package/libtracefs/libtracefs.hash @@ -0,0 +1,4 @@ +# Locally computed +sha256 411fcbf3434ecbaefa6c2b1bf092266293a672e2d7ee46fdd6b402753cb8bd16 libtracefs-1.7.0.tar.gz +sha256 f6b78c087c3ebdf0f3c13415070dd480a3f35d8fc76f3d02180a407c1c812f79 GPL-2.0 +sha256 0b9a4febcdee6de55872501d5c1a8f5d8b0d1650cd4d5351995ceb22e889f8ca LGPL-2.1 diff --git a/package/libtracefs/libtracefs.mk b/package/libtracefs/libtracefs.mk new file mode 100644 index 0000000000..1e6e19a234 --- /dev/null +++ b/package/libtracefs/libtracefs.mk @@ -0,0 +1,18 @@ +################################################################################ +# +# libtracefs +# +################################################################################ + +LIBTRACEFS_VERSION = 1.7.0 +LIBTRACEFS_SITE = https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/snapshot +LIBTRACEFS_INSTALL_STAGING = YES +LIBTRACEFS_LICENSE = GPL-2.0, LGPL-2.1 +LIBTRACEFS_LICENSE_FILES = LICENSES/GPL-2.0 LICENSES/LGPL-2.1 + +LIBTRACEFS_DEPENDENCIES = host-bison host-flex host-pkgconf libtraceevent + +LIBTRACEFS_CONF_OPTS = \ + -Ddoc=false + +$(eval $(meson-package)) From 24f73b85f887122df8343346a106be144e6d814a Mon Sep 17 00:00:00 2001 From: Maxime Chevallier Date: Tue, 24 Oct 2023 16:42:55 +0200 Subject: [PATCH 4558/5754] package/linux-tools: add rtla The RealTime Linux Analysis tool includes a set of commands that relies on the osnoise and timerlat tracers from the ftrace kernel subsystem, allowing to analyze the lantency sources coming from the hardware and the kernel itself. This tool was introduced in v5.17 but until v5.19 it relied on libprocps that has been deprecated soon. So let's make it available for v5.19+. Rtla relies on libtracefs and libtraceevent, although libtraceevent itself is already a dependency for libtracefs. Signed-off-by: Maxime Chevallier [Giulio: fix install on recent Linux versions] Signed-off-by: Giulio Benetti [Andreas: deal with Linux Fixups, musl, SSP] Signed-off-by: Andreas Ziegler [yann.morin.1998@free.fr: reword and extend help text] Signed-off-by: Yann E. MORIN --- DEVELOPERS | 2 + package/linux-tools/Config.in | 21 +++++++++ package/linux-tools/linux-tool-rtla.mk.in | 52 +++++++++++++++++++++++ 3 files changed, 75 insertions(+) create mode 100644 package/linux-tools/linux-tool-rtla.mk.in diff --git a/DEVELOPERS b/DEVELOPERS index 86588b1adb..d7543247f2 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1237,6 +1237,7 @@ F: package/libnss/ F: package/libnvme/ F: package/libtraceevent/ F: package/libtracefs +F: package/linux-tools/linux-tool-rtla.mk.in F: package/mali-driver/ F: package/minicom/ F: package/mongoose/ @@ -2136,6 +2137,7 @@ F: package/timescaledb/ N: Maxime Chevallier F: package/libtraceevent/ F: package/libtracefs +F: package/linux-tools/linux-tool-rtla.mk.in N: Michael Durrant F: board/arcturus/ diff --git a/package/linux-tools/Config.in b/package/linux-tools/Config.in index 451b0eeff5..adfca4dbe3 100644 --- a/package/linux-tools/Config.in +++ b/package/linux-tools/Config.in @@ -102,6 +102,27 @@ config BR2_PACKAGE_LINUX_TOOLS_PERF_NEEDS_HOST_PYTHON3 endif +config BR2_PACKAGE_LINUX_TOOLS_RTLA + bool "rtla" + select BR2_PACKAGE_LINUX_TOOLS + select BR2_PACKAGE_LIBTRACEFS + help + These tracers allow performing latency analysis, for which the + rtla tool provides wrapper commands to visualize and extract + latency traces and reports. + + rtla includes three tracers, which have been introduced in + different kernel versions: + - Linux 5.19 introduced the osnoise and timerlat tracers, + - Linux 6.3 introduced the hwnoise tracer + + osnoise and timerlat are always installed, while hwnoise is + installed if your kernel is recent enough. + + Note: rtla in kernels before 5.19 had additional dependencies, + not available in Buildroot, so only rtla in kernels 5.19 + onwards is actually supported in Buildroot. + config BR2_PACKAGE_LINUX_TOOLS_SELFTESTS bool"selftests" depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # bash diff --git a/package/linux-tools/linux-tool-rtla.mk.in b/package/linux-tools/linux-tool-rtla.mk.in new file mode 100644 index 0000000000..449371ddfe --- /dev/null +++ b/package/linux-tools/linux-tool-rtla.mk.in @@ -0,0 +1,52 @@ +################################################################################ +# +# rtla +# +################################################################################ + +LINUX_TOOLS += rtla + +RTLA_DEPENDENCIES = host-pkgconf libtracefs +RTLA_MAKE_OPTS = $(LINUX_MAKE_FLAGS) \ + CC=$(TARGET_CC) \ + EXTRA_CFLAGS="-D_GNU_SOURCE" \ + LDFLAGS="$(TARGET_LDFLAGS)" \ + PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig + +ifeq ($(BR2_TOOLCHAIN_HAS_SSP),) +define RTLA_DISABLE_STACK_PROTECTOR + $(SED) 's/-fstack-protector.* //' $(LINUX_DIR)/tools/tracing/rtla/Makefile +endef +endif + +define RTLA_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_FTRACE) + $(call KCONFIG_ENABLE_OPT,CONFIG_TIMERLAT_TRACER) + $(call KCONFIG_ENABLE_OPT,CONFIG_HIST_TRIGGERS) +endef + +define RTLA_BUILD_CMDS + $(Q)if ! grep install $(LINUX_DIR)/tools/tracing/rtla/Makefile >/dev/null 2>&1 ; then \ + echo "Your kernel version is too old and does not implement the rtla tool." ; \ + echo "At least kernel 5.19 must be used." ; \ + exit 1 ; \ + fi + $(RTLA_DISABLE_STACK_PROTECTOR) + $(TARGET_MAKE_ENV) $(MAKE) $(RTLA_MAKE_OPTS) \ + -C $(LINUX_DIR)/tools/tracing rtla +endef + +# make rtla_install build and install by default documentation using rst2man +# but it's not available in Buildroot and we don't want manual files in target +# folder so let's simply install the resulting rtla binary and create symlinks +# like Linux does in its tools/tracing/rtla/Makefile +define RTLA_INSTALL_TARGET_CMDS + $(INSTALL) -m 0755 -D $(LINUX_DIR)/tools/tracing/rtla/rtla $(TARGET_DIR)/usr/bin + ln -sf rtla $(TARGET_DIR)/usr/bin/osnoise + ln -sf rtla $(TARGET_DIR)/usr/bin/timerlat + + # Check if hwnoise is provided or not + if grep -q hwnoise $(LINUX_DIR)/tools/tracing/rtla/Makefile; then \ + ln -sf rtla $(TARGET_DIR)/usr/bin/hwnoise ; \ + fi +endef From b37249581fa4a221923540478db7fa720e04035d Mon Sep 17 00:00:00 2001 From: Maxime Chevallier Date: Tue, 24 Oct 2023 16:42:56 +0200 Subject: [PATCH 4559/5754] package/trace-cmd: bump to 3.1.7 trace-cmd's dependencies 'libtracefs' and 'libtraceevent' were split into dedicated projects, maintained outside of trace-cmd. This release, on top of bumping the version, adds this new dependencies. Signed-off-by: Maxime Chevallier [Giulio: bump to version 3.1.7] Signed-off-by: Giulio Benetti [yann.morin.1998@free.fr: alphabetical order in dependencies] Signed-off-by: Yann E. MORIN --- package/trace-cmd/Config.in | 2 ++ package/trace-cmd/trace-cmd.hash | 2 +- package/trace-cmd/trace-cmd.mk | 6 ++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/package/trace-cmd/Config.in b/package/trace-cmd/Config.in index 2d0accd7ae..00b9ebbd9a 100644 --- a/package/trace-cmd/Config.in +++ b/package/trace-cmd/Config.in @@ -4,6 +4,8 @@ config BR2_PACKAGE_TRACE_CMD depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_USE_MMU # fork() depends on !BR2_STATIC_LIBS # dlopen() + select BR2_PACKAGE_LIBTRACEEVENT + select BR2_PACKAGE_LIBTRACEFS help Command line reader for ftrace. diff --git a/package/trace-cmd/trace-cmd.hash b/package/trace-cmd/trace-cmd.hash index 4d39e4d5ea..6edcaf0e1c 100644 --- a/package/trace-cmd/trace-cmd.hash +++ b/package/trace-cmd/trace-cmd.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 a74d9ade2633b88d0ad199360d51996427e23f4835594133e456cd6e3bd3a651 trace-cmd-v2.9.7.tar.gz +sha256 e496d41e599f8ef3c9a74675da05f86be0d8d48d524f0182c73ab98cd16da0b0 trace-cmd-v3.1.7.tar.gz sha256 b1d04b850c1c7471b0f0896f6c6f0fcfc9f07e2dd183a5f5826af269fe9e88fb COPYING sha256 70f297763149e72306919c924e164f83041d5e512868d4c8c1826c171b3e49f9 COPYING.LIB sha256 f6b78c087c3ebdf0f3c13415070dd480a3f35d8fc76f3d02180a407c1c812f79 LICENSES/GPL-2.0 diff --git a/package/trace-cmd/trace-cmd.mk b/package/trace-cmd/trace-cmd.mk index 52bb99036c..ab8e9149f7 100644 --- a/package/trace-cmd/trace-cmd.mk +++ b/package/trace-cmd/trace-cmd.mk @@ -4,14 +4,14 @@ # ################################################################################ -TRACE_CMD_VERSION = 2.9.7 +TRACE_CMD_VERSION = 3.1.7 TRACE_CMD_SOURCE = trace-cmd-v$(TRACE_CMD_VERSION).tar.gz TRACE_CMD_SITE = \ https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot TRACE_CMD_LICENSE = GPL-2.0, LGPL-2.1 TRACE_CMD_LICENSE_FILES = COPYING COPYING.LIB LICENSES/GPL-2.0 LICENSES/LGPL-2.1 -TRACE_CMD_DEPENDENCIES = host-pkgconf +TRACE_CMD_DEPENDENCIES = host-pkgconf libtraceevent libtracefs TRACE_CMD_MAKE_OPTS = prefix=/usr etcdir=/etc ifeq ($(BR2_PACKAGE_AUDIT),y) @@ -34,6 +34,8 @@ ifeq ($(BR2_sparc64),y) TRACE_CMD_CFLAGS += -fPIC endif +TRACE_CMD_CFLAGS += $($(HOST_DIR)/bin/pkg-config --cflags libtracefs) + # trace-cmd use CPPFLAGS to add some extra flags. # But like for CFLAGS, $(TARGET_CPPFLAGS) contains _LARGEFILE64_SOURCE # that causes build problems. From ee9c92e4a4d518d07da5fc3d64aa695509ecdea7 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 7 Jan 2024 15:19:01 +0100 Subject: [PATCH 4560/5754] package/lvm2: fix libaio handling libaio is only needed for standard install Signed-off-by: Fabrice Fontaine [yann.morin.1998@free.fr: fix check-package] Signed-off-by: Yann E. MORIN --- package/lvm2/Config.in | 2 +- package/lvm2/lvm2.mk | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/lvm2/Config.in b/package/lvm2/Config.in index 577a90656a..ddb398d160 100644 --- a/package/lvm2/Config.in +++ b/package/lvm2/Config.in @@ -3,7 +3,6 @@ config BR2_PACKAGE_LVM2 depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # needs fork() depends on !BR2_STATIC_LIBS # It fails to build statically - select BR2_PACKAGE_LIBAIO help This is LVM2, the rewrite of The Linux Logical Volume Manager. LVM supports enterprise level volume management of disk and @@ -27,6 +26,7 @@ if BR2_PACKAGE_LVM2 config BR2_PACKAGE_LVM2_STANDARD_INSTALL bool "standard install instead of only dmsetup" default y + select BR2_PACKAGE_LIBAIO help Install the standard suite of lvm2 programs. When this option is not set, only dmsetup is installed. diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk index 9caf99eb9b..474ea30bdc 100644 --- a/package/lvm2/lvm2.mk +++ b/package/lvm2/lvm2.mk @@ -25,7 +25,7 @@ LVM2_CONF_OPTS += \ --disable-nls \ --with-symvers=no -LVM2_DEPENDENCIES += host-pkgconf libaio +LVM2_DEPENDENCIES += host-pkgconf # LVM2 uses autoconf, but not automake, and the build system does not # take into account the toolchain passed at configure time. @@ -49,6 +49,7 @@ LVM2_CONF_OPTS += --disable-selinux endif ifeq ($(BR2_PACKAGE_LVM2_STANDARD_INSTALL),y) +LVM2_DEPENDENCIES += libaio LVM2_INSTALL_STAGING_OPTS += install LVM2_INSTALL_TARGET_OPTS += install ifeq ($(BR2_INIT_SYSTEMD),y) From 453ae6d2a8bfd579b592ae2e005ce94c21b98e60 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 7 Jan 2024 14:26:16 +0100 Subject: [PATCH 4561/5754] package/liquid-dsp: bump to version 1.6.0 https://github.com/jgaeddert/liquid-dsp/releases/tag/v1.6.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/liquid-dsp/liquid-dsp.hash | 2 +- package/liquid-dsp/liquid-dsp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/liquid-dsp/liquid-dsp.hash b/package/liquid-dsp/liquid-dsp.hash index 6fdbd62a86..4e18f3caa2 100644 --- a/package/liquid-dsp/liquid-dsp.hash +++ b/package/liquid-dsp/liquid-dsp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 93003edb6e74090b41009b1fae6f273a3e711dc4c8c56a0cca3e89167b765953 liquid-dsp-1.5.0.tar.gz +sha256 6ee6a5dfb48e047b118cf613c0b9f43e34356a5667a77a72a55371d2c8c53bf5 liquid-dsp-1.6.0.tar.gz sha256 4df7126196efba1283deb99e3269418dde4ab0ad1fde80a55051153451eb4df2 LICENSE diff --git a/package/liquid-dsp/liquid-dsp.mk b/package/liquid-dsp/liquid-dsp.mk index e9788eb144..ed0edacd94 100644 --- a/package/liquid-dsp/liquid-dsp.mk +++ b/package/liquid-dsp/liquid-dsp.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIQUID_DSP_VERSION = 1.5.0 +LIQUID_DSP_VERSION = 1.6.0 LIQUID_DSP_SITE = $(call github,jgaeddert,liquid-dsp,v$(LIQUID_DSP_VERSION)) LIQUID_DSP_LICENSE = MIT LIQUID_DSP_LICENSE_FILES = LICENSE From 558a25994b3ccab9b308bb667e464bdff0ab0d61 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 7 Jan 2024 12:41:01 +0100 Subject: [PATCH 4562/5754] package/libreplaygain: use version friendly to release-monitoring Update LIBREPLAYGAIN_VERSION to match what is returned by https://release-monitoring.org/project/370816 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libreplaygain/libreplaygain.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libreplaygain/libreplaygain.mk b/package/libreplaygain/libreplaygain.mk index ff0950c43d..129eb90d5f 100644 --- a/package/libreplaygain/libreplaygain.mk +++ b/package/libreplaygain/libreplaygain.mk @@ -4,9 +4,9 @@ # ################################################################################ -LIBREPLAYGAIN_VERSION = r475 +LIBREPLAYGAIN_VERSION = 475 LIBREPLAYGAIN_SITE = http://files.musepack.net/source -LIBREPLAYGAIN_SOURCE = libreplaygain_$(LIBREPLAYGAIN_VERSION).tar.gz +LIBREPLAYGAIN_SOURCE = libreplaygain_r$(LIBREPLAYGAIN_VERSION).tar.gz # upstream doesn't ship configure LIBREPLAYGAIN_AUTORECONF = YES LIBREPLAYGAIN_INSTALL_STAGING = YES From c740676c51de9ee66e32cb41bfeed5e6a446ceed Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 7 Jan 2024 12:42:27 +0100 Subject: [PATCH 4563/5754] package/musepack: use version friendly to release-monitoring Update MUSEPACK_VERSION to match what is returned by https://release-monitoring.org/project/21865 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/musepack/musepack.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/musepack/musepack.mk b/package/musepack/musepack.mk index d4dd08df36..02fe53d47d 100644 --- a/package/musepack/musepack.mk +++ b/package/musepack/musepack.mk @@ -4,9 +4,9 @@ # ################################################################################ -MUSEPACK_VERSION = r475 +MUSEPACK_VERSION = 475 MUSEPACK_SITE = http://files.musepack.net/source -MUSEPACK_SOURCE = musepack_src_$(MUSEPACK_VERSION).tar.gz +MUSEPACK_SOURCE = musepack_src_r$(MUSEPACK_VERSION).tar.gz MUSEPACK_DEPENDENCIES = libcuefile libreplaygain MUSEPACK_INSTALL_STAGING = YES MUSEPACK_BUILD_OPTS = -j1 From 9501bc80f5c34cd04bdc686cd74324beb452649e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 7 Jan 2024 14:23:45 +0100 Subject: [PATCH 4564/5754] package/liquid-dsp: fix build without neon Fix the following build failure without neon raised since bump to version 1.4.0 in commit 2f7f8f381394207bfb029ec395f5ced5695a0a2e and https://github.com/jgaeddert/liquid-dsp/commit/c821187dd9af2758c8e3c82e95eaf041b8ac81a0: /home/peko/autobuild/instance-0/output-1/host/bin/arm-none-linux-gnueabi-gcc -std=gnu11 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O2 -g0 -D_FORTIFY_SOURCE=2 -ffast-math -mcpu=cortex-a7 -mfloat-abi=hard -mfpu=neon-vfpv4 -Wall -fPIC -Wno-deprecated -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I. -Iinclude -c -o src/audio/src/cvsd.o src/audio/src/cvsd.c In file included from /home/peko/autobuild/instance-0/output-1/host/arm-buildroot-linux-gnueabi/sysroot/usr/include/features.h:388:0, from /home/peko/autobuild/instance-0/output-1/host/arm-buildroot-linux-gnueabi/sysroot/usr/include/stdlib.h:24, from src/libliquid.c:25: /home/peko/autobuild/instance-0/output-1/host/arm-buildroot-linux-gnueabi/sysroot/usr/include/gnu/stubs.h:10:29: fatal error: gnu/stubs-hard.h: No such file or directory # include ^ Indeed, upstream considers that NEON is available on all ARM platforms, and their configure.ac contains that code snippet: 239 arm|armv7*|armv8*) 240 # assume neon instructions are available 241 # TODO: check for Neon availability 242 243 # ARM architecture : use neon extensions Fixes: - http://autobuild.buildroot.org/results/36b3c2220c462e7a20262fd1b9064d9aeb6c9ec4 - http://autobuild.buildroot.org/results/881826b4b6c141e59a0da2d7d1ad55d3709fdb95 Signed-off-by: Fabrice Fontaine [yann.morin.1998@free.fr: - refactor with LIQUID_DSP_SIMDOVERRIDE - add comment about --disable-simdoverride - extend commit log with upstream code snippet ] Signed-off-by: Yann E. MORIN --- package/liquid-dsp/liquid-dsp.mk | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/package/liquid-dsp/liquid-dsp.mk b/package/liquid-dsp/liquid-dsp.mk index ed0edacd94..eb4cda67a5 100644 --- a/package/liquid-dsp/liquid-dsp.mk +++ b/package/liquid-dsp/liquid-dsp.mk @@ -37,7 +37,18 @@ endif # disable altivec, it has build issues ifeq ($(BR2_powerpc)$(BR2_powerpc64)$(BR2_powerpc64le),y) +LIQUID_DSP_SIMDOVERRIDE = y +endif + +# Upstream expects NEON on all ARM CPUs by default +ifeq ($(BR2_arm):$(BR2_ARM_FPU_NEON),y:) +LIQUID_DSP_SIMDOVERRIDE = y +endif + +ifeq ($(LIQUID_DSP_SIMDOVERRIDE),y) LIQUID_DSP_CONF_OPTS += --enable-simdoverride +# Do not add an else-clause to pass --disable-simdoverride, as it is +# non-functional, and behaves as --enable-simdoverride endif LIQUID_DSP_CONF_OPTS += \ From 292949c638e304ad5104004b95de7895ef3bd405 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 2 Jan 2024 09:36:42 +0100 Subject: [PATCH 4565/5754] Config.in: change default optimization level from -Os to -O2 Historically, Buildroot has defaulted to -Os as the gcc optimization flags. However, this default is probably not the most appropriate anymore, and this commit therefore changes the default to -O2. Here are some arguments in favor of this change: - Most Buildroot users use Buildroot for platforms that have a reasonable amount of storage, and the difference between -Os and -O2 in terms of code size is no longer as significant compared to the size of storage available on average embedded Linux devices typically found these days. - -Os can have a pretty bad performance impact, compared to -O2. - -Os is much less widely tested than -O2. For example, with recent versions of gcc, there are parts of Qt5 that segfault when compiled with -Os and work perfectly fine with -O2. Yes, it's a compiler bug that should be fixed, but in the mean time, having a default that's more widely used/tested makes sense. Signed-off-by: Thomas Petazzoni Acked-by: Yann E. MORIN Signed-off-by: Yann E. MORIN --- Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Config.in b/Config.in index 7b6ea801e7..113adf0755 100644 --- a/Config.in +++ b/Config.in @@ -474,7 +474,7 @@ config BR2_STRIP_EXCLUDE_DIRS choice prompt "gcc optimization level" - default BR2_OPTIMIZE_S + default BR2_OPTIMIZE_2 help Set the optimization level for gcc @@ -520,6 +520,7 @@ config BR2_OPTIMIZE_2 -falign-loops -falign-labels -ftree-vrp -ftree-pre. Please note the warning under -fgcse about invoking -O2 on programs that use computed gotos. + This is the default. config BR2_OPTIMIZE_3 bool "optimization level 3" @@ -548,7 +549,6 @@ config BR2_OPTIMIZE_S -falign-loops -falign-labels -freorder-blocks -freorder-blocks-and-partition -fprefetch-loop-arrays -ftree-vect-loop-version - This is the default. config BR2_OPTIMIZE_FAST bool "optimize for fast (may break packages!)" From 1d97f8c41e18534cefbb4604a80e9ad687bf74d1 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 8 Jan 2024 09:04:42 +0100 Subject: [PATCH 4566/5754] package/glibc: drop extra ')' in comment No functional change. Signed-off-by: Peter Korsgaard --- package/glibc/glibc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index 29411c58e2..596697bb8f 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -20,7 +20,7 @@ GLIBC_LICENSE = GPL-2.0+ (programs), LGPL-2.1+, BSD-3-Clause, MIT (library) GLIBC_LICENSE_FILES = COPYING COPYING.LIB LICENSES GLIBC_CPE_ID_VENDOR = gnu -# Extract the base version (e.g. 2.38) from GLIBC_VERSION) in order to +# Extract the base version (e.g. 2.38) from GLIBC_VERSION in order to # allow proper matching with the CPE database. GLIBC_CPE_ID_VERSION = $(word 1, $(subst -,$(space),$(GLIBC_VERSION))) From a34f0c02f18533abe56a497b6208fbc0401b2538 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 6 Jan 2024 23:05:31 +0100 Subject: [PATCH 4567/5754] package/libutempter: fix dependencies Commit 02c818bc5c7a6967a212f12e4caa8ccdfa0b452b forgot to add dependencies resulting in the following static build failure: /home/autobuild/autobuild/instance-5/output-1/host/bin/arm-buildroot-linux-uclibcgnueabi-gcc -Wl,-z,relro -Wl,-stats -static -shared \ -Wl,-soname,libutempter.so.0,--version-script=libutempter.map,-z,defs \ -lc iface.os -o libutempter.so /home/autobuild/autobuild/instance-5/output-1/host/lib/gcc/arm-buildroot-linux-uclibcgnueabi/12.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: /home/autobuild/autobuild/instance-5/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/lib/libc.a(__uClibc_main.os): in function `__uClibc_fini': __uClibc_main.c:(.text+0x190): undefined reference to `__fini_array_start' Fixes: - http://autobuild.buildroot.org/results/781ab393455f0e6823b850f474f6fe38b27d8efa Signed-off-by: Fabrice Fontaine Reviewed-by: Adam Duskett Tested-by: Adam Duskett Signed-off-by: Yann E. MORIN --- package/libutempter/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/libutempter/Config.in b/package/libutempter/Config.in index a06a240418..5b79c1e44d 100644 --- a/package/libutempter/Config.in +++ b/package/libutempter/Config.in @@ -1,5 +1,7 @@ config BR2_PACKAGE_LIBUTEMPTER bool "libutempter" + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + depends on !BR2_STATIC_LIBS help The libutempter library provides interface for terminal emulators such as screen and xterm to record user From 717fe9dc396b3982a02306e8685d8338ae2ebbf6 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Mon, 8 Jan 2024 14:59:30 +0200 Subject: [PATCH 4568/5754] package/rng-tools: update help text website reference We switched to new upstream since commit f9e9c6349afe0 ("package/rng-tools: bump to 6.7"). Update the website URL as well. Signed-off-by: Baruch Siach Signed-off-by: Yann E. MORIN --- package/rng-tools/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/rng-tools/Config.in b/package/rng-tools/Config.in index be3f078a0b..7f08fa25fb 100644 --- a/package/rng-tools/Config.in +++ b/package/rng-tools/Config.in @@ -9,7 +9,7 @@ config BR2_PACKAGE_RNG_TOOLS help Daemon to use hardware random number generators. - http://sourceforge.net/projects/gkernel/ + https://github.com/nhorman/rng-tools if BR2_PACKAGE_RNG_TOOLS From a2b8596873d53c52684e3056b655406aa40b58cc Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Mon, 8 Jan 2024 14:59:31 +0200 Subject: [PATCH 4569/5754] package/rng-tools: normalize github macro package name This usage of _NAME was introduced in commit f9e9c6349afe0 ("package/rng-tools: bump to 6.7"). No other package uses _NAME this way. Signed-off-by: Baruch Siach Signed-off-by: Yann E. MORIN --- package/rng-tools/rng-tools.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/rng-tools/rng-tools.mk b/package/rng-tools/rng-tools.mk index 3e565103e4..933370c9a9 100644 --- a/package/rng-tools/rng-tools.mk +++ b/package/rng-tools/rng-tools.mk @@ -5,7 +5,7 @@ ################################################################################ RNG_TOOLS_VERSION = 6.16 -RNG_TOOLS_SITE = $(call github,nhorman,$(RNG_TOOLS_NAME),v$(RNG_TOOLS_VERSION)) +RNG_TOOLS_SITE = $(call github,nhorman,rng-tools,v$(RNG_TOOLS_VERSION)) RNG_TOOLS_LICENSE = GPL-2.0 RNG_TOOLS_LICENSE_FILES = COPYING RNG_TOOLS_CPE_ID_VENDOR = rng-tools_project From f29cbc6ce3def37d7dc4d99fa2a5cbdadc6369e9 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 8 Jan 2024 09:04:12 +0100 Subject: [PATCH 4570/5754] boot/shim: security bump to version 15.6 Fixes the following security issue: CVE-2022-28737: There's a possible overflow in handle_image() when shim tries to load and execute crafted EFI executables https://github.com/advisories/GHSA-hmxr-46w2-jjwh Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- boot/shim/shim.hash | 2 +- boot/shim/shim.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/boot/shim/shim.hash b/boot/shim/shim.hash index a0a9f06f35..c9c489fd2f 100644 --- a/boot/shim/shim.hash +++ b/boot/shim/shim.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 8344473dd10569588b8238a4656b8fab226714eea9f5363f8c410aa8a5090297 shim-15.4.tar.bz2 +sha256 eab91644a3efe91a666399f5d8eb3eed0e04d04f79d4b6c0b278ef7747a239a5 shim-15.6.tar.bz2 sha256 15edf527919ddcb2f514ab9d16ad07ef219e4bb490e0b79560be510f0c159cc2 COPYRIGHT diff --git a/boot/shim/shim.mk b/boot/shim/shim.mk index 0a6d1527aa..bbef81cfc4 100644 --- a/boot/shim/shim.mk +++ b/boot/shim/shim.mk @@ -4,7 +4,7 @@ # ################################################################################ -SHIM_VERSION = 15.4 +SHIM_VERSION = 15.6 SHIM_SITE = https://github.com/rhboot/shim/releases/download/$(SHIM_VERSION) SHIM_SOURCE = shim-$(SHIM_VERSION).tar.bz2 SHIM_LICENSE = BSD-2-Clause From ff8c01da7df1fed075a048c039459790ea399525 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 8 Jan 2024 21:45:43 +0100 Subject: [PATCH 4571/5754] package/libtraceevent: fix license hashes Commit 1474f1b34b178defca1d16d18a2446fadda9a12b forgot to prepend hashes of license files by LICENSES/ Fixes: - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libtraceevent/libtraceevent.hash | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libtraceevent/libtraceevent.hash b/package/libtraceevent/libtraceevent.hash index b2ffbc9c0a..14dcf54c67 100644 --- a/package/libtraceevent/libtraceevent.hash +++ b/package/libtraceevent/libtraceevent.hash @@ -1,4 +1,4 @@ # Locally computed sha256 1801f416b317e2ae0430ce964cf22b9ecb9fb5cd9c6c2d1073b29953c3309bca libtraceevent-1.8.1.tar.gz -sha256 f6b78c087c3ebdf0f3c13415070dd480a3f35d8fc76f3d02180a407c1c812f79 GPL-2.0 -sha256 0b9a4febcdee6de55872501d5c1a8f5d8b0d1650cd4d5351995ceb22e889f8ca LGPL-2.1 +sha256 f6b78c087c3ebdf0f3c13415070dd480a3f35d8fc76f3d02180a407c1c812f79 LICENSES/GPL-2.0 +sha256 0b9a4febcdee6de55872501d5c1a8f5d8b0d1650cd4d5351995ceb22e889f8ca LICENSES/LGPL-2.1 From af755c0db31f88a1af3a9742a083d004476b9db7 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 8 Jan 2024 21:46:45 +0100 Subject: [PATCH 4572/5754] package/libtracefs: fix license hashes Commit b1dbd3f679e6660325472e3fdca72127d74e6929 forgot to prepend hashes of licences files with LICENSES/ Fixes: - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libtracefs/libtracefs.hash | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libtracefs/libtracefs.hash b/package/libtracefs/libtracefs.hash index 676fcf1111..040467af08 100644 --- a/package/libtracefs/libtracefs.hash +++ b/package/libtracefs/libtracefs.hash @@ -1,4 +1,4 @@ # Locally computed sha256 411fcbf3434ecbaefa6c2b1bf092266293a672e2d7ee46fdd6b402753cb8bd16 libtracefs-1.7.0.tar.gz -sha256 f6b78c087c3ebdf0f3c13415070dd480a3f35d8fc76f3d02180a407c1c812f79 GPL-2.0 -sha256 0b9a4febcdee6de55872501d5c1a8f5d8b0d1650cd4d5351995ceb22e889f8ca LGPL-2.1 +sha256 f6b78c087c3ebdf0f3c13415070dd480a3f35d8fc76f3d02180a407c1c812f79 LICENSES/GPL-2.0 +sha256 0b9a4febcdee6de55872501d5c1a8f5d8b0d1650cd4d5351995ceb22e889f8ca LICENSES/LGPL-2.1 From 30cc84d8994964883c9bd3ff002a1764e78c2521 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 8 Jan 2024 21:43:52 +0100 Subject: [PATCH 4573/5754] package/libtraceevent: needs dynamic library Fix the following build failure raised since the addition of the package in commit 1474f1b34b178defca1d16d18a2446fadda9a12b: ../src/event-plugin.c:10:10: fatal error: dlfcn.h: No such file or directory 10 | #include | ^~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/7802d1ad00293147edda39683f6d3f614dd48263 Signed-off-by: Fabrice Fontaine [yann.morin.1998@free.fr: only list first-level inherited deps] Signed-off-by: Yann E. MORIN --- package/libtraceevent/Config.in | 4 ++++ package/libtracefs/Config.in | 4 ++++ package/linux-tools/Config.in | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/package/libtraceevent/Config.in b/package/libtraceevent/Config.in index 399238eef1..28a5b32576 100644 --- a/package/libtraceevent/Config.in +++ b/package/libtraceevent/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_LIBTRACEEVENT bool "libtraceevent" + depends on !BR2_STATIC_LIBS # dlfcn.h help libtraceevent is a library that interfaces with the ftrace subsystem in the linux kernel. @@ -9,3 +10,6 @@ config BR2_PACKAGE_LIBTRACEEVENT rtla. https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/ + +comment "libtraceevent needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS diff --git a/package/libtracefs/Config.in b/package/libtracefs/Config.in index 81a2e962ea..bb0777b16c 100644 --- a/package/libtracefs/Config.in +++ b/package/libtracefs/Config.in @@ -1,8 +1,12 @@ config BR2_PACKAGE_LIBTRACEFS bool "libtracefs" + depends on !BR2_STATIC_LIBS # libtraceevent select BR2_PACKAGE_LIBTRACEEVENT help libtracefs is used to easily interface with the ftrace interface through the tracefs virtual filesystem. https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/ + +comment "libtracefs needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS diff --git a/package/linux-tools/Config.in b/package/linux-tools/Config.in index adfca4dbe3..ce744663f1 100644 --- a/package/linux-tools/Config.in +++ b/package/linux-tools/Config.in @@ -104,6 +104,7 @@ endif config BR2_PACKAGE_LINUX_TOOLS_RTLA bool "rtla" + depends on !BR2_STATIC_LIBS # libtracefs select BR2_PACKAGE_LINUX_TOOLS select BR2_PACKAGE_LIBTRACEFS help @@ -123,6 +124,9 @@ config BR2_PACKAGE_LINUX_TOOLS_RTLA not available in Buildroot, so only rtla in kernels 5.19 onwards is actually supported in Buildroot. +comment "rtla needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS + config BR2_PACKAGE_LINUX_TOOLS_SELFTESTS bool"selftests" depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # bash From 620bd7220a6e30eb8bdcc346a4584783d45953e1 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 8 Jan 2024 22:14:20 +0100 Subject: [PATCH 4574/5754] package/liquid-dsp: fix x86 builds HAVE_{MMX,SSE2,...} are not defined if ax_cv_have_{i}_cpu_ext is not set resulting in the following build failure raised since bump to version 1.5.0 in commit c2aaa0fbe2fdf6e599c68169aa7b2e55237190c7 and https://github.com/jgaeddert/liquid-dsp/commit/02c4e8b99b11d9f1615b8840f243b08a85b86563: src/dotprod/src/dotprod_cccf.sse.c: In function 'dotprod_cccf_execute_sse': src/dotprod/src/dotprod_cccf.sse.c:258:5: error: unknown type name '__m128'; did you mean '__int128'? 258 | __m128 v; // input vector | ^~~~~~ | __int128 or src/dotprod/src/dotprod_cccf.mmx.c: In function 'dotprod_cccf_execute_mmx': src/dotprod/src/dotprod_cccf.mmx.c:262:5: error: unknown type name '__m128'; did you mean '__int128'? 262 | __m128 v; // input vector | ^~~~~~ | __int128 While at it, add AVX2 support Fixes: - http://autobuild.buildroot.org/results/738ce9d3dc74ec165391f21256c955e5524f1632 - http://autobuild.buildroot.org/results/a2d150c724ab6787aeabaf31f65116f802e8584e Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/liquid-dsp/liquid-dsp.mk | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/package/liquid-dsp/liquid-dsp.mk b/package/liquid-dsp/liquid-dsp.mk index eb4cda67a5..ce4cd5a7a7 100644 --- a/package/liquid-dsp/liquid-dsp.mk +++ b/package/liquid-dsp/liquid-dsp.mk @@ -13,13 +13,23 @@ LIQUID_DSP_AUTORECONF = YES LIQUID_DSP_CONF_ENV = \ ax_cv_have_mmx_ext=$(if $(BR2_X86_CPU_HAS_MMX),yes,no) \ + ax_cv_have_mmx_cpu_ext=$(if $(BR2_X86_CPU_HAS_MMX),yes,no) \ ax_cv_have_sse_ext=$(if $(BR2_X86_CPU_HAS_SSE),yes,no) \ + ax_cv_have_sse_cpu_ext=$(if $(BR2_X86_CPU_HAS_SSE),yes,no) \ ax_cv_have_sse2_ext=$(if $(BR2_X86_CPU_HAS_SSE2),yes,no) \ + ax_cv_have_sse2_cpu_ext=$(if $(BR2_X86_CPU_HAS_SSE2),yes,no) \ ax_cv_have_sse3_ext=$(if $(BR2_X86_CPU_HAS_SSE3),yes,no) \ + ax_cv_have_sse3_cpu_ext=$(if $(BR2_X86_CPU_HAS_SSE3),yes,no) \ ax_cv_have_ssse3_ext=$(if $(BR2_X86_CPU_HAS_SSSE3),yes,no) \ + ax_cv_have_ssse3_cpu_ext=$(if $(BR2_X86_CPU_HAS_SSSE3),yes,no) \ ax_cv_have_sse41_ext=$(if $(BR2_X86_CPU_HAS_SSE4),yes,no) \ + ax_cv_have_sse41_cpu_ext=$(if $(BR2_X86_CPU_HAS_SSE4),yes,no) \ ax_cv_have_sse42_ext=$(if $(BR2_X86_CPU_HAS_SSE42),yes,no) \ - ax_cv_have_avx_ext=$(if $(BR2_X86_CPU_HAS_AVX),yes,no) + ax_cv_have_sse42_cpu_ext=$(if $(BR2_X86_CPU_HAS_SSE42),yes,no) \ + ax_cv_have_avx_ext=$(if $(BR2_X86_CPU_HAS_AVX),yes,no) \ + ax_cv_have_avx_cpu_ext=$(if $(BR2_X86_CPU_HAS_AVX),yes,no) \ + ax_cv_have_avx2_ext=$(if $(BR2_X86_CPU_HAS_AVX2),yes,no) \ + ax_cv_have_avx2_cpu_ext=$(if $(BR2_X86_CPU_HAS_AVX2),yes,no) LIQUID_DSP_CFLAGS = $(TARGET_CFLAGS) LIQUID_DSP_LDFLAGS = $(TARGET_LDFLAGS) From bfe2fe22697f2fc95749d20603cf3eae51453ad7 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 6 Jan 2024 11:15:04 +0100 Subject: [PATCH 4575/5754] package/uftp: security bump to version 5.0.3 Update site to avoid redirections (HSTS, etc.) Version 5.0.3 - 12/17/2023 A memory leak fix in the prior version wasn't applied correctly, resulting in an invalid memory access causing a crash. Bug fixed. Version 5.0.2 - 11/8/2023 Fixed bug that caused crash when a CLIENT_KEY arrived out of order Fixed option handling on Windows when an argument is missing https://sourceforge.net/projects/uftp-multicast/files/Changes.txt/download Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/uftp/uftp.hash | 2 +- package/uftp/uftp.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/uftp/uftp.hash b/package/uftp/uftp.hash index e47cba9394..d4d3450d1a 100644 --- a/package/uftp/uftp.hash +++ b/package/uftp/uftp.hash @@ -1,3 +1,3 @@ # Locally computed sha256 -sha256 f0435fbc8e9ffa125e05600cb6c7fc933d7d587f5bae41b257267be4f2ce0e61 uftp-5.0.1.tar.gz +sha256 cb8668c19b1f10bc63a16ffa893e205dc3ec86361037d477d8003260ebc40080 uftp-5.0.3.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.txt diff --git a/package/uftp/uftp.mk b/package/uftp/uftp.mk index ce865c20ec..3dcd8646c0 100644 --- a/package/uftp/uftp.mk +++ b/package/uftp/uftp.mk @@ -4,8 +4,8 @@ # ################################################################################ -UFTP_VERSION = 5.0.1 -UFTP_SITE = http://sourceforge.net/projects/uftp-multicast/files/source-tar +UFTP_VERSION = 5.0.3 +UFTP_SITE = https://downloads.sourceforge.net/project/uftp-multicast/source-tar UFTP_LICENSE = GPL-3.0+ UFTP_LICENSE_FILES = LICENSE.txt From 358a379f47ad20b69dcb3c3dd8eeaad210ff5e09 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 7 Jan 2024 12:55:16 +0100 Subject: [PATCH 4576/5754] package/faad2: security bump to version 2.11.1 - Switch to cmake-package - Fix CVE-2023-38857 and CVE-2023-38858 https://github.com/knik0/faad2/blob/2.11.1/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/faad2/faad2.hash | 2 +- package/faad2/faad2.mk | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/package/faad2/faad2.hash b/package/faad2/faad2.hash index 3a9c36df00..b7813130fd 100644 --- a/package/faad2/faad2.hash +++ b/package/faad2/faad2.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4c16c71295ca0cbf7c3dfe98eb11d8fa8d0ac3042e41604cfd6cc11a408cf264 faad2-2.10.1.tar.gz +sha256 72dbc0494de9ee38d240f670eccf2b10ef715fd0508c305532ca3def3225bb06 faad2-2.11.1.tar.gz sha256 d3baf3a54943cf12a994c85867a18dec84f810901b2f2878ddfd77efcc3c150f COPYING diff --git a/package/faad2/faad2.mk b/package/faad2/faad2.mk index eecab35af8..686e5045c0 100644 --- a/package/faad2/faad2.mk +++ b/package/faad2/faad2.mk @@ -4,16 +4,12 @@ # ################################################################################ -FAAD2_VERSION = 2.10.1 +FAAD2_VERSION = 2.11.1 FAAD2_SITE = $(call github,knik0,faad2,$(FAAD2_VERSION)) FAAD2_LICENSE = GPL-2.0 FAAD2_LICENSE_FILES = COPYING FAAD2_CPE_ID_VENDOR = audiocoding FAAD2_CPE_ID_PRODUCT = freeware_advanced_audio_decoder_2 -# frontend/faad calls frexp() -FAAD2_CONF_ENV = LIBS=-lm FAAD2_INSTALL_STAGING = YES -# From git -FAAD2_AUTORECONF = YES -$(eval $(autotools-package)) +$(eval $(cmake-package)) From c87746afefe7b4f86460cef17edef5eded19da62 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 7 Jan 2024 18:46:55 +0100 Subject: [PATCH 4577/5754] package/sudo: security bump to version 1.9.15p5 - Drop patch (already in version) and so also drop autoreconf - The sudoers plugin has been modified to make it more resilient to ROWHAMMER attacks on authentication and policy matching. This addresses CVE-2023-42465. https://www.sudo.ws/releases/stable/#1.9.15p5 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- .checkpackageignore | 1 - ...onfigure.ac-fix-openssl-static-build.patch | 47 ------------------- package/sudo/sudo.hash | 2 +- package/sudo/sudo.mk | 6 +-- 4 files changed, 3 insertions(+), 53 deletions(-) delete mode 100644 package/sudo/0001-configure.ac-fix-openssl-static-build.patch diff --git a/.checkpackageignore b/.checkpackageignore index e13c66f7bb..158ef066a0 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1284,7 +1284,6 @@ 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/stunnel/S50stunnel Indent Shellcheck Variables -package/sudo/0001-configure.ac-fix-openssl-static-build.patch Upstream package/supervisor/S99supervisord Variables package/suricata/0001-configure.ac-allow-the-user-to-override-RUST_TARGET.patch Upstream package/suricata/S99suricata Shellcheck diff --git a/package/sudo/0001-configure.ac-fix-openssl-static-build.patch b/package/sudo/0001-configure.ac-fix-openssl-static-build.patch deleted file mode 100644 index dc91af6119..0000000000 --- a/package/sudo/0001-configure.ac-fix-openssl-static-build.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 1fed5adc166d5f2190a6b6ad048ec2d803316327 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -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 -duplicates such as -lz or -latomic which are needed by -lssl and --lcrypto. This will fix the following build failure with sparc which -needs -latomic: - -Checking for X509_STORE_CTX_get0_cert -configure:21215: /home/thomas/autobuild/instance-3/output-1/host/bin/sparc-buildroot-linux-uclibc-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -static -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DZLIB_CONST -static conftest.c -L/home/thomas/autobuild/instance-3/output-1/host/bin/../sparc-buildroot-linux-uclibc/sysroot/usr/lib -lssl -lz -pthread -latomic -lcrypto >&5 -/home/thomas/autobuild/instance-3/output-1/host/lib/gcc/sparc-buildroot-linux-uclibc/10.4.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: /home/thomas/autobuild/instance-3/output-1/host/bin/../sparc-buildroot-linux-uclibc/sysroot/usr/lib/libcrypto.a(x509cset.o): in function `X509_CRL_up_ref': -x509cset.c:(.text+0x108): undefined reference to `__atomic_fetch_add_4' - -[...] - -In file included from ./hostcheck.c:38: -../../include/sudo_compat.h:342:41: error: conflicting types for 'ASN1_STRING_data' - 342 | # define ASN1_STRING_get0_data(x) ASN1_STRING_data(x) - | ^~~~~~~~~~~~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/8be59dd94e4916f9457cb435104e36e62a28373b - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/sudo-project/sudo/commit/1fed5adc166d5f2190a6b6ad048ec2d803316327] ---- - m4/openssl.m4 | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -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 720b21d849..066d3b9de6 100644 --- a/package/sudo/sudo.hash +++ b/package/sudo/sudo.hash @@ -1,4 +1,4 @@ # From: https://www.sudo.ws/getting/download/ -sha256 92334a12bb93e0c056b09f53e255ccb7d6f67c6350e2813cd9593ceeca78560b sudo-1.9.13p3.tar.gz +sha256 558d10b9a1991fb3b9fa7fa7b07ec4405b7aefb5b3cb0b0871dbc81e3a88e558 sudo-1.9.15p5.tar.gz # Locally calculated sha256 ea33b3971e8e4d9657cd6794a952aaa71b22bd16745f1645455b6ead010e0a28 LICENSE.md diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk index e70e8bd31f..a4e838dd94 100644 --- a/package/sudo/sudo.mk +++ b/package/sudo/sudo.mk @@ -4,8 +4,8 @@ # ################################################################################ -SUDO_VERSION_MAJOR = 1.9.13 -SUDO_VERSION_MINOR = p3 +SUDO_VERSION_MAJOR = 1.9.15 +SUDO_VERSION_MINOR = p5 SUDO_VERSION = $(SUDO_VERSION_MAJOR)$(SUDO_VERSION_MINOR) SUDO_SITE = https://www.sudo.ws/sudo/dist SUDO_LICENSE = ISC, BSD-3-Clause @@ -13,8 +13,6 @@ 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 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 SUDO_CONF_OPTS = \ From 1e12b7dd49d1c64a5195f226e9e4da21e84f5d0c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 8 Jan 2024 23:00:26 +0100 Subject: [PATCH 4578/5754] package/micropython: security bump to version 1.22.0 - Use official tarball - Update hash of license file (some packages have been added or removed but the list of licenses is the same) - Fix CVE-2023-7158: A vulnerability was found in MicroPython up to 1.21.0. It has been classified as critical. Affected is the function slice_indices of the file objslice.c. The manipulation leads to heap-based buffer overflow. It is possible to launch the attack remotely. The exploit has been disclosed to the public and may be used. Upgrading to version 1.22.0 is able to address this issue. It is recommended to upgrade the affected component. The identifier of this vulnerability is VDB-249180. Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/micropython/micropython.hash | 4 ++-- package/micropython/micropython.mk | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/micropython/micropython.hash b/package/micropython/micropython.hash index 7bff7de4e2..43551866b9 100644 --- a/package/micropython/micropython.hash +++ b/package/micropython/micropython.hash @@ -1,3 +1,3 @@ #locally computed -sha256 c980ad7e742491df0dc10db2958137dbbf9aa7a8009e102fc75f4c0cac2d6b5e micropython-1.19.1.tar.gz -sha256 0f678c2abd7fe2cfca36693630506bbcbdfc219bd04bf4a02fe3b094ae4c666f LICENSE +sha256 a042764f0b6f6d92b267454c5bd5afcb83fc3900119f2583672aac571e661924 micropython-1.22.0.tar.xz +sha256 d9e0e0395867c899090e150213bc2b417e970c17355a8d48300089875b3c8037 LICENSE diff --git a/package/micropython/micropython.mk b/package/micropython/micropython.mk index 5f687c73b9..e6eb536ea5 100644 --- a/package/micropython/micropython.mk +++ b/package/micropython/micropython.mk @@ -4,8 +4,9 @@ # ################################################################################ -MICROPYTHON_VERSION = 1.19.1 -MICROPYTHON_SITE = $(call github,micropython,micropython,v$(MICROPYTHON_VERSION)) +MICROPYTHON_VERSION = 1.22.0 +MICROPYTHON_SITE = https://micropython.org/resources/source +MICROPYTHON_SOURCE = micropython-$(MICROPYTHON_VERSION).tar.xz # Micropython has a lot of code copied from other projects, and also a number # of submodules for various libs. However, we don't even clone the submodules, # and most of the copied code is not used in the unix build. From a9da69260691bb692d7a2f0417fc5f52bcf45b5e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 9 Jan 2024 18:30:15 +0100 Subject: [PATCH 4579/5754] package/madplay: force arm mode instead of Thumb mode Fix the following build failure raised because madplay uses mad_f_mul which is defined in usr/include/mad.h (installed by libmad which has been fixed by a similar workaround in commit 0aaadd525f2df02911349ffe1518814fa095bf96, unfortunately the fix works for compiled code, not mad_f_mul define): /tmp/cc5SGGoU.s:102: Error: selected processor does not support `smull r8,r9,r2,r4' in Thumb mode Fixes: - http://autobuild.buildroot.org/results/0c0955d4f6726b50cad721f4d3437dabde316e70 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/madplay/madplay.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/madplay/madplay.mk b/package/madplay/madplay.mk index e1a78bd7d7..91ee44ab5f 100644 --- a/package/madplay/madplay.mk +++ b/package/madplay/madplay.mk @@ -15,6 +15,14 @@ MADPLAY_DEPENDENCIES = host-pkgconf libmad libid3tag $(TARGET_NLS_DEPENDENCIES) # Also 0003-configure-ac-use-pkg-config-to-find-id3tag.patch MADPLAY_AUTORECONF = YES +# madplay uses libmad which has some assembly function that is not present in +# Thumb mode: +# Error: selected processor does not support `smull r8,r9,r2,r4' in Thumb mode +# so, we desactivate Thumb mode +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +MADPLAY_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm" +endif + # Check if ALSA is built, then we should configure after alsa-lib so # ./configure can find alsa-lib. ifeq ($(BR2_PACKAGE_MADPLAY_ALSA),y) From 22393c93267ebfc1dd40292ecbd116519bb2828f Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Tue, 9 Jan 2024 14:51:48 -0800 Subject: [PATCH 4580/5754] package/go: bump to version 1.21.6 go1.21.6 (released 2024-01-09) includes fixes to the compiler, the runtime, and the crypto/tls, maps, and runtime/pprof packages. https://go.dev/doc/devel/release#go1.21.6 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 34822b7537..bee10089a7 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://go.dev/dl -sha256 285cbbdf4b6e6e62ed58f370f3f6d8c30825d6e56c5853c66d3c23bcdb09db19 go1.21.5.src.tar.gz +sha256 124926a62e45f78daabbaedb9c011d97633186a33c238ffc1e25320c02046248 go1.21.6.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index f3747b6473..f9d31aacac 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.21.5 +GO_VERSION = 1.21.6 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz From ce3f5e748a1cdd03ba19a238f7377484a6687ad5 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 9 Jan 2024 21:42:42 -0700 Subject: [PATCH 4581/5754] package/python-psutil: bump to version 5.9.7 Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-psutil/python-psutil.hash | 4 ++-- package/python-psutil/python-psutil.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-psutil/python-psutil.hash b/package/python-psutil/python-psutil.hash index f388118663..c5f4f39fe0 100644 --- a/package/python-psutil/python-psutil.hash +++ b/package/python-psutil/python-psutil.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/psutil/json -md5 eec35090e7474e471a12f0dd16c981f9 psutil-5.9.6.tar.gz -sha256 e4b92ddcd7dd4cdd3f900180ea1e104932c7bce234fb88976e2a3b296441225a psutil-5.9.6.tar.gz +md5 afcc40a779f84f6d909570a8934cebc3 psutil-5.9.7.tar.gz +sha256 3f02134e82cfb5d089fddf20bb2e03fd5cd52395321d1c8458a9e58500ff417c psutil-5.9.7.tar.gz # Locally computed sha256 checksums sha256 b89c063b3786e28e0c0a38f1931db61fed35e69dd2a2966fbecffee0f46c8d10 LICENSE diff --git a/package/python-psutil/python-psutil.mk b/package/python-psutil/python-psutil.mk index ece1039a51..e83193f20f 100644 --- a/package/python-psutil/python-psutil.mk +++ b/package/python-psutil/python-psutil.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PSUTIL_VERSION = 5.9.6 +PYTHON_PSUTIL_VERSION = 5.9.7 PYTHON_PSUTIL_SOURCE = psutil-$(PYTHON_PSUTIL_VERSION).tar.gz -PYTHON_PSUTIL_SITE = https://files.pythonhosted.org/packages/2d/01/beb7331fc6c8d1c49dd051e3611379bfe379e915c808e1301506027fce9d +PYTHON_PSUTIL_SITE = https://files.pythonhosted.org/packages/a0/d0/c9ae661a302931735237791f04cb7086ac244377f78692ba3b3eae3a9619 PYTHON_PSUTIL_SETUP_TYPE = setuptools PYTHON_PSUTIL_LICENSE = BSD-3-Clause PYTHON_PSUTIL_LICENSE_FILES = LICENSE From 22b629729667bac6aa3a9c5079be4487bb850d23 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 3 Jan 2024 20:11:50 +0100 Subject: [PATCH 4582/5754] package/exim: fix build with libexecinfo Upstream added optional support for execinfo https://git.exim.org/exim.git/commitdiff/204a7a2c2e8601558905dc34c576a627045a9f21 https://git.exim.org/exim.git/commitdiff/48ea675fee2d5fee8d33c525e28727b69114cfce in version 4.97 which was added to buildroot with commit faec3ca30e358575f70a036879029f63f7da9b29 Fixes: http://autobuild.buildroot.net/results/282/282882371e1d8c224c457bf65016f8abd11f8c45/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/exim/exim.mk | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/package/exim/exim.mk b/package/exim/exim.mk index fb9eecd71b..98b6097957 100644 --- a/package/exim/exim.mk +++ b/package/exim/exim.mk @@ -103,6 +103,7 @@ define EXIM_CONFIGURE_TOOLCHAIN $(call exim-config-add,RANLIB,$(TARGET_RANLIB)) $(call exim-config-add,HOSTCC,$(HOSTCC)) $(call exim-config-add,HOSTCFLAGS,$(HOSTCFLAGS)) + $(call exim-config-add,EXTRALIBS,$(EXIM_EXTRALIBS)) $(EXIM_FIX_IP_OPTIONS_FOR_MUSL) endef @@ -126,6 +127,13 @@ ifeq ($(BR2_STATIC_LIBS),y) EXIM_STATIC_FLAGS = LFLAGS="-pthread --static" endif +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +EXIM_DEPENDENCIES += libexecinfo +EXIM_EXTRALIBS += -lexecinfo +else ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),) +EXIM_CFLAGS = -DNO_EXECINFO +endif + # We need the host version of macro_predef during the build, before # building it we need to prepare the makefile. define EXIM_BUILD_CMDS @@ -136,7 +144,7 @@ define EXIM_BUILD_CMDS CFLAGS="-std=c99 $(HOST_CFLAGS)" \ LFLAGS="-fPIC $(HOST_LDFLAGS)" $(TARGET_MAKE_ENV) build=br $(MAKE) -C $(@D) $(EXIM_STATIC_FLAGS) \ - CFLAGS="-std=c99 $(TARGET_CFLAGS)" + CFLAGS="-std=c99 $(TARGET_CFLAGS) $(EXIM_CFLAGS)" endef # Need to replicate the LFLAGS in install, as exim still wants to build From 9bf9cac489bfe313623d0382446a1504d4f75992 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 3 Jan 2024 20:11:51 +0100 Subject: [PATCH 4583/5754] package/exim: do not build perl-based utilities Upstream added various utilities, for example exim_id_update with commit https://github.com/Exim/exim/commit/46a36afae41f63de654269c8a0b7cf5852a85a14 which is a "Utility for one-time upgrage/downgrade between exim message- id formats, around the 4.97 transition" which would add a dependency to host-perl/perl so we build and install only the needed exim binary. Fixes: http://autobuild.buildroot.net/results/111302dc3b4763befe9b159ae59b1b72de9162ea/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/exim/exim.mk | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/package/exim/exim.mk b/package/exim/exim.mk index 98b6097957..84fe96218c 100644 --- a/package/exim/exim.mk +++ b/package/exim/exim.mk @@ -144,16 +144,15 @@ define EXIM_BUILD_CMDS CFLAGS="-std=c99 $(HOST_CFLAGS)" \ LFLAGS="-fPIC $(HOST_LDFLAGS)" $(TARGET_MAKE_ENV) build=br $(MAKE) -C $(@D) $(EXIM_STATIC_FLAGS) \ - CFLAGS="-std=c99 $(TARGET_CFLAGS) $(EXIM_CFLAGS)" + CFLAGS="-std=c99 $(TARGET_CFLAGS) $(EXIM_CFLAGS)" exim endef # Need to replicate the LFLAGS in install, as exim still wants to build # something when installing... define EXIM_INSTALL_TARGET_CMDS - DESTDIR=$(TARGET_DIR) INSTALL_ARG="-no_chown -no_symlink" build=br \ - $(MAKE) -C $(@D) $(EXIM_STATIC_FLAGS) \ - CFLAGS="-std=c99 $(TARGET_CFLAGS)" \ - install + cd $(@D)/build-br; \ + DESTDIR=$(TARGET_DIR) build=br \ + ../scripts/exim_install -no_chown -no_symlink exim chmod u+s $(TARGET_DIR)/usr/sbin/exim endef From 7fe4e29b5ea2c129c123df2d847fc8e04f06e93e Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 10 Jan 2024 21:13:43 +0100 Subject: [PATCH 4584/5754] package/qwt: reinstate mkspecs cleanup The qwt package is a Qt5 package, not a Qt6 one, so it can't benefit from the target-finalize hook that was introduced in e29fcde4ba70 (package/qt6base: remove $(TARGET_DIR)/usr/mkspecs in target-finalize). Indeed, the original patch was hard-coding the mkspecs removal directly in the target-finalize recipe, and that was made a hook as a last-minute change when applying, without realising that qwt was qt5-based. So, reinstate the mkspecs removal as an ad-hoc fixup in the qwt package. This actually partially reverts commit e29fcde4ba70 (package/qt6base: remove $(TARGET_DIR)/usr/mkspecs in target-finalize). Reported-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/qwt/qwt.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/qwt/qwt.mk b/package/qwt/qwt.mk index f344ca4e3a..9f0b78655f 100644 --- a/package/qwt/qwt.mk +++ b/package/qwt/qwt.mk @@ -58,6 +58,7 @@ endef define QWT_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install INSTALL_ROOT=$(TARGET_DIR) + rm -Rf $(TARGET_DIR)/usr/mkspecs endef $(eval $(qmake-package)) From a51c664ef5130715220b28bfc71df102fb9c0bfc Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 7 Jan 2024 14:42:54 -0700 Subject: [PATCH 4585/5754] package/python-brotli: drop C++ depends C++ is no longer required for python-brotli as of version 1.1.0: https://github.com/google/brotli/commit/c8df4b3049ff1283fc4525defbcd003188f88963 Drop python-brotli C++ depends comment from python-weasyprint reverse dependency. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-brotli/Config.in | 4 ---- package/python-weasyprint/Config.in | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/package/python-brotli/Config.in b/package/python-brotli/Config.in index c31315392b..ca493bfeff 100644 --- a/package/python-brotli/Config.in +++ b/package/python-brotli/Config.in @@ -1,10 +1,6 @@ config BR2_PACKAGE_PYTHON_BROTLI bool "python-brotli" - depends on BR2_INSTALL_LIBSTDCPP help Python bindings for the Brotli compression library. https://github.com/google/brotli - -comment "python-brotli needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-weasyprint/Config.in b/package/python-weasyprint/Config.in index 18d72d742e..65210fb1eb 100644 --- a/package/python-weasyprint/Config.in +++ b/package/python-weasyprint/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_PYTHON_WEASYPRINT bool "python-weasyprint" - depends on BR2_INSTALL_LIBSTDCPP # python-brotli, python-zopfli + depends on BR2_INSTALL_LIBSTDCPP # python-zopfli select BR2_PACKAGE_PYTHON_BROTLI # runtime select BR2_PACKAGE_PYTHON_CFFI # runtime select BR2_PACKAGE_PYTHON_CSSSELECT2 # runtime From 27b02945bd35a48607f3785666b2107e01ec7ffb Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 7 Jan 2024 14:42:55 -0700 Subject: [PATCH 4586/5754] package/python-aiohttp: bump to version 3.9.1 Drop python-chardet/python-cchardet runtime dependencies. Drop python-typing-extensions runtime dependencies. Add new python-brotli runtime dependency. Add new python-frozenlist runtime dependency. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-aiohttp/Config.in | 5 ++--- package/python-aiohttp/python-aiohttp.hash | 4 ++-- package/python-aiohttp/python-aiohttp.mk | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/package/python-aiohttp/Config.in b/package/python-aiohttp/Config.in index 35c162b948..0507106fe7 100644 --- a/package/python-aiohttp/Config.in +++ b/package/python-aiohttp/Config.in @@ -4,10 +4,9 @@ config BR2_PACKAGE_PYTHON_AIOHTTP select BR2_PACKAGE_PYTHON_AIOSIGNAL # runtime select BR2_PACKAGE_PYTHON_ASYNC_TIMEOUT # runtime select BR2_PACKAGE_PYTHON_ATTRS # runtime - select BR2_PACKAGE_PYTHON_CCHARDET if BR2_INSTALL_LIBSTDCPP # runtime - select BR2_PACKAGE_PYTHON_CHARDET if !BR2_INSTALL_LIBSTDCPP # runtime + select BR2_PACKAGE_PYTHON_BROTLI # runtime + select BR2_PACKAGE_PYTHON_FROZENLIST # runtime select BR2_PACKAGE_PYTHON_MULTIDICT # runtime - select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime select BR2_PACKAGE_PYTHON_YARL # runtime select BR2_PACKAGE_PYTHON3_ZLIB # runtime help diff --git a/package/python-aiohttp/python-aiohttp.hash b/package/python-aiohttp/python-aiohttp.hash index 35c899cb0f..374e66ae8d 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 bdf57b82c0d1804f458e10320bb0dcd5 aiohttp-3.8.6.tar.gz -sha256 b0cf2a4501bff9330a8a5248b4ce951851e415bdcce9dc158e76cfd55e15085c aiohttp-3.8.6.tar.gz +md5 264e1b4fbe9f09050523c03f4d9b5ee2 aiohttp-3.9.1.tar.gz +sha256 8fc49a87ac269d4529da45871e2ffb6874e87779c3d0e2ccd813c0899221239d aiohttp-3.9.1.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 e814fc9224..2cb9058b97 100644 --- a/package/python-aiohttp/python-aiohttp.mk +++ b/package/python-aiohttp/python-aiohttp.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOHTTP_VERSION = 3.8.6 +PYTHON_AIOHTTP_VERSION = 3.9.1 PYTHON_AIOHTTP_SOURCE = aiohttp-$(PYTHON_AIOHTTP_VERSION).tar.gz -PYTHON_AIOHTTP_SITE = https://files.pythonhosted.org/packages/fd/01/f180d31923751fd20185c96938994823f00918ee5ac7b058edc005382406 +PYTHON_AIOHTTP_SITE = https://files.pythonhosted.org/packages/54/07/9467d3f8dae29b14f423b414d9e67512a76743c5bb7686fb05fe10c9cc3e PYTHON_AIOHTTP_SETUP_TYPE = setuptools PYTHON_AIOHTTP_LICENSE = Apache-2.0 PYTHON_AIOHTTP_LICENSE_FILES = LICENSE.txt From 7ea38660e01a87ab70c02e38c78a49202e8e5c21 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 6 Jan 2024 12:23:43 +0100 Subject: [PATCH 4587/5754] support/dependencies/dependencies.sh: libopenssl needs perl Math::BigInt on s390 libopenssl needs perl Math::BigInt for s390x asm to avoid the following build failure since commit a5cacb63082b9e58194c4b9f8b2af2c3e38ff15c: Can't locate bigint.pm in @INC (you may need to install the bigint module) (@INC contains: /home/buildroot/autobuild/instance-0/output-1/build/libopenssl-3.2.0/crypto/poly1305/asm/../.. /home/buildroot/autobuild/instance-0/output-1/host/lib/perl /usr/local/lib64/perl5/5.36 /usr/local/share/perl5/5.36 /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 /usr/share/perl5) at /home/buildroot/autobuild/instance-0/output-1/build/libopenssl-3.2.0/crypto/poly1305/asm/../../perlasm/s390x.pm line 16. BEGIN failed--compilation aborted at /home/buildroot/autobuild/instance-0/output-1/build/libopenssl-3.2.0/crypto/poly1305/asm/../../perlasm/s390x.pm line 16. Fixes: - http://autobuild.buildroot.org/results/986cb07d368c7214ffbc9d60c378e7ac00797f00 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- support/dependencies/dependencies.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index 6e7d067ccd..3d83cb3285 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -282,6 +282,10 @@ required_perl_modules="$required_perl_modules Thread::Queue" # Used by host-auto required_perl_modules="$required_perl_modules FindBin" # Used by (host-)libopenssl required_perl_modules="$required_perl_modules IPC::Cmd" # Used by (host-)libopenssl +if grep -q ^BR2_PACKAGE_LIBOPENSSL=y $BR2_CONFIG && grep -q ^BR2_s390x=y $BR2_CONFIG ; then + required_perl_modules="$required_perl_modules Math::BigInt" +fi + if grep -q ^BR2_PACKAGE_MOSH=y $BR2_CONFIG ; then required_perl_modules="$required_perl_modules diagnostics" fi From d702ac5844fb99d5ddc5c1a00d2ec5f83af9d034 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 6 Jan 2024 12:36:27 +0100 Subject: [PATCH 4588/5754] package/python-grpcio: needs C++ Fix the following build failure raised since the addition of the package in commit ea45b95c0e54866134c63e88e60489a012b3d134: /home/autobuild/autobuild/instance-12/output-1/build/python-grpcio-1.60.0/setup.py:40: DeprecationWarning: pkg_resources is deprecated as an API. See https://setuptools.pypa.io/en/latest/pkg_resources.html import pkg_resources Traceback (most recent call last): File "/home/autobuild/autobuild/instance-12/output-1/build/python-grpcio-1.60.0/setup.py", line 289, in if check_linker_need_libatomic(): ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/home/autobuild/autobuild/instance-12/output-1/build/python-grpcio-1.60.0/setup.py", line 223, in check_linker_need_libatomic cpp_test = subprocess.Popen( ^^^^^^^^^^^^^^^^^ File "/home/autobuild/autobuild/instance-12/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/lib/python3.11/subprocess.py", line 1026, in __init__ self._execute_child(args, executable, preexec_fn, close_fds, File "/home/autobuild/autobuild/instance-12/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/lib/python3.11/subprocess.py", line 1950, in _execute_child raise child_exception_type(errno_num, err_msg, err_filename) FileNotFoundError: [Errno 2] No such file or directory: 'no' Fixes: - http://autobuild.buildroot.org/results/58ac25b4e426712269c5fc144121c955b714c760 Signed-off-by: Fabrice Fontaine Reviewed-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-grpc-requests/Config.in | 4 ++++ package/python-grpcio-reflection/Config.in | 4 ++++ package/python-grpcio/Config.in | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/package/python-grpc-requests/Config.in b/package/python-grpc-requests/Config.in index 3c266e5976..3a2740f0f7 100644 --- a/package/python-grpc-requests/Config.in +++ b/package/python-grpc-requests/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_GRPC_REQUESTS bool "python-grpc-requests" depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-cryptography + depends on BR2_INSTALL_LIBSTDCPP # python-grpcio select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime select BR2_PACKAGE_PYTHON_GOOGLE_API_CORE # runtime select BR2_PACKAGE_PYTHON_GRPCIO # runtime @@ -9,3 +10,6 @@ config BR2_PACKAGE_PYTHON_GRPC_REQUESTS grpc for Humans. grpc reflection support client. https://github.com/wesky93/grpc_requests + +comment "python-grpcio-requests needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-grpcio-reflection/Config.in b/package/python-grpcio-reflection/Config.in index d2ee039c5f..afe8988165 100644 --- a/package/python-grpcio-reflection/Config.in +++ b/package/python-grpcio-reflection/Config.in @@ -1,8 +1,12 @@ config BR2_PACKAGE_PYTHON_GRPCIO_REFLECTION bool "python-grpcio-reflection" + depends on BR2_INSTALL_LIBSTDCPP # python-grpcio select BR2_PACKAGE_PYTHON_GRPCIO # runtime select BR2_PACKAGE_PYTHON_PROTOBUF # runtime help Standard Protobuf Reflection Service for gRPC. https://grpc.io + +comment "python-grpcio-reflection needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-grpcio/Config.in b/package/python-grpcio/Config.in index e63ac2ae34..5242eb461e 100644 --- a/package/python-grpcio/Config.in +++ b/package/python-grpcio/Config.in @@ -1,6 +1,10 @@ config BR2_PACKAGE_PYTHON_GRPCIO bool "python-grpcio" + depends on BR2_INSTALL_LIBSTDCPP help HTTP/2-based RPC framework. https://grpc.io + +comment "python-grpcio needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP From 7028893592d0022b8094e769b3215e08f104fa2b Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 6 Jan 2024 17:33:44 +0100 Subject: [PATCH 4589/5754] configs/imx8mpico: bump bsp components to version tn-kirkstone_5.15.71-2.2.0 Those components are aligned with NXP BSP lf-5.15.71-2.2.0. This commit introduces arm-trusted-firmware upstream patches to compile the needed version with newer gcc and binutils. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/5083366622 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- ...low-lower-address-access-with-gcc-12.patch | 62 +++++++++++++++++++ ...dd-support-for-new-binutils-versions.patch | 62 +++++++++++++++++++ configs/imx8mpico_defconfig | 10 +-- 3 files changed, 130 insertions(+), 4 deletions(-) create mode 100644 board/technexion/imx8mpico/patches/arm-trusted-firmware/0001-fix-build-allow-lower-address-access-with-gcc-12.patch create mode 100644 board/technexion/imx8mpico/patches/arm-trusted-firmware/0002-feat-build-add-support-for-new-binutils-versions.patch diff --git a/board/technexion/imx8mpico/patches/arm-trusted-firmware/0001-fix-build-allow-lower-address-access-with-gcc-12.patch b/board/technexion/imx8mpico/patches/arm-trusted-firmware/0001-fix-build-allow-lower-address-access-with-gcc-12.patch new file mode 100644 index 0000000000..90e808cc8e --- /dev/null +++ b/board/technexion/imx8mpico/patches/arm-trusted-firmware/0001-fix-build-allow-lower-address-access-with-gcc-12.patch @@ -0,0 +1,62 @@ +From 078cbf942c86d77775a26d83fc87ca244de02d4c Mon Sep 17 00:00:00 2001 +From: Govindraj Raja +Date: Fri, 5 May 2023 09:09:36 -0500 +Subject: [PATCH] fix(build): allow lower address access with gcc-12 + +With gcc-12 any lower address access can trigger a warning/error +this would be useful in other parts of system but in TF-A +there are various reasons to access to the lower address ranges, +example using mmio_read_*/writes_* + +So setup to allow access to lower addresses while using gcc-12 + +Change-Id: Id1b4012b13bc6876d83b90a347fee12478a1921d +Signed-off-by: Govindraj Raja +Upstream: https://github.com/ARM-software/arm-trusted-firmware/commit/dea23e245fb890c6c06eff7d1aed8fffa981fc05 +Signed-off-by: Julien Olivain +--- + Makefile | 4 ++++ + make_helpers/build_macros.mk | 12 ++++++++++++ + 2 files changed, 16 insertions(+) + +diff --git a/Makefile b/Makefile +index dccf0121d..edd7f5886 100644 +--- a/Makefile ++++ b/Makefile +@@ -385,6 +385,10 @@ ifeq ($(findstring clang,$(notdir $(CC))),) + WARNINGS += -Wunused-but-set-variable -Wmaybe-uninitialized \ + -Wpacked-bitfield-compat -Wshift-overflow=2 \ + -Wlogical-op ++ ++# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105523 ++TF_CFLAGS += $(call cc_option, --param=min-pagesize=0) ++ + else + # using clang + WARNINGS += -Wshift-overflow -Wshift-sign-overflow \ +diff --git a/make_helpers/build_macros.mk b/make_helpers/build_macros.mk +index 12aaee684..3a54bf67c 100644 +--- a/make_helpers/build_macros.mk ++++ b/make_helpers/build_macros.mk +@@ -86,6 +86,18 @@ define assert_numerics + $(foreach num,$1,$(eval $(call assert_numeric,$(num)))) + endef + ++# Convenience function to check for a given linker option. An call to ++# $(call ld_option, --no-XYZ) will return --no-XYZ if supported by the linker ++define ld_option ++ $(shell if $(LD) $(1) -v >/dev/null 2>&1; then echo $(1); fi ) ++endef ++ ++# Convenience function to check for a given compiler option. A call to ++# $(call cc_option, --no-XYZ) will return --no-XYZ if supported by the compiler ++define cc_option ++ $(shell if $(CC) $(1) -c -x c /dev/null -o /dev/null >/dev/null 2>&1; then echo $(1); fi ) ++endef ++ + # CREATE_SEQ is a recursive function to create sequence of numbers from 1 to + # $(2) and assign the sequence to $(1) + define CREATE_SEQ +-- +2.41.0 + diff --git a/board/technexion/imx8mpico/patches/arm-trusted-firmware/0002-feat-build-add-support-for-new-binutils-versions.patch b/board/technexion/imx8mpico/patches/arm-trusted-firmware/0002-feat-build-add-support-for-new-binutils-versions.patch new file mode 100644 index 0000000000..d989bdb06b --- /dev/null +++ b/board/technexion/imx8mpico/patches/arm-trusted-firmware/0002-feat-build-add-support-for-new-binutils-versions.patch @@ -0,0 +1,62 @@ +From cc14748257e07ed5b2caf5194c4c333a8d09a1f4 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 +Upstream: https://github.com/ARM-software/arm-trusted-firmware/commit/1f49db5f25cdd4e43825c9bcc0575070b80f628c +Signed-off-by: Julien Olivain +--- + Makefile | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/Makefile b/Makefile +index edd7f5886..4c0e1473e 100644 +--- a/Makefile ++++ b/Makefile +@@ -418,6 +418,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 +@@ -445,6 +447,12 @@ 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.41.0 + diff --git a/configs/imx8mpico_defconfig b/configs/imx8mpico_defconfig index 1df8c104ec..dd0f0e7b65 100644 --- a/configs/imx8mpico_defconfig +++ b/configs/imx8mpico_defconfig @@ -1,10 +1,11 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y 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/imx8mq-pico-pi.dtb" +BR2_GLOBAL_PATCH_DIR="board/technexion/imx8mpico/patches" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,TechNexion,linux-tn-imx,tn-hardknott_5.10.72-2.2.0_20220207)/linux-tn-im-tn-hardknott_5.10.72-2.2.0_20220207.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,TechNexion,linux-tn-imx,tn-kirkstone_5.15.71-2.2.0_20230512)/linux-tn-imx-tn-kirkstone_5.15.71-2.2.0_20230512.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="tn_imx8" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mq-pico-pi freescale/imx8mq-pico-pi-dcss-ili9881c" @@ -18,15 +19,16 @@ 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_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-5.10.72-2.2.0)/imx-atf-lf-5.10.72-2.2.0.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-5.15.71-2.2.0)/imx-atf-lf-5.15.71-2.2.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mq" 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,TechNexion,u-boot-tn-imx,tn-hardknott_5.10.72-2.2.0_20220207)/u-boot-tn-imx-tn-hardknott_5.10.72-2.2.0_20220207.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,TechNexion,u-boot-tn-imx,tn-kirkstone_5.15.71-2.2.0_20230512)/u-boot-tn-imx-tn-kirkstone_5.15.71-2.2.0_20230512.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="pico-imx8mq" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" BR2_TARGET_UBOOT_SPL=y From 7f13171e9d23862e0a30e84c7776f2b42cb0f9db Mon Sep 17 00:00:00 2001 From: Alexey Brodkin Date: Fri, 5 Jan 2024 10:04:22 -0800 Subject: [PATCH 4590/5754] package/binutils: re-add poison system directories patch to ARC binutils While updating ARC GNU toolchain version (see [1]) we unintentionally got rid of "0001-poison-system-directories.patch" which still makes sense. Even though one may think that we do not need these Binutils patches because we do "poisoning" of system directories in toolchain wrapper, but these wrappers don't exist for tools originated from Binutils, only for gcc, g++ etc. So we need to keep that patch still, sorry. [1] https://git.buildroot.net/buildroot/commit/?id=045ab73702b8bc09f94ca1f3b8e5bf3acb0b0843 Reported-by: Thomas Petazzoni Signed-off-by: Alexey Brodkin Signed-off-by: Thomas Petazzoni --- .../0001-poison-system-directories.patch | 309 ++++++++++++++++++ 1 file changed, 309 insertions(+) create mode 100644 package/binutils/arc-2023.09-release/0001-poison-system-directories.patch diff --git a/package/binutils/arc-2023.09-release/0001-poison-system-directories.patch b/package/binutils/arc-2023.09-release/0001-poison-system-directories.patch new file mode 100644 index 0000000000..4b927b630e --- /dev/null +++ b/package/binutils/arc-2023.09-release/0001-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 + From 3bd02f8f923aedb42fd08703f6d8f95db29001bb Mon Sep 17 00:00:00 2001 From: Jesse Taube Date: Tue, 9 Jan 2024 09:11:31 -0500 Subject: [PATCH 4591/5754] configs/imxrt1050-evk: Bump Kernel and U-boot Bump Linux to 6.7 and U-Boot to 2024.01 Signed-off-by: Jesse Taube Reviewed-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- configs/imxrt1050-evk_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/imxrt1050-evk_defconfig b/configs/imxrt1050-evk_defconfig index af060fb9f4..3eb556df06 100644 --- a/configs/imxrt1050-evk_defconfig +++ b/configs/imxrt1050-evk_defconfig @@ -7,16 +7,16 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/freescale/imxrt1050evk/genimage.cfg" # Toolchain -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_7=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.7" BR2_LINUX_KERNEL_DEFCONFIG="imxrt" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imxrt1050-evk" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imxrt1050-evk" # Filesystem BR2_TARGET_ROOTFS_EXT2=y @@ -30,7 +30,7 @@ BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" 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="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imxrt1050-evk" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/freescale/imxrt1050evk/uboot.fragment" BR2_TARGET_UBOOT_FORMAT_IMG=y From 2bcfb2549bef46c59886c94def693b3c22a5deec Mon Sep 17 00:00:00 2001 From: Jesse Taube Date: Wed, 8 Nov 2023 22:59:47 -0500 Subject: [PATCH 4592/5754] configs/imxrt1050-evk: Use zImage instead of uImage imxrt1050-evk was using uImage switch to using zImage now. Signed-off-by: Jesse Taube Signed-off-by: Thomas Petazzoni --- board/freescale/imxrt1050evk/genimage.cfg | 2 +- board/freescale/imxrt1050evk/uboot.fragment | 2 +- configs/imxrt1050-evk_defconfig | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/board/freescale/imxrt1050evk/genimage.cfg b/board/freescale/imxrt1050evk/genimage.cfg index daa51bdbe0..64fc8452f8 100644 --- a/board/freescale/imxrt1050evk/genimage.cfg +++ b/board/freescale/imxrt1050evk/genimage.cfg @@ -1,7 +1,7 @@ image boot.vfat { vfat { files = { - "uImage", + "zImage", "imxrt1050-evk.dtb", } } diff --git a/board/freescale/imxrt1050evk/uboot.fragment b/board/freescale/imxrt1050evk/uboot.fragment index 1c5bb6af35..dd45ca4c29 100644 --- a/board/freescale/imxrt1050evk/uboot.fragment +++ b/board/freescale/imxrt1050evk/uboot.fragment @@ -1,2 +1,2 @@ CONFIG_USE_BOOTCOMMAND=y -CONFIG_BOOTCOMMAND="setenv bootargs console=ttyLP0 root=/dev/mmcblk0p2 rw earlycon rootwait;load mmc 0:1 0x80800000 imxrt1050-evk.dtb;load mmc 0:1 0x80000000 uImage;bootm 0x80000000 - 0x80800000" +CONFIG_BOOTCOMMAND="setenv bootargs console=ttyLP0 root=/dev/mmcblk0p2 rw earlycon rootwait;load mmc 0:1 0x80800000 imxrt1050-evk.dtb;load mmc 0:1 0x80000000 zImage;bootz 0x80000000 - 0x80800000" diff --git a/configs/imxrt1050-evk_defconfig b/configs/imxrt1050-evk_defconfig index 3eb556df06..947abe5df2 100644 --- a/configs/imxrt1050-evk_defconfig +++ b/configs/imxrt1050-evk_defconfig @@ -14,7 +14,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.7" BR2_LINUX_KERNEL_DEFCONFIG="imxrt" -BR2_LINUX_KERNEL_UIMAGE=y +BR2_LINUX_KERNEL_ZIMAGE=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imxrt1050-evk" From b54c17bb710acbd7eff4ee1547d3d399147b62fa Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 6 Jan 2024 15:22:58 +0100 Subject: [PATCH 4593/5754] package/libzenoh-pico: bump to version 0.10.1-rc https://github.com/eclipse-zenoh/zenoh-pico/releases/tag/0.10.1-rc Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libzenoh-pico/libzenoh-pico.hash | 2 +- package/libzenoh-pico/libzenoh-pico.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libzenoh-pico/libzenoh-pico.hash b/package/libzenoh-pico/libzenoh-pico.hash index 564ecc9a57..98f804508f 100644 --- a/package/libzenoh-pico/libzenoh-pico.hash +++ b/package/libzenoh-pico/libzenoh-pico.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 752acec56236fca41dcc438307f4a76e69900383b06803d47f32c480643dc794 libzenoh-pico-0.10.0-rc.tar.gz +sha256 7b615515ac844470ec7806921e8106b2923f6c43e242b34f062954de7560b799 libzenoh-pico-0.10.1-rc.tar.gz sha256 d386df32cf327bbb25abe894277d3d7e0f447bafc59f4ad362615b0136f30db5 LICENSE diff --git a/package/libzenoh-pico/libzenoh-pico.mk b/package/libzenoh-pico/libzenoh-pico.mk index 72b956fddc..90dfda6c98 100644 --- a/package/libzenoh-pico/libzenoh-pico.mk +++ b/package/libzenoh-pico/libzenoh-pico.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBZENOH_PICO_VERSION = 0.10.0-rc +LIBZENOH_PICO_VERSION = 0.10.1-rc LIBZENOH_PICO_SITE = $(call github,eclipse-zenoh,zenoh-pico,$(LIBZENOH_PICO_VERSION)) LIBZENOH_PICO_LICENSE = Apache-2.0 or EPL-2.0 LIBZENOH_PICO_LICENSE_FILES = LICENSE From 8a170b8446585f98193bb3d780d0d8a427ff6c06 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 6 Jan 2024 19:17:54 +0100 Subject: [PATCH 4594/5754] package/json-glib: bump to version 1.8.0 Handle new nls option added by https://gitlab.gnome.org/GNOME/json-glib/-/commit/31998d84cb241a4c6343c97afc06ee24e60db032 https://download.gnome.org/sources/json-glib/1.8/json-glib-1.8.0.news Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/json-glib/json-glib.hash | 4 ++-- package/json-glib/json-glib.mk | 10 ++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/package/json-glib/json-glib.hash b/package/json-glib/json-glib.hash index 0c3cf7f7f7..b78d708391 100644 --- a/package/json-glib/json-glib.hash +++ b/package/json-glib/json-glib.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/json-glib/1.6/json-glib-1.6.6.sha256sum -sha256 96ec98be7a91f6dde33636720e3da2ff6ecbb90e76ccaa49497f31a6855a490e json-glib-1.6.6.tar.xz +# From https://download.gnome.org/sources/json-glib/1.8/json-glib-1.8.0.sha256sum +sha256 97ef5eb92ca811039ad50a65f06633f1aae64792789307be7170795d8b319454 json-glib-1.8.0.tar.xz # Hash for license file: sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 COPYING diff --git a/package/json-glib/json-glib.mk b/package/json-glib/json-glib.mk index b7ff0bfd57..cd53f24cee 100644 --- a/package/json-glib/json-glib.mk +++ b/package/json-glib/json-glib.mk @@ -4,8 +4,8 @@ # ################################################################################ -JSON_GLIB_VERSION_MAJOR = 1.6 -JSON_GLIB_VERSION = $(JSON_GLIB_VERSION_MAJOR).6 +JSON_GLIB_VERSION_MAJOR = 1.8 +JSON_GLIB_VERSION = $(JSON_GLIB_VERSION_MAJOR).0 JSON_GLIB_SITE = https://download.gnome.org/sources/json-glib/$(JSON_GLIB_VERSION_MAJOR) JSON_GLIB_SOURCE = json-glib-$(JSON_GLIB_VERSION).tar.xz JSON_GLIB_LICENSE = LGPL-2.1+ @@ -25,6 +25,12 @@ else JSON_GLIB_CONF_OPTS += -Dintrospection=disabled endif +ifeq ($(BR2_SYSTEM_ENABLE_NLS),y) +JSON_GLIB_CONF_OPTS += -Dnls=enabled +else +JSON_GLIB_CONF_OPTS += -Dnls=disabled +endif + JSON_GLIB_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) $(eval $(meson-package)) From ef0fa986eb7ff25c0a5db70ec0b62032e2d71538 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 6 Jan 2024 19:36:08 +0100 Subject: [PATCH 4595/5754] package/webrtc-audio-processing: bump to version 1.3 - Drop patch (not needed anymore) - Switch to meson-package - libabseil-cpp is a mandatory dependency Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - package/gstreamer1/gst1-plugins-bad/Config.in | 9 ++- ...detection-of-cxxabi.h-and-execinfo.h.patch | 63 ------------------- package/webrtc-audio-processing/Config.in | 10 ++- .../webrtc-audio-processing.hash | 2 +- .../webrtc-audio-processing.mk | 12 +--- 6 files changed, 17 insertions(+), 80 deletions(-) delete mode 100644 package/webrtc-audio-processing/0001-Proper-detection-of-cxxabi.h-and-execinfo.h.patch diff --git a/.checkpackageignore b/.checkpackageignore index 158ef066a0..f66f4f9a64 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1405,7 +1405,6 @@ 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/webrtc-audio-processing/0001-Proper-detection-of-cxxabi.h-and-execinfo.h.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 diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in index d2ef450d74..d2c60ec9ce 100644 --- a/package/gstreamer1/gst1-plugins-bad/Config.in +++ b/package/gstreamer1/gst1-plugins-bad/Config.in @@ -675,17 +675,20 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WEBRTCDSP bool "webrtcdsp" # All depends from webrtc-audio-processing depends on BR2_PACKAGE_WEBRTC_AUDIO_PROCESSING_ARCH_SUPPORTS + depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL + depends on !BR2_STATIC_LIBS select BR2_PACKAGE_WEBRTC_AUDIO_PROCESSING help WebRTC echo-cancellation, gain control and noise suppression -comment "webrtcdsp needs a toolchain w/ C++, NPTL, gcc >= 4.8" +comment "webrtcdsp needs a toolchain w/ C++, NPTL, dynamic library, gcc >= 8" depends on BR2_PACKAGE_WEBRTC_AUDIO_PROCESSING_ARCH_SUPPORTS + depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS_NPTL \ - || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_8 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WPE bool "wpe" diff --git a/package/webrtc-audio-processing/0001-Proper-detection-of-cxxabi.h-and-execinfo.h.patch b/package/webrtc-audio-processing/0001-Proper-detection-of-cxxabi.h-and-execinfo.h.patch deleted file mode 100644 index a0332db8e7..0000000000 --- a/package/webrtc-audio-processing/0001-Proper-detection-of-cxxabi.h-and-execinfo.h.patch +++ /dev/null @@ -1,63 +0,0 @@ -From b7a166acaddc4c78afa2b653e25114d9114699f3 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sat, 6 Aug 2016 11:24:50 +0200 -Subject: [PATCH] Proper detection of cxxabi.h and execinfo.h - -The current code in webrtc/base/checks.cc assumes that if __GLIBCXX__ is -defined and __UCLIBC__ is not defined, then both cxxabi.h and execinfo.h -will be available. - -Unfortunately, this is not correct with the musl C library: - - - It defines __GLIBCXX__ - - It does not define __UCLIBC__ (it's not uClibc after all!) - - But it also doesn't provide execinfo.h - -Therefore, in order to make things work properly, we switch to proper -autoconf checks for cxxabi.h and execinfo.h, and only use the backtrace -functionality if both are provided. - -Signed-off-by: Thomas Petazzoni ---- - configure.ac | 2 ++ - webrtc/base/checks.cc | 4 ++-- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index acbb3e2..ff4c752 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -45,6 +45,8 @@ AC_SUBST(GNUSTL_CFLAGS) - # Borrowed from gst-plugins-bad - AC_CHECK_HEADER(MobileCoreServices/MobileCoreServices.h, HAVE_IOS="yes", HAVE_IOS="no", [-]) - -+AC_CHECK_HEADERS([cxxabi.h execinfo.h]) -+ - # Based on gst-plugins-bad configure.ac and defines in - # /build/config/BUILDCONFIG.gn and - # webrtc/BUILD.gn -diff --git a/webrtc/base/checks.cc b/webrtc/base/checks.cc -index 49a31f2..05d23a6 100644 ---- a/webrtc/base/checks.cc -+++ b/webrtc/base/checks.cc -@@ -16,7 +16,7 @@ - #include - #include - --#if defined(__GLIBCXX__) && !defined(__UCLIBC__) -+#if defined(HAVE_CXX_ABI_H) && defined(HAVE_EXECINFO_H) - #include - #include - #endif -@@ -55,7 +55,7 @@ void PrintError(const char* format, ...) { - // to get usable symbols on Linux. This is copied from V8. Chromium has a more - // advanced stace trace system; also more difficult to copy. - void DumpBacktrace() { --#if defined(__GLIBCXX__) && !defined(__UCLIBC__) -+#if defined(HAVE_CXX_ABI_H) && defined(HAVE_EXECINFO_H) - void* trace[100]; - int size = backtrace(trace, sizeof(trace) / sizeof(*trace)); - char** symbols = backtrace_symbols(trace, size); --- -2.7.4 - diff --git a/package/webrtc-audio-processing/Config.in b/package/webrtc-audio-processing/Config.in index 64138269b5..cb3b21367b 100644 --- a/package/webrtc-audio-processing/Config.in +++ b/package/webrtc-audio-processing/Config.in @@ -5,17 +5,21 @@ config BR2_PACKAGE_WEBRTC_AUDIO_PROCESSING_ARCH_SUPPORTS config BR2_PACKAGE_WEBRTC_AUDIO_PROCESSING bool "webrtc-audio-processing" depends on BR2_PACKAGE_WEBRTC_AUDIO_PROCESSING_ARCH_SUPPORTS + depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # libabseil-cpp # pthread_condattr_setclock depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL + depends on !BR2_STATIC_LIBS # libabseil-cpp + select BR2_PACKAGE_LIBABSEIL_CPP help AudioProcessing library based on Google's implementation of WebRTC. http://freedesktop.org/software/pulseaudio/webrtc-audio-processing/ -comment "webrtc-audio-processing needs a toolchain w/ C++, NPTL, gcc >= 4.8" +comment "webrtc-audio-processing needs a toolchain w/ C++, NPTL, dynamic library, gcc >= 8" depends on BR2_PACKAGE_WEBRTC_AUDIO_PROCESSING_ARCH_SUPPORTS + depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS_NPTL \ - || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_8 diff --git a/package/webrtc-audio-processing/webrtc-audio-processing.hash b/package/webrtc-audio-processing/webrtc-audio-processing.hash index 18b8ea6410..eb2229360c 100644 --- a/package/webrtc-audio-processing/webrtc-audio-processing.hash +++ b/package/webrtc-audio-processing/webrtc-audio-processing.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a0fdd938fd85272d67e81572c5a4d9e200a0c104753cb3c209ded175ce3c5dbf webrtc-audio-processing-0.3.1.tar.xz +sha256 2365e93e778d7b61b5d6e02d21c47d97222e9c7deff9e1d0838ad6ec2e86f1b9 webrtc-audio-processing-1.3.tar.xz sha256 9b79539028e216e813e152d45f5c1ed5fdd0554426ad50270fb03134e7082dac COPYING diff --git a/package/webrtc-audio-processing/webrtc-audio-processing.mk b/package/webrtc-audio-processing/webrtc-audio-processing.mk index ff84a802d1..8aa5ee46b8 100644 --- a/package/webrtc-audio-processing/webrtc-audio-processing.mk +++ b/package/webrtc-audio-processing/webrtc-audio-processing.mk @@ -4,18 +4,12 @@ # ################################################################################ -WEBRTC_AUDIO_PROCESSING_VERSION = 0.3.1 +WEBRTC_AUDIO_PROCESSING_VERSION = 1.3 WEBRTC_AUDIO_PROCESSING_SOURCE = webrtc-audio-processing-$(WEBRTC_AUDIO_PROCESSING_VERSION).tar.xz WEBRTC_AUDIO_PROCESSING_SITE = http://freedesktop.org/software/pulseaudio/webrtc-audio-processing WEBRTC_AUDIO_PROCESSING_INSTALL_STAGING = YES WEBRTC_AUDIO_PROCESSING_LICENSE = BSD-3-Clause WEBRTC_AUDIO_PROCESSING_LICENSE_FILES = COPYING -WEBRTC_AUDIO_PROCESSING_DEPENDENCIES = host-pkgconf -# 0001-Proper-detection-of-cxxabi.h-and-execinfo.h.patch -WEBRTC_AUDIO_PROCESSING_AUTORECONF = YES +WEBRTC_AUDIO_PROCESSING_DEPENDENCIES = host-pkgconf libabseil-cpp -ifeq ($(BR2_SOFT_FLOAT),y) -WEBRTC_AUDIO_PROCESSING_CONF_OPTS += --with-ns-mode=fixed -endif - -$(eval $(autotools-package)) +$(eval $(meson-package)) From b7c163f1903db0eeeba6d49b3a977b2f021c5396 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 6 Jan 2024 14:39:19 +0100 Subject: [PATCH 4596/5754] package/nushell: fix sparc64 build Fix the following build failure on sparc64 raised since bump to version 0.85 in commit 470f0fb1ec0bd2ba03340f2aea34891ca8d7739d: error[E0308]: mismatched types --> /home/autobuild/autobuild/instance-7/output-1/build/nushell-0.85.0/VENDOR/uucore/src/lib/features/fs.rs:121:16 | 111 | pub fn number_of_links(&self) -> u64 { | --- expected `u64` because of return type ... 121 | return self.0.st_nlink; | ^^^^^^^^^^^^^^^ expected `u64`, found `u32` | help: you can convert a `u32` to a `u64` | 121 | return self.0.st_nlink.into(); | +++++++ For more information about this error, try `rustc --explain E0308`. error: could not compile `uucore` (lib) due to previous error Fixes: - http://autobuild.buildroot.org/results/f9f0287a8e39c65895014ca513ed25071f020add Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0001-uucore-add-support-for-sparc64.patch | 57 +++++++++++++++++++ package/nushell/nushell.mk | 7 +++ 2 files changed, 64 insertions(+) create mode 100644 package/nushell/0001-uucore-add-support-for-sparc64.patch diff --git a/package/nushell/0001-uucore-add-support-for-sparc64.patch b/package/nushell/0001-uucore-add-support-for-sparc64.patch new file mode 100644 index 0000000000..2cc05c172e --- /dev/null +++ b/package/nushell/0001-uucore-add-support-for-sparc64.patch @@ -0,0 +1,57 @@ +From 9f4330f94cc471d880df7d9089ee1105b27fd321 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 6 Jan 2024 10:26:54 +0100 +Subject: [PATCH] uucore: add support for sparc64 + +Add support for sparc64 in uucore to avoid the following build failure +with nushell: + +error[E0308]: mismatched types + --> /home/autobuild/autobuild/instance-7/output-1/build/nushell-0.85.0/VENDOR/uucore/src/lib/features/fs.rs:121:16 + | +111 | pub fn number_of_links(&self) -> u64 { + | --- expected `u64` because of return type +... +121 | return self.0.st_nlink; + | ^^^^^^^^^^^^^^^ expected `u64`, found `u32` + | +help: you can convert a `u32` to a `u64` + | +121 | return self.0.st_nlink.into(); + | +++++++ + +For more information about this error, try `rustc --explain E0308`. +error: could not compile `uucore` (lib) due to previous error + +Fixes: + - http://autobuild.buildroot.org/results/f9f0287a8e39c65895014ca513ed25071f020add + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/uutils/coreutils/commit/d158f1a396d19cc2aed68131b80ec3b7325d108e +--- + src/uucore/src/lib/features/fs.rs | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/VENDOR/uucore/src/lib/features/fs.rs b/VENDOR/uucore/src/lib/features/fs.rs +index 20cc9e13d..3b9170bc3 100644 +--- a/VENDOR/uucore/src/lib/features/fs.rs ++++ b/VENDOR/uucore/src/lib/features/fs.rs +@@ -121,6 +121,7 @@ impl FileInformation { + not(target_os = "solaris"), + not(target_arch = "aarch64"), + not(target_arch = "riscv64"), ++ not(target_arch = "sparc64"), + target_pointer_width = "64" + ))] + return self.0.st_nlink; +@@ -137,6 +138,7 @@ impl FileInformation { + target_os = "solaris", + target_arch = "aarch64", + target_arch = "riscv64", ++ target_arch = "sparc64", + not(target_pointer_width = "64") + ) + ))] +-- +2.43.0 + diff --git a/package/nushell/nushell.mk b/package/nushell/nushell.mk index 779a3c4393..7b538da4e2 100644 --- a/package/nushell/nushell.mk +++ b/package/nushell/nushell.mk @@ -10,6 +10,13 @@ NUSHELL_LICENSE = MIT NUSHELL_LICENSE_FILES = LICENSE NUSHELL_DEPENDENCIES = host-pkgconf openssl ncurses +# 0001-uucore-add-support-for-sparc64.patch +define NUSHELL_PATCH_CHECKSUM_FILE + $(SED) 's/b0390ae7bca8b31f0db289a5d064bba36d45e4d137674e9df2c6ab6256f926f4/f8ce2ad571e1482f6833cb147eafeb724776e7887ebabf339a5f3e79860583cb/' \ + $(@D)/VENDOR/uucore/.cargo-checksum.json +endef +NUSHELL_POST_PATCH_HOOKS += NUSHELL_PATCH_CHECKSUM_FILE + # 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 \ From 9d8497e79de3ced144877ba6ee38cc5b7181aaeb Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Sat, 6 Jan 2024 16:01:32 -0700 Subject: [PATCH 4597/5754] package/ivi-homescreen: new package Much like flutter-pi, this package is a Flutter embedder used to run Flutter applications. However, unlike Flutter-pi, this package requires a Wayland compositor to run, which flutter-pi does not support. Furthermore, flutter-pi lacks several plugins and features that ivi-homescreen supports, such as: - Dart VM console redirection - DLT logging - Accessibility - Compositor region - Compositor surface - Desktop Window - Go Router - Isolate - Keyboard Manager - Layer Playground - Mouse Cursor - PackageInfo - Platform - Platform Views - Restoration The following plugins and options are hardcoded to off: - Crash handler: Requires a newer version of sentry-native. - File selector: Requires the zenity package. - Firebase-core: Requires the firebase-cpp-sdk package. - URL Launcher: Requires a runtime-dependency on xdg-open. - BUILD_TEXTURE_NAVI_RENDER_EGL: Failes to build. - BUILD_TEXTURE_TEST_EGL: Fails to build. - ENABLE_AGL_CLIENT: Used for Automitve Grade Linux (AGL). The ENABLE_XDG_CLIENT=ON option is a requirement to run Flutter apps. If this option is disabled, ivi-homescreen segfaults when starting an application. Finally, there is a need for a patch that fixes the audio-players plugin: If the audio-players plugin is the only plugin selected, several compilation errors occure because of undeclared definitions, as the standard_method_codec.h header file is missing. Upstream-status: https://github.com/toyota-connected/ivi-homescreen/pull/133 This package has been tested on a x86_64 host with an AMD Ryzen 9 6900HS with Docker 24.0.5: - The following distributions: - Fedora 39: Host system - Ubuntu 22.04: Docker - Debian 11: Docker - The following targets: - BR2_aarch64 - BR2_arm - BR2_x86_64 Signed-off-by: Adam Duskett [yann.morin.1998@free.fr: - propagate BR2_PACKAGE_HOST_FLUTTER_SDK_BIN_ARCH_SUPPORTS to comments - drop NPTL, implied by glibc - reorder dependencies in a more logical way - reorder comments - drop undefined BR2_PACKAGE_IVI_HOMESCREEN_HAS_CLIENT - grammar ("for to change") ] Signed-off-by: Yann E. MORIN --- DEVELOPERS | 1 + package/Config.in | 1 + ...-headers-to-the-audio-players-plugin.patch | 82 ++++++ package/ivi-homescreen/Config.in | 270 ++++++++++++++++++ package/ivi-homescreen/ivi-homescreen.hash | 21 ++ package/ivi-homescreen/ivi-homescreen.mk | 136 +++++++++ 6 files changed, 511 insertions(+) create mode 100644 package/ivi-homescreen/0001-add-missing-headers-to-the-audio-players-plugin.patch create mode 100644 package/ivi-homescreen/Config.in create mode 100644 package/ivi-homescreen/ivi-homescreen.hash create mode 100644 package/ivi-homescreen/ivi-homescreen.mk diff --git a/DEVELOPERS b/DEVELOPERS index d7543247f2..94a89c63d5 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -35,6 +35,7 @@ F: package/flutter-engine/ F: package/flutter-gallery/ F: package/flutter-pi/ F: package/flutter-sdk-bin/ +F: package/ivi-homescreen/ F: package/libutempter/ F: package/tllist/ F: support/testing/tests/package/test_flutter.py diff --git a/package/Config.in b/package/Config.in index f5d0c06334..0009256298 100644 --- a/package/Config.in +++ b/package/Config.in @@ -322,6 +322,7 @@ comment "Graphic applications" source "package/glmark2/Config.in" source "package/glslsandbox-player/Config.in" source "package/gnuplot/Config.in" + source "package/ivi-homescreen/Config.in" source "package/jhead/Config.in" source "package/kmscube/Config.in" source "package/libva-utils/Config.in" diff --git a/package/ivi-homescreen/0001-add-missing-headers-to-the-audio-players-plugin.patch b/package/ivi-homescreen/0001-add-missing-headers-to-the-audio-players-plugin.patch new file mode 100644 index 0000000000..c26fdba7f2 --- /dev/null +++ b/package/ivi-homescreen/0001-add-missing-headers-to-the-audio-players-plugin.patch @@ -0,0 +1,82 @@ +From 7e35ea4fbd94a1604907069bb9cc2e2dff4b43c7 Mon Sep 17 00:00:00 2001 +From: Adam Duskett +Date: Sat, 6 Jan 2024 14:18:56 -0700 +Subject: [PATCH] add missing headers to the audio-players plugin + +Fixes flutter::StandardMethodCodec not being declared on the following lines: +plugins/audio_players/audio_players_registry.cc:83 +plugins/audio_players/audio_players_registry.cc:94 +plugins/audio_players/audio_players_registry.cc:152 +plugins/audio_players/audio_player.cc:257 +plugins/audio_players/audio_player.cc:623 + +Upstream: https://github.com/toyota-connected/ivi-homescreen/pull/133 + +Signed-off-by: Adam Duskett +--- + shell/plugins/audio_players/audio_player.cc | 3 ++- + shell/plugins/audio_players/audio_players.cc | 4 +++- + shell/plugins/audio_players/audio_players_registry.cc | 3 ++- + 3 files changed, 7 insertions(+), 3 deletions(-) + +diff --git a/shell/plugins/audio_players/audio_player.cc b/shell/plugins/audio_players/audio_player.cc +index 56027eb..a85e9ae 100644 +--- a/shell/plugins/audio_players/audio_player.cc ++++ b/shell/plugins/audio_players/audio_player.cc +@@ -20,6 +20,7 @@ + #include + #include + ++#include + #include + + #include +@@ -639,4 +640,4 @@ void AudioPlayer::OnPlatformMessage(const FlutterPlatformMessage* message, + engine->SendPlatformMessageResponse(message->response_handle, result->data(), + result->size()); + } +-} // namespace Plugins +\ No newline at end of file ++} // namespace Plugins +diff --git a/shell/plugins/audio_players/audio_players.cc b/shell/plugins/audio_players/audio_players.cc +index 0605576..4290f5a 100644 +--- a/shell/plugins/audio_players/audio_players.cc ++++ b/shell/plugins/audio_players/audio_players.cc +@@ -19,6 +19,8 @@ + #include + #include + ++#include ++ + #include "audio_player.h" + #include "audio_players_registry.h" + #include "engine.h" +@@ -314,4 +316,4 @@ void AudioPlayers::OnPlatformMessage(const FlutterPlatformMessage* message, + : "Unknown AudioPlayersLinux error"); + } + } +-} +\ No newline at end of file ++} +diff --git a/shell/plugins/audio_players/audio_players_registry.cc b/shell/plugins/audio_players/audio_players_registry.cc +index 6c9ef33..00c4f45 100644 +--- a/shell/plugins/audio_players/audio_players_registry.cc ++++ b/shell/plugins/audio_players/audio_players_registry.cc +@@ -19,6 +19,7 @@ + #include + #include + ++#include + #include + + #include "audio_player.h" +@@ -168,4 +169,4 @@ void AudioPlayersRegistry::OnPlatformMessageEvents( + engine->SendPlatformMessageResponse(message->response_handle, result->data(), + result->size()); + } +-} // namespace Plugins +\ No newline at end of file ++} // namespace Plugins +-- +2.43.0 + diff --git a/package/ivi-homescreen/Config.in b/package/ivi-homescreen/Config.in new file mode 100644 index 0000000000..de7509320f --- /dev/null +++ b/package/ivi-homescreen/Config.in @@ -0,0 +1,270 @@ +menuconfig BR2_PACKAGE_IVI_HOMESCREEN + bool "ivi-homescreen" + depends on BR2_PACKAGE_HOST_FLUTTER_SDK_BIN_ARCH_SUPPORTS + depends on BR2_PACKAGE_FLUTTER_ENGINE_ARCH_SUPPORTS + depends on BR2_HOST_GCC_AT_LEAST_5 # flutter-engine + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # flutter-engine + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # flutter-engine + depends on BR2_TOOLCHAIN_USES_GLIBC # flutter-engine + depends on BR2_INSTALL_LIBSTDCPP # flutter-engine + depends on !BR2_STATIC_LIBS # flutter-engine, wayland + depends on BR2_USE_WCHAR # flutter-engine + depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES # flutter-engine + select BR2_PACKAGE_HOST_FLUTTER_SDK_BIN + select BR2_PACKAGE_FLUTTER_ENGINE + select BR2_PACKAGE_LIBXKBCOMMON + select BR2_PACKAGE_WAYLAND + select BR2_PACKAGE_WAYLAND_PROTOCOLS + select BR2_PACKAGE_WAYLAND_UTILS + help + Toyota's Flutter Embedder that communicates with Wayland + compositors. + Features: + - Strongly Typed (C++) + - Lightweight + - Platform Channels enabled/disabled via CMake + - OpenGL Texture Framework + - Compositor Sub-surface/Region support + - Vulkan / EGL backend support + + https://github.com/toyota-connected/ivi-homescreen + +if BR2_PACKAGE_IVI_HOMESCREEN + +config BR2_PACKAGE_IVI_HOMESCREEN_IVI_SHELL_CLIENT + bool "ivi-shell client" + +comment "Logging" +config BR2_PACKAGE_IVI_HOMESCREEN_DART_VM_LOGGING + bool "Enable Dart VM Logging" + +config BR2_PACKAGE_IVI_HOMESCREEN_DLT_LOGGING + bool "DLT logging" + +comment "EGL options" + +config BR2_PACKAGE_IVI_HOMESCREEN_EGL_TRANSPARENCY + bool "Transparency" + depends on BR2_PACKAGE_HAS_LIBEGL + +comment "Transparency support needs an EGL backend" + depends on !BR2_PACKAGE_HAS_LIBEGL + +config BR2_PACKAGE_IVI_HOMESCREEN_EGL_ENABLE_3D + bool "3D support" + depends on BR2_PACKAGE_HAS_LIBEGL + help + Build with EGL Stencil, Depth, and Stencil + +comment "3D support needs an EGL backend" + depends on !BR2_PACKAGE_HAS_LIBEGL + +config BR2_PACKAGE_IVI_HOMESCREEN_EGL_MULTISAMPLE + bool "Multisample support" + depends on BR2_PACKAGE_HAS_LIBEGL + help + Build with EGL Sample set to 4 + +comment "Multisample support needs an EGL backend" + depends on !BR2_PACKAGE_HAS_LIBEGL + +comment "dependency-less plugins" + +config BR2_PACKAGE_IVI_HOMESCREEN_ACCESSIBILITY_PLUGIN + bool "Accessibility" + +config BR2_PACKAGE_IVI_HOMESCREEN_COMP_REGION_PLUGIN + bool "Compositor Region" + +config BR2_PACKAGE_IVI_HOMESCREEN_COMP_SURF_PLUGIN + bool "Compositor Surface" + +config BR2_PACKAGE_IVI_HOMESCREEN_DESKTOP_WINDOW_PLUGIN + bool "Desktop Window" + help + Flutter plugin to change window size. + + https://pub.dev/packages/desktop_window + +config BR2_PACKAGE_IVI_HOMESCREEN_GO_ROUTER_PLUGIN + bool "Go Router" + help + A declarative routing package for Flutter that uses the + Router API to provide a convenient, url-based API for + navigating between different screens. You can define URL + patterns, navigate using a URL, handle deep links, and a + number of other navigation-related scenarios. + + https://pub.dev/packages/go_router + +config BR2_PACKAGE_IVI_HOMESCREEN_INTEGRATION_TEST_PLUGIN + bool "Flutter Integration Test support" + help + https://docs.flutter.dev/cookbook/testing/integration/introduction + +config BR2_PACKAGE_IVI_HOMESCREEN_ISOLATE_PLUGIN + bool "Isolate" + +config BR2_PACKAGE_IVI_HOMESCREEN_KEYBOARD_MANAGER_PLUGIN + bool "Keyboard Manager" + select BR2_PACKAGE_IVI_HOMESCREEN_TEXT_INPUT_PLUGIN # runtime + help + This is a wrapper for the raw keyboard listener made to + simplify intercept external keyboard button press. + + https://pub.dev/packages/keyboard_manager + +config BR2_PACKAGE_IVI_HOMESCREEN_KEY_EVENT_PLUGIN + bool "Key Event" + select BR2_PACKAGE_IVI_HOMESCREEN_TEXT_INPUT_PLUGIN # runtime + help + KeyEvent plugin to support RawKeyEvent. + +config BR2_PACKAGE_IVI_HOMESCREEN_LAYER_PLAYGROUND_PLUGIN + bool "Layer Playground" + select BR2_PACKAGE_IVI_HOMESCREEN_PLATFORM_VIEWS_PLUGIN + help + This plugin enables the platform views plugin and also + provides a simple-box-view-type option. + + https://github.com/toyota-connected/ivi-homescreen/tree/main/shell/plugins/platform_views + +config BR2_PACKAGE_IVI_HOMESCREEN_LOGGING_PLUGIN + bool "Logging" + +config BR2_PACKAGE_IVI_HOMESCREEN_MOUSE_CURSOR_PLUGIN + bool "Mouse Cursor" + help + Add mouse cursor support. + +config BR2_PACKAGE_IVI_HOMESCREEN_PACKAGE_INFO_PLUGIN + bool "PackageInfo" + help + Prints the ivi-homescreen package information. + +config BR2_PACKAGE_IVI_HOMESCREEN_PLATFORM_PLUGIN + bool "Platform" + help + Get information about the platform the Flutter application + is running on. + +config BR2_PACKAGE_IVI_HOMESCREEN_PLATFORM_VIEWS_PLUGIN + bool "Platform Views" + help + This plugin supports the AndroidView interface. Meaning you + can take any Platform View Dart code, change the definition + to use AndroidView, and you will have a working interface. + + Benefits of using this interface: + - pre-defined interface that is supported in Flutter SDK + - params are easily augmented in Dart to add for given use + case + - pass touch to another process/library without additional + work + + For a backing implementation there are a number of approaches: + - Have a PlatformView implementation render to a Texture + - Compositor Region support + (poke a hole for another process) + - Compositor sub-surface and manage Z-order + + The above is already supported today using either an OpenGL + texture, or a Compositor Sub-Surface. Using Platform Views + just re-uses an existing interface. + + https://github.com/toyota-connected/ivi-homescreen/tree/main/shell/plugins/platform_views + +config BR2_PACKAGE_IVI_HOMESCREEN_RESTORATION_PLUGIN + bool "Restoration" + help + Handles the Flutter restoration callback + +config BR2_PACKAGE_IVI_HOMESCREEN_TEXT_INPUT_PLUGIN + bool "Text Input" + help + Allow for text input + +comment "plugins with external dependencies" +config BR2_PACKAGE_IVI_HOMESCREEN_AUDIO_PLAYERS + bool "Audio Players" + select BR2_PACKAGE_GSTREAMER1 + select BR2_PACKAGE_GST1_PLUGINS_BASE + select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ALSA + select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOCONVERT + select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIORESAMPLE + select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VOLUME + help + A Flutter plugin to play multiple simultaneously audio files. + Based on audioplayers-v5.2.1 + + https://pub.dev/packages/audioplayers + +config BR2_PACKAGE_IVI_HOMESCREEN_FLUTTER_SECURE_STORAGE_PLUGIN + bool "Flutter Secure Storage" + select BR2_PACKAGE_LIBSECRET + help + Store data in secure storage + + https://pub.dev/packages/flutter_secure_storage + +config BR2_PACKAGE_IVI_HOMESCREEN_GOOGLE_SIGN_IN_PLUGIN + bool "Google Sign In manager" + select BR2_PACKAGE_LIBCURL + select BR2_PACKAGE_LIBCURL_FORCE_TLS + select BR2_PACKAGE_OPENSSL + help + This static plugin is to support this pub.dev package: + https://pub.dev/packages/google_sign_in + + https://github.com/toyota-connected/ivi-homescreen/tree/main/shell/plugins/google_sign_in + +config BR2_PACKAGE_IVI_HOMESCREEN_GSTREAMER_EGL_PLUGIN + bool "GStreamer EGL" + depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS + depends on BR2_PACKAGE_HAS_LIBEGL + select BR2_PACKAGE_FFMPEG + select BR2_PACKAGE_GSTREAMER1 + select BR2_PACKAGE_GST1_PLUGINS_BASE + select BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL + select BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_EGL + help + A GStreamer-powered alternative to Flutter's video_player that + support Linux, iOS and Android. + + https://pub.dev/packages/flutter_gstreamer_player + +comment "GStreamer plugin needs an EGL backend" + depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS + depends on !BR2_PACKAGE_HAS_LIBEGL + +config BR2_PACKAGE_IVI_HOMESCREEN_OPENGL_TEXTURE_PLUGIN + bool "OpenGL Texture" + depends on BR2_PACKAGE_HAS_LIBEGL + help + A Flutter OpenGL ES plugin using a Texture() widget. + Many shaders from ShaderToy.com can be copy/pasted + + https://pub.dev/packages/flutter_opengl + +comment "OpenGL texture plugin needs an EGL backend" + depends on !BR2_PACKAGE_HAS_LIBEGL + +endif # BR2_PACKAGE_IVI_HOMESCREEN + +comment "ivi-homescreen needs a glibc toolchain w/ wchar, C++, gcc >= 5, dynamic library, host gcc >= 5, NPTL" + depends on BR2_PACKAGE_HOST_FLUTTER_SDK_BIN_ARCH_SUPPORTS + depends on BR2_PACKAGE_FLUTTER_ENGINE_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_TOOLCHAIN_HAS_THREADS_NPTL \ + || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 \ + || BR2_STATIC_LIBS || !BR2_USE_WCHAR \ + || !BR2_HOST_GCC_AT_LEAST_5 + +comment "ivi-homescreen needs a toolchain not affected by GCC bug 64735" + depends on BR2_PACKAGE_HOST_FLUTTER_SDK_BIN_ARCH_SUPPORTS + depends on BR2_PACKAGE_FLUTTER_ENGINE_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 + +comment "ivi-homescreen needs an OpenGL or OpenGLES backend" + depends on BR2_PACKAGE_HOST_FLUTTER_SDK_BIN_ARCH_SUPPORTS + depends on BR2_PACKAGE_FLUTTER_ENGINE_ARCH_SUPPORTS + depends on !BR2_PACKAGE_HAS_LIBGL && !BR2_PACKAGE_HAS_LIBGLES diff --git a/package/ivi-homescreen/ivi-homescreen.hash b/package/ivi-homescreen/ivi-homescreen.hash new file mode 100644 index 0000000000..a0d0162948 --- /dev/null +++ b/package/ivi-homescreen/ivi-homescreen.hash @@ -0,0 +1,21 @@ +# Locally calculated +sha256 1ab2e7ab5f947482cb5529dbb6392e7e1945ceb0b593abde6b6279d7bd2fdb79 ivi-homescreen-5ab78a19e95c88cc5d6b173ab1260a211e78cf0a-br1.tar.gz + +# Apache-2.0 +sha256 6b96fa0a3def85caaf466caa2bd82d4ca4f22d106ff88f97a00c537c00cc714b LICENSE +sha256 943c358cb6d086e4bc0937941b8f8d766db7d4e5f06583efd45dca0ca6a645f3 third_party/filament/libs/bluevk/include/bluevk/BlueVK.h + +# BSD-3-Clause +sha256 fdff25c8a4147791114584a45d56621336d294601da77656e83504a71747c8c2 third_party/flutter/shell/platform/common/client_wrapper/core_implementations.cc + +# BSD-Style +sha256 baa98cbcc03e3e745c4ad9ac2d3fb3464424486b2e420081181013034a7e6406 third_party/flutter/third_party/dart/runtime/include/dart_api.h + +# BSL-1.0 +sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 third_party/asio-1-28-1/asio/LICENSE_1_0.txt + +# MIT +sha256 240f786071b64c28c0a1dae3e3b05fc3ca93fa4882b1e36e56ee49fee3037b0a third_party/flutter/third_party/rapidjson/include/rapidjson/rapidjson.h +sha256 4b67e7ae8c91e68e1a929eb1cbaa4c773c6d19aa91aaa12c390cf9560d1c9799 third_party/sanitizers-cmake/LICENSE +sha256 a7241a379cb98d37788f82c2fc2e484c3ae85dae881fd3406f0637644850926f third_party/spdlog-1.12.0/LICENSE +sha256 8b79f17fa7cf47adeeb8277965267e3932155fdfcab81a0ed5d583438bdf9135 third_party/weston/protocol/ivi-application.xml diff --git a/package/ivi-homescreen/ivi-homescreen.mk b/package/ivi-homescreen/ivi-homescreen.mk new file mode 100644 index 0000000000..4293b2bc35 --- /dev/null +++ b/package/ivi-homescreen/ivi-homescreen.mk @@ -0,0 +1,136 @@ +################################################################################ +# +# ivi-homescreen +# +################################################################################ + +IVI_HOMESCREEN_VERSION = 5ab78a19e95c88cc5d6b173ab1260a211e78cf0a +IVI_HOMESCREEN_SITE = https://github.com/toyota-connected/ivi-homescreen.git +IVI_HOMESCREEN_SITE_METHOD = git +IVI_HOMESCREEN_LICENSE = Apache-2.0, BSD-3-Clause, BSD-Style, BSL-1.0, MIT + +# Keep order as listed in ivi-homescreen.hash +IVI_HOMESCREEN_LICENSE_FILES = \ + LICENSE \ + third_party/filament/libs/bluevk/include/bluevk/BlueVK.h \ + third_party/flutter/shell/platform/common/client_wrapper/core_implementations.cc \ + third_party/flutter/third_party/dart/runtime/include/dart_api.h \ + third_party/asio-1-28-1/asio/LICENSE_1_0.txt \ + third_party/flutter/third_party/rapidjson/include/rapidjson/rapidjson.h \ + third_party/sanitizers-cmake/LICENSE \ + third_party/spdlog-1.12.0/LICENSE \ + third_party/weston/protocol/ivi-application.xml + +IVI_HOMESCREEN_DEPENDENCIES = \ + host-flutter-sdk-bin \ + flutter-engine \ + libxkbcommon \ + wayland \ + wayland-protocols \ + wayland-utils + +IVI_HOMESCREEN_CONF_OPTS = \ + -DBUILD_CRASH_HANDLER=OFF \ + -DBUILD_PLUGIN_FILE_SELECTOR=OFF \ + -DBUILD_PLUGIN_FIREBASE_CORE=OFF \ + -DBUILD_PLUGIN_URL_LAUNCHER=OFF \ + -DBUILD_TEXTURE_NAVI_RENDER_EGL=OFF \ + -DBUILD_TEXTURE_TEST_EGL=OFF \ + -DBUILD_UNIT_TESTS=OFF \ + -DENABLE_AGL_CLIENT=OFF \ + -DENABLE_XDG_CLIENT=ON \ + -DENABLE_IVI_SHELL_CLIENT=$(if $(BR2_PACKAGE_IVI_HOMESCREEN_IVI_SHELL_CLIENT),ON,OFF) + +# Logging +IVI_HOMESCREEN_CONF_OPTS += \ + -DENABLE_DART_VM_LOGGING=$(if $(BR2_PACKAGE_IVI_HOMESCREEN_DART_VM_LOGGING),ON,OFF) \ + -DENABLE_DLT=$(if $(BR2_PACKAGE_IVI_HOMESCREEN_DLT_LOGGING),ON,OFF) + +# EGL +IVI_HOMESCREEN_CONF_OPTS += \ + -DBUILD_EGL_TRANSPARENCY=$(if $(BR2_PACKAGE_IVI_HOMESCREEN_EGL_TRANSPARENCY),ON,OFF) \ + -DBUILD_EGL_ENABLE_3D=$(if $(BR2_PACKAGE_IVI_HOMESCREEN_EGL_ENABLE_3D),ON,OFF) \ + -DBUILD_EGL_ENABLE_MULTISAMPLE=$(if $(BR2_PACKAGE_IVI_HOMESCREEN_EGL_MULTISAMPLE),ON,OFF) + +# dependency-less plugins +IVI_HOMESCREEN_CONF_OPTS += \ + -DBUILD_PLUGIN_ACCESSIBILITY=$(if $(BR2_PACKAGE_IVI_HOMESCREEN_ACCESSIBILITY_PLUGIN),ON,OFF) \ + -DBUILD_PLUGIN_COMP_REGION=$(if $(BR2_PACKAGE_IVI_HOMESCREEN_COMP_REGION_PLUGIN),ON,OFF) \ + -DBUILD_PLUGIN_COMP_SURF=$(if $(BR2_PACKAGE_IVI_HOMESCREEN_COMP_SURF_PLUGIN),ON,OFF) \ + -DBUILD_PLUGIN_DESKTOP_WINDOW=$(if $(BR2_PACKAGE_IVI_HOMESCREEN_DESKTOP_WINDOW_PLUGIN),ON,OFF) \ + -DBUILD_PLUGIN_GO_ROUTER=$(if $(BR2_PACKAGE_IVI_HOMESCREEN_GO_ROUTER_PLUGIN),ON,OFF) \ + -DBUILD_PLUGIN_INTEGRATION_TEST=$(if $(BR2_PACKAGE_IVI_HOMESCREEN_INTEGRATION_TEST_PLUGIN),ON,OFF) \ + -DBUILD_PLUGIN_ISOLATE=$(if $(BR2_PACKAGE_IVI_HOMESCREEN_ISOLATE_PLUGIN),ON,OFF) \ + -DBUILD_PLUGIN_KEYBOARD_MANAGER=$(if $(BR2_PACKAGE_IVI_HOMESCREEN_KEYBOARD_MANAGER_PLUGIN),ON,OFF) \ + -DBUILD_PLUGIN_KEY_EVENT=$(if $(BR2_PACKAGE_IVI_HOMESCREEN_KEY_EVENT_PLUGIN),ON,OFF) \ + -DBUILD_PLUGIN_LAYER_PLAYGROUND=$(if $(BR2_PACKAGE_IVI_HOMESCREEN_LAYER_PLAYGROUND_PLUGIN),ON,OFF) \ + -DBUILD_PLUGIN_LOGGING=$(if $(BR2_PACKAGE_IVI_HOMESCREEN_LOGGING_PLUGIN),ON,OFF) \ + -DBUILD_PLUGIN_MOUSE_CURSOR=$(if $(BR2_PACKAGE_IVI_HOMESCREEN_MOUSE_CURSOR_PLUGIN),ON,OFF) \ + -DBUILD_PLUGIN_PACKAGE_INFO=$(if $(BR2_PACKAGE_IVI_HOMESCREEN_PACKAGE_INFO_PLUGIN),ON,OFF) \ + -DBUILD_PLUGIN_PLATFORM=$(if $(BR2_PACKAGE_IVI_HOMESCREEN_PLATFORM_PLUGIN),ON,OFF) \ + -DBUILD_PLUGIN_PLATFORM_VIEWS=$(if $(BR2_PACKAGE_IVI_HOMESCREEN_PLATFORM_VIEWS_PLUGIN),ON,OFF) \ + -DBUILD_PLUGIN_RESTORATION=$(if $(BR2_PACKAGE_IVI_HOMESCREEN_RESTORATION_PLUGIN),ON,OFF) \ + -DBUILD_PLUGIN_TEXT_INPUT=$(if $(BR2_PACKAGE_IVI_HOMESCREEN_TEXT_INPUT_PLUGIN),ON,OFF) + +# Wayland backend options +ifeq ($(BR2_PACKAGE_HAS_LIBEGL),y) +IVI_HOMESCREEN_DEPENDENCIES += libegl +IVI_HOMESCREEN_CONF_OPTS += -DBUILD_BACKEND_WAYLAND_EGL=ON +else +IVI_HOMESCREEN_CONF_OPTS += -DBUILD_BACKEND_WAYLAND_EGL=OFF +endif + +ifeq ($(BR2_PACKAGE_MESA3D_VULKAN_DRIVER),y) +IVI_HOMESCREEN_DEPENDENCIES += mesa3d +IVI_HOMESCREEN_CONF_OPTS += -DBUILD_BACKEND_WAYLAND_VULKAN=ON +else +IVI_HOMESCREEN_CONF_OPTS += -DBUILD_BACKEND_WAYLAND_VULKAN=OFF +endif + +ifeq ($(BR2_PACKAGE_LIBDRM),y) +IVI_HOMESCREEN_DEPENDENCIES += libdrm +IVI_HOMESCREEN_CONF_OPTS += -DBUILD_BACKEND_WAYLAND_DRM=ON +else +IVI_HOMESCREEN_CONF_OPTS += -DBUILD_BACKEND_WAYLAND_DRM=OFF +endif + +# "plugins with external dependencies" +ifeq ($(BR2_PACKAGE_IVI_HOMESCREEN_AUDIO_PLAYERS),y) +IVI_HOMESCREEN_DEPENDENCIES += gstreamer1 gst1-plugins-base +IVI_HOMESCREEN_CONF_OPTS += -DBUILD_PLUGIN_AUDIO_PLAYERS=ON +else +IVI_HOMESCREEN_CONF_OPTS += -DBUILD_PLUGIN_AUDIO_PLAYERS=OFF +endif + +ifeq ($(BR2_PACKAGE_IVI_HOMESCREEN_FLUTTER_SECURE_STORAGE_PLUGIN),y) +IVI_HOMESCREEN_DEPENDENCIES += libsecret +IVI_HOMESCREEN_CONF_OPTS += -DBUILD_PLUGIN_SECURE_STORAGE=ON +else +IVI_HOMESCREEN_CONF_OPTS += -DBUILD_PLUGIN_SECURE_STORAGE=OFF +endif + +ifeq ($(BR2_PACKAGE_IVI_HOMESCREEN_GOOGLE_SIGN_IN_PLUGIN),y) +IVI_HOMESCREEN_DEPENDENCIES += libcurl +IVI_HOMESCREEN_CONF_OPTS += -DBUILD_PLUGIN_GOOGLE_SIGN_IN=ON +else +IVI_HOMESCREEN_CONF_OPTS += -DBUILD_PLUGIN_GOOGLE_SIGN_IN=OFF +endif + +ifeq ($(BR2_PACKAGE_IVI_HOMESCREEN_GSTREAMER_EGL_PLUGIN),y) +IVI_HOMESCREEN_DEPENDENCIES += ffmpeg gstreamer1 gst1-plugins-base +IVI_HOMESCREEN_CONF_OPTS += -DBUILD_PLUGIN_GSTREAMER_EGL=ON +else +IVI_HOMESCREEN_CONF_OPTS += -DBUILD_PLUGIN_GSTREAMER_EGL=OFF +endif + +ifeq ($(BR2_PACKAGE_IVI_HOMESCREEN_OPENGL_TEXTURE_PLUGIN),y) +IVI_HOMESCREEN_CONF_OPTS += \ + -DBUILD_PLUGIN_OPENGL_TEXTURE=ON \ + -DBUILD_TEXTURE_EGL=ON +else +IVI_HOMESCREEN_CONF_OPTS += \ + -DBUILD_PLUGIN_OPENGL_TEXTURE=OFF \ + -DBUILD_TEXTURE_EGL=OFF +endif + +$(eval $(cmake-package)) From 6fc32c5697c5eb99c7eb4607e39eb192b9f1cf43 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Mon, 24 Apr 2023 10:40:12 +0300 Subject: [PATCH 4598/5754] package/sunxi-mali-utgard: support the wayland driver Add a choice to allow using the Wayland variant of the r6p2 Mali driver. When selected, the package is marked as provider for libgbm as libMali.so includes the symbols and a libgbm.so symlink is installed; and both BR2_PACKAGE_HAS_{LIBGBM,LIBEGL_WAYLAND} are selected accordingly. Signed-off-by: Adrian Perez de Castro Signed-off-by: Thomas Petazzoni --- package/sunxi-mali-utgard/Config.in | 29 +++++++++++++++++++ .../sunxi-mali-utgard/sunxi-mali-utgard.mk | 19 ++++++++++-- 2 files changed, 45 insertions(+), 3 deletions(-) diff --git a/package/sunxi-mali-utgard/Config.in b/package/sunxi-mali-utgard/Config.in index 59ac21f5ab..f70a6f645c 100644 --- a/package/sunxi-mali-utgard/Config.in +++ b/package/sunxi-mali-utgard/Config.in @@ -18,6 +18,9 @@ config BR2_PACKAGE_PROVIDES_LIBEGL config BR2_PACKAGE_PROVIDES_LIBGLES default "sunxi-mali-utgard" +config BR2_PACKAGE_PROVIDES_LIBGBM + default "sunxi-mali-utgard" if BR2_PACKAGE_SUNXI_MALI_UTGARD_WAYLAND + choice prompt "Version" default BR2_PACKAGE_SUNXI_MALI_UTGARD_R6P2 if BR2_PACKAGE_SUNXI_MALI_MAINLINE_R6P2 # legacy @@ -38,6 +41,32 @@ config BR2_PACKAGE_SUNXI_MALI_UTGARD_REVISION default "r6p2" if BR2_PACKAGE_SUNXI_MALI_UTGARD_R6P2 default "r8p1" if BR2_PACKAGE_SUNXI_MALI_UTGARD_R8P1 +choice + prompt "Platform" + default BR2_PACKAGE_SUNXI_MALI_UTGARD_FBDEV + help + Select the target EGL platform. + +config BR2_PACKAGE_SUNXI_MALI_UTGARD_FBDEV + bool "fbdev" + +config BR2_PACKAGE_SUNXI_MALI_UTGARD_WAYLAND + bool "wayland" + depends on BR2_PACKAGE_SUNXI_MALI_UTGARD_R6P2 + select BR2_PACKAGE_HAS_LIBEGL_WAYLAND + select BR2_PACKAGE_HAS_LIBGBM + select BR2_PACKAGE_WAYLAND + +comment "wayland support requires version r6p2" + depends on !BR2_PACKAGE_SUNXI_MALI_UTGARD_R6P2 + +endchoice + +config BR2_PACKAGE_SUNXI_MALI_UTGARD_PLATFORM + string + default "fbdev" if BR2_PACKAGE_SUNXI_MALI_UTGARD_FBDEV + default "wayland" if BR2_PACKAGE_SUNXI_MALI_UTGARD_WAYLAND + endif comment "sunxi-mali-utgard needs an EABIhf glibc toolchain" diff --git a/package/sunxi-mali-utgard/sunxi-mali-utgard.mk b/package/sunxi-mali-utgard/sunxi-mali-utgard.mk index f693667955..cd03ad62f7 100644 --- a/package/sunxi-mali-utgard/sunxi-mali-utgard.mk +++ b/package/sunxi-mali-utgard/sunxi-mali-utgard.mk @@ -14,6 +14,7 @@ SUNXI_MALI_UTGARD_EULA_NO_SPACES = EULA_for_Mali_400MP_AW.pdf SUNXI_MALI_UTGARD_LICENSE_FILES = $(SUNXI_MALI_UTGARD_EULA_NO_SPACES) SUNXI_MALI_UTGARD_REV = $(call qstrip,$(BR2_PACKAGE_SUNXI_MALI_UTGARD_REVISION)) +SUNXI_MALI_UTGARD_PLATFORM = $(call qstrip,$(BR2_PACKAGE_SUNXI_MALI_UTGARD_PLATFORM)) ifeq ($(BR2_arm),y) SUNXI_MALI_UTGARD_ARCH=arm @@ -24,9 +25,9 @@ endif define SUNXI_MALI_UTGARD_INSTALL_STAGING_CMDS mkdir -p $(STAGING_DIR)/usr/lib $(STAGING_DIR)/usr/include - cp -rf $(@D)/$(SUNXI_MALI_UTGARD_REV)/$(SUNXI_MALI_UTGARD_ARCH)/fbdev/*.so* \ + cp -rf $(@D)/$(SUNXI_MALI_UTGARD_REV)/$(SUNXI_MALI_UTGARD_ARCH)/$(SUNXI_MALI_UTGARD_PLATFORM)/*.so* \ $(STAGING_DIR)/usr/lib/ - cp -rf $(@D)/include/fbdev/* $(STAGING_DIR)/usr/include/ + cp -rf $(@D)/include/$(SUNXI_MALI_UTGARD_PLATFORM)/* $(STAGING_DIR)/usr/include/ $(INSTALL) -D -m 0644 package/sunxi-mali-utgard/egl.pc \ $(STAGING_DIR)/usr/lib/pkgconfig/egl.pc @@ -34,9 +35,21 @@ define SUNXI_MALI_UTGARD_INSTALL_STAGING_CMDS $(STAGING_DIR)/usr/lib/pkgconfig/glesv2.pc endef +ifeq ($(BR2_PACKAGE_SUNXI_MALI_UTGARD_WAYLAND),y) +define SUNXI_MALI_UTGARD_INSTALL_FIXUP_STAGING_PC_FILES + sed -e '/^Cflags:/s/$$/ -DWL_EGL_PLATFORM/' \ + -e '/^Requires:/s/$$/ wayland-client wayland-server/' \ + -i $(STAGING_DIR)/usr/lib/pkgconfig/egl.pc + sed -e '/^Requires:/s/$$/ wayland-client wayland-server/' \ + -i $(STAGING_DIR)/usr/lib/pkgconfig/glesv2.pc +endef +SUNXI_MALI_UTGARD_POST_INSTALL_TARGET_HOOKS += SUNXI_MALI_UTGARD_INSTALL_FIXUP_STAGING_PC_FILES +SUNXI_MALI_UTGARD_DEPENDENCIES += wayland +endif + define SUNXI_MALI_UTGARD_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)/usr/lib - cp -rf $(@D)/$(SUNXI_MALI_UTGARD_REV)/$(SUNXI_MALI_UTGARD_ARCH)/fbdev/*.so* \ + cp -rf $(@D)/$(SUNXI_MALI_UTGARD_REV)/$(SUNXI_MALI_UTGARD_ARCH)/$(SUNXI_MALI_UTGARD_PLATFORM)/*.so* \ $(TARGET_DIR)/usr/lib/ endef From 117ece4835182a0be6f4552a805cc0c912af411d Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Wed, 10 Jan 2024 22:12:21 +0100 Subject: [PATCH 4599/5754] package/libtracefs: bump to version 1.8.0 Let's drop local patch thas has been upstreamed but another one to fix linking failure due to meson and Makefile unalignment. Also, now libtracefs samples require pthread, but we don't want samples to be built to save target size and reduce dependencies counot, so let's disable it by setting meson samples variable to false in LIBTRACEFS_CONF_OPTS. Signed-off-by: Giulio Benetti [yann.morin.1998@free.fr: do an actual backport now it's upstreamed] Signed-off-by: Yann E. MORIN --- ...-add-option-to-disable-documentation.patch | 51 ------------------- ...-meson-build-tracefs-mmap-by-default.patch | 34 +++++++++++++ package/libtracefs/libtracefs.hash | 2 +- package/libtracefs/libtracefs.mk | 5 +- 4 files changed, 38 insertions(+), 54 deletions(-) delete mode 100644 package/libtracefs/0001-libtracefs-add-option-to-disable-documentation.patch create mode 100644 package/libtracefs/0001-libtracefs-meson-build-tracefs-mmap-by-default.patch diff --git a/package/libtracefs/0001-libtracefs-add-option-to-disable-documentation.patch b/package/libtracefs/0001-libtracefs-add-option-to-disable-documentation.patch deleted file mode 100644 index 70e7e61310..0000000000 --- a/package/libtracefs/0001-libtracefs-add-option-to-disable-documentation.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 881e23ed774360f93ca81f820d7897bd9bbd6d63 Mon Sep 17 00:00:00 2001 -From: Giulio Benetti -Date: Sat, 30 Sep 2023 22:40:08 +0200 -Subject: [PATCH] libtracefs: add option to disable documentation - -On some Linux environment builder(i.e. Buildroot) host asciidoc is not -provided since by default all man/docs are not installed to target but -meson.build at the moment build ascii and html documentation and -requires asciidoc making the building to fail. So let's add doc option -set to true by default to let the user to override it and not produce -the documentation. - -Upstream: https://patchwork.kernel.org/project/linux-trace-devel/patch/20230930204008.2528607-1-giulio.benetti@benettiengineering.com/ - -Signed-off-by: Giulio Benetti ---- - meson.build | 3 +++ - meson_options.txt | 2 ++ - 2 files changed, 5 insertions(+) - -diff --git a/meson.build b/meson.build -index 9d42d78..f1e492e 100644 ---- a/meson.build -+++ b/meson.build -@@ -39,6 +39,8 @@ if cunit_dep.found() - subdir('utest') - endif - subdir('samples') -+ -+if get_option('doc') - subdir('Documentation') - - custom_target( -@@ -46,3 +48,4 @@ custom_target( - output: 'docs', - depends: [html, man], - command: ['echo']) -+endif -diff --git a/meson_options.txt b/meson_options.txt -index 1d92c28..5533a88 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -14,3 +14,5 @@ option('man-bold-literal', type : 'boolean', value : false, - description : 'enable bold literals') - option('docbook-suppress-sp', type : 'boolean', value : false, - description : 'docbook suppress sp') -+option('doc', type : 'boolean', value: true, -+ description : 'produce documentation') --- -2.34.1 - diff --git a/package/libtracefs/0001-libtracefs-meson-build-tracefs-mmap-by-default.patch b/package/libtracefs/0001-libtracefs-meson-build-tracefs-mmap-by-default.patch new file mode 100644 index 0000000000..4a462aab66 --- /dev/null +++ b/package/libtracefs/0001-libtracefs-meson-build-tracefs-mmap-by-default.patch @@ -0,0 +1,34 @@ +From 7d15d7744d957b1721d8e202bd5095b7c449570f Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Wed, 10 Jan 2024 21:39:25 +0100 +Subject: [PATCH] libtracefs meson: build tracefs-mmap by default + +Accordingly to Makefile let's add tracefs-mmap.c to build, this is needed +for linking by other object files. + +Link: https://lore.kernel.org/linux-trace-devel/20240110203925.266999-1-giulio.benetti@benettiengineering.com + +Signed-off-by: Giulio Benetti +Signed-off-by: Steven Rostedt (Google) +Upstream: https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/commit/?id=7d15d7744d957b1721d8e202bd5095b7c449570f +[yann.morin.1998@free.fr: do an actual backport] +Signed-off-by: Yann E. MORIN +--- + src/meson.build | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/meson.build b/src/meson.build +index 5b76554..f7a98b9 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -11,6 +11,7 @@ sources= [ + 'tracefs-instance.c', + 'tracefs-kprobes.c', + 'tracefs-marker.c', ++ 'tracefs-mmap.c', + 'tracefs-record.c', + 'tracefs-sqlhist.c', + 'tracefs-tools.c', +-- +2.43.0 + diff --git a/package/libtracefs/libtracefs.hash b/package/libtracefs/libtracefs.hash index 040467af08..ebc562eb40 100644 --- a/package/libtracefs/libtracefs.hash +++ b/package/libtracefs/libtracefs.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 411fcbf3434ecbaefa6c2b1bf092266293a672e2d7ee46fdd6b402753cb8bd16 libtracefs-1.7.0.tar.gz +sha256 f92475d5c4cb509983697fb359ee615bef4f08ed8bdc9c690f6118ba68886de0 libtracefs-1.8.0.tar.gz sha256 f6b78c087c3ebdf0f3c13415070dd480a3f35d8fc76f3d02180a407c1c812f79 LICENSES/GPL-2.0 sha256 0b9a4febcdee6de55872501d5c1a8f5d8b0d1650cd4d5351995ceb22e889f8ca LICENSES/LGPL-2.1 diff --git a/package/libtracefs/libtracefs.mk b/package/libtracefs/libtracefs.mk index 1e6e19a234..ed45fcbc50 100644 --- a/package/libtracefs/libtracefs.mk +++ b/package/libtracefs/libtracefs.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBTRACEFS_VERSION = 1.7.0 +LIBTRACEFS_VERSION = 1.8.0 LIBTRACEFS_SITE = https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/snapshot LIBTRACEFS_INSTALL_STAGING = YES LIBTRACEFS_LICENSE = GPL-2.0, LGPL-2.1 @@ -13,6 +13,7 @@ LIBTRACEFS_LICENSE_FILES = LICENSES/GPL-2.0 LICENSES/LGPL-2.1 LIBTRACEFS_DEPENDENCIES = host-bison host-flex host-pkgconf libtraceevent LIBTRACEFS_CONF_OPTS = \ - -Ddoc=false + -Ddoc=false \ + -Dsamples=false $(eval $(meson-package)) From 0ca23b84e51cd9db7c45451a952135f2f79c5bcb Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Wed, 10 Jan 2024 22:12:22 +0100 Subject: [PATCH 4600/5754] package/libtraceevent: bump to version 1.8.2 Signed-off-by: Giulio Benetti Signed-off-by: Yann E. MORIN --- package/libtraceevent/libtraceevent.hash | 2 +- package/libtraceevent/libtraceevent.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libtraceevent/libtraceevent.hash b/package/libtraceevent/libtraceevent.hash index 14dcf54c67..c338491f26 100644 --- a/package/libtraceevent/libtraceevent.hash +++ b/package/libtraceevent/libtraceevent.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 1801f416b317e2ae0430ce964cf22b9ecb9fb5cd9c6c2d1073b29953c3309bca libtraceevent-1.8.1.tar.gz +sha256 919f0c024c7b5059eace52d854d4df00ae7e361a4033e1b4d6fe01d97064a1b9 libtraceevent-1.8.2.tar.gz sha256 f6b78c087c3ebdf0f3c13415070dd480a3f35d8fc76f3d02180a407c1c812f79 LICENSES/GPL-2.0 sha256 0b9a4febcdee6de55872501d5c1a8f5d8b0d1650cd4d5351995ceb22e889f8ca LICENSES/LGPL-2.1 diff --git a/package/libtraceevent/libtraceevent.mk b/package/libtraceevent/libtraceevent.mk index d348fc51f6..da0aa575d7 100644 --- a/package/libtraceevent/libtraceevent.mk +++ b/package/libtraceevent/libtraceevent.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBTRACEEVENT_VERSION = 1.8.1 +LIBTRACEEVENT_VERSION = 1.8.2 LIBTRACEEVENT_SITE = https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/snapshot LIBTRACEEVENT_LICENSE = GPL-2.0, LGPL-2.1 LIBTRACEEVENT_LICENSE_FILES = LICENSES/GPL-2.0 LICENSES/LGPL-2.1 From 9a8371e37db63e7dd14ba6ba524df39ce2d58a2e Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Wed, 10 Jan 2024 22:12:23 +0100 Subject: [PATCH 4601/5754] package/trace-cmd: bump to version 3.2 Signed-off-by: Giulio Benetti Signed-off-by: Yann E. MORIN --- package/trace-cmd/trace-cmd.hash | 2 +- package/trace-cmd/trace-cmd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/trace-cmd/trace-cmd.hash b/package/trace-cmd/trace-cmd.hash index 6edcaf0e1c..30b0c48de6 100644 --- a/package/trace-cmd/trace-cmd.hash +++ b/package/trace-cmd/trace-cmd.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 e496d41e599f8ef3c9a74675da05f86be0d8d48d524f0182c73ab98cd16da0b0 trace-cmd-v3.1.7.tar.gz +sha256 62af2c6062eeb434925921bb5936774b0a0e17a5f86671fa2ea2f40704a080cd trace-cmd-v3.2.tar.gz sha256 b1d04b850c1c7471b0f0896f6c6f0fcfc9f07e2dd183a5f5826af269fe9e88fb COPYING sha256 70f297763149e72306919c924e164f83041d5e512868d4c8c1826c171b3e49f9 COPYING.LIB sha256 f6b78c087c3ebdf0f3c13415070dd480a3f35d8fc76f3d02180a407c1c812f79 LICENSES/GPL-2.0 diff --git a/package/trace-cmd/trace-cmd.mk b/package/trace-cmd/trace-cmd.mk index ab8e9149f7..e02eb79530 100644 --- a/package/trace-cmd/trace-cmd.mk +++ b/package/trace-cmd/trace-cmd.mk @@ -4,7 +4,7 @@ # ################################################################################ -TRACE_CMD_VERSION = 3.1.7 +TRACE_CMD_VERSION = 3.2 TRACE_CMD_SOURCE = trace-cmd-v$(TRACE_CMD_VERSION).tar.gz TRACE_CMD_SITE = \ https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot From 1a2ae469d0c9d548c091f731748e01039dd4f2a4 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Tue, 2 Jan 2024 16:59:23 -0700 Subject: [PATCH 4602/5754] package/Config.in: move flutter-pi flutter-pi was erroneously placed under the "Graphic libraries" section of the menu "Graphic libraries and applications (graphic/text)" menu. However, as flutter-pi is an application that runs graphic applicaitons it is better suited to be placed under the "Graphic applications" section. Signed-off-by: Adam Duskett Signed-off-by: Yann E. MORIN --- package/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/Config.in b/package/Config.in index 0009256298..bf5075fabc 100644 --- a/package/Config.in +++ b/package/Config.in @@ -316,6 +316,7 @@ comment "Graphic applications" source "package/cage/Config.in" source "package/cog/Config.in" source "package/dmenu-wayland/Config.in" + source "package/flutter-pi/Config.in" source "package/foot/Config.in" source "package/fswebcam/Config.in" source "package/ghostscript/Config.in" @@ -351,7 +352,6 @@ comment "Graphic libraries" source "package/fbterm/Config.in" source "package/fbv/Config.in" source "package/flutter-gallery/Config.in" - source "package/flutter-pi/Config.in" source "package/freerdp/Config.in" source "package/graphicsmagick/Config.in" source "package/imagemagick/Config.in" From 75d78e42259e46ca575f4a07879d3e68d2e3a811 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Tue, 2 Jan 2024 16:59:24 -0700 Subject: [PATCH 4603/5754] package/Config.in: move flutter-gallery menu entry flutter-gallery was erroneously placed under the "Graphic libraries" section of the menu "Graphic libraries and applications (graphic/text)" menu. However, as flutter-gallery is a flutter-based graphical user interface (GUI) application, it is better suited to be placed under the "Graphic applications" section. Signed-off-by: Adam Duskett Signed-off-by: Yann E. MORIN --- package/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/Config.in b/package/Config.in index bf5075fabc..5b8b15fa54 100644 --- a/package/Config.in +++ b/package/Config.in @@ -316,6 +316,7 @@ comment "Graphic applications" source "package/cage/Config.in" source "package/cog/Config.in" source "package/dmenu-wayland/Config.in" + source "package/flutter-gallery/Config.in" source "package/flutter-pi/Config.in" source "package/foot/Config.in" source "package/fswebcam/Config.in" @@ -351,7 +352,6 @@ comment "Graphic libraries" source "package/fbset/Config.in" source "package/fbterm/Config.in" source "package/fbv/Config.in" - source "package/flutter-gallery/Config.in" source "package/freerdp/Config.in" source "package/graphicsmagick/Config.in" source "package/imagemagick/Config.in" From 681286564ebd8aeabb52fa353c24f315404a20d8 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Tue, 2 Jan 2024 16:59:25 -0700 Subject: [PATCH 4604/5754] package/flutter-sdk-bin: bump version to 3.16.5 Upstream changed their --{en,dis}able-telemetry option, and replaced it with --{en,dis}able-analytics. A subsequent look at the rest of the file including the logic around the change of the name of the above option provides no other elevant changes that would apply to this package update. Signed-off-by: Adam Duskett Signed-off-by: Yann E. MORIN --- package/flutter-sdk-bin/flutter-sdk-bin.hash | 2 +- package/flutter-sdk-bin/flutter-sdk-bin.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/flutter-sdk-bin/flutter-sdk-bin.hash b/package/flutter-sdk-bin/flutter-sdk-bin.hash index a204de1807..f0a855f2c9 100644 --- a/package/flutter-sdk-bin/flutter-sdk-bin.hash +++ b/package/flutter-sdk-bin/flutter-sdk-bin.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b6bc6f93423488c67110e0fe56523cd2260f3a4c379ed015cd1c7fab66362739 flutter_linux_3.13.9-stable.tar.xz +sha256 57e59fa3a31be7e87b3847cdf782f1323578bbf70a0cd35f3615f01ab429ac29 flutter_linux_3.16.5-stable.tar.xz sha256 a598db94b6290ffbe10b5ecf911057b6a943351c727fdda9e5f2891d68700a20 LICENSE diff --git a/package/flutter-sdk-bin/flutter-sdk-bin.mk b/package/flutter-sdk-bin/flutter-sdk-bin.mk index e8e71b6ab0..a28cf645f3 100644 --- a/package/flutter-sdk-bin/flutter-sdk-bin.mk +++ b/package/flutter-sdk-bin/flutter-sdk-bin.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLUTTER_SDK_BIN_VERSION = 3.13.9 +FLUTTER_SDK_BIN_VERSION = 3.16.5 FLUTTER_SDK_BIN_SITE = https://storage.googleapis.com/flutter_infra_release/releases/stable/linux FLUTTER_SDK_BIN_SOURCE = flutter_linux_$(FLUTTER_SDK_BIN_VERSION)-stable.tar.xz FLUTTER_SDK_BIN_LICENSE = BSD-3-Clause @@ -25,7 +25,7 @@ HOST_FLUTTER_SDK_BIN_ENV = \ HOST_FLUTTER_SDK_BIN_CONF_OPTS = \ --clear-features \ --no-analytics \ - --disable-telemetry \ + --disable-analytics \ --enable-custom-devices \ --enable-linux-desktop \ --no-enable-android \ From 9c954953b40b343d09c075114d5af57bf157f3e3 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Tue, 2 Jan 2024 16:59:26 -0700 Subject: [PATCH 4605/5754] package/flutter-engine: bump version to 3.16.5 Flutter 3.16 includes 1,954 commits and improvements. Flutter 3.16.0 also sets Material 3 as the default visual style for applications. A brief changelog can be found here: https://docs.flutter.dev/release/release-notes/release-notes-3.16.0 A full changelog is provided below, which is provided at the end of the brief changelog page found above: https://github.com/flutter/engine/compare/3.13.0%E2%80%A63.16.0-0.5.pre Signed-off-by: Adam Duskett Signed-off-by: Yann E. MORIN --- package/flutter-engine/flutter-engine.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/flutter-engine/flutter-engine.mk b/package/flutter-engine/flutter-engine.mk index d31d435d79..c3ac144f2a 100644 --- a/package/flutter-engine/flutter-engine.mk +++ b/package/flutter-engine/flutter-engine.mk @@ -21,7 +21,7 @@ # # There is no hash provided, as the gn binary (used for configuration) relies # on the .git directories. As such, a reproducible tarball is not possible. -FLUTTER_ENGINE_VERSION = 3.13.9 +FLUTTER_ENGINE_VERSION = 3.16.5 # There is nothing for Buildroot to download. This is handled by gclient. FLUTTER_ENGINE_SITE = From edfa9ea45ce3c2ddad2c52ab57a8047f4257c76f Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 11 Jan 2024 09:48:54 +0100 Subject: [PATCH 4606/5754] package/udev: move back sgx group from systemd Commit 6d163e12a4784580 (package/udev: move render and sgx to package/systemd) moved the sgx group creation to the systemd package because eudev at that time did not reference it. This changed in eudev 3.1.12 with commit a8ffcd1b985fb4 (rules/50-udev-default.rules: fix issue 160) so move it back to get rid of a warning from udevd: udevd[303]: specified group 'sgx' unknown Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/systemd/systemd.mk | 1 - package/udev/udev.mk | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 4746bda904..d371233cfe 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -639,7 +639,6 @@ endef define SYSTEMD_USERS # udev user groups - - render -1 * - - - DRI rendering nodes - - - sgx -1 * - - - SGX device nodes # systemd user groups - - systemd-journal -1 * - - - Journal $(SYSTEMD_REMOTE_USER) diff --git a/package/udev/udev.mk b/package/udev/udev.mk index d70d13ebb3..21c1a71f5a 100644 --- a/package/udev/udev.mk +++ b/package/udev/udev.mk @@ -8,6 +8,7 @@ define UDEV_USERS - - input -1 * - - - Input device group - - kvm -1 * - - - kvm nodes + - - sgx -1 * - - - SGX device nodes endef $(eval $(virtual-package)) From 9fbd3d85745fdf32dac06355e9c524270ae034bb Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Thu, 11 Jan 2024 11:38:17 +0100 Subject: [PATCH 4607/5754] Revert "support/download: generate even more reproducible tarballs" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit 768f9f80f62c (support/download: generate even more reproducible tarballs) causes non-reproducibility in tarballs we previousy generated, especially the archives for two cargo-vendored packages, ripgrep and sentry-cli. The cause is that those two pakcages eventually vendor a file that has the u+x bit set, but is otehrwise go-x. With 768f9f80f62c, the files are now go+x, so the hash for those generated archives has changed. Besides, that commit was wrong: it did not account for the 'r' bit for go part, leaving some non-reproducibility still unaccounted for. So, to generate really reproducible archives, we would need to fix that read bit as well, and that has the potential to affect all the archives we generated so far. If we wanted to do so, we'd need a way to version all generated archives, like we do for git and svn, but now for all the different CVSes, as well as for all the vendoring post-processes. For 768f9f80f62c, all that was of conern was the working copies of CVSes (i.e. git, svn, cvs...) that we cache in the Buildroot download dir, not the temporary files during post-processing. Indeed, in that latter case, the user has virtually no way to mangle with the mode of the intermediate extract before repack. And we do have a big fat warning that users should not attempt to meddle with the git tree that Buildroot caches. As 768f9f80f62c however demonstrates, is that it took quite a long time between the introduction of the git caching, and the time someone eventually discovered they could meddle in there. This shows that the issue it not actually critical in most setups. Also, the tar manual [0] hints at a better solution to handle reproducibility, which even avoids touching the files on disk which is even nicer: ‘--mode='go+u,go-w'’ Omit irrelevant information about file permissions. If we were to actually handle the mode bit for reproducibility, we'd need to: - introduce archive versioning for all download backends and prost-processing - use the tar officially suggested method So, revert that change, as it was incomplete, was not really fixing much issues, and causes actual issues. This reverts commit 768f9f80f62c1da6e298c680f0f4bfa887f38c78. [0] https://www.gnu.org/software/tar/manual/tar.html#Reproducibility Thanks to Vincent and Arnout for pointing at the tar manual. Reported-by: Antoine Coutant Reported-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN Cc: Vincent Fazio Cc: Arnout Vandecappelle (Essensium/Mind) Tested-by: Romain Naour Signed-off-by: Antoine Coutant --- support/download/helpers | 3 --- 1 file changed, 3 deletions(-) diff --git a/support/download/helpers b/support/download/helpers index 265685eff5..90a7d6c1ec 100755 --- a/support/download/helpers +++ b/support/download/helpers @@ -53,9 +53,6 @@ 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 529b62f261ce01b347759d9516bf0852d968f751 Mon Sep 17 00:00:00 2001 From: Antoine Coutant Date: Thu, 11 Jan 2024 11:38:19 +0100 Subject: [PATCH 4608/5754] package/ripgrep: bump to version 14.1.0 Changelog: https://github.com/BurntSushi/ripgrep/blob/master/CHANGELOG.md The patch has been rebased to ripgrep 14.1.0. Signed-off-by: Antoine Coutant Signed-off-by: Yann E. MORIN --- ...llocator-behind-a-cargo-feature-flag.patch | 52 ++++++++++--------- package/ripgrep/ripgrep.hash | 2 +- package/ripgrep/ripgrep.mk | 6 +-- 3 files changed, 29 insertions(+), 31 deletions(-) diff --git a/package/ripgrep/0001-puts-jemalloc-allocator-behind-a-cargo-feature-flag.patch b/package/ripgrep/0001-puts-jemalloc-allocator-behind-a-cargo-feature-flag.patch index e2ba68f389..e665a6570e 100644 --- a/package/ripgrep/0001-puts-jemalloc-allocator-behind-a-cargo-feature-flag.patch +++ b/package/ripgrep/0001-puts-jemalloc-allocator-behind-a-cargo-feature-flag.patch @@ -1,4 +1,4 @@ -From 68c2a4d7a5d9b46f65121958fdb12d5270bfd1b6 Mon Sep 17 00:00:00 2001 +From 77f850969433b14769ade4281899373f3ebabf86 Mon Sep 17 00:00:00 2001 From: Jonathan Stites Date: Wed, 6 May 2020 12:55:35 +0000 Subject: [PATCH] puts jemalloc allocator behind a cargo feature flag @@ -9,6 +9,8 @@ Moves jemalloc behind a feature for musl builds, where it is not supported by the upstream project, so ripgrep will fail to build. Signed-off-by: Sam Voss +[Antoine: update for 14.1.0] +Signed-off-by: Antoine Coutant --- .github/workflows/ci.yml | 6 ++++++ .github/workflows/release.yml | 8 +++++++- @@ -18,10 +20,10 @@ Signed-off-by: Sam Voss 5 files changed, 35 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml -index ab154ec..aa567d9 100644 +index d21b85a..0c9ecb9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml -@@ -149,6 +149,12 @@ jobs: +@@ -172,6 +172,12 @@ jobs: if: matrix.target != '' run: ${{ env.CARGO }} test --verbose --workspace ${{ env.TARGET_FLAGS }} @@ -31,14 +33,14 @@ index ab154ec..aa567d9 100644 + if: matrix.os == 'nightly-musl' + run: ${{ env.CARGO }} test --verbose --all --features jemalloc ${{ env.TARGET_FLAGS }} + - - name: Test for existence of build artifacts (Windows) - if: matrix.os == 'windows-2019' - shell: bash + - name: Test zsh shell completions (Unix, sans cross) + # We could test this when using Cross, but we'd have to execute the + # 'rg' binary (done in test-complete) with qemu, which is a pain and diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml -index 7cfb6a4..ad6b82d 100644 +index f6ea3d9..ac18129 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml -@@ -133,7 +133,13 @@ jobs: +@@ -171,7 +171,13 @@ jobs: echo "target flag is: ${{ env.TARGET_FLAGS }}" echo "target dir is: ${{ env.TARGET_DIR }}" @@ -50,25 +52,25 @@ index 7cfb6a4..ad6b82d 100644 + + - name: Build release binary (non-linux) + if: matrix.build != 'linux' - run: ${{ env.CARGO }} build --verbose --release --features pcre2 ${{ env.TARGET_FLAGS }} - - - name: Strip release binary (linux and macos) + shell: bash + run: | + ${{ env.CARGO }} build --verbose --release --features pcre2 ${{ env.TARGET_FLAGS }} diff --git a/Cargo.toml b/Cargo.toml -index fb78fcb..0d34b1e 100644 +index da350bc..1a0a48f 100644 --- a/Cargo.toml +++ b/Cargo.toml -@@ -56,8 +56,9 @@ version = "2.33.0" - default-features = false - features = ["suggestions"] +@@ -59,8 +59,9 @@ serde_json = "1.0.23" + termcolor = "1.1.0" + textwrap = { version = "0.16.0", default-features = false } -[target.'cfg(all(target_env = "musl", target_pointer_width = "64"))'.dependencies.jemallocator] +[dependencies.jemallocator] - version = "0.3.0" + version = "0.5.0" +optional = true - [build-dependencies] - lazy_static = "1.1.0" -@@ -75,6 +76,11 @@ walkdir = "2" + [dev-dependencies] + serde = "1.0.77" +@@ -70,6 +71,11 @@ walkdir = "2" [features] simd-accel = ["grep/simd-accel"] pcre2 = ["grep/pcre2"] @@ -81,10 +83,10 @@ index fb78fcb..0d34b1e 100644 [profile.release] debug = 1 diff --git a/README.md b/README.md -index 46938bc..9917b29 100644 +index 0821fab..fdb9fb5 100644 --- a/README.md +++ b/README.md -@@ -406,6 +406,15 @@ build a static executable with MUSL and with PCRE2, then you will need to have +@@ -478,6 +478,15 @@ build a static executable with MUSL and with PCRE2, then you will need to have `musl-gcc` installed, which might be in a separate package from the actual MUSL library, depending on your Linux distribution. @@ -101,10 +103,10 @@ index 46938bc..9917b29 100644 ### Running tests diff --git a/crates/core/main.rs b/crates/core/main.rs -index 47385de..c9dae5a 100644 +index 64f35ce..9aa6663 100644 --- a/crates/core/main.rs +++ b/crates/core/main.rs -@@ -31,7 +31,7 @@ mod subject; +@@ -27,7 +27,7 @@ mod search; // have the fastest version of everything. Its goal is to be small and amenable // to static compilation.) Even though ripgrep isn't particularly allocation // heavy, musl's allocator appears to slow down ripgrep quite a bit. Therefore, @@ -113,7 +115,7 @@ index 47385de..c9dae5a 100644 // // We don't unconditionally use jemalloc because it can be nice to use the // system's default allocator by default. Moreover, jemalloc seems to increase -@@ -39,7 +39,11 @@ mod subject; +@@ -35,7 +35,11 @@ mod search; // // Moreover, we only do this on 64-bit systems since jemalloc doesn't support // i686. @@ -127,5 +129,5 @@ index 47385de..c9dae5a 100644 static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc; -- -2.32.0 +2.25.1 diff --git a/package/ripgrep/ripgrep.hash b/package/ripgrep/ripgrep.hash index 71e74e1bcf..9d5b869a9c 100644 --- a/package/ripgrep/ripgrep.hash +++ b/package/ripgrep/ripgrep.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6f1d4a8b653ce48d59ad777288b1257cbda607db29db19d031b7e622c60526f8 ripgrep-af6b6c543b224d348a8876f0c06245d9ea7929c5.tar.gz +sha256 6dfa5e8346b041749b9d7467efb794fcd15cf5b7d3ccec530940dcb1aa4ab590 ripgrep-14.1.0.tar.gz sha256 0f96a83840e146e43c0ec96a22ec1f392e0680e6c1226e6f3ba87e0740af850f LICENSE-MIT diff --git a/package/ripgrep/ripgrep.mk b/package/ripgrep/ripgrep.mk index d587441cfa..05b8d5c48e 100644 --- a/package/ripgrep/ripgrep.mk +++ b/package/ripgrep/ripgrep.mk @@ -4,11 +4,7 @@ # ################################################################################ -# Same as 13.0.0, we use a Git commit hash because the hash of this -# tarball changed when moving to the cargo-package infrastructure, and -# we can't change the hash of existing tarball. Please switch back to -# a Git tag at the next version bump. -RIPGREP_VERSION = af6b6c543b224d348a8876f0c06245d9ea7929c5 +RIPGREP_VERSION = 14.1.0 RIPGREP_SITE = $(call github,burntsushi,ripgrep,$(RIPGREP_VERSION)) RIPGREP_LICENSE = MIT RIPGREP_LICENSE_FILES = LICENSE-MIT From 24b2ef0c6799c4d8fb1a9de78590c4e48b5470e7 Mon Sep 17 00:00:00 2001 From: Sebastian Weyer Date: Thu, 11 Jan 2024 11:38:18 +0100 Subject: [PATCH 4609/5754] support/testing: test_rust.py: Add test to check correct vendoring Currently the tests TestRust and TestRustBin do check for vendoring by requiring package ripgrep to be built but only if the download directory is already empty, otherwise the existing contents of the download directory will be reused and therefore not be redownloaded. This new test will only verify that the required packages are downloaded and vendored correctly without doing a runtime test. It does so by setting a path to a folder "dl" inside the build directory (output-directory/testname/) and then setting the environment variable BR2_DL_DIR to this path before the build starts. BR2_DL_DIR is not set in the config options because it would be overridden by the user's own environment variable if defined. This code was essentially copied from the file test_gitforge.py which was added in commit 1ca6ab6ace3c1f9edfbfd16b57d1280b3ea2c6f5 We want the package ripgrep to be built since it requires vendoring directly. Additionally we want the package python-cryptography to be built because it has rust dependencies and therefore indirectly also requires vendoring. Signed-off-by: Sebastian Weyer Signed-off-by: Antoine Coutant Signed-off-by: Yann E. MORIN --- support/testing/tests/package/test_rust.py | 42 ++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/support/testing/tests/package/test_rust.py b/support/testing/tests/package/test_rust.py index fb9dd2d916..763125ca20 100644 --- a/support/testing/tests/package/test_rust.py +++ b/support/testing/tests/package/test_rust.py @@ -1,4 +1,5 @@ import os +import shutil import infra.basetest @@ -54,3 +55,44 @@ class TestRust(TestRustBase): def test_run(self): self.login() self.assertRunOk("rg Buildroot /etc/issue") + + +class TestRustVendoring(infra.basetest.BRConfigTest): + config = \ + """ + BR2_arm=y + BR2_cortex_a9=y + BR2_ARM_ENABLE_NEON=y + BR2_ARM_ENABLE_VFP=y + BR2_TOOLCHAIN_EXTERNAL=y + # BR2_TARGET_ROOTFS_TAR is not set + BR2_PACKAGE_HOST_RUSTC=y + BR2_PACKAGE_RIPGREP=y + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_CRYPTOGRAPHY=y + BR2_BACKUP_SITE="" + """ + + def setUp(self): + super(TestRustVendoring, self).setUp() + + def tearDown(self): + self.show_msg("Cleaning up") + if self.b and not self.keepbuilds: + self.b.delete() + + def check_download(self, package): + # store downloaded tarball inside the output dir so the test infra + # cleans it up at the end + dl_dir = os.path.join(self.builddir, "dl") + # enforce we test the download + if os.path.exists(dl_dir): + shutil.rmtree(dl_dir) + env = {"BR2_DL_DIR": dl_dir} + self.b.build(["{}-dirclean".format(package), + "{}-legal-info".format(package)], + env) + + def test_run(self): + self.check_download("ripgrep") + self.check_download("python-cryptography") From 694b0ce218b984db3cad9c45541b0d49c46dfd2a Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Tue, 2 Jan 2024 16:59:27 -0700 Subject: [PATCH 4610/5754] package/flutter-pi: bump version to f34d7bdbda713ba607b9625541ddfa314d9999a0 There are 14 commits between the current version of d62e84 and f34d7b. Some highlights include: - egl_gbm_render_surface: fix initialization of is_locked: - src/egl_gbm_render_surface: properly fallback to surface with no modifier (so we can drop our patch) - user input: store mt positions separately - video player: Transition to READY before NULL - check all malloc returns In addition, commit 6a28738 introduces the charset_converter, which is a platform-side implementation of the charset_converter plugin found here: https://pub.dev/packages/charset_converter As this is a new plugin, disable it; a follow-up commit will add an option to enable it. Signed-off-by: Adam Duskett Signed-off-by: Yann E. MORIN --- ...er_surface-properly-fallback-to-surf.patch | 59 ------------------- package/flutter-pi/flutter-pi.hash | 2 +- package/flutter-pi/flutter-pi.mk | 3 +- 3 files changed, 3 insertions(+), 61 deletions(-) delete mode 100644 package/flutter-pi/0001-src-egl_gbm_render_surface-properly-fallback-to-surf.patch diff --git a/package/flutter-pi/0001-src-egl_gbm_render_surface-properly-fallback-to-surf.patch b/package/flutter-pi/0001-src-egl_gbm_render_surface-properly-fallback-to-surf.patch deleted file mode 100644 index 7a1a49b3d4..0000000000 --- a/package/flutter-pi/0001-src-egl_gbm_render_surface-properly-fallback-to-surf.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 856f9849763535d62ed01b538ba23905875c93f4 Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" -Date: Tue, 26 Sep 2023 20:31:17 +0200 -Subject: [PATCH] src/egl_gbm_render_surface: properly fallback to surface with - no modifier - -In 869fa7fcfbeb, we added a fallback to be able to create an EGL sruface -when the driver do not support modifiers, like the llvmpipe software -renderer (or like some proprietary drivers, like the MALI ones), as -reported in #269 [0]. - -However, in c6537673c9b6, there was a big overhaul of renderer -infrastructure. That commit lost the with-modifiers code path and only -kept the without-modifiers fallback one (i.e. it only kept the call to -gbm_surface_create(), not to gbm_surface_create_with_modifiers()). - -Then in b0d09f5032a4, the with-modifier code path was re-instated, but -in a way that made it exclusive with the without-modifiers one. That is, -the without-modifiers code path was not a fallback to when the other -failed. - -Re-instate the fallback mechanism as intiially implemented. - -[0] https://github.com/ardera/flutter-pi/issues/269 - -Signed-off-by: Yann E. MORIN -Upstream: https://github.com/ardera/flutter-pi/pull/367 ---- - src/egl_gbm_render_surface.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/egl_gbm_render_surface.c b/src/egl_gbm_render_surface.c -index ce9e5e7..8a58667 100644 ---- a/src/egl_gbm_render_surface.c -+++ b/src/egl_gbm_render_surface.c -@@ -146,6 +146,7 @@ static int egl_gbm_render_surface_init( - } - #endif - -+ gbm_surface = NULL; - if (allowed_modifiers != NULL) { - gbm_surface = gbm_surface_create_with_modifiers( - gbm_device, -@@ -158,9 +159,10 @@ static int egl_gbm_render_surface_init( - if (gbm_surface == NULL) { - ok = errno; - LOG_ERROR("Couldn't create GBM surface for rendering. gbm_surface_create_with_modifiers: %s\n", strerror(ok)); -- return ok; -+ LOG_ERROR("Will retry without modifiers\n"); - } -- } else { -+ } -+ if (gbm_surface == NULL) { - gbm_surface = gbm_surface_create( - gbm_device, - size.x, --- -2.25.1 - diff --git a/package/flutter-pi/flutter-pi.hash b/package/flutter-pi/flutter-pi.hash index f7148963a4..6c5371d18a 100644 --- a/package/flutter-pi/flutter-pi.hash +++ b/package/flutter-pi/flutter-pi.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e4af79c8f53c15913f52a83a221f099a2a750d023a0bc4560d0db6f15def79a2 flutter-pi-d62e84350d2869b3ec1dfb1af21bfe234c4b817f-br1.tar.gz +sha256 cf10ca9e26beea036ccf218e6a900de5f1f2000e00c03e7a48898c2a0c99f591 flutter-pi-f34d7bdbda713ba607b9625541ddfa314d9999a0-br1.tar.gz sha256 b34df9d3e1b4e5d1ba70b1740ec74b69f1189b44efd0c96b898b074ef8db1c70 LICENSE diff --git a/package/flutter-pi/flutter-pi.mk b/package/flutter-pi/flutter-pi.mk index 27f140c177..4ec89bdfad 100644 --- a/package/flutter-pi/flutter-pi.mk +++ b/package/flutter-pi/flutter-pi.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLUTTER_PI_VERSION = d62e84350d2869b3ec1dfb1af21bfe234c4b817f +FLUTTER_PI_VERSION = f34d7bdbda713ba607b9625541ddfa314d9999a0 FLUTTER_PI_SITE = https://github.com/ardera/flutter-pi.git FLUTTER_PI_SITE_METHOD = git FLUTTER_PI_LICENSE = MIT @@ -27,6 +27,7 @@ FLUTTER_PI_CONF_OPTS = \ -DENABLE_VULKAN=OFF \ -DFILESYSTEM_LAYOUT=meta-flutter \ -DLINT_EGL_HEADERS=OFF \ + -DBUILD_CHARSET_CONVERTER_PLUGIN=OFF \ -DTRY_BUILD_GSTREAMER_AUDIO_PLAYER_PLUGIN=OFF \ -DTRY_BUILD_GSTREAMER_VIDEO_PLAYER_PLUGIN=OFF \ -DTRY_ENABLE_OPENGL=OFF \ From a3e98b9f2e8ed10ea09722dbbd0c97f52e1b9a6d Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Tue, 2 Jan 2024 16:59:28 -0700 Subject: [PATCH 4611/5754] package/flutter-pi: add an option to enable the charset converter plugin Signed-off-by: Adam Duskett [yann.morin.1998@free.fr: - move plugin description, from commit log, to help text ] Signed-off-by: Yann E. MORIN --- package/flutter-pi/Config.in | 11 +++++++++++ package/flutter-pi/flutter-pi.mk | 7 ++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/package/flutter-pi/Config.in b/package/flutter-pi/Config.in index ecebfad89b..4bbdc3cc77 100644 --- a/package/flutter-pi/Config.in +++ b/package/flutter-pi/Config.in @@ -23,6 +23,17 @@ if BR2_PACKAGE_FLUTTER_PI comment "plugins" +config BR2_PACKAGE_FLUTTER_PI_CHARSET_CONVERTER_PLUGIN + bool "charset converter" + help + Adds platform-side implementation of charset_converter plugin. + + Encode and decode charsets using platform built-in converter. + This plugin saves app package size as you don't need external + charset maps or whole libraries like iconv. + + https://pub.dev/packages/charset_converter + config BR2_PACKAGE_FLUTTER_PI_GSTREAMER_AUDIO_PLAYER_PLUGIN bool "gstreamer audio player" depends on BR2_PACKAGE_HAS_LIBGLES diff --git a/package/flutter-pi/flutter-pi.mk b/package/flutter-pi/flutter-pi.mk index 4ec89bdfad..ab640d704a 100644 --- a/package/flutter-pi/flutter-pi.mk +++ b/package/flutter-pi/flutter-pi.mk @@ -27,7 +27,6 @@ FLUTTER_PI_CONF_OPTS = \ -DENABLE_VULKAN=OFF \ -DFILESYSTEM_LAYOUT=meta-flutter \ -DLINT_EGL_HEADERS=OFF \ - -DBUILD_CHARSET_CONVERTER_PLUGIN=OFF \ -DTRY_BUILD_GSTREAMER_AUDIO_PLAYER_PLUGIN=OFF \ -DTRY_BUILD_GSTREAMER_VIDEO_PLAYER_PLUGIN=OFF \ -DTRY_ENABLE_OPENGL=OFF \ @@ -43,6 +42,12 @@ else FLUTTER_PI_CONF_OPTS += -DLTO=OFF endif +ifeq ($(BR2_PACKAGE_FLUTTER_PI_CHARSET_CONVERTER_PLUGIN),y) +FLUTTER_PI_CONF_OPTS += -DBUILD_CHARSET_CONVERTER_PLUGIN=ON +else +FLUTTER_PI_CONF_OPTS += -DBUILD_CHARSET_CONVERTER_PLUGIN=OFF +endif + ifeq ($(BR2_PACKAGE_FLUTTER_PI_GSTREAMER_AUDIO_PLAYER_PLUGIN),y) FLUTTER_PI_DEPENDENCIES += gstreamer1 gst1-plugins-base FLUTTER_PI_CONF_OPTS += -DBUILD_GSTREAMER_AUDIO_PLAYER_PLUGIN=ON From 15e524a10e4db3c1300464a5793edf9f2f95c7fb Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Tue, 2 Jan 2024 16:59:29 -0700 Subject: [PATCH 4612/5754] package/flutter-engine: Add profile runtime mode selection Buildroot only offers two possible runtime modes for Flutter that are automatically selected based on what the user has selected: - debug if BR2_ENABLE_RUNTIME_DEBUG is enabled. - release if BR2_ENABLE_RUNTIME_DEBUG is not enabled. However, Flutter also offers the profile runtime mode option. From https://docs.flutter.dev/testing/build-modes: ``` "Use profile mode when you want to analyze performance." What is profile mode? Some debugging ability is maintained in profile mode, which is enough to profile your app's performance. Profile mode is turned off on the emulator and simulator because their behavior does not represent actual performance. ``` As Flutter projects can be heavy and consume many resources, it is necessary to allow users developing a Flutter application to profile their application during development. This patch introduces a new choice: FLUTTER_ENGINE_RUNTIME_MODE_PROFILE. If unselected, the global option BR2_ENABLE_RUNTIME_DEBUG continues to determine whether to build Flutter in release or debug mode. This new option may confuse some users who wonder where the release and debug options are, so the help menu section under the FLUTTER_ENGINE_RUNTIME_MODE_PROFILE option explains that the global BR2_ENABLE_RUNTIME_DEBUG option controls the debug and release modes. Signed-off-by: Adam Duskett Signed-off-by: Yann E. MORIN --- package/flutter-engine/Config.in | 25 ++++++++++++++++++++++++ package/flutter-engine/flutter-engine.mk | 4 +++- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/package/flutter-engine/Config.in b/package/flutter-engine/Config.in index 2ec5b90ffd..3c92e40f74 100644 --- a/package/flutter-engine/Config.in +++ b/package/flutter-engine/Config.in @@ -39,6 +39,31 @@ config BR2_PACKAGE_FLUTTER_ENGINE https://github.com/flutter/engine +if BR2_PACKAGE_FLUTTER_ENGINE + +config FLUTTER_ENGINE_RUNTIME_MODE_PROFILE + bool "enable profiling" + help + Some debugging ability is maintained—enough to profile your + apps performance. Profile mode is disabled on the emulator + and simulator, because their behavior is not representative + of real performance. Profile mode is similar to release mode, + with the following differences: + + - Some service extensions, such as the one that enables the + performance overlay, are enabled. + + - Tracing is enabled, and tools supporting source-level + debugging (such as DevTools) can connect to the process. + + If this option is left unselected, the global option + BR2_ENABLE_RUNTIME_DEBUG determines whether to build Flutter + in release or debug mode. + + https://docs.flutter.dev/testing/build-modes#profile + +endif + comment "flutter-engine needs an OpenGL or OpenGLES backend" depends on BR2_PACKAGE_FLUTTER_ENGINE_ARCH_SUPPORTS depends on !BR2_PACKAGE_HAS_LIBGL && !BR2_PACKAGE_HAS_LIBGLES diff --git a/package/flutter-engine/flutter-engine.mk b/package/flutter-engine/flutter-engine.mk index c3ac144f2a..e972612097 100644 --- a/package/flutter-engine/flutter-engine.mk +++ b/package/flutter-engine/flutter-engine.mk @@ -52,7 +52,9 @@ FLUTTER_ENGINE_TARGET_ARCH = x64 FLUTTER_ENGINE_TARGET_TRIPPLE = x86_64-unknown-linux-gnu endif -ifeq ($(BR2_ENABLE_RUNTIME_DEBUG),y) +ifeq ($(FLUTTER_ENGINE_RUNTIME_MODE_PROFILE),y) +FLUTTER_ENGINE_RUNTIME_MODE=profile +else ifeq ($(BR2_ENABLE_RUNTIME_DEBUG),y) FLUTTER_ENGINE_RUNTIME_MODE=debug else FLUTTER_ENGINE_RUNTIME_MODE=release From bb3ede3b36fe8e38b4e3f17696c4b131e3f84b96 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 11 Jan 2024 19:22:25 +0100 Subject: [PATCH 4613/5754] package/criu: disable i386 Building for i386 raises the following build failure since the additon of the package in commit 3e4b479f39c15ffdf307ec8395d856680c727204: Makefile:23: *** "The architecture i386 isn't supported". Stop. Setting ARCH=x86 won't work either as it results in the following build failure: compel/arch/x86/plugins/std/memcpy.S: Assembler messages: compel/arch/x86/plugins/std/memcpy.S:20: Error: bad register name `%rdi' compel/arch/x86/plugins/std/memcpy.S:21: Error: bad register name `%rdx' compel/arch/x86/plugins/std/memcpy.S:22: Error: `shrq' is only supported in 64-bit mode compel/arch/x86/plugins/std/memcpy.S:24: Error: `movsq' is only supported in 64-bit mode compel/arch/x86/plugins/std/syscalls/syscall-common-x86-64.S: Assembler messages: compel/arch/x86/plugins/std/syscalls/syscall-common-x86-64.S:13: Error: bad register name `%rcx' compel/arch/x86/plugins/std/syscalls/syscall-common-x86-64.S:19: Error: bad register name `%rax' Fixes: - http://autobuild.buildroot.org/results/94cc463762b57efacf743d107a8dda7660a995a3 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/criu/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/criu/Config.in b/package/criu/Config.in index ff3bf30229..b3bb830768 100644 --- a/package/criu/Config.in +++ b/package/criu/Config.in @@ -6,7 +6,6 @@ config BR2_PACKAGE_CRIU_ARCH_SUPPORTS default y if BR2_ARM_CPU_ARMV7M default y if BR2_ARM_CPU_ARMV8A default y if BR2_aarch64 - default y if BR2_i386 default y if BR2_mips default y if BR2_x86_64 default y if BR2_powerpc64le # Only support powerpc64 with LE From c07aafa087927ac6f10591bc13e30b7ecd5c7b7f Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 11 Jan 2024 11:56:19 +0100 Subject: [PATCH 4614/5754] package/Makefile.in: set GIT_DIR=. in {HOST, TARGET}_MAKE_ENV A number of packages try to detect if they are running in a git repo and run git describe at build time instead of using the hard coded version number if it succeed, leading to odd version numbers as they end up picking up the Buildroot git version if building inside a Buildroot git checkout, E.G.: rauc --version rauc 2023.11-562-g9c954953b4+ This is because rauc builds with meson and uses vcs_tag: https://github.com/rauc/rauc/blob/v1.11/meson.build#L168-L171 https://mesonbuild.com/Reference-manual_functions.html#vcs_tag Another example is micropython, where we already work around it by passing GIT_DIR=. In the context of Buildroot the packages are never built in their own git checkout, so pass GIT_DIR=. to ensure git doesn't walk back up the directory tree and finds the Buildroot git repo, which fixes the rauc (and similar) issues. >>> rauc 1.11 Building .. ninja: Entering directory `/home/peko/source/buildroot/output-rauc/build/rauc-1.11//build' [1/29] Generating version.h with a custom command fatal: not a git repository: '.' cat output-rauc/build/rauc-1.11/build/version.h #define PACKAGE_STRING "rauc 1.11" #define PACKAGE_VERSION "1.11" Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/Makefile.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package/Makefile.in b/package/Makefile.in index 9fbe960759..3e276d23d6 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -263,7 +263,9 @@ export PERL=$(shell which perl) # finds this perl module by exporting the proper value for PERL5LIB. export PERL5LIB=$(HOST_DIR)/lib/perl -TARGET_MAKE_ENV = PATH=$(BR_PATH) +TARGET_MAKE_ENV = \ + GIT_DIR=. \ + PATH=$(BR_PATH) TARGET_CONFIGURE_OPTS = \ $(TARGET_MAKE_ENV) \ @@ -307,6 +309,7 @@ TARGET_CONFIGURE_OPTS = \ HOST_MAKE_ENV = \ + GIT_DIR=. \ PATH=$(BR_PATH) \ PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \ PKG_CONFIG_SYSROOT_DIR="/" \ From 9024e18665232dc4047203edb6d012021baeedfa Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 11 Jan 2024 11:56:20 +0100 Subject: [PATCH 4615/5754] package/micropython: drop GIT_DIR=. workaround Now that it is handled globally in TARGET_MAKE_ENV. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/micropython/micropython.mk | 5 ----- 1 file changed, 5 deletions(-) diff --git a/package/micropython/micropython.mk b/package/micropython/micropython.mk index e6eb536ea5..3d356c51d8 100644 --- a/package/micropython/micropython.mk +++ b/package/micropython/micropython.mk @@ -14,11 +14,6 @@ MICROPYTHON_LICENSE = MIT, BSD-1-Clause, BSD-3-Clause, Zlib MICROPYTHON_LICENSE_FILES = LICENSE MICROPYTHON_DEPENDENCIES = host-pkgconf libffi host-python3 -# Set GIT_DIR so package won't use buildroot's version number -MICROPYTHON_MAKE_ENV = \ - $(TARGET_MAKE_ENV) \ - GIT_DIR=. - # Use fallback implementation for exception handling on architectures that don't # have explicit support. ifeq ($(BR2_i386)$(BR2_x86_64)$(BR2_arm)$(BR2_armeb),) From 66414ed526ca44b383baa56b706f58747b90ea52 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Tue, 2 Jan 2024 16:59:30 -0700 Subject: [PATCH 4616/5754] package/flutter-sdk-bin: add dart arguments for different runtime modes Now that profile mode is an option for the flutter-engine package, the logic in package/flutter-sdk-bin/flutter-sdk-bin.mk is no longer sufficient. The profile/debug/release logic was inspired by: https://github.com/meta-flutter/meta-flutter/blob/kirkstone/conf/include/ Signed-off-by: Adam Duskett [yann.morin.1998@free.fr: - make FLUTTER_ENGINE_RUNTIME_MODE_PROFILE win over BR2_ENABLE_RUNTIME_DEBUG - don't set variables to empty string ] Signed-off-by: Yann E. MORIN --- package/flutter-sdk-bin/flutter-sdk-bin.mk | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/package/flutter-sdk-bin/flutter-sdk-bin.mk b/package/flutter-sdk-bin/flutter-sdk-bin.mk index a28cf645f3..5e5042bea8 100644 --- a/package/flutter-sdk-bin/flutter-sdk-bin.mk +++ b/package/flutter-sdk-bin/flutter-sdk-bin.mk @@ -54,14 +54,20 @@ define HOST_FLUTTER_SDK_BIN_INSTALL_CMDS cp -rpdT $(@D)/. $(HOST_FLUTTER_SDK_BIN_SDK)/ endef -ifeq ($(BR2_ENABLE_RUNTIME_DEBUG),y) -HOST_FLUTTER_SDK_BIN_SDK_ROOT = \ - $(HOST_FLUTTER_SDK_BIN_SDK_ENGINE)/common/flutter_patched_sdk +ifeq ($(FLUTTER_ENGINE_RUNTIME_MODE_PROFILE),y) +HOST_FLUTTER_SDK_BIN_PROFILE_FLAGS = --track-widget-creation HOST_FLUTTER_SDK_BIN_SDK_PRODUCT = false +HOST_FLUTTER_SDK_BIN_SDK_ROOT = $(HOST_FLUTTER_SDK_BIN_SDK_ENGINE)/common/flutter_patched_sdk +HOST_FLUTTER_SDK_BIN_SDK_VM_PROFILE = true +else ifeq ($(BR2_ENABLE_RUNTIME_DEBUG),y) +HOST_FLUTTER_SDK_BIN_DEBUG_FLAGS = --enable-asserts +HOST_FLUTTER_SDK_BIN_SDK_PRODUCT = false +HOST_FLUTTER_SDK_BIN_SDK_ROOT = $(HOST_FLUTTER_SDK_BIN_SDK_ENGINE)/common/flutter_patched_sdk +HOST_FLUTTER_SDK_BIN_SDK_VM_PROFILE = false else -HOST_FLUTTER_SDK_BIN_SDK_ROOT = \ - $(HOST_FLUTTER_SDK_BIN_SDK_ENGINE)/common/flutter_patched_sdk_product HOST_FLUTTER_SDK_BIN_SDK_PRODUCT = true +HOST_FLUTTER_SDK_BIN_SDK_ROOT = $(HOST_FLUTTER_SDK_BIN_SDK_ENGINE)/common/flutter_patched_sdk_product +HOST_FLUTTER_SDK_BIN_SDK_VM_PROFILE = false endif # The Order matters.Taken from: @@ -73,8 +79,10 @@ HOST_FLUTTER_SDK_BIN_DART_ARGS = \ --sdk-root $(HOST_FLUTTER_SDK_BIN_SDK_ROOT) \ --target=flutter \ --no-print-incremental-dependencies \ - -Ddart.vm.profile=false \ + -Ddart.vm.profile=$(HOST_FLUTTER_SDK_BIN_SDK_VM_PROFILE) \ -Ddart.vm.product=$(HOST_FLUTTER_SDK_BIN_SDK_PRODUCT) \ + $(HOST_FLUTTER_SDK_BIN_DEBUG_FLAGS) \ + $(HOST_FLUTTER_SDK_BIN_PROFILE_FLAGS) \ --aot \ --tfa \ --target-os linux \ From baacbfdb2bdd23789d9f18cedb1c80115de9c0d2 Mon Sep 17 00:00:00 2001 From: Michael Nosthoff Date: Mon, 8 Jan 2024 14:59:44 +0100 Subject: [PATCH 4617/5754] package/catch2: bump to version 3.5.1 Signed-off-by: Michael Nosthoff Signed-off-by: Peter Korsgaard --- 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 d118feadf8..c90973154a 100644 --- a/package/catch2/catch2.hash +++ b/package/catch2/catch2.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 f6d4f8d78a9b59ec72a81d49f58d18eb317372ac07f8d9432710a079e69fd66a catch2-3.5.0.tar.gz +sha256 49c3ca7a68f1c8ec71307736bc6ed14fec21631707e1be9af45daf4037e75a08 catch2-3.5.1.tar.gz sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE.txt diff --git a/package/catch2/catch2.mk b/package/catch2/catch2.mk index 49ac5fff2d..fc4a1d69a9 100644 --- a/package/catch2/catch2.mk +++ b/package/catch2/catch2.mk @@ -4,7 +4,7 @@ # ################################################################################ -CATCH2_VERSION = 3.5.0 +CATCH2_VERSION = 3.5.1 CATCH2_SITE = $(call github,catchorg,Catch2,v$(CATCH2_VERSION)) CATCH2_INSTALL_STAGING = YES CATCH2_INSTALL_TARGET = NO From 069da87a89da7275389065fd4ca9dbfefb453aad Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 13 Jan 2024 17:26:44 +0100 Subject: [PATCH 4618/5754] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.{1, 6}.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 82d46365e7..9f9cf55d96 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.6.10" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.6.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 4207bd6b2f..2b904c298a 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 9ee627e4c109aec7fca3eda5898e81d201af2c7eb2f7d9d7d94c1f0e1205546c linux-6.6.10.tar.xz -sha256 2df774dd53f9ffd4e57ebf804cf597709295df6a304fe261d25220a134b7f041 linux-6.1.71.tar.xz +sha256 afe2e5a661bb886d762684ebea71607d1ee8cb9dd100279d2810ba20d9671e52 linux-6.6.11.tar.xz +sha256 98dce69077c35cffca799dcdbbd32a02242aad6b0950eb931936bb2ef69f0926 linux-6.1.72.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc sha256 5a807a5fa2a80ada957d8079681dfb5cc196ec26f43244d1c8a4fd7af592d192 linux-5.15.146.tar.xz -sha256 c43d613216e6c5197519a4e979de5c1b510100858ff591963931c99e59c7485b linux-5.10.206.tar.xz -sha256 4dae99e49f466d4689e128ec023754908147159d7462019a83c7da1f25df9b15 linux-5.4.265.tar.xz +sha256 86ace9892296bf1534d574894edd27614b68de4085c03fd3f60121751a334f1b linux-5.10.207.tar.xz +sha256 da072f7e6fe719c01e517cac1fa9988b2f5fa87d62a8501b7dc16d3b62b2acb6 linux-5.4.266.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 022dce3935eadec7c31093992cc101c905fd4ffbb8afce92f3e41fdd0fa18b36 linux-4.19.303.tar.xz -sha256 8a1d520cfa71e9faebae9d8c24101f5bffe48fcb897dede4cecad5af67c34a45 linux-4.14.334.tar.xz +sha256 cdc6a5d51aaff7c50bfe4ac4adf5cc3727043a24641145dc268e858db2a4b598 linux-4.19.304.tar.xz +sha256 0820fdb7971c6974338081c11fbf2dc869870501e7bdcac4d0ed58ba1f57b61c linux-4.14.336.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 df760326dc..f4c1cba23e 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -408,13 +408,13 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.14.334" if BR2_KERNEL_HEADERS_4_14 - default "4.19.303" if BR2_KERNEL_HEADERS_4_19 - default "5.4.265" if BR2_KERNEL_HEADERS_5_4 - default "5.10.206" if BR2_KERNEL_HEADERS_5_10 + default "4.14.336" if BR2_KERNEL_HEADERS_4_14 + default "4.19.304" if BR2_KERNEL_HEADERS_4_19 + default "5.4.266" if BR2_KERNEL_HEADERS_5_4 + default "5.10.207" if BR2_KERNEL_HEADERS_5_10 default "5.15.146" if BR2_KERNEL_HEADERS_5_15 - default "6.1.71" if BR2_KERNEL_HEADERS_6_1 - default "6.6.10" if BR2_KERNEL_HEADERS_6_6 + default "6.1.72" if BR2_KERNEL_HEADERS_6_1 + default "6.6.11" 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 a959e1baab92426335325cc6dba3e90c7654ed2d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 13 Jan 2024 17:26:47 +0100 Subject: [PATCH 4619/5754] package/linux-headers: drop 4.14.x option The 4.14.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 | 6 ------ 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 46ae84997e..82387338d9 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2024.02" +config BR2_KERNEL_HEADERS_4_14 + bool "kernel headers version 4.14.x are no longer supported" + select BR2_LEGACY + help + Version 4.14.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + config BR2_PACKAGE_LIBCAMERA_PIPELINE_RASPBERRYPI bool "libcamera pipeline 'raspberrypi' was renamed to 'rpi/vc4'" depends on BR2_arm || BR2_aarch64 diff --git a/linux/linux.hash b/linux/linux.hash index 2b904c298a..27a9d5cd0d 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -7,7 +7,6 @@ sha256 86ace9892296bf1534d574894edd27614b68de4085c03fd3f60121751a334f1b linux- sha256 da072f7e6fe719c01e517cac1fa9988b2f5fa87d62a8501b7dc16d3b62b2acb6 linux-5.4.266.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc sha256 cdc6a5d51aaff7c50bfe4ac4adf5cc3727043a24641145dc268e858db2a4b598 linux-4.19.304.tar.xz -sha256 0820fdb7971c6974338081c11fbf2dc869870501e7bdcac4d0ed58ba1f57b61c linux-4.14.336.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 f4c1cba23e..b6ff605469 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -24,11 +24,6 @@ config BR2_KERNEL_HEADERS_AS_KERNEL depends on BR2_LINUX_KERNEL select BR2_KERNEL_HEADERS_LATEST if BR2_LINUX_KERNEL_LATEST_VERSION -config BR2_KERNEL_HEADERS_4_14 - bool "Linux 4.14.x kernel headers" - depends on !BR2_riscv - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 - config BR2_KERNEL_HEADERS_4_19 bool "Linux 4.19.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 @@ -408,7 +403,6 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.14.336" if BR2_KERNEL_HEADERS_4_14 default "4.19.304" if BR2_KERNEL_HEADERS_4_19 default "5.4.266" if BR2_KERNEL_HEADERS_5_4 default "5.10.207" if BR2_KERNEL_HEADERS_5_10 From 8fba83e5f975c779c26cbb9cdd80e3790088da0d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 13 Jan 2024 17:37:53 +0100 Subject: [PATCH 4620/5754] package/kodi: bump version to 20.3-Nexus Removed patches which are included in this release. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- .../kodi-jsonschemabuilder.mk | 2 +- .../kodi-texturepacker/kodi-texturepacker.mk | 2 +- ...se-AnnouncementFlagToString-when-log.patch | 31 ---------- ...ontrol-use-explicit-cast-to-UTILS-CO.patch | 32 ---------- ...-fmt-enums-format_as-for-explicit-en.patch | 33 ----------- ...er-for-std-atomic-for-explicit-atomi.patch | 37 ------------ ...ypeInfo-add-initialization-of-tp_wat.patch | 59 ------------------- package/kodi/kodi.hash | 2 +- package/kodi/kodi.mk | 2 +- 9 files changed, 4 insertions(+), 196 deletions(-) delete mode 100644 package/kodi/0002-CGUIWindowHome-use-AnnouncementFlagToString-when-log.patch delete mode 100644 package/kodi/0003-CGUIColorButtonControl-use-explicit-cast-to-UTILS-CO.patch delete mode 100644 package/kodi/0004-CLog-allow-using-fmt-enums-format_as-for-explicit-en.patch delete mode 100644 package/kodi/0005-CLog-add-formatter-for-std-atomic-for-explicit-atomi.patch delete mode 100644 package/kodi/0006-PythonBindings-TypeInfo-add-initialization-of-tp_wat.patch diff --git a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk index e017aa8d9c..2ed4961e68 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.2-Nexus +KODI_JSONSCHEMABUILDER_VERSION = 20.3-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 c0bc767dd4..728e25606c 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.2-Nexus +KODI_TEXTUREPACKER_VERSION = 20.3-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-CGUIWindowHome-use-AnnouncementFlagToString-when-log.patch b/package/kodi/0002-CGUIWindowHome-use-AnnouncementFlagToString-when-log.patch deleted file mode 100644 index 3aa41adc86..0000000000 --- a/package/kodi/0002-CGUIWindowHome-use-AnnouncementFlagToString-when-log.patch +++ /dev/null @@ -1,31 +0,0 @@ -From cfbc0ec1b2cf2952fa4a279cf5fc71c15bf56f23 Mon Sep 17 00:00:00 2001 -From: Lukas Rusak -Date: Tue, 27 Jun 2023 11:21:50 -0700 -Subject: [PATCH] CGUIWindowHome: use AnnouncementFlagToString when logging - -Upstream: https://github.com/xbmc/xbmc/commit/3a20f5b67ff32cc3663e0ccd72941e666e8756a4 -Upstream: https://github.com/xbmc/xbmc/pull/23571 - -Signed-off-by: Lukas Rusak -Signed-off-by: Bernd Kuhls ---- - xbmc/windows/GUIWindowHome.cpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/xbmc/windows/GUIWindowHome.cpp b/xbmc/windows/GUIWindowHome.cpp -index c42e073c48..abc6cfc94d 100644 ---- a/xbmc/windows/GUIWindowHome.cpp -+++ b/xbmc/windows/GUIWindowHome.cpp -@@ -78,7 +78,8 @@ void CGUIWindowHome::Announce(ANNOUNCEMENT::AnnouncementFlag flag, - { - int ra_flag = 0; - -- CLog::Log(LOGDEBUG, LOGANNOUNCE, "GOT ANNOUNCEMENT, type: {}, from {}, message {}", flag, sender, message); -+ CLog::Log(LOGDEBUG, LOGANNOUNCE, "GOT ANNOUNCEMENT, type: {}, from {}, message {}", -+ AnnouncementFlagToString(flag), sender, message); - - // we are only interested in library changes - if ((flag & (ANNOUNCEMENT::VideoLibrary | ANNOUNCEMENT::AudioLibrary)) == 0) --- -2.39.2 - diff --git a/package/kodi/0003-CGUIColorButtonControl-use-explicit-cast-to-UTILS-CO.patch b/package/kodi/0003-CGUIColorButtonControl-use-explicit-cast-to-UTILS-CO.patch deleted file mode 100644 index 8ac29dcd20..0000000000 --- a/package/kodi/0003-CGUIColorButtonControl-use-explicit-cast-to-UTILS-CO.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 8b1673044971cae84de7d34015230b9503f292f4 Mon Sep 17 00:00:00 2001 -From: Lukas Rusak -Date: Tue, 27 Jun 2023 11:22:32 -0700 -Subject: [PATCH] CGUIColorButtonControl: use explicit cast to - UTILS::COLOR::Color when formatting - -Upstream: https://github.com/xbmc/xbmc/commit/c82006b575b78efbb3f5aff40a159b90f245ea9d -Upstream: https://github.com/xbmc/xbmc/pull/23571 - -Signed-off-by: Lukas Rusak -Signed-off-by: Bernd Kuhls ---- - xbmc/guilib/GUIColorButtonControl.cpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/xbmc/guilib/GUIColorButtonControl.cpp b/xbmc/guilib/GUIColorButtonControl.cpp -index 940834cb68..67597d7ab5 100644 ---- a/xbmc/guilib/GUIColorButtonControl.cpp -+++ b/xbmc/guilib/GUIColorButtonControl.cpp -@@ -188,7 +188,8 @@ void CGUIColorButtonControl::RenderInfoText() - void CGUIColorButtonControl::ProcessInfoText(unsigned int currentTime) - { - CRect labelRenderRect = m_labelInfo.GetRenderRect(); -- bool changed = m_labelInfo.SetText(StringUtils::Format("#{:08X}", m_imgBoxColor)); -+ bool changed = m_labelInfo.SetText( -+ StringUtils::Format("#{:08X}", static_cast(m_imgBoxColor))); - // Set Label X position based on image mask control position - float textWidth = m_labelInfo.GetTextWidth() + 2 * m_labelInfo.GetLabelInfo().offsetX; - float textPosX = m_imgColorMask->GetXPosition() - textWidth; --- -2.39.2 - diff --git a/package/kodi/0004-CLog-allow-using-fmt-enums-format_as-for-explicit-en.patch b/package/kodi/0004-CLog-allow-using-fmt-enums-format_as-for-explicit-en.patch deleted file mode 100644 index 4e09218361..0000000000 --- a/package/kodi/0004-CLog-allow-using-fmt-enums-format_as-for-explicit-en.patch +++ /dev/null @@ -1,33 +0,0 @@ -From ec1fd134e31b8c667ff06e02e21a75c4c3e87dfd Mon Sep 17 00:00:00 2001 -From: Lukas Rusak -Date: Tue, 27 Jun 2023 11:24:02 -0700 -Subject: [PATCH] CLog: allow using fmt::enums::format_as for explicit enum - conversion when using libfmt>=10 - -Upstream: https://github.com/xbmc/xbmc/commit/e4b1aa8450fabfb41379953c8ccec0a512421531 -Upstream: https://github.com/xbmc/xbmc/pull/23571 - -Signed-off-by: Lukas Rusak -Signed-off-by: Bernd Kuhls ---- - xbmc/utils/log.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/xbmc/utils/log.h b/xbmc/utils/log.h -index 9fc4aae368..adf46905a8 100644 ---- a/xbmc/utils/log.h -+++ b/xbmc/utils/log.h -@@ -46,6 +46,10 @@ class dist_sink; - } // namespace sinks - } // namespace spdlog - -+#if FMT_VERSION >= 100000 -+using fmt::enums::format_as; -+#endif -+ - class CLog : public ISettingsHandler, public ISettingCallback - { - public: --- -2.39.2 - diff --git a/package/kodi/0005-CLog-add-formatter-for-std-atomic-for-explicit-atomi.patch b/package/kodi/0005-CLog-add-formatter-for-std-atomic-for-explicit-atomi.patch deleted file mode 100644 index b87a60f809..0000000000 --- a/package/kodi/0005-CLog-add-formatter-for-std-atomic-for-explicit-atomi.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 46f6d97f46254600bd34f77f335a475178d7aaa5 Mon Sep 17 00:00:00 2001 -From: Lukas Rusak -Date: Tue, 27 Jun 2023 11:24:34 -0700 -Subject: [PATCH] CLog: add formatter for std::atomic for explicit atomic - conversion when using libfmt>=10 - -Upstream: https://github.com/xbmc/xbmc/commit/26c164a28cfd18ceef7a1f2bbba5bf8a4a5a750c -Upstream: https://github.com/xbmc/xbmc/pull/23571 - -Signed-off-by: Lukas Rusak -Signed-off-by: Bernd Kuhls ---- - xbmc/utils/log.h | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/xbmc/utils/log.h b/xbmc/utils/log.h -index adf46905a8..1c42c888cb 100644 ---- a/xbmc/utils/log.h -+++ b/xbmc/utils/log.h -@@ -48,6 +48,14 @@ class dist_sink; - - #if FMT_VERSION >= 100000 - using fmt::enums::format_as; -+ -+namespace fmt -+{ -+template -+struct formatter, Char> : formatter -+{ -+}; -+} // namespace fmt - #endif - - class CLog : public ISettingsHandler, public ISettingCallback --- -2.39.2 - diff --git a/package/kodi/0006-PythonBindings-TypeInfo-add-initialization-of-tp_wat.patch b/package/kodi/0006-PythonBindings-TypeInfo-add-initialization-of-tp_wat.patch deleted file mode 100644 index ed0c340f52..0000000000 --- a/package/kodi/0006-PythonBindings-TypeInfo-add-initialization-of-tp_wat.patch +++ /dev/null @@ -1,59 +0,0 @@ -From cbfee0e6add2b57c6a2a8641a60b4322543f4675 Mon Sep 17 00:00:00 2001 -From: Lukas Rusak -Date: Wed, 12 Jul 2023 19:58:08 -0700 -Subject: [PATCH] PythonBindings: TypeInfo: add initialization of - tp_watched for PyTypeObject - -This member was added in upstream commit https://github.com/python/cpython/commit/82ccbf69a842db25d8117f1c41b47aa5b4ed96ab - -This change first appeared in Python v3.12.0a1 - -Signed-off-by: Lukas Rusak - -Upstream: https://github.com/xbmc/xbmc/commit/2c84ee54a75770e291f38d4ebb2c31c8f2c3b8c5 - -Signed-off-by: Bernd Kuhls ---- - xbmc/interfaces/python/swig.cpp | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/xbmc/interfaces/python/swig.cpp b/xbmc/interfaces/python/swig.cpp -index 5a2599a84ea0f..74baa72ee5c4c 100644 ---- a/xbmc/interfaces/python/swig.cpp -+++ b/xbmc/interfaces/python/swig.cpp -@@ -71,6 +71,9 @@ namespace PythonBindings - #endif - #if PY_VERSION_HEX < 0x03090000 - 0, -+#endif -+#if PY_VERSION_HEX >= 0x030C00A1 -+ 0, - #endif - }; - - -From e3ba40936cc10de05c46d507851568ee3e351f43 Mon Sep 17 00:00:00 2001 -From: Lukas Rusak -Date: Thu, 13 Jul 2023 08:57:38 -0700 -Subject: [PATCH] swig.cpp: add clang-format formatting - -Signed-off-by: Lukas Rusak ---- - xbmc/interfaces/python/swig.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/xbmc/interfaces/python/swig.cpp b/xbmc/interfaces/python/swig.cpp -index 74baa72ee5c4c..0c49f87ca84e1 100644 ---- a/xbmc/interfaces/python/swig.cpp -+++ b/xbmc/interfaces/python/swig.cpp -@@ -18,8 +18,8 @@ namespace PythonBindings - { - TypeInfo::TypeInfo(const std::type_info& ti) : swigType(NULL), parentType(NULL), typeIndex(ti) - { -- static PyTypeObject py_type_object_header = -- { PyVarObject_HEAD_INIT(nullptr, 0) 0, -+ static PyTypeObject py_type_object_header = { -+ PyVarObject_HEAD_INIT(nullptr, 0) 0, - 0, - 0, - 0, diff --git a/package/kodi/kodi.hash b/package/kodi/kodi.hash index 37fbf0c004..81d26f1cb1 100644 --- a/package/kodi/kodi.hash +++ b/package/kodi/kodi.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 4e81abf81172812bc8891f69a7a80a2b846298cecaae7b5009725e28a3040c23 kodi-20.2-Nexus.tar.gz +sha256 1dbf1d9f4d5eeeb6aa2593813703343a8a377e88a00c68226354e4d67467f64d kodi-20.3-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 4fe6ea46cc..97d02e9b92 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.2 +KODI_VERSION_MAJOR = 20.3 KODI_VERSION_NAME = Nexus KODI_VERSION = $(KODI_VERSION_MAJOR)-$(KODI_VERSION_NAME) KODI_SITE = $(call github,xbmc,xbmc,$(KODI_VERSION)) From 38e447edb9b6a893e45f0053bd49303bde52ef57 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 13 Jan 2024 17:44:30 +0100 Subject: [PATCH 4621/5754] package/libdrm: bump version to 2.4.120 Release notes: https://lists.x.org/archives/xorg-announce/2024-January/003441.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- 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 219c2c0712..dd43a89d68 100644 --- a/package/libdrm/libdrm.hash +++ b/package/libdrm/libdrm.hash @@ -1,6 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2023-December/003438.html -sha256 0a49f12f09b5b6e68eaaaff3f02ca7cff9aa926939b212d343161d3e8ac56291 libdrm-2.4.119.tar.xz -sha512 c8dd7665e85c01a67fcce1c1c614bc05a3ec311f31cae7de5fb1cd27d0f11f1801be63de3fa3e33b2f505544fd4b1bc292965c5e8de46a3beaaedb10334945ca libdrm-2.4.119.tar.xz +# From https://lists.x.org/archives/xorg-announce/2024-January/003441.html +sha256 3bf55363f76c7250946441ab51d3a6cc0ae518055c0ff017324ab76cdefb327a libdrm-2.4.120.tar.xz +sha512 6dc16e5134a669eeb59debb1dc2d15b857483ab7476dc2b94bd05a32d8953f046f5656f6cf9e1a63e97e7156fb65ebb58b6a29fe45cb6326058baaf820626e70 libdrm-2.4.120.tar.xz # Hash for license file sha256 d0a616a9020dc0271e36e6dd4bad174b4e2c2a42636f13785f8e18dd5f85fd83 data/meson.build diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk index fd50f4f22e..61d1c24377 100644 --- a/package/libdrm/libdrm.mk +++ b/package/libdrm/libdrm.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBDRM_VERSION = 2.4.119 +LIBDRM_VERSION = 2.4.120 LIBDRM_SOURCE = libdrm-$(LIBDRM_VERSION).tar.xz LIBDRM_SITE = https://dri.freedesktop.org/libdrm LIBDRM_LICENSE = MIT From b034d1127aae5601bccc4b47356a34f86dfa3eb7 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 11 Jan 2024 19:20:52 +0100 Subject: [PATCH 4622/5754] package/{mesa3d, mesa3d-headers}: bump version to 23.3.3 Release notes: https://lists.freedesktop.org/archives/mesa-announce/2024-January/000742.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 8e870ac030..0ca8d07e73 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.3.2 +MESA3D_HEADERS_VERSION = 23.3.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 b6c36f1c55..706911a809 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2023-December/000741.html -sha256 3cfcb81fa16f89c56abe3855d2637d396ee4e03849b659000a6b8e5f57e69adc mesa-23.3.2.tar.xz -sha512 634d2b67ade2121de3f19f2cccd4bf7ceb2ac391b9366587ed1c2412444e010de8ec14a25529fdec1f43f943096422eb23cefcb8a89d2f8b20286850188b65c3 mesa-23.3.2.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2024-January/000742.html +sha256 518307c0057fa3cee8b58df78be431d4df5aafa7edc60d09278b2d7a0a80f3b4 mesa-23.3.3.tar.xz +sha512 bed23e8324b026edd5d2b16a381ec563cf2fa9be9c8fbe8d9fb907cab9d87eef91f493fb9d4e3973d4b679e271d2a85ce48af491585638ab97f087532fc63c30 mesa-23.3.3.tar.xz # License sha256 a00275a53178e2645fb65be99a785c110513446a5071ff2c698ed260ad917d75 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 98fa33febe..99db7d0eb2 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.3.2 +MESA3D_VERSION = 23.3.3 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos From e6af32c08c8d47a71d6f8fa48439f3d87dcef2f6 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 11 Jan 2024 22:25:05 +0100 Subject: [PATCH 4623/5754] package/libkcapi: bump to version 1.5.0 Drop patches (already in version) https://github.com/smuellerDD/libkcapi/releases/tag/v1.5.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- .checkpackageignore | 3 - ...b-kcapi-kernel-if.c-fix-uclibc-build.patch | 55 ------------ .../libkcapi/0002-Add-disable-werror.patch | 46 ---------- ...ver-build-error-on-non-ELF-platforms.patch | 84 ------------------- package/libkcapi/libkcapi.hash | 2 +- package/libkcapi/libkcapi.mk | 2 +- 6 files changed, 2 insertions(+), 190 deletions(-) delete mode 100644 package/libkcapi/0001-lib-kcapi-kernel-if.c-fix-uclibc-build.patch delete mode 100644 package/libkcapi/0002-Add-disable-werror.patch delete mode 100644 package/libkcapi/0003-Fix-symver-build-error-on-non-ELF-platforms.patch diff --git a/.checkpackageignore b/.checkpackageignore index f66f4f9a64..7417e12e93 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -648,9 +648,6 @@ 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 package/libjson/0001-fix-broken-makefile.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 diff --git a/package/libkcapi/0001-lib-kcapi-kernel-if.c-fix-uclibc-build.patch b/package/libkcapi/0001-lib-kcapi-kernel-if.c-fix-uclibc-build.patch deleted file mode 100644 index 818150dafb..0000000000 --- a/package/libkcapi/0001-lib-kcapi-kernel-if.c-fix-uclibc-build.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 4d9bbc866682bdf46c78047dca02230372620295 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 6 Nov 2022 17:05:14 +0100 -Subject: [PATCH] lib/kcapi-kernel-if.c: fix uclibc build - -Fix the following uclibc build failure raised since version 1.4.0 and -https://github.com/smuellerDD/libkcapi/commit/12f19b9a1dd308117f83e8cb33e28e3c040710a0: - -lib/kcapi-kernel-if.c: In function '_kcapi_common_send_meta': -lib/kcapi-kernel-if.c:196:26: error: conversion to 'int' from 'size_t' {aka 'unsigned int'} may change the sign of the result [-Werror=sign-conversion] - 196 | msg.msg_iovlen = kcapi_downcast_int(iovlen); - | ^~~~~~~~~~~~~~~~~~ - -Indeed, uclibc has the same behavior than musl when __WORDSIZE != 32 -even if it defines __GLIBC__: -https://github.com/wbx-github/uclibc-ng/blob/ab1dd83bec59c9e65c31efd6e887182948f627be/libc/sysdeps/linux/common/bits/socket.h - -Fixes: - - http://autobuild.buildroot.org/results/eccf4b84670b5ef0fdd68b46338edf5043c7cc0d - -Signed-off-by: Tan En De -Signed-off-by: Fabrice Fontaine -Signed-off-by: Stephan Mueller -[Retrieved from: -https://github.com/smuellerDD/libkcapi/commit/4d9bbc866682bdf46c78047dca02230372620295] ---- - lib/kcapi-kernel-if.c | 8 ++------ - 1 file changed, 2 insertions(+), 6 deletions(-) - -diff --git a/lib/kcapi-kernel-if.c b/lib/kcapi-kernel-if.c -index d7b10bf..b4d7f74 100644 ---- a/lib/kcapi-kernel-if.c -+++ b/lib/kcapi-kernel-if.c -@@ -119,7 +119,7 @@ int _kcapi_common_accept(struct kcapi_handle *handle) - return 0; - } - --#ifdef __GLIBC__ -+#if defined(__GLIBC__) && !(defined(__UCLIBC__) && __WORDSIZE == 32) - static inline size_t kcapi_downcast_int(size_t in) - { - return in; -@@ -564,11 +564,7 @@ ssize_t _kcapi_common_recv_data(struct kcapi_handle *handle, - msg.msg_controllen = 0; - msg.msg_flags = 0; - msg.msg_iov = iov; --#ifdef __GLIBC__ -- msg.msg_iovlen = iovlen; --#else -- msg.msg_iovlen = (int)iovlen; --#endif -+ msg.msg_iovlen = kcapi_downcast_int(iovlen); - ret = recvmsg(*_kcapi_get_opfd(handle), &msg, 0); - if (ret < 0) - ret = -errno; diff --git a/package/libkcapi/0002-Add-disable-werror.patch b/package/libkcapi/0002-Add-disable-werror.patch deleted file mode 100644 index 4f2f55f145..0000000000 --- a/package/libkcapi/0002-Add-disable-werror.patch +++ /dev/null @@ -1,46 +0,0 @@ -From c27b154f03ad7e94447c7114d73aee60f0098093 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 7 Nov 2022 13:38:06 +0100 -Subject: [PATCH] Add --disable-werror - -Allow the user to disable -Werror through --disable-werror - -Signed-off-by: Fabrice Fontaine -Signed-off-by: Stephan Mueller -[Retrieved from: -https://github.com/smuellerDD/libkcapi/commit/c27b154f03ad7e94447c7114d73aee60f0098093] ---- - Makefile.am | 5 ++++- - configure.ac | 3 +++ - 2 files changed, 7 insertions(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index 1c95d3d..cddedac 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -2,7 +2,10 @@ ACLOCAL_AMFLAGS = -I m4 - AUTOMAKE_OPTIONS = subdir-objects - lib_LTLIBRARIES = libkcapi.la - --COMMON_CPPFLAGS = -Wextra -Wall -pedantic -fwrapv --param ssp-buffer-size=4 -O2 -Werror -std=gnu99 -Wconversion -+COMMON_CPPFLAGS = -Wextra -Wall -pedantic -fwrapv --param ssp-buffer-size=4 -O2 -std=gnu99 -Wconversion -+if ENABLE_WERROR -+COMMON_CPPFLAGS += -Werror -+endif - COMMON_LDFLAGS = -Wl,-z,relro,-z,now - - libtool: $(LIBTOOL_DEPS) -diff --git a/configure.ac b/configure.ac -index cb910e2..e230577 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -76,6 +76,9 @@ AX_ADD_FORTIFY_SOURCE - - AC_CHECK_API_VERSION - -+AC_ARG_ENABLE([werror], [AS_HELP_STRING([--disable-werror], [Disable -Werror])], [with_werror=$enableval], [with_werror=yes]) -+AM_CONDITIONAL([ENABLE_WERROR], [test "x$with_werror" = "xyes"]) -+ - AC_ARG_ENABLE([kcapi-test], [AS_HELP_STRING([--enable-kcapi-test], [Compile kcapi test program])], [with_kcapi_test=$enableval]) - AM_CONDITIONAL([ENABLE_KCAPI_TEST], [test "x$with_kcapi_test" = "xyes"]) - diff --git a/package/libkcapi/0003-Fix-symver-build-error-on-non-ELF-platforms.patch b/package/libkcapi/0003-Fix-symver-build-error-on-non-ELF-platforms.patch deleted file mode 100644 index 206ac7ec4a..0000000000 --- a/package/libkcapi/0003-Fix-symver-build-error-on-non-ELF-platforms.patch +++ /dev/null @@ -1,84 +0,0 @@ -From f630ed1f807e26de04b3a5dfd7f1b39d1c5cb642 Mon Sep 17 00:00:00 2001 -From: Tan En De -Date: Sat, 26 Nov 2022 07:47:39 +0800 -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. -So, revert to using .symver in such case. - -[1]: http://autobuild.buildroot.net/results/447/4470efb5a078c0e368f6bd4f5ec455eea5eeebb5/build-end.log - -Signed-off-by: Tan En De -Signed-off-by: Stephan Mueller ---- -Upstream status: commit f630ed1f807e26de04b3a5dfd7f1b39d1c5cb642 - - configure.ac | 2 ++ - lib/internal.h | 2 +- - m4/ac_check_attribute_symver.m4 | 24 ++++++++++++++++++++++++ - 3 files changed, 27 insertions(+), 1 deletion(-) - create mode 100644 m4/ac_check_attribute_symver.m4 - -diff --git a/configure.ac b/configure.ac -index e230577..ba17404 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -76,6 +76,8 @@ AX_ADD_FORTIFY_SOURCE - - AC_CHECK_API_VERSION - -+AC_CHECK_ATTRIBUTE_SYMVER -+ - AC_ARG_ENABLE([werror], [AS_HELP_STRING([--disable-werror], [Disable -Werror])], [with_werror=$enableval], [with_werror=yes]) - AM_CONDITIONAL([ENABLE_WERROR], [test "x$with_werror" = "xyes"]) - -diff --git a/lib/internal.h b/lib/internal.h -index 14844a9..7977b04 100644 ---- a/lib/internal.h -+++ b/lib/internal.h -@@ -352,7 +352,7 @@ static inline int io_getevents(__attribute__((unused)) aio_context_t ctx, - * Auxiliary macros - ************************************************************/ - --#if __GNUC__ >= 10 -+#if HAVE_ATTRIBUTE_SYMVER && __GNUC__ >= 10 - # define IMPL_SYMVER(name, version) \ - __attribute__((__symver__("kcapi_" #name "@@LIBKCAPI_" version))) - -diff --git a/m4/ac_check_attribute_symver.m4 b/m4/ac_check_attribute_symver.m4 -new file mode 100644 -index 0000000..b484c5e ---- /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.34.1 - diff --git a/package/libkcapi/libkcapi.hash b/package/libkcapi/libkcapi.hash index d858086408..691ef0977a 100644 --- a/package/libkcapi/libkcapi.hash +++ b/package/libkcapi/libkcapi.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 644b47593b3f27f08add7a8808ccdbe569a2f331d70fb8b52551e57379b917fa libkcapi-1.4.0.tar.xz +sha256 15b550c14165a266fa233b485d029d54508da593dfa6d1731ec5d5a285c716e9 libkcapi-1.5.0.tar.xz sha256 9765fad61726afb2b253db2c68153672e4178d6809667ae98141f3e90fe8645b COPYING sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING.gplv2 sha256 13aa749a5b0a454917a944ed8fffc530b784f5ead522b1aacaf4ec8aa55a6239 COPYING.bsd diff --git a/package/libkcapi/libkcapi.mk b/package/libkcapi/libkcapi.mk index c6251c286c..11462d6e2a 100644 --- a/package/libkcapi/libkcapi.mk +++ b/package/libkcapi/libkcapi.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBKCAPI_VERSION = 1.4.0 +LIBKCAPI_VERSION = 1.5.0 LIBKCAPI_SOURCE = libkcapi-$(LIBKCAPI_VERSION).tar.xz LIBKCAPI_SITE = http://www.chronox.de/libkcapi LIBKCAPI_AUTORECONF = YES From 1e3d206f154915ec86d7750bf7f846b6da412a1a Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 11 Jan 2024 22:30:40 +0100 Subject: [PATCH 4624/5754] package/wireshark: security bump to version 4.0.12 - GVCP dissector crash. CVE-2024-0208. - IEEE 1609.2 dissector crash. CVE-2024-0209. https://www.wireshark.org/security/wnpa-sec-2024-01 https://www.wireshark.org/security/wnpa-sec-2024-02 https://www.wireshark.org/docs/relnotes/wireshark-4.0.12 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 a6ef69b1af..6610eb7781 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.11.txt -sha1 4af3140d69f9d41e1c4e161fad66304a6920ddce wireshark-4.0.11.tar.xz -sha256 4c341cc33a6c512d983f4126e6f3e5c249f604e14ab7f337d38b1cbe58199e3d wireshark-4.0.11.tar.xz +# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-4.0.12.txt +sha1 e00d90769995bf786b05c05bdd9a2c6c8e372e70 wireshark-4.0.12.tar.xz +sha256 e4e3d618ba11e159fb163f0dc4716a8b72a065aafd1111db9405332552a5a115 wireshark-4.0.12.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index 6fb4b60f2b..3759f9bf94 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRESHARK_VERSION = 4.0.11 +WIRESHARK_VERSION = 4.0.12 WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.xz WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions WIRESHARK_LICENSE = wireshark license From 329672f94a8807dc8e35bcfd4cc411eb21f22144 Mon Sep 17 00:00:00 2001 From: Marcin Niestroj Date: Fri, 12 Jan 2024 20:39:58 +0100 Subject: [PATCH 4625/5754] configs/orangepi_zero3: bump ARM Trusted Firmware to 2.10 Signed-off-by: Marcin Niestroj Tested-by: Sergey Kuzminov Signed-off-by: Peter Korsgaard --- configs/orangepi_zero3_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/orangepi_zero3_defconfig b/configs/orangepi_zero3_defconfig index 51a6efd3ed..f4fbf86812 100644 --- a/configs/orangepi_zero3_defconfig +++ b/configs/orangepi_zero3_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.9" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.10" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_h616" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y From 8e75e40f7a499e4c7b1f608bddc83a2c9e4ab2b3 Mon Sep 17 00:00:00 2001 From: Marcin Niestroj Date: Fri, 12 Jan 2024 20:39:59 +0100 Subject: [PATCH 4626/5754] configs/orangepi_zero3: use upstream U-Boot and Linux There is now support in both upstream U-Boot and upstream Linux. Signed-off-by: Marcin Niestroj Tested-by: Sergey Kuzminov Signed-off-by: Peter Korsgaard --- board/orangepi/orangepi-zero3/linux.config | 1 - configs/orangepi_zero3_defconfig | 17 ++++++++--------- 2 files changed, 8 insertions(+), 10 deletions(-) delete mode 100644 board/orangepi/orangepi-zero3/linux.config diff --git a/board/orangepi/orangepi-zero3/linux.config b/board/orangepi/orangepi-zero3/linux.config deleted file mode 100644 index 09b7a93a5a..0000000000 --- a/board/orangepi/orangepi-zero3/linux.config +++ /dev/null @@ -1 +0,0 @@ -CONFIG_MFD_AC200=y diff --git a/configs/orangepi_zero3_defconfig b/configs/orangepi_zero3_defconfig index f4fbf86812..93d53dc301 100644 --- a/configs/orangepi_zero3_defconfig +++ b/configs/orangepi_zero3_defconfig @@ -2,7 +2,7 @@ BR2_aarch64=y BR2_cortex_a53=y BR2_ARM_FPU_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_7=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y BR2_SYSTEM_DHCP="eth0" @@ -16,8 +16,8 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y # Bootloader 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,orangepi-xunlong,u-boot-orangepi,6fe17fac388aad17490cf386578b7532975e567f)/u-boot-orangepi-6fe17fac388aad17490cf386578b7532975e567f.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero3" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y @@ -30,21 +30,20 @@ BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="SCP=/dev/null" # Kernel BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,orangepi-xunlong,linux-orangepi,3495b5ee0594566c9fed930b96b1cae90600412e)/linux-orangepi-3495b5ee0594566c9fed930b96b1cae90600412e.tar.gz" -BR2_LINUX_KERNEL_DEFCONFIG="linux_sunxi64" +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.7" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h616-orangepi-zero3" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h618-orangepi-zero3" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero3/linux.config" # Filesystem BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi Zero3" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_SIZE="180M" +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set # host tools From 4267375218e211148b16bca3b4decb45a5ed9fcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Wed, 3 Jan 2024 07:33:01 +0100 Subject: [PATCH 4627/5754] configs/broadcom_northstar_defconfig: specify kernel & headers versions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Even though Northstart platform support is well upstreamed it may always happen that some kernel change affects/breaks something. It's a good practice to specify fixed versions for kernel & Linux headers. Signed-off-by: Rafał Miłecki Signed-off-by: Peter Korsgaard --- configs/broadcom_northstar_defconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configs/broadcom_northstar_defconfig b/configs/broadcom_northstar_defconfig index 9ae716726d..bbd368ac79 100644 --- a/configs/broadcom_northstar_defconfig +++ b/configs/broadcom_northstar_defconfig @@ -1,7 +1,10 @@ BR2_arm=y BR2_cortex_a9=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/broadcom/northstar/post-image.sh" BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.9" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/broadcom/northstar/linux.config" BR2_LINUX_KERNEL_APPENDED_ZIMAGE=y From 4e8c88382dc92f2b52a16e46b324dc9999e2e9dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Wed, 3 Jan 2024 07:32:53 +0100 Subject: [PATCH 4628/5754] board/broadcom/northstar: fix building custom images MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Custom Northstar images allow installing (flashing) them using vendor UI or CFE bootloader. The change of DTS files paths ("broadcom/" prefix introduction in Linux 6.5+) prevented post script from generating them. Adjust post-image.sh to deal with new paths. Signed-off-by: Rafał Miłecki Signed-off-by: Peter Korsgaard --- board/broadcom/northstar/post-image.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/board/broadcom/northstar/post-image.sh b/board/broadcom/northstar/post-image.sh index b6150fc539..559ed8bf4b 100755 --- a/board/broadcom/northstar/post-image.sh +++ b/board/broadcom/northstar/post-image.sh @@ -27,8 +27,9 @@ build_trx() { rm -f $images/zImage.$device.lzma } -devices="$(sed -n 's/^BR2_LINUX_KERNEL_INTREE_DTS_NAME="\([a-z0-9 \-]*\)"$/\1/p' ${BR2_CONFIG})" +devices="$(sed -n 's/^BR2_LINUX_KERNEL_INTREE_DTS_NAME="\([^"]*\)"$/\1/p' ${BR2_CONFIG})" for device in $devices; do + device="${device#broadcom/}" case "$device" in "bcm4708-smartrg-sr400ac") build_trx "$1" "$device" From 2b6358d4daffd5188b58322598c866ebfadd6304 Mon Sep 17 00:00:00 2001 From: Michael Nosthoff Date: Sun, 7 Jan 2024 10:39:55 +0100 Subject: [PATCH 4629/5754] package/fmt: bump to version 10.2.1 - fixes an ABI break introduced in 10.2.0 Signed-off-by: Michael Nosthoff Signed-off-by: Peter Korsgaard --- 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 f9928820ce..5d46b3fe3b 100644 --- a/package/fmt/fmt.hash +++ b/package/fmt/fmt.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8a942861a94f8461a280f823041cde8f620a6d8b0e0aacc98c15bb5a9dd92399 fmt-10.2.0.zip +sha256 312151a2d13c8327f5c9c586ac6cf7cddc1658e8f53edae0ec56509c8fa516c9 fmt-10.2.1.zip sha256 07580f2a3b35709ce703d523f447b242f6dfec7582a8c0df102c7fa2849375f8 LICENSE diff --git a/package/fmt/fmt.mk b/package/fmt/fmt.mk index 2512657727..335efa7edf 100644 --- a/package/fmt/fmt.mk +++ b/package/fmt/fmt.mk @@ -4,7 +4,7 @@ # ################################################################################ -FMT_VERSION = 10.2.0 +FMT_VERSION = 10.2.1 FMT_SITE = https://github.com/fmtlib/fmt/releases/download/$(FMT_VERSION) FMT_SOURCE = fmt-$(FMT_VERSION).zip FMT_LICENSE = MIT with exception From 52f8db409fade387f0f90940c0b32acb27317017 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 10 Jan 2024 21:51:53 +0100 Subject: [PATCH 4630/5754] package/pipewire: fix webrtc-audio-processing condition The condition checking whether the webrtc-audio-processing package is enabled, added in commit 3ccd3b4c384e98703841b12f7309362957f8f17d ("package/pipewire: bump to version 0.3.32") is obviously incorrect, and can never be true. Fix the condition to use the correct variable instead. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/pipewire/pipewire.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pipewire/pipewire.mk b/package/pipewire/pipewire.mk index 628c69ff8a..f0f3cd847c 100644 --- a/package/pipewire/pipewire.mk +++ b/package/pipewire/pipewire.mk @@ -225,7 +225,7 @@ else PIPEWIRE_CONF_OPTS += -Dcompress-offload=disabled endif -ifeq ($(WEBRTC_AUDIO_PROCESSING),y) +ifeq ($(BR2_PACKAGE_WEBRTC_AUDIO_PROCESSING),y) PIPEWIRE_CONF_OPTS += -Decho-cancel-webrtc=enabled PIPEWIRE_DEPENDENCIES += webrtc-audio-processing else From e3518dd952d20d64bc9cd24ebf025b4e7b575baf Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 10 Jan 2024 23:02:32 +0100 Subject: [PATCH 4631/5754] package/libuev: security bump to version 2.4.1 - Fix #27: possible buffer overrun in uev_run() - Update hash of LICENSE file (update in year with https://github.com/troglobit/libuev/commit/0f5909615439d2a3d6a9b44f5a7570e071b90448) https://github.com/troglobit/libuev/blob/v2.4.1/ChangeLog.md Signed-off-by: Fabrice Fontaine Signed-off-by: Joachim Wiberg Signed-off-by: Peter Korsgaard --- package/libuev/libuev.hash | 6 +++--- package/libuev/libuev.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libuev/libuev.hash b/package/libuev/libuev.hash index e5c9660a02..1b5a9fa721 100644 --- a/package/libuev/libuev.hash +++ b/package/libuev/libuev.hash @@ -1,4 +1,4 @@ -# From https://github.com/troglobit/libuev/releases/download/v2.4.0/libuev-2.4.0.tar.xz.sha256 -sha256 31f1aa4f492ba4f6a5dd6b19968ae6a732968dc05cae6575930560b6cee1f5ef libuev-2.4.0.tar.xz +# From https://github.com/troglobit/libuev/releases/download/v2.4.1/libuev-2.4.1.tar.xz.sha256 +sha256 1d171c572ca48ddd6763f76c54e77d021d4ca7beb007610f7c1fec903511977b libuev-2.4.1.tar.xz # License files -sha256 694a734d9c1b46ae203314ed1c744a1acebd4fe5fc964b761703772546f0d3ab LICENSE +sha256 387d0d8e2aabf187751c8f1ebb9a4abaecaa7e0e05fead27f408193a0f0f17dd LICENSE diff --git a/package/libuev/libuev.mk b/package/libuev/libuev.mk index a32381dcc5..432c362401 100644 --- a/package/libuev/libuev.mk +++ b/package/libuev/libuev.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUEV_VERSION = 2.4.0 +LIBUEV_VERSION = 2.4.1 LIBUEV_SOURCE = libuev-$(LIBUEV_VERSION).tar.xz LIBUEV_SITE = https://github.com/troglobit/libuev/releases/download/v$(LIBUEV_VERSION) LIBUEV_LICENSE = MIT From 146cd5abb260a0be41a773ba4a33b32ca83f1e35 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 10 Jan 2024 23:03:53 +0100 Subject: [PATCH 4632/5754] package/libminiupnpc: bump to version 2.2.6 https://github.com/miniupnp/miniupnp/blob/miniupnpc_2_2_6/miniupnpc/Changelog.txt Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libminiupnpc/libminiupnpc.hash | 2 +- package/libminiupnpc/libminiupnpc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libminiupnpc/libminiupnpc.hash b/package/libminiupnpc/libminiupnpc.hash index db6b01f0c9..21dac02dd3 100644 --- a/package/libminiupnpc/libminiupnpc.hash +++ b/package/libminiupnpc/libminiupnpc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 38acd5f4602f7cf8bcdc1ec30b2d58db2e9912e5d9f5350dd99b06bfdffb517c miniupnpc-2.2.5.tar.gz +sha256 37fcd91953508c3e62d6964bb8ffbc5d47f3e13481fa54e6214fcc68704c66f1 miniupnpc-2.2.6.tar.gz sha256 e143c6e207d0bb874c4be76b57689ffa408063a37a735c6dcec3dc600cb522c5 LICENSE diff --git a/package/libminiupnpc/libminiupnpc.mk b/package/libminiupnpc/libminiupnpc.mk index 59b593cb36..dddbe6f81b 100644 --- a/package/libminiupnpc/libminiupnpc.mk +++ b/package/libminiupnpc/libminiupnpc.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMINIUPNPC_VERSION = 2.2.5 +LIBMINIUPNPC_VERSION = 2.2.6 LIBMINIUPNPC_SOURCE = miniupnpc-$(LIBMINIUPNPC_VERSION).tar.gz LIBMINIUPNPC_SITE = http://miniupnp.free.fr/files LIBMINIUPNPC_INSTALL_STAGING = YES From 0e09a4ad71db519dc94701f1e1de4ab0b46348f4 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 10 Jan 2024 22:51:51 +0100 Subject: [PATCH 4633/5754] package/ibm-sw-tpm2: fix openssl build Fix the following build failure raised since bump of openssl to version 3.2.0 in commit 973b1eba5a4ee72f040bd471b147267e36be73ad: In file included from BnValues.h:327, from Global.h:80, from Tpm.h:78, from ACTCommands.c:62: TpmToOsslMath.h:83:5: error: #error Untested OpenSSL version 83 | # error Untested OpenSSL version | ^~~~~ Fixes: - http://autobuild.buildroot.org/results/f22867e71dca64d4ab5fee4db39fe9b1899f4b85 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- .../0002-Add-support-for-OpenSSL-3-2-x.patch | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 package/ibm-sw-tpm2/0002-Add-support-for-OpenSSL-3-2-x.patch diff --git a/package/ibm-sw-tpm2/0002-Add-support-for-OpenSSL-3-2-x.patch b/package/ibm-sw-tpm2/0002-Add-support-for-OpenSSL-3-2-x.patch new file mode 100644 index 0000000000..6732efce8c --- /dev/null +++ b/package/ibm-sw-tpm2/0002-Add-support-for-OpenSSL-3-2-x.patch @@ -0,0 +1,28 @@ +From beea0f97b3c95ec69f3e269df1af87eb2cdd3c46 Mon Sep 17 00:00:00 2001 +From: Otto Hollmann +Date: Tue, 12 Dec 2023 13:58:32 +0100 +Subject: [PATCH] Add support for OpenSSL 3.2.x + +Upstream: https://github.com/kgoldman/ibmswtpm2/pull/13 +Signed-off-by: Fabrice Fontaine +--- + src/TpmToOsslMath.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/TpmToOsslMath.h b/src/TpmToOsslMath.h +index 0b18191..1271937 100644 +--- a/src/TpmToOsslMath.h ++++ b/src/TpmToOsslMath.h +@@ -76,10 +76,10 @@ + * As of release 3.0.0, OPENSSL_VERSION_NUMBER is a combination of the + * major (M), minor (NN) and patch (PP) version into a single integer 0xMNN00PP0L + */ +-#if OPENSSL_VERSION_NUMBER > 0x30100ff0L ++#if OPENSSL_VERSION_NUMBER > 0x30200ff0L + // Check the bignum_st definition in crypto/bn/bn_lcl.h or crypto/bn/bn_local.h and either update + // the version check or provide the new definition for this version. +-// Currently safe for all 3.1.x ++// Currently safe for all 3.2.x + # error Untested OpenSSL version + #elif OPENSSL_VERSION_NUMBER >= 0x10100000L + // from crypto/bn/bn_lcl.h From f5f839af621c56aae464ae0beb6f61747001ff2e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 10 Jan 2024 22:58:02 +0100 Subject: [PATCH 4634/5754] package/lensfun: bump to version 0.3.4 https://github.com/lensfun/lensfun/releases/tag/v0.3.4 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/lensfun/lensfun.hash | 2 +- package/lensfun/lensfun.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lensfun/lensfun.hash b/package/lensfun/lensfun.hash index f03d0b54ae..5cb4fe37cd 100644 --- a/package/lensfun/lensfun.hash +++ b/package/lensfun/lensfun.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 57ba5a0377f24948972339e18be946af12eda22b7c707eb0ddd26586370f6765 lensfun-0.3.3.tar.gz +sha256 dafb39c08ef24a0e2abd00d05d7341b1bf1f0c38bfcd5a4c69cf5f0ecb6db112 lensfun-0.3.4.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 docs/gpl-3.0.txt sha256 a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c docs/lgpl-3.0.txt diff --git a/package/lensfun/lensfun.mk b/package/lensfun/lensfun.mk index f82ed44495..59f008ce6d 100644 --- a/package/lensfun/lensfun.mk +++ b/package/lensfun/lensfun.mk @@ -4,7 +4,7 @@ # ################################################################################ -LENSFUN_VERSION = 0.3.3 +LENSFUN_VERSION = 0.3.4 LENSFUN_SITE = $(call github,lensfun,lensfun,v$(LENSFUN_VERSION)) LENSFUN_LICENSE = LGPL-3.0+ (libraries), GPL-3.0+ (programs) LENSFUN_LICENSE_FILES = docs/gpl-3.0.txt docs/lgpl-3.0.txt From 300717f0e2b5f1ec4434d30aa1c6a2b2da5da3a7 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 2 Jan 2024 14:25:57 +0100 Subject: [PATCH 4635/5754] package/asterisk: bump to 20.5.2 Tested on a Raspberry PI4 with a SNOM 360 and a SIP Trunk to Easybell. Attention: chan_sip is deprecated, use chan_pjsip instead. For chan_pjsip you need to enable openssl otherwise the module will not load. Patches 0005 and 0006 are applied upstream. Remove unused configure options: --without-curses --without-isdnnet --without-misdn --without-nbs --without-oss --without-sqlite --without-suppserv --without-termcap --without-tinfo --without-vpb Signed-off-by: Waldemar Brodkorb Signed-off-by: Peter Korsgaard --- .checkpackageignore | 2 - DEVELOPERS | 1 + ...tection-of-re-entrant-resolver-funct.patch | 38 ------------------- ...n-iostream.c-fix-build-with-libressl.patch | 38 ------------------- package/asterisk/asterisk.hash | 2 +- package/asterisk/asterisk.mk | 18 ++------- 6 files changed, 6 insertions(+), 93 deletions(-) delete mode 100644 package/asterisk/0005-configure-fix-detection-of-re-entrant-resolver-funct.patch delete mode 100644 package/asterisk/0006-main-iostream.c-fix-build-with-libressl.patch diff --git a/.checkpackageignore b/.checkpackageignore index 7417e12e93..bbbf35c102 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -159,8 +159,6 @@ 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/0001-Makefile.in-fix-make-install-for-non-root-don-t-stri.patch Upstream package/at/S99at Indent Variables package/attr/0001-build-with-older-GCCs.patch Upstream diff --git a/DEVELOPERS b/DEVELOPERS index 94a89c63d5..f5b04937b6 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -3108,6 +3108,7 @@ N: Wade Berrier F: package/ngrep/ N: Waldemar Brodkorb +F: package/asterisk/ F: package/mksh/ F: package/ruby/ F: package/uclibc/ diff --git a/package/asterisk/0005-configure-fix-detection-of-re-entrant-resolver-funct.patch b/package/asterisk/0005-configure-fix-detection-of-re-entrant-resolver-funct.patch deleted file mode 100644 index bee8fdbb1b..0000000000 --- a/package/asterisk/0005-configure-fix-detection-of-re-entrant-resolver-funct.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 9b4070944578336506cd0a76de6f733c72d0ca74 Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" -Date: Sat, 13 Oct 2018 11:11:15 +0200 -Subject: [PATCH] configure: fix detection of re-entrant resolver functions - -Fixes https://issues.asterisk.org/jira/browse/ASTERISK-21795 - -uClibc does not provide res_nsearch: -asterisk-16.0.0/main/dns.c:506: undefined reference to `res_nsearch' - -Patch coded by Yann E. MORIN: -http://lists.busybox.net/pipermail/buildroot/2018-October/232630.html - -Signed-off-by: Bernd Kuhls ---- - configure.ac | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index dd0c8edd13..ee1ca9ceb6 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1388,7 +1388,11 @@ AC_LINK_IFELSE( - #include - #endif - #include ], -- [int foo = res_ninit(NULL);])], -+ [ -+ int foo; -+ foo = res_ninit(NULL); -+ foo = res_nsearch(NULL, NULL, 0, 0, NULL, 0); -+ ])], - AC_MSG_RESULT(yes) - AC_DEFINE([HAVE_RES_NINIT], 1, [Define to 1 if your system has the re-entrant resolver functions.]) - AC_SEARCH_LIBS(res_9_ndestroy, resolv) --- -2.19.1 - diff --git a/package/asterisk/0006-main-iostream.c-fix-build-with-libressl.patch b/package/asterisk/0006-main-iostream.c-fix-build-with-libressl.patch deleted file mode 100644 index cdd3aa8cfb..0000000000 --- a/package/asterisk/0006-main-iostream.c-fix-build-with-libressl.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 9569fa20fec49f530170a3042afb99556cf66a2e Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 17 Apr 2022 10:52:42 +0200 -Subject: [PATCH] main/iostream.c: fix build with libressl - -Fix the following build failure with libressl by using SSL_is_server -which is available since version 2.7.0 and -https://github.com/libressl-portable/openbsd/commit/d7ec516916c5eaac29b02d7a8ac6570f63b458f7: - -iostream.c: In function 'ast_iostream_close': -iostream.c:559:41: error: invalid use of incomplete typedef 'SSL' {aka 'struct ssl_st'} - 559 | if (!stream->ssl->server) { - | ^~ - -Fixes: - - http://autobuild.buildroot.org/results/ce4d62d00bb77ba5b303cacf6be7e350581a62f9 - -Signed-off-by: Fabrice Fontaine ---- - main/iostream.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/main/iostream.c b/main/iostream.c -index d060b6d6d4..b8ab80ec91 100644 ---- a/main/iostream.c -+++ b/main/iostream.c -@@ -553,7 +553,7 @@ int ast_iostream_close(struct ast_iostream *stream) - ERR_error_string(sslerr, err), ssl_error_to_string(sslerr, res)); - } - --#if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10100000L) -+#if !(defined(LIBRESSL_VERSION_NUMBER) && (LIBRESSL_VERSION_NUMBER < 0x2070000L)) && (OPENSSL_VERSION_NUMBER >= 0x10100000L) - if (!SSL_is_server(stream->ssl)) { - #else - if (!stream->ssl->server) { --- -2.35.1 - diff --git a/package/asterisk/asterisk.hash b/package/asterisk/asterisk.hash index 41e1da2962..246f4219aa 100644 --- a/package/asterisk/asterisk.hash +++ b/package/asterisk/asterisk.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 ef1ddc07dc02bb0c5f5ba58a5e42e42bcb63e55ac94199be8e3b5d3910f43736 asterisk-16.30.1.tar.gz +sha256 9def260ac8745a5eac7aceabe1c22f84a283b7812f0eccd760f87ce9eb991d22 asterisk-20.5.2.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 4f1a80ba8b..d1f3ea82d3 100644 --- a/package/asterisk/asterisk.mk +++ b/package/asterisk/asterisk.mk @@ -4,7 +4,7 @@ # ################################################################################ -ASTERISK_VERSION = 16.30.1 +ASTERISK_VERSION = 20.5.2 # 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)) @@ -25,7 +25,7 @@ ASTERISK_CPE_ID_VENDOR = asterisk ASTERISK_CPE_ID_PRODUCT = open_source ASTERISK_SELINUX_MODULES = asterisk -# For patches 0002, 0003 and 0005 +# For patches 0002 and 0003 ASTERISK_AUTORECONF = YES ASTERISK_AUTORECONF_OPTS = -Iautoconf -Ithird-party -Ithird-party/pjproject -Ithird-party/jansson @@ -56,7 +56,6 @@ ASTERISK_CONF_OPTS = \ --without-bfd \ --without-cap \ --without-cpg \ - --without-curses \ --without-gtk2 \ --without-gmime \ --without-hoard \ @@ -65,37 +64,26 @@ ASTERISK_CONF_OPTS = \ --without-imap \ --without-inotify \ --without-iodbc \ - --without-isdnnet \ --without-jack \ --without-uriparser \ --without-kqueue \ --without-libedit \ --without-libxslt \ --without-lua \ - --without-misdn \ --without-mysqlclient \ - --without-nbs \ --without-neon29 \ --without-newt \ --without-openr2 \ --without-osptk \ - --without-oss \ --without-postgres \ - --without-pjproject \ - --without-pjproject-bundled \ --without-popt \ --without-resample \ --without-sdl \ --without-SDL_image \ - --without-sqlite \ - --without-suppserv \ --without-tds \ - --without-termcap \ --without-timerfd \ - --without-tinfo \ --without-unbound \ --without-unixodbc \ - --without-vpb \ --without-x11 \ --with-crypt \ --with-jansson \ @@ -103,6 +91,8 @@ ASTERISK_CONF_OPTS = \ --with-ilbc \ --with-libxml2 \ --with-libedit="$(STAGING_DIR)/usr" \ + --with-pjproject \ + --with-pjproject-bundled \ --with-sqlite3="$(STAGING_DIR)/usr" \ --with-sounds-cache=$(ASTERISK_DL_DIR) From 083b03aec676534f0170cc2c599e936fd778faf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fl=C3=A1vio=20Tapaj=C3=B3s?= Date: Wed, 10 Jan 2024 12:22:45 -0300 Subject: [PATCH 4636/5754] boot/uboot: bump to 2024.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit All in-tree configs with the uboot bootloader use a custom version, so this patch is mostly for the menuconfig default uboot version Signed-off-by: Flávio Tapajós Signed-off-by: Peter Korsgaard --- boot/uboot/Config.in | 4 ++-- boot/uboot/uboot.hash | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index 21f19db890..beafb38930 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -41,7 +41,7 @@ choice Select the specific U-Boot version you want to use config BR2_TARGET_UBOOT_LATEST_VERSION - bool "2022.04" + bool "2024.01" config BR2_TARGET_UBOOT_CUSTOM_VERSION bool "Custom version" @@ -85,7 +85,7 @@ endif config BR2_TARGET_UBOOT_VERSION string - default "2022.04" if BR2_TARGET_UBOOT_LATEST_VERSION + default "2024.01" if BR2_TARGET_UBOOT_LATEST_VERSION default BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE \ if BR2_TARGET_UBOOT_CUSTOM_VERSION default "custom" if BR2_TARGET_UBOOT_CUSTOM_TARBALL diff --git a/boot/uboot/uboot.hash b/boot/uboot/uboot.hash index a8bd817900..fbe5d21540 100644 --- a/boot/uboot/uboot.hash +++ b/boot/uboot/uboot.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 68e065413926778e276ec3abd28bb32fa82abaa4a6898d570c1f48fbdb08bcd0 u-boot-2022.04.tar.bz2 +sha256 b99611f1ed237bf3541bdc8434b68c96a6e05967061f992443cb30aabebef5b3 u-boot-2024.01.tar.bz2 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Licenses/gpl-2.0.txt From 17c386fca2c529e1adf087a96b391a3619bd02c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fl=C3=A1vio=20Tapaj=C3=B3s?= Date: Wed, 10 Jan 2024 12:22:46 -0300 Subject: [PATCH 4637/5754] configs/asus_tinker-s_rk3288: bump U-boot to 2024.01 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Flávio Tapajós Signed-off-by: Peter Korsgaard --- configs/asus_tinker-s_rk3288_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/asus_tinker-s_rk3288_defconfig b/configs/asus_tinker-s_rk3288_defconfig index ad2ccec9f9..fc1b3b3505 100644 --- a/configs/asus_tinker-s_rk3288_defconfig +++ b/configs/asus_tinker-s_rk3288_defconfig @@ -10,7 +10,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=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.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="tinker-s-rk3288" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y From e8edf25ac86615b701378eef1d937cd1f3df9a47 Mon Sep 17 00:00:00 2001 From: Christian Hitz Date: Wed, 10 Jan 2024 18:14:54 +0100 Subject: [PATCH 4638/5754] package/duktape: add DUKTAPE_CPE_ID_VENDOR cpe:2.3:a:duktape_project:duktape:2.7.0:*:*:*:*:*:*:* is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/DEAF95D7-0DAB-4025-8C5A-9CCF80D75CF2 Signed-off-by: Christian Hitz Signed-off-by: Peter Korsgaard --- package/duktape/duktape.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/duktape/duktape.mk b/package/duktape/duktape.mk index 674c5e9323..9b5fb65f06 100644 --- a/package/duktape/duktape.mk +++ b/package/duktape/duktape.mk @@ -11,6 +11,7 @@ DUKTAPE_SITE = \ DUKTAPE_LICENSE = MIT DUKTAPE_LICENSE_FILES = LICENSE.txt DUKTAPE_INSTALL_STAGING = YES +DUKTAPE_CPE_ID_VENDOR = duktape_project define DUKTAPE_BUILD_CMDS $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) -f Makefile.sharedlibrary From 0d615aa138036ccf3fbba8351c5123a9d825ae37 Mon Sep 17 00:00:00 2001 From: Christian Hitz Date: Wed, 10 Jan 2024 18:17:54 +0100 Subject: [PATCH 4639/5754] package/libaio: add LIBAIO_CPE_ID_VENDOR cpe:2.3:a:libaio_project:libaio:-:*:*:*:*:*:*:*is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/69B8039E-7837-4DE3-8DFE-C2E4D834EE78 Signed-off-by: Christian Hitz Signed-off-by: Peter Korsgaard --- package/libaio/libaio.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libaio/libaio.mk b/package/libaio/libaio.mk index e13e49346b..12cfbc4ef4 100644 --- a/package/libaio/libaio.mk +++ b/package/libaio/libaio.mk @@ -9,6 +9,7 @@ LIBAIO_SITE = https://releases.pagure.org/libaio LIBAIO_INSTALL_STAGING = YES LIBAIO_LICENSE = LGPL-2.1+ LIBAIO_LICENSE_FILES = COPYING +LIBAIO_CPE_ID_VENDOR = libaio_project LIBAIO_CONFIGURE_OPTS = $(TARGET_CONFIGURE_OPTS) From f79658fbb5337fbe6cf8f735d5e1a851c7e28ad3 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 9 Jan 2024 12:07:20 -0700 Subject: [PATCH 4640/5754] package/zbar: bump to version 0.23.93 Drop patch which is now upstream. Signed-off-by: James Hilliard [Peter: drop patch from .checkpackageignore] Signed-off-by: Peter Korsgaard --- .checkpackageignore | 1 - ...ython-enum-fix-build-for-Python-3.11.patch | 62 ------------------- package/zbar/zbar.hash | 2 +- package/zbar/zbar.mk | 2 +- 4 files changed, 2 insertions(+), 65 deletions(-) delete mode 100644 package/zbar/0001-python-enum-fix-build-for-Python-3.11.patch diff --git a/.checkpackageignore b/.checkpackageignore index bbbf35c102..020caa754d 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1465,7 +1465,6 @@ package/ympd/0001-only-c-language.patch Upstream package/ympd/0002-added-forward-declarations.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/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 diff --git a/package/zbar/0001-python-enum-fix-build-for-Python-3.11.patch b/package/zbar/0001-python-enum-fix-build-for-Python-3.11.patch deleted file mode 100644 index f525b62184..0000000000 --- a/package/zbar/0001-python-enum-fix-build-for-Python-3.11.patch +++ /dev/null @@ -1,62 +0,0 @@ -From fbaec4b4e6fe735efe6916fe5b92805a0d96bf8a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= - -Date: Wed, 21 Sep 2022 10:32:11 +0700 -Subject: [PATCH] python: enum: fix build for Python 3.11 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Python 3.9 introduced Py_SET_SIZE function to set size instead of -relying on Py_SIZE() as a macro [3.9]. - -Python 3.10 started to encourage to use Py_SET_SIZE instead of -assigning into return value of Py_SIZE [3.10]. - -Python 3.11 flips the switch, turn Py_SIZE into a function [3.11], -thus Py_SIZE(obj) will be a rvalue. We need to use Py_SET_SIZE -to set size now. - -[3.9]: https://docs.python.org/3.9/c-api/structures.html#c.Py_SET_SIZE -[3.10]: https://docs.python.org/3.10/c-api/structures.html#c.Py_SIZE -[3.11]: https://docs.python.org/3.11/c-api/structures.html#c.Py_SIZE - -Signed-off-by: Đoàn Trần Công Danh -Signed-off-by: James Hilliard -[Upstream status: -https://github.com/mchehab/zbar/pull/231] ---- - python/enum.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/python/enum.c b/python/enum.c -index dfe1b1e..946344f 100644 ---- a/python/enum.c -+++ b/python/enum.c -@@ -52,7 +52,11 @@ enumitem_new (PyTypeObject *type, - - /* we assume the "fast path" for a single-digit ints (see longobject.c) */ - /* this also holds if we get a small_int preallocated long */ -+#if PY_VERSION_HEX >= 0x03090000 -+ Py_SET_SIZE(&self->val, Py_SIZE(longval)); -+#else - Py_SIZE(&self->val) = Py_SIZE(longval); -+#endif - self->val.ob_digit[0] = longval->ob_digit[0]; - Py_DECREF(longval); - #else -@@ -143,7 +147,11 @@ zbarEnumItem_New (PyObject *byname, - - /* we assume the "fast path" for a single-digit ints (see longobject.c) */ - /* this also holds if we get a small_int preallocated long */ -+#if PY_VERSION_HEX >= 0x03090000 -+ Py_SET_SIZE(&self->val, Py_SIZE(longval)); -+#else - Py_SIZE(&self->val) = Py_SIZE(longval); -+#endif - self->val.ob_digit[0] = longval->ob_digit[0]; - Py_DECREF(longval); - --- -2.34.1 - diff --git a/package/zbar/zbar.hash b/package/zbar/zbar.hash index a4303266db..0136b1d1f3 100644 --- a/package/zbar/zbar.hash +++ b/package/zbar/zbar.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 9152c8fb302b3891e1cb9cc719883d2f4ccd2483e3430783a2cf2d93bd5901ad zbar-0.23.90.tar.bz2 +sha256 83be8f85fc7c288fd91f98d52fc55db7eedbddcf10a83d9221d7034636683fa0 zbar-0.23.93.tar.bz2 sha256 44260f9252c7fe38ba8dfb645330504f4a375e3a5e9dd7d5d6b9f04adb4952f1 LICENSE.md diff --git a/package/zbar/zbar.mk b/package/zbar/zbar.mk index 2c933929cf..1a1e4eb24b 100644 --- a/package/zbar/zbar.mk +++ b/package/zbar/zbar.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZBAR_VERSION = 0.23.90 +ZBAR_VERSION = 0.23.93 ZBAR_SOURCE = zbar-$(ZBAR_VERSION).tar.bz2 ZBAR_SITE = https://www.linuxtv.org/downloads/zbar ZBAR_LICENSE = LGPL-2.1+ From 974e74f673a9db4a66f2eb992efc7b74bc0086af Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 9 Jan 2024 21:03:50 +0100 Subject: [PATCH 4641/5754] package/onevpl-intel-gpu: bump version to 24.1.1 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 38d788a86d..d1e671f96a 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 c61a6866f4ea3c8378330e98cc3e03586c8059061c2642ee69ed8f91df41e939 onevpl-intel-gpu-23.4.3.tar.gz +sha256 e0bd388c04740dd9f2e8ca989bc54428c13a531ed4c097d00f06aa6e58a6d15c onevpl-intel-gpu-24.1.1.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 da6da2ad61..52fbe2ed9b 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.4.3 +ONEVPL_INTEL_GPU_VERSION = 24.1.1 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 ff32619d5722d4d5d5ee75dbc4b82adbf2e37f6a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 9 Jan 2024 21:03:51 +0100 Subject: [PATCH 4642/5754] package/intel-mediadriver: bump version to 24.1.1 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 b021d05301..feade4974c 100644 --- a/package/intel-mediadriver/intel-mediadriver.hash +++ b/package/intel-mediadriver/intel-mediadriver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 83b95eefe86c9d58d92c2a77793541ea3cb643dff419599ffa87899fd58738cd intel-media-23.4.3.tar.gz +sha256 da90f3c38176936f6315bb4b0f04f6f83080f9a6a228294538aa6befe9ce20e0 intel-media-24.1.1.tar.gz sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md diff --git a/package/intel-mediadriver/intel-mediadriver.mk b/package/intel-mediadriver/intel-mediadriver.mk index c9989f9380..f526de193c 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.4.3 +INTEL_MEDIADRIVER_VERSION = 24.1.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 460859677b5fdede488c29d8269ac93415254593 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Tue, 9 Jan 2024 21:32:56 +0100 Subject: [PATCH 4643/5754] package/opencsd: bump to version 1.4.2 For change log, see: https://github.com/Linaro/OpenCSD/blob/v1.4.2/README.md?plain=1#L299 Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- 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 a3534976b5..3314792822 100644 --- a/package/opencsd/opencsd.hash +++ b/package/opencsd/opencsd.hash @@ -1,3 +1,3 @@ # Locally Computed: -sha256 159a611535fd7d3bf179bcbdab3791852c6e7199401a6e59cdeef3ba2072edc4 opencsd-1.4.1.tar.gz +sha256 b41d1a37dc4d4979ff3f5dc9206557e76fcc26c7d5e11e8df2000494d527aba1 opencsd-1.4.2.tar.gz sha256 980eef4b0744e63834e3ec0d50c2a4ff6d81d7ec62dd8ba8c66acae0ec5a2e88 LICENSE diff --git a/package/opencsd/opencsd.mk b/package/opencsd/opencsd.mk index 76135bf0b0..bbc70b082f 100644 --- a/package/opencsd/opencsd.mk +++ b/package/opencsd/opencsd.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENCSD_VERSION = 1.4.1 +OPENCSD_VERSION = 1.4.2 OPENCSD_SITE = $(call github,Linaro,OpenCSD,v$(OPENCSD_VERSION)) OPENCSD_LICENSE = BSD-3-Clause OPENCSD_LICENSE_FILES = LICENSE From 3865d88423c18f28f74efd9878a386db9491246f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 11 Jan 2024 20:40:21 +0100 Subject: [PATCH 4644/5754] package/criu: disable mips mips raises the following build failure since the addition of the package in commit 3e4b479f39c15ffdf307ec8395d856680c727204: compel/arch/mips/plugins/std/memcpy.S:7: Error: opcode not supported on this processor: mips32 (mips32) `dadd $2,$0,$4' compel/arch/mips/plugins/std/memcpy.S:8: Error: opcode not supported on this processor: mips32 (mips32) `daddiu $13,$0,0' Indeed, dadd and daddiu are specific to mips64 Building on mips64 doesn't work either as it raises the following build failure: /tmp/ccArXSfi.s:305: Error: opcode not supported on this processor: mips64 (mips64) `rdhwr $2,$29' Fixes: - http://autobuild.buildroot.org/results/b0341d0654e66bdac2c91d5949be3810a961d9da - http://autobuild.buildroot.org/results/b7b8860476de04980bd8c7241d3dd5a01a0251c8 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/criu/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/criu/Config.in b/package/criu/Config.in index b3bb830768..fc0da823b3 100644 --- a/package/criu/Config.in +++ b/package/criu/Config.in @@ -6,7 +6,6 @@ config BR2_PACKAGE_CRIU_ARCH_SUPPORTS default y if BR2_ARM_CPU_ARMV7M default y if BR2_ARM_CPU_ARMV8A default y if BR2_aarch64 - default y if BR2_mips default y if BR2_x86_64 default y if BR2_powerpc64le # Only support powerpc64 with LE # CRIU has "some" support for s390 but it is not included due to From ff8186657cdb0b4d4fd8c8b7cee45fa14fa4490c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= Date: Tue, 2 Jan 2024 15:50:27 +0100 Subject: [PATCH 4645/5754] package/linux-firmware: add rtw89 firmware files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add files for rtw89 driver and extend help text for rtw88 option a bit. Signed-off-by: Jan Čermák Signed-off-by: Yann E. MORIN --- package/linux-firmware/Config.in | 8 +++++++- package/linux-firmware/linux-firmware.mk | 7 +++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in index 5befe50122..1221a80984 100644 --- a/package/linux-firmware/Config.in +++ b/package/linux-firmware/Config.in @@ -422,7 +422,13 @@ config BR2_PACKAGE_LINUX_FIRMWARE_RTL_RTW88 bool "Realtek rtw88" help Firmware images supported by Realtek's wireless - driver rtw88. + driver rtw88 (802.11n/ac chipsets). + +config BR2_PACKAGE_LINUX_FIRMWARE_RTL_RTW89 + bool "Realtek rtw89" + help + Firmware images supported by Realtek's wireless + driver rtw89 (802.11ax chipsets). config BR2_PACKAGE_LINUX_FIRMWARE_REDPINE_RS9113 bool "Redpine rs9113" diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index 96905dd909..d061c9f402 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -171,6 +171,13 @@ LINUX_FIRMWARE_FILES += \ LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.rtlwifi_firmware.txt endif +# rtw89 +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_RTL_RTW89),y) +LINUX_FIRMWARE_FILES += \ + rtw89/rtw*.bin +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.rtlwifi_firmware.txt +endif + # ar3011 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_AR3011),y) LINUX_FIRMWARE_FILES += ath3k-1.fw From ae794be9cd1ff762e5f89c6e9d857297ee703ff4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= Date: Tue, 2 Jan 2024 15:50:28 +0100 Subject: [PATCH 4646/5754] package/linux-firmware: add WiFi and BT firmware for MT7921 and MT7922 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Although similar in name, they use different kernel driver (with the exception of common Bluetooth driver, but the firmware file is quite large anyway, so it's worth having the possibility to be specific). Signed-off-by: Jan Čermák [yann.morin.1998@free.fr: - add hash for license file - reorder alphabeticlly ] Signed-off-by: Yann E. MORIN --- package/linux-firmware/Config.in | 20 +++++++++++++++++ package/linux-firmware/linux-firmware.hash | 1 + package/linux-firmware/linux-firmware.mk | 26 ++++++++++++++++++++++ 3 files changed, 47 insertions(+) diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in index 1221a80984..47b765831c 100644 --- a/package/linux-firmware/Config.in +++ b/package/linux-firmware/Config.in @@ -64,6 +64,16 @@ config BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7650 help Firmware files for MediaTek MT7650 bluetooth support +config BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7921_BT + bool "MediaTek MT7921" + help + Firmware files for MediaTek MT7921 bluetooth support + +config BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7922_BT + bool "MediaTek MT7922" + help + Firmware files for MediaTek MT7922 bluetooth support + config BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_6174A_BT bool "Qualcomm Atheros Rome 6174A Bluetooth" help @@ -383,6 +393,16 @@ config BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT76X2E help MediaTek MT76x2e +config BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7921 + bool "MediaTek MT7921" + help + MediaTek MT7921 + +config BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7922 + bool "MediaTek MT7922" + help + MediaTek MT7922 + config BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_6174 bool "Qualcomm Atheros 6174" help diff --git a/package/linux-firmware/linux-firmware.hash b/package/linux-firmware/linux-firmware.hash index 6722aa14c6..67b03dc1b4 100644 --- a/package/linux-firmware/linux-firmware.hash +++ b/package/linux-firmware/linux-firmware.hash @@ -18,6 +18,7 @@ sha256 8c45a83562a69f7ac4207e4cb5c0063af2e545791b3947bc81dc82305481c15c LICENS sha256 0e0c11073ba3c832097da38e0905da36b8a3526f219407977b13b71c6675be7d LICENCE.it913x sha256 16d5040c7cf851fc693b7542e20870935b99802533ea1bfd231c377a2305e5c5 LICENCE.iwlwifi_firmware sha256 2d6062d63b91eb750bf741498691604f75184b9fee97608ec537cd09bd6a42b4 LICENCE.Marvell +sha256 a90d3f66704d85889945fec5525ea77622549da83aced1aac99828383f8f1805 LICENCE.mediatek 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 d061c9f402..b9a6154331 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -382,6 +382,32 @@ LINUX_FIRMWARE_FILES += mediatek/mt7662.bin mediatek/mt7662_rom_patch.bin LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.ralink_a_mediatek_company_firmware endif +# MT7921 +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7921),y) +LINUX_FIRMWARE_FILES += mediatek/WIFI_MT7961_patch_mcu_1_2_hdr.bin \ + mediatek/WIFI_RAM_CODE_MT7961_1.bin +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.mediatek +endif + +# Mediatek MT7921 Bluetooth +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7921_BT),y) +LINUX_FIRMWARE_FILES += mediatek/BT_RAM_CODE_MT7961_1_2_hdr.bin +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.mediatek +endif + +# MT7922 +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7922),y) +LINUX_FIRMWARE_FILES += mediatek/WIFI_MT7922_patch_mcu_1_1_hdr.bin \ + mediatek/WIFI_RAM_CODE_MT7922_1.bin +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.mediatek +endif + +# Mediatek MT7922 Bluetooth +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7922_BT),y) +LINUX_FIRMWARE_FILES += mediatek/BT_RAM_CODE_MT7922_1_1_hdr.bin +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.mediatek +endif + # qca6174 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_6174),y) LINUX_FIRMWARE_FILES += ath10k/QCA6174 From 104b0fee839d3e4885329e77d1b8d553d552fb8e Mon Sep 17 00:00:00 2001 From: Yang Li Date: Wed, 3 Jan 2024 15:39:53 +0800 Subject: [PATCH 4647/5754] package/linux-firmware: add support of Amlogic bluetooth firmware Add support of Amlogic bluetooth firmware. Signed-off-by: Yang Li [yann.morin.1998@free.fr: - add license file and its hash - move to BT submenu ] Signed-off-by: Yann E. MORIN --- 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 47b765831c..0c48a03e49 100644 --- a/package/linux-firmware/Config.in +++ b/package/linux-firmware/Config.in @@ -53,6 +53,11 @@ endmenu # Video menu "Bluetooth firmware" +config BR2_PACKAGE_LINUX_FIRMWARE_AMLOGIC + bool "Amlogic SOC Bluetooth" + help + Firmware files for Conexant Amlogic SOC bluetooth support. + config BR2_PACKAGE_LINUX_FIRMWARE_IBT bool "Intel Wireless Bluetooth" help diff --git a/package/linux-firmware/linux-firmware.hash b/package/linux-firmware/linux-firmware.hash index 67b03dc1b4..93222c881f 100644 --- a/package/linux-firmware/linux-firmware.hash +++ b/package/linux-firmware/linux-firmware.hash @@ -32,6 +32,7 @@ sha256 30ec8a66503dc73f83937564ae70ca23aa03259e64727ff4195b5b6f695e782f LICENC sha256 f8822049f32fef2e90a197bd8cf259f476db75d549456bdca8567616a9c07ace LICENCE.xc5000c sha256 a064cbf83e10d72579d236a1e36032681adb8e442943ff75b57020a82992a5ed LICENSE.QualcommAtheros_ar3k sha256 337a55102138d7baa143ee4a4c6c91693e0113fece35d380b2a12109e8c23b3f LICENSE.QualcommAtheros_ath10k +sha256 8c4f2bd742da678336ca582ac46ee203d75d77ce928797caed032ee0e3a2c7dd LICENSE.amlogic sha256 630fd46c95d3ac6544590c2265ba7348fbc930fb386261a1c04dcd9f403645b8 LICENSE.dib0700 sha256 8542aeabf2761935122d693561e16766ce1bcc2b0d003204f9040b7d6d929f2e LICENSE.i915 sha256 be904cd28cb292b80cdb6cf412ab0d9159d431671e987ad433c1f62e0988a9bc LICENSE.qcom diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index b9a6154331..91cd1b4661 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -53,6 +53,12 @@ LINUX_FIRMWARE_FILES += \ # which is installed unconditionally endif +# Amlogic SoC Bluetooth +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_AMLOGIC),y) +LINUX_FIRMWARE_FILES += amlogic/bluetooth/*.bin +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENSE.amlogic +endif + # Intel Wireless Bluetooth ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IBT),y) LINUX_FIRMWARE_FILES += intel/ibt-* From 279d3dca35171aacff62ece7ddf71c43bd969785 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= Date: Tue, 9 Jan 2024 19:33:53 +0100 Subject: [PATCH 4648/5754] package/linux-firmware: bump version to 20231211 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Updated WHENCE hash due to various commits: https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/log/WHENCE Signed-off-by: Jan Čermák Signed-off-by: Yann E. MORIN --- 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 93222c881f..339fad0d4b 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 c98d200fc4a3120de1a594713ce34e135819dff23e883a4ed387863ba25679c7 linux-firmware-20231030.tar.xz +sha256 96af7e4b5eabd37869cdb3dcbb7ab36911106d39b76e799fa1caab16a9dbe8bb linux-firmware-20231211.tar.xz # Hash for license files sha256 8116433f4004fc0c24d72b3d9e497808b724aa0e5e1cd63fc1bf66b715b1e2e9 LICENCE.Abilis @@ -38,6 +38,6 @@ sha256 8542aeabf2761935122d693561e16766ce1bcc2b0d003204f9040b7d6d929f2e LICENS sha256 be904cd28cb292b80cdb6cf412ab0d9159d431671e987ad433c1f62e0988a9bc LICENSE.qcom sha256 fc6223d4bfe9f2f9e2eddc44b9fe5721d0caf49f01cb08d602906add686d8c6f LICENSE.radeon sha256 2bdd2e716f05d9737d3f9a20f9a3a3c0caee0e866100ddb0673f1178e42f92b9 LICENSE.sdma_firmware -sha256 697134859b663bc110d57275a7a7862bba21c4425266aac8c62bee18202aac20 WHENCE +sha256 dd63e67d3d9e51f84fed9a3efa7a465310b5b5058969eb7295a58339227aee14 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 91cd1b4661..0e05f94cb2 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -LINUX_FIRMWARE_VERSION = 20231030 +LINUX_FIRMWARE_VERSION = 20231211 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 a14221b76b963f14703861e6b4ff2d9d3065ecea Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 13 Jan 2024 22:38:59 +0100 Subject: [PATCH 4649/5754] package/linux-firmware: add option for V4L cx23885 devices Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/linux-firmware/Config.in | 6 ++++++ package/linux-firmware/linux-firmware.mk | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in index 0c48a03e49..920c0a2ef1 100644 --- a/package/linux-firmware/Config.in +++ b/package/linux-firmware/Config.in @@ -631,6 +631,12 @@ config BR2_PACKAGE_LINUX_FIRMWARE_CX231XX Firmware files for Conexant Cx23100/101/102 USB broadcast A/V decoder needed by the Linux CX231XX driver. +config BR2_PACKAGE_LINUX_FIRMWARE_CX23885 + bool "Conexant Cx23885/7/8 PCIe broadcast A/V decoder" + help + Firmware files for Conexant Cx23885/7/8 PCIe broadcast + A/V decoder needed by the Linux CX23885 driver. + endmenu endif diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index 0e05f94cb2..c09dbc523e 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -850,6 +850,12 @@ LINUX_FIRMWARE_FILES += v4l-cx231xx-avcore-01.fw # which is installed unconditionally endif +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_CX23885),y) +LINUX_FIRMWARE_FILES += v4l-cx23885-avcore-01.fw +# No license file; the license is in the file WHENCE +# which is installed unconditionally +endif + ifneq ($(LINUX_FIRMWARE_FILES)$(LINUX_FIRMWARE_DIRS),) define LINUX_FIRMWARE_BUILD_CMDS From f0b9be1872a4fa41de0356888915e2ea4322fa72 Mon Sep 17 00:00:00 2001 From: Michael Nosthoff Date: Sat, 13 Jan 2024 21:46:16 +0100 Subject: [PATCH 4650/5754] package/spdlog: bump to version 1.13.0 - updated LICENSE hash because of changed link to fmt's license Signed-off-by: Michael Nosthoff Signed-off-by: Yann E. MORIN --- package/spdlog/spdlog.hash | 4 ++-- package/spdlog/spdlog.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/spdlog/spdlog.hash b/package/spdlog/spdlog.hash index a943abba2c..3dbe43ac2d 100644 --- a/package/spdlog/spdlog.hash +++ b/package/spdlog/spdlog.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4dccf2d10f410c1e2feaff89966bfc49a1abb29ef6f08246335b110e001e09a9 spdlog-1.12.0.tar.gz -sha256 a7241a379cb98d37788f82c2fc2e484c3ae85dae881fd3406f0637644850926f LICENSE +sha256 534f2ee1a4dcbeb22249856edfb2be76a1cf4f708a20b0ac2ed090ee24cfdbc9 spdlog-1.13.0.tar.gz +sha256 4ccecab18d1ff0b61174fe3d6c430541625d3ddb865b0d5887db296f883c76e7 LICENSE diff --git a/package/spdlog/spdlog.mk b/package/spdlog/spdlog.mk index 15a80edbd0..b45ae0a17d 100644 --- a/package/spdlog/spdlog.mk +++ b/package/spdlog/spdlog.mk @@ -4,7 +4,7 @@ # ################################################################################ -SPDLOG_VERSION = 1.12.0 +SPDLOG_VERSION = 1.13.0 SPDLOG_SITE = $(call github,gabime,spdlog,v$(SPDLOG_VERSION)) SPDLOG_LICENSE = MIT SPDLOG_LICENSE_FILES = LICENSE From 62036327f6ded08ceae01f9b33cb3227ef106399 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 14 Jan 2024 11:14:02 +0100 Subject: [PATCH 4651/5754] package/libkcapi: fix legal info Commit e6af32c08c8d47a71d6f8fa48439f3d87dcef2f6 forgot to update hash of COPYING (update in year: https://github.com/smuellerDD/libkcapi/commit/fc937358e71253a6efaa3ba74885364976b040ea) Fixes: - http://autobuild.buildroot.org/results/823c89ed3ac3f12e64a22bd88e193a5be28c34e5 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libkcapi/libkcapi.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libkcapi/libkcapi.hash b/package/libkcapi/libkcapi.hash index 691ef0977a..172b6cbcc7 100644 --- a/package/libkcapi/libkcapi.hash +++ b/package/libkcapi/libkcapi.hash @@ -1,5 +1,5 @@ # Locally calculated sha256 15b550c14165a266fa233b485d029d54508da593dfa6d1731ec5d5a285c716e9 libkcapi-1.5.0.tar.xz -sha256 9765fad61726afb2b253db2c68153672e4178d6809667ae98141f3e90fe8645b COPYING +sha256 00e0a844d67b190580a9dc5943e555a3d0b2158e21d01a25526762c619979326 COPYING sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING.gplv2 sha256 13aa749a5b0a454917a944ed8fffc530b784f5ead522b1aacaf4ec8aa55a6239 COPYING.bsd From b66ce2631c3ecb2c6d63c0a632bc2124ac95b251 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 14 Jan 2024 12:28:39 +0100 Subject: [PATCH 4652/5754] package/criu: add C++ comment Commit 3e4b479f39c15ffdf307ec8395d856680c727204 forgot to add C++ comment Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/criu/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/criu/Config.in b/package/criu/Config.in index fc0da823b3..4c295acf4f 100644 --- a/package/criu/Config.in +++ b/package/criu/Config.in @@ -43,9 +43,9 @@ config BR2_PACKAGE_CRIU https://criu.org/Main_Page -comment "criu needs a glibc or musl toolchain w/ threads, gcc >= 8, headers >= 4.18, dynamic library, wchar" +comment "criu needs a glibc or musl toolchain w/ threads, gcc >= 8, headers >= 4.18, C++, dynamic library, wchar" depends on BR2_PACKAGE_CRIU_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_8 || !BR2_TOOLCHAIN_HAS_THREADS \ || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_18 \ - || BR2_TOOLCHAIN_USES_UCLIBC \ + || BR2_TOOLCHAIN_USES_UCLIBC || !BR2_INSTALL_LIBSTDCPP \ || BR2_STATIC_LIBS || !BR2_USE_WCHAR From cd2dcaa6c68639470a5db806878a6baba2e15741 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 13 Jan 2024 11:06:54 +0100 Subject: [PATCH 4653/5754] package/apcupsd: set LD to TARGET_CXX As found out by Yann E. Morin in [1], apcupsd configure script is ugly, and uses gcc to do the link line-wrapping which will raise the following build failure with gcc 13: /home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/powerpc64le-buildroot-linux-gnu/13.2.0/../../../../powerpc64le-buildroot-linux-gnu/bin/ld: /home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/powerpc64le-buildroot-linux-gnu/13.2.0/../../../../powerpc64le-buildroot-linux-gnu/lib/../lib64/libsupc++.a(eh_alloc.o): in function `std::basic_string_view >::compare(unsigned long, unsigned long, char const*, unsigned long) const': eh_alloc.cc:(.text._ZNKSt17basic_string_viewIcSt11char_traitsIcEE7compareEmmPKcm[_ZNKSt17basic_string_viewIcSt11char_traitsIcEE7compareEmmPKcm]+0x44): undefined reference to `std::__throw_out_of_range_fmt(char const*, ...)' It will also raise the following build failure on sparc/arc: /home/autobuild/autobuild/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arceb-snps-linux-uclibc/9.2.1/../../../../arceb-snps-linux-uclibc/bin/ld: /home/autobuild/autobuild/instance-3/output-1/host/arceb-buildroot-linux-uclibc/sysroot/lib/libsupc++.a(eh_throw.o): in function `__exchange_and_add_dispatch': /SCRATCH/arcjenkins2/slaves/ru20-custom-arcgnu2/workspace/arcoss_verification/arc_gnu_toolchain_release/arc_gnu_toolchain_release/bd-uclibceb/gcc-stage2/arceb-snps-linux-uclibc/libstdc++-v3/include/ext/atomicity.h:82: undefined reference to `__gnu_cxx::__exchange_and_add(int volatile*, int)' /home/autobuild/autobuild/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arceb-snps-linux-uclibc/9.2.1/../../../../arceb-snps-linux-uclibc/bin/ld: /SCRATCH/arcjenkins2/slaves/ru20-custom-arcgnu2/workspace/arcoss_verification/arc_gnu_toolchain_release/arc_gnu_toolchain_release/bd-uclibceb/gcc-stage2/arceb-snps-linux-uclibc/libstdc++-v3/include/ext/atomicity.h:82: undefined reference to `__gnu_cxx::__exchange_and_add(int volatile*, int)' Instead of trying to patch the configure script as advocated by Yann E. Morin, set LD to TARGET_CXX as: - this solution is quicker - usptream is dead (last release in 2016) - this solution has already been used in other packages (nodejs, zmqpp) [1]: https://patchwork.ozlabs.org/project/buildroot/patch/20200812171821.2517-1-Evgeniy.Didin@synopsys.com/ Fixes: - http://autobuild.buildroot.org/results/6096c3ddc5edf3204635c2c90246c2e8c8e074e7 - http://autobuild.buildroot.org/results/d8a/d8a3ab31c5b86871c7e1117f4ffa7b6cedfcb7e0/build-end.log Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/apcupsd/apcupsd.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/apcupsd/apcupsd.mk b/package/apcupsd/apcupsd.mk index 80ed0b0832..97e6d6a558 100644 --- a/package/apcupsd/apcupsd.mk +++ b/package/apcupsd/apcupsd.mk @@ -71,8 +71,8 @@ APCUPSD_CONF_OPTS += --disable-usb endif define APCUPSD_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/src - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/platforms + $(TARGET_MAKE_ENV) $(MAKE) LD="$(TARGET_CXX)" -C $(@D)/src + $(TARGET_MAKE_ENV) $(MAKE) LD="$(TARGET_CXX)" -C $(@D)/platforms endef define APCUPSD_INSTALL_TARGET_CMDS From 30d5d1a2295dceacb9dd4db1b4c6aa5a7e11b9e3 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 14 Jan 2024 17:52:40 +0100 Subject: [PATCH 4654/5754] package/micropython: add MICROPYTHON_CPE_ID_VENDOR cpe:2.3:a:micropython:micropython is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/853A709B-B8CB-4E8C-BF5E-6621C3A1D994 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/micropython/micropython.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/micropython/micropython.mk b/package/micropython/micropython.mk index 3d356c51d8..6e0af59f06 100644 --- a/package/micropython/micropython.mk +++ b/package/micropython/micropython.mk @@ -13,6 +13,7 @@ MICROPYTHON_SOURCE = micropython-$(MICROPYTHON_VERSION).tar.xz MICROPYTHON_LICENSE = MIT, BSD-1-Clause, BSD-3-Clause, Zlib MICROPYTHON_LICENSE_FILES = LICENSE MICROPYTHON_DEPENDENCIES = host-pkgconf libffi host-python3 +MICROPYTHON_CPE_ID_VENDOR = micropython # Use fallback implementation for exception handling on architectures that don't # have explicit support. From b31b91296e7f985b909f104f06a098adddef1fea Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 14 Jan 2024 18:06:57 +0100 Subject: [PATCH 4655/5754] package/attr: bump to version 2.5.2 https://lists.nongnu.org/archive/html/acl-devel/2024-01/msg00011.html Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/attr/attr.hash | 2 +- package/attr/attr.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/attr/attr.hash b/package/attr/attr.hash index 334a438cae..f63c0e312a 100644 --- a/package/attr/attr.hash +++ b/package/attr/attr.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 db448a626f9313a1a970d636767316a8da32aede70518b8050fa0de7947adc32 attr-2.5.1.tar.xz +sha256 f2e97b0ab7ce293681ab701915766190d607a1dba7fae8a718138150b700a70b attr-2.5.2.tar.xz # Locally calculated sha256 98f318493be6b08bff3cd295791cde06c54e17882a3c74a1ed245eaa02533d52 doc/COPYING diff --git a/package/attr/attr.mk b/package/attr/attr.mk index 0327497e1e..6ecf5c53f4 100644 --- a/package/attr/attr.mk +++ b/package/attr/attr.mk @@ -4,7 +4,7 @@ # ################################################################################ -ATTR_VERSION = 2.5.1 +ATTR_VERSION = 2.5.2 ATTR_SOURCE = attr-$(ATTR_VERSION).tar.xz ATTR_SITE = http://download.savannah.gnu.org/releases/attr ATTR_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) From e874fd08e01a8d543520f867d95ae8a6a9fa242e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 14 Jan 2024 16:56:26 +0100 Subject: [PATCH 4656/5754] package/libuwsc: fix wolfssl build Commit 1567fbd72d4b547f70a7509247bf9abb73ab58e3 didn't fully fix the wolfssl build failure because the include on wolfssl/options.h was still missing: /home/autobuild/autobuild/instance-6/output-1/build/libuwsc-3.3.5/src/ssl.c:62:5: error: unknown type name 'SSL_CTX' 62 | SSL_CTX *ctx; | ^~~~~~~ While at it, add upstream tag to patches Fixes: - http://autobuild.buildroot.org/results/edc49cce5b1f456d980841f4c315e7cd784b1561 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- .checkpackageignore | 2 - ...001-CMakeLists.txt-add-BUILD_EXAMPLE.patch | 2 +- .../libuwsc/0002-fix-bad-indentation.patch | 3 +- .../0003-src-ssl.c-fix-wolfssl-build.patch | 37 +++++++++++++++++++ 4 files changed, 39 insertions(+), 5 deletions(-) create mode 100644 package/libuwsc/0003-src-ssl.c-fix-wolfssl-build.patch diff --git a/.checkpackageignore b/.checkpackageignore index 020caa754d..914dd6fb63 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -727,8 +727,6 @@ 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/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 diff --git a/package/libuwsc/0001-CMakeLists.txt-add-BUILD_EXAMPLE.patch b/package/libuwsc/0001-CMakeLists.txt-add-BUILD_EXAMPLE.patch index 197dd1de0f..87f343a9d9 100644 --- a/package/libuwsc/0001-CMakeLists.txt-add-BUILD_EXAMPLE.patch +++ b/package/libuwsc/0001-CMakeLists.txt-add-BUILD_EXAMPLE.patch @@ -6,7 +6,7 @@ Subject: [PATCH] CMakeLists.txt: add BUILD_EXAMPLE Allow the user to disable example Signed-off-by: Fabrice Fontaine -[yann.morin.1998@free.fr: backport from upstream] +Upstream: https://github.com/zhaojh329/libuwsc/commit/bb71b21eb9407479ad729b3c858b0fc350fae335 Signed-off-by: Yann E. MORIN --- CMakeLists.txt | 6 +++++- diff --git a/package/libuwsc/0002-fix-bad-indentation.patch b/package/libuwsc/0002-fix-bad-indentation.patch index f33f944d06..77cae92cf2 100644 --- a/package/libuwsc/0002-fix-bad-indentation.patch +++ b/package/libuwsc/0002-fix-bad-indentation.patch @@ -5,8 +5,7 @@ Subject: [PATCH] fix bad indentation Fixes error with GCC11. -[Retrieved from: -https://github.com/zhaojh329/libuwsc/commit/8cb416140741a596235b8acc46b2b119b13ebfab] +Upstream: https://github.com/zhaojh329/libuwsc/commit/8cb416140741a596235b8acc46b2b119b13ebfab Signed-off-by: Fabrice Fontaine --- src/lua/uwsc_lua.c | 2 +- diff --git a/package/libuwsc/0003-src-ssl.c-fix-wolfssl-build.patch b/package/libuwsc/0003-src-ssl.c-fix-wolfssl-build.patch new file mode 100644 index 0000000000..4c652a63c2 --- /dev/null +++ b/package/libuwsc/0003-src-ssl.c-fix-wolfssl-build.patch @@ -0,0 +1,37 @@ +From 1c3579e99163a13d622c3ef44088c23d5eea306d Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 14 Jan 2024 16:44:13 +0100 +Subject: [PATCH] src/ssl.c: fix wolfssl build + +wolfssl/options.h must also be included by clients to avoid the +following build failure because OPENSSL_ALL won't be defined: + +/home/autobuild/autobuild/instance-6/output-1/build/libuwsc-3.3.5/src/ssl.c:62:5: error: unknown type name 'SSL_CTX' + 62 | SSL_CTX *ctx; + | ^~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/edc49cce5b1f456d980841f4c315e7cd784b1561 + +Signed-off-by: Fabrice Fontaine +Upstream: N/A (already fixed by +https://github.com/zhaojh329/ssl/commit/c40ebcd7b4277321acbbd4b00b4b10fd363c7a97) +--- + src/ssl.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/ssl.c b/src/ssl.c +index 3640022..6a3d250 100644 +--- a/src/ssl.c ++++ b/src/ssl.c +@@ -54,6 +54,7 @@ struct uwsc_ssl_ctx { + #include + #elif UWSC_HAVE_WOLFSSL + #define WC_NO_HARDEN ++#include + #include + #include + #endif +-- +2.43.0 + From 4774d8205637f28e9ab421f10926121ec47a4f57 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 15 Jan 2024 11:15:37 +0100 Subject: [PATCH 4657/5754] Update for 2023.11.1 Signed-off-by: Peter Korsgaard (cherry picked from commit 8526e60a1f09854b96016b03a2439fcb61200ee4) [Peter: drop Makefile change] Signed-off-by: Peter Korsgaard --- CHANGES | 39 +++++++++++++++++++++++++++++++++++++++ support/misc/Vagrantfile | 2 +- 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 7b67711ca9..3ab69362c3 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,42 @@ +2023.11.1, released January 15th, 2024 + + Important / security related fixes. + + Infrastructure: + + - Download: Revert a permission fixup step in the tarball + creation logic, which lead to a hash mismatch issue in two + cargo-vendored packages, ripgrep and sentry-cli. + + - Build: Pass GIT_DIR=. in the environment (through + HOST_MAKE_ENV/TARGET_MAKE_ENV) to the build steps to + workaround packages trying to detect if they are building in + a git checkout and getting confused when building in a sub + directory of a Buildroot git checkout. + + Defconfigs: Rock5b: Add download hashes for U-Boot and Linux + + Updated/fixed packages: apcupsd, arm-trusted-firmware, botan, + cjson, criu, cryptodev-linux, cups, dahdi-linux, dahdi-tools, + dbus, docker, dropbear, duktape, edk2, erlang, exim, faad2, + freeswitch, gcc, gdal, gdb, giflib, glibc, gnuplot, gnutls, + go, google-breakpad, gst-omx, gstd, 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, ipcalc, jq, + json-for-modern-cpp, ksmbd-tools, libaio, libarchive, + libcamera, libcamera-apps, libcap-ng, libcgroup, libcurl, + libde265, libebml, libgtk3, libheif, libiec61850, libndns, + libostree, libraw, libsigsegv, libssh, libssh2, libuev, + libwebsockets, libzenoh-pico, liquid-dsp, lvm2, madplay, + mesa3d, micropython, minizip, mp4v2, nushell, + onevpl-intel-gpu, opensc, openssh, optee-client, orc, php, + pipewire, postgis, postgresql, proftpd, putty, python-brotli, + python-pysensors, python-sip, python-werkzeug, shim, squid, + strongswan, sway, tinyssh, tor, transmission, tree, udev, + uftp, valijson, wireshark, wlroots, wolfssl, + xserver_xorg-server, xwayland, + 2023.11, released December 4th, 2023 Various fixes. diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile index 61eb743659..64c479b693 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2023.11' +RELEASE='2023.11.1' ### Change here for more memory/cores ### VM_MEMORY=2048 From dd22e808c07e16a1f4b224925491cd7e8a038a1a Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 15 Jan 2024 17:09:40 +0100 Subject: [PATCH 4658/5754] docs/website: Update for 2023.11.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 70f89b93ec..4b6537f0a0 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -42,37 +42,37 @@

                                                      buildroot-2023.02.8.tar.xz

                                                      -

                                                      Latest stable release: 2023.11

                                                      +

                                                      Latest stable release: 2023.11.1

                                                      - +
                                                      - +
                                                      -

                                                      buildroot-2023.11.tar.gz

                                                      -

                                                      PGP signature

                                                      +

                                                      buildroot-2023.11.1.tar.gz

                                                      +

                                                      PGP signature

                                                      - +
                                                      - +
                                                      -

                                                      buildroot-2023.11.tar.xz

                                                      -

                                                      PGP signature

                                                      +

                                                      buildroot-2023.11.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 e052c99803..89dc740699 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,27 @@

                                                    News

                                                      +
                                                    • +
                                                      +
                                                      +
                                                      +

                                                      2024.02-rc1 released

                                                      +

                                                      25 February 2024

                                                      +
                                                      +
                                                      +

                                                      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 + 2024.02-rc1 + release, and report any problems found to the + mailing list or + bug tracker.

                                                      +
                                                      +
                                                      +
                                                      • +
                                                    • From 4533e42622e46f2b8e0ce4d1936c6534393d3aa1 Mon Sep 17 00:00:00 2001 From: Sen Hastings Date: Tue, 13 Feb 2024 12:07:14 +0000 Subject: [PATCH 5268/5754] support/scripts/pkg-stats: make current version cell scrollable Currently, when the version string is "too long", it is arbitrarily truncated. This works well for commit hashes, because usually the truncation is long enough to provide a short hash that is still unique in the upstream VCS. However, there are non-hash-like versions strings that get truncated and wihch the discriminant part is toward the end. Yet, adapting the version cell to the widest versions string (most probably a git hash) is not very interesting; the table is already very large. Make the cell with the version string scrollable: we get to keep the best of both worlds: a narrow version cell, and a full-length version string that can be copy-pasted if needed. Signed-off-by: Sen Hastings [yann.morin.1998@free.fr: reword commit log] Signed-off-by: Yann E. MORIN --- support/scripts/pkg-stats | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index 7835cb3d62..9307992d29 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -845,6 +845,13 @@ function expandField(fieldId){ .centered { text-align: center; } + + .current_version { + overflow: scroll; + width: 21ch; + padding: 10px 2px 10px 2px; + } + .correct, .nopatches, .good_url, .version-good, .cpe-ok, .cve-ok { background: #d2ffc4; } @@ -964,10 +971,7 @@ def dump_html_pkg(f, pkg): # Current version data_field_id = f'current_version__{pkg_css_class}' - if len(pkg.current_version) > 20: - current_version = pkg.current_version[:20] + "..." - else: - current_version = pkg.current_version + current_version = pkg.current_version f.write(f'
                                                      {current_version}
                                                      \n') From 67f6d1dad2d4dd2af64a9eae6935e75147cd7bd2 Mon Sep 17 00:00:00 2001 From: Laurent Badel Date: Mon, 26 Feb 2024 09:19:04 +0000 Subject: [PATCH 5269/5754] package/micropython: update PCRE dependency to PCRE2 micropython-lib/unix-ffi/re/re.py uses libpcre2-8 since commit d8e163b. Thus, update micropython package to select the PCRE2 package instead of PCRE. Signed-off-by: Laurent Badel Signed-off-by: Peter Korsgaard --- package/micropython/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/micropython/Config.in b/package/micropython/Config.in index 26a00baab0..849a5452f4 100644 --- a/package/micropython/Config.in +++ b/package/micropython/Config.in @@ -13,7 +13,7 @@ if BR2_PACKAGE_MICROPYTHON config BR2_PACKAGE_MICROPYTHON_LIB bool "micropython-lib" - select BR2_PACKAGE_PCRE # runtime + select BR2_PACKAGE_PCRE2 # runtime help Core Python libraries ported to MicroPython. From 433c4fd38b15efcf74b410e5068e2e51eeba6e46 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 26 Feb 2024 18:32:02 +0100 Subject: [PATCH 5270/5754] package/poco: bump to version 1.13.2 This bump will fix the following build failure raised since bump of expat to version 2.6.0 in commit 9dad5e7d7f7bc03e648621b9be6974e7ae39a467 thanks to https://github.com/pocoproject/poco/commit/75f7042b70092e79c6b770b18d033a061c84e2c5: src/ParserEngine.cpp: In member function 'void Poco::XML::ParserEngine::init()': src/ParserEngine.cpp:510:17: error: 'XML_SetBillionLaughsAttackProtectionMaximumAmplification' was not declared in this scope; did you mean 'setBillionLaughsAttackProtectionMaximumAmplification'? 510 | XML_SetBillionLaughsAttackProtectionMaximumAmplification(_parser, _maximumAmplificationFactor); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ https://github.com/pocoproject/poco/blob/poco-1.13.2-release/CHANGELOG Fixes: 9dad5e7d7f7bc03e648621b9be6974e7ae39a467 - http://autobuild.buildroot.org/results/7fad881f85d3b89abdee35388088965f05ead277 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/poco/poco.hash | 2 +- package/poco/poco.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/poco/poco.hash b/package/poco/poco.hash index 9a7981171a..0a1e900b3f 100644 --- a/package/poco/poco.hash +++ b/package/poco/poco.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 71ef96c35fced367d6da74da294510ad2c912563f12cd716ab02b6ed10a733ef poco-1.12.4.tar.gz +sha256 c01221870aa9bccedf1de39890279699207848fe61a0cfb6aeec7c5942c4627f poco-1.13.2.tar.gz sha256 c4b1e1e5f36d8331737231fefcc30f5714326aec7c387ad59a8115eb0ba7d6b5 LICENSE diff --git a/package/poco/poco.mk b/package/poco/poco.mk index 2d0233a8ce..f8c2a658de 100644 --- a/package/poco/poco.mk +++ b/package/poco/poco.mk @@ -4,7 +4,7 @@ # ################################################################################ -POCO_VERSION = 1.12.4 +POCO_VERSION = 1.13.2 POCO_SITE = $(call github,pocoproject,poco,poco-$(POCO_VERSION)-release) POCO_LICENSE = BSL-1.0 POCO_LICENSE_FILES = LICENSE From 13083cf8c0edb0ac1cae4895505720658e8dd75d Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 26 Feb 2024 18:36:44 +0100 Subject: [PATCH 5271/5754] package/erlang: fix build with autoconf 2.72 Use ERLANG_FIX_AUTOCONF_VERSION to fix the following build failure raised since bump of autoconf to version 2.72 in commit 524f3536029dace3ce9aa154d3ca4685582e1955: ERROR: autoconf of version 2.72 found in path! You need to have autoconf of version 2.71 in path. Fixes: 524f3536029dace3ce9aa154d3ca4685582e1955 - http://autobuild.buildroot.org/results/c9e8df3427fca9e8e75488e32bca18e81009238c Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/erlang/erlang.mk | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/package/erlang/erlang.mk b/package/erlang/erlang.mk index 1600b59381..84d2f4e898 100644 --- a/package/erlang/erlang.mk +++ b/package/erlang/erlang.mk @@ -17,14 +17,22 @@ ERLANG_CPE_ID_VENDOR = erlang ERLANG_CPE_ID_PRODUCT = erlang\/otp ERLANG_INSTALL_STAGING = YES +define ERLANG_FIX_AUTOCONF_VERSION + $(SED) "s/USE_AUTOCONF_VERSION=.*/USE_AUTOCONF_VERSION=$(AUTOCONF_VERSION)/" $(@D)/otp_build +endef + # Patched erts/aclocal.m4 define ERLANG_RUN_AUTOCONF cd $(@D) && PATH=$(BR_PATH) ./otp_build update_configure --no-commit endef ERLANG_DEPENDENCIES += host-autoconf -ERLANG_PRE_CONFIGURE_HOOKS += ERLANG_RUN_AUTOCONF +ERLANG_PRE_CONFIGURE_HOOKS += \ + ERLANG_FIX_AUTOCONF_VERSION \ + ERLANG_RUN_AUTOCONF HOST_ERLANG_DEPENDENCIES += host-autoconf -HOST_ERLANG_PRE_CONFIGURE_HOOKS += ERLANG_RUN_AUTOCONF +HOST_ERLANG_PRE_CONFIGURE_HOOKS += \ + ERLANG_FIX_AUTOCONF_VERSION \ + ERLANG_RUN_AUTOCONF # Return the EIV (Erlang Interface Version, EI_VSN) # $(1): base directory, i.e. either $(HOST_DIR) or $(STAGING_DIR)/usr From c20b2ae4ece10e07eeb80fcdd706a474d3be1475 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 25 Feb 2024 10:24:21 +0100 Subject: [PATCH 5272/5754] package/openssh: fix dependencies with refpolicy Commit 2c5a82a29ceb (package/openssh: select linux-pam if refpolicy upstream is selected) did not account for the linux-pam dependencies before selecting it, causing unmet dependencies warnings (unfortunately, not errors), such as: $ KCONFIG_SEED=0xCF227CF4 make randconfig WARNING: unmet direct dependencies detected for BR2_PACKAGE_LINUX_PAM Depends on [n]: BR2_ENABLE_LOCALE [=n] && BR2_USE_WCHAR [=n] && !BR2_STATIC_LIBS [=n] && BR2_USE_MMU [=y] && BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 [=y] Selected by [y]: - BR2_PACKAGE_OPENSSH [=y] && BR2_USE_MMU [=y] && BR2_PACKAGE_REFPOLICY_UPSTREAM_VERSION [=y] 2c5a82a29ceb made the choice of having openssl bear the responsibility to select linux-pam when the upstream refpolicy version was enabled. Semantically however, the responsibility really lies within refpolicy itself, since that's what imposes linux-pam to openssh. Move the select to refpolicy and drop it from openssh. Then, ensure that linux-pam is only selected when it is available. That means that one may get an openssh that is not linked against linux-pam, when the linux-pam dependencies are not met; refpolicy (by way of libsepol) also has a more stringent requirement on gcc version than linux-pam, so most probably the missing dependencies would be locale, wchar, or a static build. We consider that situation to be a corner case that we do not want to address. In the future, we may have more similar situations, whereby refpolicy would impose other packages be linked with otherwise optional dependencies. If (when) that were (will be) the case, then the proposed mechanism would quickly become ugly; we could then re-assess a nicer way to do that. Until then, this is good ebough. Signed-off-by: Yann E. MORIN Cc: Adam Duskett Cc: Thomas Petazzoni Cc: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/openssh/Config.in | 1 - package/refpolicy/Config.in | 8 ++++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/package/openssh/Config.in b/package/openssh/Config.in index a3038ba01f..08d3c7d391 100644 --- a/package/openssh/Config.in +++ b/package/openssh/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_OPENSSH bool "openssh" depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_LINUX_PAM if BR2_PACKAGE_REFPOLICY_UPSTREAM_VERSION select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_ZLIB help diff --git a/package/refpolicy/Config.in b/package/refpolicy/Config.in index 0e72b895df..8ae8f0448d 100644 --- a/package/refpolicy/Config.in +++ b/package/refpolicy/Config.in @@ -36,6 +36,14 @@ choice config BR2_PACKAGE_REFPOLICY_UPSTREAM_VERSION bool "Upstream version" + # Consider reworking the following when adding new entries: + # Upstream refpolicy for openssh expects linux-pam to be used + select BR2_PACKAGE_LINUX_PAM if BR2_PACKAGE_OPENSSH \ + && BR2_USE_MMU \ + && BR2_ENABLE_LOCALE \ + && BR2_USE_WCHAR \ + && !BR2_STATIC_LIBS \ + && BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 help Use the refpolicy as provided by Buildroot. From c7b52c3ccf4828cd848b6a98206dbe712f84e49b Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 28 Feb 2024 19:09:32 +0100 Subject: [PATCH 5273/5754] package/python3: security bump to version 3.11.8 Fixes the following security issue: gh-113659: Skip .pth files with names starting with a dot or hidden file attribute https://github.com/python/cpython/issues/113659 Signed-off-by: Peter Korsgaard --- package/python3/python3.hash | 6 +++--- package/python3/python3.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python3/python3.hash b/package/python3/python3.hash index 39a16c1f71..962d32b5d9 100644 --- a/package/python3/python3.hash +++ b/package/python3/python3.hash @@ -1,5 +1,5 @@ -# From https://www.python.org/downloads/release/python-3116/ -md5 d0c5a1a31efe879723e51addf56dd206 Python-3.11.6.tar.xz +# From https://www.python.org/downloads/release/python-3118/ +md5 b353b8433e560e1af2b130f56dfbd973 Python-3.11.8.tar.xz # Locally computed -sha256 0fab78fa7f133f4f38210c6260d90d7c0d5c7198446419ce057ec7ac2e6f5f38 Python-3.11.6.tar.xz +sha256 9e06008c8901924395bc1da303eac567a729ae012baa182ab39269f650383bb3 Python-3.11.8.tar.xz sha256 3b2f81fe21d181c499c59a256c8e1968455d6689d269aa85373bfb6af41da3bf LICENSE diff --git a/package/python3/python3.mk b/package/python3/python3.mk index 7a704d81e0..5d9d77af50 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).6 +PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).8 PYTHON3_SOURCE = Python-$(PYTHON3_VERSION).tar.xz PYTHON3_SITE = https://python.org/ftp/python/$(PYTHON3_VERSION) PYTHON3_LICENSE = Python-2.0, others From f71d9f49e5466f31b53bb2cdc0201182104c86c0 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 25 Feb 2024 23:05:35 +0100 Subject: [PATCH 5274/5754] support/scripts/pkg-stats: fix datetime deprecation warning Abide by the warning reported with python 3.12: .../support/scripts/pkg-stats:1289: DeprecationWarning: datetime.datetime.utcnow() is deprecated and scheduled for removal in a future version. Use timezone-aware objects to represent datetimes in UTC: datetime.datetime.now(datetime.UTC). Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle --- support/scripts/pkg-stats | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index 9307992d29..afb746704a 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -1290,7 +1290,7 @@ def __main__(): package_list = set([v["name"] for v in show_info_js.values() if 'name' in v]) else: package_list = None - date = datetime.datetime.utcnow() + date = datetime.datetime.now(datetime.UTC) commit = subprocess.check_output(['git', '-C', brpath, 'rev-parse', 'HEAD']).splitlines()[0].decode() From 54f8d97c913e3c38073d6a31ed3ff02dd71cf9cb Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 25 Feb 2024 23:05:36 +0100 Subject: [PATCH 5275/5754] support/scripts/pkg-stats: adapt to NVD v2 json format Commit 22b69455526f (support/scripts/cve.py: switch from NVD to FKIE for the JSON files) missed the fact that the layout of the FKIE data files are different from the original NVD ones. They are formatted according to the NVD v2 API. Most differences are relatively trivial fields renaming, and those are easily spotted in this patch. There is however one key difference in the layout of the configurations. Where the NVD had "configurations" as an object with a "nodes" key, the FKIE has a "configurations" as a list of objects with a single "nodes" key; i.e. it is one-level deeper. Signed-off-by: Yann E. MORIN Cc: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Arnout Vandecappelle --- support/scripts/cve.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/support/scripts/cve.py b/support/scripts/cve.py index f12a8048cd..747ad881c9 100755 --- a/support/scripts/cve.py +++ b/support/scripts/cve.py @@ -128,7 +128,7 @@ def read_nvd_dir(cls, nvd_dir): filename = CVE.download_nvd_year(nvd_dir, year) try: uncompressed = subprocess.check_output(["xz", "-d", "-c", filename]) - content = ijson.items(uncompressed, 'CVE_Items.item') + content = ijson.items(uncompressed, 'cve_items.item') except: # noqa: E722 print("ERROR: cannot read %s. Please remove the file then rerun this script" % filename) raise @@ -155,11 +155,11 @@ def parse_node(self, node): for parsed_node in self.parse_node(child): yield parsed_node - for cpe in node.get('cpe_match', ()): + for cpe in node.get('cpeMatch', ()): if not cpe['vulnerable']: return - product = cpe_product(cpe['cpe23Uri']) - version = cpe_version(cpe['cpe23Uri']) + product = cpe_product(cpe['criteria']) + version = cpe_version(cpe['criteria']) # ignore when product is '-', which means N/A if product == '-': return @@ -191,7 +191,7 @@ def parse_node(self, node): v_end = cpe['versionEndExcluding'] yield { - 'id': cpe['cpe23Uri'], + 'id': cpe['criteria'], 'v_start': v_start, 'op_start': op_start, 'v_end': v_end, @@ -199,14 +199,15 @@ def parse_node(self, node): } def each_cpe(self): - for node in self.nvd_cve['configurations']['nodes']: - for cpe in self.parse_node(node): - yield cpe + for nodes in self.nvd_cve.get('configurations', []): + for node in nodes['nodes']: + for cpe in self.parse_node(node): + yield cpe @property def identifier(self): """The CVE unique identifier""" - return self.nvd_cve['cve']['CVE_data_meta']['ID'] + return self.nvd_cve['id'] @property def affected_products(self): From 75a3562324bd64d4d02edbcf840809863d4c266f Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 25 Feb 2024 23:05:37 +0100 Subject: [PATCH 5276/5754] support/scripts/pkg-stats: sort CVEs in HTML output While the old NVD JSON feed provided data files where the CVEs were sorted by ID, the new feed from FKIE does not have sorted CVEs. Add a method to sort a list of CVE IDs (i.e. CVE ID strings, not CVE objects!), and use that when emiting the HTML output. The JSON output need not be sorted, because it is supposed to be used for post-processing, and we do not care about the ordering there; a consumer interested in sorting should sort on their side. Signed-off-by: Yann E. MORIN Cc: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Arnout Vandecappelle --- support/scripts/cve.py | 7 +++++++ support/scripts/pkg-stats | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/support/scripts/cve.py b/support/scripts/cve.py index 747ad881c9..1a3c307e12 100755 --- a/support/scripts/cve.py +++ b/support/scripts/cve.py @@ -117,6 +117,13 @@ def download_nvd_year(nvd_path, year): open(path_metaf, "w").write(page_meta.text) return path_jsonf_xz + @staticmethod + def sort_id(cve_ids): + def cve_key(cve_id): + year, id_ = cve_id.split('-')[1:] + return (int(year), int(id_)) + return sorted(cve_ids, key=cve_key) + @classmethod def read_nvd_dir(cls, nvd_dir): """ diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index afb746704a..9a4a3ccad5 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -1055,9 +1055,9 @@ def dump_html_pkg(f, pkg): f.write(f'
                                                      see all ({cve_total}) ▾
                                                      \n') if pkg.is_status_error("cve"): - for cve in pkg.cves: + for cve in cvecheck.CVE.sort_id(pkg.cves): f.write(f' {cve}
                                                      \n') - for cve in pkg.unsure_cves: + for cve in cvecheck.CVE.sort_id(pkg.unsure_cves): f.write(f' {cve} (unsure)
                                                      \n') elif pkg.is_status_na("cve"): f.write(f""" {pkg.status['cve'][1]}""") From 4983f9e73e17c162b85fa4ed55fc5ff13d491130 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 28 Feb 2024 23:44:59 +0100 Subject: [PATCH 5277/5754] support/scripts/pkg-stats: fix running on older python versions Commit f71d9f49e546 (support/scripts/pkg-stats: fix datetime deprecation warning) forgot to consider that the datetime.UTC suggested by python 3.12, was only introduced with python 3.11. However, we are still generating the daily report on a python 3.8 version, which fails at runtime: AttributeError: module 'datetime' has no attribute 'UTC' It turns out that datetime.UTC is just an alias for datetime.timezone.utc, which seems to have existed since before python3... Use datetime.timezone.utc instead of its alias. Signed-off-by: Yann E. MORIN Signed-off-by: Peter Korsgaard --- support/scripts/pkg-stats | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index 9a4a3ccad5..53898a36f2 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -1290,7 +1290,7 @@ def __main__(): package_list = set([v["name"] for v in show_info_js.values() if 'name' in v]) else: package_list = None - date = datetime.datetime.now(datetime.UTC) + date = datetime.datetime.now(datetime.timezone.utc) commit = subprocess.check_output(['git', '-C', brpath, 'rev-parse', 'HEAD']).splitlines()[0].decode() From aa443e82513d6f094ecf89f97d34f877c49c8167 Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Wed, 28 Feb 2024 21:02:16 +0100 Subject: [PATCH 5278/5754] package/ccache: disable building tests Signed-off-by: Marcus Hoffmann Signed-off-by: Peter Korsgaard --- package/ccache/ccache.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/ccache/ccache.mk b/package/ccache/ccache.mk index ac4bc4aba5..96b1b65c5c 100644 --- a/package/ccache/ccache.mk +++ b/package/ccache/ccache.mk @@ -16,7 +16,8 @@ HOST_CCACHE_CONF_OPTS += \ -UCMAKE_C_COMPILER_LAUNCHER \ -UCMAKE_CXX_COMPILER_LAUNCHER \ -DZSTD_FROM_INTERNET=OFF \ - -DHIREDIS_FROM_INTERNET=OFF + -DHIREDIS_FROM_INTERNET=OFF \ + -DENABLE_TESTING=OFF # Patch host-ccache as follows: # - Use BR_CACHE_DIR instead of CCACHE_DIR, because CCACHE_DIR From bd5d1f5b6ae8d9765520728e4995897940c86b05 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 28 Feb 2024 18:47:21 +0100 Subject: [PATCH 5279/5754] package/libheif: fix libjpeg build libheif raises the following build failure with libjpeg since bump to version 1.17.5 in commit 5714126edac88e3adc043a482b262b319a907dd3 and https://github.com/strukturag/libheif/commit/ebd13a20b8b7f1964939642b08b662ef7e483f39 /home/buildroot/autobuild/instance-3/output-1/build/libheif-1.17.5/libheif/plugins/encoder_jpeg.cc: In function 'heif_error jpeg_encode_image(void*, const heif_image*, heif_image_input_class)': /home/buildroot/autobuild/instance-3/output-1/build/libheif-1.17.5/libheif/plugins/encoder_jpeg.cc:366:37: error: invalid conversion from 'long unsigned int*' to 'size_t*' {aka 'unsigned int*'} [-fpermissive] 366 | jpeg_mem_dest(&cinfo, &outbuffer, &outlength); | ^~~~~~~~~~ | | | long unsigned int* Fixes: - http://autobuild.buildroot.org/results/8ca909564c8dabe28ad08c96ebbc04b25592e727 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...ns-encoder_jpeg.cc-fix-libjpeg-build.patch | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 package/libheif/0001-libheif-plugins-encoder_jpeg.cc-fix-libjpeg-build.patch diff --git a/package/libheif/0001-libheif-plugins-encoder_jpeg.cc-fix-libjpeg-build.patch b/package/libheif/0001-libheif-plugins-encoder_jpeg.cc-fix-libjpeg-build.patch new file mode 100644 index 0000000000..5245327fe7 --- /dev/null +++ b/package/libheif/0001-libheif-plugins-encoder_jpeg.cc-fix-libjpeg-build.patch @@ -0,0 +1,47 @@ +From 33eb948240365434c845b618854403e82a229012 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 31 Jan 2024 21:04:37 +0100 +Subject: [PATCH] libheif/plugins/encoder_jpeg.cc: fix libjpeg build + +Fix the following libjpeg build failure raised since version 1.17.0 and +https://github.com/strukturag/libheif/commit/ebd13a20b8b7f1964939642b08b662ef7e483f39 +because third argument of jpeg_mem_dest is defined as size_t* on libjpeg +instead of unsigned long* on jpeg-turbo: + +/home/buildroot/autobuild/instance-3/output-1/build/libheif-1.17.5/libheif/plugins/encoder_jpeg.cc: In function 'heif_error jpeg_encode_image(void*, const heif_image*, heif_image_input_class)': +/home/buildroot/autobuild/instance-3/output-1/build/libheif-1.17.5/libheif/plugins/encoder_jpeg.cc:366:37: error: invalid conversion from 'long unsigned int*' to 'size_t*' {aka 'unsigned int*'} [-fpermissive] + 366 | jpeg_mem_dest(&cinfo, &outbuffer, &outlength); + | ^~~~~~~~~~ + | | + | long unsigned int* + +Fix #1008 and #1086 + +Fixes: + - http://autobuild.buildroot.org/results/8ca909564c8dabe28ad08c96ebbc04b25592e727 + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/strukturag/libheif/pull/1120 +--- + libheif/plugins/encoder_jpeg.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/libheif/plugins/encoder_jpeg.cc b/libheif/plugins/encoder_jpeg.cc +index d6c7854..21a5541 100644 +--- a/libheif/plugins/encoder_jpeg.cc ++++ b/libheif/plugins/encoder_jpeg.cc +@@ -360,7 +360,11 @@ struct heif_error jpeg_encode_image(void* encoder_raw, const struct heif_image* + } + + uint8_t* outbuffer = nullptr; ++#ifdef LIBJPEG_TURBO_VERSION + unsigned long outlength = 0; ++#else ++ size_t outlength = 0; ++#endif + + jpeg_create_compress(&cinfo); + jpeg_mem_dest(&cinfo, &outbuffer, &outlength); +-- +2.43.0 + From 5f253e3e04e57d72f470eead8591a2606f98d396 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Thu, 29 Feb 2024 18:12:57 +0100 Subject: [PATCH 5280/5754] support/scripts/cve: fix running on older ijson versions Commit 22b69455526f (support/scripts/cve.py: switch from NVD to FKIE for the JSON files) had to change the decompressor from gz to xz, as the new location is using xz compression. That commit mentioned that it was spawning an external xz process to do the decompression, on the pretence that "there is no xz decompressor in Python stdlib." Before version 3.1, ijson.items() only accepted a file-like object as input (that file-like object could yield bytes() or str(), both were supported). Starting with version 3.1, ijson.items() also accepts that it be directly passed bytes() or str() directly. subprocess.check_output() means we are now passing bytes() to ijson.items(), so it fails on ijson versions before 3.1, with failures such as: [...] File "/usr/lib/python3/dist-packages/ijson/backends/python.py", line 25, in Lexer if type(f.read(0)) == bytetype: AttributeError: 'bytes' object has no attribute 'read' Ubuntu 20.04, on which the pkg-stats run to generate the daily report, only has ijson 2.3. More recent distros have more recent versions of ijson, like Fedora 39 that has 3.2.3, recent enough to support being fed bytes(). Commit 22b69455526f was tested on Fedora 39, so did not catch the issue. However, the reasoning in 22b69455526f is wrong: there *is* the lzma module, at least since python 3.3 (that is, aeons ago), which is able to read xz-compressed files; it also has an API similar to the gzip module, and can provide a file-like object that exposes the decompressed data. So, do just that: provide an lzma-wrapped file-like object to ijson, so that we can eventually recover our daily reports that everything is broken! :-] Note that this construct still works on recent versions! Reported-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN Cc: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Peter Korsgaard --- support/scripts/cve.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/support/scripts/cve.py b/support/scripts/cve.py index 1a3c307e12..7167ecbc6a 100755 --- a/support/scripts/cve.py +++ b/support/scripts/cve.py @@ -21,8 +21,8 @@ import os import requests # URL checking import distutils.version +import lzma import time -import subprocess import sys import operator @@ -134,8 +134,7 @@ def read_nvd_dir(cls, nvd_dir): for year in range(NVD_START_YEAR, datetime.datetime.now().year + 1): filename = CVE.download_nvd_year(nvd_dir, year) try: - uncompressed = subprocess.check_output(["xz", "-d", "-c", filename]) - content = ijson.items(uncompressed, 'cve_items.item') + content = ijson.items(lzma.LZMAFile(filename), 'cve_items.item') except: # noqa: E722 print("ERROR: cannot read %s. Please remove the file then rerun this script" % filename) raise From 6ee61ef95b0e9e66d2d251049ddba3696e51f5a6 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 25 Feb 2024 16:23:13 +0100 Subject: [PATCH 5281/5754] utils/genrandconfig: fix BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH Commit b7232c51dd402afb361d7c310855e0bf5666958d added default setting for bare-metal toolchain arch but unfortunately it used configlines.add instead of configlines.append resulting in the following build failure: /bin/sh: line 8: /home/autobuild/autobuild/instance-1/output-1/per-package/host-gcc-bare-metal/host/bin/-ar: No such file or directory While at it, also append /n for consistency Fixes: b7232c51dd402afb361d7c310855e0bf5666958d - http://autobuild.buildroot.org/results/95ac565653ddb5c14ec71470c32a34ad10b048cb Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- utils/genrandconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/genrandconfig b/utils/genrandconfig index eb1f8cbd4a..5ebec415b5 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -315,9 +315,9 @@ def fixup_config(sysinfo, configfile): 'BR2_TOOLCHAIN_BUILDROOT=y' in configlines: return False - if 'BR2_TOOLCHAIN_BARE_METAL_BUILDROOT=y' in configlines: - configlines.remove('BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH=""') - configlines.add('BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH="microblazeel-xilinx-elf"') + if 'BR2_TOOLCHAIN_BARE_METAL_BUILDROOT=y\n' in configlines: + configlines.remove('BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH=""\n') + configlines.append('BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH="microblazeel-xilinx-elf"\n') if 'BR2_PACKAGE_AUFS_UTIL=y\n' in configlines and \ 'BR2_PACKAGE_AUFS_UTIL_VERSION=""\n' in configlines: From 64dbf7ff6a19acec1fa3a31853291ecd739a45b3 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 25 Feb 2024 14:38:18 +0100 Subject: [PATCH 5282/5754] package/libpthsem: fix build with autoconf >= 2.72 Move fi statement where it belongs to fix the following build failure raised since bump of autoconf to version 2.72 in commit 524f3536029dace3ce9aa154d3ca4685582e1955: checking for stack setup via makecontext... ./configure: line 15863: syntax error near unexpected token `;;' Fixes: 524f3536029dace3ce9aa154d3ca4685582e1955 - http://autobuild.buildroot.org/results/013e0d3f72582ce3675f65786c014518682d703b Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...lude.m4-fix-build-with-autoconf-2.72.patch | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 package/libpthsem/0002-acinclude.m4-fix-build-with-autoconf-2.72.patch diff --git a/package/libpthsem/0002-acinclude.m4-fix-build-with-autoconf-2.72.patch b/package/libpthsem/0002-acinclude.m4-fix-build-with-autoconf-2.72.patch new file mode 100644 index 0000000000..0c66482c3a --- /dev/null +++ b/package/libpthsem/0002-acinclude.m4-fix-build-with-autoconf-2.72.patch @@ -0,0 +1,36 @@ +From 3ec1a1c22142c547bc7f44622291bf0abdc322f1 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 25 Feb 2024 14:33:02 +0100 +Subject: [PATCH] acinclude.m4: fix build with autoconf >= 2.72 + +Move fi statement where it belongs to fix the following build failure +with autoconf >= 2.72: + +checking for stack setup via makecontext... ./configure: line 15863: syntax error near unexpected token `;;' + +Fixes: + - http://autobuild.buildroot.org/results/013e0d3f72582ce3675f65786c014518682d703b + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/linknx/pthsem/pull/1 +--- + acinclude.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/acinclude.m4 b/acinclude.m4 +index 03b42de..d74889f 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -1426,8 +1426,8 @@ ac_cv_stacksetup_$1='guessed:(skaddr),(sksize)' + ]) + dnl # restore original compile environment + CFLAGS="$OCFLAGS" +-])dnl + fi ++])dnl + dnl # extract result ingredients of single cached result value + type=`echo $ac_cv_stacksetup_$1 | sed -e 's;:.*$;;'` + addr=`echo $ac_cv_stacksetup_$1 | sed -e 's;^.*:;;' -e 's;,.*$;;'` +-- +2.43.0 + From 880e3ea32c9ed491d5c0fe0e6d4a97640311216d Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 1 Mar 2024 14:16:20 +0100 Subject: [PATCH 5283/5754] Update for 2023.11.2 Signed-off-by: Peter Korsgaard (cherry picked from commit f05246df4f864489451576a194e38a8679c7f5da) [Peter: drop Makefile change] Signed-off-by: Peter Korsgaard --- CHANGES | 33 +++++++++++++++++++++++++++++++++ support/misc/Vagrantfile | 2 +- 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 3abd4b2281..c029569a8d 100644 --- a/CHANGES +++ b/CHANGES @@ -57,6 +57,39 @@ #15910: USB keyboard is not working by default "raspberrypicm4io_.. #15952: Grub fails to load large rootfs files +2023.11.2, released March 1st, 2024 + + Important / security related fixes. + + Added CPE identifiers for a large number of packages. + + Updated/fixed packages: bayer2rgb-neon, brltty, c-ares, cog, + containerd, cpio, crda, criu, darkhttpd, davinci-bootcount, + dbus, depot-tools, dhcpcd, domoticz, environment-setup, expat, + faad2, falcosecurity-libs, flex, flutter-engine, + flutter-gallery, flutter-pi, flutter-sdk-bin, + freeradius-server, freerdp, frr, gesftpserver, glibc, gnutls, + go, gst1-devtools, gst1-libav, gst1-python, gst1-vaapi, + gst-omx, gstreamer1, haproxy, hiredis, joe, json-c, leptonica, + libcurl, libp11, libuwsc, libvips, libzenoh-pico, + linux-firmware, linux-headers, localedef, lua-http, lvm2, + lynx, mbedtls, micropython, minizip, mpfr, netatalk, ngrep, + onevpl, opencv4, opencv4-contrib, openssh, opus, petitboot, + php, python-aiohttp, python-bitarray, python-bitstring, + python-esptool, python-gunicorn, python-hpack, + python-html5lib, python-lmdb, python-mako, python-numpy, + python-oauthlib, python-sqlparse, python-wheel, qt5base, + qt6base, redis, runc, sdl2, sqlite, syslog-ng, sysstat, + util-linux, vulkan-loader, webkitgtk, weston, wireless-regdb, + wlroots, wpewebkit, xlib_libXpm, xterm, xwayland, yasm + + New packages: python-bitarray + + Issues resolved (http://bugs.uclibc.org): + + #10096: SH4 toolchain does not build Linux kernel magicpa.. + #15952: Grub fails to load large rootfs files + 2023.11.1, released January 15th, 2024 Important / security related fixes. diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile index 64c479b693..ba06c5f5fd 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2023.11.1' +RELEASE='2023.11.2' ### Change here for more memory/cores ### VM_MEMORY=2048 From 6711c8231ac6b1d9473f8074b22212a4db1b3b65 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 1 Mar 2024 14:44:47 +0100 Subject: [PATCH 5284/5754] docs/website: Update for 2023.11.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 ece22e409d..a5285e21a4 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -42,37 +42,37 @@

                                                      buildroot-2023.02.9.tar.xz

                                                      -

                                                      Latest stable release: 2023.11.1

                                                      +

                                                      Latest stable release: 2023.11.2

                                                      - +
                                                      - +
                                                      -

                                                      buildroot-2023.11.1.tar.gz

                                                      -

                                                      PGP signature

                                                      +

                                                      buildroot-2023.11.2.tar.gz

                                                      +

                                                      PGP signature

                                                      - +
                                                      - +
                                                      -

                                                      buildroot-2023.11.1.tar.xz

                                                      -

                                                      PGP signature

                                                      +

                                                      buildroot-2023.11.2.tar.xz

                                                      +

                                                      PGP signature

                                                      diff --git a/docs/website/news.html b/docs/website/news.html index 89dc740699..c3126342be 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,25 @@

                                                      News

                                                        +
                                                      • +
                                                        +
                                                        +
                                                        +

                                                        2023.11.2 released

                                                        +

                                                        1 March 2024

                                                        +
                                                        +
                                                        +

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

                                                        +
                                                        +
                                                        +
                                                        • +
                                                      • From ccf6574061ee7e247f840ee39f5a6feaeb415e38 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 1 Mar 2024 17:45:29 +0100 Subject: [PATCH 5285/5754] Update for 2023.02.10 Signed-off-by: Peter Korsgaard (cherry picked from commit 10d272ec99344e3e3d95dce92734de7eee9fdef1) [Peter: drop Makefile/Vagrantfile changes] Signed-off-by: Peter Korsgaard --- CHANGES | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/CHANGES b/CHANGES index c029569a8d..de69ddf54c 100644 --- a/CHANGES +++ b/CHANGES @@ -640,6 +640,33 @@ #15376: Libiconv config #15461: QtVirtualKeyboard segfaults +2023.02.10, released March 1st, 2024 + + Important / security related fixes. + + Added CPE identifiers for a large number of packages. + + Updated/fixed packages: bayer2rgb-neon, brltty, c-ares, + containerd, crda, darkhttpd, davinci-bootcount, dbus, + domoticz, environment-setup, expat, faad2, falcosecurity-libs, + flex, freeradius-server, freerdp, frr, gesftpserver, glibc, + gnutls, go, gst1-devtools, gst1-libav, gst1-python, + gst1-vaapi, gst-omx, gstreamer1, haproxy, joe, json-c, + leptonica, libcurl, libuwsc, libvips, linux-firmware, + linux-headers, localedef, lua-http, lvm2, lynx, mbedtls, + micropython, minizip, mpfr, netatalk, ngrep, opencv4, + opencv4-contrib, openssh, opus, php, python-aiohttp, + python-esptool, python-gunicorn, python-hpack, + python-html5lib, python-lmdb, python-mako, python-numpy, + python-oauthlib, python-sqlparse, qt5base, qt6base, redis, + runc, sdl2, sqlite, sysstat, uuu, webkitgtk, wireless-regdb, + wpewebkit, xlib_libXpm, xterm, xwayland, yasm + + Issues resolved (http://bugs.uclibc.org): + + #10096: SH4 toolchain does not build Linux kernel magicpa.. + #15952: Grub fails to load large rootfs files + 2023.02.9, released January 15th, 2024 Important / security related fixes. From 382a157dc03015abaed953362a0790e31d1b2d3f Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 1 Mar 2024 17:59:27 +0100 Subject: [PATCH 5286/5754] docs/website: Update for 2023.02.10 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 a5285e21a4..5212812411 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -8,37 +8,37 @@
                                                        Download
                                                        -

                                                        Latest long term support release: 2023.02.9

                                                        +

                                                        Latest long term support release: 2023.02.10

                                                        - +
                                                        - +
                                                        -

                                                        buildroot-2023.02.9.tar.gz

                                                        -

                                                        PGP signature

                                                        +

                                                        buildroot-2023.02.10.tar.gz

                                                        +

                                                        PGP signature

                                                        - +
                                                        - +
                                                        -

                                                        buildroot-2023.02.9.tar.xz

                                                        -

                                                        PGP signature

                                                        +

                                                        buildroot-2023.02.10.tar.xz

                                                        +

                                                        PGP signature

                                                        diff --git a/docs/website/news.html b/docs/website/news.html index c3126342be..df5669bd19 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,25 @@

                                                        News

                                                          +
                                                        • +
                                                          +
                                                          +
                                                          +

                                                          2023.02.10 released

                                                          +

                                                          1 March 2024

                                                          +
                                                          +
                                                          +

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

                                                          +
                                                          +
                                                          +
                                                          • +
                                                        • From 66a202325a98a48013bad70de29d88f733ce5903 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 29 Feb 2024 22:56:41 +0100 Subject: [PATCH 5287/5754] boot/shim: force arm mode instead of Thumb mode Use OPTIMIZATIONS parameter to pass -marm to fix the following build failure in Thumb mode: /tmp/ccEjPM4h.s:941: Error: selected processor does not support `mrc p15,0,r2,c9,c13,0' in Thumb mode CFLAGS can't be overridden as it is defined as: CFLAGS = $(FEATUREFLAGS) \ $(OPTIMIZATIONS) \ $(WARNFLAGS) \ $(if $(findstring clang,$(CC)),$(CLANG_WARNINGS)) \ $(ARCH_CFLAGS) \ $(WERRFLAGS) \ $(INCLUDES) \ $(DEFINES) Fixes: - http://autobuild.buildroot.org/results/580156f89cfd72122fef07aa2fe37b4fdd4c316b - http://autobuild.buildroot.org/results/8980c0f422516c7263d8d0c9cc6123f30c4b7ee4 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- boot/shim/shim.mk | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/boot/shim/shim.mk b/boot/shim/shim.mk index 19b11f4086..ae57677320 100644 --- a/boot/shim/shim.mk +++ b/boot/shim/shim.mk @@ -13,10 +13,19 @@ SHIM_CPE_ID_VENDOR = redhat SHIM_INSTALL_TARGET = NO SHIM_INSTALL_IMAGES = YES +SHIM_CFLAGS = $(TARGET_CFLAGS) SHIM_MAKE_OPTS = \ ARCH="$(GNU_EFI_PLATFORM)" \ CROSS_COMPILE="$(TARGET_CROSS)" \ - DASHJ="-j$(PARALLEL_JOBS)" + DASHJ="-j$(PARALLEL_JOBS)" \ + OPTIMIZATIONS="$(SHIM_CFLAGS)" + +# shim has some assembly function that is not present in Thumb mode: +# Error: selected processor does not support `mrc p15,0,r2,c9,c13,0' in Thumb mode +# so, we desactivate Thumb mode +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +SHIM_CFLAGS += -marm +endif define SHIM_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) $(SHIM_MAKE_OPTS) From d2c99d32bf4d0c4f77377d5a8fd4fb86f22e7caa Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 1 Mar 2024 18:49:34 +0100 Subject: [PATCH 5288/5754] package/rhash: fix NLS build Fix the following NLS build failure raised since bump to version 1.4.4 in commit f9b465c66c42e936a80292f7854f605d4c88564e: ./configure: line 879: -lintl: command not found [...] /home/buildroot/autobuild/run/instance-0/output-1/host/bin/xtensa-linux-gcc calc_sums.o hash_print.o common_func.o hash_update.o file.o file_mask.o file_set.o find_file.o hash_check.o output.o parse_cmdline.o rhash_main.o win_utils.o librhash/librhash.so.1.4.4 -o rhash /home/buildroot/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/xtensa-buildroot-linux-uclibc/12.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: calc_sums.o:(.literal.rename_file_by_embeding_crc32+0x10): undefined reference to `libintl_gettext' Fixes: f9b465c66c42e936a80292f7854f605d4c88564e - http://autobuild.buildroot.org/results/f8dd8ea6c0c9cd428355e3720e679a078b8e0f8f Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...ct-assigment-in-the-configure-script.patch | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 package/rhash/0001-Fix-243-Incorrect-assigment-in-the-configure-script.patch diff --git a/package/rhash/0001-Fix-243-Incorrect-assigment-in-the-configure-script.patch b/package/rhash/0001-Fix-243-Incorrect-assigment-in-the-configure-script.patch new file mode 100644 index 0000000000..4a9a81dbf5 --- /dev/null +++ b/package/rhash/0001-Fix-243-Incorrect-assigment-in-the-configure-script.patch @@ -0,0 +1,24 @@ +From c804982d1b24c6533118b3068d2cfdca685076f3 Mon Sep 17 00:00:00 2001 +From: Aleksey Kravchenko +Date: Mon, 7 Aug 2023 01:00:37 +0300 +Subject: [PATCH] Fix #243: Incorrect assigment in the configure script + +Upstream: https://github.com/rhash/RHash/commit/c804982d1b24c6533118b3068d2cfdca685076f3 +Signed-off-by: Fabrice Fontaine +--- + configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure b/configure +index 39ef8c1..63cbd8d 100755 +--- a/configure ++++ b/configure +@@ -877,7 +877,7 @@ if test "$OPT_STATIC" = "no"; then + RHASH_TEST_OPTIONS=--shared + test "$INSTALL_LIB_SHARED" = "auto" && INSTALL_LIB_SHARED=yes + test "$INSTALL_LIB_STATIC" = "yes" && RHASH_BUILD_TARGETS="$RHASH_BUILD_TARGETS \$(LIBRHASH_STATIC)" +- RHASH_LDFLAGS=$RHASH_LDFLAGS $GETTEXT_LDFLAGS ++ RHASH_LDFLAGS=$(join_params $RHASH_LDFLAGS $GETTEXT_LDFLAGS) + else + LIBRHASH_TYPE=static + LIBRHASH_PATH="\$(LIBRHASH_STATIC)" From 1e576592607705d397220b9a5907265f052dcb95 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 1 Mar 2024 18:47:35 +0100 Subject: [PATCH 5289/5754] package/squid: needs C++17 C++17 is mandatory since bump to version 6.2 in commit 2a7c6816f02f45946e896577d78e3470331b2d63 and https://github.com/squid-cache/squid/commit/09835feb258c3058d028918e36d959dccb3f7496 resulting in the following build failure: configure: error: *** A compiler with support for C++17 language features is required. Fixes: 2a7c6816f02f45946e896577d78e3470331b2d63 - http://autobuild.buildroot.org/results/06755c324f0bf37e52976fce48a5ad62915193da Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/squid/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/squid/Config.in b/package/squid/Config.in index 6272140768..89b5a377c7 100644 --- a/package/squid/Config.in +++ b/package/squid/Config.in @@ -1,10 +1,10 @@ -comment "squid needs a toolchain w/ C++, threads, gcc >= 4.8 not affected by bug 64735" +comment "squid needs a toolchain w/ C++, threads, gcc >= 7 not affected by bug 64735" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 || \ !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + !BR2_TOOLCHAIN_GCC_AT_LEAST_7 config BR2_PACKAGE_SQUID bool "squid" @@ -12,7 +12,7 @@ config BR2_PACKAGE_SQUID depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::current_exception - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 # needs fork() depends on BR2_USE_MMU select BR2_PACKAGE_LIBCAP From 7fcb4469dbd2392c3210293d04d9776190280373 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 1 Mar 2024 18:50:56 +0100 Subject: [PATCH 5290/5754] package/newlib-bare-metal: fix build without makeinfo Fix the following build failure without makeinfo raised since the addition of the package in commit 3b95ff658bf4859eb5cffd28cbbedd1826fad9a6: make[5]: Entering directory '/home/buildroot/autobuild/instance-2/output-1/build/newlib-bare-metal-4.4.0/microblazeel-xilinx-elf/libgloss' MAKEINFO ../.././libgloss/doc/porting.info /home/buildroot/autobuild/instance-2/output-1/build/newlib-bare-metal-4.4.0/missing: line 81: makeinfo: command not found Fixes: 3b95ff658bf4859eb5cffd28cbbedd1826fad9a6 - http://autobuild.buildroot.org/results/23e6641cbce62258310c300f8aed5d6a76973d72 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/newlib-bare-metal/newlib-bare-metal.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/newlib-bare-metal/newlib-bare-metal.mk b/package/newlib-bare-metal/newlib-bare-metal.mk index 452bc4da25..e1b46fbc88 100644 --- a/package/newlib-bare-metal/newlib-bare-metal.mk +++ b/package/newlib-bare-metal/newlib-bare-metal.mk @@ -18,6 +18,7 @@ NEWLIB_BARE_METAL_LICENSE_FILES = \ NEWLIB_BARE_METAL_INSTALL_STAGING = YES NEWLIB_BARE_METAL_INSTALL_TARGET = NO +NEWLIB_BARE_METAL_MAKE_OPTS = MAKEINFO=true define NEWLIB_BARE_METAL_CONFIGURE_CMDS (cd $(@D) && \ @@ -34,11 +35,12 @@ define NEWLIB_BARE_METAL_CONFIGURE_CMDS endef define NEWLIB_BARE_METAL_BUILD_CMDS - PATH=$(BR_PATH) $(MAKE1) -C $(@D) + PATH=$(BR_PATH) $(MAKE1) $(NEWLIB_BARE_METAL_MAKE_OPTS) -C $(@D) endef define NEWLIB_BARE_METAL_INSTALL_STAGING_CMDS - PATH=$(BR_PATH) $(MAKE1) -C $(@D) DESTDIR=$(TOOLCHAIN_BARE_METAL_BUILDROOT_SYSROOT) install + PATH=$(BR_PATH) $(MAKE1) -C $(@D) $(NEWLIB_BARE_METAL_MAKE_OPTS) \ + DESTDIR=$(TOOLCHAIN_BARE_METAL_BUILDROOT_SYSROOT) install endef define NEWLIB_BARE_METAL_FIXUP From fd3f953c7883b2a5d30cff03c92e34a2b2718953 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Wed, 28 Feb 2024 19:14:11 +0100 Subject: [PATCH 5291/5754] boot/syslinux: fix build with gnu-efi >= 3.0.16 Commit fa9893ad8f "package/gnu-efi: bump to version 3.0.17" updated gnu-efi. This update introduced syslinux build failure, as reported in [1]. This commit adds a package patch to fix this issue. For technical details of the issue, see the package patch commit log. Fixes: - https://gitlab.com/buildroot.org/buildroot/-/jobs/6256880937 - https://gitlab.com/buildroot.org/buildroot/-/jobs/6256880949 [1] https://lists.buildroot.org/pipermail/buildroot/2024-February/685971.html Signed-off-by: Julien Olivain Reviewed-by: Romain Naour Signed-off-by: Peter Korsgaard --- ...stddef.h-add-wchar_t-type-definition.patch | 59 +++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 boot/syslinux/0019-stddef.h-add-wchar_t-type-definition.patch diff --git a/boot/syslinux/0019-stddef.h-add-wchar_t-type-definition.patch b/boot/syslinux/0019-stddef.h-add-wchar_t-type-definition.patch new file mode 100644 index 0000000000..65d9463a6f --- /dev/null +++ b/boot/syslinux/0019-stddef.h-add-wchar_t-type-definition.patch @@ -0,0 +1,59 @@ +From 063dac55c45d0264671c3463e824ab659e5cbb87 Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Tue, 27 Feb 2024 21:09:15 +0100 +Subject: [PATCH] stddef.h: add wchar_t type definition + +Syslinux fail to build with gnu-efi >= 3.0.16 with error: + + In file included from /host/i686-buildroot-linux-gnu/sysroot/usr/include/efi/efi.h:44, + from /build/syslinux-6.03/efi/efi.h:23, + from /build/syslinux-6.03/efi/adv.h:4, + from /build/syslinux-6.03/efi/adv.c:29: + /host/i686-buildroot-linux-gnu/sysroot/usr/include/efi/ia32/efibind.h:90:9: error: unknown type name 'wchar_t' + typedef wchar_t CHAR16; + ^~~~~~~ + +This is because gnu-efi started to use the "wchar_t" type from the +toolchain's header, in commit [1]. Before this commit, +gnu-efi was defining the type as "short". + +Syslinux is including its own minimal stddef.h file, which masks the +one provided by the toolchain. See [2]. This file does not have a type +definition for "wchar_t". + +Finally, the POSIX header is supposed to provide this +"wchar_t" type definition. See [3]. + +This commit fixes the issue by adding the "wchar_t" type definition in +the com32/include/stddef.h header. Since Syslinux has "-fshort-wchar" +in its CFLAGS (see [4]), "wchar_t" is simply defined as "short". This +also follow the previous gnu-efi < 3.0.16 behavior. + +This issue was seen in Buildroot Linux, in [5]. + +[1] https://sourceforge.net/p/gnu-efi/code/ci/189200d0b0f6fff473d302880d9569f45d4d8c4d +[2] https://repo.or.cz/syslinux.git/blob/refs/tags/syslinux-6.03:/com32/include/stddef.h +[3] https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/stddef.h.html +[4] https://repo.or.cz/syslinux.git/blob/refs/tags/syslinux-6.03:/mk/efi.mk#l27 +[5] https://lists.buildroot.org/pipermail/buildroot/2024-February/685971.html + +Upstream: Proposed: https://www.syslinux.org/archives/2024-February/026903.html +Signed-off-by: Julien Olivain +--- + com32/include/stddef.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/com32/include/stddef.h b/com32/include/stddef.h +index f52d62f3..437b11f2 100644 +--- a/com32/include/stddef.h ++++ b/com32/include/stddef.h +@@ -29,4 +29,6 @@ + */ + #define container_of(p, c, m) ((c *)((char *)(p) - offsetof(c,m))) + ++typedef short wchar_t; ++ + #endif /* _STDDEF_H */ +-- +2.44.0 + From def3b9d9a8f17398f280950b35eae0cf22d67bd8 Mon Sep 17 00:00:00 2001 From: Christian Hitz Date: Wed, 28 Feb 2024 16:01:46 +0100 Subject: [PATCH 5292/5754] package/freetype: use correct license format for dual licensed package Signed-off-by: Christian Hitz Signed-off-by: Peter Korsgaard --- package/freetype/freetype.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk index 1f4bcaf341..5032414d63 100644 --- a/package/freetype/freetype.mk +++ b/package/freetype/freetype.mk @@ -9,7 +9,7 @@ FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.xz FREETYPE_SITE = http://download.savannah.gnu.org/releases/freetype FREETYPE_INSTALL_STAGING = YES FREETYPE_MAKE_OPTS = CCexe="$(HOSTCC)" -FREETYPE_LICENSE = Dual FTL/GPL-2.0+ +FREETYPE_LICENSE = FTL or GPL-2.0+ FREETYPE_LICENSE_FILES = LICENSE.TXT docs/FTL.TXT docs/GPLv2.TXT FREETYPE_CPE_ID_VENDOR = freetype FREETYPE_DEPENDENCIES = host-pkgconf From 82afcacb620b834cef157a8c2d9ad54ff76e4e4f Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 25 Feb 2024 23:57:28 +0100 Subject: [PATCH 5293/5754] package/dracut: fix dracut_wrapper As reported by Thierry Bultel [1], dracut doesn't work since the version bump to version 059. Further investigation by Andreas Naumann [2] reported that the issue come from this commit d010fa0 refactor(dracut-install): fork() instead of popen(), sanitise line reading [3]. The issue come from our dracut_wrapper and how DRACUT_LDD is defined. Indeed dracut expect DRACUT_LDD=ldd or a single binary (without arguments) but we are using "prelink-rtld --root='${sysroot}'". With the change introduced by [3], our DRACUT_LDD is used directly by execlp() leading to an error: execlp(ldd, ldd, fullsrcpath, (char *)NULL); Use mktemp to generate a temporary dracut-ldd script using prelink-rtld --root='${sysroot}' ${1} execute dracut.real in a subshell to cleanup the temporary file at the end of the dracut wrapper script. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6224243423 [tests.fs.test_cpio.TestCpioDracutGlibcMergedUsr] https://gitlab.com/buildroot.org/buildroot/-/jobs/6224243434 [tests.fs.test_cpio.TestCpioDracutMuslMergedUsr] https://gitlab.com/buildroot.org/buildroot/-/jobs/6224243567 [tests.fs.test_cpio.TestCpioDracutUclibcMergedUsr] https://gitlab.com/buildroot.org/buildroot/-/jobs/6224243559 [tests.fs.test_cpio.TestCpioDracutGlibc] https://gitlab.com/buildroot.org/buildroot/-/jobs/6224243504 [tests.fs.test_cpio.TestCpioDracutUclibc] https://gitlab.com/buildroot.org/buildroot/-/jobs/6224243498 [tests.fs.test_cpio.TestCpioDracutMusl] [1] http://lists.busybox.net/pipermail/buildroot/2024-February/684145.html [2] http://lists.busybox.net/pipermail/buildroot/2024-February/684503.html [3] https://github.com/dracutdevs/dracut/commit/d010fa0d7f8ef42ad31729d027d2e4be6dd6e588 Fixes: 145f01ded5 ("package/dracut: bump to version 059") Reported-by: Thierry Bultel Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- package/dracut/dracut_wrapper | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/package/dracut/dracut_wrapper b/package/dracut/dracut_wrapper index 0464db17fe..968d65cbeb 100644 --- a/package/dracut/dracut_wrapper +++ b/package/dracut/dracut_wrapper @@ -31,8 +31,18 @@ if [ -z "${sysroot}" ]; then fi topdir="$(dirname "$(realpath "$(dirname "${0}")")")" -export DRACUT_LDD="${topdir}/sbin/prelink-rtld --root='${sysroot}'" +DRACUT_LDD="$(mktemp /tmp/dracut-ldd.XXXXXX)" +cat >"${DRACUT_LDD}" < Date: Sun, 25 Feb 2024 12:44:13 +0100 Subject: [PATCH 5294/5754] configs/qemu_microblaze{be, el}: remove xilinx xemaclite patch needed for qemu < 2.2.0 We carried a patch for xilinx xemaclite that was made initially for qemu < 2.2.0 [1]. Indeed, between Qemu 0.11.0 and 2.2.0 the devicetree binary blob petalogix-s3adsp1800.dtb (bundled in Qemu sources) used a compatible string 'xlnx,xps-ethernetlite-2.00.b' that was not supported by the Linux kernel [2]. These patches could have been removed since Buildroot 2015.02 when this defconfig was tested with Qemu 2.2.0 [3]. [1] https://git.buildroot.net/buildroot/commit/board/qemu/microblazebe-mmu/xilinx-xemaclite.patch?id=fa2798548368d51998fad18d7f6d1ae0ed065b33 [2] https://gitlab.com/qemu-project/qemu/-/commit/c21fd2c79e1fcaf45582f2dd4deb491c257aa9f2 [3] https://gitlab.com/buildroot.org/buildroot/-/commit/312990555c4d7d1cccd26e0728ad0d4ec86820a7 Cc: Waldemar Brodkorb Signed-off-by: Romain Naour [Peter: drop drom .checkpackageignore] Signed-off-by: Peter Korsgaard --- .checkpackageignore | 2 -- ...xilinx-xemaclite-add-2.00.b-revision.patch | 34 ------------------- ...xilinx-xemaclite-add-2.00.b-revision.patch | 34 ------------------- configs/qemu_microblazebe_mmu_defconfig | 1 - configs/qemu_microblazeel_mmu_defconfig | 1 - 5 files changed, 72 deletions(-) delete mode 100644 board/qemu/microblazebe-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch delete mode 100644 board/qemu/microblazeel-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch diff --git a/.checkpackageignore b/.checkpackageignore index a6cc58c448..c18cc4d417 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -71,8 +71,6 @@ board/pine64/rock64/patches/uboot/0001-Makefile-rk3328-needs-itb-image-to-boot-p 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/x86/post-build.sh Shellcheck board/qemu/x86_64/post-build.sh Shellcheck board/radxa/rockpi-n8/post-build.sh Shellcheck diff --git a/board/qemu/microblazebe-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch b/board/qemu/microblazebe-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch deleted file mode 100644 index eb3859f858..0000000000 --- a/board/qemu/microblazebe-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch +++ /dev/null @@ -1,34 +0,0 @@ -From e96b73478232aa42b773cd19371808af69fd4b95 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Sat, 25 Apr 2020 09:49:11 +0200 -Subject: [PATCH] net: xilinx: xemaclite: add 2.00.b revision - -Patch added for the kernel 3.14 -- fix networking in Qemu using a small patch -- disable DTS, because linux.bin does not include any DTB the - default Qemu included DTB is used and this is okay and works fine - -https://git.buildroot.net/buildroot/commit/board/qemu/microblazebe-mmu/xilinx-xemaclite.patch?id=fa2798548368d51998fad18d7f6d1ae0ed065b33 - -[Romain: convert to git format] -Signed-off-by: Romain Naour -Cc: Waldemar Brodkorb ---- - drivers/net/ethernet/xilinx/xilinx_emaclite.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/drivers/net/ethernet/xilinx/xilinx_emaclite.c b/drivers/net/ethernet/xilinx/xilinx_emaclite.c -index 0de52e70abcc..d8c13140ca77 100644 ---- a/drivers/net/ethernet/xilinx/xilinx_emaclite.c -+++ b/drivers/net/ethernet/xilinx/xilinx_emaclite.c -@@ -1278,6 +1278,7 @@ static const struct of_device_id xemaclite_of_match[] = { - { .compatible = "xlnx,opb-ethernetlite-1.01.b", }, - { .compatible = "xlnx,xps-ethernetlite-1.00.a", }, - { .compatible = "xlnx,xps-ethernetlite-2.00.a", }, -+ { .compatible = "xlnx,xps-ethernetlite-2.00.b", }, - { .compatible = "xlnx,xps-ethernetlite-2.01.a", }, - { .compatible = "xlnx,xps-ethernetlite-3.00.a", }, - { /* end of list */ }, --- -2.25.3 - diff --git a/board/qemu/microblazeel-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch b/board/qemu/microblazeel-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch deleted file mode 100644 index eb3859f858..0000000000 --- a/board/qemu/microblazeel-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch +++ /dev/null @@ -1,34 +0,0 @@ -From e96b73478232aa42b773cd19371808af69fd4b95 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Sat, 25 Apr 2020 09:49:11 +0200 -Subject: [PATCH] net: xilinx: xemaclite: add 2.00.b revision - -Patch added for the kernel 3.14 -- fix networking in Qemu using a small patch -- disable DTS, because linux.bin does not include any DTB the - default Qemu included DTB is used and this is okay and works fine - -https://git.buildroot.net/buildroot/commit/board/qemu/microblazebe-mmu/xilinx-xemaclite.patch?id=fa2798548368d51998fad18d7f6d1ae0ed065b33 - -[Romain: convert to git format] -Signed-off-by: Romain Naour -Cc: Waldemar Brodkorb ---- - drivers/net/ethernet/xilinx/xilinx_emaclite.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/drivers/net/ethernet/xilinx/xilinx_emaclite.c b/drivers/net/ethernet/xilinx/xilinx_emaclite.c -index 0de52e70abcc..d8c13140ca77 100644 ---- a/drivers/net/ethernet/xilinx/xilinx_emaclite.c -+++ b/drivers/net/ethernet/xilinx/xilinx_emaclite.c -@@ -1278,6 +1278,7 @@ static const struct of_device_id xemaclite_of_match[] = { - { .compatible = "xlnx,opb-ethernetlite-1.01.b", }, - { .compatible = "xlnx,xps-ethernetlite-1.00.a", }, - { .compatible = "xlnx,xps-ethernetlite-2.00.a", }, -+ { .compatible = "xlnx,xps-ethernetlite-2.00.b", }, - { .compatible = "xlnx,xps-ethernetlite-2.01.a", }, - { .compatible = "xlnx,xps-ethernetlite-3.00.a", }, - { /* end of list */ }, --- -2.25.3 - diff --git a/configs/qemu_microblazebe_mmu_defconfig b/configs/qemu_microblazebe_mmu_defconfig index e02b8dae2f..a93ef3564d 100644 --- a/configs/qemu_microblazebe_mmu_defconfig +++ b/configs/qemu_microblazebe_mmu_defconfig @@ -24,7 +24,6 @@ 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 -BR2_LINUX_KERNEL_PATCH="board/qemu/microblazebe-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch" # host-qemu for gitlab testing BR2_PACKAGE_HOST_QEMU=y diff --git a/configs/qemu_microblazeel_mmu_defconfig b/configs/qemu_microblazeel_mmu_defconfig index 146bbb67de..0b00b58b4e 100644 --- a/configs/qemu_microblazeel_mmu_defconfig +++ b/configs/qemu_microblazeel_mmu_defconfig @@ -24,7 +24,6 @@ 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 -BR2_LINUX_KERNEL_PATCH="board/qemu/microblazeel-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch" # host-qemu for gitlab testing BR2_PACKAGE_HOST_QEMU=y From dee6974d729da81f80d310df262436a6136164a0 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 1 Mar 2024 19:33:49 +0100 Subject: [PATCH 5295/5754] package/redis: disable -Werror Disable -Werror to avoid the following build failure raised since bump to version 7.2.1 in commit d49f53f8aaf0bff9c8d04c16485c844fef2832d0 and https://github.com/redis/redis/commit/8e138ba44fc3eb676c0f31faac19d1acc6a4c7ed: In function 'hi_sdsll2str', inlined from 'hi_sdsfromlonglong' at sds.c:500:15: sds.c:457:12: error: writing 1 byte into a region of size 0 [-Werror=stringop-overflow=] 457 | *s = *p; | ~~~^~~~ Fixes: d49f53f8aaf0bff9c8d04c16485c844fef2832d0 - http://autobuild.buildroot.org/results/fdc9f940b348430cb4da8efecc5cc047b21df281 - http://autobuild.buildroot.org/results/e5747674d52b065203a0442f7cab13e8be5f426b Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/redis/redis.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/redis/redis.mk b/package/redis/redis.mk index 09a3b9448b..2680b11b74 100644 --- a/package/redis/redis.mk +++ b/package/redis/redis.mk @@ -30,7 +30,7 @@ endif # https://github.com/antirez/redis/pull/609). We set PREFIX # instead. REDIS_BUILDOPTS = $(TARGET_CONFIGURE_OPTS) \ - PREFIX=$(TARGET_DIR)/usr MALLOC=libc + PREFIX=$(TARGET_DIR)/usr MALLOC=libc WARNINGS= ifeq ($(BR2_PACKAGE_SYSTEMD),y) REDIS_DEPENDENCIES += systemd From 31f4bf275da4ba349eed0fe2581ba8bdeae59daa Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 1 Mar 2024 19:36:29 +0100 Subject: [PATCH 5296/5754] package/newlib-bare-metal: fix legal-info Hash of COPYING.NEWLIB is wrong since the addition of the package in commit 3b95ff658bf4859eb5cffd28cbbedd1826fad9a6: ERROR: COPYING.NEWLIB has wrong sha256 hash: ERROR: expected: 422aa40293093fb54fc66e692a0d68fd0b24ed5602e5d1d33ad05ba3909057e9 ERROR: got : 9a59b4ee3af067045fe0ea78786201c42d54756fe48cbccf44f3dfc398474717 Fixes: 3b95ff658bf4859eb5cffd28cbbedd1826fad9a6 - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/newlib-bare-metal/newlib-bare-metal.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/newlib-bare-metal/newlib-bare-metal.hash b/package/newlib-bare-metal/newlib-bare-metal.hash index f8c553cf86..827925373e 100644 --- a/package/newlib-bare-metal/newlib-bare-metal.hash +++ b/package/newlib-bare-metal/newlib-bare-metal.hash @@ -5,4 +5,4 @@ sha256 0c166a39e1bf0951dfafcd68949fe0e4b6d3658081d6282f39aeefc6310f2f13 newlib sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LIB sha256 f3b7f3e4426b1fa6f60198dae7adfedd94b77b28db2d108adc0253575011e0ff COPYING.LIBGLOSS -sha256 422aa40293093fb54fc66e692a0d68fd0b24ed5602e5d1d33ad05ba3909057e9 COPYING.NEWLIB +sha256 9a59b4ee3af067045fe0ea78786201c42d54756fe48cbccf44f3dfc398474717 COPYING.NEWLIB From 3a8a87f107b916a65e0328ddd5d7f14386de11f9 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 1 Mar 2024 19:37:56 +0100 Subject: [PATCH 5297/5754] package/newlib-bare-metal: update NEWLIB_BARE_METAL_VERSION Update NEWLIB_BARE_METAL_VERSION to match version retrieved on https://release-monitoring.org/project/13816 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/newlib-bare-metal/newlib-bare-metal.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/newlib-bare-metal/newlib-bare-metal.mk b/package/newlib-bare-metal/newlib-bare-metal.mk index e1b46fbc88..f27da4284b 100644 --- a/package/newlib-bare-metal/newlib-bare-metal.mk +++ b/package/newlib-bare-metal/newlib-bare-metal.mk @@ -4,9 +4,9 @@ # ################################################################################ -NEWLIB_BARE_METAL_VERSION = 4.4.0 +NEWLIB_BARE_METAL_VERSION = 4.4.0.20231231 NEWLIB_BARE_METAL_SITE = ftp://sourceware.org/pub/newlib -NEWLIB_BARE_METAL_SOURCE = newlib-$(NEWLIB_BARE_METAL_VERSION).20231231.tar.gz +NEWLIB_BARE_METAL_SOURCE = newlib-$(NEWLIB_BARE_METAL_VERSION).tar.gz NEWLIB_BARE_METAL_DEPENDENCIES = host-gcc-bare-metal NEWLIB_BARE_METAL_ADD_TOOLCHAIN_DEPENDENCY = NO NEWLIB_BARE_METAL_LICENSE = GPL-2.0, GPL-3.0, LGPL-2.1, LGPL-3.0 From e1e292c0449e7d56de60ccd4b670f02cbe64c0c8 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 1 Mar 2024 19:51:57 +0100 Subject: [PATCH 5298/5754] Update for 2024.02-rc2 Signed-off-by: Peter Korsgaard --- CHANGES | 11 +++++++++++ Makefile | 4 ++-- docs/website/download.html | 18 +++++++++--------- docs/website/news.html | 21 +++++++++++++++++++++ 4 files changed, 43 insertions(+), 11 deletions(-) diff --git a/CHANGES b/CHANGES index de69ddf54c..d5f1bf5794 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,14 @@ +2024.02-rc2, released March 1st, 2024 + + Fixes all over the tree. + + Infrastructure: Various fixes for pkg-stats after moving to + the FKIE CVE feed and support for older python/ijson versions. + + Updated/fixed packages: ccache, dracut, erlang, freetype, + libheif, libpthsem, micropython, newlib-bare-metal, openssh, + poco, python3, redis, rhash, shim, squid, syslinux + 2024.02-rc1, released February 25th, 2024 Fixes all over the tree and new features. diff --git a/Makefile b/Makefile index dc1271825e..3389da2852 100644 --- a/Makefile +++ b/Makefile @@ -90,9 +90,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2024.02-rc1 +export BR2_VERSION := 2024.02-rc2 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1708860000 +BR2_VERSION_EPOCH = 1709318000 # 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 5212812411..70a1de5b6d 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -76,37 +76,37 @@

                                                          buildroot-2023.11.2.tar.xz

                                                          -

                                                          Latest release candidate: 2024.02-rc1

                                                          +

                                                          Latest release candidate: 2024.02-rc2

                                                          - +
                                                          - +
                                                          -

                                                          buildroot-2024.02-rc1.tar.gz

                                                          -

                                                          PGP signature

                                                          +

                                                          buildroot-2024.02-rc2.tar.gz

                                                          +

                                                          PGP signature

                                                          - +
                                                          - +
                                                          -

                                                          buildroot-2024.02-rc1.tar.xz

                                                          -

                                                          PGP signature

                                                          +

                                                          buildroot-2024.02-rc2.tar.xz

                                                          +

                                                          PGP signature

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

                                                          News

                                                            +
                                                          • +
                                                            +
                                                            +
                                                            +

                                                            2024.02-rc2 released

                                                            +

                                                            1 March 2024

                                                            +
                                                            +
                                                            +

                                                            Another week, another release candidate with more cleanups and build fixes. See the + CHANGES + file for more details.

                                                            + +

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

                                                            +
                                                            +
                                                            +
                                                            • +
                                                          • From 0073b3631f1b18a050506326061365e62756324c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 1 Mar 2024 20:40:51 +0100 Subject: [PATCH 5299/5754] package/newlib-bare-metal: add CPE variables cpe:2.3:a:newlib_project:newlib is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/822D4AAB-314B-4148-BE10-FCC59D1649BD Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/newlib-bare-metal/newlib-bare-metal.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/newlib-bare-metal/newlib-bare-metal.mk b/package/newlib-bare-metal/newlib-bare-metal.mk index f27da4284b..9f5d765751 100644 --- a/package/newlib-bare-metal/newlib-bare-metal.mk +++ b/package/newlib-bare-metal/newlib-bare-metal.mk @@ -15,6 +15,8 @@ NEWLIB_BARE_METAL_LICENSE_FILES = \ COPYING.LIB \ COPYING.LIBGLOSS \ COPYING.NEWLIB +NEWLIB_BARE_METAL_CPE_ID_VENDOR = newlib_project +NEWLIB_BARE_METAL_CPE_ID_PRODUCT = newlib NEWLIB_BARE_METAL_INSTALL_STAGING = YES NEWLIB_BARE_METAL_INSTALL_TARGET = NO From 2d5e2a87760467595f7086d89671563f61fd3acb Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 1 Mar 2024 20:56:18 +0100 Subject: [PATCH 5300/5754] package/libxml2: security bump to version 2.12.5 Fix CVE-2024-25062: An issue was discovered in libxml2 before 2.11.7 and 2.12.x before 2.12.5. When using the XML Reader interface with DTD validation and XInclude expansion enabled, processing crafted XML documents can lead to an xmlValidatePopElement use-after-free. https://gitlab.gnome.org/GNOME/libxml2/-/blob/v2.12.5/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 670ff80a41..959887ab0e 100644 --- a/package/libxml2/libxml2.hash +++ b/package/libxml2/libxml2.hash @@ -1,4 +1,4 @@ -# From https://download.gnome.org/sources/libxml2/2.12/libxml2-2.12.3.sha256sum -sha256 8c8f1092340a89ff32bc44ad5c9693aff9bc8a7a3e161bb239666e5d15ac9aaa libxml2-2.12.3.tar.xz +# From https://download.gnome.org/sources/libxml2/2.12/libxml2-2.12.5.sha256sum +sha256 a972796696afd38073e0f59c283c3a2f5a560b5268b4babc391b286166526b21 libxml2-2.12.5.tar.xz # License files, locally calculated sha256 7fb0a66f3989f9bd5c7e5438a3de02cd4a7a47dde0aea2f7ea2ba2ff454ee6a4 Copyright diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk index 1893206ccb..6070c07b03 100644 --- a/package/libxml2/libxml2.mk +++ b/package/libxml2/libxml2.mk @@ -5,7 +5,7 @@ ################################################################################ LIBXML2_VERSION_MAJOR = 2.12 -LIBXML2_VERSION = $(LIBXML2_VERSION_MAJOR).3 +LIBXML2_VERSION = $(LIBXML2_VERSION_MAJOR).5 LIBXML2_SOURCE = libxml2-$(LIBXML2_VERSION).tar.xz LIBXML2_SITE = \ https://download.gnome.org/sources/libxml2/$(LIBXML2_VERSION_MAJOR) From ef65c4f90b3be448c50d210c39baf07fefc1d282 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 1 Mar 2024 21:05:22 +0100 Subject: [PATCH 5301/5754] package/vim: security bump to version 9.1.0145 Fix CVE-2024-22667: Vim before 9.0.2142 has a stack-based buffer overflow because did_set_langmap in map.c calls sprintf to write to the error buffer that is passed down to the option callback functions. Update hash of README.txt (version number updated with https://github.com/vim/vim/commit/b4ddc6c11e95cef4b372e239871fae1c8d4f72b6) Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/vim/vim.hash | 4 ++-- package/vim/vim.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/vim/vim.hash b/package/vim/vim.hash index 4ff64bada2..194bcb4378 100644 --- a/package/vim/vim.hash +++ b/package/vim/vim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 d826682fb839c0b99f80b9189af549d46dc087ef2cfc617ce161609ba5da4dc7 vim-9.0.2136.tar.gz +sha256 0056537cb57190aa41c12ba6c2ad04ce10e7f714cde4c1fe7193a37e1c44db46 vim-9.1.0145.tar.gz sha256 0b3f1f330cb1b179bb17c7c687d4cec601e0aa3462bc7f890ad4c3888d37d720 LICENSE -sha256 b475d5d3f8c855dc1a84813bbe45c44054d7f7aee20c800950bf89d5958873de README.txt +sha256 7a2f621c8496396dae5eecdcc4dccff9d534dff4627193d3ebf7fa6d2cb27042 README.txt diff --git a/package/vim/vim.mk b/package/vim/vim.mk index b0b4ffe344..fb8062e1fa 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -4,7 +4,7 @@ # ################################################################################ -VIM_VERSION = 9.0.2136 +VIM_VERSION = 9.1.0145 VIM_SITE = $(call github,vim,vim,v$(VIM_VERSION)) VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) VIM_SUBDIR = src From b1b4923d18bc6e8a40e990e172cd9f12087fcdb6 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 1 Mar 2024 21:15:43 +0100 Subject: [PATCH 5302/5754] package/python-aiohttp: security bump to version 3.9.3 Fix CVE-2024-23334 and CVE-2024-23829 https://github.com/aio-libs/aiohttp/security/advisories/GHSA-5h86-8mv2-jq9f https://github.com/aio-libs/aiohttp/security/advisories/GHSA-8qpw-xqxj-h4r2 https://github.com/aio-libs/aiohttp/blob/v3.9.3/CHANGES.rst Signed-off-by: Fabrice Fontaine 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 374e66ae8d..542a46f032 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 264e1b4fbe9f09050523c03f4d9b5ee2 aiohttp-3.9.1.tar.gz -sha256 8fc49a87ac269d4529da45871e2ffb6874e87779c3d0e2ccd813c0899221239d aiohttp-3.9.1.tar.gz +md5 f237bcac4ade112b9e7c4b1098197244 aiohttp-3.9.3.tar.gz +sha256 90842933e5d1ff760fae6caca4b2b3edba53ba8f4b71e95dacf2818a2aca06f7 aiohttp-3.9.3.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 3dc822e832..315d68cb2e 100644 --- a/package/python-aiohttp/python-aiohttp.mk +++ b/package/python-aiohttp/python-aiohttp.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOHTTP_VERSION = 3.9.1 +PYTHON_AIOHTTP_VERSION = 3.9.3 PYTHON_AIOHTTP_SOURCE = aiohttp-$(PYTHON_AIOHTTP_VERSION).tar.gz -PYTHON_AIOHTTP_SITE = https://files.pythonhosted.org/packages/54/07/9467d3f8dae29b14f423b414d9e67512a76743c5bb7686fb05fe10c9cc3e +PYTHON_AIOHTTP_SITE = https://files.pythonhosted.org/packages/18/93/1f005bbe044471a0444a82cdd7356f5120b9cf94fe2c50c0cdbf28f1258b PYTHON_AIOHTTP_SETUP_TYPE = setuptools PYTHON_AIOHTTP_LICENSE = Apache-2.0 PYTHON_AIOHTTP_LICENSE_FILES = LICENSE.txt From 9002b818be9128a6751766a180af7cd284aa7704 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 1 Mar 2024 21:22:57 +0100 Subject: [PATCH 5303/5754] package/libcoap: fix CVE-2024-0962 A vulnerability was found in obgm libcoap 4.3.4. It has been rated as critical. Affected by this issue is the function get_split_entry of the file src/coap_oscore.c of the component Configuration File Handler. The manipulation leads to stack-based buffer overflow. The attack may be launched remotely. The exploit has been disclosed to the public and may be used. It is recommended to apply a patch to fix this issue. VDB-252206 is the identifier assigned to this vulnerability. Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...ing-OSCORE-configuration-information.patch | 38 +++++++++++++++++++ package/libcoap/libcoap.mk | 3 ++ 2 files changed, 41 insertions(+) create mode 100644 package/libcoap/0001-coap_oscore-c-Fix-parsing-OSCORE-configuration-information.patch diff --git a/package/libcoap/0001-coap_oscore-c-Fix-parsing-OSCORE-configuration-information.patch b/package/libcoap/0001-coap_oscore-c-Fix-parsing-OSCORE-configuration-information.patch new file mode 100644 index 0000000000..e75250d613 --- /dev/null +++ b/package/libcoap/0001-coap_oscore-c-Fix-parsing-OSCORE-configuration-information.patch @@ -0,0 +1,38 @@ +From 2b28d8b0e9607e71a145345b4fe49517e052b7d9 Mon Sep 17 00:00:00 2001 +From: Jon Shallow +Date: Thu, 25 Jan 2024 18:03:17 +0000 +Subject: [PATCH] coap_oscore.c: Fix parsing OSCORE configuration information + +Upstream: https://github.com/obgm/libcoap/commit/2b28d8b0e9607e71a145345b4fe49517e052b7d9 +Signed-off-by: Fabrice Fontaine +--- + src/coap_oscore.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/coap_oscore.c b/src/coap_oscore.c +index 83f785c92..e0fb22947 100644 +--- a/src/coap_oscore.c ++++ b/src/coap_oscore.c +@@ -1678,11 +1678,12 @@ get_split_entry(const char **start, + oscore_value_t *value) { + const char *begin = *start; + const char *end; ++ const char *kend; + const char *split; + size_t i; + + retry: +- end = memchr(begin, '\n', size); ++ kend = end = memchr(begin, '\n', size); + if (end == NULL) + return 0; + +@@ -1693,7 +1694,7 @@ get_split_entry(const char **start, + + if (begin[0] == '#' || (end - begin) == 0) { + /* Skip comment / blank line */ +- size -= end - begin + 1; ++ size -= kend - begin + 1; + begin = *start; + goto retry; + } diff --git a/package/libcoap/libcoap.mk b/package/libcoap/libcoap.mk index 62f08a20e9..29161142f6 100644 --- a/package/libcoap/libcoap.mk +++ b/package/libcoap/libcoap.mk @@ -15,6 +15,9 @@ LIBCOAP_CONF_OPTS = \ --disable-examples --disable-examples-source --without-tinydtls LIBCOAP_AUTORECONF = YES +# 0001-coap_oscore-c-Fix-parsing-OSCORE-configuration-information.patch +LIBCOAP_IGNORE_CVES += CVE-2024-0962 + ifeq ($(BR2_PACKAGE_GNUTLS),y) LIBCOAP_DEPENDENCIES += gnutls LIBCOAP_CONF_OPTS += \ From 2bfad952c374258e37ffdf46a2c450d860640e11 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 1 Mar 2024 21:50:37 +0100 Subject: [PATCH 5304/5754] package/python-grpcio: add BR2_PACKAGE_PYTHON_GRPCIO_ARCH_SUPPORTS Fix the following build failure raised since the addition of the package in commit ea45b95c0e54866134c63e88e60489a012b3d134: In file included from third_party/boringssl-with-bazel/src/include/openssl/base.h:78, from third_party/boringssl-with-bazel/src/include/openssl/ssl.h:145, from ./src/core/tsi/ssl/key_logging/ssl_key_logging.h:23, from ./src/core/lib/security/security_connector/ssl_utils.h:42, from ./src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h:36, from ./src/core/ext/xds/certificate_provider_store.h:44, from src/core/ext/xds/certificate_provider_store.cc:21: third_party/boringssl-with-bazel/src/include/openssl/target.h:62:2: error: #error "Unknown target CPU" 62 | #error "Unknown target CPU" | ^~~~~ Fixes: ea45b95c0e54866134c63e88e60489a012b3d134 - http://autobuild.buildroot.org/results/36686aca1b45f0bf692a60e67a48424b561930a3 - http://autobuild.buildroot.org/results/4f79c7b1b2fc3306f300ae3ec0aa4439725814c1 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/python-grpc-requests/Config.in | 3 +++ package/python-grpcio-reflection/Config.in | 2 ++ package/python-grpcio/Config.in | 11 +++++++++++ 3 files changed, 16 insertions(+) diff --git a/package/python-grpc-requests/Config.in b/package/python-grpc-requests/Config.in index 3a2740f0f7..1cdd0d3f67 100644 --- a/package/python-grpc-requests/Config.in +++ b/package/python-grpc-requests/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_GRPC_REQUESTS bool "python-grpc-requests" depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-cryptography + depends on BR2_PACKAGE_PYTHON_GRPCIO_ARCH_SUPPORTS # python-grpcio depends on BR2_INSTALL_LIBSTDCPP # python-grpcio select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime select BR2_PACKAGE_PYTHON_GOOGLE_API_CORE # runtime @@ -12,4 +13,6 @@ config BR2_PACKAGE_PYTHON_GRPC_REQUESTS https://github.com/wesky93/grpc_requests comment "python-grpcio-requests needs a toolchain w/ C++" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_PYTHON_GRPCIO_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-grpcio-reflection/Config.in b/package/python-grpcio-reflection/Config.in index afe8988165..a0ca35c286 100644 --- a/package/python-grpcio-reflection/Config.in +++ b/package/python-grpcio-reflection/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_GRPCIO_REFLECTION bool "python-grpcio-reflection" + depends on BR2_PACKAGE_PYTHON_GRPCIO_ARCH_SUPPORTS # python-grpcio depends on BR2_INSTALL_LIBSTDCPP # python-grpcio select BR2_PACKAGE_PYTHON_GRPCIO # runtime select BR2_PACKAGE_PYTHON_PROTOBUF # runtime @@ -9,4 +10,5 @@ config BR2_PACKAGE_PYTHON_GRPCIO_REFLECTION https://grpc.io comment "python-grpcio-reflection needs a toolchain w/ C++" + depends on BR2_PACKAGE_PYTHON_GRPCIO_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-grpcio/Config.in b/package/python-grpcio/Config.in index 5242eb461e..9657ccb6ed 100644 --- a/package/python-grpcio/Config.in +++ b/package/python-grpcio/Config.in @@ -1,5 +1,15 @@ +config BR2_PACKAGE_PYTHON_GRPCIO_ARCH_SUPPORTS + bool + # see third_party/boringssl-with-bazel/src/include/openssl/target.h + default y if BR2_aarch64 || BR2_aarch64_be + default y if BR2_arm || BR2_armeb + default y if BR2_i386 || BR2_x86_64 + default y if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el + default y if BR2_riscv + config BR2_PACKAGE_PYTHON_GRPCIO bool "python-grpcio" + depends on BR2_PACKAGE_PYTHON_GRPCIO_ARCH_SUPPORTS depends on BR2_INSTALL_LIBSTDCPP help HTTP/2-based RPC framework. @@ -7,4 +17,5 @@ config BR2_PACKAGE_PYTHON_GRPCIO https://grpc.io comment "python-grpcio needs a toolchain w/ C++" + depends on BR2_PACKAGE_PYTHON_GRPCIO_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP From 86e244b1a5695a570d00755beeaae068dcb30c2d Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Tue, 13 Feb 2024 11:58:40 +0100 Subject: [PATCH 5305/5754] package/rauc: bump to 1.11.1 This fixes an incompatibility with openssl 3.2 when using codesign certificate purpose [1]. [1] https://github.com/rauc/rauc/releases/tag/v1.11.1 Signed-off-by: Marcus Hoffmann Signed-off-by: Yann E. MORIN --- 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 8de309f8c7..63aa4715e0 100644 --- a/package/rauc/rauc.hash +++ b/package/rauc/rauc.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a28f415c580390dd9e65016a5d90a63ee1cfd7e1b3e864cbb13cb3ac3513391f rauc-1.11.tar.xz +sha256 391d13d709abb630c459e79e62e474e68224c5d07c816355784bba75a86a2507 rauc-1.11.1.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/rauc/rauc.mk b/package/rauc/rauc.mk index aff5ead281..fbdea4e235 100644 --- a/package/rauc/rauc.mk +++ b/package/rauc/rauc.mk @@ -4,7 +4,7 @@ # ################################################################################ -RAUC_VERSION = 1.11 +RAUC_VERSION = 1.11.1 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 a8b33cb87b6de28e33ac46a20526ebe77c7591f1 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 2 Mar 2024 11:58:02 +0100 Subject: [PATCH 5306/5754] package/openvmtools: needs dynamic library openvmtools can't be built statically since at least bump to version 10.3.5 in commit 5f0f0f7e4f3362a3695d5876d0f41125a2544285: libtool: link: /home/autobuild/autobuild/instance-9/output-1/per-package/openvmtools/host/bin/i586-buildroot-linux-musl-gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Ofast -g0 -static -Wall -Wno-pointer-sign -Wno-unused-value -fno-strict-aliasing -Wno-unknown-pragmas -Wno-uninitialized -Wno-deprecated-declarations -Wno-unused-const-variable -Wno-unused-but-set-variable -static -o vmtoolsd vmtoolsd-cmdLine.o vmtoolsd-mainLoop.o vmtoolsd-mainPosix.o vmtoolsd-pluginMgr.o vmtoolsd-serviceObj.o vmtoolsd-threadPool.o vmtoolsd-toolsRpc.o vmtoolsd-svcSignals.o vmtoolsd-toolsHangDetector.o -pthread -Wl,--export-dynamic -pthread -pthread -pthread /home/autobuild/autobuild/instance-9/output-1/build/openvmtools-11.3.5-18557794/libvmtools/.libs/libvmtools.a -L/home/autobuild/autobuild/instance-9/output-1/per-package/openvmtools/host/bin/../i586-buildroot-linux-musl/sysroot/usr/lib /home/autobuild/autobuild/instance-9/output-1/per-package/openvmtools/host/i586-buildroot-li nux-musl/sysroot/usr/lib/libdnet.a /home/autobuild/autobuild/instance-9/output-1/per-package/openvmtools/host/i586-buildroot-linux-musl/sysroot/usr/lib/libtirpc.a -lrt -lcrypt -lpthread -lgmodule-2.0 -lgobject-2.0 /home/autobuild/autobuild/instance-9/output-1/per-package/openvmtools/host/i586-buildroot-linux-musl/sysroot/usr/lib/libffi.a -lgthread-2.0 -lglib-2.0 -lm /home/autobuild/autobuild/instance-9/output-1/per-package/openvmtools/host/i586-buildroot-linux-musl/sysroot/usr/lib/libpcre.a ../../lib/globalConfig/.libs/libGlobalConfig.a -pthread /home/autobuild/autobuild/instance-9/output-1/per-package/openvmtools/host/bin/../lib/gcc/i586-buildroot-linux-musl/10.4.0/../../../../i586-buildroot-linux-musl/bin/ld: /home/autobuild/autobuild/instance-9/output-1/build/openvmtools-11.3.5-18557794/libvmtools/.libs/libvmtools.a(libvmtools_la-vmtools.o):(.modinfo+0x0): multiple definition of `vm_version'; vmtoolsd-mainPosix.o:(.modinfo+0x0): first defined here Fixes: - http://autobuild.buildroot.org/results/61b03301bc36247c75e797fb294ec7f96bce6e22 - http://autobuild.buildroot.org/results/eea487eb0de911f4e4bce7a557d4c93d732181cf Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/openvmtools/Config.in | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package/openvmtools/Config.in b/package/openvmtools/Config.in index 066a7a4736..b62e5d0361 100644 --- a/package/openvmtools/Config.in +++ b/package/openvmtools/Config.in @@ -11,6 +11,7 @@ config BR2_PACKAGE_OPENVMTOOLS depends on BR2_USE_WCHAR # libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_ENABLE_LOCALE + depends on !BR2_STATIC_LIBS depends on !BR2_TOOLCHAIN_USES_UCLIBC select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBDNET @@ -30,16 +31,15 @@ if BR2_PACKAGE_OPENVMTOOLS config BR2_PACKAGE_OPENVMTOOLS_PAM bool "PAM support" - # linux-pam needs locale and wchar, but we already have this - # dependency on the main symbol, above. + # linux-pam needs locale, dynamic library and wchar, but we + # already have these dependencies on the main symbol, above. depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # linux-pam - depends on !BR2_STATIC_LIBS select BR2_PACKAGE_LINUX_PAM help Support for PAM in openvmtools -comment "PAM support needs a toolchain w/ dynamic library, gcc >= 4.9" - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 +comment "PAM support needs a toolchain w/ gcc >= 4.9" + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 config BR2_PACKAGE_OPENVMTOOLS_RESOLUTIONKMS bool "resolutionkms support" @@ -57,9 +57,9 @@ comment "resolutionkms needs udev, a toolchain w/ threads" endif -comment "openvmtools needs a glibc or musl toolchain w/ wchar, threads, locale" +comment "openvmtools needs a glibc or musl toolchain w/ wchar, threads, locale, dynamic library" depends on BR2_PACKAGE_OPENVMTOOLS_ARCH_SUPPORTS depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_ENABLE_LOCALE || \ + !BR2_ENABLE_LOCALE || BR2_STATIC_LIBS || \ BR2_TOOLCHAIN_USES_UCLIBC From 44dc77af0ed77cefd80985d6bd8380acdbdf1940 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Fri, 1 Mar 2024 23:03:23 +0100 Subject: [PATCH 5307/5754] package/expat: bump to version 2.6.1 Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/expat/expat.hash | 6 +++--- package/expat/expat.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/expat/expat.hash b/package/expat/expat.hash index 043501378b..980a9ab6a7 100644 --- a/package/expat/expat.hash +++ b/package/expat/expat.hash @@ -1,6 +1,6 @@ -# From https://sourceforge.net/projects/expat/files/expat/2.6.0/ -md5 bd169cb11f4b9bdfddadf9e88a5c4d4b expat-2.6.0.tar.xz -sha1 d87e8ab2a3c1deb858c6b22e5ade9d5673086004 expat-2.6.0.tar.xz +# From https://sourceforge.net/projects/expat/files/expat/2.6.1/ +md5 84d0ee1c554212dc8f068e538de5b823 expat-2.6.1.tar.xz +sha1 1a1804b7c565a8b21abbd3433ef67ed8a4476960 expat-2.6.1.tar.xz # Locally calculated sha256 cb5f5a8ea211e1cabd59be0a933a52e3c02cc326e86a4d387d8d218e7ee47a3e expat-2.6.0.tar.xz diff --git a/package/expat/expat.mk b/package/expat/expat.mk index 5f4016e0d1..e09fcc673f 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXPAT_VERSION = 2.6.0 +EXPAT_VERSION = 2.6.1 EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION) EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz EXPAT_INSTALL_STAGING = YES From 73c83dbe3e8e212b4b3d563b5ddf86354d6a6b29 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 1 Mar 2024 23:00:16 +0100 Subject: [PATCH 5308/5754] package/nginx-naxsi: needs pcre2 Commit 722b84eafa5e3d9540e0a80bae0c971a3a778358 forgot to update nginx-naxsi resulting in the following build failure: In file included from ../nginx-naxsi-d714f1636ea49a9a9f4f06dba14aee003e970834/naxsi_src/naxsi_runtime.c:7: ../nginx-naxsi-d714f1636ea49a9a9f4f06dba14aee003e970834/naxsi_src/naxsi.h:147:3: error: unknown type name 'ngx_regex_compile_t' 147 | ngx_regex_compile_t* target_rx; | ^~~~~~~~~~~~~~~~~~~ Fixes: 722b84eafa5e3d9540e0a80bae0c971a3a778358 - http://autobuild.buildroot.org/results/87bbcf946ccbd8e3bf1ca9f39464f4bb198c8d42 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/nginx-naxsi/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/nginx-naxsi/Config.in b/package/nginx-naxsi/Config.in index fc2ba9bfe3..d30d653df3 100644 --- a/package/nginx-naxsi/Config.in +++ b/package/nginx-naxsi/Config.in @@ -1,8 +1,8 @@ config BR2_PACKAGE_NGINX_NAXSI bool "nginx-naxsi" depends on BR2_PACKAGE_NGINX_HTTP - # uses pcre, so nginx needs to be built with pcre support - select BR2_PACKAGE_PCRE + # uses pcre2, so nginx needs to be built with pcre2 support + select BR2_PACKAGE_PCRE2 help NAXSI means Nginx Anti XSS & SQL Injection. From b6d96266a174024c5f6f8647cf19617056aef56c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 2 Mar 2024 09:56:26 +0100 Subject: [PATCH 5309/5754] package/spirv-tools: needs gcc >= 8 spirv-tools unconditionally includes filesystem since its addition in commit 0a01085abeb7d8a097cb68b9f7f4faec7711543c resulting in the following build failure: /home/buildroot/autobuild/run/instance-1/output-1/build/spirv-tools-1.3.261.1/tools/objdump/objdump.cpp:15:10: fatal error: filesystem: No such file or directory #include ^~~~~~~~~~~~ Fixes: 0a01085abeb7d8a097cb68b9f7f4faec7711543c - http://autobuild.buildroot.org/results/aaeb0ca8773842768f9311fc804bb7529d9e3bfa Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/spirv-tools/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/spirv-tools/Config.in b/package/spirv-tools/Config.in index 39fdb80b86..fa9b615c56 100644 --- a/package/spirv-tools/Config.in +++ b/package/spirv-tools/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_SPIRV_TOOLS bool "spirv-tools" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # C++17 filesystem select BR2_PACKAGE_SPIRV_HEADERS help The SPIR-V Tools project provides an API and commands for @@ -9,6 +9,6 @@ config BR2_PACKAGE_SPIRV_TOOLS https://github.com/KhronosGroup/SPIRV-Tools -comment "spirv-tools needs a toolchain w/ C++, gcc >= 7" +comment "spirv-tools needs a toolchain w/ C++, gcc >= 8" depends on !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_7 + !BR2_TOOLCHAIN_GCC_AT_LEAST_8 From 2934a4692c4f1f3649b7781263ae655fcb3d780a Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 2 Mar 2024 10:27:32 +0100 Subject: [PATCH 5310/5754] package/parted: needs gcc >= 5 Fix the following build failure raised since bump to version 3.5 in commit 57817fe05a4250a260a08201812c6652b306a0e5 and https://git.savannah.gnu.org/cgit/parted.git/commit/?id=15c49ec04f7eaff014d2e1eddd0aecf4150db63d: gpt.c:181:5: error: initializer element is not constant { PED_PARTITION_APPLE_TV_RECOVERY, PARTITION_APPLE_TV_RECOVERY_GUID }, ^ gpt.c:181:5: error: (near initialization for 'flag_uuid_mapping[0].type_uuid') Fixes: 57817fe05a4250a260a08201812c6652b306a0e5 - http://autobuild.buildroot.org/results/1f0af75ec55da9052fbfb195a0699f84619eac81 - http://autobuild.buildroot.org/results/438b5f40e8b393801f36c691d239e298998cb9d2 Note that udisks also select parted, but it already has a more stringent dependency on GCC >= 7. Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libblockdev/Config.in | 15 +++++++++------ package/parted/Config.in | 6 ++++-- package/python-pyparted/Config.in | 6 ++++-- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/package/libblockdev/Config.in b/package/libblockdev/Config.in index e0449628b4..7494b0f6b7 100644 --- a/package/libblockdev/Config.in +++ b/package/libblockdev/Config.in @@ -32,12 +32,13 @@ config BR2_PACKAGE_LIBBLOCKDEV_CRYPTO config BR2_PACKAGE_LIBBLOCKDEV_FS bool "filesystem" depends on BR2_ENABLE_LOCALE # parted + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # parted select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT select BR2_PACKAGE_PARTED select BR2_PACKAGE_E2FSPROGS -comment "filesystem plugin needs a toolchain w/ locale" - depends on !BR2_ENABLE_LOCALE +comment "filesystem plugin needs a toolchain w/ locale, gcc >= 5" + depends on !BR2_ENABLE_LOCALE || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 config BR2_PACKAGE_LIBBLOCKDEV_LOOP bool "loop" @@ -45,11 +46,12 @@ config BR2_PACKAGE_LIBBLOCKDEV_LOOP config BR2_PACKAGE_LIBBLOCKDEV_LVM2 bool "lvm2" depends on BR2_ENABLE_LOCALE # parted + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # parted select BR2_PACKAGE_PARTED select BR2_PACKAGE_LVM2 -comment "lvm2 support needs a toolchain w/ locale" - depends on !BR2_ENABLE_LOCALE +comment "lvm2 support needs a toolchain w/ locale, gcc >= 5" + depends on !BR2_ENABLE_LOCALE || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 config BR2_PACKAGE_LIBBLOCKDEV_MDRAID bool "mdraid" @@ -62,11 +64,12 @@ config BR2_PACKAGE_LIBBLOCKDEV_NVME config BR2_PACKAGE_LIBBLOCKDEV_PART bool "part" depends on BR2_ENABLE_LOCALE # parted + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # parted select BR2_PACKAGE_PARTED select BR2_PACKAGE_UTIL_LINUX_LIBFDISK -comment "part plugin needs a toolchain w/ locale" - depends on !BR2_ENABLE_LOCALE +comment "part plugin needs a toolchain w/ locale, gcc >= 5" + depends on !BR2_ENABLE_LOCALE || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 config BR2_PACKAGE_LIBBLOCKDEV_SWAP bool "swap" diff --git a/package/parted/Config.in b/package/parted/Config.in index f48b365a2d..ea6c3db2bf 100644 --- a/package/parted/Config.in +++ b/package/parted/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_PARTED bool "parted" depends on BR2_ENABLE_LOCALE depends on BR2_USE_WCHAR + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBUUID help @@ -9,5 +10,6 @@ config BR2_PACKAGE_PARTED http://www.gnu.org/software/parted/ -comment "parted needs a toolchain w/ locale, wchar" - depends on !BR2_ENABLE_LOCALE || !BR2_USE_WCHAR +comment "parted needs a toolchain w/ locale, wchar, gcc >=5" + depends on !BR2_ENABLE_LOCALE || !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 diff --git a/package/python-pyparted/Config.in b/package/python-pyparted/Config.in index 60f54a5484..430bf204a1 100644 --- a/package/python-pyparted/Config.in +++ b/package/python-pyparted/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_PYPARTED bool "python-pyparted" depends on BR2_ENABLE_LOCALE # parted + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # parted depends on BR2_USE_WCHAR select BR2_PACKAGE_PARTED help @@ -8,5 +9,6 @@ config BR2_PACKAGE_PYTHON_PYPARTED https://github.com/rhinstaller/pyparted -comment "pyparted needs a toolchain w/ locale, wchar" - depends on !BR2_ENABLE_LOCALE || !BR2_USE_WCHAR +comment "pyparted needs a toolchain w/ locale, wchar, gcc >= 5" + depends on !BR2_ENABLE_LOCALE || !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 From 953230e176ef4357d5cc28039eb913951b79f513 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Thu, 29 Feb 2024 23:41:20 +0100 Subject: [PATCH 5311/5754] package/rust/rust.mk: add missing host-zlib dependency Several rust tools are linking against zlib, so add the depedency explicitly in HOST_RUST_DEPENDENCIES. For now, host-rust build system is not able to find zlib provided by Buildroot in HOST_DIR due to at least two issues that will be fixed in followup commits. Note that host-zlib is already in the dependency chain, by way of host-openssl, but since rust needs for itself, we need to add it as an explicit dependency. Signed-off-by: Romain Naour [yann.morin.1998@free.fr: add not about transitive dependency] Signed-off-by: Yann E. MORIN --- package/rust/rust.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/rust/rust.mk b/package/rust/rust.mk index f7a5c0fcd5..16a397407f 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -20,6 +20,7 @@ HOST_RUST_DEPENDENCIES = \ host-python3 \ host-rust-bin \ host-openssl \ + host-zlib \ $(BR2_CMAKE_HOST_DEPENDENCY) HOST_RUST_VERBOSITY = $(if $(VERBOSE),2,0) From 83a4c6f4fbedefb7aa12a887c2c073d9ade20c6e Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Thu, 29 Feb 2024 23:41:21 +0100 Subject: [PATCH 5312/5754] package/rust: use host libraries from HOST_DIR host-rust package depends on several host packages to provide tools and libraries but it doesn't take into account out host libraries in HOST_DIR while building rustc compiler. Indeed, rustc needs zlib and fails to link if zlib is not installed on the host. error: could not compile `rustc_driver` (lib) due to previous error If zlib is installed on the host, we can notice it with ldd tool (while it should be linked with the one provided by Buildroot host-zlib): ldd [...]TestRust/host/bin/rustc libz.so.1 => /lib64/libz.so.1 Provide HOST_LDFLAGS using llvm.ldflags in config.toml. (HOST_LDFLAGS provides -L$(HOST_DIR)/lib -Wl,-rpath,$(HOST_DIR)/lib) With that fixed, rustc_driver link with libz from HOST_DIR but the host-rust build still fail later due to another issue. error: could not compile `rustdoc-tool` (bin "rustdoc_tool_binary") due to previous error Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6256881545 http://autobuild.buildroot.org/results/a6b/a6b28783f29e6b729824bf42679a62f72ad5bee0 Signed-off-by: Romain Naour [yann.morin.1998@free.fr: slight rewording in commit log] Signed-off-by: Yann E. MORIN --- package/rust/rust.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/rust/rust.mk b/package/rust/rust.mk index 16a397407f..4903060368 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -65,6 +65,7 @@ define HOST_RUST_CONFIGURE_CMDS echo 'cc = "$(TARGET_CROSS)gcc"'; \ echo '[llvm]'; \ echo 'ninja = false'; \ + echo 'ldflags = "$(HOST_LDFLAGS)"'; \ ) > $(@D)/config.toml endef From 6849d17cf4d65f3c8dcc986a7a68ce51619f8508 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 2 Mar 2024 22:28:52 +0100 Subject: [PATCH 5313/5754] package/powertop: fix gettext build Fix gettext build raised since bump to version 2.15 in commit d65b960859046be486ced6c490d3671bd1392661: *** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version 0.18 but the autoconf macros are from gettext version 0.20 Fixes: d65b960859046be486ced6c490d3671bd1392661 - http://autobuild.buildroot.org/results/bb80a7842d18651e5069f3a91f06a9c23218d260 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/powertop/powertop.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/powertop/powertop.mk b/package/powertop/powertop.mk index 0481caee07..a7a57939e0 100644 --- a/package/powertop/powertop.mk +++ b/package/powertop/powertop.mk @@ -20,6 +20,7 @@ POWERTOP_DEPENDENCIES = \ POWERTOP_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) # 0001-add-disable-stack-protector-option.patch POWERTOP_AUTORECONF = YES +POWERTOP_AUTOPOINT = YES POWERTOP_AUTORECONF_OPTS = --include=$(HOST_DIR)/share/autoconf-archive POWERTOP_CONF_OPTS = --disable-stack-protector From edde351cb8c13ffd54a369916da5f3f372edd4a2 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 2 Mar 2024 23:20:49 +0100 Subject: [PATCH 5314/5754] package/powertop: reorder variables in a more logical manner Group _CONF_{ENV,OPTS} together after the autreconf ones. Keep AUTORECONF=YES close to AUTORECONF_OPTS Signed-off-by: Yann E. MORIN --- package/powertop/powertop.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/powertop/powertop.mk b/package/powertop/powertop.mk index a7a57939e0..aa7d251b90 100644 --- a/package/powertop/powertop.mk +++ b/package/powertop/powertop.mk @@ -17,11 +17,12 @@ POWERTOP_DEPENDENCIES = \ $(if $(BR2_PACKAGE_PCIUTILS),pciutils) \ $(TARGET_NLS_DEPENDENCIES) -POWERTOP_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) # 0001-add-disable-stack-protector-option.patch -POWERTOP_AUTORECONF = YES POWERTOP_AUTOPOINT = YES +POWERTOP_AUTORECONF = YES POWERTOP_AUTORECONF_OPTS = --include=$(HOST_DIR)/share/autoconf-archive + +POWERTOP_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) POWERTOP_CONF_OPTS = --disable-stack-protector # fix missing config.rpath (needed for autoreconf) in the codebase From b8707cee5e7e4af8fc2addd317b294e081db994f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 2 Mar 2024 17:31:37 +0100 Subject: [PATCH 5315/5754] package/python-cheroot: drop host-python-setuptools-scm-git-archive Drop host-python-setuptools-scm-git-archive dependency Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...ptools-scm-v7-for-building-the-dists.patch | 101 ++++++++++++++++++ package/python-cheroot/python-cheroot.mk | 2 +- 2 files changed, 102 insertions(+), 1 deletion(-) create mode 100644 package/python-cheroot/0001-Use-setuptools-scm-v7-for-building-the-dists.patch diff --git a/package/python-cheroot/0001-Use-setuptools-scm-v7-for-building-the-dists.patch b/package/python-cheroot/0001-Use-setuptools-scm-v7-for-building-the-dists.patch new file mode 100644 index 0000000000..837f2804d2 --- /dev/null +++ b/package/python-cheroot/0001-Use-setuptools-scm-v7-for-building-the-dists.patch @@ -0,0 +1,101 @@ +From f0c51af263e20f332c6f675aa90ec6705ae4f5d1 Mon Sep 17 00:00:00 2001 +From: Serhii Abarovskyi +Date: Tue, 9 May 2023 18:33:54 +0300 +Subject: [PATCH] Use setuptools-scm v7+ for building the dists + +Since version 7, setuptools-scm has native support for git archive, +so the setuptools-scm-git-archive project is obsolete +and this patch removes it from the build dependencies. +Close #515 + +Upstream: https://github.com/cherrypy/cheroot/commit/f0c51af263e20f332c6f675aa90ec6705ae4f5d1 +Signed-off-by: Fabrice Fontaine +--- + .git_archival.txt | 3 +++ + pyproject.toml | 3 +-- + requirements/dist-build-constraints.in | 3 +-- + requirements/dist-build-constraints.txt | 16 +++++++--------- + setup.cfg | 3 +-- + 5 files changed, 13 insertions(+), 15 deletions(-) + +diff --git a/.git_archival.txt b/.git_archival.txt +index 95cb3eea4e..3994ec0a83 100644 +--- a/.git_archival.txt ++++ b/.git_archival.txt +@@ -1 +1,4 @@ ++node: $Format:%H$ ++node-date: $Format:%cI$ ++describe-name: $Format:%(describe:tags=true)$ + ref-names: $Format:%D$ +diff --git a/pyproject.toml b/pyproject.toml +index b1e5f60a80..88df57dcc1 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -6,8 +6,7 @@ requires = [ + "setuptools>=34.4", + + # Plugins +- "setuptools_scm[toml]>=3.5", +- "setuptools_scm_git_archive>=1.1", ++ "setuptools-scm >= 7.0.0", + ] + build-backend = "setuptools.build_meta" + +diff --git a/requirements/dist-build-constraints.in b/requirements/dist-build-constraints.in +index 26b57228a9..a37baef1a9 100644 +--- a/requirements/dist-build-constraints.in ++++ b/requirements/dist-build-constraints.in +@@ -5,8 +5,7 @@ + setuptools >= 34.4 + + # Plugins +-setuptools_scm[toml] >= 3.5 +-setuptools_scm_git_archive >= 1.1 ++setuptools-scm[toml] >= 7.0.0 + + # Dynamic (coming from setuptools' PEP 517 build backend) + wheel +diff --git a/requirements/dist-build-constraints.txt b/requirements/dist-build-constraints.txt +index 525f2be30f..8bd4343ff6 100644 +--- a/requirements/dist-build-constraints.txt ++++ b/requirements/dist-build-constraints.txt +@@ -1,18 +1,16 @@ + # +-# This file is autogenerated by pip-compile with python 3.10 +-# To update, run: ++# This file is autogenerated by pip-compile with Python 3.10 ++# by the following command: + # + # pip-compile --allow-unsafe --output-file=requirements/dist-build-constraints.txt --strip-extras requirements/dist-build-constraints.in + # +-packaging==21.3 ++packaging==23.1 + # via setuptools-scm +-pyparsing==3.0.6 +- # via packaging +-setuptools-scm==6.3.2 ++setuptools-scm==7.1.0 + # via -r requirements/dist-build-constraints.in +-setuptools-scm-git-archive==1.1 +- # via -r requirements/dist-build-constraints.in +-tomli==2.0.0 ++tomli==2.0.1 ++ # via setuptools-scm ++typing-extensions==4.6.3 + # via setuptools-scm + wheel==0.37.1 + # via -r requirements/dist-build-constraints.in +diff --git a/setup.cfg b/setup.cfg +index 1f2b08f4c3..900c7b4feb 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -64,8 +64,7 @@ include_package_data = True + packages = find: + include_package_data = True + setup_requires = +- setuptools_scm>=1.15.0 +- setuptools_scm_git_archive>=1.0 ++ setuptools_scm >= 7.0.0 + install_requires = + importlib_metadata; python_version < '3.8' + more_itertools >= 2.6 diff --git a/package/python-cheroot/python-cheroot.mk b/package/python-cheroot/python-cheroot.mk index 86e16f7db2..19aa7ae193 100644 --- a/package/python-cheroot/python-cheroot.mk +++ b/package/python-cheroot/python-cheroot.mk @@ -10,6 +10,6 @@ PYTHON_CHEROOT_SITE = https://files.pythonhosted.org/packages/08/7c/95c154177b16 PYTHON_CHEROOT_LICENSE = BSD-3-Clause PYTHON_CHEROOT_LICENSE_FILES = LICENSE.md PYTHON_CHEROOT_SETUP_TYPE = setuptools -PYTHON_CHEROOT_DEPENDENCIES = host-python-setuptools-scm host-python-setuptools-scm-git-archive +PYTHON_CHEROOT_DEPENDENCIES = host-python-setuptools-scm $(eval $(python-package)) From 4a71f029085f8eda64aeee0edb80b7be8ca58022 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 2 Mar 2024 17:31:38 +0100 Subject: [PATCH 5316/5754] package/python-setuptools-scm-git-archive: drop package python-setuptools-scm-git-archive is obsolete as python-setuptools-scm >= 7.0.0 supports Git archives by itself. Moreover, it raises the following build failure without pip since its addition in commit 9359325c6081df89ff57667cb49e0d12cd553b97: /nvmedata/autobuild/instance-3/output-1/per-package/host-python-setuptools-scm-git-archive/host/bin/python: No module named pip Traceback (most recent call last): File "/nvmedata/autobuild/instance-3/output-1/per-package/host-python-setuptools-scm-git-archive/host/lib/python3.10/site-packages/setuptools/installer.py", line 82, in fetch_build_egg subprocess.check_call(cmd) File "/nvmedata/autobuild/instance-3/output-1/per-package/host-python-setuptools-scm-git-archive/host/lib/python3.10/subprocess.py", line 369, in check_call raise CalledProcessError(retcode, cmd) subprocess.CalledProcessError: Command '['/nvmedata/autobuild/instance-3/output-1/per-package/host-python-setuptools-scm-git-archive/host/bin/python', '-m', 'pip', '--disable-pip-version-check', 'wheel', '--no-deps', '-w', '/tmp/tmpaxobatcs', '--quiet', 'typing-extensions']' returned non-zero exit status 1. Fixes: - http://autobuild.buildroot.org/results/d05e412170c427e4f210da164c783b3527f15892 - http://autobuild.buildroot.org/results/50f80cfabccbe5c75cd889ce6af2b418e376d4e5 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- .../python-setuptools-scm-git-archive.hash | 5 ----- .../python-setuptools-scm-git-archive.mk | 15 --------------- 2 files changed, 20 deletions(-) delete mode 100644 package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.hash delete mode 100644 package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk diff --git a/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.hash b/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.hash deleted file mode 100644 index ce790a3d59..0000000000 --- a/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5, sha256 from https://pypi.org/pypi/setuptools-scm-git-archive/json -md5 cfcdab6edbe6b710ab24ad355e7cf7a3 setuptools_scm_git_archive-1.4.1.tar.gz -sha256 c418bc77b3974d3ac65f268f058f23e01dc5f991f2233128b0e16a69de227b09 setuptools_scm_git_archive-1.4.1.tar.gz -# Locally computed sha256 checksums -sha256 89807acf2309bd285f033404ee78581602f3cd9b819a16ac2f0e5f60ff4a473e LICENSE diff --git a/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk b/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk deleted file mode 100644 index 153343788b..0000000000 --- a/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# python-setuptools-scm-git-archive -# -################################################################################ - -PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_VERSION = 1.4.1 -PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_SOURCE = setuptools_scm_git_archive-$(PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_VERSION).tar.gz -PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_SITE = https://files.pythonhosted.org/packages/47/d6/c9a8d1ea95613f79b9b914cf9a5e8e420b7625fc54137c1d7c9cbbda5adf -PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_SETUP_TYPE = setuptools -PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_LICENSE = MIT -PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_LICENSE_FILES = LICENSE -HOST_PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_DEPENDENCIES = host-python-setuptools-scm - -$(eval $(host-python-package)) From e2e8e655feb7f1162e554a40ea5c7a2db0987ffa Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 2 Mar 2024 13:59:38 +0100 Subject: [PATCH 5317/5754] package/strace: musl on aarch64 needs headers >= 5.0 strace needs headers >= 5.0 and https://github.com/torvalds/linux/commit/9966a05c7b80f075f2bc7e48dbb108d3f2927234 to avoid the following build failure on musl and aarch64 due to headers conflict raised at least since bump to version 6.0 in commit 544806bfd8052d05dee671c23c354e5f73f954f9: In file included from /home/autobuild/autobuild/instance-7/output-1/host/aarch64_be-buildroot-linux-musl/sysroot/usr/include/signal.h:48, from strace.c:17: /home/autobuild/autobuild/instance-7/output-1/host/aarch64_be-buildroot-linux-musl/sysroot/usr/include/bits/signal.h:18:16: error: redefinition of 'struct sigcontext' 18 | typedef struct sigcontext { | ^~~~~~~~~~ In file included from /home/autobuild/autobuild/instance-7/output-1/host/aarch64_be-buildroot-linux-musl/sysroot/usr/include/asm/ptrace.h:26, from /home/autobuild/autobuild/instance-7/output-1/host/aarch64_be-buildroot-linux-musl/sysroot/usr/include/linux/ptrace.h:107, from ptrace.h:33, from strace.c:16: /home/autobuild/autobuild/instance-7/output-1/host/aarch64_be-buildroot-linux-musl/sysroot/usr/include/asm/sigcontext.h:28:8: note: originally defined here 28 | struct sigcontext { | ^~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/74a480aa76970b36dcd890d9bd7a9df1d49e8e16 - http://autobuild.buildroot.org/results/79ee8ae5fb9712fd874b56e836eca1b997c50cd9 Signed-off-by: Fabrice Fontaine [Peter: fix architecture conditional] Signed-off-by: Peter Korsgaard --- package/strace/Config.in | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/package/strace/Config.in b/package/strace/Config.in index dc245c7297..e0551f3861 100644 --- a/package/strace/Config.in +++ b/package/strace/Config.in @@ -4,6 +4,10 @@ config BR2_PACKAGE_STRACE depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_0 || !BR2_nios2 # needs at least kernel headers 5.0 on xtensa depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0 || !BR2_xtensa + # needs at least kernel headers 5.0 on musl aarch64 + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0 || \ + !(BR2_aarch64 || BR2_aarch64_be) || \ + !BR2_TOOLCHAIN_USES_MUSL depends on !BR2_RISCV_32 help A useful diagnostic, instructional, and debugging tool. @@ -22,3 +26,8 @@ comment "strace needs a toolchain w/ headers >= 4.0 on nios2" comment "strace needs a toolchain w/ headers >= 5.0 on xtensa" depends on BR2_xtensa depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0 + +comment "strace needs a musl toolchain w/ headers >= 5.0 on aarch64" + depends on BR2_aarch64 || BR2_aarch64_be + depends on BR2_TOOLCHAIN_USES_MUSL + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0 From 1692f2514a48ee369e09753007e9c67ff90daaf3 Mon Sep 17 00:00:00 2001 From: Thomas Devoogdt Date: Fri, 1 Mar 2024 13:17:56 +0100 Subject: [PATCH 5318/5754] package/sdl2: drop video-x11-{xinerama, vm} Support has been dropped since the major release 2.24.0: https://github.com/libsdl-org/SDL/commit/7d7ec9c95146c44d4b4643ed552796bf07937057 Signed-off-by: Thomas Devoogdt Signed-off-by: Peter Korsgaard --- package/sdl2/sdl2.mk | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk index 42b4a433e8..eb5042e3cd 100644 --- a/package/sdl2/sdl2.mk +++ b/package/sdl2/sdl2.mk @@ -112,13 +112,6 @@ else SDL2_CONF_OPTS += --disable-video-x11-xcursor endif -ifeq ($(BR2_PACKAGE_XLIB_LIBXINERAMA),y) -SDL2_DEPENDENCIES += xlib_libXinerama -SDL2_CONF_OPTS += --enable-video-x11-xinerama -else -SDL2_CONF_OPTS += --disable-video-x11-xinerama -endif - ifeq ($(BR2_PACKAGE_XLIB_LIBXI),y) SDL2_DEPENDENCIES += xlib_libXi SDL2_CONF_OPTS += --enable-video-x11-xinput @@ -140,13 +133,6 @@ else SDL2_CONF_OPTS += --disable-video-x11-scrnsaver endif -ifeq ($(BR2_PACKAGE_XLIB_LIBXXF86VM),y) -SDL2_DEPENDENCIES += xlib_libXxf86vm -SDL2_CONF_OPTS += --enable-video-x11-vm -else -SDL2_CONF_OPTS += --disable-video-x11-vm -endif - else SDL2_CONF_OPTS += --disable-video-x11 --without-x endif From fe1b0818364be4742815f69a102ac2e676784136 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 3 Mar 2024 11:50:34 +0100 Subject: [PATCH 5319/5754] support/dependencies/dependencies.sh: libopenssl needs perl bigint on s390x Commit 7ea38660e01a87ab70c02e38c78a49202e8e5c21 confused bigint [1] with Math::BigInt [2]: Can't locate bigint.pm in @INC (you may need to install the bigint module) (@INC contains: /home/buildroot/autobuild/instance-1/output-1/build/libopenssl-3.2.1/crypto/chacha/asm/../.. /home/buildroot/autobuild/instance-1/output-1/host/lib/perl /usr/local/lib64/perl5/5.36 /usr/local/share/perl5/5.36 /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 /usr/share/perl5) at /home/buildroot/autobuild/instance-1/output-1/build/libopenssl-3.2.1/crypto/chacha/asm/../../perlasm/s390x.pm line 16. BEGIN failed--compilation aborted at /home/buildroot/autobuild/instance-1/output-1/build/libopenssl-3.2.1/crypto/chacha/asm/../../perlasm/s390x.pm line 16. [1] https://perldoc.perl.org/bigint [2] https://perldoc.perl.org/Math::BigInt Fixes: 7ea38660e01a87ab70c02e38c78a49202e8e5c21 - http://autobuild.buildroot.org/results/777d86a1e53dc3d6a16c829348673f1c33245a6c Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- support/dependencies/dependencies.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index 3d83cb3285..6d5fc36037 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -283,7 +283,7 @@ required_perl_modules="$required_perl_modules FindBin" # Used by (host-)libopens required_perl_modules="$required_perl_modules IPC::Cmd" # Used by (host-)libopenssl if grep -q ^BR2_PACKAGE_LIBOPENSSL=y $BR2_CONFIG && grep -q ^BR2_s390x=y $BR2_CONFIG ; then - required_perl_modules="$required_perl_modules Math::BigInt" + required_perl_modules="$required_perl_modules bigint" fi if grep -q ^BR2_PACKAGE_MOSH=y $BR2_CONFIG ; then From 8077efb83769d43f976f7159f2c861e20163c96e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 3 Mar 2024 11:06:26 +0100 Subject: [PATCH 5320/5754] package/conmon: fix build with gcc 4.8 Fix the following build failure with gcc 4.8 raised since the addition of the package in commit 06f50ff1bf066feb6cf6ed512113773f87c884fb: src/conmon.c:5:2: error: #error conmon.c requires C99 or later #error conmon.c requires C99 or later ^ Fixes: 06f50ff1bf066feb6cf6ed512113773f87c884fb - http://autobuild.buildroot.org/results/b573aceefde04435ea13dfd2a48f9c2372bde4d7 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/conmon/conmon.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/conmon/conmon.mk b/package/conmon/conmon.mk index 214cb460a5..1e57786686 100644 --- a/package/conmon/conmon.mk +++ b/package/conmon/conmon.mk @@ -25,7 +25,8 @@ define CONMON_CONFIGURE_CMDS endef define CONMON_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \ + $(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" \ + CFLAGS="$(TARGET_CFLAGS) -std=c99" \ LDFLAGS="$(TARGET_LDFLAGS)" -C $(@D) bin/conmon endef From 5dd267200925fbce0de9da026aa5d4c001972855 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 3 Mar 2024 15:10:02 +0100 Subject: [PATCH 5321/5754] package/gcc: fix BR2_GCC_VERSION_ARC definition for gcc 13.x Since the ARC-special GCC version was bumped from gcc 10.x to gcc 13.x in commit 045ab73702b8bc09f94ca1f3b8e5bf3acb0b0843 ("toolchain: bump ARC toolchain components to arc-2023.09-release"), the BR2_GCC_VERSION_ARC option definition is not entirely correct: it selects BR2_TOOLCHAIN_GCC_AT_LEAST_10, while it should select BR2_TOOLCHAIN_GCC_AT_LEAST_13. This commit fixes this. Cc: Alexey Brodkin Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- package/gcc/Config.in.host | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index fabc6173f5..d294e8da30 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -13,7 +13,7 @@ config BR2_GCC_VERSION_ARC bool "gcc arc (13.1)" # Only supported architecture depends on BR2_arc - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 config BR2_GCC_VERSION_POWERPC_SPE bool "gcc powerpc spe" From 9d74e5af7189a50d891b5ffc3acc55ff795abdf1 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 14 Feb 2024 20:58:58 +0100 Subject: [PATCH 5322/5754] package/gstreamer1/gst1-vaapi: fix wayland build wayland-protocols is a mandatory dependency with wayland since bump to version 1.22.0 in commit 33d4c226e582f6c0086431c4d9154e462cb3cf34 and https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/3c713cc16ee1d374213cb2b47a3127e14e5ff8a5: Run-time dependency wayland-protocols found: NO (tried pkgconfig and cmake) ../output-1/build/gst1-vaapi-1.22.0/meson.build:111:0: ERROR: Dependency "wayland-protocols" not found, tried pkgconfig and cmake Fixes: 33d4c226e582f6c0086431c4d9154e462cb3cf34 - http://autobuild.buildroot.org/results/b5e79d4e10fdf24c3fd43ab742d9d14a5d07824b - http://autobuild.buildroot.org/results/ad624cd11d5a1b3346974000ae2b61f4261af02c Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/gstreamer1/gst1-vaapi/Config.in | 1 + package/gstreamer1/gst1-vaapi/gst1-vaapi.mk | 1 + 2 files changed, 2 insertions(+) diff --git a/package/gstreamer1/gst1-vaapi/Config.in b/package/gstreamer1/gst1-vaapi/Config.in index a1062097ed..d6a1542ad3 100644 --- a/package/gstreamer1/gst1-vaapi/Config.in +++ b/package/gstreamer1/gst1-vaapi/Config.in @@ -8,6 +8,7 @@ config BR2_PACKAGE_GST1_VAAPI select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_GST1_PLUGINS_BASE select BR2_PACKAGE_GST1_PLUGINS_BAD # gstreamer-codecparsers + select BR2_PACKAGE_WAYLAND_PROTOCOLS if BR2_PACKAGE_WAYLAND select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 select BR2_PACKAGE_XLIB_LIBXRANDR if BR2_PACKAGE_XORG7 help diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk index 4b04d1bb72..d934bab233 100644 --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk @@ -39,6 +39,7 @@ endif ifeq ($(BR2_PACKAGE_WAYLAND),y) GST1_VAAPI_CONF_OPTS += -Dwayland=enabled +GST1_VAAPI_DEPENDENCIES += wayland wayland-protocols else GST1_VAAPI_CONF_OPTS += -Dwayland=disabled endif From 02df2834155aec4c74149b1aacc4d56babcc9325 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 6 Jan 2024 14:10:26 +0100 Subject: [PATCH 5323/5754] package/octave: add libreadline search prefix GNU Octave changed its detection of readline library in [1]. This commit was first included in version 8.1.0. GNU Octave was updated to 8.1.0 in Buildroot in commit b36e4b10f3 "package/octave: bump to version 8.1.0". Since this commit, Octave can fail to find readline automatically in some specific situations. For example, when host system is Fedora 39 and the host "readline-devel" package is installed (see detailed explanation below). Octave is now using a m4 macro from gnulib to detect readline. See [2]. This macro is calling AC_LIB_LINKFLAGS_BODY([readline]). Note that this macro will look into $libdir and $includedir by default. See [3]. Buildroot is calling target autotools configure command with --prefix=/usr and --exec-prefix=/usr arguments. See [4]. Autotools derives libdir='${exec_prefix}/lib' and includedir='${prefix}/include'. Finally, gnulib will also search automatically into alternate library directories (i.e. lib32, lib64). See [5]. All of this will make the configure script searching the readline library by default (i.e. if the library prefix is not provided) into the host "/usr/lib", "/usr/lib32" and "/usr/lib64", when configuring for target. This issue is not happening on the Buildroot docker reference image, because the package "libreadline-dev" is not present in this image. Even if the package "libreadline-dev" is installed on a Debian based host systems, the issue is still not happening because libraries are installed in the path "/usr/lib/x86_64-linux-gnu", which is not searched by gnulib macros. On host systems which installs libraries into one of the "/usr/lib{,32,64}" directories, the Octave configuration script will fail, because it will detect the host library and try to link against it with target architecture and compilation flags and will fail. Since the --enable-readline configure option is present, the configuration script will fail because it cannot find a working readline library. This can be seen in the octave configuration log, in file: output/build/octave-8.4.0/config.log configure:73671: checking for readline configure:73705: /buildroot/output/host/bin/aarch64-none-linux-gnu-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -D_FORTIFY_SOURCE=1 -pthread -fopenmp -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 conftest.c -lpthread -lm /usr/lib64/libreadline.so >&5 /buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-none-linux-gnu/13.2.1/../../../../aarch64-none-linux-gnu/bin/ld: /usr/lib64/libreadline.so: error adding symbols: file in wrong format collect2: error: ld returned 1 exit status This situation can be reproduced on a Fedora 39 x86_64 host system, with the "readline-devel" package installed. Note: uninstalling the "readline-devel" will work around the issue. The issue can be reproduced with a Buildroot configuration such as: cat > .config < Signed-off-by: Arnout Vandecappelle --- package/octave/octave.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/octave/octave.mk b/package/octave/octave.mk index cae0de7620..f240a5057c 100644 --- a/package/octave/octave.mk +++ b/package/octave/octave.mk @@ -20,7 +20,9 @@ OCTAVE_DEPENDENCIES = \ pcre2 ifeq ($(BR2_PACKAGE_READLINE),y) -OCTAVE_CONF_OPTS += --enable-readline +OCTAVE_CONF_OPTS += \ + --enable-readline \ + --with-libreadline-prefix=$(STAGING_DIR)/usr OCTAVE_DEPENDENCIES += readline else OCTAVE_CONF_OPTS += --disable-readline From eaeba56aa2d21f1d264c7e361731808e3f072d9d Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 14 Jan 2024 13:54:48 +0100 Subject: [PATCH 5324/5754] toolchain/Config.in: update ucontext handling As suggested by Thomas Petazzoni in [1], add a comment on BR2_TOOLCHAIN_HAS_UCONTEXT to specify that this boolean will be set to true only when a toolchain provides a full featured ucontext implementation with ucontext_t and {get,make,set}context. As a result, drop its selection from BR2_TOOLCHAIN_USES_MUSL to fix the following musl build failure on php: /home/autobuild/autobuild/instance-8/output-1/host/lib/gcc/m68k-buildroot-linux-musl/12.3.0/../../../../m68k-buildroot-linux-musl/bin/ld: Zend/zend_fibers.o: in function `zend_fiber_init_context': zend_fibers.c:(.text+0x946): undefined reference to `getcontext' [1]: https://patchwork.ozlabs.org/project/buildroot/patch/20230516193307.1543455-1-bernd.kuhls@t-online.de/ Fixes: - http://autobuild.buildroot.org/results/271f9fb8bfa5ba2f74feef81e6b375b54e21cece Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- toolchain/Config.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/toolchain/Config.in b/toolchain/Config.in index 407a03c42e..3dd6e83d35 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -34,7 +34,6 @@ config BR2_TOOLCHAIN_USES_MUSL select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS_NPTL - select BR2_TOOLCHAIN_HAS_UCONTEXT select BR2_TOOLCHAIN_SUPPORTS_PIE if !BR2_STATIC_LIBS choice @@ -302,6 +301,8 @@ config BR2_TOOLCHAIN_HAS_SSP_STRONG bool default y if BR2_TOOLCHAIN_HAS_SSP && BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 +# This boolean is true if the toolchain provides a full featured +# ucontext implementation with ucontext_t and {get,make,set}context config BR2_TOOLCHAIN_HAS_UCONTEXT bool From e97cd704c58c133a226f109337ae4d83b124b780 Mon Sep 17 00:00:00 2001 From: Viacheslav Bocharov Date: Wed, 31 Jan 2024 18:07:11 +0300 Subject: [PATCH 5325/5754] package/rtl8822cs bump driver version to latest - Update driver for kernel 6.7+ - Fix warning/errors on build Fixes: http://autobuild.buildroot.net/results/e4f/e4f1dd9d6e3ac305fd54221e04e4bafeb480ccf7 Signed-off-by: Viacheslav Bocharov Reviewed-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle --- package/rtl8822cs/rtl8822cs.hash | 2 +- package/rtl8822cs/rtl8822cs.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rtl8822cs/rtl8822cs.hash b/package/rtl8822cs/rtl8822cs.hash index 4b44512913..34bcc412ce 100644 --- a/package/rtl8822cs/rtl8822cs.hash +++ b/package/rtl8822cs/rtl8822cs.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 b3b8543ff6d6d602ffaf60342969830edc8205917b96d004f84ed79524894dc7 rtl8822cs-2e4e99ae1502b173a938357dc1087e49475b26ed.tar.gz +sha256 d61fff0ee8b4219a6441791ff26be1b8c49ef8b2ca78345bf12b7a0541f498e9 rtl8822cs-fda6cd263e89567272060e6182a39aee20b894c4.tar.gz diff --git a/package/rtl8822cs/rtl8822cs.mk b/package/rtl8822cs/rtl8822cs.mk index 6036acb864..dbdc7d84bf 100644 --- a/package/rtl8822cs/rtl8822cs.mk +++ b/package/rtl8822cs/rtl8822cs.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8822CS_VERSION = 2e4e99ae1502b173a938357dc1087e49475b26ed +RTL8822CS_VERSION = fda6cd263e89567272060e6182a39aee20b894c4 RTL8822CS_SITE = $(call github,jethome-ru,rtl88x2cs,$(RTL8822CS_VERSION)) RTL8822CS_LICENSE = GPL-2.0 From 7781cdca3163035f3f89df90605cde7c5b7cd3c5 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 11 Feb 2024 22:47:51 +0100 Subject: [PATCH 5326/5754] package/shadow: drop BR2_PACKAGE_SHADOW_UTMPX utmpx is not available since bump to version 4.14.3 in commit 8a01774d9897310c00a0945865f5a6d5167dfca3 and https://github.com/shadow-maint/shadow/commit/3be7b9d75a6b73fe24394d7ac1e315d60d45b5ee: configure: WARNING: unrecognized options: --disable-gtk-doc, --disable-gtk-doc-html, --disable-doc, --disable-docs, --disable-documentation, --with-xmlto, --with-fop, --enable-ipv6, --enable-utmpx Fixes: 8a01774d9897310c00a0945865f5a6d5167dfca3 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- Config.in.legacy | 6 ++++++ package/shadow/Config.in | 5 ----- package/shadow/shadow.mk | 6 ------ 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index a869279af7..576148c4af 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2024.02" +config BR2_PACKAGE_SHADOW_UTMPX + bool "shadow utmpx removed" + select BR2_LEGACY + help + UTMPX has been dropped by upstream. + config BR2_PACKAGE_TINYMEMBENCH bool "tinymembench removed" select BR2_LEGACY diff --git a/package/shadow/Config.in b/package/shadow/Config.in index e85e5884d2..230271af7d 100644 --- a/package/shadow/Config.in +++ b/package/shadow/Config.in @@ -31,11 +31,6 @@ comment "account-tools-setuid needs a toolchain w/ dynamic library, wchar, local depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || \ !BR2_ENABLE_LOCALE || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 -config BR2_PACKAGE_SHADOW_UTMPX - bool "utmpx" - help - Enable loggin in utmpx / wtmpx. - config BR2_PACKAGE_SHADOW_SUBORDINATE_IDS bool "subordinate-ids" help diff --git a/package/shadow/shadow.mk b/package/shadow/shadow.mk index 03eb16a3f4..1e7ada6148 100644 --- a/package/shadow/shadow.mk +++ b/package/shadow/shadow.mk @@ -43,12 +43,6 @@ 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 From 1140bfd950f3d211306f10b6e40deabd91d55b16 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 11 Feb 2024 23:30:46 +0100 Subject: [PATCH 5327/5754] support/testing: mdadm: improve test robustness on slow runners As expected by Peter in [1], the hardcoded 3 seconds for waiting the RAID array to rebuild are not enough on slow test host runners. This test already failed at least once for that reason, in [2]. In order to fix those failures, this commit adds extra logic to allow several attempts, before failing. The timeout is currently set at 10 attempts, waiting 3 seconds between each attempts. To help even more, those 3 seconds are also scaled with the timeout_multiplier. Fixes: [2] [1] https://lists.buildroot.org/pipermail/buildroot/2024-February/685034.html [2] https://gitlab.com/buildroot.org/buildroot/-/jobs/6137469690 Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle --- support/testing/tests/package/test_mdadm.py | 22 ++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/support/testing/tests/package/test_mdadm.py b/support/testing/tests/package/test_mdadm.py index 75385309a6..d5abdb0706 100644 --- a/support/testing/tests/package/test_mdadm.py +++ b/support/testing/tests/package/test_mdadm.py @@ -122,13 +122,21 @@ def test_run(self): # We add back this blank drive to the array. self.assertRunOk(f"mdadm {md_dev} --add {failing_dev}") - # We wait few seconds to let the device rebuild. - time.sleep(3) - - # The array should no longer be marked as degraded. - out, ret = self.emulator.run(monitor_cmd) - self.assertEqual(ret, 0) - self.assertNotIn("DegradedArray", "\n".join(out)) + # Device rebuild can take a variable amount of time, depending + # on the load of the test controller host. So we will allow + # several attempts, before failing. + for attempt in range(10): + # We wait few seconds to let the device rebuild. + time.sleep(3 * self.timeout_multiplier) + + # Once rebuilt, the array should no longer be marked as + # degraded. + out, ret = self.emulator.run(monitor_cmd) + self.assertEqual(ret, 0) + if "DegradedArray" not in "\n".join(out): + break + else: + self.fail("Timeout while waiting for the array to rebuild.") # With all those array manipulations, the data file should not # be corrupted. We should be able to recompute the same hash From c2d218eb7266ddf7fe157bb7b58da58429ef4f8e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 13 Feb 2024 22:00:51 +0100 Subject: [PATCH 5328/5754] package/botan: fix uclibc build getentropy is enabled by default since version 3.0 and https://github.com/randombit/botan/commit/8642f2a99deefc85cdb512ee50d9f62c5e0ae4b8 and explicit_bzero is also enabled since version 3.0 and https://github.com/randombit/botan/commit/e6819a380fb67c1be546dc618248b62d93266423 resulting in the following build failure since bump to version 3.2.0 in commit 2f8feb66204ff661e9fd5f508e2dfd1ebc0f2813: src/lib/entropy/getentropy/getentropy.cpp:26:9: error: '::getentropy' has not been declared; did you mean 'Getentropy'? 26 | if(::getentropy(buf.data(), buf.size()) == 0) { | ^~~~~~~~~~ | Getentropy Fixes: 2f8feb66204ff661e9fd5f508e2dfd1ebc0f2813 - http://autobuild.buildroot.org/results/d58c4730c770467b42af426545dd917ecc5fed17 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/botan/botan.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/botan/botan.mk b/package/botan/botan.mk index 7c290f04ad..88dbfa5807 100644 --- a/package/botan/botan.mk +++ b/package/botan/botan.mk @@ -49,7 +49,7 @@ BOTAN_CONF_OPTS += --without-stack-protector endif ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) -BOTAN_CONF_OPTS += --without-os-feature=getauxval +BOTAN_CONF_OPTS += --without-os-feature=explicit_bzero,getauxval,getentropy endif ifeq ($(BR2_PACKAGE_BOOST_FILESYSTEM)$(BR2_PACKAGE_BOOST_SYSTEM),yy) From c9de634b082e9d5a8f52f7c983a481105696d347 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 16 Feb 2024 19:14:15 +0100 Subject: [PATCH 5329/5754] package/dash: fix static build Drop -Wl,--fatal-warnings with --enable-static to avoid the following static build failure: configure:4778: checking for strtod configure:4778: /home/autobuild/autobuild/instance-8/output-1/host/bin/powerpc-buildroot-linux-uclibcspe-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -mabi=spe -mfloat-gprs=single -Wa,-me500 -Os -g0 -static -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -static -Wl,--fatal-warnings conftest.c >&5 /home/autobuild/autobuild/instance-8/output-1/host/lib/gcc/powerpc-buildroot-linux-uclibcspe/8.4.0/../../../../powerpc-buildroot-linux-uclibcspe/bin/ld: warning: conftest has a LOAD segment with RWX permissions collect2: error: ld returned 1 exit status [...] In file included from arith_yylex.c:44: system.h:74:22: error: static declaration of 'strtod' follows non-static declaration static inline double strtod(const char *nptr, char **endptr) ^~~~~~ Fixes: - http://autobuild.buildroot.org/results/a54fdc7d1b94beb47203373ae35b08d9cea8d42c - http://autobuild.buildroot.org/results/a4287b86186bf0a1d5370cf53123b324ae65c1da Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- ...-configure.ac-drop-Wl-fatal-warnings.patch | 45 +++++++++++++++++++ package/dash/dash.mk | 2 + 2 files changed, 47 insertions(+) create mode 100644 package/dash/0001-configure.ac-drop-Wl-fatal-warnings.patch diff --git a/package/dash/0001-configure.ac-drop-Wl-fatal-warnings.patch b/package/dash/0001-configure.ac-drop-Wl-fatal-warnings.patch new file mode 100644 index 0000000000..eaa5d6cc60 --- /dev/null +++ b/package/dash/0001-configure.ac-drop-Wl-fatal-warnings.patch @@ -0,0 +1,45 @@ +From 7d07f683b83ef9fbdf258ce61b022b32f06f253a Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 16 Feb 2024 17:26:28 +0100 +Subject: [PATCH] configure.ac: drop -Wl,--fatal-warnings + +Drop -Wl,--fatal-warnings with --enable-static to avoid the following +static build failure: + +configure:4778: checking for strtod +configure:4778: /home/autobuild/autobuild/instance-8/output-1/host/bin/powerpc-buildroot-linux-uclibcspe-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -mabi=spe -mfloat-gprs=single -Wa,-me500 -Os -g0 -static -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -static -Wl,--fatal-warnings conftest.c >&5 +/home/autobuild/autobuild/instance-8/output-1/host/lib/gcc/powerpc-buildroot-linux-uclibcspe/8.4.0/../../../../powerpc-buildroot-linux-uclibcspe/bin/ld: warning: conftest has a LOAD segment with RWX permissions +collect2: error: ld returned 1 exit status + +[...] + +In file included from arith_yylex.c:44: +system.h:74:22: error: static declaration of 'strtod' follows non-static declaration + static inline double strtod(const char *nptr, char **endptr) + ^~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/a54fdc7d1b94beb47203373ae35b08d9cea8d42c + +Signed-off-by: Fabrice Fontaine +Upstream: https://lore.kernel.org/dash/20240216163319.860768-1-fontaine.fabrice@gmail.com +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 5524650..6993364 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -34,7 +34,7 @@ fi + AC_ARG_ENABLE(static, AS_HELP_STRING(--enable-static, \ + [Build statical linked program])) + if test "$enable_static" = "yes"; then +- export LDFLAGS="-static -Wl,--fatal-warnings" ++ export LDFLAGS="-static" + fi + + AC_ARG_ENABLE(fnmatch, AS_HELP_STRING(--disable-fnmatch, \ +-- +2.43.0 + diff --git a/package/dash/dash.mk b/package/dash/dash.mk index 6efc71e568..aebfd28be8 100644 --- a/package/dash/dash.mk +++ b/package/dash/dash.mk @@ -8,6 +8,8 @@ DASH_VERSION = 0.5.11.5 DASH_SITE = http://gondor.apana.org.au/~herbert/dash/files DASH_LICENSE = BSD-3-Clause, GPL-2.0+ (mksignames.c) DASH_LICENSE_FILES = COPYING +# We're patching configure.ac +DASH_AUTORECONF = YES # dash does not build in parallel DASH_MAKE = $(MAKE1) From 607507dfa91102c42b6b531e8f3a1a133e46e33f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 16 Feb 2024 22:18:13 +0100 Subject: [PATCH 5330/5754] package/liburing: fix uclibc build Fix the following build failure with uclibc-ng raised since bump to version 2.4 in commit 3cc1b539e7e9fd49f571441e395e7daa8597dbec and https://github.com/axboe/liburing/commit/c6bc86e2125bcd6fa10ff2b128cd86486acadff6: In file included from lib.h:12, from setup.c:4: arch/aarch64/lib.h:7:10: fatal error: sys/auxv.h: No such file or directory 7 | #include | ^~~~~~~~~~~~ Fixes: 3cc1b539e7e9fd49f571441e395e7daa8597dbec - http://autobuild.buildroot.org/results/cc44d714c9267dd7a98debeb8c81c4ee1efe4ebb Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- ...01-src-arch-aarch64-fix-uclibc-build.patch | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 package/liburing/0001-src-arch-aarch64-fix-uclibc-build.patch diff --git a/package/liburing/0001-src-arch-aarch64-fix-uclibc-build.patch b/package/liburing/0001-src-arch-aarch64-fix-uclibc-build.patch new file mode 100644 index 0000000000..4468105e4f --- /dev/null +++ b/package/liburing/0001-src-arch-aarch64-fix-uclibc-build.patch @@ -0,0 +1,39 @@ +From f03f8da34fe96ac35a916ca3058b0f41971eae3b Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 16 Feb 2024 18:59:42 +0100 +Subject: [PATCH] src/arch/aarch64: fix uclibc build + +Fix the following build failure with uclibc-ng raised since version 2.3 +and +https://github.com/axboe/liburing/commit/c6bc86e2125bcd6fa10ff2b128cd86486acadff6: + +In file included from lib.h:12, + from setup.c:4: +arch/aarch64/lib.h:7:10: fatal error: sys/auxv.h: No such file or directory + 7 | #include + | ^~~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/cc44d714c9267dd7a98debeb8c81c4ee1efe4ebb + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/axboe/liburing/commit/32f9c27a76c43627f79bb77469d2da8583e4d3df +--- + src/arch/aarch64/lib.h | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/arch/aarch64/lib.h b/src/arch/aarch64/lib.h +index 3b701b1..41bcfc9 100644 +--- a/src/arch/aarch64/lib.h ++++ b/src/arch/aarch64/lib.h +@@ -4,7 +4,6 @@ + #define LIBURING_ARCH_AARCH64_LIB_H + + #include +-#include + #include "../../syscall.h" + + static inline long __get_page_size(void) +-- +2.43.0 + From ed2090717f657c1f19bb7bd62c97e17a7bf3ff50 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 3 Mar 2024 18:26:22 +0100 Subject: [PATCH 5331/5754] package/strongswan: drop BR2_PACKAGE_STRONGSWAN_SCEP scepclient is unrecognized since bump to version 5.9.8 in commit b79d735139282ecf052dc89d4c221bbd16447112 and https://github.com/strongswan/strongswan/commit/8716f7c03c6193b1cb53837243177f36280ff4f7: 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, --enable-scepclient Fixes: b79d735139282ecf052dc89d4c221bbd16447112 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- Config.in.legacy | 10 ++++++++++ package/strongswan/Config.in | 3 --- package/strongswan/strongswan.mk | 1 - 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 576148c4af..5956ffcca5 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,16 @@ endif comment "Legacy options removed in 2024.02" +config BR2_PACKAGE_STRONGSWAN_SCEP + bool "strongswan SCEP client tool removed" + select BR2_LEGACY + help + "ipsec scepclient" tool has been removed and replaced by the + pki subcommands "pki --scep" and "pki --scepca" which + implement the new SCEP RFC 8894 standard that was released in + September 2020 and which supports trusted "certificate + renewal" based on the existing client certificate. + config BR2_PACKAGE_SHADOW_UTMPX bool "shadow utmpx removed" select BR2_LEGACY diff --git a/package/strongswan/Config.in b/package/strongswan/Config.in index f2e597e016..5231e69ca8 100644 --- a/package/strongswan/Config.in +++ b/package/strongswan/Config.in @@ -204,9 +204,6 @@ config BR2_PACKAGE_STRONGSWAN_PKI bool "Enable pki certificate utility" default y -config BR2_PACKAGE_STRONGSWAN_SCEP - bool "Enable SCEP client tool" - config BR2_PACKAGE_STRONGSWAN_SCRIPTS bool "Enable additional utilities (found in scripts directory)" default y diff --git a/package/strongswan/strongswan.mk b/package/strongswan/strongswan.mk index 36cb72f6be..5521fb7dd4 100644 --- a/package/strongswan/strongswan.mk +++ b/package/strongswan/strongswan.mk @@ -33,7 +33,6 @@ STRONGSWAN_CONF_OPTS += \ --enable-stroke=$(if $(BR2_PACKAGE_STRONGSWAN_STROKE),yes,no) \ --enable-sql=$(if $(BR2_PACKAGE_STRONGSWAN_SQL),yes,no) \ --enable-pki=$(if $(BR2_PACKAGE_STRONGSWAN_PKI),yes,no) \ - --enable-scepclient=$(if $(BR2_PACKAGE_STRONGSWAN_SCEP),yes,no) \ --enable-scripts=$(if $(BR2_PACKAGE_STRONGSWAN_SCRIPTS),yes,no) \ --enable-vici=$(if $(BR2_PACKAGE_STRONGSWAN_VICI),yes,no) \ --enable-swanctl=$(if $(BR2_PACKAGE_STRONGSWAN_VICI),yes,no) \ From 8895cae09b7f364fdd8eb55ad487a9bad55e2faf Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 30 Oct 2023 14:38:33 +0100 Subject: [PATCH 5332/5754] package/tar: fix NLS build Fix the following build failure raised since bump to version 1.35 in commit d4d483451f0a305781b94b96c15a6cf4b489cd84: /home/thomas/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/12.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: buffer.o: in function `bufmap_reset': buffer.c:(.text+0xe8): undefined reference to `libintl_gettext' Fixes: - http://autobuild.buildroot.org/results/99b05d4b495b6337c6a48ea5a551a3a84c6d2e6b Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/tar/tar.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/tar/tar.mk b/package/tar/tar.mk index dc17647b2c..d57d63970d 100644 --- a/package/tar/tar.mk +++ b/package/tar/tar.mk @@ -13,6 +13,8 @@ TAR_CONF_OPTS = --exec-prefix=/ TAR_LICENSE = GPL-3.0+ TAR_LICENSE_FILES = COPYING TAR_CPE_ID_VENDOR = gnu +TAR_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) +TAR_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) # 0002-Fix-boundary-checking-in-base-256-decoder.patch TAR_IGNORE_CVES += CVE-2022-48303 From c1fa9bc2f7a4e5481edf4fce5c03dd45862fe72c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 30 Nov 2023 20:13:05 +0100 Subject: [PATCH 5333/5754] package/libselinux: fix build with BR2_TIME_BITS_64 Do not remove _FILE_OFFSET_BITS=64 from CFLAGS and CPPFLAGS to avoid the following build failure with BR2_TIME_BITS_64 raised since commit 3c427c64726560ea1743282a3fdb78f5b28692eb: In file included from /home/autobuild/autobuild/instance-9/output-1/per-package/libselinux/host/mipsel-buildroot-linux-gnu/sysroot/usr/include/features.h:394, from /home/autobuild/autobuild/instance-9/output-1/per-package/libselinux/host/mipsel-buildroot-linux-gnu/sysroot/usr/include/bits/libc-header-start.h:33, from /home/autobuild/autobuild/instance-9/output-1/per-package/libselinux/host/mipsel-buildroot-linux-gnu/sysroot/usr/include/stdint.h:26, from /home/autobuild/autobuild/instance-9/output-1/per-package/libselinux/host/lib/gcc/mipsel-buildroot-linux-gnu/12.3.0/include/stdint.h:9, from ../include/selinux/avc.h:9, from avc.c:10: /home/autobuild/autobuild/instance-9/output-1/per-package/libselinux/host/mipsel-buildroot-linux-gnu/sysroot/usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" 26 | # error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" | ^~~~~ This LFS workaround for glibc < 2.23 was added in 2016 by commit ebcca24c953d8df4b16bc52c5ba31feae4ed8ad0 and is probably not needed anymore as glibc 2.23 was released in February 2016: https://sourceware.org/glibc/wiki/Release/2.23 Fixes: - http://autobuild.buildroot.org/results/d85c81f87adf3a5945fa369bcec233e6def2ed12 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/libselinux/libselinux.mk | 8 -------- 1 file changed, 8 deletions(-) diff --git a/package/libselinux/libselinux.mk b/package/libselinux/libselinux.mk index 601038e46f..734084ba50 100644 --- a/package/libselinux/libselinux.mk +++ b/package/libselinux/libselinux.mk @@ -52,14 +52,6 @@ define LIBSELINUX_BUILD_PYTHON_BINDINGS endef endif # python3 -# Filter out D_FILE_OFFSET_BITS=64. This fixes errors caused by glibc 2.22. We -# set CFLAGS, CPPFLAGS and LDFLAGS here because we want to win over the -# CFLAGS/CPPFLAGS/LDFLAGS definitions passed by $(PKG_PYTHON_SETUPTOOLS_ENV) -# when the python binding is enabled. -LIBSELINUX_MAKE_OPTS += \ - CFLAGS="$(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CFLAGS))" \ - CPPFLAGS="$(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CPPFLAGS))" - define LIBSELINUX_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ $(LIBSELINUX_MAKE_OPTS) all From 077741623fcd5372a43dd78719f859c479815901 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 3 Mar 2024 18:11:15 +0100 Subject: [PATCH 5334/5754] package/efivar: bump to version 39 to fix build failures For release note since version 38, see [1]. This commit introduces changes in package patches: - 0001: Patch dropped. An similar change is included in this release. See [2]. - 0002: Patch no longer needed since the package build recipe sets CFLAGS without -Werror, and the package makefile sets -Werror only by default. See [3], included since version 38. - 0003: Rebased on version 39 and renamed to 0001. The patch is also flagged as "Upstream: Not applicable". - 0004: Patch dropped. Included in this release. See [4]. This commit also removes all patch entries in ".checkpackageignore" (since the remaining patch has its "Upstream:" tag). This version 39 also fixes few build failures. Those can be seen by running the command "utils/test-pkg -a -p efivar". The first group of build failures is: br-arm-basic [28/45]: FAILED br-i386-pentium4-full [31/45]: FAILED br-mips64-n64-full [33/45]: FAILED br-mips64r6-el-hf-glibc [34/45]: FAILED linaro-aarch64 [38/45]: FAILED linaro-arm [39/45]: FAILED Fixes: /buildroot/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-linux-gnu/7.3.1/../../../../aarch64-linux-gnu/bin/ld: .data not found for insert collect2: error: ld returned 1 exit status efivar 38 was using linker scripts, which was not working in all cases. Those issues are fixed by the upstream commit [5] which removes the use of this linker script (included in this release). The "test-pkg -a -p efivar" also caught another kind of build failures: br-i386-pentium-mmx-musl [32/45]: FAILED Fixes: In file included from efivar.h:18, from efisec.h:24, from secdb-dump.c:7: list.h: In function 'list_sort': list.h:152:2: warning: implicit declaration of function 'qsort_r'; did you mean 'qsort'? [-Wimplicit-function-declaration] 152 | qsort_r(array, nmemb, sizeof(*array), cmp, state); | ^~~~~~~ | qsort Those failures were introduced in commit f24029b561 "package/efivar: bump to version 38". This is because efivar introduced a usage of the qsort_r() libc function, in upstream commit [6], first included in version 38. Musl libc added the qsort_r() function in upstream commit [7], included in version v1.2.3 (2022-04-07). So external toolchains including a Musl older than this version will fail. But given how old this issue is (musql 1.2.3 is included in Buildroot since 2022.05), this issue is ignored. uClibc-ng external toolchains are also not affected, since it added the qsort_r() function in commit [8] included since its first version v1.0.0 (2015-02-02). So there is no need to exclude external uclibc toolchains. [1] https://github.com/rhboot/efivar/releases/tag/39 [2] https://github.com/rhboot/efivar/commit/4f3da3dc351d7743d91327e74fcaaa13299eeb39 [3] https://github.com/rhboot/efivar/commit/998f617cec92d526e1fadb745673ceef63fa1483 [4] https://github.com/rhboot/efivar/commit/cece3ffd5be2f8641eb694513f2b73e5eb97ffd3 [5] https://github.com/rhboot/efivar/commit/cfd686de51494d3e34be896a91835657ccab37d4 [6] https://github.com/rhboot/efivar/commit/62afa2aa588fb0a6ff56acdd268b9f3c557028b8 [7] https://git.musl-libc.org/cgit/musl/commit/?id=b76f37fd5625d038141b52184956fb4b7838e9a5 [8] https://gogs.waldemar-brodkorb.de/oss/uclibc-ng/commit/515d54433138596e81267237542bd9168b8cc787 Signed-off-by: Julien Olivain [Peter: drop dependency on !external musl] Signed-off-by: Peter Korsgaard --- .checkpackageignore | 4 - .../efivar/0001-Allow-build-with-uClibc.patch | 39 ---- ...r-isolate-makeguids-host-tool-build.patch} | 19 +- .../efivar/0002-gcc.specs-drop-Werror.patch | 46 ----- ...04-efisecdb-fix-build-with-musl-libc.patch | 185 ------------------ package/efivar/efivar.hash | 2 +- package/efivar/efivar.mk | 2 +- 7 files changed, 13 insertions(+), 284 deletions(-) delete mode 100644 package/efivar/0001-Allow-build-with-uClibc.patch rename package/efivar/{0003-efivar-isolate-makeguids-host-tool-build.patch => 0001-efivar-isolate-makeguids-host-tool-build.patch} (70%) delete mode 100644 package/efivar/0002-gcc.specs-drop-Werror.patch delete mode 100644 package/efivar/0004-efisecdb-fix-build-with-musl-libc.patch diff --git a/.checkpackageignore b/.checkpackageignore index c18cc4d417..1303db52c6 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -338,10 +338,6 @@ package/ebtables/0003-configure.ac-add-option-enable-kernel-64-userland-32.patch 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 diff --git a/package/efivar/0001-Allow-build-with-uClibc.patch b/package/efivar/0001-Allow-build-with-uClibc.patch deleted file mode 100644 index 0da80f26d2..0000000000 --- a/package/efivar/0001-Allow-build-with-uClibc.patch +++ /dev/null @@ -1,39 +0,0 @@ -From bfd9cd9e603ef0d0e593d4432048bffc2acfeb7c Mon Sep 17 00:00:00 2001 -From: Andy Shevchenko -Date: Fri, 25 Nov 2016 19:42:27 +0200 -Subject: [PATCH] Allow build with uClibc - -Basically this replaces type definitions in . - -Signed-off-by: Andy Shevchenko -[Erico: rebase to 38] -Signed-off-by: Erico Nunes ---- - src/export.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/src/export.c b/src/export.c -index db5e637..21c5617 100644 ---- a/src/export.c -+++ b/src/export.c -@@ -9,10 +9,16 @@ - #include - #include - #include --#include - - #include "efivar.h" - -+#ifdef __UCLIBC__ -+typedef int_least16_t char16_t; -+typedef int_least32_t char32_t; -+#else -+#include -+#endif -+ - #define EFIVAR_MAGIC 0xf3df1597u - - #define ATTRS_UNSET 0xa5a5a5a5a5a5a5a5 --- -2.37.3 - diff --git a/package/efivar/0003-efivar-isolate-makeguids-host-tool-build.patch b/package/efivar/0001-efivar-isolate-makeguids-host-tool-build.patch similarity index 70% rename from package/efivar/0003-efivar-isolate-makeguids-host-tool-build.patch rename to package/efivar/0001-efivar-isolate-makeguids-host-tool-build.patch index f136bf2cd3..aad207d834 100644 --- a/package/efivar/0003-efivar-isolate-makeguids-host-tool-build.patch +++ b/package/efivar/0001-efivar-isolate-makeguids-host-tool-build.patch @@ -1,4 +1,4 @@ -From b069a48abd62a669851b9c3b501d579748dab0fd Mon Sep 17 00:00:00 2001 +From e1c3734bab27fd850b4ac6681d219ceaf0637616 Mon Sep 17 00:00:00 2001 From: Erico Nunes Date: Mon, 3 Oct 2022 18:16:55 +0200 Subject: [PATCH] efivar: isolate makeguids host tool build @@ -14,16 +14,19 @@ target and remove target build dependencies from it. This way, Buildroot can build the tool separately in a host build step and the target build step can then be straightforward. +Upstream: Not applicable (does not support cross compilation) +Signed-off-by: Julien Olivain +[Julien: rebased patch to version 39] Signed-off-by: Erico Nunes --- src/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Makefile b/src/Makefile -index 0e423c4..82c59c2 100644 +index 6fc2a62..7fa63c6 100644 --- a/src/Makefile +++ b/src/Makefile -@@ -68,7 +68,6 @@ makeguids : LDFLAGS=$(HOST_LDFLAGS) +@@ -70,7 +70,6 @@ makeguids : LDFLAGS=$(HOST_LDFLAGS) makeguids : CCLDFLAGS=$(HOST_CCLDFLAGS) makeguids : $(MAKEGUIDS_OBJECTS) @@ -31,18 +34,18 @@ index 0e423c4..82c59c2 100644 $(MAKEGUIDS_OUTPUT) : guids.txt @set -e ; \ missing=no ; \ -@@ -81,9 +80,9 @@ $(MAKEGUIDS_OUTPUT) : guids.txt +@@ -83,9 +82,9 @@ $(MAKEGUIDS_OUTPUT) : guids.txt if [ "$${missing}" != "no" ]; then \ exit 1 ; \ fi -- ./makeguids $(LD_DASH_T) guids.txt guid-symbols.c include/efivar/efivar-guids.h guids.lds -+ makeguids $(LD_DASH_T) guids.txt guid-symbols.c include/efivar/efivar-guids.h guids.lds +- ./makeguids guids.txt guid-symbols.c include/efivar/efivar-guids.h ++ makeguids guids.txt guid-symbols.c include/efivar/efivar-guids.h -prep : makeguids $(GENERATED_SOURCES) +prep : $(GENERATED_SOURCES) - $(LIBEFIVAR_OBJECTS) $(LIBEFIBOOT_OBJECTS) : prep + $(LIBEFIVAR_OBJECTS) $(LIBEFIBOOT_OBJECTS) : include/efivar/efivar-guids.h -- -2.37.3 +2.44.0 diff --git a/package/efivar/0002-gcc.specs-drop-Werror.patch b/package/efivar/0002-gcc.specs-drop-Werror.patch deleted file mode 100644 index a25b844906..0000000000 --- a/package/efivar/0002-gcc.specs-drop-Werror.patch +++ /dev/null @@ -1,46 +0,0 @@ -From a1d469753528a98aec971377a526619da5054b20 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 22 Mar 2021 07:52:34 +0100 -Subject: [PATCH] gcc.specs: drop -Werror - -Build with -Werror raises the following build failure with gcc 10: - -/home/buildroot/autobuild/run/instance-1/output-1/host/bin/aarch64-none-linux-gnu-gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O2 -I/home/buildroot/autobuild/run/instance-1/output-1/build/efivar-37/src/include/ -specs=/home/buildroot/autobuild/run/instance-1/output-1/build/efivar-37/gcc.specs -L. -fPIC -Wl,-z,muldefs -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -o efivar efivar.c -lefivar -ldl -In file included from efivar.h:28, - from efivar.c:40: -In function 'text_to_guid', - inlined from 'parse_name.constprop' at efivar.c:157:8: -guid.h:106:2: error: 'strncpy' output may be truncated copying 8 bytes from a string of length 38 [-Werror=stringop-truncation] - 106 | strncpy(eightbytes, text, 8); - | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ -cc1: all warnings being treated as errors - -Fixes: - - http://autobuild.buildroot.org/results/fcba72d359f4128515560e9105384cd4deff5043 - -Signed-off-by: Fabrice Fontaine -[Upstream status: not upstreamable as Makefiles were reworked and a new -ERRORS parameter was added: -https://github.com/rhboot/efivar/commit/998f617cec92d526e1fadb745673ceef63fa1483] -[Erico: rebase to 38] -Signed-off-by: Erico Nunes ---- - src/include/defaults.mk | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/include/defaults.mk b/src/include/defaults.mk -index 632b155..2a9537a 100644 ---- a/src/include/defaults.mk -+++ b/src/include/defaults.mk -@@ -29,7 +29,7 @@ WARNINGS_GCC ?= - WARNINGS_CCC_ANALYZER ?= $(WARNINGS_GCC) - WARNINGS ?= -Wall -Wextra $(call family,WARNINGS) - ERRORS_GCC ?= --ERRORS ?= -Werror $(call family,ERRORS) -+ERRORS ?= $(call family,ERRORS) - CPPFLAGS ?= - override _CPPFLAGS := $(CPPFLAGS) - override CPPFLAGS = $(_CPPFLAGS) -DLIBEFIVAR_VERSION=$(VERSION) \ --- -2.37.3 - diff --git a/package/efivar/0004-efisecdb-fix-build-with-musl-libc.patch b/package/efivar/0004-efisecdb-fix-build-with-musl-libc.patch deleted file mode 100644 index 9815a9d0cf..0000000000 --- a/package/efivar/0004-efisecdb-fix-build-with-musl-libc.patch +++ /dev/null @@ -1,185 +0,0 @@ -From cece3ffd5be2f8641eb694513f2b73e5eb97ffd3 Mon Sep 17 00:00:00 2001 -From: Natanael Copa -Date: Fri, 28 Jan 2022 12:13:30 +0100 -Subject: [PATCH] efisecdb: fix build with musl libc - -Refactor code to use POSIX atexit(3) instead of the GNU specific -on_exit(3). - -Resolves: #197 -Resolves: #202 -Signed-off-by: Natanael Copa -[Erico: backport from upstream commit -cece3ffd5be2f8641eb694513f2b73e5eb97ffd3] -Signed-off-by: Erico Nunes ---- - src/compiler.h | 2 -- - src/efisecdb.c | 68 +++++++++++++++++++------------------------------- - 2 files changed, 26 insertions(+), 44 deletions(-) - -diff --git a/src/compiler.h b/src/compiler.h -index e2f18f0..d95fb01 100644 ---- a/src/compiler.h -+++ b/src/compiler.h -@@ -7,8 +7,6 @@ - #ifndef COMPILER_H_ - #define COMPILER_H_ - --#include -- - /* GCC version checking borrowed from glibc. */ - #if defined(__GNUC__) && defined(__GNUC_MINOR__) - # define GNUC_PREREQ(maj,min) \ -diff --git a/src/efisecdb.c b/src/efisecdb.c -index f882373..6bd5ad9 100644 ---- a/src/efisecdb.c -+++ b/src/efisecdb.c -@@ -25,6 +25,10 @@ - extern char *optarg; - extern int optind, opterr, optopt; - -+static efi_secdb_t *secdb = NULL; -+static list_t infiles; -+static list_t actions; -+ - struct hash_param { - char *name; - efi_secdb_type_t algorithm; -@@ -187,12 +191,11 @@ add_action(list_t *list, action_type_t action_type, const efi_guid_t *owner, - } - - static void --free_actions(int status UNUSED, void *actionsp) -+free_actions(void) - { -- list_t *actions = (list_t *)actionsp; - list_t *pos, *tmp; - -- for_each_action_safe(pos, tmp, actions) { -+ for_each_action_safe(pos, tmp, &actions) { - action_t *action = list_entry(pos, action_t, list); - - list_del(&action->list); -@@ -202,12 +205,11 @@ free_actions(int status UNUSED, void *actionsp) - } - - static void --free_infiles(int status UNUSED, void *infilesp) -+free_infiles(void) - { -- list_t *infiles = (list_t *)infilesp; - list_t *pos, *tmp; - -- for_each_ptr_safe(pos, tmp, infiles) { -+ for_each_ptr_safe(pos, tmp, &infiles) { - ptrlist_t *entry = list_entry(pos, ptrlist_t, list); - - list_del(&entry->list); -@@ -216,27 +218,12 @@ free_infiles(int status UNUSED, void *infilesp) - } - - static void --maybe_free_secdb(int status UNUSED, void *voidp) -+maybe_free_secdb(void) - { -- efi_secdb_t **secdbp = (efi_secdb_t **)voidp; -- -- if (secdbp == NULL || *secdbp == NULL) -+ if (secdb == NULL) - return; - -- efi_secdb_free(*secdbp); --} -- --static void --maybe_do_unlink(int status, void *filep) --{ -- char **file = (char **)filep; -- -- if (status == 0) -- return; -- if (file == NULL || *file == NULL) -- return; -- -- unlink(*file); -+ efi_secdb_free(secdb); - } - - static void -@@ -323,15 +310,6 @@ parse_input_files(list_t *infiles, char **outfile, efi_secdb_t **secdb, - return status; - } - --/* -- * These need to be static globals so that they're not on main's stack when -- * on_exit() fires. -- */ --static efi_secdb_t *secdb = NULL; --static list_t infiles; --static list_t actions; --static char *outfile = NULL; -- - int - main(int argc, char *argv[]) - { -@@ -351,6 +329,7 @@ main(int argc, char *argv[]) - bool do_sort_data = false; - bool sort_descending = false; - int status = 0; -+ char *outfile = NULL; - - const char sopts[] = ":aAc:dfg:h:i:Lo:rs:t:v?"; - const struct option lopts[] = { -@@ -376,10 +355,9 @@ main(int argc, char *argv[]) - INIT_LIST_HEAD(&infiles); - INIT_LIST_HEAD(&actions); - -- on_exit(free_actions, &actions); -- on_exit(free_infiles, &infiles); -- on_exit(maybe_free_secdb, &secdb); -- on_exit(maybe_do_unlink, &outfile); -+ atexit(free_actions); -+ atexit(free_infiles); -+ atexit(maybe_free_secdb); - - /* - * parse the command line. -@@ -587,24 +565,30 @@ sort_err: - outfd = open(outfile, flags, 0600); - if (outfd < 0) { - char *tmpoutfile = outfile; -- if (errno == EEXIST) -- outfile = NULL; -+ if (errno != EEXIST) -+ unlink(outfile); - err(1, "could not open \"%s\"", tmpoutfile); - } - - rc = ftruncate(outfd, 0); -- if (rc < 0) -+ if (rc < 0) { -+ unlink(outfile); - err(1, "could not truncate output file \"%s\"", outfile); -+ } - - void *output; - size_t size = 0; - rc = efi_secdb_realize(secdb, &output, &size); -- if (rc < 0) -+ if (rc < 0) { -+ unlink(outfile); - secdb_err(1, "could not realize signature list"); -+ } - - rc = write(outfd, output, size); -- if (rc < 0) -+ if (rc < 0) { -+ unlink(outfile); - err(1, "could not write signature list"); -+ } - - close(outfd); - xfree(output); --- -2.37.3 - diff --git a/package/efivar/efivar.hash b/package/efivar/efivar.hash index 827b46baa4..bef096bda6 100644 --- a/package/efivar/efivar.hash +++ b/package/efivar/efivar.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 e3bbde37238bd47af1fcf270dc0ef1f4be030d86364c917b93669222ec52bbea efivar-38.tar.gz +sha256 c9edd15f2eeeea63232f3e669a48e992c7be9aff57ee22672ac31f5eca1609a6 efivar-39.tar.gz sha256 91df770634adc2755e78cae33a0d01e702ce2f69046408ae93d0d934ff29691b COPYING diff --git a/package/efivar/efivar.mk b/package/efivar/efivar.mk index ee6d7302df..6c3b57837a 100644 --- a/package/efivar/efivar.mk +++ b/package/efivar/efivar.mk @@ -4,7 +4,7 @@ # ################################################################################ -EFIVAR_VERSION = 38 +EFIVAR_VERSION = 39 EFIVAR_SITE = $(call github,rhboot,efivar,$(EFIVAR_VERSION)) EFIVAR_LICENSE = LGPL-2.1 EFIVAR_LICENSE_FILES = COPYING From 8035ea0a712eaa16d2ac96cd29db0e8726b0f685 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 3 Mar 2024 19:18:59 +0100 Subject: [PATCH 5335/5754] package/shadow: disable on uclibc shadow unconditionally uses reallocarray and explicit_bzero since bump to version 4.14.3 in commit 8a01774d9897310c00a0945865f5a6d5167dfca3 and https://github.com/shadow-maint/shadow/commit/1aa22c14674e14e84efa171614dea2b515d5a223 https://github.com/shadow-maint/shadow/commit/0e0a310acf5111251589116343897a63ebc88e7a resulting in the following uclibc build failure: /home/autobuild/autobuild/instance-9/output-1/host/lib/gcc/arc-buildroot-linux-uclibc/13.1.1/../../../../arc-buildroot-linux-uclibc/bin/ld: groups.o: in function `main': groups.c:(.text.startup+0x20): undefined reference to `reallocarray' Fixes: - http://autobuild.buildroot.org/results/98be07d299aa383a447a1f1dd2924a00c1a29a34 Signed-off-by: Fabrice Fontaine [Peter: add a comment about what functions are missing, reallocf reference] Signed-off-by: Peter Korsgaard --- package/shadow/Config.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/shadow/Config.in b/package/shadow/Config.in index 230271af7d..b08b06457b 100644 --- a/package/shadow/Config.in +++ b/package/shadow/Config.in @@ -2,6 +2,7 @@ menuconfig BR2_PACKAGE_SHADOW bool "shadow" depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + depends on !BR2_TOOLCHAIN_USES_UCLIBC # reallocarray, explicit_bzero help Utilities to deal with user accounts. @@ -55,5 +56,6 @@ config BR2_PACKAGE_SHADOW_YESCRYPT 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 +comment "shadow needs a glibc or musl toolchain w/ headers >= 4.14, dynamic library" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 || \ + BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_UCLIBC From f64f82f78ffd9c4b530a7a7f17e1a66feaa23c80 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 3 Mar 2024 22:58:32 +0100 Subject: [PATCH 5336/5754] package/fluent-bit: force libopenssl libressl dropped engine support since version 3.8.1 resulting in the following build failure since bump of libressl to version 3.8.2 in commit 21eca49ed5110872407b76ab9337d2877c4cda24: /home/autobuild/autobuild/instance-0/output-1/host/lib/gcc/armeb-buildroot-linux-gnueabi/12.3.0/../../../../armeb-buildroot-linux-gnueabi/bin/ld: ../library/librdkafka.a(rdkafka_admin.c.o): in function `rd_kafka_UserScramCredentialUpsertion_new': /home/autobuild/autobuild/instance-0/output-1/build/fluent-bit-2.2.2/lib/librdkafka-2.3.0/src/rdkafka_admin.c:5909: undefined reference to `RAND_priv_bytes' /home/autobuild/autobuild/instance-0/output-1/host/lib/gcc/armeb-buildroot-linux-gnueabi/12.3.0/../../../../armeb-buildroot-linux-gnueabi/bin/ld: ../library/librdkafka.a(rdkafka_ssl.c.o): in function `rd_kafka_ssl_set_certs': /home/autobuild/autobuild/instance-0/output-1/build/fluent-bit-2.2.2/lib/librdkafka-2.3.0/src/rdkafka_ssl.c:1384: undefined reference to `ENGINE_load_ssl_client_cert' Fixes: - http://autobuild.buildroot.org/results/dd74eb4e31e0e4d23e7638cff47c6876fda59952 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/fluent-bit/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/fluent-bit/Config.in b/package/fluent-bit/Config.in index dec40c4371..53284ee17d 100644 --- a/package/fluent-bit/Config.in +++ b/package/fluent-bit/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_FLUENT_BIT depends on !BR2_STATIC_LIBS # dlfcn.h select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL select BR2_PACKAGE_LIBYAML help Fast and Lightweight Logs and Metrics processor. From 34d473b5cca2a0e01ba7a60ced275f94a0e40540 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 3 Mar 2024 11:30:00 +0100 Subject: [PATCH 5337/5754] package/luvi: fix build with aarch64_be Fix the following build failure with aarch64_be raised since the addition of aarch64_be support to luajit in commit 28e5c2f2bdd147dbb9aefbc040fc618f46ee0663: luajit: unknown architecture Fixes: 28e5c2f2bdd147dbb9aefbc040fc618f46ee0663 - http://autobuild.buildroot.org/results/9b89eff7d90173b8c74b8f676650709cc4418e65 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/luvi/luvi.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/luvi/luvi.mk b/package/luvi/luvi.mk index a8e645fab3..ebd1066c5c 100644 --- a/package/luvi/luvi.mk +++ b/package/luvi/luvi.mk @@ -22,6 +22,8 @@ else ifeq ($(BR2_arm)$(BR2_armeb),y) LUVI_TARGET_ARCH = arm else ifeq ($(BR2_aarch64),y) LUVI_TARGET_ARCH = arm64 +else ifeq ($(BR2_aarch64_be),y) +LUVI_TARGET_ARCH = arm64be else ifeq ($(BR2_mips),y) LUVI_TARGET_ARCH = mips else ifeq ($(BR2_mipsel),y) From c39259aa35ff1376910e402e3b7f2449e1e133d3 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 3 Mar 2024 14:04:14 +0100 Subject: [PATCH 5338/5754] package/spirv-tools: needs dynamic library Fix the following static build failure raised since the addition of the package in commit 0a01085abeb7d8a097cb68b9f7f4faec7711543c: [ 26%] Linking CXX shared library libSPIRV-Tools-shared.so /home/autobuild/autobuild/instance-11/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/12.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: /home/autobuild/autobuild/instance-11/output-1/host/xtensa-buildroot-linux-uclibc/sysroot/usr/lib/libc.a(__uClibc_main.os): in function `__uClibc_init': __uClibc_main.c:(.text+0x98): undefined reference to `__fini_array_start' Fixes: 0a01085abeb7d8a097cb68b9f7f4faec7711543c - http://autobuild.buildroot.org/results/f953d500830e8124c6e85c57887106f9352cb4c2 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/spirv-tools/Config.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/spirv-tools/Config.in b/package/spirv-tools/Config.in index fa9b615c56..98b0c46525 100644 --- a/package/spirv-tools/Config.in +++ b/package/spirv-tools/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_SPIRV_TOOLS bool "spirv-tools" depends on BR2_INSTALL_LIBSTDCPP + depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # C++17 filesystem select BR2_PACKAGE_SPIRV_HEADERS help @@ -9,6 +10,6 @@ config BR2_PACKAGE_SPIRV_TOOLS https://github.com/KhronosGroup/SPIRV-Tools -comment "spirv-tools needs a toolchain w/ C++, gcc >= 8" - depends on !BR2_INSTALL_LIBSTDCPP || \ +comment "spirv-tools needs a toolchain w/ C++, dynamic library, gcc >= 8" + depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_8 From 7cc49fc692c4b8e5ba9ab30ed1ed67d48b89c445 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 3 Mar 2024 21:46:40 +0100 Subject: [PATCH 5339/5754] package/oracle-mysql: drop package The package has not seen any updates for ~10 years, E.G. latest version bump was in commit 42c56751fc55 (mysql: bump to version 5.1.73) and the version contains multiple known vulnerabilities, so drop the package. Signed-off-by: Peter Korsgaard --- .checkpackageignore | 12 - Config.in.legacy | 7 + package/mysql/Config.in | 20 - .../oracle-mysql/0000-ac_cache_check.patch | 156 - .../0001-configure-ps-cache-check.patch | 39 - .../0002-use-new-readline-iface.patch | 21 - .../0003-ac_stack_direction-is-unset.patch | 15 - .../0004-Fix-gen_lex_hash-execution.patch | 32 - ...05-bison_3_breaks_mysql_server_build.patch | 3310 ----------------- .../0006-no-force-static-build.patch | 18 - ...0007-dont-install-in-mysql-directory.patch | 182 - .../0008-fix-type-conversion.patch | 22 - package/oracle-mysql/0009-gcc7.patch | 45 - .../0010-fix-build-without-zlib.patch | 52 - ...-alloca.m4-Remove-obsolete-Cray-supp.patch | 51 - package/oracle-mysql/S97mysqld | 39 - package/oracle-mysql/mysqld.service | 13 - package/oracle-mysql/oracle-mysql.hash | 6 - package/oracle-mysql/oracle-mysql.mk | 140 - 19 files changed, 7 insertions(+), 4173 deletions(-) delete mode 100644 package/oracle-mysql/0000-ac_cache_check.patch delete mode 100644 package/oracle-mysql/0001-configure-ps-cache-check.patch delete mode 100644 package/oracle-mysql/0002-use-new-readline-iface.patch delete mode 100644 package/oracle-mysql/0003-ac_stack_direction-is-unset.patch delete mode 100644 package/oracle-mysql/0004-Fix-gen_lex_hash-execution.patch delete mode 100644 package/oracle-mysql/0005-bison_3_breaks_mysql_server_build.patch delete mode 100644 package/oracle-mysql/0006-no-force-static-build.patch delete mode 100644 package/oracle-mysql/0007-dont-install-in-mysql-directory.patch delete mode 100644 package/oracle-mysql/0008-fix-type-conversion.patch delete mode 100644 package/oracle-mysql/0009-gcc7.patch delete mode 100644 package/oracle-mysql/0010-fix-build-without-zlib.patch delete mode 100644 package/oracle-mysql/0011-config-ac-macros-alloca.m4-Remove-obsolete-Cray-supp.patch delete mode 100644 package/oracle-mysql/S97mysqld delete mode 100644 package/oracle-mysql/mysqld.service delete mode 100644 package/oracle-mysql/oracle-mysql.hash delete mode 100644 package/oracle-mysql/oracle-mysql.mk diff --git a/.checkpackageignore b/.checkpackageignore index 1303db52c6..f4bfa12e1e 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -967,18 +967,6 @@ package/openvmtools/shutdown Shellcheck package/openvpn/S60openvpn Indent Shellcheck Variables package/oprofile/0001-musl.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 diff --git a/Config.in.legacy b/Config.in.legacy index 5956ffcca5..918f5075af 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2024.02" +config BR2_PACKAGE_ORACLE_MYSQL + bool "oracle mysql removed" + select BR2_LEGACY + help + Oracle mysql has been removed as the package was + unmaintained. Consider using mariadb instead. + config BR2_PACKAGE_STRONGSWAN_SCEP bool "strongswan SCEP client tool removed" select BR2_LEGACY diff --git a/package/mysql/Config.in b/package/mysql/Config.in index 8942e55a45..3257253166 100644 --- a/package/mysql/Config.in +++ b/package/mysql/Config.in @@ -10,7 +10,6 @@ if BR2_PACKAGE_MYSQL choice prompt "mysql variant" - default BR2_PACKAGE_ORACLE_MYSQL help Select either the oracle mysql server or the mariadb server @@ -39,15 +38,6 @@ comment "mariadb needs a toolchain w/ dynamic library, C++, wchar" || !BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_ATOMIC || BR2_TOOLCHAIN_HAS_SYNC_8 -config BR2_PACKAGE_ORACLE_MYSQL - bool "oracle mysql" - select BR2_PACKAGE_NCURSES - select BR2_PACKAGE_HAS_MYSQL - help - The MySQL Open Source Database System - - http://www.mysql.com/ - endchoice if BR2_PACKAGE_MARIADB @@ -65,22 +55,12 @@ config BR2_PACKAGE_MARIADB_SERVER_EMBEDDED endif -if BR2_PACKAGE_ORACLE_MYSQL - -config BR2_PACKAGE_ORACLE_MYSQL_SERVER - bool "oracle mysql server" - help - Install the MySQL server on the target. - -endif - config BR2_PACKAGE_HAS_MYSQL bool config BR2_PACKAGE_PROVIDES_MYSQL string default "mariadb" if BR2_PACKAGE_MARIADB - default "oracle-mysql" if BR2_PACKAGE_ORACLE_MYSQL endif diff --git a/package/oracle-mysql/0000-ac_cache_check.patch b/package/oracle-mysql/0000-ac_cache_check.patch deleted file mode 100644 index c3b55ba8d3..0000000000 --- a/package/oracle-mysql/0000-ac_cache_check.patch +++ /dev/null @@ -1,156 +0,0 @@ -Patch borrowed from -http://code.google.com/p/minimyth/source/browse/trunk/gar-minimyth/script/db/mysql/files/mysql-5.1.47-ac_cache_check.patch?r=6493. - -It allows to override through ac_cv_* variables various checks that -cannot be performed when cross-compiling. - -Signed-off-by: Thomas Petazzoni - ---- - storage/innodb_plugin/plug.in | 59 ++++++++++++++++++++++++++++-------------- - 1 file changed, 40 insertions(+), 19 deletions(-) - -Index: mysql-5.1.53/storage/innodb_plugin/plug.in -=================================================================== ---- mysql-5.1.53.orig/storage/innodb_plugin/plug.in -+++ mysql-5.1.53/storage/innodb_plugin/plug.in -@@ -53,9 +53,10 @@ - esac - AC_SUBST(INNODB_DYNAMIC_CFLAGS) - -- AC_MSG_CHECKING(whether GCC atomic builtins are available) -+ AC_CACHE_CHECK([whether GCC atomic builtins are available], -+ [ac_cv_have_decl_HAVE_IB_GCC_ATOMIC_BUILTINS], - # either define HAVE_IB_GCC_ATOMIC_BUILTINS or not -- AC_TRY_RUN( -+ [AC_TRY_RUN( - [ - int main() - { -@@ -95,18 +96,23 @@ - } - ], - [ -- AC_DEFINE([HAVE_IB_GCC_ATOMIC_BUILTINS], [1], -- [GCC atomic builtins are available]) - AC_MSG_RESULT(yes) -+ ac_cv_have_decl_HAVE_IB_GCC_ATOMIC_BUILTINS=yes - ], - [ - AC_MSG_RESULT(no) -+ ac_cv_have_decl_HAVE_IB_GCC_ATOMIC_BUILTINS=no - ] -- ) -+ )]) -+ if test "x$ac_cv_have_decl_HAVE_IB_GCC_ATOMIC_BUILTINS"= "xyes" ; then -+ AC_DEFINE([HAVE_IB_GCC_ATOMIC_BUILTINS], [1], -+ [GCC atomic builtins are available]) -+ fi - -- AC_MSG_CHECKING(whether pthread_t can be used by GCC atomic builtins) -+ AC_CACHE_CHECK([whether pthread_t can be used by GCC atomic builtins], -+ [ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_GCC], - # either define HAVE_IB_ATOMIC_PTHREAD_T_GCC or not -- AC_TRY_RUN( -+ [AC_TRY_RUN( - [ - #include - #include -@@ -126,14 +132,18 @@ - } - ], - [ -- AC_DEFINE([HAVE_IB_ATOMIC_PTHREAD_T_GCC], [1], -- [pthread_t can be used by GCC atomic builtins]) - AC_MSG_RESULT(yes) -+ ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_GCC=yes - ], - [ - AC_MSG_RESULT(no) -+ ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_GCC=no - ] -- ) -+ )]) -+ if test "x$ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_GCC"= "xyes" ; then -+ AC_DEFINE([HAVE_IB_ATOMIC_PTHREAD_T_GCC], [1], -+ [pthread_t can be used by GCC atomic builtins]) -+ fi - - AC_MSG_CHECKING(whether Solaris libc atomic functions are available) - # either define HAVE_IB_SOLARIS_ATOMICS or not -@@ -148,9 +158,10 @@ - are available]) - ) - -- AC_MSG_CHECKING(whether pthread_t can be used by Solaris libc atomic functions) -+ AC_CACHE_CHECK([whether pthread_t can be used by Solaris libc atomic functions], -+ [ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS], - # either define HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS or not -- AC_TRY_RUN( -+ [AC_TRY_RUN( - [ - #include - #include -@@ -181,28 +192,33 @@ - } - ], - [ -- AC_DEFINE([HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS], [1], -- [pthread_t can be used by solaris atomics]) - AC_MSG_RESULT(yes) -+ ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS=yes - ], - [ - AC_MSG_RESULT(no) -+ ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS=no - ] -- ) -+ )]) -+ if test "x$ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS"= "xyes" ; then -+ AC_DEFINE([HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS], [1], -+ [pthread_t can be used by solaris atomics]) -+ fi - - # this is needed to know which one of atomic_cas_32() or atomic_cas_64() - # to use in the source - AC_CHECK_SIZEOF([pthread_t], [], [#include ]) - - # Check for x86 PAUSE instruction -- AC_MSG_CHECKING(for x86 PAUSE instruction) -+ AC_CACHE_CHECK([for x86 PAUSE instruction], -+ [ac_cv_have_decl_HAVE_IB_PAUSE_INSTRUCTION], - # We have to actually try running the test program, because of a bug - # in Solaris on x86_64, where it wrongly reports that PAUSE is not - # supported when trying to run an application. See - # http://bugs.opensolaris.org/bugdatabase/printableBug.do?bug_id=6478684 - # We use ib_ prefix to avoid collisoins if this code is added to - # mysql's configure.in. -- AC_TRY_RUN( -+ [AC_TRY_RUN( - [ - int main() { - __asm__ __volatile__ ("pause"); -@@ -210,16 +226,21 @@ - } - ], - [ -- AC_DEFINE([HAVE_IB_PAUSE_INSTRUCTION], [1], [Does x86 PAUSE instruction exist]) - AC_MSG_RESULT(yes) -+ ac_cv_have_decl_HAVE_IB_PAUSE_INSTRUCTION=yes - ], - [ - AC_MSG_RESULT(no) -+ ac_cv_have_decl_HAVE_IB_PAUSE_INSTRUCTION=no - ], - [ - AC_MSG_RESULT(no) -+ ac_cv_have_decl_HAVE_IB_PAUSE_INSTRUCTION=no - ] -- ) -+ )]) -+ if test "x$ac_cv_have_decl_HAVE_IB_PAUSE_INSTRUCTION"= "xyes" ; then -+ AC_DEFINE([HAVE_IB_PAUSE_INSTRUCTION], [1], [Does x86 PAUSE instruction exist]) -+ fi - ]) - - # vim: set ft=config: diff --git a/package/oracle-mysql/0001-configure-ps-cache-check.patch b/package/oracle-mysql/0001-configure-ps-cache-check.patch deleted file mode 100644 index 336e80e0b7..0000000000 --- a/package/oracle-mysql/0001-configure-ps-cache-check.patch +++ /dev/null @@ -1,39 +0,0 @@ -Patch borrowed from -http://cgit.openembedded.org/cgit.cgi/openembedded/tree/recipes/mysql/files/configure-ps-cache-check.patch - -It allows to specify through ac_cv_FIND_PROC how ps should be used on -the target to find the PID of a program. - -Signed-off-by: Thomas Petazzoni - ---- - configure.in | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -Index: mysql-5.1.53/configure.in -=================================================================== ---- mysql-5.1.53.orig/configure.in -+++ mysql-5.1.53/configure.in -@@ -462,8 +462,8 @@ - # then Make, then shell. The autoconf substitution uses single quotes, so - # no unprotected single quotes should appear in the expression. - AC_PATH_PROG(PS, ps, ps) --AC_MSG_CHECKING("how to check if pid exists") --PS=$ac_cv_path_PS -+AC_CACHE_CHECK([how to check if pid exists], [ac_cv_FIND_PROC], -+[ - # Linux style - if $PS wwwp $$ 2> /dev/null | grep -- "$0" > /dev/null - then -@@ -502,8 +502,9 @@ - AC_MSG_ERROR([Could not find the right ps and/or grep switches. Which OS is this? See the Installation chapter in the Reference Manual.]) - esac - fi --AC_SUBST(FIND_PROC) --AC_MSG_RESULT("$FIND_PROC") -+ac_cv_FIND_PROC="$FIND_PROC" -+]) -+AC_SUBST([FIND_PROC], [$ac_cv_FIND_PROC]) - - # Check if a pid is valid - AC_PATH_PROG(KILL, kill, kill) diff --git a/package/oracle-mysql/0002-use-new-readline-iface.patch b/package/oracle-mysql/0002-use-new-readline-iface.patch deleted file mode 100644 index c5906563ce..0000000000 --- a/package/oracle-mysql/0002-use-new-readline-iface.patch +++ /dev/null @@ -1,21 +0,0 @@ -Tell MySQL to use the new readline interface even when an external -readline is being used. - -Signed-off-by: Thomas Petazzoni - ---- - configure.in | 1 + - 1 file changed, 1 insertion(+) - -Index: mysql-5.1.53/configure.in -=================================================================== ---- mysql-5.1.53.orig/configure.in -+++ mysql-5.1.53/configure.in -@@ -2689,6 +2689,7 @@ - # this way we avoid linking commercial source with GPL readline - readline_link="-lreadline" - want_to_use_readline="yes" -+ AC_DEFINE_UNQUOTED(USE_NEW_READLINE_INTERFACE, 1) - elif [test "$mysql_cv_libedit_interface" = "yes"] - then - # Use libedit diff --git a/package/oracle-mysql/0003-ac_stack_direction-is-unset.patch b/package/oracle-mysql/0003-ac_stack_direction-is-unset.patch deleted file mode 100644 index 6fef0a9acf..0000000000 --- a/package/oracle-mysql/0003-ac_stack_direction-is-unset.patch +++ /dev/null @@ -1,15 +0,0 @@ -misc.m4: ac_cv_c_stack_direction is unset. - -Signed-off-by: Marcelo Gutierrez (UTN/FRH) - ---- mysql-5.1.70.orig/config/ac-macros/misc.m4 -+++ mysql-5.1.70/config/ac-macros/misc.m4 -@@ -477,7 +477,7 @@ - exit(ptr_f(&a) < 0); - } - ], ac_cv_c_stack_direction=1, ac_cv_c_stack_direction=-1, -- ac_cv_c_stack_direction=)]) -+ ac_cv_c_stack_direction=0)]) - AC_DEFINE_UNQUOTED(STACK_DIRECTION, $ac_cv_c_stack_direction) - ])dnl - diff --git a/package/oracle-mysql/0004-Fix-gen_lex_hash-execution.patch b/package/oracle-mysql/0004-Fix-gen_lex_hash-execution.patch deleted file mode 100644 index b91ed4fef9..0000000000 --- a/package/oracle-mysql/0004-Fix-gen_lex_hash-execution.patch +++ /dev/null @@ -1,32 +0,0 @@ -Makefile: fix cross-compiling the server - -MySQL Makefile believes it can run code it just compiled, to -generate a header. This does not work for cross-compilation. - -Instead, use a pre-installed host-version of the required tool. - -Signed-off-by: Marcelo Gutierrez (UTN/FRH) - ---- mysql-5.1.70/sql/Makefile.am -+++ mysql-5.1.70.patch/sql/Makefile.am -@@ -177,7 +177,7 @@ - # this avoid the rebuild of the built files in a source dist - lex_hash.h: gen_lex_hash.cc lex.h - $(MAKE) $(AM_MAKEFLAGS) gen_lex_hash$(EXEEXT) -- ./gen_lex_hash$(EXEEXT) > $@-t -+ gen_lex_hash$(EXEEXT) > $@-t - $(MV) $@-t $@ - - # For testing of udf_example.so - ---- mysql-5.1.70/sql/Makefile.in -+++ mysql-5.1.70.patch/sql/Makefile.in -@@ -1310,7 +1310,7 @@ - # this avoid the rebuild of the built files in a source dist - lex_hash.h: gen_lex_hash.cc lex.h - $(MAKE) $(AM_MAKEFLAGS) gen_lex_hash$(EXEEXT) -- ./gen_lex_hash$(EXEEXT) > $@-t -+ gen_lex_hash$(EXEEXT) > $@-t - $(MV) $@-t $@ - - # We might have some stuff not built in this build, but that we want to install diff --git a/package/oracle-mysql/0005-bison_3_breaks_mysql_server_build.patch b/package/oracle-mysql/0005-bison_3_breaks_mysql_server_build.patch deleted file mode 100644 index 918fe2456a..0000000000 --- a/package/oracle-mysql/0005-bison_3_breaks_mysql_server_build.patch +++ /dev/null @@ -1,3310 +0,0 @@ -fix the yacc code in mysql - -Signed-off-by: Marcelo Gutierrez (UTN/FRH) ---- -diff -uNr mysql-5.1.73.orig/sql/sql_lex.cc mysql-5.1.73/sql/sql_lex.cc ---- mysql-5.1.73.orig/sql/sql_lex.cc 2013-11-04 18:52:27.000000000 +0000 -+++ mysql-5.1.73/sql/sql_lex.cc 2014-02-12 14:12:04.244111625 +0000 -@@ -775,14 +775,13 @@ - (which can't be followed by a signed number) - */ - --int MYSQLlex(void *arg, void *yythd) -+int MYSQLlex(void *arg, THD *thd) - { - reg1 uchar c= 0; - bool comment_closed; - int tokval, result_state; - uint length; - enum my_lex_states state; -- THD *thd= (THD *)yythd; - Lex_input_stream *lip= & thd->m_parser_state->m_lip; - LEX *lex= thd->lex; - YYSTYPE *yylval=(YYSTYPE*) arg; -diff -uNr mysql-5.1.73.orig/sql/sql_lex.h mysql-5.1.73/sql/sql_lex.h ---- mysql-5.1.73.orig/sql/sql_lex.h 2013-11-04 18:52:27.000000000 +0000 -+++ mysql-5.1.73/sql/sql_lex.h 2014-02-12 14:17:19.424106423 +0000 -@@ -2072,7 +2072,7 @@ - extern void lex_free(void); - extern void lex_start(THD *thd); - extern void lex_end(LEX *lex); --extern int MYSQLlex(void *arg, void *yythd); -+extern int MYSQLlex(void *arg, THD *thd); - - extern void trim_whitespace(CHARSET_INFO *cs, LEX_STRING *str); - -diff -uNr mysql-5.1.73.orig/sql/sql_parse.cc mysql-5.1.73/sql/sql_parse.cc ---- mysql-5.1.73.orig/sql/sql_parse.cc 2013-11-04 18:52:27.000000000 +0000 -+++ mysql-5.1.73/sql/sql_parse.cc 2014-02-12 14:19:20.424104427 +0000 -@@ -8012,7 +8012,7 @@ - } - - --extern int MYSQLparse(void *thd); // from sql_yacc.cc -+extern int MYSQLparse(THD *thd); // from sql_yacc.cc - - - /** -diff -uNr mysql-5.1.73.orig/sql/sql_yacc.yy mysql-5.1.73/sql/sql_yacc.yy ---- mysql-5.1.73.orig/sql/sql_yacc.yy 2013-11-04 18:52:27.000000000 +0000 -+++ mysql-5.1.73/sql/sql_yacc.yy 2014-02-12 20:17:06.707750140 +0000 -@@ -23,19 +23,13 @@ - */ - - %{ --/* thd is passed as an argument to yyparse(), and subsequently to yylex(). --** The type will be void*, so it must be cast to (THD*) when used. --** Use the YYTHD macro for this. --*/ --#define YYPARSE_PARAM yythd --#define YYLEX_PARAM yythd --#define YYTHD ((THD *)yythd) --#define YYLIP (& YYTHD->m_parser_state->m_lip) -+ -+#define YYLIP (& thd->m_parser_state->m_lip) - - #define MYSQL_YACC - #define YYINITDEPTH 100 - #define YYMAXDEPTH 3200 /* Because of 64K stack */ --#define Lex (YYTHD->lex) -+#define Lex (thd->lex) - #define Select Lex->current_select - #include "mysql_priv.h" - #include "slave.h" -@@ -55,7 +49,7 @@ - #pragma warning (disable : 4065) - #endif - --int yylex(void *yylval, void *yythd); -+int yylex(void *yylval, THD *thd); - - const LEX_STRING null_lex_str= {0,0}; - -@@ -64,7 +58,7 @@ - ulong val= *(F); \ - if (my_yyoverflow((B), (D), &val)) \ - { \ -- yyerror((char*) (A)); \ -+ yyerror(current_thd, (char*) (A)); \ - return 2; \ - } \ - else \ -@@ -76,7 +70,7 @@ - #define MYSQL_YYABORT \ - do \ - { \ -- LEX::cleanup_lex_after_parse_error(YYTHD);\ -+ LEX::cleanup_lex_after_parse_error(thd);\ - YYABORT; \ - } while (0) - -@@ -159,9 +153,8 @@ - to abort from the parser. - */ - --void MYSQLerror(const char *s) -+void MYSQLerror(THD *thd, const char *s) - { -- THD *thd= current_thd; - - /* - Restore the original LEX if it was replaced when parsing -@@ -675,7 +668,10 @@ - bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize); - %} - --%pure_parser /* We have threads */ -+/* We have threads */ -+%define api.pure -+%parse-param { THD *thd } -+%lex-param { THD *thd } - /* - Currently there are 169 shift/reduce conflicts. - We should not introduce new conflicts any more. -@@ -1516,7 +1512,6 @@ - query: - END_OF_INPUT - { -- THD *thd= YYTHD; - if (!thd->bootstrap && - (!(thd->lex->select_lex.options & OPTION_FOUND_COMMENT))) - { -@@ -1530,7 +1525,7 @@ - { - Lex_input_stream *lip = YYLIP; - -- if ((YYTHD->client_capabilities & CLIENT_MULTI_QUERIES) && -+ if ((thd->client_capabilities & CLIENT_MULTI_QUERIES) && - ! lip->stmt_prepare_mode && - ! lip->eof()) - { -@@ -1626,7 +1621,6 @@ - deallocate: - deallocate_or_drop PREPARE_SYM ident - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - lex->sql_command= SQLCOM_DEALLOCATE_PREPARE; - lex->prepared_stmt_name= $3; -@@ -1641,7 +1635,6 @@ - prepare: - PREPARE_SYM ident FROM prepare_src - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - lex->sql_command= SQLCOM_PREPARE; - lex->prepared_stmt_name= $2; -@@ -1651,14 +1644,12 @@ - prepare_src: - TEXT_STRING_sys - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - lex->prepared_stmt_code= $1; - lex->prepared_stmt_code_is_varref= FALSE; - } - | '@' ident_or_text - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - lex->prepared_stmt_code= $2; - lex->prepared_stmt_code_is_varref= TRUE; -@@ -1668,7 +1659,6 @@ - execute: - EXECUTE_SYM ident - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - lex->sql_command= SQLCOM_EXECUTE; - lex->prepared_stmt_name= $2; -@@ -1826,7 +1816,6 @@ - create: - CREATE opt_table_options TABLE_SYM opt_if_not_exists table_ident - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - lex->sql_command= SQLCOM_CREATE_TABLE; - if (!lex->select_lex.add_table_to_list(thd, $5, NULL, -@@ -1844,13 +1833,13 @@ - } - create2 - { -- LEX *lex= YYTHD->lex; -+ LEX *lex= thd->lex; - lex->current_select= &lex->select_lex; - if ((lex->create_info.used_fields & HA_CREATE_USED_ENGINE) && - !lex->create_info.db_type) - { -- lex->create_info.db_type= ha_default_handlerton(YYTHD); -- push_warning_printf(YYTHD, MYSQL_ERROR::WARN_LEVEL_WARN, -+ lex->create_info.db_type= ha_default_handlerton(thd); -+ push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN, - ER_WARN_USING_OTHER_HANDLER, - ER(ER_WARN_USING_OTHER_HANDLER), - ha_resolve_storage_engine_name(lex->create_info.db_type), -@@ -1979,7 +1968,7 @@ - event_tail: - remember_name EVENT_SYM opt_if_not_exists sp_name - { -- THD *thd= YYTHD; -+ THD *thd= thd; - LEX *lex=Lex; - - lex->stmt_definition_begin= $1; -@@ -2046,7 +2035,7 @@ - ev_starts: - /* empty */ - { -- Item *item= new (YYTHD->mem_root) Item_func_now_local(); -+ Item *item= new (thd->mem_root) Item_func_now_local(); - if (item == NULL) - MYSQL_YYABORT; - Lex->event_parse_data->item_starts= item; -@@ -2096,7 +2085,6 @@ - - ev_sql_stmt: - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - Lex_input_stream *lip= YYLIP; - -@@ -2139,7 +2127,6 @@ - } - ev_sql_stmt_inner - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - - /* return back to the original memory root ASAP */ -@@ -2198,11 +2185,10 @@ - $$= new sp_name($1, $3, true); - if ($$ == NULL) - MYSQL_YYABORT; -- $$->init_qname(YYTHD); -+ $$->init_qname(thd); - } - | ident - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - LEX_STRING db; - if (check_routine_name(&$1)) -@@ -2272,7 +2258,7 @@ - lex->sql_command= SQLCOM_CALL; - lex->spname= $2; - lex->value_list.empty(); -- sp_add_used_routine(lex, YYTHD, $2, TYPE_ENUM_PROCEDURE); -+ sp_add_used_routine(lex, thd, $2, TYPE_ENUM_PROCEDURE); - } - opt_sp_cparam_list {} - ; -@@ -2345,7 +2331,7 @@ - (enum enum_field_types)$3, - sp_param_in); - -- if (lex->sphead->fill_field_definition(YYTHD, lex, -+ if (lex->sphead->fill_field_definition(thd, lex, - (enum enum_field_types) $3, - &spvar->field_def)) - { -@@ -2382,7 +2368,7 @@ - (enum enum_field_types)$4, - (sp_param_mode_t)$1); - -- if (lex->sphead->fill_field_definition(YYTHD, lex, -+ if (lex->sphead->fill_field_definition(thd, lex, - (enum enum_field_types) $4, - &spvar->field_def)) - { -@@ -2445,13 +2431,12 @@ - { - LEX *lex= Lex; - -- lex->sphead->reset_lex(YYTHD); -+ lex->sphead->reset_lex(thd); - lex->spcont->declare_var_boundary($2); - } - type - sp_opt_default - { -- THD *thd= YYTHD; - LEX *lex= Lex; - sp_pcontext *pctx= lex->spcont; - uint num_vars= pctx->context_var_count(); -@@ -2477,7 +2462,7 @@ - spvar->type= var_type; - spvar->dflt= dflt_value_item; - -- if (lex->sphead->fill_field_definition(YYTHD, lex, var_type, -+ if (lex->sphead->fill_field_definition(thd, lex, var_type, - &spvar->field_def)) - { - MYSQL_YYABORT; -@@ -2501,7 +2486,7 @@ - } - - pctx->declare_var_boundary(0); -- if (lex->sphead->restore_lex(YYTHD)) -+ if (lex->sphead->restore_lex(thd)) - MYSQL_YYABORT; - $$.vars= $2; - $$.conds= $$.hndlrs= $$.curs= 0; -@@ -2516,7 +2501,7 @@ - my_error(ER_SP_DUP_COND, MYF(0), $2.str); - MYSQL_YYABORT; - } -- if(YYTHD->lex->spcont->push_cond(&$2, $5)) -+ if(thd->lex->spcont->push_cond(&$2, $5)) - MYSQL_YYABORT; - $$.vars= $$.hndlrs= $$.curs= 0; - $$.conds= 1; -@@ -2602,7 +2587,7 @@ - - sp_cursor_stmt: - { -- Lex->sphead->reset_lex(YYTHD); -+ Lex->sphead->reset_lex(thd); - } - select - { -@@ -2618,7 +2603,7 @@ - } - lex->sp_lex_in_use= TRUE; - $$= lex; -- if (lex->sphead->restore_lex(YYTHD)) -+ if (lex->sphead->restore_lex(thd)) - MYSQL_YYABORT; - } - ; -@@ -2662,7 +2647,7 @@ - sp_cond: - ulong_num - { /* mysql errno */ -- $$= (sp_cond_type_t *)YYTHD->alloc(sizeof(sp_cond_type_t)); -+ $$= (sp_cond_type_t *)thd->alloc(sizeof(sp_cond_type_t)); - if ($$ == NULL) - MYSQL_YYABORT; - $$->type= sp_cond_type_t::number; -@@ -2675,7 +2660,7 @@ - my_error(ER_SP_BAD_SQLSTATE, MYF(0), $3.str); - MYSQL_YYABORT; - } -- $$= (sp_cond_type_t *)YYTHD->alloc(sizeof(sp_cond_type_t)); -+ $$= (sp_cond_type_t *)thd->alloc(sizeof(sp_cond_type_t)); - if ($$ == NULL) - MYSQL_YYABORT; - $$->type= sp_cond_type_t::state; -@@ -2705,21 +2690,21 @@ - } - | SQLWARNING_SYM /* SQLSTATEs 01??? */ - { -- $$= (sp_cond_type_t *)YYTHD->alloc(sizeof(sp_cond_type_t)); -+ $$= (sp_cond_type_t *)thd->alloc(sizeof(sp_cond_type_t)); - if ($$ == NULL) - MYSQL_YYABORT; - $$->type= sp_cond_type_t::warning; - } - | not FOUND_SYM /* SQLSTATEs 02??? */ - { -- $$= (sp_cond_type_t *)YYTHD->alloc(sizeof(sp_cond_type_t)); -+ $$= (sp_cond_type_t *)thd->alloc(sizeof(sp_cond_type_t)); - if ($$ == NULL) - MYSQL_YYABORT; - $$->type= sp_cond_type_t::notfound; - } - | SQLEXCEPTION_SYM /* All other SQLSTATEs */ - { -- $$= (sp_cond_type_t *)YYTHD->alloc(sizeof(sp_cond_type_t)); -+ $$= (sp_cond_type_t *)thd->alloc(sizeof(sp_cond_type_t)); - if ($$ == NULL) - MYSQL_YYABORT; - $$->type= sp_cond_type_t::exception; -@@ -2789,7 +2774,6 @@ - - sp_proc_stmt_statement: - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - Lex_input_stream *lip= YYLIP; - -@@ -2798,7 +2782,6 @@ - } - statement - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - Lex_input_stream *lip= YYLIP; - sp_head *sp= lex->sphead; -@@ -2845,7 +2828,7 @@ - - sp_proc_stmt_return: - RETURN_SYM -- { Lex->sphead->reset_lex(YYTHD); } -+ { Lex->sphead->reset_lex(thd); } - expr - { - LEX *lex= Lex; -@@ -2867,7 +2850,7 @@ - MYSQL_YYABORT; - sp->m_flags|= sp_head::HAS_RETURN; - } -- if (sp->restore_lex(YYTHD)) -+ if (sp->restore_lex(thd)) - MYSQL_YYABORT; - } - ; -@@ -3094,7 +3077,7 @@ - ; - - sp_if: -- { Lex->sphead->reset_lex(YYTHD); } -+ { Lex->sphead->reset_lex(thd); } - expr THEN_SYM - { - LEX *lex= Lex; -@@ -3108,7 +3091,7 @@ - sp->add_cont_backpatch(i) || - sp->add_instr(i)) - MYSQL_YYABORT; -- if (sp->restore_lex(YYTHD)) -+ if (sp->restore_lex(thd)) - MYSQL_YYABORT; - } - sp_proc_stmts1 -@@ -3147,7 +3130,7 @@ - { - LEX *lex= Lex; - case_stmt_action_case(lex); -- lex->sphead->reset_lex(YYTHD); /* For expr $3 */ -+ lex->sphead->reset_lex(thd); /* For expr $3 */ - } - expr - { -@@ -3156,7 +3139,7 @@ - MYSQL_YYABORT; - - /* For expr $3 */ -- if (lex->sphead->restore_lex(YYTHD)) -+ if (lex->sphead->restore_lex(thd)) - MYSQL_YYABORT; - } - simple_when_clause_list -@@ -3198,7 +3181,7 @@ - simple_when_clause: - WHEN_SYM - { -- Lex->sphead->reset_lex(YYTHD); /* For expr $3 */ -+ Lex->sphead->reset_lex(thd); /* For expr $3 */ - } - expr - { -@@ -3208,7 +3191,7 @@ - if (case_stmt_action_when(lex, $3, true)) - MYSQL_YYABORT; - /* For expr $3 */ -- if (lex->sphead->restore_lex(YYTHD)) -+ if (lex->sphead->restore_lex(thd)) - MYSQL_YYABORT; - } - THEN_SYM -@@ -3223,7 +3206,7 @@ - searched_when_clause: - WHEN_SYM - { -- Lex->sphead->reset_lex(YYTHD); /* For expr $3 */ -+ Lex->sphead->reset_lex(thd); /* For expr $3 */ - } - expr - { -@@ -3231,7 +3214,7 @@ - if (case_stmt_action_when(lex, $3, false)) - MYSQL_YYABORT; - /* For expr $3 */ -- if (lex->sphead->restore_lex(YYTHD)) -+ if (lex->sphead->restore_lex(thd)) - MYSQL_YYABORT; - } - THEN_SYM -@@ -3395,7 +3378,7 @@ - MYSQL_YYABORT; - } - | WHILE_SYM -- { Lex->sphead->reset_lex(YYTHD); } -+ { Lex->sphead->reset_lex(thd); } - expr DO_SYM - { - LEX *lex= Lex; -@@ -3409,7 +3392,7 @@ - sp->new_cont_backpatch(i) || - sp->add_instr(i)) - MYSQL_YYABORT; -- if (sp->restore_lex(YYTHD)) -+ if (sp->restore_lex(thd)) - MYSQL_YYABORT; - } - sp_proc_stmts1 END WHILE_SYM -@@ -3424,7 +3407,7 @@ - lex->sphead->do_cont_backpatch(); - } - | REPEAT_SYM sp_proc_stmts1 UNTIL_SYM -- { Lex->sphead->reset_lex(YYTHD); } -+ { Lex->sphead->reset_lex(thd); } - expr END REPEAT_SYM - { - LEX *lex= Lex; -@@ -3436,7 +3419,7 @@ - if (i == NULL || - lex->sphead->add_instr(i)) - MYSQL_YYABORT; -- if (lex->sphead->restore_lex(YYTHD)) -+ if (lex->sphead->restore_lex(thd)) - MYSQL_YYABORT; - /* We can shortcut the cont_backpatch here */ - i->m_cont_dest= ip+1; -@@ -3859,7 +3842,6 @@ - create3 {} - | LIKE table_ident - { -- THD *thd= YYTHD; - TABLE_LIST *src_table; - LEX *lex= thd->lex; - -@@ -3873,7 +3855,6 @@ - } - | '(' LIKE table_ident ')' - { -- THD *thd= YYTHD; - TABLE_LIST *src_table; - LEX *lex= thd->lex; - -@@ -4342,7 +4323,6 @@ - bit_expr - { - Item *part_expr= $1; -- THD *thd= YYTHD; - LEX *lex= thd->lex; - Name_resolution_context *context= &lex->current_select->context; - TABLE_LIST *save_list= context->table_list; -@@ -4364,7 +4344,7 @@ - my_error(ER_PARTITION_FUNCTION_IS_NOT_ALLOWED, MYF(0)); - MYSQL_YYABORT; - } -- if (part_expr->fix_fields(YYTHD, (Item**)0) || -+ if (part_expr->fix_fields(thd, (Item**)0) || - ((context->table_list= save_list), FALSE) || - (!part_expr->const_item()) || - (!lex->safe_to_cache_query)) -@@ -4629,7 +4609,7 @@ - | TYPE_SYM opt_equal storage_engines - { - Lex->create_info.db_type= $3; -- WARN_DEPRECATED(yythd, "6.0", "TYPE=storage_engine", -+ WARN_DEPRECATED(thd, "6.0", "TYPE=storage_engine", - "'ENGINE=storage_engine'"); - Lex->create_info.used_fields|= HA_CREATE_USED_ENGINE; - } -@@ -4791,19 +4771,19 @@ - storage_engines: - ident_or_text - { -- plugin_ref plugin= ha_resolve_by_name(YYTHD, &$1); -+ plugin_ref plugin= ha_resolve_by_name(thd, &$1); - - if (plugin) - $$= plugin_data(plugin, handlerton*); - else - { -- if (YYTHD->variables.sql_mode & MODE_NO_ENGINE_SUBSTITUTION) -+ if (thd->variables.sql_mode & MODE_NO_ENGINE_SUBSTITUTION) - { - my_error(ER_UNKNOWN_STORAGE_ENGINE, MYF(0), $1.str); - MYSQL_YYABORT; - } - $$= 0; -- push_warning_printf(YYTHD, MYSQL_ERROR::WARN_LEVEL_WARN, -+ push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN, - ER_UNKNOWN_STORAGE_ENGINE, - ER(ER_UNKNOWN_STORAGE_ENGINE), - $1.str); -@@ -4815,7 +4795,7 @@ - ident_or_text - { - plugin_ref plugin; -- if ((plugin= ha_resolve_by_name(YYTHD, &$1))) -+ if ((plugin= ha_resolve_by_name(thd, &$1))) - $$= plugin_data(plugin, handlerton*); - else - { -@@ -5043,7 +5023,7 @@ - { - char buff[sizeof("YEAR()") + MY_INT64_NUM_DECIMAL_DIGITS + 1]; - my_snprintf(buff, sizeof(buff), "YEAR(%lu)", length); -- push_warning_printf(YYTHD, MYSQL_ERROR::WARN_LEVEL_NOTE, -+ push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_NOTE, - ER_WARN_DEPRECATED_SYNTAX, - ER(ER_WARN_DEPRECATED_SYNTAX), - buff, "YEAR(4)"); -@@ -5057,7 +5037,7 @@ - { $$=MYSQL_TYPE_TIME; } - | TIMESTAMP opt_field_length - { -- if (YYTHD->variables.sql_mode & MODE_MAXDB) -+ if (thd->variables.sql_mode & MODE_MAXDB) - $$=MYSQL_TYPE_DATETIME; - else - { -@@ -5189,7 +5169,7 @@ - real_type: - REAL - { -- $$= YYTHD->variables.sql_mode & MODE_REAL_AS_FLOAT ? -+ $$= thd->variables.sql_mode & MODE_REAL_AS_FLOAT ? - MYSQL_TYPE_FLOAT : MYSQL_TYPE_DOUBLE; - } - | DOUBLE_SYM -@@ -5263,7 +5243,7 @@ - | DEFAULT now_or_signed_literal { Lex->default_value=$2; } - | ON UPDATE_SYM NOW_SYM optional_braces - { -- Item *item= new (YYTHD->mem_root) Item_func_now_local(); -+ Item *item= new (thd->mem_root) Item_func_now_local(); - if (item == NULL) - MYSQL_YYABORT; - Lex->on_update_value= item; -@@ -5312,7 +5292,7 @@ - now_or_signed_literal: - NOW_SYM optional_braces - { -- $$= new (YYTHD->mem_root) Item_func_now_local(); -+ $$= new (thd->mem_root) Item_func_now_local(); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -5673,7 +5653,6 @@ - alter: - ALTER opt_ignore TABLE_SYM table_ident - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - lex->name.str= 0; - lex->name.length= 0; -@@ -5799,7 +5778,7 @@ - Event_parse_data. - */ - -- if (!(Lex->event_parse_data= Event_parse_data::new_instance(YYTHD))) -+ if (!(Lex->event_parse_data= Event_parse_data::new_instance(thd))) - MYSQL_YYABORT; - Lex->event_parse_data->identifier= $4; - -@@ -6192,7 +6171,6 @@ - { - if (!$4) - { -- THD *thd= YYTHD; - $4= thd->variables.collation_database; - } - $5= $5 ? $5 : $4; -@@ -6556,7 +6534,7 @@ - assign_to_keycache: - table_ident cache_keys_spec - { -- if (!Select->add_table_to_list(YYTHD, $1, NULL, 0, TL_READ, -+ if (!Select->add_table_to_list(thd, $1, NULL, 0, TL_READ, - Select->pop_index_hints())) - MYSQL_YYABORT; - } -@@ -6585,7 +6563,7 @@ - preload_keys: - table_ident cache_keys_spec opt_ignore_leaves - { -- if (!Select->add_table_to_list(YYTHD, $1, NULL, $3, TL_READ, -+ if (!Select->add_table_to_list(thd, $1, NULL, $3, TL_READ, - Select->pop_index_hints())) - MYSQL_YYABORT; - } -@@ -6593,7 +6571,7 @@ - - cache_keys_spec: - { -- Lex->select_lex.alloc_index_hints(YYTHD); -+ Lex->select_lex.alloc_index_hints(thd); - Select->set_index_hint_type(INDEX_HINT_USE, - global_system_variables.old_mode ? - INDEX_HINT_MASK_JOIN : -@@ -6813,7 +6791,6 @@ - | select_item - | '*' - { -- THD *thd= YYTHD; - Item *item= new (thd->mem_root) - Item_field(&thd->lex->current_select->context, - NULL, NULL, "*"); -@@ -6828,7 +6805,6 @@ - select_item: - remember_name select_item2 remember_end select_alias - { -- THD *thd= YYTHD; - DBUG_ASSERT($1 < $3); - - if (add_item_to_list(thd, $2)) -@@ -6929,7 +6905,7 @@ - else - { - /* X OR Y */ -- $$ = new (YYTHD->mem_root) Item_cond_or($1, $3); -+ $$ = new (thd->mem_root) Item_cond_or($1, $3); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -6937,7 +6913,7 @@ - | expr XOR expr %prec XOR - { - /* XOR is a proprietary extension */ -- $$ = new (YYTHD->mem_root) Item_cond_xor($1, $3); -+ $$ = new (thd->mem_root) Item_cond_xor($1, $3); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -6979,50 +6955,50 @@ - else - { - /* X AND Y */ -- $$ = new (YYTHD->mem_root) Item_cond_and($1, $3); -+ $$ = new (thd->mem_root) Item_cond_and($1, $3); - if ($$ == NULL) - MYSQL_YYABORT; - } - } - | NOT_SYM expr %prec NOT_SYM - { -- $$= negate_expression(YYTHD, $2); -+ $$= negate_expression(thd, $2); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bool_pri IS TRUE_SYM %prec IS - { -- $$= new (YYTHD->mem_root) Item_func_istrue($1); -+ $$= new (thd->mem_root) Item_func_istrue($1); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bool_pri IS not TRUE_SYM %prec IS - { -- $$= new (YYTHD->mem_root) Item_func_isnottrue($1); -+ $$= new (thd->mem_root) Item_func_isnottrue($1); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bool_pri IS FALSE_SYM %prec IS - { -- $$= new (YYTHD->mem_root) Item_func_isfalse($1); -+ $$= new (thd->mem_root) Item_func_isfalse($1); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bool_pri IS not FALSE_SYM %prec IS - { -- $$= new (YYTHD->mem_root) Item_func_isnotfalse($1); -+ $$= new (thd->mem_root) Item_func_isnotfalse($1); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bool_pri IS UNKNOWN_SYM %prec IS - { -- $$= new (YYTHD->mem_root) Item_func_isnull($1); -+ $$= new (thd->mem_root) Item_func_isnull($1); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bool_pri IS not UNKNOWN_SYM %prec IS - { -- $$= new (YYTHD->mem_root) Item_func_isnotnull($1); -+ $$= new (thd->mem_root) Item_func_isnotnull($1); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -7032,19 +7008,19 @@ - bool_pri: - bool_pri IS NULL_SYM %prec IS - { -- $$= new (YYTHD->mem_root) Item_func_isnull($1); -+ $$= new (thd->mem_root) Item_func_isnull($1); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bool_pri IS not NULL_SYM %prec IS - { -- $$= new (YYTHD->mem_root) Item_func_isnotnull($1); -+ $$= new (thd->mem_root) Item_func_isnotnull($1); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bool_pri EQUAL_SYM predicate %prec EQUAL_SYM - { -- $$= new (YYTHD->mem_root) Item_func_equal($1,$3); -+ $$= new (thd->mem_root) Item_func_equal($1,$3); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -7066,13 +7042,12 @@ - predicate: - bit_expr IN_SYM '(' subselect ')' - { -- $$= new (YYTHD->mem_root) Item_in_subselect($1, $4); -+ $$= new (thd->mem_root) Item_in_subselect($1, $4); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bit_expr not IN_SYM '(' subselect ')' - { -- THD *thd= YYTHD; - Item *item= new (thd->mem_root) Item_in_subselect($1, $5); - if (item == NULL) - MYSQL_YYABORT; -@@ -7082,7 +7057,7 @@ - } - | bit_expr IN_SYM '(' expr ')' - { -- $$= handle_sql2003_note184_exception(YYTHD, $1, true, $4); -+ $$= handle_sql2003_note184_exception(thd, $1, true, $4); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -7090,13 +7065,13 @@ - { - $6->push_front($4); - $6->push_front($1); -- $$= new (YYTHD->mem_root) Item_func_in(*$6); -+ $$= new (thd->mem_root) Item_func_in(*$6); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bit_expr not IN_SYM '(' expr ')' - { -- $$= handle_sql2003_note184_exception(YYTHD, $1, false, $5); -+ $$= handle_sql2003_note184_exception(thd, $1, false, $5); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -7104,7 +7079,7 @@ - { - $7->push_front($5); - $7->push_front($1); -- Item_func_in *item = new (YYTHD->mem_root) Item_func_in(*$7); -+ Item_func_in *item = new (thd->mem_root) Item_func_in(*$7); - if (item == NULL) - MYSQL_YYABORT; - item->negate(); -@@ -7112,14 +7087,14 @@ - } - | bit_expr BETWEEN_SYM bit_expr AND_SYM predicate - { -- $$= new (YYTHD->mem_root) Item_func_between($1,$3,$5); -+ $$= new (thd->mem_root) Item_func_between($1,$3,$5); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bit_expr not BETWEEN_SYM bit_expr AND_SYM predicate - { - Item_func_between *item; -- item= new (YYTHD->mem_root) Item_func_between($1,$4,$6); -+ item= new (thd->mem_root) Item_func_between($1,$4,$6); - if (item == NULL) - MYSQL_YYABORT; - item->negate(); -@@ -7127,42 +7102,42 @@ - } - | bit_expr SOUNDS_SYM LIKE bit_expr - { -- Item *item1= new (YYTHD->mem_root) Item_func_soundex($1); -- Item *item4= new (YYTHD->mem_root) Item_func_soundex($4); -+ Item *item1= new (thd->mem_root) Item_func_soundex($1); -+ Item *item4= new (thd->mem_root) Item_func_soundex($4); - if ((item1 == NULL) || (item4 == NULL)) - MYSQL_YYABORT; -- $$= new (YYTHD->mem_root) Item_func_eq(item1, item4); -+ $$= new (thd->mem_root) Item_func_eq(item1, item4); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bit_expr LIKE simple_expr opt_escape - { -- $$= new (YYTHD->mem_root) Item_func_like($1,$3,$4,Lex->escape_used); -+ $$= new (thd->mem_root) Item_func_like($1,$3,$4,Lex->escape_used); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bit_expr not LIKE simple_expr opt_escape - { -- Item *item= new (YYTHD->mem_root) Item_func_like($1,$4,$5, -+ Item *item= new (thd->mem_root) Item_func_like($1,$4,$5, - Lex->escape_used); - if (item == NULL) - MYSQL_YYABORT; -- $$= new (YYTHD->mem_root) Item_func_not(item); -+ $$= new (thd->mem_root) Item_func_not(item); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bit_expr REGEXP bit_expr - { -- $$= new (YYTHD->mem_root) Item_func_regex($1,$3); -+ $$= new (thd->mem_root) Item_func_regex($1,$3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bit_expr not REGEXP bit_expr - { -- Item *item= new (YYTHD->mem_root) Item_func_regex($1,$4); -+ Item *item= new (thd->mem_root) Item_func_regex($1,$4); - if (item == NULL) - MYSQL_YYABORT; -- $$= negate_expression(YYTHD, item); -+ $$= negate_expression(thd, item); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -7172,85 +7147,85 @@ - bit_expr: - bit_expr '|' bit_expr %prec '|' - { -- $$= new (YYTHD->mem_root) Item_func_bit_or($1,$3); -+ $$= new (thd->mem_root) Item_func_bit_or($1,$3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bit_expr '&' bit_expr %prec '&' - { -- $$= new (YYTHD->mem_root) Item_func_bit_and($1,$3); -+ $$= new (thd->mem_root) Item_func_bit_and($1,$3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bit_expr SHIFT_LEFT bit_expr %prec SHIFT_LEFT - { -- $$= new (YYTHD->mem_root) Item_func_shift_left($1,$3); -+ $$= new (thd->mem_root) Item_func_shift_left($1,$3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bit_expr SHIFT_RIGHT bit_expr %prec SHIFT_RIGHT - { -- $$= new (YYTHD->mem_root) Item_func_shift_right($1,$3); -+ $$= new (thd->mem_root) Item_func_shift_right($1,$3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bit_expr '+' bit_expr %prec '+' - { -- $$= new (YYTHD->mem_root) Item_func_plus($1,$3); -+ $$= new (thd->mem_root) Item_func_plus($1,$3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bit_expr '-' bit_expr %prec '-' - { -- $$= new (YYTHD->mem_root) Item_func_minus($1,$3); -+ $$= new (thd->mem_root) Item_func_minus($1,$3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bit_expr '+' INTERVAL_SYM expr interval %prec '+' - { -- $$= new (YYTHD->mem_root) Item_date_add_interval($1,$4,$5,0); -+ $$= new (thd->mem_root) Item_date_add_interval($1,$4,$5,0); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bit_expr '-' INTERVAL_SYM expr interval %prec '-' - { -- $$= new (YYTHD->mem_root) Item_date_add_interval($1,$4,$5,1); -+ $$= new (thd->mem_root) Item_date_add_interval($1,$4,$5,1); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bit_expr '*' bit_expr %prec '*' - { -- $$= new (YYTHD->mem_root) Item_func_mul($1,$3); -+ $$= new (thd->mem_root) Item_func_mul($1,$3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bit_expr '/' bit_expr %prec '/' - { -- $$= new (YYTHD->mem_root) Item_func_div($1,$3); -+ $$= new (thd->mem_root) Item_func_div($1,$3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bit_expr '%' bit_expr %prec '%' - { -- $$= new (YYTHD->mem_root) Item_func_mod($1,$3); -+ $$= new (thd->mem_root) Item_func_mod($1,$3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bit_expr DIV_SYM bit_expr %prec DIV_SYM - { -- $$= new (YYTHD->mem_root) Item_func_int_div($1,$3); -+ $$= new (thd->mem_root) Item_func_int_div($1,$3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bit_expr MOD_SYM bit_expr %prec MOD_SYM - { -- $$= new (YYTHD->mem_root) Item_func_mod($1,$3); -+ $$= new (thd->mem_root) Item_func_mod($1,$3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bit_expr '^' bit_expr - { -- $$= new (YYTHD->mem_root) Item_func_bit_xor($1,$3); -+ $$= new (thd->mem_root) Item_func_bit_xor($1,$3); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -7299,7 +7274,6 @@ - | function_call_conflict - | simple_expr COLLATE_SYM ident_or_text %prec NEG - { -- THD *thd= YYTHD; - Item *i1= new (thd->mem_root) Item_string($3.str, - $3.length, - thd->charset()); -@@ -7315,7 +7289,7 @@ - | sum_expr - | simple_expr OR_OR_SYM simple_expr - { -- $$= new (YYTHD->mem_root) Item_func_concat($1, $3); -+ $$= new (thd->mem_root) Item_func_concat($1, $3); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -7325,25 +7299,25 @@ - } - | '-' simple_expr %prec NEG - { -- $$= new (YYTHD->mem_root) Item_func_neg($2); -+ $$= new (thd->mem_root) Item_func_neg($2); - if ($$ == NULL) - MYSQL_YYABORT; - } - | '~' simple_expr %prec NEG - { -- $$= new (YYTHD->mem_root) Item_func_bit_neg($2); -+ $$= new (thd->mem_root) Item_func_bit_neg($2); - if ($$ == NULL) - MYSQL_YYABORT; - } - | not2 simple_expr %prec NEG - { -- $$= negate_expression(YYTHD, $2); -+ $$= negate_expression(thd, $2); - if ($$ == NULL) - MYSQL_YYABORT; - } - | '(' subselect ')' - { -- $$= new (YYTHD->mem_root) Item_singlerow_subselect($2); -+ $$= new (thd->mem_root) Item_singlerow_subselect($2); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -7352,20 +7326,20 @@ - | '(' expr ',' expr_list ')' - { - $4->push_front($2); -- $$= new (YYTHD->mem_root) Item_row(*$4); -+ $$= new (thd->mem_root) Item_row(*$4); - if ($$ == NULL) - MYSQL_YYABORT; - } - | ROW_SYM '(' expr ',' expr_list ')' - { - $5->push_front($3); -- $$= new (YYTHD->mem_root) Item_row(*$5); -+ $$= new (thd->mem_root) Item_row(*$5); - if ($$ == NULL) - MYSQL_YYABORT; - } - | EXISTS '(' subselect ')' - { -- $$= new (YYTHD->mem_root) Item_exists_subselect($3); -+ $$= new (thd->mem_root) Item_exists_subselect($3); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -7374,7 +7348,7 @@ - | MATCH ident_list_arg AGAINST '(' bit_expr fulltext_options ')' - { - $2->push_front($5); -- Item_func_match *i1= new (YYTHD->mem_root) Item_func_match(*$2, $6); -+ Item_func_match *i1= new (thd->mem_root) Item_func_match(*$2, $6); - if (i1 == NULL) - MYSQL_YYABORT; - Select->add_ftfunc_to_list(i1); -@@ -7382,7 +7356,7 @@ - } - | BINARY simple_expr %prec NEG - { -- $$= create_func_cast(YYTHD, $2, ITEM_CAST_CHAR, NULL, NULL, -+ $$= create_func_cast(thd, $2, ITEM_CAST_CHAR, NULL, NULL, - &my_charset_bin); - if ($$ == NULL) - MYSQL_YYABORT; -@@ -7390,27 +7364,27 @@ - | CAST_SYM '(' expr AS cast_type ')' - { - LEX *lex= Lex; -- $$= create_func_cast(YYTHD, $3, $5, lex->length, lex->dec, -+ $$= create_func_cast(thd, $3, $5, lex->length, lex->dec, - lex->charset); - if ($$ == NULL) - MYSQL_YYABORT; - } - | CASE_SYM opt_expr when_list opt_else END - { -- $$= new (YYTHD->mem_root) Item_func_case(* $3, $2, $4 ); -+ $$= new (thd->mem_root) Item_func_case(* $3, $2, $4 ); - if ($$ == NULL) - MYSQL_YYABORT; - } - | CONVERT_SYM '(' expr ',' cast_type ')' - { -- $$= create_func_cast(YYTHD, $3, $5, Lex->length, Lex->dec, -+ $$= create_func_cast(thd, $3, $5, Lex->length, Lex->dec, - Lex->charset); - if ($$ == NULL) - MYSQL_YYABORT; - } - | CONVERT_SYM '(' expr USING charset_name ')' - { -- $$= new (YYTHD->mem_root) Item_func_conv_charset($3,$5); -+ $$= new (thd->mem_root) Item_func_conv_charset($3,$5); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -7423,14 +7397,14 @@ - my_error(ER_WRONG_COLUMN_NAME, MYF(0), il->my_name()->str); - MYSQL_YYABORT; - } -- $$= new (YYTHD->mem_root) Item_default_value(Lex->current_context(), -+ $$= new (thd->mem_root) Item_default_value(Lex->current_context(), - $3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | VALUES '(' simple_ident_nospvar ')' - { -- $$= new (YYTHD->mem_root) Item_insert_value(Lex->current_context(), -+ $$= new (thd->mem_root) Item_insert_value(Lex->current_context(), - $3); - if ($$ == NULL) - MYSQL_YYABORT; -@@ -7438,7 +7412,7 @@ - | INTERVAL_SYM expr interval '+' expr %prec INTERVAL_SYM - /* we cannot put interval before - */ - { -- $$= new (YYTHD->mem_root) Item_date_add_interval($5,$2,$3,0); -+ $$= new (thd->mem_root) Item_date_add_interval($5,$2,$3,0); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -7453,19 +7427,19 @@ - function_call_keyword: - CHAR_SYM '(' expr_list ')' - { -- $$= new (YYTHD->mem_root) Item_func_char(*$3); -+ $$= new (thd->mem_root) Item_func_char(*$3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | CHAR_SYM '(' expr_list USING charset_name ')' - { -- $$= new (YYTHD->mem_root) Item_func_char(*$3, $5); -+ $$= new (thd->mem_root) Item_func_char(*$3, $5); - if ($$ == NULL) - MYSQL_YYABORT; - } - | CURRENT_USER optional_braces - { -- $$= new (YYTHD->mem_root) Item_func_current_user(Lex->current_context()); -+ $$= new (thd->mem_root) Item_func_current_user(Lex->current_context()); - if ($$ == NULL) - MYSQL_YYABORT; - Lex->set_stmt_unsafe(); -@@ -7473,31 +7447,30 @@ - } - | DATE_SYM '(' expr ')' - { -- $$= new (YYTHD->mem_root) Item_date_typecast($3); -+ $$= new (thd->mem_root) Item_date_typecast($3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | DAY_SYM '(' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_dayofmonth($3); -+ $$= new (thd->mem_root) Item_func_dayofmonth($3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | HOUR_SYM '(' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_hour($3); -+ $$= new (thd->mem_root) Item_func_hour($3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | INSERT '(' expr ',' expr ',' expr ',' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_insert($3,$5,$7,$9); -+ $$= new (thd->mem_root) Item_func_insert($3,$5,$7,$9); - if ($$ == NULL) - MYSQL_YYABORT; - } - | INTERVAL_SYM '(' expr ',' expr ')' %prec INTERVAL_SYM - { -- THD *thd= YYTHD; - List *list= new (thd->mem_root) List; - if (list == NULL) - MYSQL_YYABORT; -@@ -7512,7 +7485,6 @@ - } - | INTERVAL_SYM '(' expr ',' expr ',' expr_list ')' %prec INTERVAL_SYM - { -- THD *thd= YYTHD; - $7->push_front($5); - $7->push_front($3); - Item_row *item= new (thd->mem_root) Item_row(*$7); -@@ -7524,103 +7496,103 @@ - } - | LEFT '(' expr ',' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_left($3,$5); -+ $$= new (thd->mem_root) Item_func_left($3,$5); - if ($$ == NULL) - MYSQL_YYABORT; - } - | MINUTE_SYM '(' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_minute($3); -+ $$= new (thd->mem_root) Item_func_minute($3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | MONTH_SYM '(' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_month($3); -+ $$= new (thd->mem_root) Item_func_month($3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | RIGHT '(' expr ',' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_right($3,$5); -+ $$= new (thd->mem_root) Item_func_right($3,$5); - if ($$ == NULL) - MYSQL_YYABORT; - } - | SECOND_SYM '(' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_second($3); -+ $$= new (thd->mem_root) Item_func_second($3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | TIME_SYM '(' expr ')' - { -- $$= new (YYTHD->mem_root) Item_time_typecast($3); -+ $$= new (thd->mem_root) Item_time_typecast($3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | TIMESTAMP '(' expr ')' - { -- $$= new (YYTHD->mem_root) Item_datetime_typecast($3); -+ $$= new (thd->mem_root) Item_datetime_typecast($3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | TIMESTAMP '(' expr ',' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_add_time($3, $5, 1, 0); -+ $$= new (thd->mem_root) Item_func_add_time($3, $5, 1, 0); - if ($$ == NULL) - MYSQL_YYABORT; - } - | TRIM '(' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_trim($3); -+ $$= new (thd->mem_root) Item_func_trim($3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | TRIM '(' LEADING expr FROM expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_ltrim($6,$4); -+ $$= new (thd->mem_root) Item_func_ltrim($6,$4); - if ($$ == NULL) - MYSQL_YYABORT; - } - | TRIM '(' TRAILING expr FROM expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_rtrim($6,$4); -+ $$= new (thd->mem_root) Item_func_rtrim($6,$4); - if ($$ == NULL) - MYSQL_YYABORT; - } - | TRIM '(' BOTH expr FROM expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_trim($6,$4); -+ $$= new (thd->mem_root) Item_func_trim($6,$4); - if ($$ == NULL) - MYSQL_YYABORT; - } - | TRIM '(' LEADING FROM expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_ltrim($5); -+ $$= new (thd->mem_root) Item_func_ltrim($5); - if ($$ == NULL) - MYSQL_YYABORT; - } - | TRIM '(' TRAILING FROM expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_rtrim($5); -+ $$= new (thd->mem_root) Item_func_rtrim($5); - if ($$ == NULL) - MYSQL_YYABORT; - } - | TRIM '(' BOTH FROM expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_trim($5); -+ $$= new (thd->mem_root) Item_func_trim($5); - if ($$ == NULL) - MYSQL_YYABORT; - } - | TRIM '(' expr FROM expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_trim($5,$3); -+ $$= new (thd->mem_root) Item_func_trim($5,$3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | USER '(' ')' - { -- $$= new (YYTHD->mem_root) Item_func_user(); -+ $$= new (thd->mem_root) Item_func_user(); - if ($$ == NULL) - MYSQL_YYABORT; - Lex->set_stmt_unsafe(); -@@ -7628,7 +7600,7 @@ - } - | YEAR_SYM '(' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_year($3); -+ $$= new (thd->mem_root) Item_func_year($3); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -7649,34 +7621,34 @@ - function_call_nonkeyword: - ADDDATE_SYM '(' expr ',' expr ')' - { -- $$= new (YYTHD->mem_root) Item_date_add_interval($3, $5, -+ $$= new (thd->mem_root) Item_date_add_interval($3, $5, - INTERVAL_DAY, 0); - if ($$ == NULL) - MYSQL_YYABORT; - } - | ADDDATE_SYM '(' expr ',' INTERVAL_SYM expr interval ')' - { -- $$= new (YYTHD->mem_root) Item_date_add_interval($3, $6, $7, 0); -+ $$= new (thd->mem_root) Item_date_add_interval($3, $6, $7, 0); - if ($$ == NULL) - MYSQL_YYABORT; - } - | CURDATE optional_braces - { -- $$= new (YYTHD->mem_root) Item_func_curdate_local(); -+ $$= new (thd->mem_root) Item_func_curdate_local(); - if ($$ == NULL) - MYSQL_YYABORT; - Lex->safe_to_cache_query=0; - } - | CURTIME optional_braces - { -- $$= new (YYTHD->mem_root) Item_func_curtime_local(); -+ $$= new (thd->mem_root) Item_func_curtime_local(); - if ($$ == NULL) - MYSQL_YYABORT; - Lex->safe_to_cache_query=0; - } - | CURTIME '(' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_curtime_local($3); -+ $$= new (thd->mem_root) Item_func_curtime_local($3); - if ($$ == NULL) - MYSQL_YYABORT; - Lex->safe_to_cache_query=0; -@@ -7684,83 +7656,83 @@ - | DATE_ADD_INTERVAL '(' expr ',' INTERVAL_SYM expr interval ')' - %prec INTERVAL_SYM - { -- $$= new (YYTHD->mem_root) Item_date_add_interval($3,$6,$7,0); -+ $$= new (thd->mem_root) Item_date_add_interval($3,$6,$7,0); - if ($$ == NULL) - MYSQL_YYABORT; - } - | DATE_SUB_INTERVAL '(' expr ',' INTERVAL_SYM expr interval ')' - %prec INTERVAL_SYM - { -- $$= new (YYTHD->mem_root) Item_date_add_interval($3,$6,$7,1); -+ $$= new (thd->mem_root) Item_date_add_interval($3,$6,$7,1); - if ($$ == NULL) - MYSQL_YYABORT; - } - | EXTRACT_SYM '(' interval FROM expr ')' - { -- $$=new (YYTHD->mem_root) Item_extract( $3, $5); -+ $$=new (thd->mem_root) Item_extract( $3, $5); - if ($$ == NULL) - MYSQL_YYABORT; - } - | GET_FORMAT '(' date_time_type ',' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_get_format($3, $5); -+ $$= new (thd->mem_root) Item_func_get_format($3, $5); - if ($$ == NULL) - MYSQL_YYABORT; - } - | NOW_SYM optional_braces - { -- $$= new (YYTHD->mem_root) Item_func_now_local(); -+ $$= new (thd->mem_root) Item_func_now_local(); - if ($$ == NULL) - MYSQL_YYABORT; - Lex->safe_to_cache_query=0; - } - | NOW_SYM '(' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_now_local($3); -+ $$= new (thd->mem_root) Item_func_now_local($3); - if ($$ == NULL) - MYSQL_YYABORT; - Lex->safe_to_cache_query=0; - } - | POSITION_SYM '(' bit_expr IN_SYM expr ')' - { -- $$ = new (YYTHD->mem_root) Item_func_locate($5,$3); -+ $$ = new (thd->mem_root) Item_func_locate($5,$3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | SUBDATE_SYM '(' expr ',' expr ')' - { -- $$= new (YYTHD->mem_root) Item_date_add_interval($3, $5, -+ $$= new (thd->mem_root) Item_date_add_interval($3, $5, - INTERVAL_DAY, 1); - if ($$ == NULL) - MYSQL_YYABORT; - } - | SUBDATE_SYM '(' expr ',' INTERVAL_SYM expr interval ')' - { -- $$= new (YYTHD->mem_root) Item_date_add_interval($3, $6, $7, 1); -+ $$= new (thd->mem_root) Item_date_add_interval($3, $6, $7, 1); - if ($$ == NULL) - MYSQL_YYABORT; - } - | SUBSTRING '(' expr ',' expr ',' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_substr($3,$5,$7); -+ $$= new (thd->mem_root) Item_func_substr($3,$5,$7); - if ($$ == NULL) - MYSQL_YYABORT; - } - | SUBSTRING '(' expr ',' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_substr($3,$5); -+ $$= new (thd->mem_root) Item_func_substr($3,$5); - if ($$ == NULL) - MYSQL_YYABORT; - } - | SUBSTRING '(' expr FROM expr FOR_SYM expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_substr($3,$5,$7); -+ $$= new (thd->mem_root) Item_func_substr($3,$5,$7); - if ($$ == NULL) - MYSQL_YYABORT; - } - | SUBSTRING '(' expr FROM expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_substr($3,$5); -+ $$= new (thd->mem_root) Item_func_substr($3,$5); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -7775,9 +7747,9 @@ - */ - Lex->set_stmt_unsafe(); - if (global_system_variables.sysdate_is_now == 0) -- $$= new (YYTHD->mem_root) Item_func_sysdate_local(); -+ $$= new (thd->mem_root) Item_func_sysdate_local(); - else -- $$= new (YYTHD->mem_root) Item_func_now_local(); -+ $$= new (thd->mem_root) Item_func_now_local(); - if ($$ == NULL) - MYSQL_YYABORT; - Lex->safe_to_cache_query=0; -@@ -7785,42 +7757,42 @@ - | SYSDATE '(' expr ')' - { - if (global_system_variables.sysdate_is_now == 0) -- $$= new (YYTHD->mem_root) Item_func_sysdate_local($3); -+ $$= new (thd->mem_root) Item_func_sysdate_local($3); - else -- $$= new (YYTHD->mem_root) Item_func_now_local($3); -+ $$= new (thd->mem_root) Item_func_now_local($3); - if ($$ == NULL) - MYSQL_YYABORT; - Lex->safe_to_cache_query=0; - } - | TIMESTAMP_ADD '(' interval_time_stamp ',' expr ',' expr ')' - { -- $$= new (YYTHD->mem_root) Item_date_add_interval($7,$5,$3,0); -+ $$= new (thd->mem_root) Item_date_add_interval($7,$5,$3,0); - if ($$ == NULL) - MYSQL_YYABORT; - } - | TIMESTAMP_DIFF '(' interval_time_stamp ',' expr ',' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_timestamp_diff($5,$7,$3); -+ $$= new (thd->mem_root) Item_func_timestamp_diff($5,$7,$3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | UTC_DATE_SYM optional_braces - { -- $$= new (YYTHD->mem_root) Item_func_curdate_utc(); -+ $$= new (thd->mem_root) Item_func_curdate_utc(); - if ($$ == NULL) - MYSQL_YYABORT; - Lex->safe_to_cache_query=0; - } - | UTC_TIME_SYM optional_braces - { -- $$= new (YYTHD->mem_root) Item_func_curtime_utc(); -+ $$= new (thd->mem_root) Item_func_curtime_utc(); - if ($$ == NULL) - MYSQL_YYABORT; - Lex->safe_to_cache_query=0; - } - | UTC_TIMESTAMP_SYM optional_braces - { -- $$= new (YYTHD->mem_root) Item_func_now_utc(); -+ $$= new (thd->mem_root) Item_func_now_utc(); - if ($$ == NULL) - MYSQL_YYABORT; - Lex->safe_to_cache_query=0; -@@ -7835,62 +7807,61 @@ - function_call_conflict: - ASCII_SYM '(' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_ascii($3); -+ $$= new (thd->mem_root) Item_func_ascii($3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | CHARSET '(' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_charset($3); -+ $$= new (thd->mem_root) Item_func_charset($3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | COALESCE '(' expr_list ')' - { -- $$= new (YYTHD->mem_root) Item_func_coalesce(* $3); -+ $$= new (thd->mem_root) Item_func_coalesce(* $3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | COLLATION_SYM '(' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_collation($3); -+ $$= new (thd->mem_root) Item_func_collation($3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | DATABASE '(' ')' - { -- $$= new (YYTHD->mem_root) Item_func_database(); -+ $$= new (thd->mem_root) Item_func_database(); - if ($$ == NULL) - MYSQL_YYABORT; - Lex->safe_to_cache_query=0; - } - | IF '(' expr ',' expr ',' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_if($3,$5,$7); -+ $$= new (thd->mem_root) Item_func_if($3,$5,$7); - if ($$ == NULL) - MYSQL_YYABORT; - } - | MICROSECOND_SYM '(' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_microsecond($3); -+ $$= new (thd->mem_root) Item_func_microsecond($3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | MOD_SYM '(' expr ',' expr ')' - { -- $$ = new (YYTHD->mem_root) Item_func_mod($3, $5); -+ $$ = new (thd->mem_root) Item_func_mod($3, $5); - if ($$ == NULL) - MYSQL_YYABORT; - } - | OLD_PASSWORD '(' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_old_password($3); -+ $$= new (thd->mem_root) Item_func_old_password($3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | PASSWORD '(' expr ')' - { -- THD *thd= YYTHD; - Item* i1; - if (thd->variables.old_passwords) - i1= new (thd->mem_root) Item_func_old_password($3); -@@ -7902,31 +7873,30 @@ - } - | QUARTER_SYM '(' expr ')' - { -- $$ = new (YYTHD->mem_root) Item_func_quarter($3); -+ $$ = new (thd->mem_root) Item_func_quarter($3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | REPEAT_SYM '(' expr ',' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_repeat($3,$5); -+ $$= new (thd->mem_root) Item_func_repeat($3,$5); - if ($$ == NULL) - MYSQL_YYABORT; - } - | REPLACE '(' expr ',' expr ',' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_replace($3,$5,$7); -+ $$= new (thd->mem_root) Item_func_replace($3,$5,$7); - if ($$ == NULL) - MYSQL_YYABORT; - } - | TRUNCATE_SYM '(' expr ',' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_round($3,$5,1); -+ $$= new (thd->mem_root) Item_func_round($3,$5,1); - if ($$ == NULL) - MYSQL_YYABORT; - } - | WEEK_SYM '(' expr ')' - { -- THD *thd= YYTHD; - Item *i1= new (thd->mem_root) Item_int((char*) "0", - thd->variables.default_week_format, - 1); -@@ -7938,7 +7908,7 @@ - } - | WEEK_SYM '(' expr ',' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_week($3,$5); -+ $$= new (thd->mem_root) Item_func_week($3,$5); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -7960,52 +7930,52 @@ - geometry_function: - CONTAINS_SYM '(' expr ',' expr ')' - { -- $$= GEOM_NEW(YYTHD, -+ $$= GEOM_NEW(thd, - Item_func_spatial_rel($3, $5, - Item_func::SP_CONTAINS_FUNC)); - } - | GEOMETRYCOLLECTION '(' expr_list ')' - { -- $$= GEOM_NEW(YYTHD, -+ $$= GEOM_NEW(thd, - Item_func_spatial_collection(* $3, - Geometry::wkb_geometrycollection, - Geometry::wkb_point)); - } - | LINESTRING '(' expr_list ')' - { -- $$= GEOM_NEW(YYTHD, -+ $$= GEOM_NEW(thd, - Item_func_spatial_collection(* $3, - Geometry::wkb_linestring, - Geometry::wkb_point)); - } - | MULTILINESTRING '(' expr_list ')' - { -- $$= GEOM_NEW(YYTHD, -+ $$= GEOM_NEW(thd, - Item_func_spatial_collection(* $3, - Geometry::wkb_multilinestring, - Geometry::wkb_linestring)); - } - | MULTIPOINT '(' expr_list ')' - { -- $$= GEOM_NEW(YYTHD, -+ $$= GEOM_NEW(thd, - Item_func_spatial_collection(* $3, - Geometry::wkb_multipoint, - Geometry::wkb_point)); - } - | MULTIPOLYGON '(' expr_list ')' - { -- $$= GEOM_NEW(YYTHD, -+ $$= GEOM_NEW(thd, - Item_func_spatial_collection(* $3, - Geometry::wkb_multipolygon, - Geometry::wkb_polygon)); - } - | POINT_SYM '(' expr ',' expr ')' - { -- $$= GEOM_NEW(YYTHD, Item_func_point($3,$5)); -+ $$= GEOM_NEW(thd, Item_func_point($3,$5)); - } - | POLYGON '(' expr_list ')' - { -- $$= GEOM_NEW(YYTHD, -+ $$= GEOM_NEW(thd, - Item_func_spatial_collection(* $3, - Geometry::wkb_polygon, - Geometry::wkb_linestring)); -@@ -8043,7 +8013,6 @@ - } - opt_udf_expr_list ')' - { -- THD *thd= YYTHD; - Create_func *builder; - Item *item= NULL; - -@@ -8097,7 +8066,6 @@ - } - | ident '.' ident '(' opt_expr_list ')' - { -- THD *thd= YYTHD; - Create_qfunc *builder; - Item *item= NULL; - -@@ -8161,7 +8129,7 @@ - udf_expr_list: - udf_expr - { -- $$= new (YYTHD->mem_root) List; -+ $$= new (thd->mem_root) List; - if ($$ == NULL) - MYSQL_YYABORT; - $$->push_back($1); -@@ -8194,7 +8162,7 @@ - remember_name we may get quoted or escaped names. - */ - else if ($2->type() != Item::FIELD_ITEM) -- $2->set_name($1, (uint) ($3 - $1), YYTHD->charset()); -+ $2->set_name($1, (uint) ($3 - $1), thd->charset()); - $$= $2; - } - ; -@@ -8202,46 +8170,46 @@ - sum_expr: - AVG_SYM '(' in_sum_expr ')' - { -- $$= new (YYTHD->mem_root) Item_sum_avg($3); -+ $$= new (thd->mem_root) Item_sum_avg($3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | AVG_SYM '(' DISTINCT in_sum_expr ')' - { -- $$= new (YYTHD->mem_root) Item_sum_avg_distinct($4); -+ $$= new (thd->mem_root) Item_sum_avg_distinct($4); - if ($$ == NULL) - MYSQL_YYABORT; - } - | BIT_AND '(' in_sum_expr ')' - { -- $$= new (YYTHD->mem_root) Item_sum_and($3); -+ $$= new (thd->mem_root) Item_sum_and($3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | BIT_OR '(' in_sum_expr ')' - { -- $$= new (YYTHD->mem_root) Item_sum_or($3); -+ $$= new (thd->mem_root) Item_sum_or($3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | BIT_XOR '(' in_sum_expr ')' - { -- $$= new (YYTHD->mem_root) Item_sum_xor($3); -+ $$= new (thd->mem_root) Item_sum_xor($3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | COUNT_SYM '(' opt_all '*' ')' - { -- Item *item= new (YYTHD->mem_root) Item_int((int32) 0L,1); -+ Item *item= new (thd->mem_root) Item_int((int32) 0L,1); - if (item == NULL) - MYSQL_YYABORT; -- $$= new (YYTHD->mem_root) Item_sum_count(item); -+ $$= new (thd->mem_root) Item_sum_count(item); - if ($$ == NULL) - MYSQL_YYABORT; - } - | COUNT_SYM '(' in_sum_expr ')' - { -- $$= new (YYTHD->mem_root) Item_sum_count($3); -+ $$= new (thd->mem_root) Item_sum_count($3); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -8251,13 +8219,13 @@ - { Select->in_sum_expr--; } - ')' - { -- $$= new (YYTHD->mem_root) Item_sum_count_distinct(* $5); -+ $$= new (thd->mem_root) Item_sum_count_distinct(* $5); - if ($$ == NULL) - MYSQL_YYABORT; - } - | MIN_SYM '(' in_sum_expr ')' - { -- $$= new (YYTHD->mem_root) Item_sum_min($3); -+ $$= new (thd->mem_root) Item_sum_min($3); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -8268,55 +8236,55 @@ - */ - | MIN_SYM '(' DISTINCT in_sum_expr ')' - { -- $$= new (YYTHD->mem_root) Item_sum_min($4); -+ $$= new (thd->mem_root) Item_sum_min($4); - if ($$ == NULL) - MYSQL_YYABORT; - } - | MAX_SYM '(' in_sum_expr ')' - { -- $$= new (YYTHD->mem_root) Item_sum_max($3); -+ $$= new (thd->mem_root) Item_sum_max($3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | MAX_SYM '(' DISTINCT in_sum_expr ')' - { -- $$= new (YYTHD->mem_root) Item_sum_max($4); -+ $$= new (thd->mem_root) Item_sum_max($4); - if ($$ == NULL) - MYSQL_YYABORT; - } - | STD_SYM '(' in_sum_expr ')' - { -- $$= new (YYTHD->mem_root) Item_sum_std($3, 0); -+ $$= new (thd->mem_root) Item_sum_std($3, 0); - if ($$ == NULL) - MYSQL_YYABORT; - } - | VARIANCE_SYM '(' in_sum_expr ')' - { -- $$= new (YYTHD->mem_root) Item_sum_variance($3, 0); -+ $$= new (thd->mem_root) Item_sum_variance($3, 0); - if ($$ == NULL) - MYSQL_YYABORT; - } - | STDDEV_SAMP_SYM '(' in_sum_expr ')' - { -- $$= new (YYTHD->mem_root) Item_sum_std($3, 1); -+ $$= new (thd->mem_root) Item_sum_std($3, 1); - if ($$ == NULL) - MYSQL_YYABORT; - } - | VAR_SAMP_SYM '(' in_sum_expr ')' - { -- $$= new (YYTHD->mem_root) Item_sum_variance($3, 1); -+ $$= new (thd->mem_root) Item_sum_variance($3, 1); - if ($$ == NULL) - MYSQL_YYABORT; - } - | SUM_SYM '(' in_sum_expr ')' - { -- $$= new (YYTHD->mem_root) Item_sum_sum($3); -+ $$= new (thd->mem_root) Item_sum_sum($3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | SUM_SYM '(' DISTINCT in_sum_expr ')' - { -- $$= new (YYTHD->mem_root) Item_sum_sum_distinct($4); -+ $$= new (thd->mem_root) Item_sum_sum_distinct($4); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -8328,7 +8296,7 @@ - { - SELECT_LEX *sel= Select; - sel->in_sum_expr--; -- $$= new (YYTHD->mem_root) -+ $$= new (thd->mem_root) - Item_func_group_concat(Lex->current_context(), $3, $5, - sel->gorder_list, $7); - if ($$ == NULL) -@@ -8357,7 +8325,7 @@ - ident_or_text SET_VAR expr - { - Item_func_set_user_var *item; -- $$= item= new (YYTHD->mem_root) Item_func_set_user_var($1, $3); -+ $$= item= new (thd->mem_root) Item_func_set_user_var($1, $3); - if ($$ == NULL) - MYSQL_YYABORT; - LEX *lex= Lex; -@@ -8366,7 +8334,7 @@ - } - | ident_or_text - { -- $$= new (YYTHD->mem_root) Item_func_get_user_var($1); -+ $$= new (thd->mem_root) Item_func_get_user_var($1); - if ($$ == NULL) - MYSQL_YYABORT; - LEX *lex= Lex; -@@ -8380,7 +8348,7 @@ - my_parse_error(ER(ER_SYNTAX_ERROR)); - MYSQL_YYABORT; - } -- if (!($$= get_system_var(YYTHD, $2, $3, $4))) -+ if (!($$= get_system_var(thd, $2, $3, $4))) - MYSQL_YYABORT; - if (!((Item_func_get_system_var*) $$)->is_written_to_binlog()) - Lex->set_stmt_unsafe(); -@@ -8395,7 +8363,7 @@ - opt_gconcat_separator: - /* empty */ - { -- $$= new (YYTHD->mem_root) String(",", 1, &my_charset_latin1); -+ $$= new (thd->mem_root) String(",", 1, &my_charset_latin1); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -8422,9 +8390,9 @@ - - gorder_list: - gorder_list ',' order_ident order_dir -- { if (add_gorder_to_list(YYTHD, $3,(bool) $4)) MYSQL_YYABORT; } -+ { if (add_gorder_to_list(thd, $3,(bool) $4)) MYSQL_YYABORT; } - | order_ident order_dir -- { if (add_gorder_to_list(YYTHD, $1,(bool) $2)) MYSQL_YYABORT; } -+ { if (add_gorder_to_list(thd, $1,(bool) $2)) MYSQL_YYABORT; } - ; - - in_sum_expr: -@@ -8477,7 +8445,7 @@ - expr_list: - expr - { -- $$= new (YYTHD->mem_root) List; -+ $$= new (thd->mem_root) List; - if ($$ == NULL) - MYSQL_YYABORT; - $$->push_back($1); -@@ -8497,7 +8465,7 @@ - ident_list: - simple_ident - { -- $$= new (YYTHD->mem_root) List; -+ $$= new (thd->mem_root) List; - if ($$ == NULL) - MYSQL_YYABORT; - $$->push_back($1); -@@ -8595,7 +8563,7 @@ - { - MYSQL_YYABORT_UNLESS($1 && $3); - /* Change the current name resolution context to a local context. */ -- if (push_new_name_resolution_context(YYTHD, $1, $3)) -+ if (push_new_name_resolution_context(thd, $1, $3)) - MYSQL_YYABORT; - Select->parsing_place= IN_ON; - } -@@ -8610,7 +8578,7 @@ - { - MYSQL_YYABORT_UNLESS($1 && $3); - /* Change the current name resolution context to a local context. */ -- if (push_new_name_resolution_context(YYTHD, $1, $3)) -+ if (push_new_name_resolution_context(thd, $1, $3)) - MYSQL_YYABORT; - Select->parsing_place= IN_ON; - } -@@ -8640,7 +8608,7 @@ - { - MYSQL_YYABORT_UNLESS($1 && $5); - /* Change the current name resolution context to a local context. */ -- if (push_new_name_resolution_context(YYTHD, $1, $5)) -+ if (push_new_name_resolution_context(thd, $1, $5)) - MYSQL_YYABORT; - Select->parsing_place= IN_ON; - } -@@ -8676,7 +8644,7 @@ - { - MYSQL_YYABORT_UNLESS($1 && $5); - /* Change the current name resolution context to a local context. */ -- if (push_new_name_resolution_context(YYTHD, $1, $5)) -+ if (push_new_name_resolution_context(thd, $1, $5)) - MYSQL_YYABORT; - Select->parsing_place= IN_ON; - } -@@ -8724,7 +8692,7 @@ - } - table_ident opt_table_alias opt_key_definition - { -- if (!($$= Select->add_table_to_list(YYTHD, $2, $3, -+ if (!($$= Select->add_table_to_list(thd, $2, $3, - Select->get_table_join_options(), - Lex->lock_option, - Select->pop_index_hints()))) -@@ -8922,7 +8890,7 @@ - - opt_index_hints_list: - /* empty */ -- | { Select->alloc_index_hints(YYTHD); } index_hints_list -+ | { Select->alloc_index_hints(thd); } index_hints_list - ; - - opt_key_definition: -@@ -8931,15 +8899,15 @@ - ; - - opt_key_usage_list: -- /* empty */ { Select->add_index_hint(YYTHD, NULL, 0); } -+ /* empty */ { Select->add_index_hint(thd, NULL, 0); } - | key_usage_list {} - ; - - key_usage_element: - ident -- { Select->add_index_hint(YYTHD, $1.str, $1.length); } -+ { Select->add_index_hint(thd, $1.str, $1.length); } - | PRIMARY_SYM -- { Select->add_index_hint(YYTHD, (char *)"PRIMARY", 7); } -+ { Select->add_index_hint(thd, (char *)"PRIMARY", 7); } - ; - - key_usage_list: -@@ -8952,7 +8920,7 @@ - { - if (!($$= new List)) - MYSQL_YYABORT; -- String *s= new (YYTHD->mem_root) String((const char *) $1.str, -+ String *s= new (thd->mem_root) String((const char *) $1.str, - $1.length, - system_charset_info); - if (s == NULL) -@@ -8961,7 +8929,7 @@ - } - | using_list ',' ident - { -- String *s= new (YYTHD->mem_root) String((const char *) $3.str, -+ String *s= new (thd->mem_root) String((const char *) $3.str, - $3.length, - system_charset_info); - if (s == NULL) -@@ -9002,7 +8970,7 @@ - implementation without changing its - resolution. - */ -- WARN_DEPRECATED(yythd, VER_CELOSIA, "FRAC_SECOND", "MICROSECOND"); -+ WARN_DEPRECATED(thd, VER_CELOSIA, "FRAC_SECOND", "MICROSECOND"); - } - ; - -@@ -9086,7 +9054,6 @@ - } - | /* empty */ - { -- THD *thd= YYTHD; - Lex->escape_used= FALSE; - $$= ((thd->variables.sql_mode & MODE_NO_BACKSLASH_ESCAPES) ? - new (thd->mem_root) Item_string("", 0, &my_charset_latin1) : -@@ -9107,9 +9074,9 @@ - - group_list: - group_list ',' order_ident order_dir -- { if (add_group_to_list(YYTHD, $3,(bool) $4)) MYSQL_YYABORT; } -+ { if (add_group_to_list(thd, $3,(bool) $4)) MYSQL_YYABORT; } - | order_ident order_dir -- { if (add_group_to_list(YYTHD, $1,(bool) $2)) MYSQL_YYABORT; } -+ { if (add_group_to_list(thd, $1,(bool) $2)) MYSQL_YYABORT; } - ; - - olap_opt: -@@ -9156,7 +9123,6 @@ - alter_order_item: - simple_ident_nospvar order_dir - { -- THD *thd= YYTHD; - bool ascending= ($2 == 1) ? true : false; - if (add_order_to_list(thd, $1, ascending)) - MYSQL_YYABORT; -@@ -9209,9 +9175,9 @@ - - order_list: - order_list ',' order_ident order_dir -- { if (add_order_to_list(YYTHD, $3,(bool) $4)) MYSQL_YYABORT; } -+ { if (add_order_to_list(thd, $3,(bool) $4)) MYSQL_YYABORT; } - | order_ident order_dir -- { if (add_order_to_list(YYTHD, $1,(bool) $2)) MYSQL_YYABORT; } -+ { if (add_order_to_list(thd, $1,(bool) $2)) MYSQL_YYABORT; } - ; - - order_dir: -@@ -9271,19 +9237,19 @@ - } - | ULONGLONG_NUM - { -- $$= new (YYTHD->mem_root) Item_uint($1.str, $1.length); -+ $$= new (thd->mem_root) Item_uint($1.str, $1.length); - if ($$ == NULL) - MYSQL_YYABORT; - } - | LONG_NUM - { -- $$= new (YYTHD->mem_root) Item_uint($1.str, $1.length); -+ $$= new (thd->mem_root) Item_uint($1.str, $1.length); - if ($$ == NULL) - MYSQL_YYABORT; - } - | NUM - { -- $$= new (YYTHD->mem_root) Item_uint($1.str, $1.length); -+ $$= new (thd->mem_root) Item_uint($1.str, $1.length); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -9365,7 +9331,7 @@ - lex->proc_list.elements=0; - lex->proc_list.first=0; - lex->proc_list.next= &lex->proc_list.first; -- Item_field *item= new (YYTHD->mem_root) -+ Item_field *item= new (thd->mem_root) - Item_field(&lex->current_select->context, - NULL, NULL, $2.str); - if (item == NULL) -@@ -9390,8 +9356,7 @@ - procedure_item: - remember_name expr remember_end - { -- THD *thd= YYTHD; -- -+ - if (add_proc_to_list(thd, $2)) - MYSQL_YYABORT; - if (!$2->name) -@@ -9560,7 +9525,6 @@ - } - | DROP FUNCTION_SYM if_exists ident '.' ident - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - sp_name *spname; - if ($4.str && check_db_name(&$4)) -@@ -9583,7 +9547,6 @@ - } - | DROP FUNCTION_SYM if_exists ident - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - LEX_STRING db= {0, 0}; - sp_name *spname; -@@ -9664,7 +9627,7 @@ - table_name: - table_ident - { -- if (!Select->add_table_to_list(YYTHD, $1, NULL, TL_OPTION_UPDATING)) -+ if (!Select->add_table_to_list(thd, $1, NULL, TL_OPTION_UPDATING)) - MYSQL_YYABORT; - } - ; -@@ -9677,7 +9640,7 @@ - table_alias_ref: - table_ident_opt_wild - { -- if (!Select->add_table_to_list(YYTHD, $1, NULL, -+ if (!Select->add_table_to_list(thd, $1, NULL, - TL_OPTION_UPDATING | TL_OPTION_ALIAS, - Lex->lock_option )) - MYSQL_YYABORT; -@@ -9868,7 +9831,7 @@ - expr { $$= $1;} - | DEFAULT - { -- $$= new (YYTHD->mem_root) Item_default_value(Lex->current_context()); -+ $$= new (thd->mem_root) Item_default_value(Lex->current_context()); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -9922,7 +9885,7 @@ - update_elem: - simple_ident_nospvar equal expr_or_default - { -- if (add_item_to_list(YYTHD, $1) || add_value_to_list(YYTHD, $3)) -+ if (add_item_to_list(thd, $1) || add_value_to_list(thd, $3)) - MYSQL_YYABORT; - } - ; -@@ -9965,7 +9928,7 @@ - single_multi: - FROM table_ident - { -- if (!Select->add_table_to_list(YYTHD, $2, NULL, TL_OPTION_UPDATING, -+ if (!Select->add_table_to_list(thd, $2, NULL, TL_OPTION_UPDATING, - Lex->lock_option)) - MYSQL_YYABORT; - } -@@ -9998,7 +9961,7 @@ - Table_ident *ti= new Table_ident($1); - if (ti == NULL) - MYSQL_YYABORT; -- if (!Select->add_table_to_list(YYTHD, -+ if (!Select->add_table_to_list(thd, - ti, - $3, - TL_OPTION_UPDATING | TL_OPTION_ALIAS, -@@ -10007,10 +9970,10 @@ - } - | ident '.' ident opt_wild opt_table_alias - { -- Table_ident *ti= new Table_ident(YYTHD, $1, $3, 0); -+ Table_ident *ti= new Table_ident(thd, $1, $3, 0); - if (ti == NULL) - MYSQL_YYABORT; -- if (!Select->add_table_to_list(YYTHD, -+ if (!Select->add_table_to_list(thd, - ti, - $5, - TL_OPTION_UPDATING | TL_OPTION_ALIAS, -@@ -10130,7 +10093,7 @@ - { - LEX *lex= Lex; - lex->sql_command= SQLCOM_SHOW_DATABASES; -- if (prepare_schema_table(YYTHD, lex, 0, SCH_SCHEMATA)) -+ if (prepare_schema_table(thd, lex, 0, SCH_SCHEMATA)) - MYSQL_YYABORT; - } - | opt_full TABLES opt_db wild_and_where -@@ -10138,7 +10101,7 @@ - LEX *lex= Lex; - lex->sql_command= SQLCOM_SHOW_TABLES; - lex->select_lex.db= $3; -- if (prepare_schema_table(YYTHD, lex, 0, SCH_TABLE_NAMES)) -+ if (prepare_schema_table(thd, lex, 0, SCH_TABLE_NAMES)) - MYSQL_YYABORT; - } - | opt_full TRIGGERS_SYM opt_db wild_and_where -@@ -10146,7 +10109,7 @@ - LEX *lex= Lex; - lex->sql_command= SQLCOM_SHOW_TRIGGERS; - lex->select_lex.db= $3; -- if (prepare_schema_table(YYTHD, lex, 0, SCH_TRIGGERS)) -+ if (prepare_schema_table(thd, lex, 0, SCH_TRIGGERS)) - MYSQL_YYABORT; - } - | EVENTS_SYM opt_db wild_and_where -@@ -10154,7 +10117,7 @@ - LEX *lex= Lex; - lex->sql_command= SQLCOM_SHOW_EVENTS; - lex->select_lex.db= $2; -- if (prepare_schema_table(YYTHD, lex, 0, SCH_EVENTS)) -+ if (prepare_schema_table(thd, lex, 0, SCH_EVENTS)) - MYSQL_YYABORT; - } - | TABLE_SYM STATUS_SYM opt_db wild_and_where -@@ -10162,7 +10125,7 @@ - LEX *lex= Lex; - lex->sql_command= SQLCOM_SHOW_TABLE_STATUS; - lex->select_lex.db= $3; -- if (prepare_schema_table(YYTHD, lex, 0, SCH_TABLES)) -+ if (prepare_schema_table(thd, lex, 0, SCH_TABLES)) - MYSQL_YYABORT; - } - | OPEN_SYM TABLES opt_db wild_and_where -@@ -10170,22 +10133,22 @@ - LEX *lex= Lex; - lex->sql_command= SQLCOM_SHOW_OPEN_TABLES; - lex->select_lex.db= $3; -- if (prepare_schema_table(YYTHD, lex, 0, SCH_OPEN_TABLES)) -+ if (prepare_schema_table(thd, lex, 0, SCH_OPEN_TABLES)) - MYSQL_YYABORT; - } - | opt_full PLUGIN_SYM - { - LEX *lex= Lex; -- WARN_DEPRECATED(yythd, "6.0", "SHOW PLUGIN", "'SHOW PLUGINS'"); -+ WARN_DEPRECATED(thd, "6.0", "SHOW PLUGIN", "'SHOW PLUGINS'"); - lex->sql_command= SQLCOM_SHOW_PLUGINS; -- if (prepare_schema_table(YYTHD, lex, 0, SCH_PLUGINS)) -+ if (prepare_schema_table(thd, lex, 0, SCH_PLUGINS)) - MYSQL_YYABORT; - } - | PLUGINS_SYM - { - LEX *lex= Lex; - lex->sql_command= SQLCOM_SHOW_PLUGINS; -- if (prepare_schema_table(YYTHD, lex, 0, SCH_PLUGINS)) -+ if (prepare_schema_table(thd, lex, 0, SCH_PLUGINS)) - MYSQL_YYABORT; - } - | ENGINE_SYM known_storage_engines show_engine_param -@@ -10198,7 +10161,7 @@ - lex->sql_command= SQLCOM_SHOW_FIELDS; - if ($5) - $4->change_db($5); -- if (prepare_schema_table(YYTHD, lex, $4, SCH_COLUMNS)) -+ if (prepare_schema_table(thd, lex, $4, SCH_COLUMNS)) - MYSQL_YYABORT; - } - | NEW_SYM MASTER_SYM FOR_SYM SLAVE -@@ -10233,7 +10196,7 @@ - lex->sql_command= SQLCOM_SHOW_KEYS; - if ($4) - $3->change_db($4); -- if (prepare_schema_table(YYTHD, lex, $3, SCH_STATISTICS)) -+ if (prepare_schema_table(thd, lex, $3, SCH_STATISTICS)) - MYSQL_YYABORT; - } - | COLUMN_SYM TYPES_SYM -@@ -10245,15 +10208,15 @@ - { - LEX *lex=Lex; - lex->sql_command= SQLCOM_SHOW_STORAGE_ENGINES; -- WARN_DEPRECATED(yythd, "6.0", "SHOW TABLE TYPES", "'SHOW [STORAGE] ENGINES'"); -- if (prepare_schema_table(YYTHD, lex, 0, SCH_ENGINES)) -+ WARN_DEPRECATED(thd, "6.0", "SHOW TABLE TYPES", "'SHOW [STORAGE] ENGINES'"); -+ if (prepare_schema_table(thd, lex, 0, SCH_ENGINES)) - MYSQL_YYABORT; - } - | opt_storage ENGINES_SYM - { - LEX *lex=Lex; - lex->sql_command= SQLCOM_SHOW_STORAGE_ENGINES; -- if (prepare_schema_table(YYTHD, lex, 0, SCH_ENGINES)) -+ if (prepare_schema_table(thd, lex, 0, SCH_ENGINES)) - MYSQL_YYABORT; - } - | AUTHORS_SYM -@@ -10285,7 +10248,7 @@ - { - LEX *lex= Lex; - lex->sql_command= SQLCOM_SHOW_PROFILE; -- if (prepare_schema_table(YYTHD, lex, NULL, SCH_PROFILES) != 0) -+ if (prepare_schema_table(thd, lex, NULL, SCH_PROFILES) != 0) - YYABORT; - } - | opt_var_type STATUS_SYM wild_and_where -@@ -10293,7 +10256,7 @@ - LEX *lex= Lex; - lex->sql_command= SQLCOM_SHOW_STATUS; - lex->option_type= $1; -- if (prepare_schema_table(YYTHD, lex, 0, SCH_STATUS)) -+ if (prepare_schema_table(thd, lex, 0, SCH_STATUS)) - MYSQL_YYABORT; - } - | INNOBASE_SYM STATUS_SYM -@@ -10301,24 +10264,24 @@ - LEX *lex= Lex; - lex->sql_command = SQLCOM_SHOW_ENGINE_STATUS; - if (!(lex->create_info.db_type= -- ha_resolve_by_legacy_type(YYTHD, DB_TYPE_INNODB))) -+ ha_resolve_by_legacy_type(thd, DB_TYPE_INNODB))) - { - my_error(ER_UNKNOWN_STORAGE_ENGINE, MYF(0), "InnoDB"); - MYSQL_YYABORT; - } -- WARN_DEPRECATED(yythd, "6.0", "SHOW INNODB STATUS", "'SHOW ENGINE INNODB STATUS'"); -+ WARN_DEPRECATED(thd, "6.0", "SHOW INNODB STATUS", "'SHOW ENGINE INNODB STATUS'"); - } - | MUTEX_SYM STATUS_SYM - { - LEX *lex= Lex; - lex->sql_command = SQLCOM_SHOW_ENGINE_MUTEX; - if (!(lex->create_info.db_type= -- ha_resolve_by_legacy_type(YYTHD, DB_TYPE_INNODB))) -+ ha_resolve_by_legacy_type(thd, DB_TYPE_INNODB))) - { - my_error(ER_UNKNOWN_STORAGE_ENGINE, MYF(0), "InnoDB"); - MYSQL_YYABORT; - } -- WARN_DEPRECATED(yythd, "6.0", "SHOW MUTEX STATUS", "'SHOW ENGINE INNODB MUTEX'"); -+ WARN_DEPRECATED(thd, "6.0", "SHOW MUTEX STATUS", "'SHOW ENGINE INNODB MUTEX'"); - } - | opt_full PROCESSLIST_SYM - { Lex->sql_command= SQLCOM_SHOW_PROCESSLIST;} -@@ -10327,21 +10290,21 @@ - LEX *lex= Lex; - lex->sql_command= SQLCOM_SHOW_VARIABLES; - lex->option_type= $1; -- if (prepare_schema_table(YYTHD, lex, 0, SCH_VARIABLES)) -+ if (prepare_schema_table(thd, lex, 0, SCH_VARIABLES)) - MYSQL_YYABORT; - } - | charset wild_and_where - { - LEX *lex= Lex; - lex->sql_command= SQLCOM_SHOW_CHARSETS; -- if (prepare_schema_table(YYTHD, lex, 0, SCH_CHARSETS)) -+ if (prepare_schema_table(thd, lex, 0, SCH_CHARSETS)) - MYSQL_YYABORT; - } - | COLLATION_SYM wild_and_where - { - LEX *lex= Lex; - lex->sql_command= SQLCOM_SHOW_COLLATIONS; -- if (prepare_schema_table(YYTHD, lex, 0, SCH_COLLATIONS)) -+ if (prepare_schema_table(thd, lex, 0, SCH_COLLATIONS)) - MYSQL_YYABORT; - } - | GRANTS -@@ -10371,7 +10334,7 @@ - { - LEX *lex= Lex; - lex->sql_command = SQLCOM_SHOW_CREATE; -- if (!lex->select_lex.add_table_to_list(YYTHD, $3, NULL,0)) -+ if (!lex->select_lex.add_table_to_list(thd, $3, NULL,0)) - MYSQL_YYABORT; - lex->only_view= 0; - lex->create_info.storage_media= HA_SM_DEFAULT; -@@ -10380,7 +10343,7 @@ - { - LEX *lex= Lex; - lex->sql_command = SQLCOM_SHOW_CREATE; -- if (!lex->select_lex.add_table_to_list(YYTHD, $3, NULL, 0)) -+ if (!lex->select_lex.add_table_to_list(thd, $3, NULL, 0)) - MYSQL_YYABORT; - lex->only_view= 1; - } -@@ -10416,14 +10379,14 @@ - { - LEX *lex= Lex; - lex->sql_command= SQLCOM_SHOW_STATUS_PROC; -- if (prepare_schema_table(YYTHD, lex, 0, SCH_PROCEDURES)) -+ if (prepare_schema_table(thd, lex, 0, SCH_PROCEDURES)) - MYSQL_YYABORT; - } - | FUNCTION_SYM STATUS_SYM wild_and_where - { - LEX *lex= Lex; - lex->sql_command= SQLCOM_SHOW_STATUS_FUNC; -- if (prepare_schema_table(YYTHD, lex, 0, SCH_PROCEDURES)) -+ if (prepare_schema_table(thd, lex, 0, SCH_PROCEDURES)) - MYSQL_YYABORT; - } - | PROCEDURE CODE_SYM sp_name -@@ -10501,7 +10464,7 @@ - /* empty */ - | LIKE TEXT_STRING_sys - { -- Lex->wild= new (YYTHD->mem_root) String($2.str, $2.length, -+ Lex->wild= new (thd->mem_root) String($2.str, $2.length, - system_charset_info); - if (Lex->wild == NULL) - MYSQL_YYABORT; -@@ -10525,7 +10488,7 @@ - lex->sql_command= SQLCOM_SHOW_FIELDS; - lex->select_lex.db= 0; - lex->verbose= 0; -- if (prepare_schema_table(YYTHD, lex, $2, SCH_COLUMNS)) -+ if (prepare_schema_table(thd, lex, $2, SCH_COLUMNS)) - MYSQL_YYABORT; - } - opt_describe_column {} -@@ -10554,7 +10517,7 @@ - | text_string { Lex->wild= $1; } - | ident - { -- Lex->wild= new (YYTHD->mem_root) String((const char*) $1.str, -+ Lex->wild= new (thd->mem_root) String((const char*) $1.str, - $1.length, - system_charset_info); - if (Lex->wild == NULL) -@@ -10697,7 +10660,6 @@ - load: - LOAD DATA_SYM - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - - if (lex->sphead) -@@ -10711,7 +10673,7 @@ - | LOAD TABLE_SYM table_ident FROM MASTER_SYM - { - LEX *lex=Lex; -- WARN_DEPRECATED(yythd, "6.0", "LOAD TABLE FROM MASTER", -+ WARN_DEPRECATED(thd, "6.0", "LOAD TABLE FROM MASTER", - "MySQL Administrator (mysqldump, mysql)"); - if (lex->sphead) - { -@@ -10719,7 +10681,7 @@ - MYSQL_YYABORT; - } - lex->sql_command = SQLCOM_LOAD_MASTER_TABLE; -- if (!Select->add_table_to_list(YYTHD, $3, NULL, TL_OPTION_UPDATING)) -+ if (!Select->add_table_to_list(thd, $3, NULL, TL_OPTION_UPDATING)) - MYSQL_YYABORT; - } - ; -@@ -10739,7 +10701,7 @@ - opt_duplicate INTO TABLE_SYM table_ident - { - LEX *lex=Lex; -- if (!Select->add_table_to_list(YYTHD, $9, NULL, TL_OPTION_UPDATING, -+ if (!Select->add_table_to_list(thd, $9, NULL, TL_OPTION_UPDATING, - lex->lock_option)) - MYSQL_YYABORT; - lex->field_list.empty(); -@@ -10754,7 +10716,7 @@ - | FROM MASTER_SYM - { - Lex->sql_command = SQLCOM_LOAD_MASTER_DATA; -- WARN_DEPRECATED(yythd, "6.0", "LOAD DATA FROM MASTER", -+ WARN_DEPRECATED(thd, "6.0", "LOAD DATA FROM MASTER", - "mysqldump or future " - "BACKUP/RESTORE DATABASE facility"); - } -@@ -10872,7 +10834,7 @@ - simple_ident_nospvar {$$= $1;} - | '@' ident_or_text - { -- $$= new (YYTHD->mem_root) Item_user_var_as_out_param($2); -+ $$= new (thd->mem_root) Item_user_var_as_out_param($2); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -10889,7 +10851,6 @@ - TEXT_STRING - { - LEX_STRING tmp; -- THD *thd= YYTHD; - CHARSET_INFO *cs_con= thd->variables.collation_connection; - CHARSET_INFO *cs_cli= thd->variables.character_set_client; - uint repertoire= thd->lex->text_string_is_7bit && -@@ -10915,7 +10876,7 @@ - uint repertoire= Lex->text_string_is_7bit ? - MY_REPERTOIRE_ASCII : MY_REPERTOIRE_UNICODE30; - DBUG_ASSERT(my_charset_is_ascii_based(national_charset_info)); -- $$= new (YYTHD->mem_root) Item_string($1.str, $1.length, -+ $$= new (thd->mem_root) Item_string($1.str, $1.length, - national_charset_info, - DERIVATION_COERCIBLE, - repertoire); -@@ -10924,7 +10885,7 @@ - } - | UNDERSCORE_CHARSET TEXT_STRING - { -- Item_string *str= new (YYTHD->mem_root) Item_string($2.str, -+ Item_string *str= new (thd->mem_root) Item_string($2.str, - $2.length, $1); - if (str == NULL) - MYSQL_YYABORT; -@@ -10943,7 +10904,7 @@ - If the string has been pure ASCII so far, - check the new part. - */ -- CHARSET_INFO *cs= YYTHD->variables.collation_connection; -+ CHARSET_INFO *cs= thd->variables.collation_connection; - item->collation.repertoire|= my_string_repertoire(cs, - $2.str, - $2.length); -@@ -10954,15 +10915,15 @@ - text_string: - TEXT_STRING_literal - { -- $$= new (YYTHD->mem_root) String($1.str, -+ $$= new (thd->mem_root) String($1.str, - $1.length, -- YYTHD->variables.collation_connection); -+ thd->variables.collation_connection); - if ($$ == NULL) - MYSQL_YYABORT; - } - | HEX_NUM - { -- Item *tmp= new (YYTHD->mem_root) Item_hex_string($1.str, $1.length); -+ Item *tmp= new (thd->mem_root) Item_hex_string($1.str, $1.length); - if (tmp == NULL) - MYSQL_YYABORT; - /* -@@ -10974,7 +10935,7 @@ - } - | BIN_NUM - { -- Item *tmp= new (YYTHD->mem_root) Item_bin_string($1.str, $1.length); -+ Item *tmp= new (thd->mem_root) Item_bin_string($1.str, $1.length); - if (tmp == NULL) - MYSQL_YYABORT; - /* -@@ -10989,7 +10950,6 @@ - param_marker: - PARAM_MARKER - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - Lex_input_stream *lip= YYLIP; - Item_param *item; -@@ -11022,38 +10982,38 @@ - | NUM_literal { $$ = $1; } - | NULL_SYM - { -- $$ = new (YYTHD->mem_root) Item_null(); -+ $$ = new (thd->mem_root) Item_null(); - if ($$ == NULL) - MYSQL_YYABORT; - YYLIP->next_state= MY_LEX_OPERATOR_OR_IDENT; - } - | FALSE_SYM - { -- $$= new (YYTHD->mem_root) Item_int((char*) "FALSE",0,1); -+ $$= new (thd->mem_root) Item_int((char*) "FALSE",0,1); - if ($$ == NULL) - MYSQL_YYABORT; - } - | TRUE_SYM - { -- $$= new (YYTHD->mem_root) Item_int((char*) "TRUE",1,1); -+ $$= new (thd->mem_root) Item_int((char*) "TRUE",1,1); - if ($$ == NULL) - MYSQL_YYABORT; - } - | HEX_NUM - { -- $$ = new (YYTHD->mem_root) Item_hex_string($1.str, $1.length); -+ $$ = new (thd->mem_root) Item_hex_string($1.str, $1.length); - if ($$ == NULL) - MYSQL_YYABORT; - } - | BIN_NUM - { -- $$= new (YYTHD->mem_root) Item_bin_string($1.str, $1.length); -+ $$= new (thd->mem_root) Item_bin_string($1.str, $1.length); - if ($$ == NULL) - MYSQL_YYABORT; - } - | UNDERSCORE_CHARSET HEX_NUM - { -- Item *tmp= new (YYTHD->mem_root) Item_hex_string($2.str, $2.length); -+ Item *tmp= new (thd->mem_root) Item_hex_string($2.str, $2.length); - if (tmp == NULL) - MYSQL_YYABORT; - /* -@@ -11064,7 +11024,7 @@ - String *str= tmp->val_str((String*) 0); - - Item_string *item_str; -- item_str= new (YYTHD->mem_root) -+ item_str= new (thd->mem_root) - Item_string(NULL, /* name will be set in select_item */ - str ? str->ptr() : "", - str ? str->length() : 0, -@@ -11082,7 +11042,7 @@ - } - | UNDERSCORE_CHARSET BIN_NUM - { -- Item *tmp= new (YYTHD->mem_root) Item_bin_string($2.str, $2.length); -+ Item *tmp= new (thd->mem_root) Item_bin_string($2.str, $2.length); - if (tmp == NULL) - MYSQL_YYABORT; - /* -@@ -11093,7 +11053,7 @@ - String *str= tmp->val_str((String*) 0); - - Item_string *item_str; -- item_str= new (YYTHD->mem_root) -+ item_str= new (thd->mem_root) - Item_string(NULL, /* name will be set in select_item */ - str ? str->ptr() : "", - str ? str->length() : 0, -@@ -11117,7 +11077,7 @@ - NUM - { - int error; -- $$= new (YYTHD->mem_root) -+ $$= new (thd->mem_root) - Item_int($1.str, - (longlong) my_strtoll10($1.str, NULL, &error), - $1.length); -@@ -11127,7 +11087,7 @@ - | LONG_NUM - { - int error; -- $$= new (YYTHD->mem_root) -+ $$= new (thd->mem_root) - Item_int($1.str, - (longlong) my_strtoll10($1.str, NULL, &error), - $1.length); -@@ -11136,23 +11096,23 @@ - } - | ULONGLONG_NUM - { -- $$= new (YYTHD->mem_root) Item_uint($1.str, $1.length); -+ $$= new (thd->mem_root) Item_uint($1.str, $1.length); - if ($$ == NULL) - MYSQL_YYABORT; - } - | DECIMAL_NUM - { -- $$= new (YYTHD->mem_root) Item_decimal($1.str, $1.length, -- YYTHD->charset()); -- if (($$ == NULL) || (YYTHD->is_error())) -+ $$= new (thd->mem_root) Item_decimal($1.str, $1.length, -+ thd->charset()); -+ if (($$ == NULL) || (thd->is_error())) - { - MYSQL_YYABORT; - } - } - | FLOAT_NUM - { -- $$= new (YYTHD->mem_root) Item_float($1.str, $1.length); -- if (($$ == NULL) || (YYTHD->is_error())) -+ $$= new (thd->mem_root) Item_float($1.str, $1.length); -+ if (($$ == NULL) || (thd->is_error())) - { - MYSQL_YYABORT; - } -@@ -11172,7 +11132,7 @@ - ident '.' '*' - { - SELECT_LEX *sel= Select; -- $$= new (YYTHD->mem_root) Item_field(Lex->current_context(), -+ $$= new (thd->mem_root) Item_field(Lex->current_context(), - NullS, $1.str, "*"); - if ($$ == NULL) - MYSQL_YYABORT; -@@ -11180,7 +11140,6 @@ - } - | ident '.' ident '.' '*' - { -- THD *thd= YYTHD; - SELECT_LEX *sel= Select; - const char* schema= thd->client_capabilities & CLIENT_NO_SCHEMA ? - NullS : $1.str; -@@ -11200,7 +11159,6 @@ - simple_ident: - ident - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - Lex_input_stream *lip= YYLIP; - sp_variable_t *spv; -@@ -11251,7 +11209,6 @@ - simple_ident_nospvar: - ident - { -- THD *thd= YYTHD; - SELECT_LEX *sel=Select; - if ((sel->parsing_place != IN_HAVING) || - (sel->get_in_sum_expr() > 0)) -@@ -11273,7 +11230,6 @@ - simple_ident_q: - ident '.' ident - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - - /* -@@ -11352,7 +11308,6 @@ - } - | '.' ident '.' ident - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - SELECT_LEX *sel= lex->current_select; - if (sel->no_table_names_allowed) -@@ -11377,7 +11332,6 @@ - } - | ident '.' ident '.' ident - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - SELECT_LEX *sel= lex->current_select; - const char* schema= (thd->client_capabilities & CLIENT_NO_SCHEMA ? -@@ -11445,7 +11399,7 @@ - } - | ident '.' ident - { -- $$= new Table_ident(YYTHD, $1,$3,0); -+ $$= new Table_ident(thd, $1,$3,0); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -11467,7 +11421,7 @@ - } - | ident '.' ident opt_wild - { -- $$= new Table_ident(YYTHD, $1,$3,0); -+ $$= new Table_ident(thd, $1,$3,0); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -11477,7 +11431,7 @@ - ident - { - LEX_STRING db={(char*) any_db,3}; -- $$= new Table_ident(YYTHD, db,$1,0); -+ $$= new Table_ident(thd, db,$1,0); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -11487,8 +11441,7 @@ - IDENT { $$= $1; } - | IDENT_QUOTED - { -- THD *thd= YYTHD; -- -+ - if (thd->charset_is_system_charset) - { - CHARSET_INFO *cs= system_charset_info; -@@ -11516,8 +11469,6 @@ - TEXT_STRING_sys: - TEXT_STRING - { -- THD *thd= YYTHD; -- - if (thd->charset_is_system_charset) - $$= $1; - else -@@ -11532,8 +11483,6 @@ - TEXT_STRING_literal: - TEXT_STRING - { -- THD *thd= YYTHD; -- - if (thd->charset_is_collation_connection) - $$= $1; - else -@@ -11548,8 +11497,6 @@ - TEXT_STRING_filesystem: - TEXT_STRING - { -- THD *thd= YYTHD; -- - if (thd->charset_is_character_set_filesystem) - $$= $1; - else -@@ -11566,7 +11513,6 @@ - IDENT_sys { $$=$1; } - | keyword - { -- THD *thd= YYTHD; - $$.str= thd->strmake($1.str, $1.length); - if ($$.str == NULL) - MYSQL_YYABORT; -@@ -11578,7 +11524,6 @@ - IDENT_sys { $$=$1; } - | keyword_sp - { -- THD *thd= YYTHD; - $$.str= thd->strmake($1.str, $1.length); - if ($$.str == NULL) - MYSQL_YYABORT; -@@ -11595,7 +11540,6 @@ - user: - ident_or_text - { -- THD *thd= YYTHD; - if (!($$=(LEX_USER*) thd->alloc(sizeof(st_lex_user)))) - MYSQL_YYABORT; - $$->user = $1; -@@ -11609,7 +11553,6 @@ - } - | ident_or_text '@' ident_or_text - { -- THD *thd= YYTHD; - if (!($$=(LEX_USER*) thd->alloc(sizeof(st_lex_user)))) - MYSQL_YYABORT; - $$->user = $1; $$->host=$3; -@@ -11628,7 +11571,7 @@ - } - | CURRENT_USER optional_braces - { -- if (!($$=(LEX_USER*) YYTHD->alloc(sizeof(st_lex_user)))) -+ if (!($$=(LEX_USER*) thd->alloc(sizeof(st_lex_user)))) - MYSQL_YYABORT; - /* - empty LEX_USER means current_user and -@@ -11991,7 +11934,6 @@ - - option_type_value: - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - Lex_input_stream *lip= YYLIP; - -@@ -12022,7 +11964,6 @@ - } - ext_option_value - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - Lex_input_stream *lip= YYLIP; - -@@ -12105,7 +12046,6 @@ - sys_option_value: - option_type internal_variable_name equal set_expr_or_default - { -- THD *thd= YYTHD; - LEX *lex= Lex; - LEX_STRING *name= &$2.base_name; - -@@ -12117,7 +12057,7 @@ - my_parse_error(ER(ER_SYNTAX_ERROR)); - MYSQL_YYABORT; - } -- if (set_trigger_new_row(YYTHD, name, $4)) -+ if (set_trigger_new_row(thd, name, $4)) - MYSQL_YYABORT; - } - else if ($2.var) -@@ -12147,7 +12087,6 @@ - } - | option_type TRANSACTION_SYM ISOLATION LEVEL_SYM isolation_types - { -- THD *thd= YYTHD; - LEX *lex=Lex; - lex->option_type= $1; - Item *item= new (thd->mem_root) Item_int((int32) $5); -@@ -12167,7 +12106,7 @@ - '@' ident_or_text equal expr - { - Item_func_set_user_var *item; -- item= new (YYTHD->mem_root) Item_func_set_user_var($2, $4); -+ item= new (thd->mem_root) Item_func_set_user_var($2, $4); - if (item == NULL) - MYSQL_YYABORT; - set_var_user *var= new set_var_user(item); -@@ -12177,7 +12116,6 @@ - } - | '@' '@' opt_var_ident_type internal_variable_name equal set_expr_or_default - { -- THD *thd= YYTHD; - struct sys_var_with_base tmp= $4; - /* Lookup if necessary: must be a system variable. */ - if (tmp.var == NULL) -@@ -12190,7 +12128,6 @@ - } - | charset old_or_new_charset_name_or_default - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - CHARSET_INFO *cs2; - cs2= $2 ? $2: global_system_variables.character_set_client; -@@ -12238,7 +12175,6 @@ - } - | PASSWORD equal text_or_password - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - LEX_USER *user; - sp_pcontext *spc= lex->spcont; -@@ -12278,7 +12214,6 @@ - internal_variable_name: - ident - { -- THD *thd= YYTHD; - sp_pcontext *spc= thd->lex->spcont; - sp_variable_t *spv; - -@@ -12337,7 +12272,7 @@ - } - else - { -- sys_var *tmp=find_sys_var(YYTHD, $3.str, $3.length); -+ sys_var *tmp=find_sys_var(thd, $3.str, $3.length); - if (!tmp) - MYSQL_YYABORT; - if (!tmp->is_struct()) -@@ -12348,7 +12283,7 @@ - } - | DEFAULT '.' ident - { -- sys_var *tmp=find_sys_var(YYTHD, $3.str, $3.length); -+ sys_var *tmp=find_sys_var(thd, $3.str, $3.length); - if (!tmp) - MYSQL_YYABORT; - if (!tmp->is_struct()) -@@ -12370,16 +12305,16 @@ - TEXT_STRING { $$=$1.str;} - | PASSWORD '(' TEXT_STRING ')' - { -- $$= $3.length ? YYTHD->variables.old_passwords ? -- Item_func_old_password::alloc(YYTHD, $3.str, $3.length) : -- Item_func_password::alloc(YYTHD, $3.str, $3.length) : -+ $$= $3.length ? thd->variables.old_passwords ? -+ Item_func_old_password::alloc(thd, $3.str, $3.length) : -+ Item_func_password::alloc(thd, $3.str, $3.length) : - $3.str; - if ($$ == NULL) - MYSQL_YYABORT; - } - | OLD_PASSWORD '(' TEXT_STRING ')' - { -- $$= $3.length ? Item_func_old_password::alloc(YYTHD, $3.str, -+ $$= $3.length ? Item_func_old_password::alloc(thd, $3.str, - $3.length) : - $3.str; - if ($$ == NULL) -@@ -12393,19 +12328,19 @@ - | DEFAULT { $$=0; } - | ON - { -- $$=new (YYTHD->mem_root) Item_string("ON", 2, system_charset_info); -+ $$=new (thd->mem_root) Item_string("ON", 2, system_charset_info); - if ($$ == NULL) - MYSQL_YYABORT; - } - | ALL - { -- $$=new (YYTHD->mem_root) Item_string("ALL", 3, system_charset_info); -+ $$=new (thd->mem_root) Item_string("ALL", 3, system_charset_info); - if ($$ == NULL) - MYSQL_YYABORT; - } - | BINARY - { -- $$=new (YYTHD->mem_root) Item_string("binary", 6, system_charset_info); -+ $$=new (thd->mem_root) Item_string("binary", 6, system_charset_info); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -12443,7 +12378,7 @@ - table_ident opt_table_alias lock_option - { - thr_lock_type lock_type= (thr_lock_type) $3; -- if (!Select->add_table_to_list(YYTHD, $1, $2, 0, lock_type)) -+ if (!Select->add_table_to_list(thd, $1, $2, 0, lock_type)) - MYSQL_YYABORT; - /* If table is to be write locked, protect from a impending GRL. */ - if (lock_type >= TL_WRITE_ALLOW_WRITE) -@@ -12514,7 +12449,7 @@ - lex->expr_allows_subselect= FALSE; - lex->sql_command = SQLCOM_HA_READ; - lex->ha_rkey_mode= HA_READ_KEY_EXACT; /* Avoid purify warnings */ -- Item *one= new (YYTHD->mem_root) Item_int((int32) 1); -+ Item *one= new (thd->mem_root) Item_int((int32) 1); - if (one == NULL) - MYSQL_YYABORT; - lex->current_select->select_limit= one; -@@ -12836,10 +12771,10 @@ - $$=$1; $1->password=$4; - if ($4.length) - { -- if (YYTHD->variables.old_passwords) -+ if (thd->variables.old_passwords) - { - char *buff= -- (char *) YYTHD->alloc(SCRAMBLED_PASSWORD_CHAR_LENGTH_323+1); -+ (char *) thd->alloc(SCRAMBLED_PASSWORD_CHAR_LENGTH_323+1); - if (buff == NULL) - MYSQL_YYABORT; - my_make_scrambled_password_323(buff, $4.str, $4.length); -@@ -12849,7 +12784,7 @@ - else - { - char *buff= -- (char *) YYTHD->alloc(SCRAMBLED_PASSWORD_CHAR_LENGTH+1); -+ (char *) thd->alloc(SCRAMBLED_PASSWORD_CHAR_LENGTH+1); - if (buff == NULL) - MYSQL_YYABORT; - my_make_scrambled_password(buff, $4.str, $4.length); -@@ -12881,7 +12816,7 @@ - column_list_id: - ident - { -- String *new_str = new (YYTHD->mem_root) String((const char*) $1.str,$1.length,system_charset_info); -+ String *new_str = new (thd->mem_root) String((const char*) $1.str,$1.length,system_charset_info); - if (new_str == NULL) - MYSQL_YYABORT; - List_iterator iter(Lex->columns); -@@ -12981,14 +12916,14 @@ - - opt_chain: - /* empty */ -- { $$= (YYTHD->variables.completion_type == 1); } -+ { $$= (thd->variables.completion_type == 1); } - | AND_SYM NO_SYM CHAIN_SYM { $$=0; } - | AND_SYM CHAIN_SYM { $$=1; } - ; - - opt_release: - /* empty */ -- { $$= (YYTHD->variables.completion_type == 2); } -+ { $$= (thd->variables.completion_type == 2); } - | RELEASE_SYM { $$=1; } - | NO_SYM RELEASE_SYM { $$=0; } - ; -@@ -13102,7 +13037,6 @@ - - union_order_or_limit: - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - DBUG_ASSERT(lex->current_select->linkage != GLOBAL_OPTIONS_TYPE); - SELECT_LEX *sel= lex->current_select; -@@ -13118,7 +13052,6 @@ - } - order_or_limit - { -- THD *thd= YYTHD; - thd->lex->current_select->no_table_names_allowed= 0; - thd->where= ""; - } -@@ -13255,14 +13188,14 @@ - from older master servers (i.e. to create non-suid trigger in this - case). - */ -- YYTHD->lex->definer= 0; -+ thd->lex->definer= 0; - } - ; - - definer: - DEFINER_SYM EQ user - { -- YYTHD->lex->definer= get_current_user(YYTHD, $3); -+ thd->lex->definer= get_current_user(thd, $3); - } - ; - -@@ -13307,7 +13240,6 @@ - view_tail: - view_suid VIEW_SYM table_ident - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - lex->sql_command= SQLCOM_CREATE_VIEW; - /* first table in list is target VIEW name */ -@@ -13347,7 +13279,6 @@ - } - view_select_aux view_check_option - { -- THD *thd= YYTHD; - LEX *lex= Lex; - uint len= YYLIP->get_cpp_ptr() - lex->create_view_select.str; - void *create_view_select= thd->memdup(lex->create_view_select.str, len); -@@ -13403,7 +13334,6 @@ - EACH_SYM - ROW_SYM - { /* $15 */ -- THD *thd= YYTHD; - LEX *lex= thd->lex; - Lex_input_stream *lip= YYLIP; - sp_head *sp; -@@ -13437,8 +13367,8 @@ - sp_head *sp= lex->sphead; - - lex->sql_command= SQLCOM_CREATE_TRIGGER; -- sp->set_stmt_end(YYTHD); -- sp->restore_thd_mem_root(YYTHD); -+ sp->set_stmt_end(thd); -+ sp->restore_thd_mem_root(thd); - - if (sp->is_not_allowed_in_function("trigger")) - MYSQL_YYABORT; -@@ -13448,7 +13378,7 @@ - sp_proc_stmt alternatives are not saving/restoring LEX, so - lex->query_tables can be wiped out. - */ -- if (!lex->select_lex.add_table_to_list(YYTHD, $9, -+ if (!lex->select_lex.add_table_to_list(thd, $9, - (LEX_STRING*) 0, - TL_OPTION_UPDATING, - TL_IGNORE)) -@@ -13466,7 +13396,6 @@ - AGGREGATE_SYM remember_name FUNCTION_SYM ident - RETURNS_SYM udf_type SONAME_SYM TEXT_STRING_sys - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - if (is_native_function(thd, & $4)) - { -@@ -13484,7 +13413,6 @@ - | remember_name FUNCTION_SYM ident - RETURNS_SYM udf_type SONAME_SYM TEXT_STRING_sys - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - if (is_native_function(thd, & $3)) - { -@@ -13507,7 +13435,6 @@ - sp_name /* $3 */ - '(' /* $4 */ - { /* $5 */ -- THD *thd= YYTHD; - LEX *lex= thd->lex; - Lex_input_stream *lip= YYLIP; - sp_head *sp; -@@ -13565,7 +13492,7 @@ - MYSQL_YYABORT; - } - -- if (sp->fill_field_definition(YYTHD, lex, -+ if (sp->fill_field_definition(thd, lex, - (enum enum_field_types) $11, - &sp->m_return_field_def)) - MYSQL_YYABORT; -@@ -13574,7 +13501,6 @@ - } - sp_c_chistics /* $13 */ - { /* $14 */ -- THD *thd= YYTHD; - LEX *lex= thd->lex; - Lex_input_stream *lip= YYLIP; - -@@ -13583,7 +13509,6 @@ - } - sp_proc_stmt /* $15 */ - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - sp_head *sp= lex->sphead; - -@@ -13654,10 +13579,10 @@ - sp= new sp_head(); - if (sp == NULL) - MYSQL_YYABORT; -- sp->reset_thd_mem_root(YYTHD); -+ sp->reset_thd_mem_root(thd); - sp->init(lex); - sp->m_type= TYPE_ENUM_PROCEDURE; -- sp->init_sp_name(YYTHD, $3); -+ sp->init_sp_name(thd, $3); - - lex->sphead= sp; - } -@@ -13672,7 +13597,6 @@ - sp_pdparam_list - ')' - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - - lex->sphead->m_param_end= YYLIP->get_cpp_tok_start(); -@@ -13680,7 +13604,6 @@ - } - sp_c_chistics - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - - lex->sphead->m_chistics= &lex->sp_chistics; -@@ -13691,9 +13614,9 @@ - LEX *lex= Lex; - sp_head *sp= lex->sphead; - -- sp->set_stmt_end(YYTHD); -+ sp->set_stmt_end(thd); - lex->sql_command= SQLCOM_CREATE_PROCEDURE; -- sp->restore_thd_mem_root(YYTHD); -+ sp->restore_thd_mem_root(thd); - } - ; - -@@ -13730,21 +13653,21 @@ - text_string - { - MYSQL_YYABORT_UNLESS($1->length() <= MAXGTRIDSIZE); -- if (!(Lex->xid=(XID *)YYTHD->alloc(sizeof(XID)))) -+ if (!(Lex->xid=(XID *)thd->alloc(sizeof(XID)))) - MYSQL_YYABORT; - Lex->xid->set(1L, $1->ptr(), $1->length(), 0, 0); - } - | text_string ',' text_string - { - MYSQL_YYABORT_UNLESS($1->length() <= MAXGTRIDSIZE && $3->length() <= MAXBQUALSIZE); -- if (!(Lex->xid=(XID *)YYTHD->alloc(sizeof(XID)))) -+ if (!(Lex->xid=(XID *)thd->alloc(sizeof(XID)))) - MYSQL_YYABORT; - Lex->xid->set(1L, $1->ptr(), $1->length(), $3->ptr(), $3->length()); - } - | text_string ',' text_string ',' ulong_num - { - MYSQL_YYABORT_UNLESS($1->length() <= MAXGTRIDSIZE && $3->length() <= MAXBQUALSIZE); -- if (!(Lex->xid=(XID *)YYTHD->alloc(sizeof(XID)))) -+ if (!(Lex->xid=(XID *)thd->alloc(sizeof(XID)))) - MYSQL_YYABORT; - Lex->xid->set($5, $1->ptr(), $1->length(), $3->ptr(), $3->length()); - } diff --git a/package/oracle-mysql/0006-no-force-static-build.patch b/package/oracle-mysql/0006-no-force-static-build.patch deleted file mode 100644 index 8172a9848e..0000000000 --- a/package/oracle-mysql/0006-no-force-static-build.patch +++ /dev/null @@ -1,18 +0,0 @@ -configure: do not force a static link for non-installed programs - -Otherwise, it tries to link against a static libz, which may not exist -in a shared-only system. - -Signed-off-by: "Yann E. MORIN" - -diff -durN mysql-5.1.73.orig/configure.in mysql-5.1.73/configure.in ---- mysql-5.1.73.orig/configure.in 2014-12-22 00:04:46.550508208 +0100 -+++ mysql-5.1.73/configure.in 2014-12-22 00:05:56.415307480 +0100 -@@ -562,7 +562,6 @@ - AC_MSG_ERROR([MySQL requires an ANSI C compiler (and a C++ compiler). Try gcc. See the Installation chapter in the Reference Manual.]) - fi - --NOINST_LDFLAGS="-static" - - static_nss="" - STATIC_NSS_FLAGS="" diff --git a/package/oracle-mysql/0007-dont-install-in-mysql-directory.patch b/package/oracle-mysql/0007-dont-install-in-mysql-directory.patch deleted file mode 100644 index 971b9ceeb5..0000000000 --- a/package/oracle-mysql/0007-dont-install-in-mysql-directory.patch +++ /dev/null @@ -1,182 +0,0 @@ -Don't install in mysql directory - -Installing libraries in a subdirectory of /usr/lib leads to no end of -trouble. It requires either setting a RUN_PATH in the ELF files linked -with it or adding the path to ld.so.conf and calling ldconfig on the -target. - -So to simplify things, put everything in /usr/lib instead of -/usr/lib/mysql - -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) - -diff -Nrup mysql-5.1.73.orig/dbug/Makefile.am mysql-5.1.73/dbug/Makefile.am ---- mysql-5.1.73.orig/dbug/Makefile.am 2013-11-04 19:52:27.000000000 +0100 -+++ mysql-5.1.73/dbug/Makefile.am 2015-12-14 00:34:58.567937603 +0100 -@@ -17,7 +17,7 @@ - - INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include - LDADD = libdbug.a ../mysys/libmysys.a ../strings/libmystrings.a --pkglib_LIBRARIES = libdbug.a -+lib_LIBRARIES = libdbug.a - noinst_HEADERS = dbug_long.h - libdbug_a_SOURCES = dbug.c sanity.c - EXTRA_DIST = CMakeLists.txt example1.c example2.c example3.c \ -diff -Nrup mysql-5.1.73.orig/libmysql/Makefile.shared mysql-5.1.73/libmysql/Makefile.shared ---- mysql-5.1.73.orig/libmysql/Makefile.shared 2013-11-04 19:52:27.000000000 +0100 -+++ mysql-5.1.73/libmysql/Makefile.shared 2015-12-14 00:34:58.567937603 +0100 -@@ -25,7 +25,7 @@ MYSQLBASEdir= $(prefix) - ## We'll use CLIENT_EXTRA_LDFLAGS for threaded and non-threaded - ## until someone complains that they need separate options. - LDADD = @CLIENT_EXTRA_LDFLAGS@ $(target) --pkglib_LTLIBRARIES = $(target) -+lib_LTLIBRARIES = $(target) - - noinst_PROGRAMS = conf_to_src - -diff -Nrup mysql-5.1.73.orig/libmysqld/Makefile.am mysql-5.1.73/libmysqld/Makefile.am ---- mysql-5.1.73.orig/libmysqld/Makefile.am 2013-11-04 19:52:27.000000000 +0100 -+++ mysql-5.1.73/libmysqld/Makefile.am 2015-12-14 00:34:58.567937603 +0100 -@@ -38,7 +38,7 @@ INCLUDES= -I$(top_builddir)/include -I$ - @condition_dependent_plugin_includes@ - - noinst_LIBRARIES = libmysqld_int.a --pkglib_LIBRARIES = libmysqld.a -+lib_LIBRARIES = libmysqld.a - SUBDIRS = . examples - libmysqld_sources= libmysqld.c lib_sql.cc emb_qcache.cc - libmysqlsources = errmsg.c get_password.c libmysql.c client.c pack.c \ -diff -Nrup mysql-5.1.73.orig/mysys/Makefile.am mysql-5.1.73/mysys/Makefile.am ---- mysql-5.1.73.orig/mysys/Makefile.am 2013-11-04 19:52:27.000000000 +0100 -+++ mysql-5.1.73/mysys/Makefile.am 2015-12-14 00:34:58.567937603 +0100 -@@ -18,7 +18,7 @@ MYSQLSHAREdir = $(pkgdatadir) - MYSQLBASEdir= $(prefix) - INCLUDES = @ZLIB_INCLUDES@ -I$(top_builddir)/include \ - -I$(top_srcdir)/include -I$(srcdir) --pkglib_LIBRARIES = libmysys.a -+lib_LIBRARIES = libmysys.a - LDADD = libmysys.a $(top_builddir)/strings/libmystrings.a $(top_builddir)/dbug/libdbug.a - noinst_HEADERS = mysys_priv.h my_static.h my_handler_errors.h - libmysys_a_SOURCES = my_init.c my_getwd.c mf_getdate.c my_mmap.c \ -diff -Nrup mysql-5.1.73.orig/storage/csv/Makefile.am mysql-5.1.73/storage/csv/Makefile.am ---- mysql-5.1.73.orig/storage/csv/Makefile.am 2013-11-04 19:52:27.000000000 +0100 -+++ mysql-5.1.73/storage/csv/Makefile.am 2015-12-14 00:34:58.563937596 +0100 -@@ -30,7 +30,7 @@ DEFS = @DEFS@ - noinst_HEADERS = ha_tina.h transparent_file.h - - EXTRA_LTLIBRARIES = ha_csv.la --pkglib_LTLIBRARIES = @plugin_csv_shared_target@ -+lib_LTLIBRARIES = @plugin_csv_shared_target@ - ha_csv_la_LDFLAGS = -module -rpath $(MYSQLLIBdir) - ha_csv_la_CXXFLAGS = $(AM_CXXFLAGS) -DMYSQL_PLUGIN - ha_csv_la_SOURCES = transparent_file.cc ha_tina.cc -diff -Nrup mysql-5.1.73.orig/storage/heap/Makefile.am mysql-5.1.73/storage/heap/Makefile.am ---- mysql-5.1.73.orig/storage/heap/Makefile.am 2013-11-04 19:52:27.000000000 +0100 -+++ mysql-5.1.73/storage/heap/Makefile.am 2015-12-14 00:34:58.563937596 +0100 -@@ -26,7 +26,7 @@ WRAPLIBS= - LDADD = - - DEFS = @DEFS@ --pkglib_LIBRARIES = libheap.a -+lib_LIBRARIES = libheap.a - noinst_PROGRAMS = hp_test1 hp_test2 - noinst_LIBRARIES = libheap.a - hp_test1_LDFLAGS = @NOINST_LDFLAGS@ -diff -Nrup mysql-5.1.73.orig/storage/myisam/Makefile.am mysql-5.1.73/storage/myisam/Makefile.am ---- mysql-5.1.73.orig/storage/myisam/Makefile.am 2013-11-04 19:52:27.000000000 +0100 -+++ mysql-5.1.73/storage/myisam/Makefile.am 2015-12-14 00:34:58.563937596 +0100 -@@ -30,7 +30,7 @@ DEFS = @DEFS@ - EXTRA_DIST = mi_test_all.sh mi_test_all.res ft_stem.c CMakeLists.txt plug.in - pkgdata_DATA = mi_test_all mi_test_all.res - --pkglib_LIBRARIES = libmyisam.a -+lib_LIBRARIES = libmyisam.a - bin_PROGRAMS = myisamchk myisamlog myisampack myisam_ftdump - myisamchk_DEPENDENCIES= $(LIBRARIES) - myisamchk_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmyisam.a \ -diff -Nrup mysql-5.1.73.orig/storage/myisammrg/Makefile.am mysql-5.1.73/storage/myisammrg/Makefile.am ---- mysql-5.1.73.orig/storage/myisammrg/Makefile.am 2013-11-04 19:52:27.000000000 +0100 -+++ mysql-5.1.73/storage/myisammrg/Makefile.am 2015-12-14 00:34:58.563937596 +0100 -@@ -26,7 +26,7 @@ WRAPLIBS= - LDADD = - - DEFS = @DEFS@ --pkglib_LIBRARIES = libmyisammrg.a -+lib_LIBRARIES = libmyisammrg.a - noinst_HEADERS = myrg_def.h ha_myisammrg.h - noinst_LIBRARIES = libmyisammrg.a - libmyisammrg_a_SOURCES = myrg_open.c myrg_extra.c myrg_info.c myrg_locking.c \ -diff -Nrup mysql-5.1.73.orig/strings/Makefile.am mysql-5.1.73/strings/Makefile.am ---- mysql-5.1.73.orig/strings/Makefile.am 2013-11-04 19:52:27.000000000 +0100 -+++ mysql-5.1.73/strings/Makefile.am 2015-12-14 00:34:58.567937603 +0100 -@@ -16,7 +16,7 @@ - # This file is public domain and comes with NO WARRANTY of any kind - - INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include --pkglib_LIBRARIES = libmystrings.a -+lib_LIBRARIES = libmystrings.a - - # Exact one of ASSEMBLER_X - if ASSEMBLER_x86 -@@ -69,15 +69,15 @@ conf_to_src_LDFLAGS= @NOINST_LDFLAGS@ - - FLAGS=$(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) @NOINST_LDFLAGS@ - --str_test: str_test.c $(pkglib_LIBRARIES) -- $(LINK) $(FLAGS) -DMAIN $(INCLUDES) $(srcdir)/str_test.c $(LDADD) $(pkglib_LIBRARIES) -+str_test: str_test.c $(lib_LIBRARIES) -+ $(LINK) $(FLAGS) -DMAIN $(INCLUDES) $(srcdir)/str_test.c $(LDADD) $(lib_LIBRARIES) - - uctypedump: uctypedump.c - $(LINK) $(INCLUDES) $(srcdir)/uctypedump.c - --test_decimal$(EXEEXT): decimal.c $(pkglib_LIBRARIES) -+test_decimal$(EXEEXT): decimal.c $(lib_LIBRARIES) - $(CP) $(srcdir)/decimal.c ./test_decimal.c -- $(LINK) $(FLAGS) -DMAIN ./test_decimal.c $(LDADD) $(pkglib_LIBRARIES) -+ $(LINK) $(FLAGS) -DMAIN ./test_decimal.c $(LDADD) $(lib_LIBRARIES) - $(RM) -f ./test_decimal.c - - # Don't update the files from bitkeeper -diff -Nrup mysql-5.1.73.orig/tests/Makefile.am mysql-5.1.73/tests/Makefile.am ---- mysql-5.1.73.orig/tests/Makefile.am 2013-11-04 19:52:27.000000000 +0100 -+++ mysql-5.1.73/tests/Makefile.am 2015-12-14 00:34:58.567937603 +0100 -@@ -51,11 +51,11 @@ mysql_client_test.o: mysql_client_fw.c - - insert_test_SOURCES= insert_test.c - select_test_SOURCES= select_test.c --insert_test_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES) --select_test_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES) -+insert_test_DEPENDENCIES= $(LIBRARIES) $(lib_LTLIBRARIES) -+select_test_DEPENDENCIES= $(LIBRARIES) $(lib_LTLIBRARIES) - - bug25714_SOURCES= bug25714.c --bug25714_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES) -+bug25714_DEPENDENCIES= $(LIBRARIES) $(lib_LTLIBRARIES) - - # Fix for mit-threads - DEFS = -DMYSQL_CLIENT_NO_THREADS -diff -Nrup mysql-5.1.73.orig/vio/Makefile.am mysql-5.1.73/vio/Makefile.am ---- mysql-5.1.73.orig/vio/Makefile.am 2013-11-04 19:52:27.000000000 +0100 -+++ mysql-5.1.73/vio/Makefile.am 2015-12-14 00:34:58.567937603 +0100 -@@ -16,7 +16,7 @@ - INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ - $(openssl_includes) - LDADD = @CLIENT_EXTRA_LDFLAGS@ $(openssl_libs) $(yassl_libs) --pkglib_LIBRARIES = libvio.a -+lib_LIBRARIES = libvio.a - - noinst_HEADERS = vio_priv.h - -diff -Nrup mysql-5.1.73.orig/zlib/Makefile.am mysql-5.1.73/zlib/Makefile.am ---- mysql-5.1.73.orig/zlib/Makefile.am 2013-11-04 19:52:27.000000000 +0100 -+++ mysql-5.1.73/zlib/Makefile.am 2015-12-14 00:34:58.567937603 +0100 -@@ -19,7 +19,7 @@ INCLUDES= -I$(top_builddir)/include -I$ - - LIBS= $(NON_THREADED_LIBS) - --pkglib_LTLIBRARIES = libz.la -+lib_LTLIBRARIES = libz.la - noinst_LTLIBRARIES = libzlt.la - - libz_la_LDFLAGS = -static diff --git a/package/oracle-mysql/0008-fix-type-conversion.patch b/package/oracle-mysql/0008-fix-type-conversion.patch deleted file mode 100644 index 65babf4f20..0000000000 --- a/package/oracle-mysql/0008-fix-type-conversion.patch +++ /dev/null @@ -1,22 +0,0 @@ -Fix type conversion - -Fixes the following build error with gcc 6.x: - -protocol.cc:27:40: error: narrowing conversion of ''\37777777776'' from 'char' to 'uchar {aka unsigned char}' inside { } [-Wnarrowing] - static uchar eof_buff[1]= { (char) 254 }; /* Marker for end of fields */ - -Signed-off-by: Thomas Petazzoni - -Index: b/server-tools/instance-manager/protocol.cc -=================================================================== ---- a/server-tools/instance-manager/protocol.cc -+++ b/server-tools/instance-manager/protocol.cc -@@ -24,7 +24,7 @@ - #include - - --static uchar eof_buff[1]= { (char) 254 }; /* Marker for end of fields */ -+static uchar eof_buff[1]= { (uchar) 254 }; /* Marker for end of fields */ - static const char ERROR_PACKET_CODE= (char) 255; - - diff --git a/package/oracle-mysql/0009-gcc7.patch b/package/oracle-mysql/0009-gcc7.patch deleted file mode 100644 index 321112d635..0000000000 --- a/package/oracle-mysql/0009-gcc7.patch +++ /dev/null @@ -1,45 +0,0 @@ -Fix gcc7 compile - -mysql.cc: In function 'void build_completion_hash(bool, bool)': -mysql.cc:2687:37: error: invalid conversion from 'char' to 'char*' [-fpermissive] - field_names[i][num_fields*2]= '\0'; - ^~~~ -Patch was partly backported from upstream commit: -https://github.com/mysql/mysql-server/commit/ae21683d980d5fe9e39bd0193827ea3604256eb9 - -Signed-off-by: Bernd Kuhls -[Thomas: add more gcc 7.x fixes in instance_map.cc.] -Signed-off-by: Thomas Petazzoni - -Index: b/client/mysql.cc -=================================================================== ---- a/client/mysql.cc -+++ b/client/mysql.cc -@@ -2684,7 +2684,7 @@ - mysql_free_result(fields); - break; - } -- field_names[i][num_fields*2]= '\0'; -+ field_names[i][num_fields*2]= NULL; - j=0; - while ((sql_field=mysql_fetch_field(fields))) - { -Index: b/server-tools/instance-manager/instance_map.cc -=================================================================== ---- a/server-tools/instance-manager/instance_map.cc -+++ b/server-tools/instance-manager/instance_map.cc -@@ -526,12 +526,12 @@ - Options::Main::config_file); - - argv_options[1]= defaults_file_arg; -- argv_options[2]= '\0'; -+ argv_options[2]= NULL; - - argc= 2; - } - else -- argv_options[1]= '\0'; -+ argv_options[1]= NULL; - - /* - If the routine failed, we'll simply fallback to defaults in diff --git a/package/oracle-mysql/0010-fix-build-without-zlib.patch b/package/oracle-mysql/0010-fix-build-without-zlib.patch deleted file mode 100644 index b6e64e6bdd..0000000000 --- a/package/oracle-mysql/0010-fix-build-without-zlib.patch +++ /dev/null @@ -1,52 +0,0 @@ -Fix build without zlib - -Don't include unconditionally zlib.h, and compile out code that -requires zlib support. - -Signed-off-by: Fabrice Fontaine - -diff -durN mysql-5.1.73.orig/mysys/checksum.c mysql-5.1.73/mysys/checksum.c ---- mysql-5.1.73.orig/mysys/checksum.c 2020-07-14 17:34:38.212304432 +0200 -+++ mysql-5.1.73/mysys/checksum.c 2020-07-14 18:06:45.076342493 +0200 -@@ -16,7 +16,9 @@ - - #include - #include -+#ifdef HAVE_COMPRESS - #include -+#endif - - /* - Calculate a long checksum for a memoryblock. -diff -durN mysql-5.1.73.orig/sql/item_strfunc.cc mysql-5.1.73/sql/item_strfunc.cc ---- mysql-5.1.73.orig/sql/item_strfunc.cc 2020-07-14 17:34:38.160304431 +0200 -+++ mysql-5.1.73/sql/item_strfunc.cc 2020-07-14 18:04:36.956339962 +0200 -@@ -35,7 +35,9 @@ - #include "my_md5.h" - #include "sha1.h" - #include "my_aes.h" -+#ifdef HAVE_COMPRESS - #include -+#endif - C_MODE_START - #include "../mysys/my_static.h" // For soundex_map - C_MODE_END -diff -durN mysql-5.1.73.orig/sql/sql_table.cc mysql-5.1.73/sql/sql_table.cc ---- mysql-5.1.73.orig/sql/sql_table.cc 2020-07-14 17:34:38.156304431 +0200 -+++ mysql-5.1.73/sql/sql_table.cc 2020-07-14 18:14:48.628352044 +0200 -@@ -1681,6 +1681,7 @@ - goto end; - } - } -+#ifdef HAVE_COMPRESS - if (flags & WFRM_PACK_FRM) - { - /* -@@ -1702,6 +1703,7 @@ - } - error= my_delete(shadow_frm_name, MYF(MY_WME)); - } -+#endif - if (flags & WFRM_INSTALL_SHADOW) - { - #ifdef WITH_PARTITION_STORAGE_ENGINE diff --git a/package/oracle-mysql/0011-config-ac-macros-alloca.m4-Remove-obsolete-Cray-supp.patch b/package/oracle-mysql/0011-config-ac-macros-alloca.m4-Remove-obsolete-Cray-supp.patch deleted file mode 100644 index 492e01bffe..0000000000 --- a/package/oracle-mysql/0011-config-ac-macros-alloca.m4-Remove-obsolete-Cray-supp.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 0d8ab9b020870c62c216fca77e7f8bd3eeb710c3 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 9 Oct 2021 19:23:46 +0200 -Subject: [PATCH] config/ac-macros/alloca.m4: Remove obsolete Cray support - -Remove obsolete Cray support to avoid the following build failure since -autoconf >= 2.70 and -http://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=commit;h=15edf7fd8094fd14a89d9891dd72a9624762597a: - -autoheader: warning: missing template: CRAY_STACKSEG_END -autoheader: warning: Use AC_DEFINE([CRAY_STACKSEG_END], [], [Description]) -autoreconf: error: /home/buildroot/autobuild/instance-2/output-1/host/bin/autoheader failed with exit status: 1 -package/pkg-generic.mk:273: recipe for target '/home/buildroot/autobuild/instance-2/output-1/build/oracle-mysql-5.1.73/.stamp_configured' failed - -Fixes: - - http://autobuild.buildroot.org/results/e5329bcf166d46b2eb17f2bc727c0307bef5ed02 - -Upstream: switched to CMake a very long time ago, so not sent upstream -Signed-off-by: Fabrice Fontaine ---- - config/ac-macros/alloca.m4 | 14 -------------- - 1 file changed, 14 deletions(-) - -diff --git a/config/ac-macros/alloca.m4 b/config/ac-macros/alloca.m4 -index 8c730dd671f..eecb8249573 100644 ---- a/config/ac-macros/alloca.m4 -+++ b/config/ac-macros/alloca.m4 -@@ -46,20 +46,6 @@ then - ALLOCA=alloca.o - AC_DEFINE(C_ALLOCA, 1) - -- AC_CACHE_CHECK(whether alloca needs Cray hooks, ac_cv_os_cray, -- [AC_EGREP_CPP(webecray, -- [#if defined(CRAY) && ! defined(CRAY2) -- webecray -- #else -- wenotbecray -- #endif -- ], ac_cv_os_cray=yes, ac_cv_os_cray=no)]) -- if test "$ac_cv_os_cray" = "yes"; then -- for ac_func in _getb67 GETB67 getb67; do -- AC_CHECK_FUNC($ac_func, [AC_DEFINE_UNQUOTED(CRAY_STACKSEG_END, $ac_func) -- break]) -- done -- fi - fi - AC_SUBST(ALLOCA)dnl - else --- -2.33.0 - diff --git a/package/oracle-mysql/S97mysqld b/package/oracle-mysql/S97mysqld deleted file mode 100644 index 110ca2cd12..0000000000 --- a/package/oracle-mysql/S97mysqld +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh - -MYSQL_DIR="/var/mysql" -MYSQL_USER="mysql" - -[ -r /etc/default/mysql ] && . /etc/default/mysql - -case "$1" in - start) - if [ ! -d $MYSQL_DIR/mysql ] ; then - echo "Creating MySQL system tables..." - mysql_install_db --user=$MYSQL_USER --ldata=$MYSQL_DIR - fi - - # mysqld runs as user mysql, but /run is only writable by root - # so create a subdirectory for mysql. - install -d -o mysql -g root -m 0755 /run/mysql - - # We don't use start-stop-daemon because mysqld has - # its own wrapper script. - printf "Starting mysql..." - /usr/bin/mysqld_safe --pid-file=/run/mysql/mysqld.pid & - echo "done." - ;; - stop) - printf "Stopping mysql..." - if test -f /run/mysql/mysqld.pid ; then - kill `cat /run/mysql/mysqld.pid` - fi - echo "done." - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "Usage: /etc/init.d/mysqld {start|stop|restart}" - ;; -esac diff --git a/package/oracle-mysql/mysqld.service b/package/oracle-mysql/mysqld.service deleted file mode 100644 index c9e5e42f71..0000000000 --- a/package/oracle-mysql/mysqld.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=MySQL database server - -[Service] -ExecStartPre=/bin/sh -c 'test -d /var/mysql/mysql || mysql_install_db --user=mysql --ldata=/var/mysql' -ExecStart=/usr/bin/mysqld_safe -Restart=always -User=mysql -RuntimeDirectory=mysql -RuntimeDirectoryMode=0755 - -[Install] -WantedBy=multi-user.target diff --git a/package/oracle-mysql/oracle-mysql.hash b/package/oracle-mysql/oracle-mysql.hash deleted file mode 100644 index c4ce39437e..0000000000 --- a/package/oracle-mysql/oracle-mysql.hash +++ /dev/null @@ -1,6 +0,0 @@ -# From https://downloads.mariadb.com/archives/mysql-5.1/mysql-5.1.73.tar.gz.md5 -md5 887f869bcc757957067b9198f707f32f mysql-5.1.73.tar.gz -# Locally computed -sha256 05ebe21305408b24407d14b77607a3e5ffa3c300e03f1359d3066f301989dcb5 mysql-5.1.73.tar.gz -sha256 cbf0dbf56528a629f4358a1339f981202f1a9a0d9542c092b03f486064ced2db README -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/oracle-mysql/oracle-mysql.mk b/package/oracle-mysql/oracle-mysql.mk deleted file mode 100644 index 1086e4125f..0000000000 --- a/package/oracle-mysql/oracle-mysql.mk +++ /dev/null @@ -1,140 +0,0 @@ -################################################################################ -# -# oracle-mysql -# -################################################################################ - -ORACLE_MYSQL_VERSION_MAJOR = 5.1 -ORACLE_MYSQL_VERSION = $(ORACLE_MYSQL_VERSION_MAJOR).73 -ORACLE_MYSQL_SOURCE = mysql-$(ORACLE_MYSQL_VERSION).tar.gz -ORACLE_MYSQL_SITE = http://dev.mysql.com/get/Downloads/MySQL-$(ORACLE_MYSQL_VERSION_MAJOR) -ORACLE_MYSQL_INSTALL_STAGING = YES -ORACLE_MYSQL_DEPENDENCIES = ncurses -ORACLE_MYSQL_AUTORECONF = YES -ORACLE_MYSQL_LICENSE = GPL-2.0 -ORACLE_MYSQL_LICENSE_FILES = README COPYING -ORACLE_MYSQL_CPE_ID_VENDOR = oracle -ORACLE_MYSQL_CPE_ID_PRODUCT = mysql -ORACLE_MYSQL_SELINUX_MODULES = mysql -ORACLE_MYSQL_PROVIDES = mysql -ORACLE_MYSQL_CONFIG_SCRIPTS = mysql_config - -# Unix socket. This variable can also be consulted by other buildroot packages -MYSQL_SOCKET = /run/mysql/mysql.sock - -ORACLE_MYSQL_CONF_ENV = \ - ac_cv_sys_restartable_syscalls=yes \ - ac_cv_path_PS=/bin/ps \ - ac_cv_path_HOSTNAME=/bin/hostname \ - ac_cv_FIND_PROC="/bin/ps p \$\$PID | grep -v grep | grep mysqld > /dev/null" \ - ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_GCC=yes \ - ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS=no \ - ac_cv_have_decl_HAVE_IB_GCC_ATOMIC_BUILTINS=yes \ - mysql_cv_new_rl_interface=yes - -ORACLE_MYSQL_CONF_OPTS = \ - --without-ndb-binlog \ - --without-docs \ - --without-man \ - --without-libedit \ - --with-readline \ - --with-low-memory \ - --enable-thread-safe-client \ - --with-unix-socket-path=$(MYSQL_SOCKET) \ - --disable-mysql-maintainer-mode - -# host-oracle-mysql only installs what is needed to build mysql, i.e. the -# gen_lex_hash tool, and it only builds the parts that are needed to -# create this tool -HOST_ORACLE_MYSQL_DEPENDENCIES = host-zlib host-ncurses - -HOST_ORACLE_MYSQL_CONF_OPTS = \ - --with-embedded-server \ - --disable-mysql-maintainer-mode - -define HOST_ORACLE_MYSQL_BUILD_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/include my_config.h - $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/mysys libmysys.a - $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/strings libmystrings.a - $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/vio libvio.a - $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/dbug libdbug.a - $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/regex libregex.a - $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/sql gen_lex_hash -endef - -define HOST_ORACLE_MYSQL_INSTALL_CMDS - $(INSTALL) -m 0755 $(@D)/sql/gen_lex_hash $(HOST_DIR)/bin/ -endef - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -ORACLE_MYSQL_DEPENDENCIES += openssl -endif - -ifeq ($(BR2_PACKAGE_ZLIB),y) -ORACLE_MYSQL_DEPENDENCIES += zlib -ORACLE_MYSQL_CONF_OPTS += --with-zlib-dir=$(STAGING_DIR)/usr -else -ORACLE_MYSQL_CONF_OPTS += --without-zlib-dir -endif - -ifeq ($(BR2_PACKAGE_ORACLE_MYSQL_SERVER),y) -ORACLE_MYSQL_DEPENDENCIES += host-oracle-mysql host-bison - -ORACLE_MYSQL_CONF_OPTS += \ - --localstatedir=/var/mysql \ - --with-atomic-ops=up \ - --with-embedded-server \ - --without-query-cache \ - --without-plugin-partition \ - --without-plugin-daemon_example \ - --without-plugin-ftexample \ - --without-plugin-archive \ - --without-plugin-blackhole \ - --without-plugin-example \ - --without-plugin-federated \ - --without-plugin-ibmdb2i \ - --without-plugin-innobase \ - --without-plugin-innodb_plugin \ - --without-plugin-ndbcluster - -# Debugging is only available for the server, so no need for -# this if-block outside of the server if-block -ifeq ($(BR2_ENABLE_RUNTIME_DEBUG),y) -ORACLE_MYSQL_CONF_OPTS += --with-debug=full -else -ORACLE_MYSQL_CONF_OPTS += --without-debug -endif - -define ORACLE_MYSQL_USERS - mysql -1 nobody -1 * /var/mysql - - MySQL daemon -endef - -define ORACLE_MYSQL_ADD_FOLDER - $(INSTALL) -d $(TARGET_DIR)/var/mysql -endef - -ORACLE_MYSQL_POST_INSTALL_TARGET_HOOKS += ORACLE_MYSQL_ADD_FOLDER - -define ORACLE_MYSQL_INSTALL_INIT_SYSV - $(INSTALL) -D -m 0755 $(ORACLE_MYSQL_PKGDIR)/S97mysqld \ - $(TARGET_DIR)/etc/init.d/S97mysqld -endef - -define ORACLE_MYSQL_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 $(ORACLE_MYSQL_PKGDIR)/mysqld.service \ - $(TARGET_DIR)/usr/lib/systemd/system/mysqld.service -endef - -else -ORACLE_MYSQL_CONF_OPTS += \ - --without-server -endif - -define ORACLE_MYSQL_REMOVE_TEST_PROGS - rm -rf $(TARGET_DIR)/usr/mysql-test $(TARGET_DIR)/usr/sql-bench -endef - -ORACLE_MYSQL_POST_INSTALL_TARGET_HOOKS += ORACLE_MYSQL_REMOVE_TEST_PROGS - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) From 8708f3a23a7e28fdb04fc57406e13e6b7ff4a337 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 3 Mar 2024 21:46:41 +0100 Subject: [PATCH 5340/5754] package/mysql: drop virtual package Now that oracle-mysql is dropped there isn't any need for the mysql virtual package. Adjust the other packages to directly use the mariadb symbols. Signed-off-by: Peter Korsgaard --- Config.in.legacy | 8 ++++ package/Config.in | 2 +- package/apr-util/apr-util.mk | 4 +- package/collectd/Config.in | 2 +- package/collectd/collectd.mk | 4 +- package/cppdb/Config.in | 4 +- package/cppdb/cppdb.mk | 4 +- package/dovecot/Config.in | 6 +-- package/dovecot/dovecot.mk | 2 +- .../freeradius-server/freeradius-server.mk | 4 +- package/gerbera/gerbera.mk | 4 +- package/kodi/Config.in | 2 +- package/kodi/kodi.mk | 2 +- package/libdbi-drivers/libdbi-drivers.mk | 4 +- package/libodb-mysql/Config.in | 4 +- package/libodb-mysql/libodb-mysql.mk | 2 +- package/lighttpd/lighttpd.mk | 2 +- package/linknx/linknx.mk | 4 +- package/{mysql => mariadb}/Config.in | 37 ++----------------- package/mariadb/mariadb.mk | 1 - package/motion/motion.mk | 4 +- package/mysql/mysql.mk | 7 ---- package/open2300/open2300.mk | 4 +- package/perl-dbd-mysql/Config.in | 2 +- package/perl-dbd-mysql/perl-dbd-mysql.mk | 2 +- package/poco/Config.in | 2 +- package/poco/poco.mk | 2 +- package/pure-ftpd/pure-ftpd.mk | 4 +- package/qt5/qt5base/Config.in | 2 +- package/qt5/qt5base/qt5base.mk | 2 +- package/qt6/qt6base/Config.in | 2 +- package/qt6/qt6base/qt6base.mk | 2 +- package/rsyslog/rsyslog.mk | 4 +- package/sconeserver/Config.in | 2 +- package/sconeserver/sconeserver.mk | 2 +- package/strongswan/Config.in | 2 +- package/strongswan/strongswan.mk | 2 +- package/tcl/tcl.mk | 4 +- package/ulogd/ulogd.mk | 4 +- package/zabbix/Config.in | 2 +- package/zabbix/zabbix.mk | 2 +- 41 files changed, 66 insertions(+), 95 deletions(-) rename package/{mysql => mariadb}/Config.in (62%) delete mode 100644 package/mysql/mysql.mk diff --git a/Config.in.legacy b/Config.in.legacy index 918f5075af..1b15d25d6b 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,14 @@ endif comment "Legacy options removed in 2024.02" +config BR2_PACKAGE_MYSQL + bool "mysql virtual package removed" + select BR2_LEGACY + help + The mysql virtual package has been removed as mariadb is the + only supported mysql variant. Use the mariadb package + instead. + config BR2_PACKAGE_ORACLE_MYSQL bool "oracle mysql removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index bf0fe078b9..33039331f7 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1587,8 +1587,8 @@ menu "Database" source "package/libodb-mysql/Config.in" source "package/libodb-pgsql/Config.in" source "package/libpqxx/Config.in" + source "package/mariadb/Config.in" source "package/mongodb/Config.in" - source "package/mysql/Config.in" source "package/postgresql/Config.in" if BR2_PACKAGE_POSTGRESQL source "package/osm2pgsql/Config.in" diff --git a/package/apr-util/apr-util.mk b/package/apr-util/apr-util.mk index 02b6d5e277..477db1c593 100644 --- a/package/apr-util/apr-util.mk +++ b/package/apr-util/apr-util.mk @@ -35,9 +35,9 @@ else APR_UTIL_CONF_OPTS += --without-gdbm endif -ifeq ($(BR2_PACKAGE_MYSQL),y) +ifeq ($(BR2_PACKAGE_MARIADB),y) APR_UTIL_CONF_OPTS += --with-mysql="$(STAGING_DIR)/usr" -APR_UTIL_DEPENDENCIES += mysql +APR_UTIL_DEPENDENCIES += mariadb else APR_UTIL_CONF_OPTS += --without-mysql endif diff --git a/package/collectd/Config.in b/package/collectd/Config.in index a0c367c78d..e6d549f81f 100644 --- a/package/collectd/Config.in +++ b/package/collectd/Config.in @@ -394,7 +394,7 @@ config BR2_PACKAGE_COLLECTD_MYSQL depends on BR2_INSTALL_LIBSTDCPP # mysql depends on BR2_USE_MMU # mysql depends on BR2_TOOLCHAIN_HAS_THREADS # mysql - select BR2_PACKAGE_MYSQL + select BR2_PACKAGE_MARIADB help Connects to a MySQL database and issues a "show status" command. diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk index 76f622b8db..b47b2efaba 100644 --- a/package/collectd/collectd.mk +++ b/package/collectd/collectd.mk @@ -194,7 +194,7 @@ COLLECTD_DEPENDENCIES = \ $(if $(BR2_PACKAGE_COLLECTD_MEMCACHEC),libmemcached) \ $(if $(BR2_PACKAGE_COLLECTD_MODBUS),libmodbus) \ $(if $(BR2_PACKAGE_COLLECTD_MQTT),mosquitto) \ - $(if $(BR2_PACKAGE_COLLECTD_MYSQL),mysql) \ + $(if $(BR2_PACKAGE_COLLECTD_MYSQL),mariadb) \ $(if $(BR2_PACKAGE_COLLECTD_NETLINK),libmnl) \ $(if $(BR2_PACKAGE_COLLECTD_NGINX),libcurl) \ $(if $(BR2_PACKAGE_COLLECTD_NOTIFY_EMAIL),libesmtp) \ @@ -224,7 +224,7 @@ endif ifeq ($(BR2_PACKAGE_LUAJIT),y) COLLECTD_CONF_ENV += LIBLUA_PKG_CONFIG_NAME=luajit endif -ifeq ($(BR2_PACKAGE_MYSQL),y) +ifeq ($(BR2_PACKAGE_MARIADB),y) COLLECTD_CONF_OPTS += --with-libmysql=$(STAGING_DIR)/usr endif ifeq ($(BR2_PACKAGE_NETSNMP),y) diff --git a/package/cppdb/Config.in b/package/cppdb/Config.in index ceff0ab76f..1394c1efd8 100644 --- a/package/cppdb/Config.in +++ b/package/cppdb/Config.in @@ -5,7 +5,7 @@ config BR2_PACKAGE_CPPDB depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS # Can be built without them but it's useless - depends on BR2_PACKAGE_MYSQL || BR2_PACKAGE_POSTGRESQL || BR2_PACKAGE_SQLITE + depends on BR2_PACKAGE_MARIADB || BR2_PACKAGE_POSTGRESQL || BR2_PACKAGE_SQLITE help CppDB is an SQL connectivity library that is designed to provide platform and Database independent connectivity API @@ -15,6 +15,6 @@ config BR2_PACKAGE_CPPDB http://cppcms.com/sql/cppdb/ comment "cppdb needs a toolchain w/ C++, threads, dynamic library" - depends on BR2_PACKAGE_MYSQL || BR2_PACKAGE_POSTGRESQL || BR2_PACKAGE_SQLITE + depends on BR2_PACKAGE_MARIADB || BR2_PACKAGE_POSTGRESQL || BR2_PACKAGE_SQLITE depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ BR2_STATIC_LIBS diff --git a/package/cppdb/cppdb.mk b/package/cppdb/cppdb.mk index e73f04e194..d2a901d28b 100644 --- a/package/cppdb/cppdb.mk +++ b/package/cppdb/cppdb.mk @@ -12,8 +12,8 @@ CPPDB_DEPENDENCIES = $(if $(BR2_PACKAGE_SQLITE),sqlite) CPPDB_LICENSE = BSL-1.0 or MIT CPPDB_LICENSE_FILES = LICENSE_1_0.txt MIT.txt -ifeq ($(BR2_PACKAGE_MYSQL),y) -CPPDB_DEPENDENCIES += mysql +ifeq ($(BR2_PACKAGE_MARIADB),y) +CPPDB_DEPENDENCIES += mariadb else CPPDB_CONF_OPTS += -DDISABLE_MYSQL=ON endif diff --git a/package/dovecot/Config.in b/package/dovecot/Config.in index 377fd4dbb8..20b08b62be 100644 --- a/package/dovecot/Config.in +++ b/package/dovecot/Config.in @@ -17,9 +17,9 @@ if BR2_PACKAGE_DOVECOT config BR2_PACKAGE_DOVECOT_MYSQL bool "mysql support" - depends on BR2_INSTALL_LIBSTDCPP # mysql - depends on BR2_TOOLCHAIN_HAS_THREADS # mysql - select BR2_PACKAGE_MYSQL + depends on BR2_INSTALL_LIBSTDCPP # mariadb + depends on BR2_TOOLCHAIN_HAS_THREADS # mariadb + select BR2_PACKAGE_MARIADB help Enable MySQL support. diff --git a/package/dovecot/dovecot.mk b/package/dovecot/dovecot.mk index 2933401cbc..f90996fdd7 100644 --- a/package/dovecot/dovecot.mk +++ b/package/dovecot/dovecot.mk @@ -83,7 +83,7 @@ endif ifeq ($(BR2_PACKAGE_DOVECOT_MYSQL),y) DOVECOT_CONF_ENV += MYSQL_CONFIG="$(STAGING_DIR)/usr/bin/mysql_config" DOVECOT_CONF_OPTS += --with-mysql -DOVECOT_DEPENDENCIES += mysql +DOVECOT_DEPENDENCIES += mariadb else DOVECOT_CONF_OPTS += --without-mysql endif diff --git a/package/freeradius-server/freeradius-server.mk b/package/freeradius-server/freeradius-server.mk index 1b5751d753..1e8ada6bb9 100644 --- a/package/freeradius-server/freeradius-server.mk +++ b/package/freeradius-server/freeradius-server.mk @@ -140,9 +140,9 @@ else FREERADIUS_SERVER_CONF_OPTS += --without-rlm_cache_memcached endif -ifeq ($(BR2_PACKAGE_MYSQL),y) +ifeq ($(BR2_PACKAGE_MARIADB),y) FREERADIUS_SERVER_CONF_OPTS += --with-rlm_sql_mysql -FREERADIUS_SERVER_DEPENDENCIES += mysql +FREERADIUS_SERVER_DEPENDENCIES += mariadb else FREERADIUS_SERVER_CONF_OPTS += --without-rlm_sql_mysql endif diff --git a/package/gerbera/gerbera.mk b/package/gerbera/gerbera.mk index c60d49b0f9..6616a83e74 100644 --- a/package/gerbera/gerbera.mk +++ b/package/gerbera/gerbera.mk @@ -89,8 +89,8 @@ GERBERA_DEPENDENCIES += libupnp GERBERA_CONF_OPTS += -DWITH_NPUPNP=OFF endif -ifeq ($(BR2_PACKAGE_MYSQL),y) -GERBERA_DEPENDENCIES += mysql +ifeq ($(BR2_PACKAGE_MARIADB),y) +GERBERA_DEPENDENCIES += mariadb GERBERA_CONF_OPTS += -DWITH_MYSQL=ON else GERBERA_CONF_OPTS += -DWITH_MYSQL=OFF diff --git a/package/kodi/Config.in b/package/kodi/Config.in index 6b68e6d504..8ad9fdae78 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -198,7 +198,7 @@ comment "nfs support needs a toolchain w/ threads support" config BR2_PACKAGE_KODI_MYSQL bool "mysql" - select BR2_PACKAGE_MYSQL + select BR2_PACKAGE_MARIADB help Enable MySQL support diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index d057eb3f05..eebb48238a 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -216,7 +216,7 @@ endif ifeq ($(BR2_PACKAGE_KODI_MYSQL),y) KODI_CONF_OPTS += -DENABLE_MYSQLCLIENT=ON -KODI_DEPENDENCIES += mysql +KODI_DEPENDENCIES += mariadb else KODI_CONF_OPTS += -DENABLE_MYSQLCLIENT=OFF endif diff --git a/package/libdbi-drivers/libdbi-drivers.mk b/package/libdbi-drivers/libdbi-drivers.mk index af8db79581..a6ff9d9cfe 100644 --- a/package/libdbi-drivers/libdbi-drivers.mk +++ b/package/libdbi-drivers/libdbi-drivers.mk @@ -15,8 +15,8 @@ LIBDBI_DRIVERS_AUTORECONF = YES LIBDBI_DRIVERS_CONF_OPTS = --with-dbi-libdir=$(STAGING_DIR)/usr/lib -ifeq ($(BR2_PACKAGE_MYSQL),y) -LIBDBI_DRIVERS_DEPENDENCIES += mysql +ifeq ($(BR2_PACKAGE_MARIADB),y) +LIBDBI_DRIVERS_DEPENDENCIES += mariadb LIBDBI_DRIVERS_CONF_OPTS += --with-mysql LIBDBI_DRIVERS_CONF_ENV += MYSQL_CONFIG="$(STAGING_DIR)/usr/bin/mysql_config" else diff --git a/package/libodb-mysql/Config.in b/package/libodb-mysql/Config.in index d606165f9b..5645ccbbfb 100644 --- a/package/libodb-mysql/Config.in +++ b/package/libodb-mysql/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_LIBODB_MYSQL bool "libodb-mysql" depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_PACKAGE_MYSQL + depends on BR2_PACKAGE_MARIADB select BR2_PACKAGE_LIBODB help This package contains the MySQL ODB runtime library. Every @@ -13,4 +13,4 @@ config BR2_PACKAGE_LIBODB_MYSQL comment "libodb-mysql needs a toolchain w/ C++, threads" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_PACKAGE_MYSQL + depends on BR2_PACKAGE_MARIADB diff --git a/package/libodb-mysql/libodb-mysql.mk b/package/libodb-mysql/libodb-mysql.mk index 88b6f4cb31..427224dfb0 100644 --- a/package/libodb-mysql/libodb-mysql.mk +++ b/package/libodb-mysql/libodb-mysql.mk @@ -11,7 +11,7 @@ LIBODB_MYSQL_SITE = https://www.codesynthesis.com/download/odb/$(LIBODB_MYSQL_VE LIBODB_MYSQL_INSTALL_STAGING = YES LIBODB_MYSQL_LICENSE = GPL-2.0 LIBODB_MYSQL_LICENSE_FILES = LICENSE -LIBODB_MYSQL_DEPENDENCIES = libodb mysql +LIBODB_MYSQL_DEPENDENCIES = libodb mariadb LIBODB_MYSQL_CONF_ENV = \ CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" \ LIBS=`$(STAGING_DIR)/usr/bin/mysql_config --libs` diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index 91877f8aae..5109e3cebb 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -73,7 +73,7 @@ LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_MYSQL),y) -LIGHTTPD_DEPENDENCIES += mysql +LIGHTTPD_DEPENDENCIES += mariadb LIGHTTPD_CONF_OPTS += -Dwith_mysql=enabled else LIGHTTPD_CONF_OPTS += -Dwith_mysql=disabled diff --git a/package/linknx/linknx.mk b/package/linknx/linknx.mk index dcfcd5e3f5..683e0c49cb 100644 --- a/package/linknx/linknx.mk +++ b/package/linknx/linknx.mk @@ -49,9 +49,9 @@ else LINKNX_CONF_OPTS += --without-lua endif -ifeq ($(BR2_PACKAGE_MYSQL),y) +ifeq ($(BR2_PACKAGE_MARIADB),y) LINKNX_CONF_OPTS += --with-mysql=$(STAGING_DIR)/usr -LINKNX_DEPENDENCIES += mysql +LINKNX_DEPENDENCIES += mariadb else LINKNX_CONF_OPTS += --without-mysql endif diff --git a/package/mysql/Config.in b/package/mariadb/Config.in similarity index 62% rename from package/mysql/Config.in rename to package/mariadb/Config.in index 3257253166..d88dda3cda 100644 --- a/package/mysql/Config.in +++ b/package/mariadb/Config.in @@ -1,22 +1,9 @@ -config BR2_PACKAGE_MYSQL - bool "mysql support" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_MMU # fork() - depends on BR2_TOOLCHAIN_HAS_THREADS - help - Select the desired mysql provider. - -if BR2_PACKAGE_MYSQL - -choice - prompt "mysql variant" - help - Select either the oracle mysql server or the mariadb server - config BR2_PACKAGE_MARIADB bool "mariadb" depends on BR2_INSTALL_LIBSTDCPP # fmt depends on !BR2_STATIC_LIBS + depends on BR2_USE_MMU # fork() + depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_HAS_ATOMIC || BR2_TOOLCHAIN_HAS_SYNC_8 depends on BR2_USE_WCHAR # fmt select BR2_PACKAGE_LIBAIO @@ -25,7 +12,6 @@ config BR2_PACKAGE_MARIADB select BR2_PACKAGE_NCURSES select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_PCRE2 - select BR2_PACKAGE_HAS_MYSQL help MariaDB is one of the most popular database servers in the world. It's made by the original developers of MySQL and @@ -33,13 +19,11 @@ config BR2_PACKAGE_MARIADB http://www.mariadb.org/ -comment "mariadb needs a toolchain w/ dynamic library, C++, wchar" +comment "mariadb needs a toolchain w/ dynamic library, C++, threads, wchar" depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP \ - || !BR2_USE_WCHAR + || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_ATOMIC || BR2_TOOLCHAIN_HAS_SYNC_8 -endchoice - if BR2_PACKAGE_MARIADB config BR2_PACKAGE_MARIADB_SERVER @@ -54,16 +38,3 @@ config BR2_PACKAGE_MARIADB_SERVER_EMBEDDED Install the mariadb embedded server on the target. endif - -config BR2_PACKAGE_HAS_MYSQL - bool - -config BR2_PACKAGE_PROVIDES_MYSQL - string - default "mariadb" if BR2_PACKAGE_MARIADB - -endif - -comment "mysql needs a toolchain w/ C++, threads" - depends on BR2_USE_MMU - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/mariadb/mariadb.mk b/package/mariadb/mariadb.mk index 7f3755892a..8641437d4d 100644 --- a/package/mariadb/mariadb.mk +++ b/package/mariadb/mariadb.mk @@ -13,7 +13,6 @@ MARIADB_LICENSE_FILES = README.md COPYING MARIADB_CPE_ID_VENDOR = mariadb MARIADB_SELINUX_MODULES = mysql MARIADB_INSTALL_STAGING = YES -MARIADB_PROVIDES = mysql MARIADB_CONFIG_SCRIPTS = mysql_config MARIADB_DEPENDENCIES = \ diff --git a/package/motion/motion.mk b/package/motion/motion.mk index a42c2ad149..ff5e2c1403 100644 --- a/package/motion/motion.mk +++ b/package/motion/motion.mk @@ -23,8 +23,8 @@ else MOTION_CONF_OPTS += --without-ffmpeg endif -ifeq ($(BR2_PACKAGE_MYSQL),y) -MOTION_DEPENDENCIES += mysql +ifeq ($(BR2_PACKAGE_MARIADB),y) +MOTION_DEPENDENCIES += mariadb MOTION_CONF_OPTS += --with-mysql else MOTION_CONF_OPTS += --without-mysql diff --git a/package/mysql/mysql.mk b/package/mysql/mysql.mk deleted file mode 100644 index d65562563d..0000000000 --- a/package/mysql/mysql.mk +++ /dev/null @@ -1,7 +0,0 @@ -################################################################################ -# -# mysql -# -################################################################################ - -$(eval $(virtual-package)) diff --git a/package/open2300/open2300.mk b/package/open2300/open2300.mk index 9fb7dbc2fd..74f6d720f9 100644 --- a/package/open2300/open2300.mk +++ b/package/open2300/open2300.mk @@ -15,8 +15,8 @@ OPEN2300_BINS = \ OPEN2300_CFLAGS = $(TARGET_CFLAGS) OPEN2300_LDFLAGS = $(TARGET_LDFLAGS) -ifeq ($(BR2_PACKAGE_MYSQL),y) -OPEN2300_DEPENDENCIES += mysql +ifeq ($(BR2_PACKAGE_MARIADB),y) +OPEN2300_DEPENDENCIES += mariadb OPEN2300_BINS += mysql2300 mysqlhistlog2300 OPEN2300_CFLAGS += $(shell $(STAGING_DIR)/usr/bin/mysql_config --cflags) OPEN2300_LDFLAGS += $(shell $(STAGING_DIR)/usr/bin/mysql_config --libs) diff --git a/package/perl-dbd-mysql/Config.in b/package/perl-dbd-mysql/Config.in index 55bbc95347..eff76f5b61 100644 --- a/package/perl-dbd-mysql/Config.in +++ b/package/perl-dbd-mysql/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_PERL_DBD_MYSQL depends on BR2_INSTALL_LIBSTDCPP # mysql depends on BR2_USE_MMU # mysql depends on BR2_TOOLCHAIN_HAS_THREADS # mysql - select BR2_PACKAGE_MYSQL + select BR2_PACKAGE_MARIADB select BR2_PACKAGE_PERL_DBI # runtime help A MySQL driver for the Perl5 Database Interface (DBI). diff --git a/package/perl-dbd-mysql/perl-dbd-mysql.mk b/package/perl-dbd-mysql/perl-dbd-mysql.mk index 98521a78cf..e87e34100a 100644 --- a/package/perl-dbd-mysql/perl-dbd-mysql.mk +++ b/package/perl-dbd-mysql/perl-dbd-mysql.mk @@ -9,7 +9,7 @@ PERL_DBD_MYSQL_SOURCE = DBD-mysql-$(PERL_DBD_MYSQL_VERSION).tar.gz PERL_DBD_MYSQL_SITE = $(BR2_CPAN_MIRROR)/authors/id/C/CA/CAPTTOFU PERL_DBD_MYSQL_DEPENDENCIES = \ host-perl-dbi \ - mysql + mariadb PERL_DBD_MYSQL_LICENSE = Artistic or GPL-1.0+ PERL_DBD_MYSQL_LICENSE_FILES = LICENSE PERL_DBD_MYSQL_DISTNAME = DBD-mysql diff --git a/package/poco/Config.in b/package/poco/Config.in index 820e631966..7cb9987ec7 100644 --- a/package/poco/Config.in +++ b/package/poco/Config.in @@ -46,7 +46,7 @@ config BR2_PACKAGE_POCO_DATA config BR2_PACKAGE_POCO_DATA_MYSQL bool "Data/MySQL" depends on BR2_USE_MMU # mysql - select BR2_PACKAGE_MYSQL + select BR2_PACKAGE_MARIADB select BR2_PACKAGE_POCO_DATA config BR2_PACKAGE_POCO_DATA_PGSQL diff --git a/package/poco/poco.mk b/package/poco/poco.mk index f8c2a658de..b1d5a653c4 100644 --- a/package/poco/poco.mk +++ b/package/poco/poco.mk @@ -15,7 +15,7 @@ POCO_DEPENDENCIES = \ pcre2 \ zlib \ $(if $(BR2_PACKAGE_POCO_CRYPTO),openssl) \ - $(if $(BR2_PACKAGE_POCO_DATA_MYSQL),mysql) \ + $(if $(BR2_PACKAGE_POCO_DATA_MYSQL),mariadb) \ $(if $(BR2_PACKAGE_POCO_DATA_SQLITE),sqlite) \ $(if $(BR2_PACKAGE_POCO_DATA_PGSQL),postgresql) \ $(if $(BR2_PACKAGE_POCO_NETSSL_OPENSSL),openssl) \ diff --git a/package/pure-ftpd/pure-ftpd.mk b/package/pure-ftpd/pure-ftpd.mk index 138b05ebb4..ffd27d7b99 100644 --- a/package/pure-ftpd/pure-ftpd.mk +++ b/package/pure-ftpd/pure-ftpd.mk @@ -31,9 +31,9 @@ ifeq ($(BR2_PACKAGE_LIBSODIUM),y) PURE_FTPD_DEPENDENCIES += libsodium endif -ifeq ($(BR2_PACKAGE_MYSQL),y) +ifeq ($(BR2_PACKAGE_MARIADB),y) PURE_FTPD_CONF_OPTS += --with-mysql=$(STAGING_DIR)/usr -PURE_FTPD_DEPENDENCIES += mysql +PURE_FTPD_DEPENDENCIES += mariadb else PURE_FTPD_CONF_OPTS += --without-mysql endif diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in index 0c7ed41c46..6e6a7cf984 100644 --- a/package/qt5/qt5base/Config.in +++ b/package/qt5/qt5base/Config.in @@ -62,7 +62,7 @@ if BR2_PACKAGE_QT5BASE_SQL config BR2_PACKAGE_QT5BASE_MYSQL bool "MySQL Plugin" depends on BR2_USE_MMU # mysql - select BR2_PACKAGE_MYSQL + select BR2_PACKAGE_MARIADB select BR2_PACKAGE_NCURSES select BR2_PACKAGE_READLINE help diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index fbd882da21..e173639cca 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -129,7 +129,7 @@ endif ifeq ($(BR2_PACKAGE_QT5BASE_SQL),y) ifeq ($(BR2_PACKAGE_QT5BASE_MYSQL),y) QT5BASE_CONFIGURE_OPTS += -plugin-sql-mysql -mysql_config $(STAGING_DIR)/usr/bin/mysql_config -QT5BASE_DEPENDENCIES += mysql +QT5BASE_DEPENDENCIES += mariadb else QT5BASE_CONFIGURE_OPTS += -no-sql-mysql endif diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index 98a7520486..3b15d40c83 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -190,7 +190,7 @@ config BR2_PACKAGE_QT6BASE_MYSQL depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_THREADS - select BR2_PACKAGE_MYSQL + select BR2_PACKAGE_MARIADB help Build MySQL plugin diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 667dd4133f..6857725ef5 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -313,7 +313,7 @@ QT6BASE_CONF_OPTS += -DFEATURE_sql_db2=OFF -DFEATURE_sql_ibase=OFF -DFEATURE_sql ifeq ($(BR2_PACKAGE_QT6BASE_MYSQL),y) QT6BASE_CONF_OPTS += -DFEATURE_sql_mysql=ON -QT6BASE_DEPENDENCIES += mysql +QT6BASE_DEPENDENCIES += mariadb else QT6BASE_CONF_OPTS += -DFEATURE_sql_mysql=OFF endif diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk index 1919863f4f..dc30a2edcd 100644 --- a/package/rsyslog/rsyslog.mk +++ b/package/rsyslog/rsyslog.mk @@ -102,8 +102,8 @@ else RSYSLOG_CONF_OPTS += --disable-impcap endif -ifeq ($(BR2_PACKAGE_MYSQL),y) -RSYSLOG_DEPENDENCIES += mysql +ifeq ($(BR2_PACKAGE_MARIADB),y) +RSYSLOG_DEPENDENCIES += mariadb RSYSLOG_CONF_OPTS += --enable-mysql RSYSLOG_CONF_ENV += ac_cv_prog_MYSQL_CONFIG=$(STAGING_DIR)/usr/bin/mysql_config else diff --git a/package/sconeserver/Config.in b/package/sconeserver/Config.in index 0e8a995090..cce21fc860 100644 --- a/package/sconeserver/Config.in +++ b/package/sconeserver/Config.in @@ -67,7 +67,7 @@ config BR2_PACKAGE_SCONESERVER_MATHS config BR2_PACKAGE_SCONESERVER_MYSQL bool "mysql" depends on BR2_USE_MMU # mysql - select BR2_PACKAGE_MYSQL + select BR2_PACKAGE_MARIADB help MySQL module for Sconeserver diff --git a/package/sconeserver/sconeserver.mk b/package/sconeserver/sconeserver.mk index 89abc8d3b2..10a0a22597 100644 --- a/package/sconeserver/sconeserver.mk +++ b/package/sconeserver/sconeserver.mk @@ -63,7 +63,7 @@ SCONESERVER_CONF_OPTS += -DWITH_MATHS=OFF endif ifeq ($(BR2_PACKAGE_SCONESERVER_MYSQL),y) -SCONESERVER_DEPENDENCIES += mysql +SCONESERVER_DEPENDENCIES += mariadb SCONESERVER_CONF_OPTS += -DWITH_MYSQL=ON else SCONESERVER_CONF_OPTS += -DWITH_MYSQL=OFF diff --git a/package/strongswan/Config.in b/package/strongswan/Config.in index 5231e69ca8..9be5fe177d 100644 --- a/package/strongswan/Config.in +++ b/package/strongswan/Config.in @@ -193,7 +193,7 @@ config BR2_PACKAGE_STRONGSWAN_STROKE config BR2_PACKAGE_STRONGSWAN_SQL bool "Enable SQL database configuration backend" - depends on BR2_PACKAGE_SQLITE || BR2_PACKAGE_MYSQL + depends on BR2_PACKAGE_SQLITE || BR2_PACKAGE_MARIADB config BR2_PACKAGE_STRONGSWAN_BYPASS_LAN bool "Enable BYPASS-LAN plugin" diff --git a/package/strongswan/strongswan.mk b/package/strongswan/strongswan.mk index 5521fb7dd4..41959793a3 100644 --- a/package/strongswan/strongswan.mk +++ b/package/strongswan/strongswan.mk @@ -80,7 +80,7 @@ STRONGSWAN_DEPENDENCIES += \ ifeq ($(BR2_PACKAGE_STRONGSWAN_SQL),y) STRONGSWAN_DEPENDENCIES += \ $(if $(BR2_PACKAGE_SQLITE),sqlite) \ - $(if $(BR2_PACKAGE_MYSQL),mysql) + $(if $(BR2_PACKAGE_MARIADB),mariadb) endif # disable connmark/forecast until net/if.h vs. linux/if.h conflict resolved diff --git a/package/tcl/tcl.mk b/package/tcl/tcl.mk index 1943bc7b27..18171aebd7 100644 --- a/package/tcl/tcl.mk +++ b/package/tcl/tcl.mk @@ -35,7 +35,7 @@ HOST_TCL_PRE_CONFIGURE_HOOKS += HOST_TCL_REMOVE_PACKAGES # We remove the bundled sqlite as we prefer to not use bundled stuff at all. define TCL_REMOVE_PACKAGES rm -fr $(@D)/pkgs/sqlite3* \ - $(if $(BR2_PACKAGE_MYSQL),,$(@D)/pkgs/tdbcmysql*) \ + $(if $(BR2_PACKAGE_MARIADB),,$(@D)/pkgs/tdbcmysql*) \ $(@D)/pkgs/tdbcodbc* \ $(if $(BR2_PACKAGE_POSTGRESQL),,$(@D)/pkgs/tdbcpostgres*) \ $(if $(BR2_PACKAGE_SQLITE),,$(@D)/pkgs/tdbcsqlite3*) @@ -74,7 +74,7 @@ endef TCL_POST_INSTALL_TARGET_HOOKS += TCL_REMOVE_EXTRA TCL_DEPENDENCIES = $(if $(BR2_PACKAGE_SQLITE),sqlite) \ - $(if $(BR2_PACKAGE_MYSQL),mysql) \ + $(if $(BR2_PACKAGE_MARIADB),mariadb) \ $(if $(BR2_PACKAGE_POSTGRESQL),postgresql) \ zlib diff --git a/package/ulogd/ulogd.mk b/package/ulogd/ulogd.mk index 033acb06c2..2ebf076d9a 100644 --- a/package/ulogd/ulogd.mk +++ b/package/ulogd/ulogd.mk @@ -22,11 +22,11 @@ ULOGD_DEPENDENCIES += libdbi else ULOGD_CONF_OPTS += --disable-dbi endif -ifeq ($(BR2_PACKAGE_MYSQL),y) +ifeq ($(BR2_PACKAGE_MARIADB),y) ULOGD_CONF_OPTS += \ --enable-mysql \ --with-mysql-config=$(STAGING_DIR)/usr/bin/mysql_config -ULOGD_DEPENDENCIES += mysql +ULOGD_DEPENDENCIES += mariadb else ULOGD_CONF_OPTS += --disable-mysql endif diff --git a/package/zabbix/Config.in b/package/zabbix/Config.in index af677f782e..9ac668117d 100644 --- a/package/zabbix/Config.in +++ b/package/zabbix/Config.in @@ -39,7 +39,7 @@ config BR2_PACKAGE_ZABBIX_SERVER_MYSQL bool "mysql" depends on BR2_INSTALL_LIBSTDCPP # mysql depends on BR2_TOOLCHAIN_HAS_THREADS # mysql - select BR2_PACKAGE_MYSQL + select BR2_PACKAGE_MARIADB config BR2_PACKAGE_ZABBIX_SERVER_POSTGRESQL bool "postgresql" diff --git a/package/zabbix/zabbix.mk b/package/zabbix/zabbix.mk index 3b126caa49..76568f5a18 100644 --- a/package/zabbix/zabbix.mk +++ b/package/zabbix/zabbix.mk @@ -107,7 +107,7 @@ ZABBIX_POST_INSTALL_TARGET_HOOKS += ZABBIX_SERVER_COPY_FRONTEND endif ifeq ($(BR2_PACKAGE_ZABBIX_SERVER_MYSQL),y) -ZABBIX_DEPENDENCIES += mysql +ZABBIX_DEPENDENCIES += mariadb ZABBIX_CONF_OPTS += --with-mysql=$(STAGING_DIR)/usr/bin/mysql_config --without-postgresql ZABBIX_DATABASE = mysql else ifeq ($(BR2_PACKAGE_ZABBIX_SERVER_POSTGRESQL),y) From 20406b715946887902e40ffcf8815a90dcb5faaf Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 3 Mar 2024 00:29:40 +0100 Subject: [PATCH 5341/5754] package/rust: provide RUSTFLAGS for cargo While building the rust toolchain, the build system ends up using cargo (from [...]/output/build/host-rust-bin-1.74.1/cargo/bin/cargo) to build some tools like rustdoc-tool. But the host-rust package doesn't use the cargo infractructure (since it provides cargo binary) and our cargo environment variables [1] are not set to crosscompile cargo packages in the rust toolchain. For exemple, we usually set RUSTFLAGS="-C link-arg=-Wl,-rpath,$(HOST_DIR)/lib" to force cargo using libraries provided by Buildroot in $(HOST_DIR)/lib. RUSTFLAGS is actually needed to find zlib library (host-zlib) to link rustdoc-tool when zlib is not installed on the host. Add $(HOST_PKG_CARGO_ENV) in HOST_RUST_BUILD_CMDS since it already includes RUSTFLAGS but also CARGO_HOME. Fixes: error: could not compile `rustdoc-tool` (bin "rustdoc_tool_binary") due to previous error [1] https://gitlab.com/buildroot.org/buildroot/-/blob/2024.02-rc1/package/pkg-cargo.mk#L165 Signed-off-by: Romain Naour Signed-off-by: Yann E. MORIN --- package/rust/rust.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/rust/rust.mk b/package/rust/rust.mk index 4903060368..c544582c99 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -70,7 +70,8 @@ define HOST_RUST_CONFIGURE_CMDS endef define HOST_RUST_BUILD_CMDS - cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) x.py build + cd $(@D); $(HOST_MAKE_ENV) $(HOST_PKG_CARGO_ENV) \ + $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) x.py build endef HOST_RUST_INSTALL_OPTS = \ From 15109dd7ebcf2c670c2eea31fa79460a8a1446e9 Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Mon, 4 Mar 2024 19:18:41 +0100 Subject: [PATCH 5342/5754] package/python-django: security bump to 5.0.3 Fixes: CVE-2024-27351: Potential regular expression denial-of-service in django.utils.text.Truncator.words() [1] Remove patch that is included in this release. [1] https://docs.djangoproject.com/en/dev/releases/5.0.3/ Signed-off-by: Marcus Hoffmann Signed-off-by: Peter Korsgaard --- ...d-sensitive_variables-sensitive_post.patch | 45 ------------------- package/python-django/python-django.hash | 4 +- package/python-django/python-django.mk | 4 +- 3 files changed, 4 insertions(+), 49 deletions(-) delete mode 100644 package/python-django/0001-Fixed-sensitive_variables-sensitive_post.patch diff --git a/package/python-django/0001-Fixed-sensitive_variables-sensitive_post.patch b/package/python-django/0001-Fixed-sensitive_variables-sensitive_post.patch deleted file mode 100644 index 90dc9c7dd0..0000000000 --- a/package/python-django/0001-Fixed-sensitive_variables-sensitive_post.patch +++ /dev/null @@ -1,45 +0,0 @@ -From d294b7679f2cb51c7231d6a7fb22e76eb74e49ec Mon Sep 17 00:00:00 2001 -From: Mariusz Felisiak -Date: Sat, 17 Feb 2024 08:15:59 +0100 -Subject: [PATCH] Fixed #35187 -- Fixed - @sensitive_variables/sensitive_post_parameters decorators crash with - .pyc-only builds. - -Thanks Jon Janzen for the implementation idea. - -Thanks Marcus Hoffmann for the report. - -Regression in 38e391e95fe5258bc6d2467332dc9cd44ce6ba52. -Backport of d1be05b3e9209fd0787841c71a95819d81061187 from main - -Signed-off-by: Marcus Hoffmann -Upstream: https://github.com/django/django/commit/41a4bba817f139f3cfd94f04e728e046560c9a18 ---- - django/views/decorators/debug.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/django/views/decorators/debug.py b/django/views/decorators/debug.py -index 7ea8a540de..6540fc0651 100644 ---- a/django/views/decorators/debug.py -+++ b/django/views/decorators/debug.py -@@ -47,7 +47,6 @@ def sensitive_variables(*variables): - - try: - file_path = inspect.getfile(wrapped_func) -- _, first_file_line = inspect.getsourcelines(wrapped_func) - except TypeError: # Raises for builtins or native functions. - raise ValueError( - f"{func.__name__} cannot safely be wrapped by " -@@ -55,7 +54,8 @@ def sensitive_variables(*variables): - "Python file (not a builtin or from a native extension)." - ) - else: -- key = hash(f"{file_path}:{first_file_line}") -+ first_line_number = wrapped_func.__code__.co_firstlineno -+ key = hash(f"{file_path}:{first_line_number}") - - if variables: - coroutine_functions_to_sensitive_variables[key] = variables --- -2.34.1 - diff --git a/package/python-django/python-django.hash b/package/python-django/python-django.hash index 20b66a4106..d5684a083c 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 5d0df847e1b751a4a5d2bde1563c75fc Django-5.0.2.tar.gz -sha256 b5bb1d11b2518a5f91372a282f24662f58f66749666b0a286ab057029f728080 Django-5.0.2.tar.gz +md5 1009c48d70060cadb40000cc15a8058a Django-5.0.3.tar.gz +sha256 5fb37580dcf4a262f9258c1f4373819aacca906431f505e4688e37f3a99195df Django-5.0.3.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 231de0b833..258ff9e0c1 100644 --- a/package/python-django/python-django.mk +++ b/package/python-django/python-django.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_DJANGO_VERSION = 5.0.2 +PYTHON_DJANGO_VERSION = 5.0.3 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/50/98/499a2d11eb0b22fdd55ce5895e0f5ce6d7d4957a785f237a89317cb478fa +PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/e1/b1/ac6a16aaf0049637b50afbcf06b8ec2fa5c6ce42d4ae6ba66bbaf4c3609a PYTHON_DJANGO_LICENSE = BSD-3-Clause PYTHON_DJANGO_LICENSE_FILES = LICENSE PYTHON_DJANGO_CPE_ID_VENDOR = djangoproject From 0193f559dd4fafd6bc70168e1af5b02fcaccd987 Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Mon, 4 Mar 2024 14:10:33 +0100 Subject: [PATCH 5343/5754] package/rauc: bump to version 1.11.2 Release Notes: https://github.com/rauc/rauc/releases/tag/v1.11.2 Signed-off-by: Marcus Hoffmann Signed-off-by: Peter Korsgaard --- package/rauc/rauc.hash | 4 ++-- package/rauc/rauc.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/rauc/rauc.hash b/package/rauc/rauc.hash index 63aa4715e0..6899ca94fe 100644 --- a/package/rauc/rauc.hash +++ b/package/rauc/rauc.hash @@ -1,3 +1,3 @@ -# Locally calculated -sha256 391d13d709abb630c459e79e62e474e68224c5d07c816355784bba75a86a2507 rauc-1.11.1.tar.xz +# Locally calculated after checking pgp signature +sha256 e47070e97f89136ca8d0b2b044c40e68ac0f44432046176d08d66717320df4a7 rauc-1.11.2.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/rauc/rauc.mk b/package/rauc/rauc.mk index fbdea4e235..7bb374259f 100644 --- a/package/rauc/rauc.mk +++ b/package/rauc/rauc.mk @@ -4,7 +4,7 @@ # ################################################################################ -RAUC_VERSION = 1.11.1 +RAUC_VERSION = 1.11.2 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 6e6b0cbf5270bf9164de5badfabbc6d2a6242b0e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 4 Mar 2024 16:35:39 +0100 Subject: [PATCH 5344/5754] package/fluent-bit: fix build with BR2_TIME_BITS_64 Do not remove _FILE_OFFSET_BITS=64 from CFLAGS to avoid the following build failure with BR2_TIME_BITS_64 raised since commit 3c427c64726560ea1743282a3fdb78f5b28692eb: In file included from /home/thomas/autobuild/instance-1/output-1/host/microblaze-buildroot-linux-gnu/sysroot/usr/include/features.h:394, from /home/thomas/autobuild/instance-1/output-1/host/microblaze-buildroot-linux-gnu/sysroot/usr/include/bits/libc-header-start.h:33, from /home/thomas/autobuild/instance-1/output-1/host/microblaze-buildroot-linux-gnu/sysroot/usr/include/stdio.h:27, from /home/thomas/autobuild/instance-1/output-1/build/fluent-bit-2.1.7/tools/xxd-c/xxd-c.c:27: /home/thomas/autobuild/instance-1/output-1/host/microblaze-buildroot-linux-gnu/sysroot/usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" 26 | # error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" | ^~~~~ Indeed, this LFS workaround was present since the addition of the package in commit 6a0f7c39bcb48fc13aa2ce3fc4996baf1be66483 and is only needed to fix a build failure with the old codesourcery-arm toolchain from 2014 which uses glibc < 2.23. as glibc 2.23 was released in February 2016: https://sourceware.org/glibc/wiki/Release/2.23, drop this workaround as already done for libselinux in commit c1fa9bc2f7a4e5481edf4fce5c03dd45862fe72c. A follow-up patch will also drop codesourcery-arm toolchain. Fixes: 3c427c64726560ea1743282a3fdb78f5b28692eb - http://autobuild.buildroot.org/results/ff5c60cd038550453ce138fe2a9383af2f5d6f2f Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/fluent-bit/fluent-bit.mk | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk index e51322aad6..00a8904c55 100644 --- a/package/fluent-bit/fluent-bit.mk +++ b/package/fluent-bit/fluent-bit.mk @@ -12,8 +12,6 @@ FLUENT_BIT_CPE_ID_VENDOR = treasuredata FLUENT_BIT_CPE_ID_PRODUCT = fluent_bit FLUENT_BIT_DEPENDENCIES = host-bison host-flex libyaml openssl -FLUENT_BIT_CFLAGS = $(TARGET_CFLAGS) - FLUENT_BIT_CONF_OPTS += \ -DFLB_DEBUG=No \ -DFLB_RELEASE=Yes \ @@ -55,11 +53,6 @@ FLUENT_BIT_CONF_OPTS += \ FLUENT_BIT_CONF_OPTS += \ -DCMAKE_INSTALL_SYSCONFDIR="/etc/" -# Undefining _FILE_OFFSET_BITS here because of a "bug" with glibc fts.h -# large file support. -# https://bugzilla.redhat.com/show_bug.cgi?id=574992 -FLUENT_BIT_CFLAGS += -U_FILE_OFFSET_BITS - ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) FLUENT_BIT_DEPENDENCIES += libexecinfo FLUENT_BIT_LDFLAGS += -lexecinfo @@ -76,8 +69,7 @@ FLUENT_BIT_LDFLAGS += -latomic endif FLUENT_BIT_CONF_OPTS += \ - -DCMAKE_EXE_LINKER_FLAGS="$(FLUENT_BIT_LDFLAGS)" \ - -DCMAKE_C_FLAGS="$(FLUENT_BIT_CFLAGS)" + -DCMAKE_EXE_LINKER_FLAGS="$(FLUENT_BIT_LDFLAGS)" define FLUENT_BIT_INSTALL_INIT_SYSV $(INSTALL) -D -m 0755 package/fluent-bit/S99fluent-bit \ From b146a0b944dedf45153348761ac313ca9062a7c0 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 4 Mar 2024 16:50:09 +0100 Subject: [PATCH 5345/5754] package/rauc-hawkbit-updater: fix build with gcc 4.8 Fix the following build failure with gcc 4.8 raised since the addition of the package in commit 928b7219cd7079864eadadc66dbff21c5cd72804: ../src/hawkbit-client.c:873:17: error: 'for' loop initial declarations are only allowed in C99 mode for (const gint *code = &resumable_codes[0]; *code; code++) ^ ../src/hawkbit-client.c:873:17: note: use option -std=c99 or -std=gnu99 to compile your code Fixes: 928b7219cd7079864eadadc66dbff21c5cd72804 - http://autobuild.buildroot.org/results/e275d0ec4fe1da418a6163b46666316034b83b19 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk b/package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk index a453f75a28..3836d3c84e 100644 --- a/package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk +++ b/package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk @@ -10,5 +10,6 @@ RAUC_HAWKBIT_UPDATER_SOURCE = rauc-hawkbit-updater-$(RAUC_HAWKBIT_UPDATER_VERSIO RAUC_HAWKBIT_UPDATER_LICENSE = LGPL-2.1 RAUC_HAWKBIT_UPDATER_LICENSE_FILES = LICENSE RAUC_HAWKBIT_UPDATER_DEPENDENCIES = json-glib libcurl +RAUC_HAWKBIT_UPDATER_CFLAGS = $(TARGET_CFLAGS) -std=c99 $(eval $(meson-package)) From a9ccdc11704de3ac7aac892080e2cd8561dc3482 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 4 Mar 2024 16:54:26 +0100 Subject: [PATCH 5346/5754] package/tllist: fix build with gcc 4.8 Fix the following build failure with gcc 4.8 raised since the addition of the package in commit 996b786cfc03c3cf2ac631045650545c901e3075: In file included from ../test.c:7:0: ../test.c: In function 'main': ../tllist.h:213:17: error: 'for' loop initial declarations are only allowed in C99 mode for (int _i = 0; _i < __insize; _i++) { \ ^ Fixes: 996b786cfc03c3cf2ac631045650545c901e3075 - http://autobuild.buildroot.org/results/e82fdf4f9ef199e1baa169d38a75872bddd4e6dd Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/tllist/tllist.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/tllist/tllist.mk b/package/tllist/tllist.mk index 88a28d2427..69a34a65ab 100644 --- a/package/tllist/tllist.mk +++ b/package/tllist/tllist.mk @@ -12,5 +12,6 @@ TLLIST_LICENSE_FILES = LICENSE # header only TLLIST_INSTALL_TARGET = NO TLLIST_INSTALL_STAGING = YES +TLLIST_CFLAGS = $(TARGET_CFLAGS) -std=c99 $(eval $(meson-package)) From d4fdd78a7207935c24427bbe736c443f0ad2a745 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 4 Mar 2024 17:19:53 +0100 Subject: [PATCH 5347/5754] package/libva: fix build with gcc 4.8 Fix the following build failure with gcc 4.8 raised since bump to version 2.20.0 in commit e926c83928e08c0ecd6cd4383e1cca151a8a4d2c and https://github.com/intel/libva/commit/4f5a4345fc9f92565763ca22026891475e3cf835: ../va/va.c: In function 'va_new_opendriver': ../va/va.c:695:9: error: 'for' loop initial declarations are only allowed in C99 mode for (unsigned int i = 0; i < num_drivers; i++) ^ ../va/va.c:695:9: note: use option -std=c99 or -std=gnu99 to compile your code Fixes: e926c83928e08c0ecd6cd4383e1cca151a8a4d2c - http://autobuild.buildroot.org/results/b9dbd104fa05c59883d87f74e6522c55620a4252 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libva/libva.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libva/libva.mk b/package/libva/libva.mk index 9e9d5d698c..4481be9e7b 100644 --- a/package/libva/libva.mk +++ b/package/libva/libva.mk @@ -10,6 +10,7 @@ LIBVA_LICENSE = MIT LIBVA_LICENSE_FILES = COPYING LIBVA_INSTALL_STAGING = YES LIBVA_DEPENDENCIES = host-pkgconf libdrm +LIBVA_CFLAGS = $(TARGET_CFLAGS) -std=gnu99 # libdrm is a hard-dependency LIBVA_CONF_OPTS = \ From 11a577c19e23d0b774f357b2d62ac3c41b7f201f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 4 Mar 2024 17:07:57 +0100 Subject: [PATCH 5348/5754] package/botan: needs C++20 C++20 is mandatory since bump to version 3.2.0 in commit 2f8feb66204ff661e9fd5f508e2dfd1ebc0f2813 and https://github.com/randombit/botan/commit/e2efb744ceda875b193bc5ce589f2c45ceaa3a82 resulting in the following build failure: powerpc-linux-g++.br_real: error: unrecognized command line option '-std=c++20'; did you mean '-std=c++2a'? BR2_TOOLCHAIN_HAS_GCC_BUG_64735 dependency can be dropped as gcc > 7 is not affected by this bug Fixes: 2f8feb66204ff661e9fd5f508e2dfd1ebc0f2813 - http://autobuild.buildroot.org/results/4171515ce33832fb07c8b42cda2575067f9e9859 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/botan/Config.in | 11 +++-------- package/strongswan/Config.in | 11 +++-------- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/package/botan/Config.in b/package/botan/Config.in index 8f7f3f5c7a..5c3f31726e 100644 --- a/package/botan/Config.in +++ b/package/botan/Config.in @@ -14,10 +14,9 @@ config BR2_PACKAGE_BOTAN_ARCH_SUPPORTS config BR2_PACKAGE_BOTAN bool "botan" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_10 # C++20 depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_PACKAGE_BOTAN_ARCH_SUPPORTS - depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::future select BR2_PACKAGE_BOOST_FILESYSTEM if BR2_PACKAGE_BOOST && BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS select BR2_PACKAGE_BOOST_SYSTEM if BR2_PACKAGE_BOOST && BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS help @@ -25,11 +24,7 @@ config BR2_PACKAGE_BOTAN http://botan.randombit.net -comment "botan needs a toolchain w/ C++, threads, gcc >= 4.8" +comment "botan needs a toolchain w/ C++, threads, gcc >= 10" depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP \ - || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + || !BR2_TOOLCHAIN_GCC_AT_LEAST_10 depends on BR2_PACKAGE_BOTAN_ARCH_SUPPORTS - -comment "botan needs a toolchain not affected by GCC bug 64735" - depends on BR2_PACKAGE_BOTAN_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 diff --git a/package/strongswan/Config.in b/package/strongswan/Config.in index 9be5fe177d..a62688f9c3 100644 --- a/package/strongswan/Config.in +++ b/package/strongswan/Config.in @@ -35,19 +35,14 @@ config BR2_PACKAGE_STRONGSWAN_BOTAN bool "botan" depends on BR2_PACKAGE_BOTAN_ARCH_SUPPORTS depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 - depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_10 # botan select BR2_PACKAGE_BOTAN -comment "botan backend needs a toolchain w/ C++, gcc >= 4.8" +comment "botan backend needs a toolchain w/ C++, gcc >= 10" depends on !BR2_INSTALL_LIBSTDCPP \ - || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + || !BR2_TOOLCHAIN_GCC_AT_LEAST_10 depends on BR2_PACKAGE_BOTAN_ARCH_SUPPORTS -comment "botan backend needs a toolchain not affected by GCC bug 64735" - depends on BR2_PACKAGE_BOTAN_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 - config BR2_PACKAGE_STRONGSWAN_OPENSSL bool "OpenSSL" select BR2_PACKAGE_OPENSSL From fd484c1f57781aed6e99a61cbfae21e0edbe7dd8 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 4 Mar 2024 18:07:23 +0100 Subject: [PATCH 5349/5754] package/poco: fix BR2_SHARED_STATIC_LIBS build poco can't be built statically since commit 073a89196a22f995c142cd11640d3cfb7cef691d. However, commit add7c433d250e153d9e58fe7da3bd52171ba2652 enabled static (and shared) build with BR2_SHARED_STATIC_LIBS resulting in the following build failure since at least version 1.11.1: /home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/mips-buildroot-linux-gnu/11.2.0/../../../../mips-buildroot-linux-gnu/bin/ld: /home/buildroot/autobuild/instance-1/output-1/build/poco-1.11.1/lib/Linux/mips/libPocoXML.a(ParserEngine.o): in function `Poco::XML::ParserEngine::handleStartElement(void*, char const*, char const**)': ParserEngine.cpp:(.text+0x2f8): undefined reference to `XML_GetSpecifiedAttributeCount' Fixes: add7c433d250e153d9e58fe7da3bd52171ba2652 - http://autobuild.buildroot.org/results/afc434a13d5e7a8affa4abb4058d7bebc81aca29 - http://autobuild.buildroot.org/results/860b70a8c9c4a6a53247ac4bdb4fd0851b28c61a Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/poco/poco.mk | 6 ------ 1 file changed, 6 deletions(-) diff --git a/package/poco/poco.mk b/package/poco/poco.mk index b1d5a653c4..cc8a22fc2a 100644 --- a/package/poco/poco.mk +++ b/package/poco/poco.mk @@ -57,13 +57,7 @@ ifeq ($(BR2_SOFT_FLOAT),y) POCO_CONF_OPTS += --no-fpenvironment endif -ifeq ($(BR2_STATIC_LIBS),y) -POCO_MAKE_TARGET = static_release -else ifeq ($(BR2_SHARED_LIBS),y) POCO_MAKE_TARGET = shared_release -else ifeq ($(BR2_SHARED_STATIC_LIBS),y) -POCO_MAKE_TARGET = all_release -endif POCO_LDFLAGS=$(TARGET_LDFLAGS) ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) From 4766ace0d05dd264c37ee923634b897ba0dd3a43 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 5 Mar 2024 09:56:16 +0100 Subject: [PATCH 5350/5754] package/openblas: fix mips64 build Use MIPS64_GENERIC instead of SICORTEX with mips64 to avoid the following build failure raised at least since bump to version 0.3.25 in commit 6a172ffe6b2aa5c59427696775cfa4c189f99c19: ../kernel/mips64/amax.S:76: Error: opcode not supported on this processor: mips64 (mips64) `mtc1 $0,$f0' MIPS64_GENERIC is available since version 0.3.22 and https://github.com/OpenMathLib/OpenBLAS/commit/a50b29c540c25baf8f788131cc905ebe0575f253 Fixes: - http://autobuild.buildroot.org/results/b8da10aeb16343540ce3672faabdaa4d3bffb020 - http://autobuild.buildroot.org/results/32702ccaa2384252058840960d8998abca294fad Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/openblas/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/openblas/Config.in b/package/openblas/Config.in index 26a76d29fb..74c4a3aa5c 100644 --- a/package/openblas/Config.in +++ b/package/openblas/Config.in @@ -28,7 +28,7 @@ config BR2_PACKAGE_OPENBLAS_DEFAULT_TARGET default "PPC440FP2" if BR2_powerpc_440fp # P5600 is built with MSA support which is only available in Codescape toolchains default "P5600" if BR2_mips_p5600 && BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS - default "SICORTEX" if BR2_MIPS_CPU_MIPS64 + default "MIPS64_GENERIC" if BR2_MIPS_CPU_MIPS64 # I6400 is built with MSA support which is only available in Codescape toolchains default "I6400" if BR2_mips_i6400 && BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS # OpenBLAS assumes SPARC=Sparc v9 From 06026055fcef1d36f586c5e808ca595b9ab782f2 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 5 Mar 2024 10:13:02 +0100 Subject: [PATCH 5351/5754] package/ltp-testsuite: fix build with BR2_TIME_BITS_64 Do not remove _FILE_OFFSET_BITS=64 from CFLAGS and CPPFLAGS to avoid the following build failure with BR2_TIME_BITS_64 raised since commit 3c427c64726560ea1743282a3fdb78f5b28692eb: configure:5239: /home/autobuild/autobuild/instance-1/output-1/host/bin/mips-buildroot-linux-gnu-gcc -c -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_TIME_BITS=64 -Os -g2 -I/home/autobuild/autobuild/instance-1/output-1/host/bin/../mips-buildroot-linux-gnu/sysroot/usr/include/tirpc -fno-builtin -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_TIME_BITS=64 conftest.c >&5 In file included from /home/autobuild/autobuild/instance-1/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/features.h:394, from /home/autobuild/autobuild/instance-1/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/bits/libc-header-start.h:33, from /home/autobuild/autobuild/instance-1/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/limits.h:26, from /home/autobuild/autobuild/instance-1/output-1/host/lib/gcc/mips-buildroot-linux-gnu/13.2.0/include/limits.h:205, from /home/autobuild/autobuild/instance-1/output-1/host/lib/gcc/mips-buildroot-linux-gnu/13.2.0/include/syslimits.h:7, from /home/autobuild/autobuild/instance-1/output-1/host/lib/gcc/mips-buildroot-linux-gnu/13.2.0/include/limits.h:34, from conftest.c:12: /home/autobuild/autobuild/instance-1/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" 26 | # error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" | ^~~~~ [...] checking for /home/autobuild/autobuild/instance-1/output-1/host/bin/mips-buildroot-linux-gnu-gcc options needed to detect all undeclared functions... cannot detect configure: error: in `/home/autobuild/autobuild/instance-1/output-1/build/ltp-testsuite-20240129': configure: error: cannot make /home/autobuild/autobuild/instance-1/output-1/host/bin/mips-buildroot-linux-gnu-gcc report undeclared builtins Indeed, this LFS workaround was added by commit ca3524ba707126de7284210c00268a8e7ca6379a and is only needed to fix a build failure with the old codesourcery-arm toolchain from 2014 which uses glibc < 2.23. as glibc 2.23 was released in February 2016: https://sourceware.org/glibc/wiki/Release/2.23, drop this workaround as already done for libselinux in commit c1fa9bc2f7a4e5481edf4fce5c03dd45862fe72c. A follow-up patch will also drop codesourcery-arm toolchain. Fixes: - http://autobuild.buildroot.org/results/d2e75a79bc42b6a9a2b407fd557aca5c7f207d84 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/ltp-testsuite/ltp-testsuite.mk | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/package/ltp-testsuite/ltp-testsuite.mk b/package/ltp-testsuite/ltp-testsuite.mk index ea57686a9c..0996b77e58 100644 --- a/package/ltp-testsuite/ltp-testsuite.mk +++ b/package/ltp-testsuite/ltp-testsuite.mk @@ -47,10 +47,7 @@ else LTP_TESTSUITE_CONF_ENV += have_numa_headers=no endif -# ltp-testsuite uses , which isn't compatible with largefile -# support. -LTP_TESTSUITE_CFLAGS = $(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CFLAGS)) -LTP_TESTSUITE_CPPFLAGS = $(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CPPFLAGS)) +LTP_TESTSUITE_CFLAGS = $(TARGET_CFLAGS) LTP_TESTSUITE_LIBS = ifeq ($(BR2_PACKAGE_LIBTIRPC),y) @@ -66,7 +63,6 @@ endif LTP_TESTSUITE_CONF_ENV += \ CFLAGS="$(LTP_TESTSUITE_CFLAGS)" \ - CPPFLAGS="$(LTP_TESTSUITE_CPPFLAGS)" \ LIBS="$(LTP_TESTSUITE_LIBS)" \ SYSROOT="$(STAGING_DIR)" From 87e979e4572449ecb7d2058b02d642b38cc3b0f8 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 5 Mar 2024 14:46:21 +0100 Subject: [PATCH 5352/5754] Update for 2024.02 Signed-off-by: Peter Korsgaard --- CHANGES | 16 ++++++++++++++++ Makefile | 4 ++-- docs/website/download.html | 22 +++++++++++----------- docs/website/news.html | 21 +++++++++++++++++++++ support/misc/Vagrantfile | 2 +- 5 files changed, 51 insertions(+), 14 deletions(-) diff --git a/CHANGES b/CHANGES index d5f1bf5794..8f0b4042fa 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,19 @@ +2024.02, released March 5th, 2024 + + Various fixes. + + Updated/fixed packages: botan, conmon, dash, efivar, expat, + fluent-bit, gcc, gst1-vaapi, libcoap, libselinux, liburing, + libva, libxml2, ltp-testsuite, luvi, newlib-bare-metal, + nginx-naxsi, octave, openblas, openvmtools, parted, poco, + powertop, python-aiohttp, python-cheroot, python-django, + python-grpcio, rauc, rauc-hawkbit-updater, rtl8822cs, rust, + sdl2, shadow, spirv-tools, strace, strongswan, tar, tllist, + vim + + Removed packages: mysql (virtual), oracle-mysql, + python-setuptools-scm-git-archive + 2024.02-rc2, released March 1st, 2024 Fixes all over the tree. diff --git a/Makefile b/Makefile index 3389da2852..6d5e9a7972 100644 --- a/Makefile +++ b/Makefile @@ -90,9 +90,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2024.02-rc2 +export BR2_VERSION := 2024.02 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1709318000 +BR2_VERSION_EPOCH = 1709640000 # 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 70a1de5b6d..c1393134df 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -8,40 +8,40 @@
                                                            Download
                                                            -

                                                            Latest long term support release: 2023.02.10

                                                            +

                                                            Latest stable / long term support release: 2024.02

                                                            - +
                                                            - +
                                                            -

                                                            buildroot-2023.02.10.tar.gz

                                                            -

                                                            PGP signature

                                                            +

                                                            buildroot-2024.02.tar.gz

                                                            +

                                                            PGP signature

                                                            - +
                                                            - +
                                                            -

                                                            buildroot-2023.02.10.tar.xz

                                                            -

                                                            PGP signature

                                                            +

                                                            buildroot-2024.02.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 f142515889..a51da7f4bb 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,27 @@

                                                            News

                                                              +
                                                            • +
                                                              +
                                                              +
                                                              +

                                                              2023.02 released

                                                              +

                                                              5 March 2024

                                                              +
                                                              +
                                                              +

                                                              The stable 2024.02 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 + 2024.02 release.

                                                              + +

                                                              Notice that this is a long term support release which will be + supported with security and other important fixes until March 2025.

                                                              +
                                                              +
                                                              +
                                                              • +
                                                            • diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile index ba06c5f5fd..73bdcc8b5e 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2023.11.2' +RELEASE='2024.02' ### Change here for more memory/cores ### VM_MEMORY=2048 From 3cfd81f39da4a5ffc9596666733b70311038687e Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Tue, 5 Mar 2024 16:34:54 -0800 Subject: [PATCH 5353/5754] package/go: security bump to go1.21.8 Fixes the following CVEs: CVE-2024-24783: crypto/x509: Verify panics on certificates with an unknown public key algorithm CVE-2023-45290: net/http: memory exhaustion in Request.ParseMultipartForm CVE-2023-45289: net/http, net/http/cookiejar: incorrect forwarding of sensitive headers and cookies on HTTP redirect CVE-2024-24785: html/template: errors returned from MarshalJSON methods may break template escaping CVE-2024-24784: net/mail: comments in display names are incorrectly handled https://go.dev/doc/devel/release#go1.21.8 Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard (cherry picked from commit a94f816e4595e651e78eebfa49fa695cfe44cd77) 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 d008019e94..b1aed10c7c 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://go.dev/dl -sha256 00197ab20f33813832bff62fd93cca1c42a08cc689a32a6672ca49591959bff6 go1.21.7.src.tar.gz +sha256 dc806cf75a87e1414b5b4c3dcb9dd3e9cc98f4cfccec42b7af617d5a658a3c43 go1.21.8.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index 9efd4a3123..3ca055b25d 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.21.7 +GO_VERSION = 1.21.8 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz From 9e28f0493ffcd78de3ef1fad7077055fbd528362 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 5 Mar 2024 16:59:20 +0100 Subject: [PATCH 5354/5754] package/ell: bump to version 0.63 https://git.kernel.org/pub/scm/libs/ell/ell.git/tree/ChangeLog?h=0.63 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 2695f48ead67e951668d20240dbb9ad122d20f1d) Signed-off-by: Peter Korsgaard --- 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 8bc61ee293..f5ded676c3 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 c21ba3530d530c736f9b3e6acc954d4404c1ce4abaf2a4694e46ecec17653fa0 ell-0.61.tar.xz +sha256 7397c76996d7646b9917ebf016cd67586b10166295af2e0e18cdb5b8f6659965 ell-0.63.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/ell/ell.mk b/package/ell/ell.mk index 300c1eee88..f43dbdb5f7 100644 --- a/package/ell/ell.mk +++ b/package/ell/ell.mk @@ -4,7 +4,7 @@ # ################################################################################ -ELL_VERSION = 0.61 +ELL_VERSION = 0.63 ELL_SOURCE = ell-$(ELL_VERSION).tar.xz ELL_SITE = $(BR2_KERNEL_MIRROR)/linux/libs/ell ELL_LICENSE = LGPL-2.1+ From 415b829106e3c5befe0141b228d48c73e1238d47 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 5 Mar 2024 16:59:21 +0100 Subject: [PATCH 5355/5754] package/iwd: security bump to version 2.16 Fix CVE-2023-52161: The Access Point functionality in eapol_auth_key_handle in eapol.c in iNet wireless daemon (IWD) before 2.14 allows attackers to gain unauthorized access to a protected Wi-Fi network. An attacker can complete the EAPOL handshake by skipping Msg2/4 and instead sending Msg4/4 with an all-zero key. https://git.kernel.org/pub/scm/network/wireless/iwd.git/tree/ChangeLog?h=2.16 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit e2bcdcdd109561780e5e419ccaa3ca5135fa7b3e) Signed-off-by: Peter Korsgaard --- 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 4eea644842..3f18146e13 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 f7ac93aeef672604f5b5194ca038035ae222925be392c4345873c9742f477797 iwd-2.6.tar.xz +sha256 c1a82032e994861e794cf3b5a16d07ae1aa03a6674f716c73408ffeae2a233ba iwd-2.16.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/iwd/iwd.mk b/package/iwd/iwd.mk index f20427114b..af6b2f849a 100644 --- a/package/iwd/iwd.mk +++ b/package/iwd/iwd.mk @@ -4,7 +4,7 @@ # ################################################################################ -IWD_VERSION = 2.6 +IWD_VERSION = 2.16 IWD_SOURCE = iwd-$(IWD_VERSION).tar.xz IWD_SITE = $(BR2_KERNEL_MIRROR)/linux/network/wireless IWD_LICENSE = LGPL-2.1+ From 0e2e7fd65048fdf20b7babb2762d5e871475d3a6 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 5 Mar 2024 14:21:48 +0100 Subject: [PATCH 5356/5754] package/libcgroup: fix build with BR2_TIME_BITS_64 Do not remove _FILE_OFFSET_BITS=64 from CFLAGS and CPPFLAGS to avoid the following build failure with BR2_TIME_BITS_64 raised since commit 3c427c64726560ea1743282a3fdb78f5b28692eb: In file included from /home/fabrice/buildroot/output/host/mips-buildroot-linux-gnu/sysroot/usr/include/features.h:394, from ../include/libcgroup/error.h:9, from ../include/libcgroup.h:21, from log.c:15: /home/fabrice/buildroot/output/host/mips-buildroot-linux-gnu/sysroot/usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" 26 | # error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" | ^~~~~ Indeed, this LFS workaround is there since the addition of the package in commit ff7191c12e88b044848f6655f7015335235bdc7a and is only needed to fix a build failure with the old codesourcery-arm toolchain from 2014 which uses glibc < 2.23. as glibc 2.23 was released in February 2016: https://sourceware.org/glibc/wiki/Release/2.23, drop this workaround as already done for libselinux in commit c1fa9bc2f7a4e5481edf4fce5c03dd45862fe72c. A follow-up patch will also drop codesourcery-arm toolchain. Fixes: 3c427c64726560ea1743282a3fdb78f5b28692eb - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 1c2dbcdcf0bb589d325c379246acaa39bb07b7be) Signed-off-by: Peter Korsgaard --- package/libcgroup/libcgroup.mk | 7 ------- 1 file changed, 7 deletions(-) diff --git a/package/libcgroup/libcgroup.mk b/package/libcgroup/libcgroup.mk index cfe1d0f9f8..28f572d325 100644 --- a/package/libcgroup/libcgroup.mk +++ b/package/libcgroup/libcgroup.mk @@ -12,13 +12,6 @@ LIBCGROUP_CPE_ID_VALID = YES LIBCGROUP_DEPENDENCIES = host-bison host-flex LIBCGROUP_INSTALL_STAGING = YES -# Undefining _FILE_OFFSET_BITS here because of a "bug" with glibc fts.h -# large file support. See https://bugzilla.redhat.com/show_bug.cgi?id=574992 -# for more information. -LIBCGROUP_CONF_ENV = \ - CXXFLAGS="$(TARGET_CXXFLAGS) -U_FILE_OFFSET_BITS" \ - CFLAGS="$(TARGET_CFLAGS) -U_FILE_OFFSET_BITS" - LIBCGROUP_CONF_OPTS = \ --disable-daemon \ --disable-initscript-install From a81de0654de03980271065bc8070c04c5595837f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 5 Mar 2024 14:47:46 +0100 Subject: [PATCH 5357/5754] package/restorecond: fix build with BR2_TIME_BITS_64 Do not remove _FILE_OFFSET_BITS=64 from CFLAGS and CPPFLAGS to avoid the following build failure with BR2_TIME_BITS_64 raised since commit 3c427c64726560ea1743282a3fdb78f5b28692eb: In file included from /home/fabrice/buildroot/output/host/mips-buildroot-linux-gnu/sysroot/usr/include/features.h:394, from /home/fabrice/buildroot/output/host/mips-buildroot-linux-gnu/sysroot/usr/include/fts.h:53, from restore.h:6, from restore.c:1: /home/fabrice/buildroot/output/host/mips-buildroot-linux-gnu/sysroot/usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" 26 | # error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" | ^~~~~ Indeed, this LFS workaround was there since the addititon of the package in commit 9d6da7a264a5b36ad641a0d26b3a3d27188d3624 and is only needed to fix a build failure with the old codesourcery-arm toolchain from 2014 which uses glibc < 2.23. as glibc 2.23 was released in February 2016: https://sourceware.org/glibc/wiki/Release/2.23, drop this workaround as already done for libselinux in commit c1fa9bc2f7a4e5481edf4fce5c03dd45862fe72c. A follow-up patch will also drop codesourcery-arm toolchain. Fixes: 3c427c64726560ea1743282a3fdb78f5b28692eb - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 85acd9b5b9b46808749d1618b26789c782cc81a0) Signed-off-by: Peter Korsgaard --- package/restorecond/restorecond.mk | 5 ----- 1 file changed, 5 deletions(-) diff --git a/package/restorecond/restorecond.mk b/package/restorecond/restorecond.mk index cd40905230..96ef8d2a50 100644 --- a/package/restorecond/restorecond.mk +++ b/package/restorecond/restorecond.mk @@ -11,13 +11,8 @@ RESTORECOND_LICENSE_FILES = LICENSE RESTORECOND_DEPENDENCIES = libglib2 libsepol libselinux dbus-glib -# Undefining _FILE_OFFSET_BITS here because of a "bug" with glibc fts.h -# large file support. -# See https://bugzilla.redhat.com/show_bug.cgi?id=574992 for more information RESTORECOND_MAKE_OPTS += \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS) -U_FILE_OFFSET_BITS" \ - CPPFLAGS="$(TARGET_CPPFLAGS) -U_FILE_OFFSET_BITS" \ ARCH="$(BR2_ARCH)" # We need to pass DESTDIR at build time because it's used by From 890be8d4cfbfa48c05fde6f41fd76683f92dbf6b Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 5 Mar 2024 14:57:24 +0100 Subject: [PATCH 5358/5754] package/policycoreutils: fix build with BR2_TIME_BITS_64 Do not remove _FILE_OFFSET_BITS=64 from CFLAGS and CPPFLAGS to avoid the following build failure with BR2_TIME_BITS_64 raised since commit 3c427c64726560ea1743282a3fdb78f5b28692eb: In file included from /home/fabrice/buildroot/output/host/mips-buildroot-linux-gnu/sysroot/usr/include/features.h:394, from /home/fabrice/buildroot/output/host/mips-buildroot-linux-gnu/sysroot/usr/include/errno.h:25, from pp.c:20: /home/fabrice/buildroot/output/host/mips-buildroot-linux-gnu/sysroot/usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" 26 | # error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" | ^~~~~ Indeed, this LFS workaround was there since the addition of the package in commit cb328f77f8f07bfd89d6b69385c941a7b281732b and is only needed to fix a build failure with the old codesourcery-arm toolchain from 2014 which uses glibc < 2.23. as glibc 2.23 was released in February 2016: https://sourceware.org/glibc/wiki/Release/2.23, drop this workaround as already done for libselinux in commit c1fa9bc2f7a4e5481edf4fce5c03dd45862fe72c. A follow-up patch will also drop codesourcery-arm toolchain. Fixes: 3c427c64726560ea1743282a3fdb78f5b28692eb - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 0ac2d5a41ad776b493e6b0c44c760968a28ec81e) Signed-off-by: Peter Korsgaard --- package/policycoreutils/policycoreutils.mk | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/package/policycoreutils/policycoreutils.mk b/package/policycoreutils/policycoreutils.mk index 61d91066d4..0e639760fa 100644 --- a/package/policycoreutils/policycoreutils.mk +++ b/package/policycoreutils/policycoreutils.mk @@ -11,7 +11,7 @@ POLICYCOREUTILS_LICENSE_FILES = LICENSE POLICYCOREUTILS_CPE_ID_VENDOR = selinuxproject POLICYCOREUTILS_DEPENDENCIES = libsemanage libcap-ng $(TARGET_NLS_DEPENDENCIES) -POLICYCOREUTILS_MAKE_OPTS = LDLIBS=$(TARGET_NLS_LIBS) +POLICYCOREUTILS_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) LDLIBS=$(TARGET_NLS_LIBS) ifeq ($(BR2_PACKAGE_LINUX_PAM),y) POLICYCOREUTILS_DEPENDENCIES += linux-pam @@ -28,14 +28,6 @@ ifeq ($(BR2_PACKAGE_LINUX_PAM)$(BR2_PACKAGE_AUDIT),yy) POLICYCOREUTILS_MAKE_OPTS += LSPP_PRIV=y endif -# Undefining _FILE_OFFSET_BITS here because of a "bug" with glibc fts.h -# large file support. -# See https://bugzilla.redhat.com/show_bug.cgi?id=574992 for more information -POLICYCOREUTILS_MAKE_OPTS += \ - $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS) -U_FILE_OFFSET_BITS" \ - CPPFLAGS="$(TARGET_CPPFLAGS) -U_FILE_OFFSET_BITS" - POLICYCOREUTILS_MAKE_DIRS = \ load_policy newrole run_init \ secon semodule sestatus setfiles \ @@ -59,14 +51,9 @@ endef HOST_POLICYCOREUTILS_DEPENDENCIES = host-libsemanage -# Undefining _FILE_OFFSET_BITS here because of a "bug" with glibc fts.h -# large file support. -# See https://bugzilla.redhat.com/show_bug.cgi?id=574992 for more information -# We also need to pass PREFIX because it defaults to $(DESTDIR)/usr +# We need to pass PREFIX because it defaults to $(DESTDIR)/usr HOST_POLICYCOREUTILS_MAKE_OPTS = \ $(HOST_CONFIGURE_OPTS) \ - CFLAGS="$(HOST_CFLAGS) -U_FILE_OFFSET_BITS" \ - CPPFLAGS="$(HOST_CPPFLAGS) -U_FILE_OFFSET_BITS" \ PREFIX=$(HOST_DIR) \ ETCDIR=$(HOST_DIR)/etc \ SBINDIR=$(HOST_DIR)/sbin From bb6d0c06eb2981325c712cab197a73f44c15c1aa Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 5 Mar 2024 13:52:56 +0100 Subject: [PATCH 5359/5754] package/botan: fix build without NPTL botan unconditionally uses pthread_setname_np since bump to version 3.2.0 in commit 2f8feb66204ff661e9fd5f508e2dfd1ebc0f2813 and https://github.com/randombit/botan/commit/313e439c786d68bcf374b2cb0edfe3ffd891db94 resulting in the following build failure: src/lib/utils/os_utils.cpp:625:22: error: 'pthread_setname_np' was not declared in this scope 625 | static_cast(pthread_setname_np(thread.native_handle(), name.c_str())); | ^~~~~~~~~~~~~~~~~~ So only enable threads if NPTL is available Fixes: 2f8feb66204ff661e9fd5f508e2dfd1ebc0f2813 - http://autobuild.buildroot.org/results/03677de6270ff5de61fff2a76e5cd723aa34e64e Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit c944f455adf9730b1c72e70cf5b5e14a64a470be) Signed-off-by: Peter Korsgaard --- package/botan/Config.in | 5 ++--- package/botan/botan.mk | 6 ++++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/botan/Config.in b/package/botan/Config.in index 5c3f31726e..c74128bb9d 100644 --- a/package/botan/Config.in +++ b/package/botan/Config.in @@ -15,7 +15,6 @@ config BR2_PACKAGE_BOTAN bool "botan" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_GCC_AT_LEAST_10 # C++20 - depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_PACKAGE_BOTAN_ARCH_SUPPORTS select BR2_PACKAGE_BOOST_FILESYSTEM if BR2_PACKAGE_BOOST && BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS select BR2_PACKAGE_BOOST_SYSTEM if BR2_PACKAGE_BOOST && BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS @@ -24,7 +23,7 @@ config BR2_PACKAGE_BOTAN http://botan.randombit.net -comment "botan needs a toolchain w/ C++, threads, gcc >= 10" - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP \ +comment "botan needs a toolchain w/ C++, gcc >= 10" + depends on !BR2_INSTALL_LIBSTDCPP \ || !BR2_TOOLCHAIN_GCC_AT_LEAST_10 depends on BR2_PACKAGE_BOTAN_ARCH_SUPPORTS diff --git a/package/botan/botan.mk b/package/botan/botan.mk index 88dbfa5807..95352ea41b 100644 --- a/package/botan/botan.mk +++ b/package/botan/botan.mk @@ -48,6 +48,12 @@ else BOTAN_CONF_OPTS += --without-stack-protector endif +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS_NPTL),y) +BOTAN_CONF_OPTS += --with-os-feature=threads +else +BOTAN_CONF_OPTS += --without-os-feature=threads +endif + ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) BOTAN_CONF_OPTS += --without-os-feature=explicit_bzero,getauxval,getentropy endif From 2154c51a8618d6366cb1bd49af51bd1c39b048a7 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 5 Mar 2024 16:40:03 +0100 Subject: [PATCH 5360/5754] package/php: add libucontext optional dependency Select libucontext if the toolchain doesn't support ucontext to allow building php on musl Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 2824aa8a23a765b660219c129d4980f1b7c7691c) Signed-off-by: Peter Korsgaard --- package/php/Config.in | 3 +++ package/php/php.mk | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/package/php/Config.in b/package/php/Config.in index 69b4268c1d..af8574ac75 100644 --- a/package/php/Config.in +++ b/package/php/Config.in @@ -9,6 +9,7 @@ config BR2_PACKAGE_PHP_ARCH_SUPPORTS default y if BR2_RISCV_64 default y if BR2_s390x default y if BR2_TOOLCHAIN_HAS_UCONTEXT + default y if BR2_PACKAGE_LIBUCONTEXT_ARCH_SUPPORTS config BR2_PACKAGE_PHP bool "php" @@ -25,6 +26,8 @@ config BR2_PACKAGE_PHP BR2_USE_MMU select BR2_PACKAGE_PHP_SAPI_CLI if !BR2_USE_MMU select BR2_PACKAGE_PCRE2 + select BR2_PACKAGE_LIBUCONTEXT if \ + BR2_PACKAGE_LIBUCONTEXT_ARCH_SUPPORTS help PHP is a widely-used general-purpose scripting language that is especially suited for Web development diff --git a/package/php/php.mk b/package/php/php.mk index 4daf7f633d..28893be4c6 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -40,6 +40,11 @@ ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) PHP_EXTRA_LIBS += -latomic endif +ifeq ($(BR2_PACKAGE_LIBUCONTEXT),y) +PHP_DEPENDENCIES += libucontext +PHP_EXTRA_LIBS += -lucontext +endif + ifeq ($(call qstrip,$(BR2_TARGET_LOCALTIME)),) PHP_LOCALTIME = UTC else From 9b85ad4ace4181578f549ef665e966d6a14f9c5d Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 6 Mar 2024 13:18:23 +0100 Subject: [PATCH 5361/5754] package/squid: needs gcc and host gcc >= 8 cf_gen.cc is compiled by host compiler and unconditionally uses auto since bump to version 6.6 in commit c13199c9326fa2daa574f08ec8fc063a48d0eb06 and https://github.com/squid-cache/squid/commit/09835feb258c3058d028918e36d959dccb3f7496 resulting in the following build failure with host gcc < 8: /usr/bin/g++ -O2 -I/home/buildroot/autobuild/run/instance-1/output-1/host/include -o cf_gen ./cf_gen.cc -I. -I../include/ -I../src ./cf_gen.cc: In function 'int main(int, char**)': ./cf_gen.cc:268:63: error: forming reference to void auto &newEntry = entries.emplace_back(name); ^ So add a dependency on host gcc >= 8 and gcc >= 8 as advocated by upstream in https://github.com/squid-cache/squid/blob/9d3433c4ac6cd547c10cf298b8a5e61a463fb753/doc/release-notes/release-6.sgml.in: This release adds a dependency on C++17 support in any compiler used to build Squid. GCC 8+ and Clang 8+ support C++17. While at it, drop BR2_TOOLCHAIN_HAS_GCC_BUG_64735 which is always false with gcc >= 7 Fixes: c13199c9326fa2daa574f08ec8fc063a48d0eb06 - http://autobuild.buildroot.org/results/f1766d1a3b2ce7745fa23cdeae1101806cd97aea Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit b8db5c466046dc2f3d9c411e6c9924667dd1a40c) Signed-off-by: Peter Korsgaard --- package/squid/Config.in | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package/squid/Config.in b/package/squid/Config.in index 89b5a377c7..149884d815 100644 --- a/package/squid/Config.in +++ b/package/squid/Config.in @@ -1,18 +1,18 @@ -comment "squid needs a toolchain w/ C++, threads, gcc >= 7 not affected by bug 64735" +comment "squid needs a toolchain w/ C++, threads, gcc >= 8, host gcc >= 8" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_ATOMIC - depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 || \ - !BR2_INSTALL_LIBSTDCPP || \ + depends on !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_7 + !BR2_TOOLCHAIN_GCC_AT_LEAST_8 || \ + !BR2_HOST_GCC_AT_LEAST_8 config BR2_PACKAGE_SQUID bool "squid" depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::current_exception - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # C++17 + depends on BR2_HOST_GCC_AT_LEAST_8 # C++17 # needs fork() depends on BR2_USE_MMU select BR2_PACKAGE_LIBCAP From de6446f56dcf6ed1e6ac0084b471b3ead6c1d4c0 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 6 Mar 2024 20:26:04 +0100 Subject: [PATCH 5362/5754] linux: disable -Werror MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Disable -Werror to fix the following build failure with esp-hosted raised at least since commit a382a7d55432918d2a1e47ae4cbe7ed50fa17a08: In function ‘destroy_cmd_wq’, inlined from ‘esp_commands_teardown’ at /home/autobuild/autobuild/instance-4/output-1/build/esp-hosted-ce3c50a33fa4bc562a1b6cbcee292c1ae0b0a404/esp_hosted_ng/host/esp_cmd.c:1467:2: ./include/linux/workqueue.h:639:9: error: call to ‘__warn_flushing_systemwide_wq’ declared with attribute warning: Please avoid flushing system-wide workqueues. [-Werror=attribute-warning] 639 | __warn_flushing_systemwide_wq(); \ | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /home/autobuild/autobuild/instance-4/output-1/build/esp-hosted-ce3c50a33fa4bc562a1b6cbcee292c1ae0b0a404/esp_hosted_ng/host/esp_cmd.c:408:17: note: in expansion of macro ‘flush_scheduled_work’ 408 | flush_scheduled_work(); | ^~~~~~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/6ac7a4601938d3296ed1657c06f8cdf433757d73 - http://autobuild.buildroot.org/results/7997cc8a67645a6e1cf4e24d172c6feae459dcfb Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 6b56e0b4f09b36140e2cb9e41072d5ac6074f375) Signed-off-by: Peter Korsgaard --- linux/linux.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/linux/linux.mk b/linux/linux.mk index 53e2ad6d48..4e12b36c1f 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -436,6 +436,7 @@ define LINUX_KCONFIG_FIXUP_CMDS $(call KCONFIG_ENABLE_OPT,CONFIG_LOGO) $(call KCONFIG_ENABLE_OPT,CONFIG_LOGO_LINUX_CLUT224)) $(call KCONFIG_DISABLE_OPT,CONFIG_GCC_PLUGINS) + $(call KCONFIG_DISABLE_OPT,CONFIG_WERROR) $(PACKAGES_LINUX_CONFIG_FIXUPS) endef From 24156a64ecf35196374a0e653386298e8a4d9d3c Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Wed, 6 Mar 2024 17:45:40 -0800 Subject: [PATCH 5363/5754] package/docker-compose: bump version to 2.24.7 https://github.com/docker/compose/releases/tag/v2.24.7 Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard (cherry picked from commit 31abe2f6a9f5787e8ddb9ce9353b2ea72466be4c) Signed-off-by: Peter Korsgaard --- 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 92f7b227d3..ca3d08cf63 100644 --- a/package/docker-compose/docker-compose.hash +++ b/package/docker-compose/docker-compose.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ed132bcc226261a595469f5ca6d4ea20b02965867216b56d4e7a5962efb46570 docker-compose-2.24.5.tar.gz +sha256 931bfcc34eb43106be07787372bb853d4cd82830a5785f3049c5192ab0e4ac35 docker-compose-2.24.7.tar.gz sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd LICENSE diff --git a/package/docker-compose/docker-compose.mk b/package/docker-compose/docker-compose.mk index 947f09d0b3..5417ba2d4f 100644 --- a/package/docker-compose/docker-compose.mk +++ b/package/docker-compose/docker-compose.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_COMPOSE_VERSION = 2.24.5 +DOCKER_COMPOSE_VERSION = 2.24.7 DOCKER_COMPOSE_SITE = $(call github,docker,compose,v$(DOCKER_COMPOSE_VERSION)) DOCKER_COMPOSE_LICENSE = Apache-2.0 DOCKER_COMPOSE_LICENSE_FILES = LICENSE From 312dea63e722a305d99bf287b6da7b99a2329f62 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 11 Feb 2024 23:27:05 +0100 Subject: [PATCH 5364/5754] package/util-linux: bump to version 2.39.3 Fixes: http://autobuild.buildroot.net/results/623/623b21e29693e1de8945cb25e258488f06e6040e/ Changes between 2.39.2 and 2.39.3: 2da5c904e18fdcffd2b252d641e6f76374c7b406 build-sys: release++ (v2.39.3) 03c939edda81c5a4d6e5f5c1cb896e79c1e82e16 docs: update v2.39.3-ReleaseNotes dafb120ef79c878cfd1b65c1d1c46497f17a7f7e docs: update AUTHORS file bfc9691ce5d964b87f6c02cc236361b4772456d0 po-man: merge changes d2232b60963a6e4e43fd359d1a4b552c4291b327 po: merge changes 4ab356c1c02c34cd3935e1bb0aa47ed6e27cfe3c po: add ro.po (from translationproject.org) 7e147d16c06f14b3f760b620d4f359cef12fe4ad po: update es.po (from translationproject.org) e8cb61f07430d5f1d624245a219c2e21694c5f52 lsfd: fix memory leak in append_filter_expr() 192d8aaa07e088e44fcb78736a53baae1ead7ccd lsfd: avoid undefined behavior 756588f8c8b2ed93c124ca15cfb3f0efc4a0f9f6 lsfd: (man) fix the form for the optional argument of --inet option 8d78c1306d1a9d5ebf9ec058344685da0360b87b Add Phytium FTC310 & FTC664 support b75322cdb13c6c0b3789ff8fc19dcd017c069784 Add Phytium FTC862 cpu model. fix:#2486 ec1b0eb36bd6c5a5079293ab03241163f61a8bf4 libmount: accept '\' as escape for options separator 2e5f5c8d85338811595d321a77647a40e12321c9 tests: add ts_skip_docker 0b3254cac3a275bbe32af57c6037cd29c21324d7 Merge branch 'stable-2.39/bcachefs-fixes' of https://github.com/t-8ch/util-linux into PR/stable-v2.39.3 6498439340a16e6acee54987df016c6b7928b17a tests: skip broken tests on docker fa9b5365861934faab9ba73bd405095f56f02e45 libblkid: (bcachefs) add support for sub-device labels 3c5d991b0323b33816e661e52da5d6f5402f47b5 libblkid: (bcachefs) adapt to major.minor version ece194082fb318d0fa3fec31193ce6f61b97c67a libuuid: avoid truncate clocks.txt to improve performance 84a62c1a5a614bde2530544bf2558c73f0179d42 libuuid/src/gen_uuid.c: fix cs_min declaration 93239aa7869ddd236db8e5a28b4e6873ce6e0f22 libmount: fix possible NULL dereference [coverity scan] a6def815e21d50db7a99ec74080c3fd7eb64e934 meson: install wall executable with group 'tty' c6c1c69c3e83606eced938d841af03c1acef03a0 meson: install write executable with group 'tty' bf2cd1d5a6eb273fbb11931b86ae165e7da5a397 libmount: improve mnt_table_next_child_fs() c14f5bf37adf681c378fc004f0996e0bcfd30ce0 docs: add SPDX to boilerplate.c fdd9f11f5e38b044617d3bc5f6c00789096b233f disk-utils: add SPDX and Copyright notices e7dbe9c788da98b86f8cf87bc20ec74e32206451 include/audit-arch: add missing SPDX 5ec7b14a72d9893d2a8d8c7f40cd45b44c9575c9 setterm: avoid restoring flags from uninitialized memory 64d2300e6443c311219f187433046751a86ed18e Fix man page for col to correct documentation error 7cc2c962567fe40daa9b12481224e5a0e6f96c47 Update col.c to fix option mistake 122d7e7afb44d8a823e362673b0d2d1e31f7d478 umount: handle bindmounts during --recursive da18b31ff1cb504e3d288f77d1f1d1179c39e4d8 lscpu: fix caches separator for --parse= 3a5c9c1dd6935fb16f15f210b80ce9c5228e6a19 Use empty libuser config file. 7058d793def09c3d4645e9efd1d8a5d212e839b0 libblkid: exfat: fix fail to find volume label d065ff00a36b7244842f743372099837bc61328b blkpr: store return value of getopt_long in int 9ca6f1712a5803e32e26e065e32e99837ba8b5d2 lib/path: Set errno in case of fgets failure e2f0aa5c25c0295ef6187d3c53c2801fe17385e5 autotools: fix AC_DEFINE_UNQUOTED() use cefd05c479e5456af8db2a86fabad165d247176b autotools: fix librtas check f27fbafb24bdcefaa2463d47abc18491c3497451 lib/path: fix typos f8ab70477e2ca7ac050fd4e2337b76a1972c8aa3 lib/path: set errno in case of error 5ec30a362a5dd91c018c04a64fd1a481029dc4c6 lib/path: fix possible out of boundary access edc723cd3341ff3d3e660051525dca40a2af6b3b libblkid: reset errno before calling probefuncs 8de89778b945d552796f09576925310810ce798b setpriv: fix group argument completion 41599054c7248f12c8a54d02f7161d0aff4275a9 libfdisk: reset errno before calling read() cce4e44059405f3170b166fbf1774bf4b89c11c4 blkid: fix call to err_exclusive_options b718f985cb6cc3bc65618649e9f231ecafcf81fb docs: use HTTPS for GitHub clone URLs 2bddfa6928af328675b2ffbfc9b6546e9ee81722 libblkid: (probe) handle probe without chain gracefully 3d31216787d6725fed361d27f0f01aff6ef46981 lib/idcache: always gracefully handle null cache 368521e45e1c9cb44145fc72c04d1cc903a883e8 script-playutils: close filestream in case ignore_line() fails 087b0d2383b8ab1ee4564d692d5f797ac781896f libblkid: (vxfs) report endianness 7e5056f33bdfd867ce6f1a642f560fdf0b402c1e libblkid: (ntfs) validate that sector_size is a power of two f368ccc759f9684338da723a93449764d0a8e312 libsmartcols: handle nameless tables in export format f5cace8da07291c94b76b5cf80da1f921be67419 ldattach: don't call exit() from signal handler 03c12a34c58d2550c6c718275950866d387d33f5 lslogins: fix realloc() loop allocation size 83ba179b12d3c6c5f400bf78f2f742b1cc7ce256 lib/env: avoid underflow of read_all_alloc() return value 813851fba28cb3ecde6a7f0c90a7e343920cd8c7 libblkid: avoid memory leak of cachefile path 4459623cde42a5d021a6d71e38fcdfd4fff3e171 libmount: gracefully handle NULL path in mnt_resolve_target() dbde7a537f27b23d64a8d3f583af472357de7192 more: avoid out-of-bound access c26badd5d4295d52e987c75e69113edfb407fb27 libfdisk: handle allocation failure in fdisk_new_partition 5c250aa6425fc3e35c07bce019eb4b7fa34bf722 login: Use pid_t for child_pid be3f1712ee2e1e43d9b82b7cf4987c8a609a81ef login: move comment 98be90b5bafa66d98655f8639efb3ffa984fc530 build-sys: fix libmount/src/hooks.c use a711af02d32c0a0a31f1bbb943ffff2e94203e86 lscpu: Use 4K buffer size instead of BUFSIZ 45c6136cba5f7607cca08c5aaab8e9b22ef87c25 autotools: fix typos aa98c4ecc938a3459ffb759a444a8a585a9d0a3a libmount: make.stx_mnt_id use more robust c697c2bb69f55aa24b6c0e2e752548f823c53796 libmount: report statx in features list 13711f3ab79dfa92e8815eb9b752ec2bf4832d80 libmount: fix statx() includes e9ed5a2b80bf8a76924caf8cd93b4cfff4d210a7 libblkid: (vfat) avoid modifying shared buffer d2cadf0992cce589bfffeb603325c3c2fe54a991 libblkid: (jmicron_raid) use checksum APIs c54c99efd0c3fc7f1e8db8b7191a6e1e3b295f1f libblkid: (jmicron_raid) avoid modifying shared buffer 64418c52bc594abf01fc4ae8148e7aa93e4b3f22 libblkid: (zonefs) avoid modifying shared buffer b66da7ce4a04d6c960817a56fe82498c4e7dea44 losetup: fix JSON MAJ:MIN 44d7bf2c8d1c6d34a40416807d16db6c07ac4916 lslogins: (man) fix -y option formatting 7d6c71e51ed3c5f8505c67962b6d03490738a879 include: add DragonFlyBSD GPT partition types 6b9fda87c4e5d0c6f945d7565197f157b9fa3d5f libblkid: (bcachefs) fix size validation acbf17ae8f8ee0f941fe98ed12f115f2b349bba8 libblkid: (bcachefs) fix compiler warning [-Werror=sign-compare] 1ec71634aa4ef5ddca23d65c8a296f3614231e8a libblkid: (bcachefs) fix not detecting large superblocks 68564ebb50f8afab5a9527c534417e247cca0b27 libmount: Fix regression when mounting with atime We can drop 0001-libuuid-src-gen_uuid.c-fix-cs_min-declaration.patch as it was backported by upstream to the 2.39.x branch, and included in 2.39.3. Update the hash for README.licensing after upstream clarified the licensing situation with https://github.com/util-linux/util-linux/commit/fdd9f11f5e38b044617d3bc5f6c00789096b233f Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard (cherry picked from commit 45a3a8bd5a26953d4f5419fda7079fa0608dd43f) Signed-off-by: Peter Korsgaard --- ...rc-gen_uuid.c-fix-cs_min-declaration.patch | 80 ------------------- package/util-linux/util-linux.hash | 4 +- package/util-linux/util-linux.mk | 2 +- 3 files changed, 3 insertions(+), 83 deletions(-) delete mode 100644 package/util-linux/0001-libuuid-src-gen_uuid.c-fix-cs_min-declaration.patch diff --git a/package/util-linux/0001-libuuid-src-gen_uuid.c-fix-cs_min-declaration.patch b/package/util-linux/0001-libuuid-src-gen_uuid.c-fix-cs_min-declaration.patch deleted file mode 100644 index bba4d54619..0000000000 --- a/package/util-linux/0001-libuuid-src-gen_uuid.c-fix-cs_min-declaration.patch +++ /dev/null @@ -1,80 +0,0 @@ -From bcd11dece7d278bb0b76b138d08dedea80fa8262 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 7 Nov 2023 18:43:57 +0100 -Subject: [PATCH] libuuid/src/gen_uuid.c: fix cs_min declaration - -Define cs_min through a define and not a const int to avoid the -following build failure with -O0 raised since version 2.39 and -https://github.com/util-linux/util-linux/commit/2fa4168c8bc9d5438bc1dfadda293c7c21b6fa59: - -libuuid/src/gen_uuid.c: In function 'uuid_generate_time_generic': -libuuid/src/gen_uuid.c:536:33: error: initializer element is not constant - THREAD_LOCAL int cache_size = cs_min; - ^~~~~~ - -For consistency, also use define for cs_max and cs_factor - -Fixes: - - http://autobuild.buildroot.org/results/2f80a5cdb523cc3c8c0f3693607a1be036b2ae98 - -Signed-off-by: Fabrice Fontaine -Upstream: https://github.com/util-linux/util-linux/commit/07e5c29d501c19e7af84fecb5915e0f9f94cb49f ---- - libuuid/src/gen_uuid.c | 19 ++++++++++--------- - 1 file changed, 10 insertions(+), 9 deletions(-) - -diff --git a/libuuid/src/gen_uuid.c b/libuuid/src/gen_uuid.c -index 619ef0131..db793c374 100644 ---- a/libuuid/src/gen_uuid.c -+++ b/libuuid/src/gen_uuid.c -@@ -518,6 +518,10 @@ int __uuid_generate_time_cont(uuid_t out, int *num, uint32_t cont_offset) - return __uuid_generate_time_internal(out, num, cont_offset); - } - -+#define CS_MIN (1<<6) -+#define CS_MAX (1<<18) -+#define CS_FACTOR 2 -+ - /* - * Generate time-based UUID and store it to @out - * -@@ -529,11 +533,8 @@ int __uuid_generate_time_cont(uuid_t out, int *num, uint32_t cont_offset) - static int uuid_generate_time_generic(uuid_t out) { - #ifdef HAVE_TLS - /* thread local cache for uuidd based requests */ -- const int cs_min = (1<<6); -- const int cs_max = (1<<18); -- const int cs_factor = 2; - THREAD_LOCAL int num = 0; -- THREAD_LOCAL int cache_size = cs_min; -+ THREAD_LOCAL int cache_size = CS_MIN; - THREAD_LOCAL int last_used = 0; - THREAD_LOCAL struct uuid uu; - THREAD_LOCAL time_t last_time = 0; -@@ -552,10 +553,10 @@ static int uuid_generate_time_generic(uuid_t out) { - * Start with a small cache size to cover short running applications - * and adjust the cache size over the runntime. - */ -- if ((last_used == cache_size) && (cache_size < cs_max)) -- cache_size *= cs_factor; -- else if ((last_used < (cache_size / cs_factor)) && (cache_size > cs_min)) -- cache_size /= cs_factor; -+ if ((last_used == cache_size) && (cache_size < CS_MAX)) -+ cache_size *= CS_FACTOR; -+ else if ((last_used < (cache_size / CS_FACTOR)) && (cache_size > CS_MIN)) -+ cache_size /= CS_FACTOR; - - num = cache_size; - -@@ -568,7 +569,7 @@ static int uuid_generate_time_generic(uuid_t out) { - } - /* request to daemon failed, reset cache */ - num = 0; -- cache_size = cs_min; -+ cache_size = CS_MIN; - } - if (num > 0) { /* serve uuid from cache */ - uu.time_low++; --- -2.43.0 - diff --git a/package/util-linux/util-linux.hash b/package/util-linux/util-linux.hash index 1638cd9967..d47f47fdba 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.39/sha256sums.asc -sha256 87abdfaa8e490f8be6dde976f7c80b9b5ff9f301e1b67e3899e1f05a59a1531f util-linux-2.39.2.tar.xz +sha256 7b6605e48d1a49f43cc4b4cfc59f313d0dd5402fa40b96810bd572e167dfed0f util-linux-2.39.3.tar.xz # License files, locally calculated -sha256 64dfeae1519bf0e27563d905a71264310fb6a8fa74e5cf99bb36e4d30d7ef455 README.licensing +sha256 13f0ea46d12d798c095a6ad39d7ddc988e2e4d274c6494115f6b463f7bc4f702 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 72126adb00..a9e5b0bf68 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -8,7 +8,7 @@ # util-linux-libs/util-linux-libs.mk needs to be updated accordingly as well. UTIL_LINUX_VERSION_MAJOR = 2.39 -UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).2 +UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).3 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) From e7529976cceb2de105d4a9330bd16abc0acb2189 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 9 Mar 2024 17:52:37 +0100 Subject: [PATCH 5365/5754] package/bitcoin: security bump to version 26.0 For all release notes since 0.21.2, see [1]. This commit also: - removes the package patches, all included in this release, - removes the patch entry in ".checkpackageignore", - adds a comment about pgp signature check in the hash file, - updates the license hash, due to year update, - adds the requirement on gcc >= 9, see [2], - removes the dependency on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 which is no longer needed, due to the gcc version requirement. Fixes: - [3] Note: this CVE-2023-33297 is not explicitly mentioned in the Bitcoin core release notes. It is not either appearing in CVE list at [4]. The change corresponding to this vulnerability is "#27610 Improve performance of p2p inv to send queues" in the version 24.1 release note. See [5] and [6]. [1] https://github.com/bitcoin/bitcoin/tree/v26.0/doc/release-notes [2] https://github.com/bitcoin/bitcoin/blob/v26.0/doc/dependencies.md [3] https://nvd.nist.gov/vuln/detail/CVE-2023-33297 [4] https://en.bitcoin.it/wiki/Common_Vulnerabilities_and_Exposures [5] https://github.com/bitcoin/bitcoin/blob/v26.0/doc/release-notes/release-notes-24.1.md?plain=1#L45 [6] https://github.com/bitcoin/bitcoin/pull/27610 Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard (cherry picked from commit a3a88ff1c85ba0067af1028bc232f8f61b628979) Signed-off-by: Peter Korsgaard --- .checkpackageignore | 1 - ...rc-randomenv.cpp-fix-build-on-uclibc.patch | 48 ------------------- ...includes-to-fix-gcc-13-compile-error.patch | 48 ------------------- ...efactor-add-most-of-src-util-to-iwyu.patch | 34 ------------- .../0004-src-util-string-h-fix-gcc13.patch | 23 --------- package/bitcoin/Config.in | 11 ++--- package/bitcoin/bitcoin.hash | 8 ++-- package/bitcoin/bitcoin.mk | 2 +- 8 files changed, 10 insertions(+), 165 deletions(-) delete mode 100644 package/bitcoin/0001-src-randomenv.cpp-fix-build-on-uclibc.patch delete mode 100644 package/bitcoin/0002-Add-missing-includes-to-fix-gcc-13-compile-error.patch delete mode 100644 package/bitcoin/0003-refactor-add-most-of-src-util-to-iwyu.patch delete mode 100644 package/bitcoin/0004-src-util-string-h-fix-gcc13.patch diff --git a/.checkpackageignore b/.checkpackageignore index f4bfa12e1e..eec1a00e40 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -197,7 +197,6 @@ 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/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 diff --git a/package/bitcoin/0001-src-randomenv.cpp-fix-build-on-uclibc.patch b/package/bitcoin/0001-src-randomenv.cpp-fix-build-on-uclibc.patch deleted file mode 100644 index 8038a311d3..0000000000 --- a/package/bitcoin/0001-src-randomenv.cpp-fix-build-on-uclibc.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 330cb33985d0ce97c20f4a0f0bbda0fbffe098d4 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 9 Nov 2020 21:18:40 +0100 -Subject: [PATCH] src/randomenv.cpp: fix build on uclibc - -Check for HAVE_STRONG_GETAUXVAL or HAVE_WEAK_GETAUXVAL before using -getauxval to avoid a build failure on uclibc - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/bitcoin/bitcoin/pull/20358] ---- - src/randomenv.cpp | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/randomenv.cpp b/src/randomenv.cpp -index 07122b7f6..5e07c3db4 100644 ---- a/src/randomenv.cpp -+++ b/src/randomenv.cpp -@@ -53,7 +53,7 @@ - #include - #endif - #endif --#ifdef __linux__ -+#if defined(HAVE_STRONG_GETAUXVAL) || defined(HAVE_WEAK_GETAUXVAL) - #include - #endif - -@@ -326,7 +326,7 @@ void RandAddStaticEnv(CSHA512& hasher) - // Bitcoin client version - hasher << CLIENT_VERSION; - --#ifdef __linux__ -+#if defined(HAVE_STRONG_GETAUXVAL) || defined(HAVE_WEAK_GETAUXVAL) - // Information available through getauxval() - # ifdef AT_HWCAP - hasher << getauxval(AT_HWCAP); -@@ -346,7 +346,7 @@ void RandAddStaticEnv(CSHA512& hasher) - const char* exec_str = (const char*)getauxval(AT_EXECFN); - if (exec_str) hasher.Write((const unsigned char*)exec_str, strlen(exec_str) + 1); - # endif --#endif // __linux__ -+#endif // HAVE_STRONG_GETAUXVAL || HAVE_WEAK_GETAUXVAL - - #ifdef HAVE_GETCPUID - AddAllCPUID(hasher); --- -2.28.0 - diff --git a/package/bitcoin/0002-Add-missing-includes-to-fix-gcc-13-compile-error.patch b/package/bitcoin/0002-Add-missing-includes-to-fix-gcc-13-compile-error.patch deleted file mode 100644 index 22c0ca2adf..0000000000 --- a/package/bitcoin/0002-Add-missing-includes-to-fix-gcc-13-compile-error.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 339a95b7537b47e5d6b732c0633a00afd96e3ca0 Mon Sep 17 00:00:00 2001 -From: MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz> -Date: Thu, 19 Jan 2023 19:35:43 +0100 -Subject: [PATCH] Add missing includes to fix gcc-13 compile error - -Upstream: https://github.com/bitcoin/bitcoin/commit/fadeb6b103cb441e0e91ef506ef29febabb10715 - -Signed-off-by: Bernd Kuhls ---- - src/support/lockedpool.cpp | 3 +++ - src/support/lockedpool.h | 4 ++-- - 2 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/src/support/lockedpool.cpp b/src/support/lockedpool.cpp -index 26de780f2..11131d551 100644 ---- a/src/support/lockedpool.cpp -+++ b/src/support/lockedpool.cpp -@@ -22,6 +22,9 @@ - #endif - - #include -+#include -+#include -+#include - #ifdef ARENA_DEBUG - #include - #include -diff --git a/src/support/lockedpool.h b/src/support/lockedpool.h -index b9e2e99d1..25b4c0f36 100644 ---- a/src/support/lockedpool.h -+++ b/src/support/lockedpool.h -@@ -5,11 +5,11 @@ - #ifndef BITCOIN_SUPPORT_LOCKEDPOOL_H - #define BITCOIN_SUPPORT_LOCKEDPOOL_H - --#include -+#include - #include - #include --#include - #include -+#include - #include - - /** --- -2.39.2 - diff --git a/package/bitcoin/0003-refactor-add-most-of-src-util-to-iwyu.patch b/package/bitcoin/0003-refactor-add-most-of-src-util-to-iwyu.patch deleted file mode 100644 index 095fa648dd..0000000000 --- a/package/bitcoin/0003-refactor-add-most-of-src-util-to-iwyu.patch +++ /dev/null @@ -1,34 +0,0 @@ -From c187efa907fd64ea2c7b7d699c5c97f9d5b79960 Mon Sep 17 00:00:00 2001 -From: fanquake -Date: Thu, 9 Jun 2022 16:26:55 +0100 -Subject: [PATCH] refactor: add most of src/util to iwyu - -These files change infrequently, and not much header shuffling is required. - -We don't add everything in src/util/ yet, because IWYU makes some -dubious suggestions, which I'm going to follow up with upstream. - -Upstream: https://github.com/bitcoin/bitcoin/commit/07f2c25d04c39a0074e1d9ee1b24b3e359c8153f - -[Bernd: backported relevant part from upstream commit to version 0.21.2 - to fix build error with gcc 13.x] -Signed-off-by: Bernd Kuhls ---- - src/util/bip32.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/util/bip32.h b/src/util/bip32.h -index 347e83db9..6ef051c48 100644 ---- a/src/util/bip32.h -+++ b/src/util/bip32.h -@@ -6,6 +6,7 @@ - #define BITCOIN_UTIL_BIP32_H - - #include -+#include - #include - #include - --- -2.39.2 - diff --git a/package/bitcoin/0004-src-util-string-h-fix-gcc13.patch b/package/bitcoin/0004-src-util-string-h-fix-gcc13.patch deleted file mode 100644 index 00a9ef2b97..0000000000 --- a/package/bitcoin/0004-src-util-string-h-fix-gcc13.patch +++ /dev/null @@ -1,23 +0,0 @@ -From fa2deae2a86417d7e0d4cd33fb933b1000d20313 Mon Sep 17 00:00:00 2001 -From: MacroFake -Date: Thu, 5 May 2022 08:28:29 +0200 -Subject: [PATCH] Wrap boost::replace_all - -Upstream: https://github.com/bitcoin/bitcoin/commit/fa2deae2a86417d7e0d4cd33fb933b1000d20313 - -[Bernd: backported relevant part from upstream commit to version 0.21.2 - to fix build error with gcc 13.x] -Signed-off-by: Bernd Kuhls ---- -diff --git a/src/util/string.h b/src/util/string.h -index 2e91347b27a10..df20e34ae9aaa 100644 ---- a/src/util/string.h -+++ b/src/util/string.h -@@ -9,6 +9,7 @@ - - #include - #include -+#include - #include - #include - #include diff --git a/package/bitcoin/Config.in b/package/bitcoin/Config.in index a344811d6b..c4a2447fc9 100644 --- a/package/bitcoin/Config.in +++ b/package/bitcoin/Config.in @@ -11,8 +11,8 @@ config BR2_PACKAGE_BITCOIN bool "bitcoin" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-thread, boost-filesystem - depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::future depends on BR2_PACKAGE_BITCOIN_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9 depends on BR2_TOOLCHAIN_HAS_THREADS # boost depends on BR2_USE_WCHAR select BR2_PACKAGE_BOOST @@ -36,12 +36,9 @@ config BR2_PACKAGE_BITCOIN https://bitcoincore.org -comment "bitcoin needs a toolchain w/ C++, threads, wchar" +comment "bitcoin needs a toolchain w/ C++, threads, wchar, gcc >= 9" depends on BR2_PACKAGE_BITCOIN_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS depends on !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR - -comment "bitcoin needs a toolchain not affected by GCC bug 64735" - depends on BR2_PACKAGE_BITCOIN_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 + !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_9 diff --git a/package/bitcoin/bitcoin.hash b/package/bitcoin/bitcoin.hash index 643fcbc141..6b3008af86 100644 --- a/package/bitcoin/bitcoin.hash +++ b/package/bitcoin/bitcoin.hash @@ -1,5 +1,7 @@ -# From https://bitcoincore.org/bin/bitcoin-core-0.21.2/SHA256SUMS.asc -sha256 4146f751fc5691bdcf911cbdb8d32d8d25c297d29d58173227ae1ae6438edb9e bitcoin-0.21.2.tar.gz +# Hash from: https://bitcoincore.org/bin/bitcoin-core-26.0/SHA256SUMS +# After checking pgp signature from: +# https://bitcoincore.org/bin/bitcoin-core-26.0/SHA256SUMS.asc +sha256 ab1d99276e28db62d1d9f3901e85ac358d7f1ebcb942d348a9c4e46f0fcdc0a1 bitcoin-26.0.tar.gz # Hash for license file -sha256 96fe807030b21f88305adc32af62f9aa19915f2783509fd6f52aea02cf83f644 COPYING +sha256 a6331cd1f889397adfc0c3b0535682a20950c6cf8e5c712e9997a15ce98324e1 COPYING diff --git a/package/bitcoin/bitcoin.mk b/package/bitcoin/bitcoin.mk index 10ae32202c..493c569336 100644 --- a/package/bitcoin/bitcoin.mk +++ b/package/bitcoin/bitcoin.mk @@ -4,7 +4,7 @@ # ################################################################################ -BITCOIN_VERSION = 0.21.2 +BITCOIN_VERSION = 26.0 BITCOIN_SITE = https://bitcoincore.org/bin/bitcoin-core-$(BITCOIN_VERSION) BITCOIN_AUTORECONF = YES BITCOIN_LICENSE = MIT From 3e89511377b3829dfe0e3a38fa5fc97df6decc0b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 7 Mar 2024 18:42:18 +0100 Subject: [PATCH 5366/5754] package/kodi: bump version to 20.5-Nexus Release notes: https://github.com/xbmc/xbmc/releases/tag/20.5-Nexus Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 36ed69f0bf6415243741e8d5b5357ab7c91a57b4) Signed-off-by: Peter Korsgaard --- package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk | 2 +- package/kodi-texturepacker/kodi-texturepacker.mk | 2 +- package/kodi/kodi.hash | 2 +- package/kodi/kodi.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk index b785a71b6e..a43ee57e00 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.4-Nexus +KODI_JSONSCHEMABUILDER_VERSION = 20.5-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 9810193014..e640ab3a90 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.4-Nexus +KODI_TEXTUREPACKER_VERSION = 20.5-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/kodi.hash b/package/kodi/kodi.hash index 7b26778b68..b497ab7dca 100644 --- a/package/kodi/kodi.hash +++ b/package/kodi/kodi.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 ccb2d3e382b5ae628a89db2325f5e778f1770a2a182f6eaa25645a22ccdffb18 kodi-20.4-Nexus.tar.gz +sha256 9bf3257ebf251d20f276b7f90681985a270779150af2fb395d4b593c04002deb kodi-20.5-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 eebb48238a..085169367d 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.4 +KODI_VERSION_MAJOR = 20.5 KODI_VERSION_NAME = Nexus KODI_VERSION = $(KODI_VERSION_MAJOR)-$(KODI_VERSION_NAME) KODI_SITE = $(call github,xbmc,xbmc,$(KODI_VERSION)) From 3a906ddf0693d26ae6afad04e5ab7678dc6afbdf Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 7 Mar 2024 18:41:52 +0100 Subject: [PATCH 5367/5754] package/kodi-pvr-hts: bump version to 20.7.2-Nexus Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit aebe2b1dae2dd5c1e7952d00ad124064821be718) Signed-off-by: Peter Korsgaard --- 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 a268940b0e..2a59b7bbe5 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 15d68d928e0794fb42fd0f3483403fb0290c5c94aa3d3b648a8a2f8e8316dfff kodi-pvr-hts-20.7.0-Nexus.tar.gz +sha256 244cfc1488aa0c51465af411f3df8884b4a571a08acfa20ac9defdb8ef49022e kodi-pvr-hts-20.7.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 c56d0e0546..ebc31ddbdf 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.7.0-Nexus +KODI_PVR_HTS_VERSION = 20.7.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 From 57b4f2212d4be9fef0ee91b06338dcc119265542 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 7 Mar 2024 18:43:07 +0100 Subject: [PATCH 5368/5754] package/intel-mediadriver: bump version to 24.1.4 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 150a1722a78c51dd7996c5aaa3b42476f60451d1) 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 a1b098094b..4b410fb961 100644 --- a/package/intel-mediadriver/intel-mediadriver.hash +++ b/package/intel-mediadriver/intel-mediadriver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 a024e96abd662193e4295f427a76c5894087503df46bd82c0e5bea103e44b171 intel-media-24.1.3.tar.gz +sha256 7ea727b3e2890cf8f50307a3910664209bcbae1ce0d3d8f81bb9f522b0f66d59 intel-media-24.1.4.tar.gz sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md diff --git a/package/intel-mediadriver/intel-mediadriver.mk b/package/intel-mediadriver/intel-mediadriver.mk index 72a22fe5c9..9fdbef93bb 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 = 24.1.3 +INTEL_MEDIADRIVER_VERSION = 24.1.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 f646e4728dd38c6c0f8cd550216ba8249ff20973 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 7 Mar 2024 18:43:08 +0100 Subject: [PATCH 5369/5754] package/libvpl: bump version to 2.10.2 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 45f964d8dde03161fdfbe69013d19e9a13fb005f) Signed-off-by: Peter Korsgaard --- package/libvpl/libvpl.hash | 2 +- package/libvpl/libvpl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libvpl/libvpl.hash b/package/libvpl/libvpl.hash index df1914e4a4..19407e01ba 100644 --- a/package/libvpl/libvpl.hash +++ b/package/libvpl/libvpl.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 524299a7b920ac0de1f6913ca90515858ea3a8ea2daaea60f8e0be62f22c8041 libvpl-2.10.1.tar.gz +sha256 ad956ea7ecf14614325f59dfb44cc5ba08e2fcac373342d61c7db152ac651253 libvpl-2.10.2.tar.gz sha256 bf1cfac2e2792b6e1e995ce103d70796aecaf2ec7e4c5fe5474f7acec7b4a677 LICENSE diff --git a/package/libvpl/libvpl.mk b/package/libvpl/libvpl.mk index 0c5d354874..645fda14de 100644 --- a/package/libvpl/libvpl.mk +++ b/package/libvpl/libvpl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVPL_VERSION = 2.10.1 +LIBVPL_VERSION = 2.10.2 LIBVPL_SITE = $(call github,intel,libvpl,v$(LIBVPL_VERSION)) LIBVPL_LICENSE = MIT LIBVPL_LICENSE_FILES = LICENSE From 43fd684dd5876862cae6e970954fbe31b4e7fddb Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 7 Mar 2024 18:43:09 +0100 Subject: [PATCH 5370/5754] package/onevpl-intel-gpu: bump version to 24.1.4 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 1d69b083e8c724a82d7e0cfbf5989147b3c2f5e7) 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 a45758a2c3..8dd42c4713 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 15d34e4304d7aeb5ea5e529b6f51171109cef42525113321f675bc14e56c697e onevpl-intel-gpu-24.1.3.tar.gz +sha256 879a232351ce0647522a0981edded3760104aec9f2bdc2ad31f70df03c95a6a9 onevpl-intel-gpu-24.1.4.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 509698ce26..ca2c866735 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 = 24.1.3 +ONEVPL_INTEL_GPU_VERSION = 24.1.4 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 aef0c76d9c644bd97294c716ec73bb3b72565923 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 7 Mar 2024 18:48:47 +0100 Subject: [PATCH 5371/5754] {linux, linux-headers}: bump 4.19.x / 5.{4, 10, 15}.x / 6.{1, 6}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit bb8766cc5463e59b931a10ec67793a79fb06eda7) 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 07d6b2b5ec..df84cce539 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.6.18" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.6.21" 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 15c0dc8d3d..977ad30f73 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 4e43d8c5fba14f7c82597838011648056487b7550fd83276ad534559e8499b1d linux-6.6.18.tar.xz -sha256 faa49ca22fb55ed4d5ca2a55e07dd10e4e171cfc3b92568a631453cd2068b39b linux-6.1.79.tar.xz +sha256 ee0b430148da94d2b13608b8d80b007b7d281dc90e3f19b63cf9a9943810e457 linux-6.6.21.tar.xz +sha256 0ebd861c6fd47bb0a9d3a09664d704833d1a54750c7bf9c4ad8b5e9cbd49342b linux-6.1.81.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 bd84809a367eb400eb04e0e70294e6ba12fc03b6bfb5a7dfaca548f8947501b0 linux-5.15.149.tar.xz -sha256 4ea63c5a90fdc3c459ab35c11ee8c93d2364a7cdbfb101100f8cab70d490ef6d linux-5.10.210.tar.xz -sha256 ff54bec6d053c7994f3bb8c45021de2858ff9f740d2ccbbcf072b87821a918cf linux-5.4.269.tar.xz +sha256 8a1e760bf2660947234109aa4fdbbe3686238b4e852157b96c59356689107e49 linux-5.15.151.tar.xz +sha256 0cf3e467bd8d35533888327e9f8a9a9d354fdf83e8f82e9fe5a234f896a07493 linux-5.10.212.tar.xz +sha256 cdbc61334cdadbd3945b08f03ed197c65bdf358c3383a4334b3e5b483bd95850 linux-5.4.271.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 83eeff613405d0045d0f717c6ac14c178678fe0a163c41d9dd8878ac0f73e352 linux-4.19.307.tar.xz +sha256 95ada7aa6ef1c69d7a469432f936365e35b004d24e751d82c21a371edd2c84f9 linux-4.19.309.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 63e82c49df..fe4fc5011e 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -403,12 +403,12 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.19.307" if BR2_KERNEL_HEADERS_4_19 - default "5.4.269" if BR2_KERNEL_HEADERS_5_4 - default "5.10.210" if BR2_KERNEL_HEADERS_5_10 - default "5.15.149" if BR2_KERNEL_HEADERS_5_15 - default "6.1.79" if BR2_KERNEL_HEADERS_6_1 - default "6.6.18" if BR2_KERNEL_HEADERS_6_6 + default "4.19.309" if BR2_KERNEL_HEADERS_4_19 + default "5.4.271" if BR2_KERNEL_HEADERS_5_4 + default "5.10.212" if BR2_KERNEL_HEADERS_5_10 + default "5.15.151" if BR2_KERNEL_HEADERS_5_15 + default "6.1.81" if BR2_KERNEL_HEADERS_6_1 + default "6.6.21" 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 b0444f7e3bcd7233c093f49a18891eab38a6fc99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?= Date: Thu, 14 Mar 2024 17:16:20 +0100 Subject: [PATCH 5372/5754] package/expat: security bump to version 2.6.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Security fixes: - CVE-2024-28757 -- Prevent billion laughs attacks with isolated use of external parsers. Please see the commit message of commit 1d50b80cf31de87750103656f6eb693746854aa8 for details. https://blog.hartwork.org/posts/expat-2-6-2-released/ https://github.com/libexpat/libexpat/blob/R_2_6_2/expat/Changes Signed-off-by: Sébastien Szymanski Signed-off-by: Peter Korsgaard (cherry picked from commit 1dfe980b19b83ee695e51e92aecb0c8cdf202a3d) Signed-off-by: Peter Korsgaard --- package/expat/expat.hash | 8 ++++---- package/expat/expat.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/expat/expat.hash b/package/expat/expat.hash index 980a9ab6a7..63890b54df 100644 --- a/package/expat/expat.hash +++ b/package/expat/expat.hash @@ -1,7 +1,7 @@ -# From https://sourceforge.net/projects/expat/files/expat/2.6.1/ -md5 84d0ee1c554212dc8f068e538de5b823 expat-2.6.1.tar.xz -sha1 1a1804b7c565a8b21abbd3433ef67ed8a4476960 expat-2.6.1.tar.xz +# From https://sourceforge.net/projects/expat/files/expat/2.6.2/ +md5 0cb75c8feb842c0794ba89666b762a2d expat-2.6.1.tar.xz +sha1 d9e5f953dcacda3c9e69b4886382c3d8847b81bd expat-2.6.1.tar.xz # Locally calculated -sha256 cb5f5a8ea211e1cabd59be0a933a52e3c02cc326e86a4d387d8d218e7ee47a3e expat-2.6.0.tar.xz +sha256 ee14b4c5d8908b1bec37ad937607eab183d4d9806a08adee472c3c3121d27364 expat-2.6.2.tar.xz sha256 122f2c27000472a201d337b9b31f7eb2b52d091b02857061a8880371612d9534 COPYING diff --git a/package/expat/expat.mk b/package/expat/expat.mk index e09fcc673f..c6b7fc8b44 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXPAT_VERSION = 2.6.1 +EXPAT_VERSION = 2.6.2 EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION) EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz EXPAT_INSTALL_STAGING = YES From d8b3d4bf26fd0fed89a293367266368d767dfa43 Mon Sep 17 00:00:00 2001 From: Nicolas Cavallari Date: Thu, 14 Mar 2024 13:27:34 +0100 Subject: [PATCH 5373/5754] package/libgit2: security bump to version 1.7.2 Fixes the following security issues: - CVE-2024-24575 (infinite loop DoS on revision lookup) and - CVE-2024-24577 (heap out of bound write on index update) https://github.com/libgit2/libgit2/releases/tag/v1.7.2 Signed-off-by: Nicolas Cavallari [Peter: mark as security bump] Signed-off-by: Peter Korsgaard (cherry picked from commit b7eb1dcbb65682b2e800b6523688102ffb4d4821) Signed-off-by: Peter Korsgaard --- 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 76d599b81e..022fb35a9c 100644 --- a/package/libgit2/libgit2.hash +++ b/package/libgit2/libgit2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 17d2b292f21be3892b704dddff29327b3564f96099a1c53b00edc23160c71327 libgit2-1.7.1.tar.gz +sha256 de384e29d7efc9330c6cdb126ebf88342b5025d920dcb7c645defad85195ea7f libgit2-1.7.2.tar.gz sha256 6f3c2cd59b057e366c1acc073b038135c52d77892bb33bd4d931c5369d3f062b COPYING diff --git a/package/libgit2/libgit2.mk b/package/libgit2/libgit2.mk index 46ccc1e517..498b665808 100644 --- a/package/libgit2/libgit2.mk +++ b/package/libgit2/libgit2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGIT2_VERSION = 1.7.1 +LIBGIT2_VERSION = 1.7.2 LIBGIT2_SITE = $(call github,libgit2,libgit2,v$(LIBGIT2_VERSION)) LIBGIT2_LICENSE = \ GPL-2.0 with linking exception, \ From a2c2c6a52150dfb39458f492e3696e756b3889d6 Mon Sep 17 00:00:00 2001 From: Maxim Kochetkov Date: Sun, 10 Mar 2024 09:08:33 +0300 Subject: [PATCH 5374/5754] package/postgis: bump to version 3.4.2 https://github.com/postgis/postgis/blob/3.4.2/NEWS Signed-off-by: Maxim Kochetkov Signed-off-by: Peter Korsgaard (cherry picked from commit 05dabbd5fcc08724f20f8a4168a5a6e0b97aec06) Signed-off-by: Peter Korsgaard --- package/postgis/postgis.hash | 2 +- package/postgis/postgis.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/postgis/postgis.hash b/package/postgis/postgis.hash index 2d2676d0d6..7e62e8e168 100644 --- a/package/postgis/postgis.hash +++ b/package/postgis/postgis.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 fef6a141213d0ff27bf45b33b849cc396c22ddb1ffc6fed435469c9e891fc81d postgis-3.4.1.tar.gz +sha256 c8c874c00ba4a984a87030af6bf9544821502060ad473d5c96f1d4d0835c5892 postgis-3.4.2.tar.gz sha256 2a3bde0a77224496ea6d8efa686da7e29ab0dd6b1a8f90ba12beaf7ae28e878a LICENSE.TXT diff --git a/package/postgis/postgis.mk b/package/postgis/postgis.mk index 5f1c643ceb..867aa4caea 100644 --- a/package/postgis/postgis.mk +++ b/package/postgis/postgis.mk @@ -4,7 +4,7 @@ # ################################################################################ -POSTGIS_VERSION = 3.4.1 +POSTGIS_VERSION = 3.4.2 POSTGIS_SITE = https://download.osgeo.org/postgis/source # parallel build issues POSTGIS_MAKE = $(MAKE1) From a9d2eb834e871bd91f1f15fa9d5cffb6ac585712 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Thu, 7 Mar 2024 20:52:33 +0100 Subject: [PATCH 5375/5754] package/mmc-utils: bump version to 2024-03-05 Fixes: http://autobuild.buildroot.net/results/06f972f95f4f2e0e7504b1fa069b89695b7377ef Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard (cherry picked from commit 7ee7b1ba6d5031405533193ec7c6edfd5dbde175) Signed-off-by: Peter Korsgaard --- package/mmc-utils/mmc-utils.hash | 2 +- package/mmc-utils/mmc-utils.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mmc-utils/mmc-utils.hash b/package/mmc-utils/mmc-utils.hash index cd9d13324f..2c1bb86066 100644 --- a/package/mmc-utils/mmc-utils.hash +++ b/package/mmc-utils/mmc-utils.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 84be5003ae83b4fdb0279a693f320fd472aebd14908a1ac16bda4f675e92ad40 mmc-utils-80271e9a6fd0db9cb3a85d024664da886e94315c-br1.tar.gz +sha256 83b1bd7602b0c8d05a8ff2f842d80fa7c9a0b084b7159bb9eed796b0075b94d1 mmc-utils-e1281d4de9166b7254ba30bb58f9191fc2c9e7fb-br1.tar.gz sha256 4207d81122a02555f78c5a11b61c83a331ee03dc933e1ef9dd932ef9b434d12d README diff --git a/package/mmc-utils/mmc-utils.mk b/package/mmc-utils/mmc-utils.mk index ef4d97c1ca..48c347d846 100644 --- a/package/mmc-utils/mmc-utils.mk +++ b/package/mmc-utils/mmc-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -MMC_UTILS_VERSION = 80271e9a6fd0db9cb3a85d024664da886e94315c +MMC_UTILS_VERSION = e1281d4de9166b7254ba30bb58f9191fc2c9e7fb 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 From 9ec0cfb5e997a8f4fdc6978bf6c555648628d00e Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Thu, 7 Mar 2024 21:10:42 +0100 Subject: [PATCH 5376/5754] package/cryptsetup: bump version to 2.7.1 Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard (cherry picked from commit 387bf13c6292837c6847d9c0f79a7872f0f2176e) Signed-off-by: Peter Korsgaard --- package/cryptsetup/cryptsetup.hash | 2 +- package/cryptsetup/cryptsetup.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/cryptsetup/cryptsetup.hash b/package/cryptsetup/cryptsetup.hash index df92ff36b8..531432aaaf 100644 --- a/package/cryptsetup/cryptsetup.hash +++ b/package/cryptsetup/cryptsetup.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/linux/utils/cryptsetup/v2.7/sha256sums.asc -sha256 94003a00cd5a81944f45e8dc529e0cfd2a6ff629bd2cd21cf5e574e465daf795 cryptsetup-2.7.0.tar.xz +sha256 da5d1419e2a86e01aa32fd79582cd54d208857cb541bca2fd426a5ff1aaabbc3 cryptsetup-2.7.1.tar.xz sha256 45670cce8b6a0ddd66c8016cd8ccef6cd71f35717cbacc7f1e895b3855207b33 COPYING sha256 8c33cc37871654ec7ed87e6fbb896c8cf33ef5ef05b1611a5aed857596ffafa5 COPYING.LGPL diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk index d17de96143..b15f458576 100644 --- a/package/cryptsetup/cryptsetup.mk +++ b/package/cryptsetup/cryptsetup.mk @@ -5,7 +5,7 @@ ################################################################################ CRYPTSETUP_VERSION_MAJOR = 2.7 -CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).0 +CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).1 CRYPTSETUP_SOURCE = cryptsetup-$(CRYPTSETUP_VERSION).tar.xz CRYPTSETUP_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/cryptsetup/v$(CRYPTSETUP_VERSION_MAJOR) CRYPTSETUP_DEPENDENCIES = \ From 6ca2dcf2b9a09fb657da17261e1f02d56c1997c4 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 7 Mar 2024 18:49:47 +0100 Subject: [PATCH 5377/5754] package/xmrig: bump version to 6.21.1 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit d566d6a3692df6859a2b62c994bddd0ec8768a24) 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 3a54d66ce4..9d84ab7957 100644 --- a/package/xmrig/xmrig.hash +++ b/package/xmrig/xmrig.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4b197c71fa06030216b641b4ea57f7a3d977a17df1b55bd13759d4705dbf5941 xmrig-6.21.0.tar.gz +sha256 c45baea5a210143b647349b5234a2192164d3473a39d2b1cab7fb35b1a2a8ba9 xmrig-6.21.1.tar.gz sha256 589ed823e9a84c56feb95ac58e7cf384626b9cbf4fda2a907bc36e103de1bad2 LICENSE diff --git a/package/xmrig/xmrig.mk b/package/xmrig/xmrig.mk index 35cd1d8d82..37a613820d 100644 --- a/package/xmrig/xmrig.mk +++ b/package/xmrig/xmrig.mk @@ -4,7 +4,7 @@ # ################################################################################ -XMRIG_VERSION = 6.21.0 +XMRIG_VERSION = 6.21.1 XMRIG_SITE = $(call github,xmrig,xmrig,v$(XMRIG_VERSION)) XMRIG_LICENSE = GPL-3.0+ XMRIG_LICENSE_FILES = LICENSE From 86d7922952e59354b4ba998d214d32417b9e3219 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 9 Mar 2024 17:49:46 +0100 Subject: [PATCH 5378/5754] toolchain: drop codesourcery arm/aarch64 toolchains codesourcery arm/aarch64 toolchains are old (2014) and use glibc 2.18/2.20 which are not compatible with 64-bit time_t raising the following build failure with libcgroup since commit 1c2dbcdcf0bb589d325c379246acaa39bb07b7be: In file included from ./libcgroup-internal.h:25:0, from parse.y:21: /home/buildroot/autobuild/run/instance-3/output-1/host/arm-buildroot-linux-gnueabi/sysroot/usr/include/fts.h:41:3: error: #error " cannot be used with -D_FILE_OFFSET_BITS==64" # error " cannot be used with -D_FILE_OFFSET_BITS==64" ^ Fixes: 1c2dbcdcf0bb589d325c379246acaa39bb07b7be - http://autobuild.buildroot.org/results/e28f955f2b360f6e7bb231a5a3800cfbd17a23d7 Signed-off-by: Fabrice Fontaine [Peter: add Config.in.legacy entries] Signed-off-by: Peter Korsgaard (cherry picked from commit 53a8c5150e5eeeb6dbbead0275dbf9141f507511) Signed-off-by: Peter Korsgaard --- Config.in.legacy | 14 +++ package/guile/guile.mk | 5 - package/mesa3d/mesa3d.mk | 6 -- package/tpm2-totp/Config.in | 2 - .../autobuild/sourcery-arm-armv4t.config | 4 - .../autobuild/sourcery-arm-thumb2.config | 7 -- .../autobuild/sourcery-arm.config | 3 - .../autobuild/toolchain-configs.csv | 5 - .../testing/tests/toolchain/test_external.py | 97 ------------------- toolchain/Config.in | 1 - toolchain/toolchain-external/Config.in | 4 - .../Config.in | 19 ---- .../Config.in.options | 9 -- ...olchain-external-codesourcery-aarch64.hash | 3 - ...toolchain-external-codesourcery-aarch64.mk | 12 --- .../Config.in | 35 ------- .../Config.in.options | 9 -- .../toolchain-external-codesourcery-arm.hash | 3 - .../toolchain-external-codesourcery-arm.mk | 13 --- 19 files changed, 14 insertions(+), 237 deletions(-) delete mode 100644 support/config-fragments/autobuild/sourcery-arm-armv4t.config delete mode 100644 support/config-fragments/autobuild/sourcery-arm-thumb2.config delete mode 100644 support/config-fragments/autobuild/sourcery-arm.config delete mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/Config.in delete mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/Config.in.options delete mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/toolchain-external-codesourcery-aarch64.hash delete mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/toolchain-external-codesourcery-aarch64.mk delete mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in delete mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in.options delete mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-arm/toolchain-external-codesourcery-arm.hash delete mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-arm/toolchain-external-codesourcery-arm.mk diff --git a/Config.in.legacy b/Config.in.legacy index 1b15d25d6b..c2124d26cb 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,20 @@ endif comment "Legacy options removed in 2024.02" +config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64 + bool "CodeSourcery AArch64 2014.11" + select BR2_LEGACY + help + The Sourcery CodeBench AArch64 toolchain has been removed, + use an ARM/Bootlin/Linaro toolchain instead. + +config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM + bool "Sourcery CodeBench ARM 2014.05 has been removed" + select BR2_LEGACY + help + The Sourcery CodeBench ARM toolchain has been removed, use + an ARM/Bootlin/Linaro toolchain instead. + config BR2_PACKAGE_MYSQL bool "mysql virtual package removed" select BR2_LEGACY diff --git a/package/guile/guile.mk b/package/guile/guile.mk index 1d2e8038f0..82daaf5ad4 100644 --- a/package/guile/guile.mk +++ b/package/guile/guile.mk @@ -44,11 +44,6 @@ ifeq ($(BR2_STATIC_LIBS),y) GUILE_CFLAGS += -DGC_NO_DLOPEN endif -# Triggers assembler error with -Os -ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM)$(BR2_OPTIMIZE_S),yy) -GUILE_CFLAGS += -O2 -endif - # jit triggers build failures with gcc < 5 ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_5),) GUILE_CONF_OPTS += --disable-jit diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 8e3cd7245d..df0079bf80 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -29,12 +29,6 @@ MESA3D_CONF_OPTS = \ -Dgallium-omx=disabled \ -Dpower8=disabled -# Codesourcery ARM 2014.05 fail to link libmesa_dri_drivers.so with --as-needed linker -# flag due to a linker bug between binutils 2.24 and 2.25 (2.24.51.20140217). -ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM),y) -MESA3D_CONF_OPTS += -Db_asneeded=false -endif - ifeq ($(BR2_PACKAGE_MESA3D_DRI3),y) MESA3D_CONF_OPTS += -Ddri3=enabled ifeq ($(BR2_PACKAGE_XLIB_LIBXSHMFENCE),y) diff --git a/package/tpm2-totp/Config.in b/package/tpm2-totp/Config.in index dcadf5a5f2..a26604abb8 100644 --- a/package/tpm2-totp/Config.in +++ b/package/tpm2-totp/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_TPM2_TOTP bool "tpm2-totp" depends on !BR2_STATIC_LIBS # tpm2-tss - depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM # glibc < 2.20 select BR2_PACKAGE_LIBQRENCODE select BR2_PACKAGE_TPM2_TSS help @@ -20,4 +19,3 @@ config BR2_PACKAGE_TPM2_TOTP comment "tpm2-totp needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS - depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM diff --git a/support/config-fragments/autobuild/sourcery-arm-armv4t.config b/support/config-fragments/autobuild/sourcery-arm-armv4t.config deleted file mode 100644 index 4c0e01fecb..0000000000 --- a/support/config-fragments/autobuild/sourcery-arm-armv4t.config +++ /dev/null @@ -1,4 +0,0 @@ -BR2_arm=y -BR2_arm920t=y -BR2_TOOLCHAIN_EXTERNAL=y -BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM=y diff --git a/support/config-fragments/autobuild/sourcery-arm-thumb2.config b/support/config-fragments/autobuild/sourcery-arm-thumb2.config deleted file mode 100644 index e726757a16..0000000000 --- a/support/config-fragments/autobuild/sourcery-arm-thumb2.config +++ /dev/null @@ -1,7 +0,0 @@ -BR2_arm=y -BR2_cortex_a8=y -BR2_ARM_EABI=y -BR2_ARM_INSTRUCTIONS_THUMB2=y -BR2_TOOLCHAIN_EXTERNAL=y -BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM=y -BR2_TARGET_OPTIMIZATION="" diff --git a/support/config-fragments/autobuild/sourcery-arm.config b/support/config-fragments/autobuild/sourcery-arm.config deleted file mode 100644 index 8ade4647f2..0000000000 --- a/support/config-fragments/autobuild/sourcery-arm.config +++ /dev/null @@ -1,3 +0,0 @@ -BR2_arm=y -BR2_TOOLCHAIN_EXTERNAL=y -BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM=y diff --git a/support/config-fragments/autobuild/toolchain-configs.csv b/support/config-fragments/autobuild/toolchain-configs.csv index a65e9bacc3..2c4fa45fe7 100644 --- a/support/config-fragments/autobuild/toolchain-configs.csv +++ b/support/config-fragments/autobuild/toolchain-configs.csv @@ -18,9 +18,6 @@ support/config-fragments/autobuild/bootlin-x86-64-musl.config,x86_64 # Test a MMU toolchain without dynamic library support support/config-fragments/autobuild/br-arm-full-static.config,x86_64 -# Test a toolchain with an old gcc version (gcc 4.8) -support/config-fragments/autobuild/sourcery-arm.config,x86 - # Toolchains used by test-pkg only when the '-a' option is passed: support/config-fragments/autobuild/arm-aarch64.config,x86_64 support/config-fragments/autobuild/bootlin-aarch64-glibc.config,x86_64 @@ -66,8 +63,6 @@ support/config-fragments/autobuild/br-xtensa-full-internal.config,any support/config-fragments/autobuild/linaro-aarch64.config,x86 support/config-fragments/autobuild/linaro-aarch64-be.config,x86 support/config-fragments/autobuild/linaro-arm.config,x86 -support/config-fragments/autobuild/sourcery-arm-armv4t.config,x86 -support/config-fragments/autobuild/sourcery-arm-thumb2.config,x86 support/config-fragments/autobuild/sourcery-mips64.config,x86 support/config-fragments/autobuild/sourcery-mips.config,x86 support/config-fragments/autobuild/sourcery-nios2.config,x86 diff --git a/support/testing/tests/toolchain/test_external.py b/support/testing/tests/toolchain/test_external.py index d22f38cedc..27dfd68500 100644 --- a/support/testing/tests/toolchain/test_external.py +++ b/support/testing/tests/toolchain/test_external.py @@ -37,103 +37,6 @@ def common_check(self): self.assertTrue(os.path.exists(interp_path)) -class TestExternalToolchainSourceryArmv4(TestExternalToolchain): - config = BASIC_CONFIG + \ - """ - BR2_arm=y - BR2_arm920t=y - BR2_TOOLCHAIN_EXTERNAL=y - BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM=y - """ - toolchain_prefix = "arm-none-linux-gnueabi" - - def test_run(self): - TestExternalToolchain.common_check(self) - - # Check the architecture variant - arch = infra.get_file_arch(self.builddir, - self.toolchain_prefix, - "lib/libc.so.6") - self.assertEqual(arch, "v4T") - - # Check the sysroot symlink - symlink = os.path.join(self.builddir, "staging", "armv4t") - self.assertTrue(os.path.exists(symlink)) - self.assertEqual(os.readlink(symlink), "./") - - # Boot the system - img = os.path.join(self.builddir, "images", "rootfs.cpio") - self.emulator.boot(arch="armv5", - kernel="builtin", - options=["-initrd", img]) - self.emulator.login() - - -class TestExternalToolchainSourceryArmv5(TestExternalToolchain): - config = BASIC_CONFIG + \ - """ - BR2_arm=y - BR2_TOOLCHAIN_EXTERNAL=y - BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM=y - """ - toolchain_prefix = "arm-none-linux-gnueabi" - - def test_run(self): - TestExternalToolchain.common_check(self) - - # Check the architecture variant - arch = infra.get_file_arch(self.builddir, - self.toolchain_prefix, - "lib/libc.so.6") - self.assertEqual(arch, "v5TE") - - # Boot the system - img = os.path.join(self.builddir, "images", "rootfs.cpio") - self.emulator.boot(arch="armv5", - kernel="builtin", - options=["-initrd", img]) - self.emulator.login() - - -class TestExternalToolchainSourceryArmv7(TestExternalToolchain): - config = BASIC_CONFIG + \ - """ - BR2_arm=y - BR2_cortex_a8=y - BR2_ARM_EABI=y - BR2_ARM_INSTRUCTIONS_THUMB2=y - BR2_TOOLCHAIN_EXTERNAL=y - BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM=y - """ - toolchain_prefix = "arm-none-linux-gnueabi" - - def test_run(self): - TestExternalToolchain.common_check(self) - - # Check the architecture variant - arch = infra.get_file_arch(self.builddir, - self.toolchain_prefix, - "lib/libc.so.6") - self.assertEqual(arch, "v7") - isa = infra.get_elf_arch_tag(self.builddir, - self.toolchain_prefix, - "lib/libc.so.6", - "Tag_THUMB_ISA_use") - self.assertEqual(isa, "Thumb-2") - - # Check we have the sysroot symlink - symlink = os.path.join(self.builddir, "staging", "thumb2") - self.assertTrue(os.path.exists(symlink)) - self.assertEqual(os.readlink(symlink), "./") - - # Boot the system - img = os.path.join(self.builddir, "images", "rootfs.cpio") - self.emulator.boot(arch="armv7", - kernel="builtin", - options=["-initrd", img]) - self.emulator.login() - - class TestExternalToolchainLinaroArm(TestExternalToolchain): config = BASIC_CONFIG + \ """ diff --git a/toolchain/Config.in b/toolchain/Config.in index 3dd6e83d35..1641dbae06 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -886,7 +886,6 @@ config BR2_TOOLCHAIN_HAS_SYNC_8 config BR2_TOOLCHAIN_HAS_LIBATOMIC bool default y if BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 && \ - !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64 && \ BR2_TOOLCHAIN_HAS_THREADS && \ !BR2_BINFMT_FLAT diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in index c1c159cb8e..b5432b71d7 100644 --- a/toolchain/toolchain-external/Config.in +++ b/toolchain/toolchain-external/Config.in @@ -11,7 +11,6 @@ choice # Aarch64 (use ARM toolchain by default) source "toolchain/toolchain-external/toolchain-external-arm-aarch64/Config.in" source "toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in" -source "toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/Config.in" # Aarch64 big-endian source "toolchain/toolchain-external/toolchain-external-arm-aarch64-be/Config.in" @@ -23,7 +22,6 @@ source "toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in" # ARM (use ARM toolchain by default) source "toolchain/toolchain-external/toolchain-external-arm-arm/Config.in" source "toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in" -source "toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in" # ARM big-endian source "toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in" @@ -115,7 +113,6 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX # Aarch64 source "toolchain/toolchain-external/toolchain-external-arm-aarch64/Config.in.options" source "toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in.options" -source "toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/Config.in.options" # Aarch64 big-endian source "toolchain/toolchain-external/toolchain-external-arm-aarch64-be/Config.in.options" @@ -127,7 +124,6 @@ source "toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in.o # ARM source "toolchain/toolchain-external/toolchain-external-arm-arm/Config.in.options" source "toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in.options" -source "toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in.options" # ARM big-endian source "toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in.options" diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/Config.in b/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/Config.in deleted file mode 100644 index 8c0f985c5b..0000000000 --- a/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/Config.in +++ /dev/null @@ -1,19 +0,0 @@ -config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64 - bool "CodeSourcery AArch64 2014.11" - depends on BR2_aarch64 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_5 - # a57/a53 and a72/a53 appeared in gcc-6 or were broken before - depends on !BR2_cortex_a57_a53 && !BR2_cortex_a72_a53 - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - select BR2_TOOLCHAIN_EXTERNAL_GLIBC - select BR2_TOOLCHAIN_HAS_SSP - select BR2_INSTALL_LIBSTDCPP - select BR2_HOSTARCH_NEEDS_IA32_LIBS - select BR2_TOOLCHAIN_HAS_NATIVE_RPC - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_16 - select BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 - help - Sourcery CodeBench toolchain for the AArch64 architecture, - from Mentor Graphics. It uses gcc 4.9.1, binutils - 2.24.51.20140217, glibc 2.20, gdb 7.7.50 and kernel headers - 3.16.2. diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/Config.in.options b/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/Config.in.options deleted file mode 100644 index 1eab839216..0000000000 --- a/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/Config.in.options +++ /dev/null @@ -1,9 +0,0 @@ -if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64 - -config BR2_TOOLCHAIN_EXTERNAL_PREFIX - default "aarch64-amd-linux-gnu" - -config BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL - default "toolchain-external-codesourcery-aarch64" - -endif diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/toolchain-external-codesourcery-aarch64.hash b/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/toolchain-external-codesourcery-aarch64.hash deleted file mode 100644 index 8f8fca0d0c..0000000000 --- a/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/toolchain-external-codesourcery-aarch64.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 405aada821146755c5f2df566375c2a682456d6b8451ee47b88cf1a52b093676 aarch64-amd-2014.11-95-aarch64-amd-linux-gnu-i686-pc-linux-gnu.tar.bz2 -sha256 3f50dd6ee433eb5b6992a1071b988e50379a738f54f58722bc60081613764716 aarch64-amd-2014.11-95-aarch64-amd-linux-gnu.src.tar.bz2 diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/toolchain-external-codesourcery-aarch64.mk b/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/toolchain-external-codesourcery-aarch64.mk deleted file mode 100644 index 192763a0e0..0000000000 --- a/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/toolchain-external-codesourcery-aarch64.mk +++ /dev/null @@ -1,12 +0,0 @@ -################################################################################ -# -# toolchain-external-codesourcery-aarch64 -# -################################################################################ - -TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64_SITE = https://sourcery.mentor.com/public/gnu_toolchain/$(TOOLCHAIN_EXTERNAL_PREFIX) -TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64_VERSION = 2014.11-95 -TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64_SOURCE = aarch64-amd-$(TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64_VERSION)-$(TOOLCHAIN_EXTERNAL_PREFIX)-i686-pc-linux-gnu.tar.bz2 -TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64_ACTUAL_SOURCE_TARBALL = aarch64-amd-$(TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64_VERSION)-$(TOOLCHAIN_EXTERNAL_PREFIX).src.tar.bz2 - -$(eval $(toolchain-external-package)) diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in b/toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in deleted file mode 100644 index aea2ba34f2..0000000000 --- a/toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in +++ /dev/null @@ -1,35 +0,0 @@ -config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM - bool "Sourcery CodeBench ARM 2014.05" - depends on BR2_arm - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9 - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - depends on BR2_ARM_EABI - # Unsupported ARM cores - depends on !BR2_cortex_a12 && !BR2_cortex_a17 && !BR2_ARM_CPU_ARMV8A - select BR2_TOOLCHAIN_EXTERNAL_GLIBC - select BR2_TOOLCHAIN_HAS_SSP - select BR2_TOOLCHAIN_HAS_NATIVE_RPC - select BR2_INSTALL_LIBSTDCPP - select BR2_HOSTARCH_NEEDS_IA32_LIBS - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_13 - select BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 - help - Sourcery CodeBench toolchain for the ARM architecture, from - Mentor Graphics. It uses gcc 4.8.3, binutils 2.24.51, glibc - 2.18 and gdb 7.7.50, kernel headers 3.13. It has support - for the following variants: - - ARMv5TE, little endian, soft-float, glibc - Select ARM926T, ARM10T, XScale or another ARMv5 core - Select BR2_SOFT_FLOAT - - ARMv4T, little endian, soft-float, glibc - Select ARM720T, ARM920T, ARM922T or another ARMv4 core - Select BR2_SOFT_FLOAT - - ARMv7-A, Thumb 2, little endian, soft-float, glibc - Select Cortex-A8, Cortex-A9 or another ARMv7-A core - Select BR2_SOFT_FLOAT - Set BR2_TARGET_OPTIMIZATION to -mthumb - -comment "Sourcery CodeBench toolchains available for the EABI ABI" - depends on BR2_arm - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9 - depends on !BR2_ARM_EABI diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in.options b/toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in.options deleted file mode 100644 index 7f3654dc70..0000000000 --- a/toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in.options +++ /dev/null @@ -1,9 +0,0 @@ -if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM - -config BR2_TOOLCHAIN_EXTERNAL_PREFIX - default "arm-none-linux-gnueabi" - -config BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL - default "toolchain-external-codesourcery-arm" - -endif diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-arm/toolchain-external-codesourcery-arm.hash b/toolchain/toolchain-external/toolchain-external-codesourcery-arm/toolchain-external-codesourcery-arm.hash deleted file mode 100644 index c01a7b17c5..0000000000 --- a/toolchain/toolchain-external/toolchain-external-codesourcery-arm/toolchain-external-codesourcery-arm.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 39ee0e789034334ecc89af94e838e3a4815400ac5ff980f808f466b04778532e arm-2014.05-29-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2 -sha256 e16a5b1e41d7ff1e74161f9405182001bc8d1360d89564e73911032e6966cc0d arm-2014.05-29-arm-none-linux-gnueabi.src.tar.bz2 diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-arm/toolchain-external-codesourcery-arm.mk b/toolchain/toolchain-external/toolchain-external-codesourcery-arm/toolchain-external-codesourcery-arm.mk deleted file mode 100644 index f15a50c43e..0000000000 --- a/toolchain/toolchain-external/toolchain-external-codesourcery-arm/toolchain-external-codesourcery-arm.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# toolchain-external-codesourcery-arm -# -################################################################################ - -TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM_VERSION = 2014.05-29 - -TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM_SITE = https://sourcery.mentor.com/public/gnu_toolchain/$(TOOLCHAIN_EXTERNAL_PREFIX) -TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM_SOURCE = arm-$(TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM_VERSION)-$(TOOLCHAIN_EXTERNAL_PREFIX)-i686-pc-linux-gnu.tar.bz2 -TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM_ACTUAL_SOURCE_TARBALL = arm-$(TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM_VERSION)-$(TOOLCHAIN_EXTERNAL_PREFIX).src.tar.bz2 - -$(eval $(toolchain-external-package)) From f7b293752bf6ad5b3f8d71626b9199e5e2475bc5 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 15 Mar 2024 16:08:02 +0100 Subject: [PATCH 5379/5754] package/rauc: bump version to 1.11.3 Contains a single fix for a regression since 1.11.0. https://github.com/rauc/rauc/releases/tag/v1.11.3 Signed-off-by: Peter Korsgaard Signed-off-by: Arnout Vandecappelle (cherry picked from commit 44f3c736a800d2afd154e5e476cdc60ae30a0108) Signed-off-by: Peter Korsgaard --- 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 6899ca94fe..391d89a8f6 100644 --- a/package/rauc/rauc.hash +++ b/package/rauc/rauc.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 e47070e97f89136ca8d0b2b044c40e68ac0f44432046176d08d66717320df4a7 rauc-1.11.2.tar.xz +sha256 ef82ee452939c03a24fd40649afa96497f3cec965994e6c9c0d94239b640bc10 rauc-1.11.3.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/rauc/rauc.mk b/package/rauc/rauc.mk index 7bb374259f..7239d84cc7 100644 --- a/package/rauc/rauc.mk +++ b/package/rauc/rauc.mk @@ -4,7 +4,7 @@ # ################################################################################ -RAUC_VERSION = 1.11.2 +RAUC_VERSION = 1.11.3 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 9a997fcf3b2097284e80c4a9f1a013b165574baa Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 14 Mar 2024 22:42:25 +0100 Subject: [PATCH 5380/5754] package/libnfs: bump to version 5.0.3 https://github.com/sahlberg/libnfs/blob/libnfs-5.0.3/CHANGELOG Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (cherry picked from commit 0a0b522b23fdadeafbca904a56047b8cf35760df) Signed-off-by: Peter Korsgaard --- package/libnfs/libnfs.hash | 2 +- package/libnfs/libnfs.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libnfs/libnfs.hash b/package/libnfs/libnfs.hash index b67a5d2eda..c5e5197c13 100644 --- a/package/libnfs/libnfs.hash +++ b/package/libnfs/libnfs.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 637e56643b19da9fba98f06847788c4dad308b723156a64748041035dcdf9bd3 libnfs-5.0.2.tar.gz +sha256 d945cb4f4c8f82ee1f3640893a168810f794a28e1010bb007ec5add345e9df3e libnfs-5.0.3.tar.gz sha256 edd960c0142b8ada98b43b6396b78f4e557b0bc70ac601a51e397ad04070e2c5 COPYING sha256 d9406ced95457941032aa11d04623b8ab71f2827a3395ebef137aec475be35b1 LICENCE-BSD.txt sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENCE-LGPL-2.1.txt diff --git a/package/libnfs/libnfs.mk b/package/libnfs/libnfs.mk index b013decfc7..eb919406f3 100644 --- a/package/libnfs/libnfs.mk +++ b/package/libnfs/libnfs.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNFS_VERSION = 5.0.2 +LIBNFS_VERSION = 5.0.3 LIBNFS_SITE = $(call github,sahlberg,libnfs,libnfs-$(LIBNFS_VERSION)) LIBNFS_INSTALL_STAGING = YES LIBNFS_AUTORECONF = YES From cc089b98d5b8726b94d1a8fdcdb96cb863d45049 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 14 Mar 2024 22:32:52 +0100 Subject: [PATCH 5381/5754] package/libkrb5: force arm mode instead of Thumb mode MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix the following build failure in Thumb mode: /tmp/ccdzbA2E.s:845: Error: selected processor does not support `mcr p15,0,r2,c7,c10,5' in Thumb mode Fixes: - http://autobuild.buildroot.org/results/08be1fa0fee0f05818cd78d4718caa3476c570ae Signed-off-by: Fabrice Fontaine Reviewed-by: André Zwing Signed-off-by: Arnout Vandecappelle (cherry picked from commit 355ceb893078b4e1d458a3367fc2c989911fefe1) Signed-off-by: Peter Korsgaard --- package/libkrb5/libkrb5.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/libkrb5/libkrb5.mk b/package/libkrb5/libkrb5.mk index 62a34b2379..c58763eddd 100644 --- a/package/libkrb5/libkrb5.mk +++ b/package/libkrb5/libkrb5.mk @@ -33,6 +33,13 @@ LIBKRB5_CONF_OPTS = \ --without-tcl \ --disable-rpath +# libkrb5 has some assembly function that is not present in Thumb mode: +# Error: selected processor does not support `mcr p15,0,r2,c7,c10,5' in Thumb mode +# so, we desactivate Thumb mode +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +LIBKRB5_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm" +endif + # Enabling static and shared at the same time is not supported ifeq ($(BR2_SHARED_STATIC_LIBS),y) LIBKRB5_CONF_OPTS += --disable-static From 78307c660af61ec59010f4fd8a648f941a7af388 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 14 Mar 2024 22:20:43 +0100 Subject: [PATCH 5382/5754] package/{mesa3d, mesa3d-headers}: bump version to 24.0.3 Release notes: https://lists.freedesktop.org/archives/mesa-announce/2024-February/000749.html https://lists.freedesktop.org/archives/mesa-announce/2024-February/000751.html https://lists.freedesktop.org/archives/mesa-announce/2024-March/000752.html Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (cherry picked from commit 773ef1fdbafc461be787f9ac69f64de62a6f55e0) 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 1d006dbc91..7f39fefaf5 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 = 24.0.0 +MESA3D_HEADERS_VERSION = 24.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 49b42e2132..1e94c2c612 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2024-February/000747.html -sha256 dc7e8c077bc5884df95478263b34bdebb7e88e600689cb56fb07be2b8c304c36 mesa-24.0.0.tar.xz -sha512 9dfdea7cebb37b9c020335e24194b39b399f48b5af6eec30c3455108276ac4e29e7b06df942cb2abc7afa667784968c0c43d19b9afe30ef03021b9cb6a789f15 mesa-24.0.0.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2024-March/000752.html +sha256 77aec9a2a37b7d3596ea1640b3cc53d0b5d9b3b52abed89de07e3717e91bfdbe mesa-24.0.3.tar.xz +sha512 76b3b479877c40f729d7f530af4e3577fa74363edcd3d9474350d498a51dbb761fc034b39bee8547e97c30fd3a520cbc50c742d5a187746e83ddab1df44f37e9 mesa-24.0.3.tar.xz # License sha256 a00275a53178e2645fb65be99a785c110513446a5071ff2c698ed260ad917d75 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index df0079bf80..29c67b77b9 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 = 24.0.0 +MESA3D_VERSION = 24.0.3 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos From 6a9e4be7f01935259f4221fa0a58187ec5d095f3 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 14 Mar 2024 22:15:57 +0100 Subject: [PATCH 5383/5754] package/mesa3d: rework dri3 handling While fixing a build error ../src/egl/drivers/dri2/platform_x11.c: In function 'dri2_x11_get_msc_rate': ../src/egl/drivers/dri2/platform_x11.c:1229:44: error: 'struct dri2_egl_display' has no member named 'screen_resources' with this defconfig: BR2_x86_64=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS=y BR2_PACKAGE_MESA3D_OPENGL_GLX=y BR2_PACKAGE_MESA3D_OPENGL_EGL=y BR2_PACKAGE_MESA3D_OPENGL_ES=y BR2_PACKAGE_XORG7=y (crocus and i915 drivers are also affected) it turns out that we can assume the need for dri3 support when X.org is enabled as a hard depen- dency even if mesa3d's configure does not throw errors when missing, like for the Intel drivers. Before this patch these Config.in options were used: config BR2_PACKAGE_MESA3D_DRI3 select BR2_PACKAGE_XLIB_LIBXSHMFENCE select BR2_PACKAGE_MESA3D_DRI3 if BR2_PACKAGE_XORG7 which can be translated into: select BR2_PACKAGE_XLIB_LIBXSHMFENCE if BR2_PACKAGE_XORG7 and used at option BR2_PACKAGE_MESA3D_DRIVER. Configure option -Ddri3=enabled is passed to mesa3d when at least one driver is enabled along with X.org: ifeq ($(BR2_PACKAGE_MESA3D_DRIVER)$(BR2_PACKAGE_XORG7),yy) Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (cherry picked from commit e2f87b3c15c100a411d277589ba8de1de564efd4) Signed-off-by: Peter Korsgaard --- package/mesa3d/Config.in | 15 ++------------- package/mesa3d/mesa3d.mk | 4 +--- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index 39a4f706e2..459051b2db 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -56,11 +56,7 @@ config BR2_PACKAGE_MESA3D_OPENCL select BR2_PACKAGE_LIBCLC select BR2_PACKAGE_HAS_LIBOPENCL -# inform the .mk file of gallium, dri, dri3 or vulkan driver selection -config BR2_PACKAGE_MESA3D_DRI3 - bool - select BR2_PACKAGE_XLIB_LIBXSHMFENCE - +# inform the .mk file of gallium or vulkan driver selection config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER bool select BR2_PACKAGE_MESA3D_DRIVER @@ -71,6 +67,7 @@ config BR2_PACKAGE_MESA3D_VULKAN_DRIVER config BR2_PACKAGE_MESA3D_DRIVER bool + select BR2_PACKAGE_XLIB_LIBXSHMFENCE if BR2_PACKAGE_XORG7 # Gallium xa state tracker. # Quote from mesa3d meson.build: "XA state tracker requires at least @@ -103,7 +100,6 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_CROCUS config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ETNAVIV bool "Gallium Etnaviv driver" depends on (BR2_TOOLCHAIN_HAS_SYNC_4 && !BR2_RISCV_32) || !BR2_PACKAGE_XORG7 # libxshmfence - select BR2_PACKAGE_MESA3D_DRI3 if BR2_PACKAGE_XORG7 select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER select BR2_PACKAGE_LIBDRM_ETNAVIV help @@ -117,7 +113,6 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_FREEDRENO # can't see is just spurious. However, that dependency is about # the toolchain having sync4 primitives, which is always a given # for arm/aarch64. - select BR2_PACKAGE_MESA3D_DRI3 if BR2_PACKAGE_XORG7 select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER select BR2_PACKAGE_LIBDRM_FREEDRENO help @@ -141,7 +136,6 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_LIMA bool "Gallium lima driver" depends on (BR2_TOOLCHAIN_HAS_SYNC_4 && !BR2_RISCV_32) || !BR2_PACKAGE_XORG7 # libxshmfence - select BR2_PACKAGE_MESA3D_DRI3 if BR2_PACKAGE_XORG7 select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER help Mesa driver for ARM Mali Utgard GPUs. @@ -158,7 +152,6 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_PANFROST bool "Gallium panfrost driver" depends on (BR2_TOOLCHAIN_HAS_SYNC_4 && !BR2_RISCV_32) || !BR2_PACKAGE_XORG7 # libxshmfence - select BR2_PACKAGE_MESA3D_DRI3 if BR2_PACKAGE_XORG7 select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER help Mesa driver for ARM Mali Midgard and Bifrost GPUs. @@ -239,7 +232,6 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D bool "Gallium v3d driver" depends on (BR2_arm && BR2_ARM_CPU_HAS_NEON) || BR2_aarch64 depends on BR2_TOOLCHAIN_HAS_SYNC_4 || !BR2_PACKAGE_XORG7 # libxshmfence - select BR2_PACKAGE_MESA3D_DRI3 if BR2_PACKAGE_XORG7 select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4 # runtime select BR2_PACKAGE_MESA3D_OPENGL_EGL @@ -255,7 +247,6 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4 bool "Gallium vc4 driver" depends on (BR2_arm && BR2_ARM_CPU_HAS_NEON) || BR2_aarch64 depends on BR2_TOOLCHAIN_HAS_SYNC_4 || !BR2_PACKAGE_XORG7 # libxshmfence - select BR2_PACKAGE_MESA3D_DRI3 if BR2_PACKAGE_XORG7 select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER select BR2_PACKAGE_LIBDRM_VC4 select BR2_PACKAGE_MESA3D_OPENGL_EGL @@ -295,7 +286,6 @@ 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. @@ -306,7 +296,6 @@ config BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL depends on BR2_TOOLCHAIN_HAS_SYNC_4 || !BR2_PACKAGE_XORG7 # libxshmfence depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 # memfd.h depends on BR2_TOOLCHAIN_USES_GLIBC # ifunc, static_assert - select BR2_PACKAGE_MESA3D_DRI3 if BR2_PACKAGE_XORG7 select BR2_PACKAGE_MESA3D_VULKAN_DRIVER help Vulkan driver for Intel hardware from Ivy Bridge onward. diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 29c67b77b9..bdb7ea9a6c 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -29,11 +29,9 @@ MESA3D_CONF_OPTS = \ -Dgallium-omx=disabled \ -Dpower8=disabled -ifeq ($(BR2_PACKAGE_MESA3D_DRI3),y) +ifeq ($(BR2_PACKAGE_MESA3D_DRIVER)$(BR2_PACKAGE_XORG7),yy) MESA3D_CONF_OPTS += -Ddri3=enabled -ifeq ($(BR2_PACKAGE_XLIB_LIBXSHMFENCE),y) MESA3D_DEPENDENCIES += xlib_libxshmfence -endif else MESA3D_CONF_OPTS += -Ddri3=disabled endif From 41e7eaeb6133724929134e2269aaf58480c383d0 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 14 Mar 2024 22:41:25 +0100 Subject: [PATCH 5384/5754] package/libnfs: fix pthread option Fix typo added by commit f9f5b3a6cbc4e62beefdd0448842ef0c8c3eb6f6 Fixes: f9f5b3a6cbc4e62beefdd0448842ef0c8c3eb6f6 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (cherry picked from commit 9a5160ed5abded9d2b843a2422a48d4964cff42e) Signed-off-by: Peter Korsgaard --- package/libnfs/libnfs.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libnfs/libnfs.mk b/package/libnfs/libnfs.mk index eb919406f3..e5e302a4f8 100644 --- a/package/libnfs/libnfs.mk +++ b/package/libnfs/libnfs.mk @@ -17,9 +17,9 @@ LIBNFS_DEPENDENCIES += libtirpc endif ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) -LIBNFS_CONF_OPTS += --enable-threads +LIBNFS_CONF_OPTS += --enable-pthread else -LIBNFS_CONF_OPTS += --disable-threads +LIBNFS_CONF_OPTS += --disable-pthread endif $(eval $(autotools-package)) From 841ddc38f13b531e355574bb2a83f933af5c5435 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 14 Mar 2024 22:11:17 +0100 Subject: [PATCH 5385/5754] package/multipath-tools: fix legal info Commit cc363e9a93484e734313b17962b931b3df6eedaa forgot to update hash of README.md (changes not related to license) Fixes: cc363e9a93484e734313b17962b931b3df6eedaa - http://autobuild.buildroot.org/results/d41b3eedb337ac7559afceed459c3e28a9bf15a2 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (cherry picked from commit 89bc66d08e17bca0c1ca40346c0c248f550b6013) Signed-off-by: Peter Korsgaard --- 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 0f51c38846..c1f32e7a3b 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 5887418b2e0e595da5aca08b2dff25298f20618f9894d5e26ce852d9d1ae90c4 README.md +sha256 9c69bb0089aa0b82b10a25095c04a7c4aec6b5bbf0776b7129123c8459fe7725 README.md From 16585b87f225f2409987d822e8846ffffbc9b59f Mon Sep 17 00:00:00 2001 From: "Jeremy J. Peper" Date: Tue, 12 Mar 2024 15:14:13 -0500 Subject: [PATCH 5386/5754] package/targetcli-fb: needs python-gobject Without python-gobject, we get the following runtime error: ModuleNotFoundError: No module named 'gi' Add python-gobject and propagate its dependencies. While we're at it, split the DEPENDENCIES over several line and sort them alphabetically. Signed-off-by: Jeremy J. Peper Reviewed-by: Adam Duskett [Arnout: reorder everything alphabeticall, split DEPENDENCIES over several lines.] Signed-off-by: Arnout Vandecappelle (cherry picked from commit 945b9f8d8e9704fd3d2dbd2579ebf9178ed49d89) Signed-off-by: Peter Korsgaard --- package/targetcli-fb/Config.in | 13 ++++++++++++- package/targetcli-fb/targetcli-fb.mk | 6 +++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/package/targetcli-fb/Config.in b/package/targetcli-fb/Config.in index 04c6a1ac09..eb7528fbea 100644 --- a/package/targetcli-fb/Config.in +++ b/package/targetcli-fb/Config.in @@ -1,12 +1,23 @@ -comment "targetcli-fb depends on Python" +comment "targetcli-fb needs Python, a glibc toolchain, gcc >= 4.9, host gcc >= 8" depends on !BR2_PACKAGE_PYTHON3 + depends on BR2_USE_MMU + depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS + depends on !BR2_HOST_GCC_AT_LEAST_8 || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_TOOLCHAIN_USES_GLIBC config BR2_PACKAGE_TARGETCLI_FB bool "targetcli-fb" depends on BR2_PACKAGE_PYTHON3 # python-configshell-fb + depends on BR2_USE_MMU # python-gobject -> gobject-introspection + depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS # python-gobject -> gobject-introspection + depends on BR2_HOST_GCC_AT_LEAST_8 # python-gobject -> gobject-introspection + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # python-gobject -> gobject-introspection + depends on BR2_TOOLCHAIN_USES_GLIBC # python-gobject -> gobject-introspection select BR2_PACKAGE_PYTHON_CONFIGSHELL_FB select BR2_PACKAGE_PYTHON_RTSLIB_FB select BR2_PACKAGE_PYTHON_SIX + select BR2_PACKAGE_PYTHON_GOBJECT help targetcli-fb is a command-line interface for configuring the LIO generic SCSI target, present in 3.x Linux kernel diff --git a/package/targetcli-fb/targetcli-fb.mk b/package/targetcli-fb/targetcli-fb.mk index d2cbf79e26..56ed7c6174 100644 --- a/package/targetcli-fb/targetcli-fb.mk +++ b/package/targetcli-fb/targetcli-fb.mk @@ -12,7 +12,11 @@ TARGETCLI_FB_LICENSE = Apache-2.0 TARGETCLI_FB_LICENSE_FILES = COPYING TARGETCLI_FB_CPE_ID_VALID = YES TARGETCLI_FB_SETUP_TYPE = setuptools -TARGETCLI_FB_DEPENDENCIES = python-configshell-fb python-rtslib-fb python-six +TARGETCLI_FB_DEPENDENCIES = \ + python-configshell-fb \ + python-gobject \ + python-rtslib-fb \ + python-six define TARGETCLI_FB_INSTALL_INIT_SYSV $(INSTALL) -m 0755 -D package/targetcli-fb/S50target \ From c41de33e45f3c44016b9eb1b14a8616fc3a7db41 Mon Sep 17 00:00:00 2001 From: "Jeremy J. Peper" Date: Tue, 12 Mar 2024 14:35:25 -0500 Subject: [PATCH 5387/5754] package/targetcli-fb: bump version to 2.1.58 bump to latest version because previous version did not work with python 3.11 corrected version mismatch with my first submission Signed-off-by: Jeremy J. Peper Signed-off-by: Arnout Vandecappelle (cherry picked from commit 242781bb61bdad2690b089cc5eaf7705d2632e5d) Signed-off-by: Peter Korsgaard --- package/targetcli-fb/targetcli-fb.hash | 2 +- package/targetcli-fb/targetcli-fb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/targetcli-fb/targetcli-fb.hash b/package/targetcli-fb/targetcli-fb.hash index 64f68a6675..1732fa99e5 100644 --- a/package/targetcli-fb/targetcli-fb.hash +++ b/package/targetcli-fb/targetcli-fb.hash @@ -1,3 +1,3 @@ # locally computed -sha256 7ae4120a54f24b13263b4b85c43952a03546f8b9fc9bd15fe87678f68245a33f targetcli-fb-2.1.54.tar.gz +sha256 605f4e4e4e7189d6a03f11a4f55e7ddb4671002d542c2f684f87dd68391dcdc2 targetcli-fb-2.1.58.tar.gz sha256 5df2a0d87d6c562f0ea11c688ac52532aa28d744cabc7994ff0537f64b3b3320 COPYING diff --git a/package/targetcli-fb/targetcli-fb.mk b/package/targetcli-fb/targetcli-fb.mk index 56ed7c6174..503b9224d0 100644 --- a/package/targetcli-fb/targetcli-fb.mk +++ b/package/targetcli-fb/targetcli-fb.mk @@ -6,7 +6,7 @@ # When upgrading the version, be sure to also upgrade python-rtslib-fb # and python-configshell-fb at the same time. -TARGETCLI_FB_VERSION = 2.1.54 +TARGETCLI_FB_VERSION = 2.1.58 TARGETCLI_FB_SITE = $(call github,open-iscsi,targetcli-fb,v$(TARGETCLI_FB_VERSION)) TARGETCLI_FB_LICENSE = Apache-2.0 TARGETCLI_FB_LICENSE_FILES = COPYING From 5cd3c8a4b4c9e3f4dd16c0efdd75ea054a2cbddc Mon Sep 17 00:00:00 2001 From: "Jeremy J. Peper" Date: Tue, 12 Mar 2024 14:35:26 -0500 Subject: [PATCH 5388/5754] package/python-configshell-fb: bump version to 1.1.30 bump to latest version because previous version did not work with python 3.11 Signed-off-by: Jeremy J. Peper Signed-off-by: Arnout Vandecappelle (cherry picked from commit 0c27711002a82bbbb47363efceb526be7862bab3) Signed-off-by: Peter Korsgaard --- package/python-configshell-fb/python-configshell-fb.hash | 2 +- package/python-configshell-fb/python-configshell-fb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/python-configshell-fb/python-configshell-fb.hash b/package/python-configshell-fb/python-configshell-fb.hash index 8fc38f61a6..e090501056 100644 --- a/package/python-configshell-fb/python-configshell-fb.hash +++ b/package/python-configshell-fb/python-configshell-fb.hash @@ -1,3 +1,3 @@ # locally computed -sha256 24b47284b463dcfb9ee0c1558827e13442127e62fa279b6e0253f136cf49058c python-configshell-fb-1.1.29.tar.gz +sha256 44696b92bea2b44c1d0bf2828477dddeb3b4dfb312ad82ce06d7b704c0985e27 python-configshell-fb-1.1.30.tar.gz sha256 5df2a0d87d6c562f0ea11c688ac52532aa28d744cabc7994ff0537f64b3b3320 COPYING diff --git a/package/python-configshell-fb/python-configshell-fb.mk b/package/python-configshell-fb/python-configshell-fb.mk index d0dd421e8d..3446a86e8d 100644 --- a/package/python-configshell-fb/python-configshell-fb.mk +++ b/package/python-configshell-fb/python-configshell-fb.mk @@ -6,7 +6,7 @@ # When upgrading the version, be sure to also upgrade python-rtslib-fb # and targetcli-fb at the same time. -PYTHON_CONFIGSHELL_FB_VERSION = 1.1.29 +PYTHON_CONFIGSHELL_FB_VERSION = 1.1.30 PYTHON_CONFIGSHELL_FB_SITE = $(call github,open-iscsi,configshell-fb,v$(PYTHON_CONFIGSHELL_FB_VERSION)) PYTHON_CONFIGSHELL_FB_LICENSE = Apache-2.0 PYTHON_CONFIGSHELL_FB_LICENSE_FILES = COPYING From 962a6709fe8b002d938692b94ecf7dbcf5a47287 Mon Sep 17 00:00:00 2001 From: "Jeremy J. Peper" Date: Tue, 12 Mar 2024 14:35:27 -0500 Subject: [PATCH 5389/5754] package/python-rtslib-fb: 2.1.76 bump to latest version because previous version did not work with python 3.11 Signed-off-by: Jeremy J. Peper Signed-off-by: Arnout Vandecappelle (cherry picked from commit 8a69af5fa4b545767ab292d1ad01266b87d45e92) Signed-off-by: Peter Korsgaard --- package/python-rtslib-fb/python-rtslib-fb.hash | 2 +- package/python-rtslib-fb/python-rtslib-fb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/python-rtslib-fb/python-rtslib-fb.hash b/package/python-rtslib-fb/python-rtslib-fb.hash index 3c2e39fffd..39c390edb2 100644 --- a/package/python-rtslib-fb/python-rtslib-fb.hash +++ b/package/python-rtslib-fb/python-rtslib-fb.hash @@ -1,3 +1,3 @@ # locally computed -sha256 9f581c4bcffebc60be236af8a6ebdeccdb66d0435eeb04ab1b743c170b95d046 python-rtslib-fb-2.1.74.tar.gz +sha256 ac15c113d09209c7b0d14d94a12ed88205a7c2feadd1096f573049fd737f7e74 python-rtslib-fb-2.1.76.tar.gz sha256 5df2a0d87d6c562f0ea11c688ac52532aa28d744cabc7994ff0537f64b3b3320 COPYING diff --git a/package/python-rtslib-fb/python-rtslib-fb.mk b/package/python-rtslib-fb/python-rtslib-fb.mk index 09bde874f0..6396d26a3f 100644 --- a/package/python-rtslib-fb/python-rtslib-fb.mk +++ b/package/python-rtslib-fb/python-rtslib-fb.mk @@ -6,7 +6,7 @@ # When upgrading the version, be sure to also upgrade # python-configshell-fb and targetcli-fb at the same time. -PYTHON_RTSLIB_FB_VERSION = 2.1.74 +PYTHON_RTSLIB_FB_VERSION = 2.1.76 # Do not switch site to PyPI: it does not contain the latest version. PYTHON_RTSLIB_FB_SITE = $(call github,open-iscsi,rtslib-fb,v$(PYTHON_RTSLIB_FB_VERSION)) PYTHON_RTSLIB_FB_LICENSE = Apache-2.0 From a08970e4438ef24e665fb233d64797affae79aea Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 17 Mar 2024 13:51:32 +0100 Subject: [PATCH 5390/5754] toolchain: drop codescape mips toolchains Codescape mips toolchains are old (2018) and use glibc 2.20 which is not compatible with 64-bit time_t raising the following build failure with libselinux since commit 1c2dbcdcf0bb589d325c379246acaa39bb07b7be: In file included from selinux_restorecon.c:17:0: /home/buildroot/autobuild/instance-1/output-1/host/mipsel-buildroot-linux-gnu/sysroot/usr/include/fts.h:41:3: error: #error " cannot be used with -D_FILE_OFFSET_BITS==64" # error " cannot be used with -D_FILE_OFFSET_BITS==64" ^~~~~ Fixes: 1c2dbcdcf0bb589d325c379246acaa39bb07b7be - http://autobuild.buildroot.org/results/a4d38af627a42a2c55d60129787c51353d5883bf Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (cherry picked from commit 33605ea6d9b370d052dbf6b06d89e7b2a16d4275) Signed-off-by: Peter Korsgaard --- Config.in.legacy | 16 +++- package/openblas/Config.in | 4 - toolchain/toolchain-external/Config.in | 6 +- .../Config.in | 66 ---------------- .../Config.in.options | 9 --- ...toolchain-external-codescape-img-mips.hash | 4 - .../toolchain-external-codescape-img-mips.mk | 51 ------------- .../Config.in | 76 ------------------- .../Config.in.options | 9 --- ...toolchain-external-codescape-mti-mips.hash | 4 - .../toolchain-external-codescape-mti-mips.mk | 51 ------------- 11 files changed, 16 insertions(+), 280 deletions(-) delete mode 100644 toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in delete mode 100644 toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in.options delete mode 100644 toolchain/toolchain-external/toolchain-external-codescape-img-mips/toolchain-external-codescape-img-mips.hash delete mode 100644 toolchain/toolchain-external/toolchain-external-codescape-img-mips/toolchain-external-codescape-img-mips.mk delete mode 100644 toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in delete mode 100644 toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in.options delete mode 100644 toolchain/toolchain-external/toolchain-external-codescape-mti-mips/toolchain-external-codescape-mti-mips.hash delete mode 100644 toolchain/toolchain-external/toolchain-external-codescape-mti-mips/toolchain-external-codescape-mti-mips.mk diff --git a/Config.in.legacy b/Config.in.legacy index c2124d26cb..5d4da5c354 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,8 +146,22 @@ endif comment "Legacy options removed in 2024.02" +config BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS + bool "Codescape IMG GNU Linux Toolchain 2018.09 has been removed" + select BR2_LEGACY + help + The Codescape IMG GNU Linux toolchain has been removed, use a + Bootlin toolchain instead. + +config BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS + bool "Codescape MTI GNU Linux Toolchain 2018.09 has been removed" + select BR2_LEGACY + help + The Codescape MTI GNU Linux toolchain has been removed, use a + Bootlin toolchain instead. + config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64 - bool "CodeSourcery AArch64 2014.11" + bool "CodeSourcery AArch64 2014.11 has been removed" select BR2_LEGACY help The Sourcery CodeBench AArch64 toolchain has been removed, diff --git a/package/openblas/Config.in b/package/openblas/Config.in index 74c4a3aa5c..7d4727003b 100644 --- a/package/openblas/Config.in +++ b/package/openblas/Config.in @@ -26,11 +26,7 @@ config BR2_PACKAGE_OPENBLAS_DEFAULT_TARGET default "PPC970" if BR2_powerpc_970 default "PPC440" if BR2_powerpc_440 default "PPC440FP2" if BR2_powerpc_440fp - # P5600 is built with MSA support which is only available in Codescape toolchains - default "P5600" if BR2_mips_p5600 && BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS default "MIPS64_GENERIC" if BR2_MIPS_CPU_MIPS64 - # I6400 is built with MSA support which is only available in Codescape toolchains - default "I6400" if BR2_mips_i6400 && BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS # OpenBLAS assumes SPARC=Sparc v9 default "SPARC" if BR2_sparc_v9 # Cortex-A15 always have a VFPv4 diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in index b5432b71d7..af9082cf6e 100644 --- a/toolchain/toolchain-external/Config.in +++ b/toolchain/toolchain-external/Config.in @@ -26,10 +26,8 @@ source "toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in" # ARM big-endian source "toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in" -# MIPS (use codesourcery toolchain by default) +# MIPS source "toolchain/toolchain-external/toolchain-external-codesourcery-mips/Config.in" -source "toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in" -source "toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in" # NIOSII source "toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in" @@ -130,8 +128,6 @@ source "toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in.o # MIPS source "toolchain/toolchain-external/toolchain-external-codesourcery-mips/Config.in.options" -source "toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in.options" -source "toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in.options" # NIOSII source "toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in.options" diff --git a/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in b/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in deleted file mode 100644 index d49c610237..0000000000 --- a/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in +++ /dev/null @@ -1,66 +0,0 @@ -config BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS - bool "Codescape IMG GNU Linux Toolchain 2018.09" - depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_7 - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - depends on BR2_MIPS_CPU_MIPS32R6 || (BR2_MIPS_CPU_MIPS64R6 && !BR2_MIPS_SOFT_FLOAT) - select BR2_TOOLCHAIN_EXTERNAL_GLIBC - select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER - select BR2_INSTALL_LIBSTDCPP - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_7 - select BR2_TOOLCHAIN_GCC_AT_LEAST_6 - select BR2_TOOLCHAIN_HAS_FORTRAN - select BR2_TOOLCHAIN_HAS_OPENMP - help - Codescape IMG GNU Linux Toolchain 2018.09 for the MIPS - architecture, from MIPS Tech LLC. It uses gcc 6.3.0, - binutils 2.28.51, glibc 2.20, gdb 7.9.1 and kernel headers - 4.7. It has support for the following variants: - - MIPS32r6 - Big-Endian, Hard-Float, 2008 NaN, o32 ABI - Select 'MIPS (big endian)' Target Architecture - Select 'mips 32r6' Target Architecture Variant - Disable 'Use soft-float' - - MIPS32r6 - Big-Endian, Soft-Float, 2008 NaN, o32 ABI - Select 'MIPS (big endian)' Target Architecture - Select 'mips 32r6' Target Architecture Variant - Enable 'Use soft-float' - - MIPS32r6 - Little-Endian, Hard-Float, 2008 NaN, o32 ABI - Select 'MIPS (little endian)' Target Architecture - Select 'mips 32r6' Target Architecture Variant - Disable 'Use soft-float' - - MIPS32r6 - Little-Endian, Soft-Float, 2008 NaN, o32 ABI - Select 'MIPS (little endian)' Target Architecture - Select 'mips 32r6' Target Architecture Variant - Enable 'Use soft-float' - - MIPS32r6 - Little-Endian, Hard-Float, 2008 NaN, o32 ABI, - microMIPS - Select 'MIPS (little endian)' Target Architecture - Select 'mips 32r6' Target Architecture Variant - Disable 'Use soft-float' - Set BR2_TARGET_OPTIMIZATION to '-mmicromips' - - MIPS32r6 - Little-Endian, Soft-Float, 2008 NaN, o32 ABI, - microMIPS - Select 'MIPS (little endian)' Target Architecture - Select 'mips 32r6' Target Architecture Variant - Enable 'Use soft-float' - Set BR2_TARGET_OPTIMIZATION to '-mmicromips' - - MIPS64r6 - Big-Endian, Hard-Float, 2008 NaN, n32 ABI - Select 'MIPS64 (big endian)' Target Architecture - Select 'mips 64r6' Target Architecture Variant - Select 'n32' Target ABI - Disable 'Use soft-float' - - MIPS64r6 - Little-Endian, Hard-Float, 2008 NaN, n32 ABI - Select 'MIPS64 (little endian)' Target Architecture - Select 'mips 64r6' Target Architecture Variant - Select 'n32' Target ABI - Disable 'Use soft-float' - - MIPS64r6 - Big-Endian, Hard-Float, 2008 NaN, n64 ABI - Select 'MIPS64 (big endian)' Target Architecture - Select 'mips 64r6' Target Architecture Variant - Select 'n64' Target ABI - Disable 'Use soft-float' - - MIPS64r6 - Little-Endian, Hard-Float, 2008 NaN, n64 ABI - Select 'MIPS64 (little endian)' Target Architecture - Select 'mips 64r6' Target Architecture Variant - Select 'n64' Target ABI - Disable 'Use soft-float' diff --git a/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in.options b/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in.options deleted file mode 100644 index 3eaa2a9522..0000000000 --- a/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in.options +++ /dev/null @@ -1,9 +0,0 @@ -if BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS - -config BR2_TOOLCHAIN_EXTERNAL_PREFIX - default "mips-img-linux-gnu" - -config BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL - default "toolchain-external-codescape-img-mips" - -endif diff --git a/toolchain/toolchain-external/toolchain-external-codescape-img-mips/toolchain-external-codescape-img-mips.hash b/toolchain/toolchain-external/toolchain-external-codescape-img-mips/toolchain-external-codescape-img-mips.hash deleted file mode 100644 index 65e1861f12..0000000000 --- a/toolchain/toolchain-external/toolchain-external-codescape-img-mips/toolchain-external-codescape-img-mips.hash +++ /dev/null @@ -1,4 +0,0 @@ -# Codescape toolchains from MIPS Tech LLC -# From: https://codescape.mips.com/components/toolchain/nanomips/2018.09-02/downloads.html -sha256 ac035f3b6a8767522977963d8e1490520d58bccca7956f4503a1eefff6492b71 Codescape.GNU.Tools.Package.2018.09-02.for.MIPS.IMG.Linux.CentOS-6.x86.tar.gz -sha256 09280f4fcbb993607905bf9a43bf5f3db2beed85726f0675b8453e19a9ddc429 Codescape.GNU.Tools.Package.2018.09-02.for.MIPS.IMG.Linux.CentOS-6.x86_64.tar.gz diff --git a/toolchain/toolchain-external/toolchain-external-codescape-img-mips/toolchain-external-codescape-img-mips.mk b/toolchain/toolchain-external/toolchain-external-codescape-img-mips/toolchain-external-codescape-img-mips.mk deleted file mode 100644 index 55424918c7..0000000000 --- a/toolchain/toolchain-external/toolchain-external-codescape-img-mips/toolchain-external-codescape-img-mips.mk +++ /dev/null @@ -1,51 +0,0 @@ -################################################################################ -# -# toolchain-external-codescape-img-mips -# -################################################################################ - -TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_VERSION = 2018.09-02 -TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_SITE = https://codescape.mips.com/components/toolchain/$(TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_VERSION) -TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_STRIP_COMPONENTS = 2 - -ifeq ($(HOSTARCH),x86) -TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_SOURCE = Codescape.GNU.Tools.Package.$(TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_VERSION).for.MIPS.IMG.Linux.CentOS-6.x86.tar.gz -else -TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_SOURCE = Codescape.GNU.Tools.Package.$(TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_VERSION).for.MIPS.IMG.Linux.CentOS-6.x86_64.tar.gz -endif - -# Special fixup for Codescape MIPS toolchains, that have bin- and -# sbin- directories. We create symlinks bin -> bin- and sbin -# -> sbin- so that the rest of Buildroot can find the toolchain -# tools in the appropriate location. -ifeq ($(BR2_MIPS_OABI32),y) -TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_BIN_DIR_SUFFIX = o32 -else ifeq ($(BR2_MIPS_NABI32),y) -TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_BIN_DIR_SUFFIX = n32 -else ifeq ($(BR2_MIPS_NABI64),y) -TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_BIN_DIR_SUFFIX = n64 -endif - -define TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_STAGING_FIXUPS - rmdir $(STAGING_DIR)/usr/bin $(STAGING_DIR)/usr/sbin - ln -sf bin-$(TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_BIN_DIR_SUFFIX) $(STAGING_DIR)/usr/bin - ln -sf sbin-$(TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_BIN_DIR_SUFFIX) $(STAGING_DIR)/usr/sbin -endef - -# The Codescape toolchain uses a sysroot layout that places them -# side-by-side instead of nested like multilibs. A symlink is needed -# much like for the nested sysroots which are handled in -# copy_toolchain_sysroot but there is not enough information in there -# to determine whether the sysroot layout was nested or side-by-side. -# Add the symlink here for now. -define TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_SYMLINK - $(Q)ARCH_SYSROOT_DIR="$(call toolchain_find_sysroot,$(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS))"; \ - ARCH_SUBDIR=`basename $${ARCH_SYSROOT_DIR}`; \ - ln -snf . $(STAGING_DIR)/$${ARCH_SUBDIR} -endef - -TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_POST_INSTALL_STAGING_HOOKS += \ - TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_STAGING_FIXUPS \ - TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_SYMLINK - -$(eval $(toolchain-external-package)) diff --git a/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in b/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in deleted file mode 100644 index 720d705d14..0000000000 --- a/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in +++ /dev/null @@ -1,76 +0,0 @@ -config BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS - bool "Codescape MTI GNU Linux Toolchain 2018.09" - depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_7 - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - depends on BR2_MIPS_CPU_MIPS32R2 || (BR2_MIPS_CPU_MIPS64R2 && !BR2_MIPS_SOFT_FLOAT) - select BR2_TOOLCHAIN_EXTERNAL_GLIBC - select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER - select BR2_INSTALL_LIBSTDCPP - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_7 - select BR2_TOOLCHAIN_GCC_AT_LEAST_6 - select BR2_TOOLCHAIN_HAS_FORTRAN - select BR2_TOOLCHAIN_HAS_OPENMP - help - Codescape MTI GNU Linux Toolchain 2018.09 for the MIPS - architecture, from MIPS Tech LLC. It uses gcc 6.3.0, - binutils 2.28.51, glibc 2.20, gdb 7.9.1 and kernel headers - 4.7. It has support for the following variants: - - MIPS32r2 - Big-Endian, Hard-Float, Legacy NaN, o32 ABI - Select 'MIPS (big endian)' Target Architecture - Select 'mips 32r2' Target Architecture Variant - Disable 'Use soft-float' - - MIPS32r2 - Big-Endian, Hard-Float, 2008 NaN, o32 ABI - Select 'MIPS (big endian)' Target Architecture - Select 'mips 32r2' Target Architecture Variant - Disable 'Use soft-float' - Set BR2_TARGET_OPTIMIZATION to '-mnan=2008' - - MIPS32r2 - Big-Endian, Soft-Float, Legacy NaN, o32 ABI - Select 'MIPS (big endian)' Target Architecture - Select 'mips 32r2' Target Architecture Variant - Enable 'Use soft-float' - - MIPS32r2 - Little-Endian, Hard-Float, Legacy NaN, o32 ABI - Select 'MIPS (little endian)' Target Architecture - Select 'mips 32r2' Target Architecture Variant - Disable 'Use soft-float' - - MIPS32r2 - Little-Endian, Hard-Float, 2008 NaN, o32 ABI - Select 'MIPS (little endian)' Target Architecture - Select 'mips 32r2' Target Architecture Variant - Disable 'Use soft-float' - Set BR2_TARGET_OPTIMIZATION to '-mnan=2008' - - MIPS32r2 - Little-Endian, Soft-Float, Legacy NaN, o32 ABI - Select 'MIPS (little endian)' Target Architecture - Select 'mips 32r2' Target Architecture Variant - Enable 'Use soft-float' - - MIPS32r2 - Little-Endian, Hard-Float, 2008 NaN, o32 ABI, - microMIPS - Select 'MIPS (little endian)' Target Architecture - Select 'mips 32r2' Target Architecture Variant - Enable 'Use soft-float' - Set BR2_TARGET_OPTIMIZATION to '-mmicromips' - - MIPS32r2 - Little-Endian, Soft-Float, Legacy NaN, o32 ABI, - microMIPS - Select 'MIPS (little endian)' Target Architecture - Select 'mips 32r2' Target Architecture Variant - Disable 'Use soft-float' - Set BR2_TARGET_OPTIMIZATION to '-mmicromips' - - MIPS64r2 - Big-Endian, Hard-Float, Legacy NaN, n32 ABI - Select 'MIPS64 (big endian)' Target Architecture - Select 'mips 64r2' Target Architecture Variant - Select 'n32' Target ABI - Disable 'Use soft-float' - - MIPS64r2 - Little-Endian, Hard-Float, Legacy NaN, n32 ABI - Select 'MIPS64 (little endian)' Target Architecture - Select 'mips 64r2' Target Architecture Variant - Select 'n32' Target ABI - Disable 'Use soft-float' - - MIPS64r2 - Big-Endian, Hard-Float, Legacy NaN, n64 ABI - Select 'MIPS64 (big endian)' Target Architecture - Select 'mips 64r2' Target Architecture Variant - Select 'n64' Target ABI - Disable 'Use soft-float' - - MIPS64r2 - Little-Endian, Hard-Float, Legacy NaN, n64 ABI - Select 'MIPS64 (little endian)' Target Architecture - Select 'mips 64r2' Target Architecture Variant - Select 'n64' Target ABI - Disable 'Use soft-float' diff --git a/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in.options b/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in.options deleted file mode 100644 index 464c9b8448..0000000000 --- a/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in.options +++ /dev/null @@ -1,9 +0,0 @@ -if BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS - -config BR2_TOOLCHAIN_EXTERNAL_PREFIX - default "mips-mti-linux-gnu" - -config BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL - default "toolchain-external-codescape-mti-mips" - -endif diff --git a/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/toolchain-external-codescape-mti-mips.hash b/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/toolchain-external-codescape-mti-mips.hash deleted file mode 100644 index b07281de48..0000000000 --- a/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/toolchain-external-codescape-mti-mips.hash +++ /dev/null @@ -1,4 +0,0 @@ -# Codescape toolchains from MIPS Tech LLC -# From: https://codescape.mips.com/components/toolchain/nanomips/2018.09-02/downloads.html -sha256 c883a404fd7ea5718e2249a530802e223381f2be52265f88e9b1ce7035c232f3 Codescape.GNU.Tools.Package.2018.09-02.for.MIPS.MTI.Linux.CentOS-6.x86.tar.gz -sha256 d6310a970b0a8a19ad8e0a2b3ead8c38ee90d0e284a9b2511200ce447f460d2c Codescape.GNU.Tools.Package.2018.09-02.for.MIPS.MTI.Linux.CentOS-6.x86_64.tar.gz diff --git a/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/toolchain-external-codescape-mti-mips.mk b/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/toolchain-external-codescape-mti-mips.mk deleted file mode 100644 index 9bee1ab87d..0000000000 --- a/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/toolchain-external-codescape-mti-mips.mk +++ /dev/null @@ -1,51 +0,0 @@ -################################################################################ -# -# toolchain-external-codescape-mti-mips -# -################################################################################ - -TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_VERSION = 2018.09-02 -TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_SITE = https://codescape.mips.com/components/toolchain/$(TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_VERSION) -TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_STRIP_COMPONENTS = 2 - -ifeq ($(HOSTARCH),x86) -TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_SOURCE = Codescape.GNU.Tools.Package.$(TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_VERSION).for.MIPS.MTI.Linux.CentOS-6.x86.tar.gz -else -TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_SOURCE = Codescape.GNU.Tools.Package.$(TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_VERSION).for.MIPS.MTI.Linux.CentOS-6.x86_64.tar.gz -endif - -# Special fixup for Codescape MIPS toolchains, that have bin- and -# sbin- directories. We create symlinks bin -> bin- and sbin -# -> sbin- so that the rest of Buildroot can find the toolchain -# tools in the appropriate location. -ifeq ($(BR2_MIPS_OABI32),y) -TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_BIN_DIR_SUFFIX = o32 -else ifeq ($(BR2_MIPS_NABI32),y) -TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_BIN_DIR_SUFFIX = n32 -else ifeq ($(BR2_MIPS_NABI64),y) -TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_BIN_DIR_SUFFIX = n64 -endif - -define TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_STAGING_FIXUPS - rmdir $(STAGING_DIR)/usr/bin $(STAGING_DIR)/usr/sbin - ln -sf bin-$(TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_BIN_DIR_SUFFIX) $(STAGING_DIR)/usr/bin - ln -sf sbin-$(TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_BIN_DIR_SUFFIX) $(STAGING_DIR)/usr/sbin -endef - -# The Codescape toolchain uses a sysroot layout that places them -# side-by-side instead of nested like multilibs. A symlink is needed -# much like for the nested sysroots which are handled in -# copy_toolchain_sysroot but there is not enough information in there -# to determine whether the sysroot layout was nested or side-by-side. -# Add the symlink here for now. -define TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_SYMLINK - $(Q)ARCH_SYSROOT_DIR="$(call toolchain_find_sysroot,$(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS))"; \ - ARCH_SUBDIR=`basename $${ARCH_SYSROOT_DIR}`; \ - ln -snf . $(STAGING_DIR)/$${ARCH_SUBDIR} -endef - -TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_POST_INSTALL_STAGING_HOOKS += \ - TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_STAGING_FIXUPS \ - TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_SYMLINK - -$(eval $(toolchain-external-package)) From 98ecfc6c0e618beb1a204d52742df93bc67a81d6 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 17 Mar 2024 13:56:31 +0100 Subject: [PATCH 5391/5754] package/squid: fix build with host gcc 10 Pass -std=c++17 to fix the following build failure with host gcc 10 raised since bump to version 6.6 in commit c13199c9326fa2daa574f08ec8fc063a48d0eb06: /usr/bin/g++ -O2 -I/home/buildroot/instance-0/output-1/host/include -o cf_gen ./cf_gen.cc -I. -I../include/ -I../src ./cf_gen.cc: In function 'int main(int, char**)': ./cf_gen.cc:268:63: error: forming reference to void 268 | auto &newEntry = entries.emplace_back(name); | ^ Fixes: - http://autobuild.buildroot.org/results/613fee008c77f8dbbe04df9a4ce4347e43de9ef9 - https://bugs.buildroot.org/show_bug.cgi?id=15997 Reported-by: Roland Franke Suggested-by: Peter Seiderer Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (cherry picked from commit 9347905b95dfe045ee40ae69d9d3f00a2c1b7168) Signed-off-by: Peter Korsgaard --- package/squid/squid.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/squid/squid.mk b/package/squid/squid.mk index 3a9edac71e..6a2b522336 100644 --- a/package/squid/squid.mk +++ b/package/squid/squid.mk @@ -21,7 +21,7 @@ SQUID_CONF_ENV = \ ac_cv_func_strnstr=no \ ac_cv_have_squid=yes \ BUILDCXX="$(HOSTCXX)" \ - BUILDCXXFLAGS="$(HOST_CXXFLAGS)" + BUILDCXXFLAGS="$(HOST_CXXFLAGS) -std=c++17" SQUID_CONF_OPTS = \ --enable-async-io=8 \ --enable-linux-netfilter \ From 043a342d793e162dac052e8c87a57d2c59c9fe96 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 17 Mar 2024 10:40:37 +0100 Subject: [PATCH 5392/5754] package/poco: needs C++17 poco needs C++17 and gcc >=8 since bump to version 1.13.2 in commit 433c4fd38b15efcf74b410e5068e2e51eeba6e46 and https://github.com/pocoproject/poco/commit/78234857bf416b718455496800d1b7be3a0d0a53 https://github.com/pocoproject/poco/commit/10f41c06d9416a6ae0884c4827ea2a91bf5d2cf8 resulting in the following build failure with gcc 7: In file included from src/Thread.cpp:28:0: src/Thread_POSIX.cpp: In member function 'void Poco::ThreadImpl::setNameImpl(const string&)': src/Thread_POSIX.cpp:162:56: error: no matching function for call to 'std::__cxx11::basic_string::append(const string&, std::__cxx11::basic_string::size_type)' truncName.append(threadName, threadName.size() - half); ^ Fixes: 433c4fd38b15efcf74b410e5068e2e51eeba6e46 - http://autobuild.buildroot.org/results/7b1c144f39a8be4ce8f964aa13a52d0bf62dd0aa Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (cherry picked from commit 54dbd8e2c5c0b2f40cb53066b265535266eaf8d6) Signed-off-by: Peter Korsgaard --- package/poco/Config.in | 6 +++--- package/poco/poco.mk | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package/poco/Config.in b/package/poco/Config.in index 7cb9987ec7..9bdef125ad 100644 --- a/package/poco/Config.in +++ b/package/poco/Config.in @@ -12,7 +12,7 @@ config BR2_PACKAGE_POCO bool "poco" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++14 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # C++17 # pthread_condattr_setclock depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on !BR2_STATIC_LIBS # dlopen() @@ -116,8 +116,8 @@ config BR2_PACKAGE_POCO_ZIP endif # BR2_PACKAGE_POCO -comment "poco needs a toolchain w/ wchar, NPTL, C++, dynamic library, gcc >= 5 w/ C++14" +comment "poco needs a toolchain w/ wchar, NPTL, C++, dynamic library, gcc >= 8" depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP \ || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS \ - || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 + || !BR2_TOOLCHAIN_GCC_AT_LEAST_8 depends on BR2_PACKAGE_POCO_ARCH_SUPPORTS diff --git a/package/poco/poco.mk b/package/poco/poco.mk index cc8a22fc2a..233252c67b 100644 --- a/package/poco/poco.mk +++ b/package/poco/poco.mk @@ -68,7 +68,6 @@ define POCO_CONFIGURE_CMDS (cd $(@D); $(TARGET_MAKE_ENV) ./configure \ --config=Linux \ --prefix=/usr \ - --cflags=-std=c++14 \ --ldflags="$(POCO_LDFLAGS)" \ --omit="$(POCO_OMIT)" \ $(POCO_CONF_OPTS) \ From 184ce4a6c3115b0d8cbc443840ca1eef0f1beb16 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Mon, 4 Mar 2024 16:32:32 +0100 Subject: [PATCH 5393/5754] configs/ti_am62x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM setting Using PLATFORM=k3 can leads to a runtime boot crash on some K3 SoC (e.g. j721e) because the optee flavor is missing. We could use BR2_TARGET_OPTEE_OS_PLATFORM=k3 and BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR=am62x but we actually can use BR2_TARGET_OPTEE_OS_PLATFORM=k3-am62x as explained in the optee-os Makefile [1]: # If $(PLATFORM) is defined and contains a hyphen, parse it as # $(PLATFORM)-$(PLATFORM_FLAVOR) for convenience This is how meta-ti set the optee-os platform: meta-ti]$ git grep OPTEEMACHINE meta-ti-bsp/conf/machine/am437x-hs-evm.conf:OPTEEMACHINE = "ti-am43xx" meta-ti-bsp/conf/machine/am57xx-hs-evm.conf:OPTEEMACHINE = "ti-am57xx" meta-ti-bsp/conf/machine/beagleplay.conf:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf:OPTEEMACHINE = "ti-dra7xx" meta-ti-bsp/conf/machine/include/am62axx.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/am62pxx.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/am62xx.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/am64xx.inc:OPTEEMACHINE = "k3-am64x" meta-ti-bsp/conf/machine/include/am65xx.inc:OPTEEMACHINE = "k3-am65x" meta-ti-bsp/conf/machine/include/j7200.inc:OPTEEMACHINE = "k3-j721e" meta-ti-bsp/conf/machine/include/j721e.inc:OPTEEMACHINE = "k3-j721e" meta-ti-bsp/conf/machine/include/j721s2.inc:OPTEEMACHINE = "k3-j784s4" meta-ti-bsp/conf/machine/include/j722s.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/j784s4.inc:OPTEEMACHINE = "k3-j784s4" meta-ti uses the OPTEEMACHINE to set optee-os platform [2]. [1] https://github.com/OP-TEE/optee_os/blob/4.0.0/Makefile#L37 [2] https://git.yoctoproject.org/meta-arm/tree/meta-arm/recipes-security/optee/optee-os.inc?h=4.0.3#n23 Suggested-by: Romain Naour Signed-off-by: Dario Binacchi Signed-off-by: Yann E. MORIN (cherry picked from commit f68c45f73334b9c83c44e5bbb3d505050f8b720e) Signed-off-by: Peter Korsgaard --- configs/ti_am62x_sk_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index f88252a89c..c3ad555a81 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -21,7 +21,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_OPTEE_OS_PLATFORM="k3-am62x" BR2_TARGET_TI_K3_IMAGE_GEN=y BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y BR2_TARGET_TI_K3_R5_LOADER=y From 0cc73a1fc50d41a459da98ae0b88ca98462e3c52 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Mon, 4 Mar 2024 16:32:33 +0100 Subject: [PATCH 5394/5754] configs/ti_am64x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM setting Using PLATFORM=k3 can leads to a runtime boot crash on some K3 SoC (e.g. j721e) because the optee flavor is missing. We could use BR2_TARGET_OPTEE_OS_PLATFORM=k3 and BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR=am64x but we actually can use BR2_TARGET_OPTEE_OS_PLATFORM=k3-am64x as explained in the optee-os Makefile [1]: # If $(PLATFORM) is defined and contains a hyphen, parse it as # $(PLATFORM)-$(PLATFORM_FLAVOR) for convenience This is how meta-ti set the optee-os platform: meta-ti]$ git grep OPTEEMACHINE meta-ti-bsp/conf/machine/am437x-hs-evm.conf:OPTEEMACHINE = "ti-am43xx" meta-ti-bsp/conf/machine/am57xx-hs-evm.conf:OPTEEMACHINE = "ti-am57xx" meta-ti-bsp/conf/machine/beagleplay.conf:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf:OPTEEMACHINE = "ti-dra7xx" meta-ti-bsp/conf/machine/include/am62axx.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/am62pxx.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/am62xx.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/am64xx.inc:OPTEEMACHINE = "k3-am64x" meta-ti-bsp/conf/machine/include/am65xx.inc:OPTEEMACHINE = "k3-am65x" meta-ti-bsp/conf/machine/include/j7200.inc:OPTEEMACHINE = "k3-j721e" meta-ti-bsp/conf/machine/include/j721e.inc:OPTEEMACHINE = "k3-j721e" meta-ti-bsp/conf/machine/include/j721s2.inc:OPTEEMACHINE = "k3-j784s4" meta-ti-bsp/conf/machine/include/j722s.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/j784s4.inc:OPTEEMACHINE = "k3-j784s4" meta-ti uses the OPTEEMACHINE to set optee-os platform [2]. [1] https://github.com/OP-TEE/optee_os/blob/4.0.0/Makefile#L37 [2] https://git.yoctoproject.org/meta-arm/tree/meta-arm/recipes-security/optee/optee-os.inc?h=4.0.3#n23 Suggested-by: Romain Naour Signed-off-by: Dario Binacchi Signed-off-by: Yann E. MORIN (cherry picked from commit fde806f8220720b95cb3973fe9d7e55057a1bee7) Signed-off-by: Peter Korsgaard --- configs/ti_am64x_sk_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig index 4bfd31f0c8..097175bd8f 100644 --- a/configs/ti_am64x_sk_defconfig +++ b/configs/ti_am64x_sk_defconfig @@ -21,7 +21,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_OPTEE_OS_PLATFORM="k3-am64x" BR2_TARGET_TI_K3_IMAGE_GEN=y BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y BR2_TARGET_TI_K3_R5_LOADER=y From a6c0eae2b304def2341f3f5ff50ed608094e81ca Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Mon, 4 Mar 2024 16:32:34 +0100 Subject: [PATCH 5395/5754] configs/ti_am62x_sk_defconfig: explicitly set the ti-k3-r5-loader version Commit 4b8fddb060fb ("configs/ti_am62x_sk: new defconfig") forgot to specify the ti-k3-r5-loader, so do that now. When the defconfig was added, the default version was 2022.10, so use it. Suggested-by: Romain Naour Signed-off-by: Dario Binacchi Signed-off-by: Yann E. MORIN (cherry picked from commit a01997fd393cdbc9b7912afa0f1aaaba0684fb56) Signed-off-by: Peter Korsgaard --- configs/ti_am62x_sk_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index c3ad555a81..a129e216d2 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -25,6 +25,8 @@ BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" BR2_TARGET_TI_K3_IMAGE_GEN=y BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y BR2_TARGET_TI_K3_R5_LOADER=y +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am62x_evm_r5" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y From 1d6c4975a4da0e951ef0682848fe1cc19926e7f6 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Mon, 4 Mar 2024 16:32:35 +0100 Subject: [PATCH 5396/5754] configs/ti_am64x_sk_defconfig: explicitly set the ti-k3-r5-loader version Commit 6b2329bb80 ("configs/ti_am64x_sk: new defconfig") forgot to specify the ti-k3-r5-loader, so do that now. When the defconfig was added, the default version was 2022.10, so use it. Suggested-by: Romain Naour Signed-off-by: Dario Binacchi Signed-off-by: Yann E. MORIN (cherry picked from commit e3a3e163253cd702d99ba731d546f2cdb6eedc05) Signed-off-by: Peter Korsgaard --- configs/ti_am64x_sk_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig index 097175bd8f..26195194c7 100644 --- a/configs/ti_am64x_sk_defconfig +++ b/configs/ti_am64x_sk_defconfig @@ -25,6 +25,8 @@ BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x" BR2_TARGET_TI_K3_IMAGE_GEN=y BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y BR2_TARGET_TI_K3_R5_LOADER=y +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am64x_evm_r5" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y From 7d7b4b1a324e969560df6717f1fcb65df492c796 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 19 Mar 2024 21:06:46 +0100 Subject: [PATCH 5397/5754] package/putty: fix arm uclibc build Fix the following arm uclibc build failure raised since bump to version 0.78 in commit 5673ea3ce4d4dd721bb17fc8d5b1283f5c1080b4 which wrongly removed patch because file was renamed. Patch was sent upstream in 2021 but rejected, even a second iteration defining AT_HWCAP2 to 26 if needed was also rejected. Fixes: 5673ea3ce4d4dd721bb17fc8d5b1283f5c1080b4 - http://autobuild.buildroot.org/results/547d1c0e8a89e1e4b601aa756d26886bfc3d586f Signed-off-by: Fabrice Fontaine [Arnout: add Upstream: to patch comment] Signed-off-by: Arnout Vandecappelle (cherry picked from commit 455ce5fc02488983a6732087bcbbb15e04c75937) Signed-off-by: Peter Korsgaard --- ...-arm_arch_queries.h-fix-uclibc-build.patch | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 package/putty/0001-unix-utils-arm_arch_queries.h-fix-uclibc-build.patch diff --git a/package/putty/0001-unix-utils-arm_arch_queries.h-fix-uclibc-build.patch b/package/putty/0001-unix-utils-arm_arch_queries.h-fix-uclibc-build.patch new file mode 100644 index 0000000000..d2abcb64cf --- /dev/null +++ b/package/putty/0001-unix-utils-arm_arch_queries.h-fix-uclibc-build.patch @@ -0,0 +1,41 @@ +From 2631c745f986b356fbe5e1d418cff63b46134df6 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 19 Mar 2024 20:37:33 +0100 +Subject: [PATCH] unix/utils/arm_arch_queries.h: fix uclibc build + +Build on uclibc is broken since version 0.75 and commit +65383082bf0c49cec63f4b36001a40bd9b13edf6 because AT_HWCAP2 is used +even if is not available: + +/home/buildroot/autobuild/run/instance-3/output-1/build/putty-0.80/unix/utils/arm_arch_queries.c: In function 'platform_aes_neon_available': +/home/buildroot/autobuild/run/instance-3/output-1/build/putty-0.80/unix/utils/arm_arch_queries.c:18:22: error: 'AT_HWCAP2' undeclared (first use in this function) + 18 | return getauxval(AT_HWCAP2) & HWCAP2_AES; + | ^~~~~~~~~ + +To fix this build failure, include + +Fixes: + - http://autobuild.buildroot.org/results/547d1c0e8a89e1e4b601aa756d26886bfc3d586f + +Upstream: Rejected after sending to Simon Tatham +Signed-off-by: Fabrice Fontaine +--- + unix/utils/arm_arch_queries.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/unix/utils/arm_arch_queries.h b/unix/utils/arm_arch_queries.h +index fa46c622..5cce7f31 100644 +--- a/unix/utils/arm_arch_queries.h ++++ b/unix/utils/arm_arch_queries.h +@@ -18,6 +18,8 @@ + + #if defined __arm__ || defined __aarch64__ + ++#include ++ + #if HAVE_SYS_TYPES_H + #include + #endif +-- +2.43.0 + From 7cd939424dcb83d49176669f07d0af87bf94bb45 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 18 Mar 2024 23:24:08 +0100 Subject: [PATCH 5398/5754] package/pulseaudio: bump to version 17.0 - Drop three upstreamed patches - This bump will fix the following build failure raised since bump of webrtc-audio-processsing to version 1.3 in commit ef0fa986eb7ff25c0a5db70ec0b62032e2d71538: ../output-1/build/pulseaudio-16.1/meson.build:723:15: ERROR: Dependency "webrtc-audio-processing" not found, tried pkgconfig and cmake https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/blob/v17.0/NEWS Fixes: ef0fa986eb7ff25c0a5db70ec0b62032e2d71538 - http://autobuild.buildroot.org/results/528717c7481adbb5333d77758ef94830f46bc3f1 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (cherry picked from commit 87504a1b7948dbfa3648ad02c3c034a3c36dcd92) Signed-off-by: Peter Korsgaard --- .checkpackageignore | 3 - ...ild-sys-Fix-atomic-support-detection.patch | 59 -------- ...d-missing-libatomic_ops-dependencies.patch | 129 ------------------ ...0004-meson.build-fix-build-without-C.patch | 56 -------- package/pulseaudio/pulseaudio.hash | 4 +- package/pulseaudio/pulseaudio.mk | 2 +- 6 files changed, 3 insertions(+), 250 deletions(-) delete mode 100644 package/pulseaudio/0002-build-sys-Fix-atomic-support-detection.patch delete mode 100644 package/pulseaudio/0003-build-sys-Add-missing-libatomic_ops-dependencies.patch delete mode 100644 package/pulseaudio/0004-meson.build-fix-build-without-C.patch diff --git a/.checkpackageignore b/.checkpackageignore index eec1a00e40..aa1679f509 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1033,9 +1033,6 @@ package/ptpd2/0002-ntp_isc_md5-rename-EVP_MD_CTX-into-PTPD_EVP_MD_CTX.patch Upst 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 diff --git a/package/pulseaudio/0002-build-sys-Fix-atomic-support-detection.patch b/package/pulseaudio/0002-build-sys-Fix-atomic-support-detection.patch deleted file mode 100644 index 631cb7f016..0000000000 --- a/package/pulseaudio/0002-build-sys-Fix-atomic-support-detection.patch +++ /dev/null @@ -1,59 +0,0 @@ -From a5392576ceba92d04706cefc1929ddd5ace5537a Mon Sep 17 00:00:00 2001 -From: Nicolas Cavallari -Date: Fri, 1 Jul 2022 14:03:44 +0200 -Subject: [PATCH] build-sys: Fix atomic support detection - -Attempting to use atomics operations on an architecture that does not -support them generally results in a link error: - -ld: /tmp/ccjYcMPP.o: in function `func': -testfile.c:(.text+0x1c): undefined reference to `__sync_bool_compare_and_swap_4' - -The current build system uses cc.compiles() to check if atomic ops are -supported, but cc.compiles() does not attempt to link, so the test fails -to enable libatomics_opts. - -Fix this by using cc.links() instead of cc.compiles(). - -Signed-off-by: Nicolas Cavallari -Upstream-status: Submitted [https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/732] ---- - meson.build | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - -diff --git a/meson.build b/meson.build -index c6db7e670..c5135330f 100644 ---- a/meson.build -+++ b/meson.build -@@ -498,22 +498,24 @@ endif - - need_libatomic_ops = false - --atomictest = '''void func() { -+atomictest = '''int main() { - volatile int atomic = 2; - __sync_bool_compare_and_swap (&atomic, 2, 3); -+ return 0; - } - ''' - --if cc.compiles(atomictest) -+if cc.links(atomictest) - cdata.set('HAVE_ATOMIC_BUILTINS', 1) - -- newatomictest = '''void func() { -+ newatomictest = '''int main() { - int c = 0; - __atomic_store_n(&c, 4, __ATOMIC_SEQ_CST); -+ return 0; - } - ''' - -- if(cc.compiles(newatomictest)) -+ if(cc.links(newatomictest)) - cdata.set('HAVE_ATOMIC_BUILTINS_MEMORY_MODEL', 1) - endif - --- -2.36.1 - diff --git a/package/pulseaudio/0003-build-sys-Add-missing-libatomic_ops-dependencies.patch b/package/pulseaudio/0003-build-sys-Add-missing-libatomic_ops-dependencies.patch deleted file mode 100644 index fac441e7dd..0000000000 --- a/package/pulseaudio/0003-build-sys-Add-missing-libatomic_ops-dependencies.patch +++ /dev/null @@ -1,129 +0,0 @@ -From 96361ff2a8f37dd3ce7ea188ce4e7b038bb6a5aa Mon Sep 17 00:00:00 2001 -From: Nicolas Cavallari -Date: Mon, 4 Jul 2022 13:49:34 +0200 -Subject: [PATCH] build-sys: Add missing libatomic_ops dependencies - -Add libatomic_ops dependencies to libraries/modules that showed a -failure on an arch that does not have native atomic operations support. - -Not all optional dependencies were tested, so it is possible that -some optional modules are still missing libatomic_ops dependencies. - -Signed-off-by: Nicolas Cavallari -Upstream-status: Submitted [https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/732] ---- - src/meson.build | 2 +- - src/modules/meson.build | 6 +++--- - src/pulse/meson.build | 2 +- - src/pulsecore/meson.build | 10 +++++----- - 4 files changed, 10 insertions(+), 10 deletions(-) - -diff --git a/src/meson.build b/src/meson.build -index 96dcec354..9efb561d8 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -205,7 +205,7 @@ else - libm_dep, thread_dep, dl_dep, shm_dep, iconv_dep, sndfile_dep, dbus_dep, - x11_dep, libsystemd_dep, glib_dep.partial_dependency(compile_args: true), - gtk_dep.partial_dependency(compile_args: true), asyncns_dep, libintl_dep, -- platform_dep, platform_socket_dep, execinfo_dep, -+ platform_dep, platform_socket_dep, execinfo_dep, libatomic_ops_dep, - ], - implicit_include_directories : false) - -diff --git a/src/modules/meson.build b/src/modules/meson.build -index 1d8004300..1e12569dc 100644 ---- a/src/modules/meson.build -+++ b/src/modules/meson.build -@@ -14,7 +14,7 @@ all_modules = [ - [ 'module-cli-protocol-tcp', 'module-protocol-stub.c', [], ['-DUSE_PROTOCOL_CLI', '-DUSE_TCP_SOCKETS'], [], libprotocol_cli ], - [ 'module-cli-protocol-unix', 'module-protocol-stub.c', [], ['-DUSE_PROTOCOL_CLI', '-DUSE_UNIX_SOCKETS'], [], libprotocol_cli ], - [ 'module-combine', 'module-combine.c' ], -- [ 'module-combine-sink', 'module-combine-sink.c' ], -+ [ 'module-combine-sink', 'module-combine-sink.c', [], [], [libatomic_ops_dep] ], - # [ 'module-coreaudio-detect', 'macosx/module-coreaudio-detect.c' ], - # [ 'module-coreaudio-device', 'macosx/module-coreaudio-device.c' ], - [ 'module-default-device-restore', 'module-default-device-restore.c', [], [], [], libprotocol_native ], -@@ -73,7 +73,7 @@ endif - - if host_machine.system() != 'windows' - all_modules += [ -- [ 'module-rtp-recv', 'rtp/module-rtp-recv.c', [], [], [], librtp ], -+ [ 'module-rtp-recv', 'rtp/module-rtp-recv.c', [], [], [libatomic_ops_dep], librtp ], - [ 'module-rtp-send', 'rtp/module-rtp-send.c' , [], [], [], librtp ], - ] - endif -@@ -243,7 +243,7 @@ module_echo_cancel_sources = [ - ] - module_echo_cancel_orc_sources = [] - module_echo_cancel_flags = [] --module_echo_cancel_deps = [] -+module_echo_cancel_deps = [libatomic_ops_dep] - module_echo_cancel_libs = [] - - if get_option('adrian-aec') -diff --git a/src/pulse/meson.build b/src/pulse/meson.build -index c2128e087..1b82c807c 100644 ---- a/src/pulse/meson.build -+++ b/src/pulse/meson.build -@@ -85,7 +85,7 @@ libpulse = shared_library('pulse', - link_args : [nodelete_link_args, versioning_link_args], - install : true, - install_rpath : privlibdir, -- dependencies : [libm_dep, thread_dep, libpulsecommon_dep, dbus_dep, dl_dep, iconv_dep, libintl_dep, platform_dep, platform_socket_dep], -+ dependencies : [libm_dep, thread_dep, libpulsecommon_dep, dbus_dep, dl_dep, iconv_dep, libintl_dep, platform_dep, platform_socket_dep, libatomic_ops_dep], - implicit_include_directories : false) - - libpulse_dep = declare_dependency(link_with: libpulse) -diff --git a/src/pulsecore/meson.build b/src/pulsecore/meson.build -index b30264b3a..b37fec499 100644 ---- a/src/pulsecore/meson.build -+++ b/src/pulsecore/meson.build -@@ -251,7 +251,7 @@ libcli = shared_library('cli', - c_args : [pa_c_args, server_c_args, database_c_args], - link_args : [nodelete_link_args], - include_directories : [configinc, topinc], -- dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep], -+ dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep, libatomic_ops_dep], - install : true, - install_rpath : privlibdir, - install_dir : modlibexecdir, -@@ -268,7 +268,7 @@ libprotocol_cli = shared_library('protocol-cli', - c_args : [pa_c_args, server_c_args, database_c_args], - link_args : [nodelete_link_args], - include_directories : [configinc, topinc], -- dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep, libcli_dep], -+ dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep, libcli_dep, libatomic_ops_dep], - install : true, - install_rpath : rpath_dirs, - install_dir : modlibexecdir, -@@ -280,7 +280,7 @@ libprotocol_http = shared_library('protocol-http', - c_args : [pa_c_args, server_c_args, database_c_args], - link_args : [nodelete_link_args], - include_directories : [configinc, topinc], -- dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep], -+ dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep, libatomic_ops_dep], - install : true, - install_rpath : privlibdir, - install_dir : modlibexecdir, -@@ -292,7 +292,7 @@ libprotocol_native = shared_library('protocol-native', - c_args : [pa_c_args, server_c_args, database_c_args], - link_args : [nodelete_link_args], - include_directories : [configinc, topinc], -- dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep, dbus_dep], -+ dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep, dbus_dep, libatomic_ops_dep], - install : true, - install_rpath : privlibdir, - install_dir : modlibexecdir, -@@ -304,7 +304,7 @@ libprotocol_simple = shared_library('protocol-simple', - c_args : [pa_c_args, server_c_args, database_c_args], - link_args : [nodelete_link_args], - include_directories : [configinc, topinc], -- dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep], -+ dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep, libatomic_ops_dep], - install : true, - install_rpath : privlibdir, - install_dir : modlibexecdir, --- -2.36.1 - diff --git a/package/pulseaudio/0004-meson.build-fix-build-without-C.patch b/package/pulseaudio/0004-meson.build-fix-build-without-C.patch deleted file mode 100644 index e770927f54..0000000000 --- a/package/pulseaudio/0004-meson.build-fix-build-without-C.patch +++ /dev/null @@ -1,56 +0,0 @@ -From ac88536d7c3fde3c22933368296c9029bb67b9fc Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 25 Jul 2022 21:49:25 +0200 -Subject: [PATCH] meson.build: fix build without C++ - -Fix the following build failure without C++: - -../output-1/build/pulseaudio-16.1/meson.build:1:0: ERROR: Unknown compiler(s): [['/home/autobuild/autobuild/instance-1/output-1/per-package/pulseaudio/host/bin/powerpc64-buildroot-linux-gnu-g++']] -The following exception(s) were encountered: -Running "/home/autobuild/autobuild/instance-1/output-1/per-package/pulseaudio/host/bin/powerpc64-buildroot-linux-gnu-g++ --version" gave "[Errno 2] No such file or directory: '/home/autobuild/autobuild/instance-1/output-1/per-package/pulseaudio/host/bin/powerpc64-buildroot-linux-gnu-g++'" - -Fixes: - - http://autobuild.buildroot.org/results/6526a21bd4da3b8458188f27c1ec04c381e4b673 - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/737] ---- - meson.build | 3 ++- - src/modules/echo-cancel/meson.build | 2 ++ - 2 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index c5135330f..8248f263b 100644 ---- a/meson.build -+++ b/meson.build -@@ -1,4 +1,4 @@ --project('pulseaudio', 'c', 'cpp', -+project('pulseaudio', 'c', - version : run_command(find_program('git-version-gen'), join_paths(meson.current_source_dir(), '.tarball-version')).stdout().strip(), - meson_version : '>= 0.50.0', - default_options : [ 'c_std=gnu11', 'cpp_std=c++11' ] -@@ -433,6 +433,7 @@ endif - # Code coverage - - if get_option('gcov') -+ add_languages('cpp') - add_project_arguments('--coverage', language: ['c', 'cpp']) - add_project_link_arguments('--coverage', language: ['c', 'cpp']) - endif -diff --git a/src/modules/echo-cancel/meson.build b/src/modules/echo-cancel/meson.build -index 641cd35e7..3b998364e 100644 ---- a/src/modules/echo-cancel/meson.build -+++ b/src/modules/echo-cancel/meson.build -@@ -6,6 +6,8 @@ - # '-Wl,--unresolved-symbols=ignore-in-object-files' otherwise it fails - # at link time. - -+add_languages('cpp') -+ - libwebrtc_util_sources = [ - 'webrtc.cc' - ] --- -GitLab - diff --git a/package/pulseaudio/pulseaudio.hash b/package/pulseaudio/pulseaudio.hash index acbb56a07d..67f6cc6ef2 100644 --- a/package/pulseaudio/pulseaudio.hash +++ b/package/pulseaudio/pulseaudio.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/pulseaudio-discuss/2022-June/032287.html -sha256 8eef32ce91d47979f95fd9a935e738cd7eb7463430dabc72863251751e504ae4 pulseaudio-16.1.tar.xz +# From https://lists.freedesktop.org/archives/pulseaudio-discuss/2024-January/032426.html +sha256 053794d6671a3e397d849e478a80b82a63cb9d8ca296bd35b73317bb5ceb87b5 pulseaudio-17.0.tar.xz # Locally computed sha256 c38aee9e3c8c4d5d594ff548a1be05453023016d6286931f6512db215ec1fd42 GPL sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 LGPL diff --git a/package/pulseaudio/pulseaudio.mk b/package/pulseaudio/pulseaudio.mk index 89191db541..254e05348d 100644 --- a/package/pulseaudio/pulseaudio.mk +++ b/package/pulseaudio/pulseaudio.mk @@ -4,7 +4,7 @@ # ################################################################################ -PULSEAUDIO_VERSION = 16.1 +PULSEAUDIO_VERSION = 17.0 PULSEAUDIO_SOURCE = pulseaudio-$(PULSEAUDIO_VERSION).tar.xz PULSEAUDIO_SITE = https://freedesktop.org/software/pulseaudio/releases PULSEAUDIO_INSTALL_STAGING = YES From 00b9f2a2f2c7ed0f92ca326de49b4262fa6a1153 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Mon, 18 Mar 2024 23:04:20 +0100 Subject: [PATCH 5399/5754] support/scripts: use FKIE git tree Currently, we grab the per-year CVE feeds, in two passes: first, we grab the meta files, and check whether something has changed since last we downloaded it; second, we download the feed proper, unless the meta file has not changed, in which case we use the locally cached feed. However, it has appeared that the FKIE releases no longer provide the meta files, which means that (once again), our daily reports are broken. The obvious fix would be to drop the use of the meta file, and always and unconditionally download the feeds. That's relatively trivial to do, but the feeds are relatively big (even as xz-xompressed). However, the CVE database from FKIE is available as a git tree. Git is pretty good at only sending delta when updating a local copy. In addition, the git tree, contains each CVE as an individual file, so it is relatively easier to scan and parse. Switch to using a local git clone. Slightly surprisingly (but not so much either), parsing the CVE files is much faster when using the git working copy, than it is when parsing the per-year feeds: indeed, the per-year feeds are xz-compressed, and even if python is slow-ish to scan a directory and opening files therein, it is still much faster than to decompress xz files. The timing delta [0] is ~100s before and ~10s now, about a ten time improvement, over the whole package set. The drawback, however, is that the git tree is much bigger on-disk, from ~55MiB for the per-year compressed feeds, to 2.1GiB for the git tree (~366MiB) and a working copy (~1.8GiB)... Given very few people are going to use that, that's considered acceptable... Eventually, with a bit of hacking [1], the two pkg-stats, before and after this change, yield the same data (except for the date and commit hash). [0] hacking support/scripts/pkg-stats to display the time before/after the CVE scan, and hacking support/scripts/cve.py to do no download so that only the CVE scan happens (and also because the meta files are no longer available). [1] sorting the CVE lists in json, sorting the json keys, and using the commit from the FKIE git tree that was used for the current per-year feeds. Signed-off-by: Yann E. MORIN Cc: Arnout Vandecappelle (Essensium/Mind) Cc: Thomas Petazzoni Signed-off-by: Arnout Vandecappelle (cherry picked from commit fee7efafd05872282e24a6923e40c1505e041196) Signed-off-by: Peter Korsgaard --- support/scripts/cve.py | 88 ++++++++++++++---------------------------- 1 file changed, 29 insertions(+), 59 deletions(-) diff --git a/support/scripts/cve.py b/support/scripts/cve.py index 7167ecbc6a..e25825581e 100755 --- a/support/scripts/cve.py +++ b/support/scripts/cve.py @@ -19,29 +19,16 @@ import datetime import os -import requests # URL checking import distutils.version -import lzma -import time +import json +import subprocess import sys import operator -try: - import ijson - # backend is a module in < 2.5, a string in >= 2.5 - if 'python' in getattr(ijson.backend, '__name__', ijson.backend): - try: - import ijson.backends.yajl2_cffi as ijson - except ImportError: - sys.stderr.write('Warning: Using slow ijson python backend\n') -except ImportError: - sys.stderr.write("You need ijson to parse NVD for CVE check\n") - exit(1) - sys.path.append('utils/') NVD_START_YEAR = 1999 -NVD_BASE_URL = "https://github.com/fkie-cad/nvd-json-data-feeds/releases/latest/download" +NVD_BASE_URL = "https://github.com/fkie-cad/nvd-json-data-feeds/" ops = { '>=': operator.ge, @@ -81,41 +68,24 @@ def __init__(self, nvd_cve): self.nvd_cve = nvd_cve @staticmethod - def download_nvd_year(nvd_path, year): - metaf = "CVE-%s.meta" % year - path_metaf = os.path.join(nvd_path, metaf) - jsonf_xz = "CVE-%s.json.xz" % year - path_jsonf_xz = os.path.join(nvd_path, jsonf_xz) - - # If the database file is less than a day old, we assume the NVD data - # locally available is recent enough. - if os.path.exists(path_jsonf_xz) and os.stat(path_jsonf_xz).st_mtime >= time.time() - 86400: - return path_jsonf_xz - - # If not, we download the meta file - url = "%s/%s" % (NVD_BASE_URL, metaf) - print("Getting %s" % url) - page_meta = requests.get(url) - page_meta.raise_for_status() - - # If the meta file already existed, we compare the existing - # one with the data newly downloaded. If they are different, - # we need to re-download the database. - # If the database does not exist locally, we need to redownload it in - # any case. - if os.path.exists(path_metaf) and os.path.exists(path_jsonf_xz): - meta_known = open(path_metaf, "r").read() - if page_meta.text == meta_known: - return path_jsonf_xz - - # Grab the compressed JSON NVD, and write files to disk - url = "%s/%s" % (NVD_BASE_URL, jsonf_xz) - print("Getting %s" % url) - page_json = requests.get(url) - page_json.raise_for_status() - open(path_jsonf_xz, "wb").write(page_json.content) - open(path_metaf, "w").write(page_meta.text) - return path_jsonf_xz + def download_nvd(nvd_git_dir): + print(f"Updating from {NVD_BASE_URL}") + if os.path.exists(nvd_git_dir): + subprocess.check_call( + ["git", "pull"], + cwd=nvd_git_dir, + stdout=subprocess.DEVNULL, + stderr=subprocess.DEVNULL, + ) + else: + # Create the directory and its parents; git + # happily clones into an empty directory. + os.makedirs(nvd_git_dir) + subprocess.check_call( + ["git", "clone", NVD_BASE_URL, nvd_git_dir], + stdout=subprocess.DEVNULL, + stderr=subprocess.DEVNULL, + ) @staticmethod def sort_id(cve_ids): @@ -131,15 +101,15 @@ def read_nvd_dir(cls, nvd_dir): feeds since NVD_START_YEAR. If the files are missing or outdated in nvd_dir, a fresh copy will be downloaded, and kept in .json.gz """ + nvd_git_dir = os.path.join(nvd_dir, "git") + CVE.download_nvd(nvd_git_dir) for year in range(NVD_START_YEAR, datetime.datetime.now().year + 1): - filename = CVE.download_nvd_year(nvd_dir, year) - try: - content = ijson.items(lzma.LZMAFile(filename), 'cve_items.item') - except: # noqa: E722 - print("ERROR: cannot read %s. Please remove the file then rerun this script" % filename) - raise - for cve in content: - yield cls(cve) + for dirpath, _, filenames in os.walk(os.path.join(nvd_git_dir, f"CVE-{year}")): + for filename in filenames: + if filename[-5:] != ".json": + continue + with open(os.path.join(dirpath, filename), "rb") as f: + yield cls(json.load(f)) def each_product(self): """Iterate over each product section of this cve""" From 95b8e4bdf4d65d29b3ede9960dad8cfa478a0a07 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Mon, 18 Mar 2024 21:38:55 +0100 Subject: [PATCH 5400/5754] package/harfbuzz: bump to version 8.3.1 Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (cherry picked from commit 356a93594de1c6a67dc35c335b35531c4607d284) Signed-off-by: Peter Korsgaard --- 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 fbe890910a..f107aee8c2 100644 --- a/package/harfbuzz/harfbuzz.hash +++ b/package/harfbuzz/harfbuzz.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 109501eaeb8bde3eadb25fab4164e993fbace29c3d775bcaa1c1e58e2f15f847 harfbuzz-8.3.0.tar.xz +sha256 f73e1eacd7e2ffae687bc3f056bb0c705b7a05aee86337686e09da8fc1c2030c harfbuzz-8.3.1.tar.xz sha256 ba8f810f2455c2f08e2d56bb49b72f37fcf68f1f4fade38977cfd7372050ad64 COPYING diff --git a/package/harfbuzz/harfbuzz.mk b/package/harfbuzz/harfbuzz.mk index 599ea548d0..e3da4add43 100644 --- a/package/harfbuzz/harfbuzz.mk +++ b/package/harfbuzz/harfbuzz.mk @@ -4,7 +4,7 @@ # ################################################################################ -HARFBUZZ_VERSION = 8.3.0 +HARFBUZZ_VERSION = 8.3.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 c9e64ea52b5aa23afb7d3236fb6e3a564d9ed6af Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 17 Mar 2024 23:00:28 +0100 Subject: [PATCH 5401/5754] package/osm2pgsql: only supports 64 bits osm2pgsql only supports 64 bits architectures since bump to version 1.10.0 in commit e056aeeca9cf8c00c6da62c39979ce6c55c92791 and https://github.com/osm2pgsql-dev/osm2pgsql/commit/389904269a1b1f246641d203abadfcd5cebb97cc resulting in the following build failure with arm: CMake Error at CMakeLists.txt:20 (message): osm2pgsql needs a 64 bit architecture Fixes: e056aeeca9cf8c00c6da62c39979ce6c55c92791 - http://autobuild.buildroot.org/results/30c2675a732fd810c68dffbb6483f9cf8e4fcbf3 Signed-off-by: Fabrice Fontaine Reviewed-by: Maxim Kochetkov Signed-off-by: Arnout Vandecappelle (cherry picked from commit 3d8e92e318c39b9d838ca607a3213c7ed1f69bc0) Signed-off-by: Peter Korsgaard --- package/osm2pgsql/Config.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/osm2pgsql/Config.in b/package/osm2pgsql/Config.in index c6a38f3180..439309df95 100644 --- a/package/osm2pgsql/Config.in +++ b/package/osm2pgsql/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_OSM2PGSQL bool "osm2pgsql" + depends on BR2_ARCH_IS_64 depends on BR2_INSTALL_LIBSTDCPP # boost, libosmium, protozero depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 depends on BR2_TOOLCHAIN_HAS_THREADS # boost, libosmium @@ -24,9 +25,11 @@ config BR2_PACKAGE_OSM2PGSQL https://osm2pgsql.org comment "osm2pgsql needs a toolchain w/ C++, wchar, threads, gcc >= 4.9" + depends on BR2_ARCH_IS_64 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 comment "osm2pgsql needs a toolchain not affected by GCC bug 64735" + depends on BR2_ARCH_IS_64 depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 From 4310f2747b5ceea7b9b7e7fa4808b267e4ea7c4d Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 21 Mar 2024 22:12:45 +0100 Subject: [PATCH 5402/5754] package/containerd: fix btrfs handling btrfs handling doesn't depend on btrfs-progs but on kernel >= 4.12 since bump to version 1.7.7 in commit 79e01ef9506a6cdc4836912607dc594ae7b1999d and https://github.com/containerd/containerd/commit/024a748c092cbddde0918f2e93a646ce50116e11 resulting in the following build failure: In file included from vendor/github.com/containerd/btrfs/v2/btrfs.go:21:0: ./btrfs.h:19:2: error: #error "Headers from kernel >= 4.12 are required on compilation time (not on run time)" #error "Headers from kernel >= 4.12 are required on compilation time (not on run time)" ^~~~~ In file included from vendor/github.com/containerd/btrfs/v2/btrfs.go:21:0: ./btrfs.h:22:10: fatal error: linux/btrfs_tree.h: No such file or directory #include ^~~~~~~~~~~~~~~~~~~~ Fixes: 79e01ef9506a6cdc4836912607dc594ae7b1999d - http://autobuild.buildroot.org/results/d6afeef47daae1783dcce3e2b6a0a16e3e5d5fbd Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 43ca417c0c883f245dde9be82d49c49adaceea2c) Signed-off-by: Peter Korsgaard --- package/containerd/Config.in | 7 ++++--- package/containerd/containerd.mk | 4 +--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/containerd/Config.in b/package/containerd/Config.in index 12a53bc111..2dd04b109c 100644 --- a/package/containerd/Config.in +++ b/package/containerd/Config.in @@ -20,12 +20,13 @@ if BR2_PACKAGE_CONTAINERD config BR2_PACKAGE_CONTAINERD_DRIVER_BTRFS bool "btrfs snapshot driver" - depends on BR2_USE_MMU # btrfs-progs - depends on BR2_TOOLCHAIN_HAS_THREADS # btrfs-progs - select BR2_PACKAGE_BTRFS_PROGS + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 help Build the btrfs snapshot driver for containerd. +comment "brtfs snapshot driver needs headers >= 4.12" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 + config BR2_PACKAGE_CONTAINERD_DRIVER_DEVMAPPER bool "devmapper snapshot driver" depends on BR2_TOOLCHAIN_HAS_THREADS # lvm2 diff --git a/package/containerd/containerd.mk b/package/containerd/containerd.mk index 50c2965b87..9bf51c93ae 100644 --- a/package/containerd/containerd.mk +++ b/package/containerd/containerd.mk @@ -35,9 +35,7 @@ CONTAINERD_DEPENDENCIES += libseccomp host-pkgconf CONTAINERD_TAGS += seccomp endif -ifeq ($(BR2_PACKAGE_CONTAINERD_DRIVER_BTRFS),y) -CONTAINERD_DEPENDENCIES += btrfs-progs -else +ifneq ($(BR2_PACKAGE_CONTAINERD_DRIVER_BTRFS),y) CONTAINERD_TAGS += no_btrfs endif From 9af8ad53b37ead14c9d4bcbf7dd8d0662bcc683b Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 21 Mar 2024 22:14:56 +0100 Subject: [PATCH 5403/5754] package/docker-engine: fix btrfs handling btrfs doesn't depend on btrfs-progs but on headers >= 4.12 since bump to version 24.0.2 in commit 314f62eda347ba02b4688ac94c6bab55b4a4d6c9 and https://github.com/moby/moby/commit/3208dcabdc8997340b255f5b880fef4e3f54580d resulting in the following build failure: daemon/graphdriver/btrfs/btrfs.go:13:6: error: #error "Headers from kernel >= 4.12 are required to build with Btrfs support." #error "Headers from kernel >= 4.12 are required to build with Btrfs support." ^~~~~ daemon/graphdriver/btrfs/btrfs.go:14:6: error: #error "HINT: Set 'DOCKER_BUILDTAGS=exclude_graphdriver_btrfs' to build without Btrfs." #error "HINT: Set 'DOCKER_BUILDTAGS=exclude_graphdriver_btrfs' to build without Btrfs." ^~~~~ daemon/graphdriver/btrfs/btrfs.go:18:10: fatal error: linux/btrfs_tree.h: No such file or directory #include ^~~~~~~~~~~~~~~~~~~~ Fixes: 314f62eda347ba02b4688ac94c6bab55b4a4d6c9 - http://autobuild.buildroot.org/results/7d07eba37149d341dc86f9742bd166de874dcd5e Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit e30b38f1c5bcc62d387f4b96d20a7a9f4715c7a5) Signed-off-by: Peter Korsgaard --- package/docker-engine/Config.in | 7 ++++--- package/docker-engine/docker-engine.mk | 4 +--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/docker-engine/Config.in b/package/docker-engine/Config.in index 71bf670f17..d48ffe6484 100644 --- a/package/docker-engine/Config.in +++ b/package/docker-engine/Config.in @@ -21,12 +21,13 @@ if BR2_PACKAGE_DOCKER_ENGINE config BR2_PACKAGE_DOCKER_ENGINE_DRIVER_BTRFS bool "btrfs filesystem driver" - depends on BR2_USE_MMU # btrfs-progs - depends on BR2_TOOLCHAIN_HAS_THREADS # btrfs-progs - select BR2_PACKAGE_BTRFS_PROGS + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 help Build the btrfs filesystem driver for Docker. +comment "brtfs filesystem driver needs headers >= 4.12" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 + config BR2_PACKAGE_DOCKER_ENGINE_DRIVER_DEVICEMAPPER bool "devicemapper filesystem driver" depends on BR2_TOOLCHAIN_HAS_THREADS # lvm2 diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index 262be2df20..05bf23ad3d 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -35,9 +35,7 @@ DOCKER_ENGINE_DEPENDENCIES += systemd DOCKER_ENGINE_TAGS += systemd journald endif -ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_DRIVER_BTRFS),y) -DOCKER_ENGINE_DEPENDENCIES += btrfs-progs -else +ifneq ($(BR2_PACKAGE_DOCKER_ENGINE_DRIVER_BTRFS),y) DOCKER_ENGINE_TAGS += exclude_graphdriver_btrfs endif From 44f3a0c6dc8aa4ea6879983a960af85b7b317051 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 17 Mar 2024 15:05:05 +0100 Subject: [PATCH 5404/5754] package/mariadb: requires DES in openssl Enable DES in openssl to avoid the following build failure raised since commit a83d41867c8d69a77d5cd0a665aa216af5340359: In file included from /home/buildroot/autobuild/run/instance-2/output-1/build/mariadb-10.11.6/libmysqld/../sql/mysqld.cc:50, from /home/buildroot/autobuild/run/instance-2/output-1/build/mariadb-10.11.6/libmysqld/lib_sql.cc:34: /home/buildroot/autobuild/run/instance-2/output-1/build/mariadb-10.11.6/libmysqld/../sql/des_key_file.h:26:3: error: 'DES_cblock' does not name a type 26 | DES_cblock key1, key2, key3; | ^~~~~~~~~~ /home/buildroot/autobuild/run/instance-2/output-1/build/mariadb-10.11.6/libmysqld/../sql/des_key_file.h:31:3: error: 'DES_key_schedule' does not name a type; did you mean 'st_des_keyschedule'? 31 | DES_key_schedule ks1, ks2, ks3; | ^~~~~~~~~~~~~~~~ | st_des_keyschedule Fixes: a83d41867c8d69a77d5cd0a665aa216af5340359 - http://autobuild.buildroot.org/results/bd067de9c2699dc9628c00b929a01890b14d53c1 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 8b3497f3ab19ec828a94eaf19923a07603b5e916) Signed-off-by: Peter Korsgaard --- package/mariadb/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/mariadb/Config.in b/package/mariadb/Config.in index d88dda3cda..acedd1da9d 100644 --- a/package/mariadb/Config.in +++ b/package/mariadb/Config.in @@ -11,6 +11,7 @@ config BR2_PACKAGE_MARIADB select BR2_PACKAGE_FMT select BR2_PACKAGE_NCURSES select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL select BR2_PACKAGE_PCRE2 help MariaDB is one of the most popular database servers in the From f53e8f3abf757d1d7b58f22a159fadc6d593f8a4 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 17 Mar 2024 14:14:46 +0100 Subject: [PATCH 5405/5754] package/spice: fix libressl build Fix the following build failure raised since bump of libressl to version 3.5.2 in commit 8b216927db080b38fdbf1f8b025b6f90a89d4bc2: red-stream.cpp: In function 'RedStreamSslStatus red_stream_ssl_accept(RedStream*)': red-stream.cpp:526:22: error: invalid use of incomplete type 'SSL' {aka 'struct ssl_st'} 526 | stream->priv->ssl->s3->flags |= SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS; | ^~ In file included from /home/buildroot/autobuild/instance-1/output-1/host/i686-buildroot-linux-gnu/sysroot/usr/include/openssl/err.h:120, from red-stream.cpp:33: /home/buildroot/autobuild/instance-1/output-1/host/i686-buildroot-linux-gnu/sysroot/usr/include/openssl/ossl_typ.h:173:16: note: forward declaration of 'SSL' {aka 'struct ssl_st'} 173 | typedef struct ssl_st SSL; | ^~~~~~ Fixes: - http://autobuild.buildroot.org/results/273eadf9e49af55e0932a8293ca65762fb43114f - http://autobuild.buildroot.org/results/97601f321efc532de0c2ea6aa618ce11fad9e851 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 4e5ea3163094e4c8cf185959b983ce95c97944e4) Signed-off-by: Peter Korsgaard --- ...SL_OP_NO_RENEGOTIATION-fallback-path.patch | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 package/spice/0001-server-add-SSL_OP_NO_RENEGOTIATION-fallback-path.patch diff --git a/package/spice/0001-server-add-SSL_OP_NO_RENEGOTIATION-fallback-path.patch b/package/spice/0001-server-add-SSL_OP_NO_RENEGOTIATION-fallback-path.patch new file mode 100644 index 0000000000..edb8b2ed17 --- /dev/null +++ b/package/spice/0001-server-add-SSL_OP_NO_RENEGOTIATION-fallback-path.patch @@ -0,0 +1,43 @@ +From 5e580eefac44d0c709afcf93eb5fca2fb353166a Mon Sep 17 00:00:00 2001 +From: orbea +Date: Fri, 26 May 2023 13:38:34 -0700 +Subject: [PATCH] server: add SSL_OP_NO_RENEGOTIATION fallback path + +With LibreSSL SSL_OP_NO_CLIENT_RENEGOTIATION is opaque which is not +compatible with the OpenSSL 1.0.2 and earlier code path in +red-stream.cpp while SSL_OP_NO_RENEGOTIATION is not yet defined for the +newer OpenSSL code path in reds.cpp. + +So with OpenSSL 1.1.0 and later if SSL_OP_NO_RENEGOTIATION is undefined +and SSL_OP_NO_CLIENT_RENEGOTIATION is defined then define the former as +the latter. This will allow the build to succeed with LibreSSL 3.7.2 and +in the future when newer LibreSSL versions add SSL_OP_NO_RENEGOTIATION +that code path will then be used automatically. + +Signed-off-by: orbea +Acked-by: Frediano Ziglio + +Upstream: https://gitlab.freedesktop.org/spice/spice/-/commit/5e580eefac44d0c709afcf93eb5fca2fb353166a +Signed-off-by: Fabrice Fontaine +--- + server/red-stream.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/server/red-stream.h b/server/red-stream.h +index 716e93317..8e57c5e5e 100644 +--- a/server/red-stream.h ++++ b/server/red-stream.h +@@ -25,6 +25,10 @@ + + SPICE_BEGIN_DECLS + ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(SSL_OP_NO_RENEGOTIATION) && defined(SSL_OP_NO_CLIENT_RENEGOTIATION) ++#define SSL_OP_NO_RENEGOTIATION SSL_OP_NO_CLIENT_RENEGOTIATION ++#endif ++ + typedef void (*AsyncReadDone)(void *opaque); + typedef void (*AsyncReadError)(void *opaque, int err); + +-- +GitLab + From d69bdfc1baa29eb8f99d082813459286247a5041 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 9 Mar 2024 16:22:05 +0100 Subject: [PATCH 5406/5754] package/axel: needs gcc >= 4.9 Fix the following build failure raised since bump to version 2.17.12 in commit 50ba0b0a40187b695740a2fce2d2f3ed7cbf58c5 and https://github.com/axel-download-accelerator/axel/commit/517d3ea036c2837b779a15b410331cd0df4fb066: src/random.c:1:23: fatal error: stdatomic.h: No such file or directory #include ^ Fixes: - http://autobuild.buildroot.org/results/ca62edddd42252bf21caa8243f8aaba38992fc68 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit c09830644466022de14a350d569e06041b394c53) Signed-off-by: Peter Korsgaard --- package/axel/Config.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/axel/Config.in b/package/axel/Config.in index 4507855ff8..740095a505 100644 --- a/package/axel/Config.in +++ b/package/axel/Config.in @@ -1,10 +1,12 @@ config BR2_PACKAGE_AXEL bool "axel" depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C11/stdatomic.h help HTTP/FTP download accelerator. https://github.com/axel-download-accelerator/axel/ -comment "axel needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "axel needs a toolchain w/ threads, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 From b6ae0782027e946034a4868b929115b95538249b Mon Sep 17 00:00:00 2001 From: Kadambini Nema Date: Wed, 14 Feb 2024 17:32:22 -0800 Subject: [PATCH 5407/5754] package/{tzdata, zic}: bump version to 2024a Release notes - https://mm.icann.org/pipermail/tz-announce/2024-February/000081.html Signed-off-by: Kadambini Nema Signed-off-by: Peter Korsgaard (cherry picked from commit 66d11f8942fd48887bc19a1c07d036ab7eca2007) Signed-off-by: Peter Korsgaard --- package/tzdata/tzdata.hash | 4 ++-- package/tzdata/tzdata.mk | 2 +- package/zic/zic.hash | 4 ++-- package/zic/zic.mk | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/tzdata/tzdata.hash b/package/tzdata/tzdata.hash index 5488625ddd..d353bc4410 100644 --- a/package/tzdata/tzdata.hash +++ b/package/tzdata/tzdata.hash @@ -1,4 +1,4 @@ -# From https://mm.icann.org/pipermail/tz-announce/2023-March/000079.html -sha512 608bd286ebcbd0004cfdc1da183273f08aff61f90c8867661154453d77a05d421e4c46ad6d066a1fe2e87d5c82ec0f1c0224667a3b35f3180a3eb7f6ff84cbf5 tzdata2023c.tar.gz +# From https://mm.icann.org/pipermail/tz-announce/2024-February/000081.html +sha512 1f09f1b2327cc9e1afc7e9045e83ee3377918dafe1bee2f282b6991828d03b3c70a4d3a17f9207dfb1361bb25bc214a8922a756e84fa114e9ba476226db57236 tzdata2024a.tar.gz # Locally computed: sha256 0613408568889f5739e5ae252b722a2659c02002839ad970a63dc5e9174b27cf LICENSE diff --git a/package/tzdata/tzdata.mk b/package/tzdata/tzdata.mk index 33e296d7d7..e367205277 100644 --- a/package/tzdata/tzdata.mk +++ b/package/tzdata/tzdata.mk @@ -4,7 +4,7 @@ # ################################################################################ -TZDATA_VERSION = 2023c +TZDATA_VERSION = 2024a TZDATA_SOURCE = tzdata$(TZDATA_VERSION).tar.gz TZDATA_SITE = https://www.iana.org/time-zones/repository/releases TZDATA_SELINUX_MODULES = tzdata diff --git a/package/zic/zic.hash b/package/zic/zic.hash index a2720a27ba..80c96ed793 100644 --- a/package/zic/zic.hash +++ b/package/zic/zic.hash @@ -1,4 +1,4 @@ -# From https://mm.icann.org/pipermail/tz-announce/2023-March/000079.html -sha512 fa18bae9c0e7c061bc9d5f5f2eb9967f0e4ddb2baafdee9887fa30cd0c60f4aa6f21eacffb17df0d59d26ff54d08c5dcefa98159309eba497e86443624913a82 tzcode2023c.tar.gz +# From https://mm.icann.org/pipermail/tz-announce/2024-February/000081.html +sha512 46da8bfa762c7d109db93e5c060789097fc0e1e38bdad5bb8fec886ef47f138bd03b913a743cd5f7e23dc359a72bfd63e7ffc0de199d2b51e6a174361dbdc43c tzcode2024a.tar.gz # Locally computed: sha256 0613408568889f5739e5ae252b722a2659c02002839ad970a63dc5e9174b27cf LICENSE diff --git a/package/zic/zic.mk b/package/zic/zic.mk index a915f6d256..95fa1eaa96 100644 --- a/package/zic/zic.mk +++ b/package/zic/zic.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZIC_VERSION = 2023c +ZIC_VERSION = 2024a ZIC_SOURCE = tzcode$(ZIC_VERSION).tar.gz ZIC_SITE = https://www.iana.org/time-zones/repository/releases ZIC_STRIP_COMPONENTS = 0 From a7b1d7d2b49b95ddd7095e67c2ea67ebf5e1333d Mon Sep 17 00:00:00 2001 From: Kadambini Nema Date: Wed, 14 Feb 2024 22:08:14 -0800 Subject: [PATCH 5408/5754] package/bash: bump to version 5.2.21 Build tested using the following config option: BR2_PACKAGE_BASH=y $ ./utils/test-pkg -c bash.config -p bash bootlin-armv5-uclibc [1/6]: OK bootlin-armv7-glibc [2/6]: OK bootlin-armv7m-uclibc [3/6]: SKIPPED bootlin-x86-64-musl [4/6]: OK br-arm-full-static [5/6]: OK sourcery-arm [6/6]: OK 6 builds, 1 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed Signed-off-by: Kadambini Nema Signed-off-by: Peter Korsgaard (cherry picked from commit 4ac57d33fcbe73fcd17a4f002803a81e455d949a) Signed-off-by: Peter Korsgaard --- package/bash/bash.hash | 4 ++-- package/bash/bash.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/bash/bash.hash b/package/bash/bash.hash index e0a1ebac91..44c1c5ed50 100644 --- a/package/bash/bash.hash +++ b/package/bash/bash.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature from -# https://ftp.gnu.org/gnu/bash/bash-5.2.15.tar.gz.sig -sha256 13720965b5f4fc3a0d4b61dd37e7565c741da9a5be24edc2ae00182fc1b3588c bash-5.2.15.tar.gz +# https://ftp.gnu.org/gnu/bash/bash-5.2.21.tar.gz.sig +sha256 c8e31bdc59b69aaffc5b36509905ba3e5cbb12747091d27b4b977f078560d5b8 bash-5.2.21.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/bash/bash.mk b/package/bash/bash.mk index 9a73ed8c36..9d173a5c7c 100644 --- a/package/bash/bash.mk +++ b/package/bash/bash.mk @@ -4,7 +4,7 @@ # ################################################################################ -BASH_VERSION = 5.2.15 +BASH_VERSION = 5.2.21 BASH_SITE = $(BR2_GNU_MIRROR)/bash BASH_DEPENDENCIES = ncurses readline host-bison BASH_LICENSE = GPL-3.0+ From 192d6bc5b20408afedab49f80a18498d20e379da Mon Sep 17 00:00:00 2001 From: Scott Fan Date: Sun, 24 Mar 2024 00:01:19 +0800 Subject: [PATCH 5409/5754] package/owfs: add missing slash after the OWFS_PKGDIR variable Signed-off-by: Scott Fan Signed-off-by: Arnout Vandecappelle (cherry picked from commit 94636d39ca324cb48ca83b329e4ecac166c24a10) Signed-off-by: Peter Korsgaard --- package/owfs/owfs.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/owfs/owfs.mk b/package/owfs/owfs.mk index 986dca921a..6b22282486 100644 --- a/package/owfs/owfs.mk +++ b/package/owfs/owfs.mk @@ -28,7 +28,7 @@ OWFS_CONF_OPTS += \ --with-fuseinclude=$(STAGING_DIR)/usr/include \ --with-fuselib=$(STAGING_DIR)/usr/lib define OWFS_INSTALL_FUSE_INIT_SYSV - $(INSTALL) -D -m 0755 $(OWFS_PKGDIR)S60owfs \ + $(INSTALL) -D -m 0755 $(OWFS_PKGDIR)/S60owfs \ $(TARGET_DIR)/etc/init.d/S60owfs endef define OWFS_CREATE_MOUNTPOINT @@ -78,7 +78,7 @@ endif OWFS_MAKE = $(MAKE) $(OWFS_EXTRA_MAKE_OPTS) define OWFS_INSTALL_INIT_SYSV - $(INSTALL) -D -m 0755 $(OWFS_PKGDIR)S55owserver \ + $(INSTALL) -D -m 0755 $(OWFS_PKGDIR)/S55owserver \ $(TARGET_DIR)/etc/init.d/S55owserver $(OWFS_INSTALL_FUSE_INIT_SYSV) endef From db54b8a716f016937dff291fb11c5e8dfa8caade Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 22 Mar 2024 18:49:41 +0100 Subject: [PATCH 5410/5754] package/libdrm: disable tests Disable tests to avoid the following build failure with amdgpu and gcc 5 if cunit is built before libdrm: In file included from ../tests/amdgpu/shader_test_util.c:10:0: ../tests/amdgpu/shader_code.h:113:2: error: initializer element is not constant ps_##_ps##_shader_patchinfo_code_size_gfx##_n, \ ^ tests can be disabled since https://gitlab.freedesktop.org/mesa/drm/-/commit/46d1e99a5d291b22d86ac52710b079491beedff8 Fixes: - http://autobuild.buildroot.org/results/612aad1fa642993da36bbec6c16c9020ac283e34 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (cherry picked from commit f95069814bd68cfc10ccf2dbc41efa6f1e127495) Signed-off-by: Peter Korsgaard --- package/libdrm/libdrm.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk index 61d1c24377..a04331c2da 100644 --- a/package/libdrm/libdrm.mk +++ b/package/libdrm/libdrm.mk @@ -17,7 +17,8 @@ LIBDRM_DEPENDENCIES = \ LIBDRM_CONF_OPTS = \ -Dcairo-tests=disabled \ - -Dman-pages=disabled + -Dman-pages=disabled \ + -Dtests=false ifeq ($(BR2_PACKAGE_LIBATOMIC_OPS),y) LIBDRM_DEPENDENCIES += libatomic_ops From c747ef182e4ae72b8ee34589aaaccccf96c2c398 Mon Sep 17 00:00:00 2001 From: Lukasz Tekieli Date: Thu, 8 Feb 2024 22:15:16 +0100 Subject: [PATCH 5411/5754] board/visionfive2: fix genimage.cfg path Set correct directory for the BR2_ROOTFS_POST_SCRIPT_ARGS. Signed-off-by: Lukasz Tekieli Signed-off-by: Peter Korsgaard (cherry picked from commit 9d4874819948a654510bea71a7d5e3db7ff10bee) Signed-off-by: Peter Korsgaard --- configs/visionfive2_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/visionfive2_defconfig b/configs/visionfive2_defconfig index dc086953a0..3a1a4f527c 100644 --- a/configs/visionfive2_defconfig +++ b/configs/visionfive2_defconfig @@ -3,7 +3,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_OVERLAY="board/visionfive2/overlay" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/visionfive/genimage.cfg" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/visionfive2/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,starfive-tech,linux,05533e9c31d6f0da20efc2d436a3b0f6d516ed4b)/linux-05533e9c31d6f0da20efc2d436a3b0f6d516ed4b.tar.gz" From 788e769f9f584937571762d6e4ece722f12ffa6d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 24 Mar 2024 14:07:17 +0100 Subject: [PATCH 5412/5754] package/onevpl-intel-gpu: bump version to 24.1.5 Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (cherry picked from commit ad89a4567d50da964298d43a6606a27469085795) 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 8dd42c4713..680ada76ea 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 879a232351ce0647522a0981edded3760104aec9f2bdc2ad31f70df03c95a6a9 onevpl-intel-gpu-24.1.4.tar.gz +sha256 e006d59399dbd0c3b3ecd91610822d655e9303b25a385a9a3ac94a42bf34b284 onevpl-intel-gpu-24.1.5.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 ca2c866735..440d73efa2 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 = 24.1.4 +ONEVPL_INTEL_GPU_VERSION = 24.1.5 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 3c31b1039f42bed6be0a8a9cd1e97851c6a12342 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 24 Mar 2024 14:07:18 +0100 Subject: [PATCH 5413/5754] package/intel-mediadriver: bump version to 24.1.5 Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (cherry picked from commit 1355c2c59f70223800fd8bc8de0b85b6ae8975b5) 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 4b410fb961..6bc9549c11 100644 --- a/package/intel-mediadriver/intel-mediadriver.hash +++ b/package/intel-mediadriver/intel-mediadriver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7ea727b3e2890cf8f50307a3910664209bcbae1ce0d3d8f81bb9f522b0f66d59 intel-media-24.1.4.tar.gz +sha256 e23ea37c98d8d4b9d1a3a134b6489256d8f5a7a4ee71967b1db8ade70052654f intel-media-24.1.5.tar.gz sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md diff --git a/package/intel-mediadriver/intel-mediadriver.mk b/package/intel-mediadriver/intel-mediadriver.mk index 9fdbef93bb..875e7e7c78 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 = 24.1.4 +INTEL_MEDIADRIVER_VERSION = 24.1.5 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 083700b3038dad79de86e42bc7807caac1c3dbed Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 24 Mar 2024 14:07:19 +0100 Subject: [PATCH 5414/5754] package/intel-gmmlib: bump version to 22.3.18 Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (cherry picked from commit 0ac9fdfb01ad3e16bfb10a10bb77c0a3d5f453e7) 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 9527cb9a56..d9cad026c4 100644 --- a/package/intel-gmmlib/intel-gmmlib.hash +++ b/package/intel-gmmlib/intel-gmmlib.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 5fa23407d4780c4ee8acd68e9ec9186e1721238150dc36ca9ab469a335891d2a intel-gmmlib-22.3.17.tar.gz +sha256 381f7ad104e3d0d8dd6c3ec0c8304e410a479c439e72db35c83fb7e2b0ec556f intel-gmmlib-22.3.18.tar.gz sha256 8b7446825df3f8b0268307e272aa6aaaf78351c83161d860d02c913c22666c48 LICENSE.md diff --git a/package/intel-gmmlib/intel-gmmlib.mk b/package/intel-gmmlib/intel-gmmlib.mk index 5502687a4a..94a07ebfb8 100644 --- a/package/intel-gmmlib/intel-gmmlib.mk +++ b/package/intel-gmmlib/intel-gmmlib.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_GMMLIB_VERSION = 22.3.17 +INTEL_GMMLIB_VERSION = 22.3.18 INTEL_GMMLIB_SITE = https://github.com/intel/gmmlib/archive INTEL_GMMLIB_LICENSE = MIT INTEL_GMMLIB_LICENSE_FILES = LICENSE.md From 3a283602b0e50dcbca51ca0fb464120a0d84d090 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 24 Mar 2024 14:06:03 +0100 Subject: [PATCH 5415/5754] package/openvpn: bump version to 2.6.10 Changelog: https://github.com/OpenVPN/openvpn/blob/release/2.6/ChangeLog https://github.com/OpenVPN/openvpn/blob/release/2.6/Changes.rst The fixed CVEs are only relevant for Windows. Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (cherry picked from commit b4eb96e36c2d02a1b7d49ac99680b9d6c2cac87f) 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 6dc470360a..932483507e 100644 --- a/package/openvpn/openvpn.hash +++ b/package/openvpn/openvpn.hash @@ -1,3 +1,3 @@ # Locally calculated after checking signature -sha256 5ede1565c8a6d880100f7f235317a7ee9eea83d5052db5547f13a9e76af7805d openvpn-2.6.8.tar.gz +sha256 1993bbb7b9edb430626eaa24573f881fd3df642f427fcb824b1aed1fca1bcc9b openvpn-2.6.10.tar.gz sha256 1fcb78d7e478bb8a9408010bdc91b36e213b1facfad093df3f7ce7e28af19043 COPYRIGHT.GPL diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk index 28948a3ab3..abcb123eea 100644 --- a/package/openvpn/openvpn.mk +++ b/package/openvpn/openvpn.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENVPN_VERSION = 2.6.8 +OPENVPN_VERSION = 2.6.10 OPENVPN_SITE = https://swupdate.openvpn.net/community/releases OPENVPN_DEPENDENCIES = host-pkgconf libcap-ng OPENVPN_LICENSE = GPL-2.0 From 6ac268457b0123235ab8b327f4baa167c5a169bf Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 24 Mar 2024 14:05:29 +0100 Subject: [PATCH 5416/5754] package/libxml2: bump version to 2.12.6 https://gitlab.gnome.org/GNOME/libxml2/-/blob/v2.12.6/NEWS Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (cherry picked from commit f9b1cc87d421356c91c8a9beb35691a35e9adb72) 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 959887ab0e..086bb41098 100644 --- a/package/libxml2/libxml2.hash +++ b/package/libxml2/libxml2.hash @@ -1,4 +1,4 @@ -# From https://download.gnome.org/sources/libxml2/2.12/libxml2-2.12.5.sha256sum -sha256 a972796696afd38073e0f59c283c3a2f5a560b5268b4babc391b286166526b21 libxml2-2.12.5.tar.xz +# From https://download.gnome.org/sources/libxml2/2.12/libxml2-2.12.6.sha256sum +sha256 889c593a881a3db5fdd96cc9318c87df34eb648edfc458272ad46fd607353fbb libxml2-2.12.6.tar.xz # License files, locally calculated sha256 7fb0a66f3989f9bd5c7e5438a3de02cd4a7a47dde0aea2f7ea2ba2ff454ee6a4 Copyright diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk index 6070c07b03..e7ed6fb752 100644 --- a/package/libxml2/libxml2.mk +++ b/package/libxml2/libxml2.mk @@ -5,7 +5,7 @@ ################################################################################ LIBXML2_VERSION_MAJOR = 2.12 -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 f244138016125a98274d7a741c8eb2eb97f1b2db Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 24 Mar 2024 13:31:59 +0100 Subject: [PATCH 5417/5754] package/neon: drop unrecognized rpath option rpath is an unrecognized option since the addition of the package in commit 59a9c02e1355bcd630a207e8be319a044597ad1d Fixes: 59a9c02e1355bcd630a207e8be319a044597ad1d Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (cherry picked from commit f85a1eb173954cfcdda1c0e947913bba598290d8) Signed-off-by: Peter Korsgaard --- package/neon/neon.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/neon/neon.mk b/package/neon/neon.mk index 96ee608780..93870b9966 100644 --- a/package/neon/neon.mk +++ b/package/neon/neon.mk @@ -10,7 +10,7 @@ NEON_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (manual and tests) NEON_LICENSE_FILES = src/COPYING.LIB test/COPYING README.md NEON_CPE_ID_VENDOR = webdav NEON_INSTALL_STAGING = YES -NEON_CONF_OPTS = --without-gssapi --disable-rpath +NEON_CONF_OPTS = --without-gssapi NEON_CONFIG_SCRIPTS = neon-config NEON_DEPENDENCIES = host-pkgconf $(TARGET_NLS_DEPENDENCIES) NEON_CONF_ENV = ne_cv_libsfor_bindtextdomain=$(TARGET_NLS_LIBS) From 4f99c548304ff2bbf3958ea38653e58caf018544 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 24 Mar 2024 10:49:34 +0100 Subject: [PATCH 5418/5754] package/vdr: bump to version 2.6.5 https://github.com/vdr-projects/vdr/blob/2.6.5/HISTORY Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (cherry picked from commit 5e545cd269e0a3bbd6f859f885c887f14d3bd2d9) Signed-off-by: Peter Korsgaard --- package/vdr/vdr.hash | 2 +- package/vdr/vdr.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/vdr/vdr.hash b/package/vdr/vdr.hash index 1b7ced0b77..47179a9907 100644 --- a/package/vdr/vdr.hash +++ b/package/vdr/vdr.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 70352c7558d627202c02e80d88c83d25d9df4c5e49a010f7d1d9ae631bd54ad0 vdr-2.6.3.tar.gz +sha256 293e355b2cc22e6152dae9c315d5b8903f3e647a2e60b6217d306ff4bceb83e1 vdr-2.6.5.tar.gz sha256 ddb9db7630752f8fdc6898f7c99a99eaeeac5213627ecb093df9c82f56175dc7 COPYING diff --git a/package/vdr/vdr.mk b/package/vdr/vdr.mk index a44e1ff512..c717d40e02 100644 --- a/package/vdr/vdr.mk +++ b/package/vdr/vdr.mk @@ -4,7 +4,7 @@ # ################################################################################ -VDR_VERSION = 2.6.3 +VDR_VERSION = 2.6.5 VDR_SITE = $(call github,vdr-projects,vdr,$(VDR_VERSION)) VDR_LICENSE = GPL-2.0+ VDR_LICENSE_FILES = COPYING From ef6d0e6e992b4d352101e7e15f07acd01e703636 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 24 Mar 2024 09:58:36 +0100 Subject: [PATCH 5419/5754] package/libtorrent-rasterbar: bump to version 1.2.19 https://github.com/arvidn/libtorrent/releases/tag/v1.2.19 https://github.com/arvidn/libtorrent/releases/tag/v1.2.18 https://github.com/arvidn/libtorrent/releases/tag/v1.2.17 https://github.com/arvidn/libtorrent/releases/tag/v1.2.16 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (cherry picked from commit 49384a0a01ad8b73ea1dc10043c3605d035933f8) Signed-off-by: Peter Korsgaard --- package/libtorrent-rasterbar/libtorrent-rasterbar.hash | 2 +- package/libtorrent-rasterbar/libtorrent-rasterbar.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libtorrent-rasterbar/libtorrent-rasterbar.hash b/package/libtorrent-rasterbar/libtorrent-rasterbar.hash index 3f59642b72..b1abe85d84 100644 --- a/package/libtorrent-rasterbar/libtorrent-rasterbar.hash +++ b/package/libtorrent-rasterbar/libtorrent-rasterbar.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c8ad8638684c0a903ebabc30490079e31b1a6a638da2adec5a8bef6a0e62214b libtorrent-rasterbar-1.2.15.tar.gz +sha256 eee8e99548dc5eb5e643e49db9202f4f97112c032dba883dfdc8144af5b6e40e libtorrent-rasterbar-1.2.19.tar.gz sha256 f3a5dd1558cce616b12edad521427ec8976ce2bb0af33f7f359cfa648bf55ad8 COPYING diff --git a/package/libtorrent-rasterbar/libtorrent-rasterbar.mk b/package/libtorrent-rasterbar/libtorrent-rasterbar.mk index 085b38343c..6b497bbe58 100644 --- a/package/libtorrent-rasterbar/libtorrent-rasterbar.mk +++ b/package/libtorrent-rasterbar/libtorrent-rasterbar.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBTORRENT_RASTERBAR_VERSION = 1.2.15 +LIBTORRENT_RASTERBAR_VERSION = 1.2.19 LIBTORRENT_RASTERBAR_SITE = \ https://github.com/arvidn/libtorrent/releases/download/v$(LIBTORRENT_RASTERBAR_VERSION) LIBTORRENT_RASTERBAR_LICENSE = BSD-3-Clause From 747eb7172be510d9b39452778e5a455810ce8fa3 Mon Sep 17 00:00:00 2001 From: Akhilesh Nema Date: Sat, 23 Mar 2024 22:11:51 -0700 Subject: [PATCH 5420/5754] package/msmtp: bump version to 1.8.25 Release notes - https://marlam.de/msmtp/news/msmtp-1-8-25/ Signed-off-by: Akhilesh Nema Signed-off-by: Arnout Vandecappelle (cherry picked from commit c1c096f91da5bfc45f1842b6dd12f1f0e016dbc4) Signed-off-by: Peter Korsgaard --- package/msmtp/msmtp.hash | 4 ++-- package/msmtp/msmtp.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/msmtp/msmtp.hash b/package/msmtp/msmtp.hash index c5fe9d9176..ba4ef02746 100644 --- a/package/msmtp/msmtp.hash +++ b/package/msmtp/msmtp.hash @@ -1,7 +1,7 @@ # Locally calculated after checking signature -# https://marlam.de/msmtp/releases/msmtp-1.8.24.tar.xz.sig +# https://marlam.de/msmtp/releases/msmtp-1.8.25.tar.xz.sig # with key 2F61B4828BBA779AECB3F32703A2A4AB1E32FD34 -sha256 bd6644b1aaab17d61b86647993e3efad860b23c54283b00ddc579c1f5110aa59 msmtp-1.8.24.tar.xz +sha256 2dfe1dbbb397d26fe0b0b6b2e9cd2efdf9d72dd42d18e70d7f363ada2652d738 msmtp-1.8.25.tar.xz # Hash for license file: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/msmtp/msmtp.mk b/package/msmtp/msmtp.mk index 93c923a123..b964970bfa 100644 --- a/package/msmtp/msmtp.mk +++ b/package/msmtp/msmtp.mk @@ -4,7 +4,7 @@ # ################################################################################ -MSMTP_VERSION = 1.8.24 +MSMTP_VERSION = 1.8.25 MSMTP_SITE = https://marlam.de/msmtp/releases MSMTP_SOURCE = msmtp-$(MSMTP_VERSION).tar.xz MSMTP_DEPENDENCIES = host-pkgconf From 11c8ff14990c8cf0b2cf7c4c63cad8f916dfba7b Mon Sep 17 00:00:00 2001 From: Akhilesh Nema Date: Sat, 23 Mar 2024 17:17:53 -0700 Subject: [PATCH 5421/5754] package/openssh: bump to version 9.7p1 Release notes - https://www.openssh.com/txt/release-9.7 Drop upstream patch - 001-better-detection-of-broken-fzero-call-used-regs.patch Signed-off-by: Akhilesh Nema Signed-off-by: Arnout Vandecappelle (cherry picked from commit 9496ff57e54c136d6961294aa2c5f8d560673ebf) Signed-off-by: Peter Korsgaard --- ...ction-of-broken-fzero-call-used-regs.patch | 57 ------------------- package/openssh/openssh.hash | 4 +- package/openssh/openssh.mk | 2 +- 3 files changed, 3 insertions(+), 60 deletions(-) delete mode 100644 package/openssh/0001-better-detection-of-broken-fzero-call-used-regs.patch diff --git a/package/openssh/0001-better-detection-of-broken-fzero-call-used-regs.patch b/package/openssh/0001-better-detection-of-broken-fzero-call-used-regs.patch deleted file mode 100644 index 5c056033a9..0000000000 --- a/package/openssh/0001-better-detection-of-broken-fzero-call-used-regs.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 1036d77b34a5fa15e56f516b81b9928006848cbd Mon Sep 17 00:00:00 2001 -From: Damien Miller -Date: Fri, 22 Dec 2023 17:56:26 +1100 -Subject: [PATCH] better detection of broken -fzero-call-used-regs -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -gcc 13.2.0 on ppc64le refuses to compile some function, including -cipher.c:compression_alg_list() with an error: - -> sorry, unimplemented: argument ‘used’ is not supportedcw -> for ‘-fzero-call-used-regs’ on this target - -This extends the autoconf will-it-work test with a similarly- -structured function that seems to catch this. - -Spotted/tested by Colin Watson; bz3645 - -Upstream: https://github.com/openssh/openssh-portable/commit/1036d77b34a5fa15e56f516b81b9928006848cbd.patch -Signed-off-by: Brandon Maier ---- - m4/openssh.m4 | 12 +++++++++--- - 1 file changed, 9 insertions(+), 3 deletions(-) - -diff --git a/m4/openssh.m4 b/m4/openssh.m4 -index 5d4c56280fc..033df501c3d 100644 ---- a/m4/openssh.m4 -+++ b/m4/openssh.m4 -@@ -20,18 +20,24 @@ char *f2(char *s, ...) { - va_end(args); - return strdup(ret); - } -+const char *f3(int s) { -+ return s ? "good" : "gooder"; -+} - int main(int argc, char **argv) { -- (void)argv; - char b[256], *cp; -+ const char *s; - /* Some math to catch -ftrapv problems in the toolchain */ - int i = 123 * argc, j = 456 + argc, k = 789 - argc; - float l = i * 2.1; - double m = l / 0.5; - long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; -+ (void)argv; - f(1); -- snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld\n", i,j,k,l,m,n,o); -+ s = f3(f(2)); -+ snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); - if (write(1, b, 0) == -1) exit(0); -- cp = f2("%d %d %d %f %f %lld %lld\n", i,j,k,l,m,n,o); -+ cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); -+ if (write(1, cp, 0) == -1) exit(0); - free(cp); - /* - * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does diff --git a/package/openssh/openssh.hash b/package/openssh/openssh.hash index 618b13133d..58297aa694 100644 --- a/package/openssh/openssh.hash +++ b/package/openssh/openssh.hash @@ -1,4 +1,4 @@ -# From https://www.openssh.com/txt/release-9.4p1 -sha256 910211c07255a8c5ad654391b40ee59800710dd8119dd5362de09385aa7a777c openssh-9.6p1.tar.gz +# From https://www.openssh.com/txt/release-9.7 +sha256 490426f766d82a2763fcacd8d83ea3d70798750c7bd2aff2e57dc5660f773ffd openssh-9.7p1.tar.gz # Locally calculated sha256 05c30446ba738934b3f1efa965b454c122ca26cc4b268e5ae6843f58ccd1b16d LICENCE diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk index ef530cc850..ce55253120 100644 --- a/package/openssh/openssh.mk +++ b/package/openssh/openssh.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENSSH_VERSION_MAJOR = 9.6 +OPENSSH_VERSION_MAJOR = 9.7 OPENSSH_VERSION_MINOR = p1 OPENSSH_VERSION = $(OPENSSH_VERSION_MAJOR)$(OPENSSH_VERSION_MINOR) OPENSSH_CPE_ID_VERSION = $(OPENSSH_VERSION_MAJOR) From 37b2a882e94cab3a58b1a2ab15de8b6af1424efd Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 23 Mar 2024 21:35:16 +0100 Subject: [PATCH 5422/5754] support/testing: add iptables runtime test Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle (cherry picked from commit 2bf3dc5b84cf9586406d1ff6aa87860eb28d037a) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + .../testing/tests/package/test_iptables.py | 78 +++++++++++++++++++ 2 files changed, 79 insertions(+) create mode 100644 support/testing/tests/package/test_iptables.py diff --git a/DEVELOPERS b/DEVELOPERS index 0bfe91f064..f01874ab10 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1797,6 +1797,7 @@ F: support/testing/tests/package/test_highway.py F: support/testing/tests/package/test_hwloc.py F: support/testing/tests/package/test_iozone.py F: support/testing/tests/package/test_iperf3.py +F: support/testing/tests/package/test_iptables.py F: support/testing/tests/package/test_jailhouse.py F: support/testing/tests/package/test_jq.py F: support/testing/tests/package/test_jq/ diff --git a/support/testing/tests/package/test_iptables.py b/support/testing/tests/package/test_iptables.py new file mode 100644 index 0000000000..ee57b31558 --- /dev/null +++ b/support/testing/tests/package/test_iptables.py @@ -0,0 +1,78 @@ +import os + +import infra.basetest + + +class TestIptables(infra.basetest.BRTest): + # The iptables package has _LINUX_CONFIG_FIXUPS, so we cannot use + # the runtime test pre-built Kernel. We need to compile a Kernel + # to make sure it will include the required configuration. + 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.82" + 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_PACKAGE_IPTABLES=y + BR2_TARGET_ROOTFS_CPIO=y + BR2_TARGET_ROOTFS_CPIO_GZIP=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + 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() + + # We check the program can execute. + self.assertRunOk("iptables --version") + + # We delete all rules in all chains. We also set default + # policies to ACCEPT for INPUT and OUPUT chains. This should + # already be the case (default Kernel config). This makes sure + # this test starts from a known state and also those common + # command invocations works. + self.assertRunOk("iptables --flush") + self.assertRunOk("iptables --policy INPUT ACCEPT") + self.assertRunOk("iptables --policy OUTPUT ACCEPT") + + # We add a filter rule to drop all the ICMP protocol to the + # IPv4 destination 127.0.0.2, in the INPUT chain. This should + # block all pings (icmp echo-requests). + cmd = "iptables --append INPUT" + cmd += " --protocol icmp --destination 127.0.0.2 --jump DROP" + self.assertRunOk(cmd) + + # We check we can list rules. + self.assertRunOk("iptables --list") + + # A ping to 127.0.0.1 is expected to work, because it's not + # matching our rule. We expect 3 replies (-c), with 0.5s + # internal (-i), and set a maximum timeout of 2s. + ping_cmd_prefix = "ping -c 3 -i 0.5 -W 2 " + self.assertRunOk(ping_cmd_prefix + "127.0.0.1") + + # A ping to 127.0.0.2 is expected to fail, because our rule is + # supposed to drop it. + ping_test_cmd = ping_cmd_prefix + "127.0.0.2" + _, exit_code = self.emulator.run(ping_test_cmd) + self.assertNotEqual(exit_code, 0) + + # We delete our only rule #1 in the INPUT chain. + self.assertRunOk("iptables --delete INPUT 1") + + # Since we deleted the rule, the ping test command which was + # supposed to fail earlier is now supposed to succeed. + self.assertRunOk(ping_test_cmd) From 2680f08178e233a6ec4d8869781e4ca15ee76316 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 15 Mar 2024 22:47:12 +0100 Subject: [PATCH 5423/5754] package/multipath-tools: drop README.md from license files Drop README.md from license files as advocated by Arnout Vandecappelle: https://patchwork.ozlabs.org/project/buildroot/patch/20240314211117.9103-1-fontaine.fabrice@gmail.com The only license-related part of README.md is that specifies that the default license, if not mentioned in the file, is LGPL-2.0. Since the README file is likely to be updated with every new release, this is a lot of overhead for such a small added value. Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (cherry picked from commit e511539cd29015f08d7417094cbf202a861ad533) Signed-off-by: Peter Korsgaard --- package/multipath-tools/multipath-tools.hash | 1 - package/multipath-tools/multipath-tools.mk | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/package/multipath-tools/multipath-tools.hash b/package/multipath-tools/multipath-tools.hash index c1f32e7a3b..03a2867144 100644 --- a/package/multipath-tools/multipath-tools.hash +++ b/package/multipath-tools/multipath-tools.hash @@ -4,4 +4,3 @@ sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENS sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 LICENSES/GPL-3.0 sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c LICENSES/LGPL-2.0 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSES/LGPL-2.1 -sha256 9c69bb0089aa0b82b10a25095c04a7c4aec6b5bbf0776b7129123c8459fe7725 README.md diff --git a/package/multipath-tools/multipath-tools.mk b/package/multipath-tools/multipath-tools.mk index e62e85e14d..164d850600 100644 --- a/package/multipath-tools/multipath-tools.mk +++ b/package/multipath-tools/multipath-tools.mk @@ -16,8 +16,7 @@ MULTIPATH_TOOLS_LICENSE_FILES = \ LICENSES/GPL-2.0 \ LICENSES/GPL-3.0 \ LICENSES/LGPL-2.0 \ - LICENSES/LGPL-2.1 \ - README.md + LICENSES/LGPL-2.1 MULTIPATH_TOOLS_CPE_ID_VENDOR = opensvc MULTIPATH_TOOLS_DEPENDENCIES = \ From 2d41bf85771bd84ffea3ee6d985303158e92789a Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 15 Mar 2024 23:10:29 +0100 Subject: [PATCH 5424/5754] package/cvs: fix build without editor Set default editor to /bin/vi to fix the following build failure when no editor is found on host: configure:40833: checking for vim configure:40862: result: no configure:40833: checking for vi configure:40862: result: no configure:40833: checking for emacs configure:40862: result: no configure:40833: checking for nano configure:40862: result: no configure:40833: checking for pico configure:40862: result: no configure:40833: checking for edit configure:40862: result: no configure:40874: error: Failed to find a text file editor. CVS cannot be compiled without a default log message editor. Searched for `vim vi emacs nano pico edit'. Try `configure --with-editor'. While at it, drop CVS_CONFIGURE_ARGS variable for simplicity Fixes: - http://autobuild.buildroot.org/results/5b8a747698bc2e64eb1f001e87577e86e4cb8d14 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (cherry picked from commit 1455d5241b288770aeea7f5ba6dcd1ea31966ba1) Signed-off-by: Peter Korsgaard --- package/cvs/cvs.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package/cvs/cvs.mk b/package/cvs/cvs.mk index bd1e04eee0..64c15f16fe 100644 --- a/package/cvs/cvs.mk +++ b/package/cvs/cvs.mk @@ -18,18 +18,18 @@ CVS_CONF_ENV = \ ac_cv_func_working_mktime=yes \ cvs_cv_func_printf_ptr=yes -CVS_CONFIGURE_ARGS = --disable-old-info-format-support +CVS_CONF_OPTS = \ + --disable-old-info-format-support \ + --with-editor=/bin/vi ifeq ($(BR2_PACKAGE_CVS_SERVER),y) -CVS_CONFIGURE_ARGS += --enable-server +CVS_CONF_OPTS += --enable-server else -CVS_CONFIGURE_ARGS += --disable-server +CVS_CONF_OPTS += --disable-server endif ifeq ($(BR2_PACKAGE_ZLIB),y) -CVS_CONFIGURE_ARGS += --with-external-zlib +CVS_CONF_OPTS += --with-external-zlib endif -CVS_CONF_OPTS = $(CVS_CONFIGURE_ARGS) - define CVS_BZIP_UNPACK $(BZCAT) $(@D)/cvs-$(CVS_VERSION).tar.bz2 | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - rm -f $(@D)/cvs-$(CVS_VERSION).tar.bz2 From 5b611f2dc63ce45ca4cd9eea88ab5c6c8dc5fef8 Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Fri, 15 Mar 2024 23:43:16 +0000 Subject: [PATCH 5425/5754] package/gmp: fix target build with host gcc 4.9 GMP does not build if the host gcc is v4.9 due to the following error gen-sieve.c: In function 'setmask': gen-sieve.c:99:3: error: 'for' loop initial declarations are only allowed in C99 or C11 mode for (unsigned i = 0; i < 2 * a * b; ++i) ^ gen-sieve.c:99:3: note: use option -std=c99, -std=gnu99, -std=c11 or -std=gnu11 to compile your code The gen-sieve utility was added in GMP v6.3.0. It is built using CC_FOR_BUILD (host compiler) during cross compilation as it generates build files. Autoconf does not have a macro for add -std=c99 to CC_FOR_BUILD, so it must be set manually. For the target, it is set correctly thanks to the AC_PROG_CC_C99 macro. Signed-off-by: Brandon Maier Signed-off-by: Arnout Vandecappelle (cherry picked from commit 9553dc9a55c13916c26aaae4fac037d35ddacca3) Signed-off-by: Peter Korsgaard --- package/gmp/gmp.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/gmp/gmp.mk b/package/gmp/gmp.mk index bd401c6a80..7e8da9025c 100644 --- a/package/gmp/gmp.mk +++ b/package/gmp/gmp.mk @@ -14,6 +14,8 @@ GMP_CPE_ID_VENDOR = gmplib GMP_DEPENDENCIES = host-m4 HOST_GMP_DEPENDENCIES = host-m4 +GMP_CONF_ENV += CC_FOR_BUILD="$(HOSTCC) -std=c99" + # 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 135b1eeb3f5a3373bb8df1d0a77251ce124083cf Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 16 Mar 2024 09:43:35 +0100 Subject: [PATCH 5426/5754] {linux, linux-headers}: bump 4.19.x / 5.{4, 10, 15}.x / 6.{1, 6}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (cherry picked from commit 75bad69099dfb66433feaf4accf1105e1f8a4319) [Peter: update BR2_LINUX_KERNEL_LATEST_VERSION to match] 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 df84cce539..d520dc379f 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.6.21" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.6.22" 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 977ad30f73..734ff27a58 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 ee0b430148da94d2b13608b8d80b007b7d281dc90e3f19b63cf9a9943810e457 linux-6.6.21.tar.xz -sha256 0ebd861c6fd47bb0a9d3a09664d704833d1a54750c7bf9c4ad8b5e9cbd49342b linux-6.1.81.tar.xz +sha256 23e3e7b56407250f5411bdab95763d0bc4e3a19dfa431d951df7eacabd61a2f4 linux-6.6.22.tar.xz +sha256 d150d2d9d416877668d8b56f75759f166168d192419eefaa942ed67225cbec06 linux-6.1.82.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 8a1e760bf2660947234109aa4fdbbe3686238b4e852157b96c59356689107e49 linux-5.15.151.tar.xz -sha256 0cf3e467bd8d35533888327e9f8a9a9d354fdf83e8f82e9fe5a234f896a07493 linux-5.10.212.tar.xz -sha256 cdbc61334cdadbd3945b08f03ed197c65bdf358c3383a4334b3e5b483bd95850 linux-5.4.271.tar.xz +sha256 f0805225f4a5b24d0bba9302c2c2f261c04f737ac5dd931da9b112e9f3e4a47e linux-5.15.152.tar.xz +sha256 84cf30223239ec3333a5f7b2a7fba2042bba70d1582a139f7543956af871ad80 linux-5.10.213.tar.xz +sha256 3599d5959a403e64be407d7f05e56cb270d6ddd154e89a596609919ab1e2e366 linux-5.4.272.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 95ada7aa6ef1c69d7a469432f936365e35b004d24e751d82c21a371edd2c84f9 linux-4.19.309.tar.xz +sha256 95ec94c4ab8f46d8a54430893f9bd653c46b0f1587d216818aa8f52fd313de69 linux-4.19.310.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 fe4fc5011e..f95fb703f0 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -403,12 +403,12 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.19.309" if BR2_KERNEL_HEADERS_4_19 - default "5.4.271" if BR2_KERNEL_HEADERS_5_4 - default "5.10.212" if BR2_KERNEL_HEADERS_5_10 - default "5.15.151" if BR2_KERNEL_HEADERS_5_15 - default "6.1.81" if BR2_KERNEL_HEADERS_6_1 - default "6.6.21" if BR2_KERNEL_HEADERS_6_6 + default "4.19.310" if BR2_KERNEL_HEADERS_4_19 + default "5.4.272" if BR2_KERNEL_HEADERS_5_4 + default "5.10.213" if BR2_KERNEL_HEADERS_5_10 + default "5.15.152" if BR2_KERNEL_HEADERS_5_15 + default "6.1.82" if BR2_KERNEL_HEADERS_6_1 + default "6.6.22" 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 2f54f4753f00962a540315641cc0286afb72898e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 16 Mar 2024 22:37:18 +0100 Subject: [PATCH 5427/5754] package/pure-ftpd: remove optional dependency to libiconv Buildroot commit 26d5d1c0a20719876220b429a43f8b1bcc29138b removed the configure option --with-rfc2640 due to upstream commit: https://github.com/jedisct1/pure-ftpd/commit/33eda763bfca8dfcf736275272b84602dcd18549 In the same upstream commit the iconv support was also removed because it was only needed for rfc2640 support, this removal was forgotten in the forementioned buildroot commit. Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (cherry picked from commit f30f5e4f61e72a507df96bea1960a9388c780a82) Signed-off-by: Peter Korsgaard --- package/pure-ftpd/pure-ftpd.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/pure-ftpd/pure-ftpd.mk b/package/pure-ftpd/pure-ftpd.mk index ffd27d7b99..b918c70930 100644 --- a/package/pure-ftpd/pure-ftpd.mk +++ b/package/pure-ftpd/pure-ftpd.mk @@ -10,7 +10,6 @@ PURE_FTPD_SOURCE = pure-ftpd-$(PURE_FTPD_VERSION).tar.bz2 PURE_FTPD_LICENSE = ISC PURE_FTPD_LICENSE_FILES = COPYING PURE_FTPD_CPE_ID_VENDOR = pureftpd -PURE_FTPD_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv) PURE_FTPD_CONF_OPTS = \ --with-altlog \ From a819bacaedd1e016cf9a4ac7f238f4e83aa32fd0 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 17 Mar 2024 10:58:11 +0100 Subject: [PATCH 5428/5754] package/xvisor: fix build without python interpreter Fix the following build failures on a system not providing the "python" interpreter binary raised at least since bump to version 0.3.1 in commit c4f8b8968770ecbf6444a5921c6472f126717626 and more probably since the addition of the package in commit e23ddf0c13e6d3b054782b86188396a0c2add1a5 and https://github.com/xvisor/xvisor/commit/ba904b4066f4b375cb1ad76ca41570741dbec62e: /bin/sh: line 1: /home/buildroot/autobuild/instance-2/output-1/build/xvisor-0.3.1/tools/scripts/d2c.py: cannot execute: required file not found or /bin/sh: /home/buildroot/instance-0/output-1/build/xvisor-0.3.2/tools/scripts/d2c.py: /usr/bin/python: bad interpreter: No such file or directory Fixes: - http://autobuild.buildroot.org/results/2e100bacc9e9face8351287e4c979c1729709d7b - http://autobuild.buildroot.org/results/5d8a08512db1b3095158753e3a7843b0fd6c9749 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (cherry picked from commit 24e996d14d28decfb9863996456b6b2720939422) Signed-off-by: Peter Korsgaard --- ...plicitly-use-the-python3-interpreter.patch | 35 +++++++++++++++++++ package/xvisor/xvisor.mk | 2 +- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 package/xvisor/0001-TOOLS-d2c-py-explicitly-use-the-python3-interpreter.patch diff --git a/package/xvisor/0001-TOOLS-d2c-py-explicitly-use-the-python3-interpreter.patch b/package/xvisor/0001-TOOLS-d2c-py-explicitly-use-the-python3-interpreter.patch new file mode 100644 index 0000000000..349d4415e2 --- /dev/null +++ b/package/xvisor/0001-TOOLS-d2c-py-explicitly-use-the-python3-interpreter.patch @@ -0,0 +1,35 @@ +From 888c94e7a121d96aa88f84c58fe7e2bd771fc5ac Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Fri, 25 Aug 2023 21:56:37 +0200 +Subject: [PATCH] TOOLS: d2c.py: explicitly use the python3 interpreter + +When compiling Xvisor on a system not providing the "python" +interpreter binary, compilation fails with output: + + (d2c) core/vio/keymaps/modifiers.c + /bin/sh: 1: /build/xvisor-0.3.2/tools/scripts/d2c.py: not found + +This commit fixes the issue following the PEP 394 recommendation: +https://peps.python.org/pep-0394/ + +It sets the "shebang" to `#! /usr/bin/env python3` to allow using other +interpreters in the PATH, or virtual environment. + +Signed-off-by: Julien Olivain + +Upstream: https://github.com/xvisor/xvisor/commit/888c94e7a121d96aa88f84c58fe7e2bd771fc5ac +Signed-off-by: Fabrice Fontaine +--- + tools/scripts/d2c.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/scripts/d2c.py b/tools/scripts/d2c.py +index b46a7bc468..daac4a5450 100755 +--- a/tools/scripts/d2c.py ++++ b/tools/scripts/d2c.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#! /usr/bin/env python3 + #/** + # Copyright (c) 2013 Anup Patel. + # All rights reserved. diff --git a/package/xvisor/xvisor.mk b/package/xvisor/xvisor.mk index eba37be9b7..2a51706b55 100644 --- a/package/xvisor/xvisor.mk +++ b/package/xvisor/xvisor.mk @@ -11,7 +11,7 @@ XVISOR_LICENSE = GPL-2.0+ XVISOR_LICENSE_FILES = COPYING XVISOR_INSTALL_IMAGES = YES XVISOR_INSTALL_TARGET = NO -XVISOR_DEPENDENCIES = host-bison host-dtc host-flex +XVISOR_DEPENDENCIES = host-bison host-dtc host-flex host-python3 XVISOR_MAKE_TARGETS = all From b0c6e9f3f6ca8f357a8ba11a9c6decf4a30984a1 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 17 Mar 2024 11:53:26 +0100 Subject: [PATCH 5429/5754] package/libunwind: drop autoreconf Commit 67d87bf7d255cd05f84fab3e3625e073b5bfccf8 forgot to drop autoreconf Fixes: 67d87bf7d255cd05f84fab3e3625e073b5bfccf8 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (cherry picked from commit 4eba5e002c1e71b1d8decba101f9b8f945a9cd3a) Signed-off-by: Peter Korsgaard --- package/libunwind/libunwind.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/libunwind/libunwind.mk b/package/libunwind/libunwind.mk index d7ddb8f179..15c4e4863f 100644 --- a/package/libunwind/libunwind.mk +++ b/package/libunwind/libunwind.mk @@ -10,7 +10,6 @@ LIBUNWIND_INSTALL_STAGING = YES LIBUNWIND_LICENSE_FILES = COPYING LIBUNWIND_LICENSE = MIT LIBUNWIND_CPE_ID_VALID = YES -LIBUNWIND_AUTORECONF = YES LIBUNWIND_CONF_OPTS = \ --disable-tests \ From 16960faf65fc7ef0b17b6eedc1e75d0ca38798c7 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 17 Mar 2024 11:55:29 +0100 Subject: [PATCH 5430/5754] package/libunwind: fix libucontext handling Commit 6ea2a27f9047696ce1c463ad55fb4a78df136954 forgot to add -lucontext to LIBS resulting in the following build failure with zeromq: /home/buildroot/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/i586-buildroot-linux-musl/9.3.0/../../../../i586-buildroot-linux-musl/bin/ld: /home/buildroot/instance-0/output-1/host/i586-buildroot-linux-musl/sysroot/usr/lib32/libunwind.so.8: undefined reference to `setcontext' Fixes: 6ea2a27f9047696ce1c463ad55fb4a78df136954 - http://autobuild.buildroot.org/results/893defe1588b2ca03c115b59b47be3f4aed438fb Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (cherry picked from commit 766c1613aed2fe10bee96b8b515f88bb6ee7a310) Signed-off-by: Peter Korsgaard --- package/libunwind/libunwind.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libunwind/libunwind.mk b/package/libunwind/libunwind.mk index 15c4e4863f..94e9bbd1b8 100644 --- a/package/libunwind/libunwind.mk +++ b/package/libunwind/libunwind.mk @@ -17,6 +17,7 @@ LIBUNWIND_CONF_OPTS = \ ifeq ($(BR2_PACKAGE_LIBUCONTEXT),y) LIBUNWIND_DEPENDENCIES += libucontext +LIBUNWIND_CONF_OPTS += LIBS=-lucontext endif $(eval $(autotools-package)) From e382d74ce7fcc543e7059b2e8ff59e4390cd135e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 17 Mar 2024 15:14:38 +0100 Subject: [PATCH 5431/5754] package/privoxy: fix build with root Fix the following build failure when the configuration files are installed as root: id: 'privoxy': no such user ****************************************************************** WARNING! WARNING! installing config files as root! It is strongly recommended to run privoxy as a non-root user, and to install the config files as that user and/or group! Please read INSTALL, and create a privoxy user and group! ******************************************************************* make[1]: *** [GNUmakefile:861: install] Error 1 This failure is probably raised since the addition of the package in commit f8a263fe361ab37ec6765b9ff6478c3b15e3d139 and https://www.privoxy.org/gitweb/?p=privoxy.git;a=commit;h=26baf6bcc0b5db47b8cf5c55eece0614712b5180 Fixes: - http://autobuild.buildroot.org/results/28d8ca6f0e2d81d62196a0958c9274ad2c8c9871 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (cherry picked from commit b6816034ebddd522a8fef9daa454c28fa1230dd6) Signed-off-by: Peter Korsgaard --- ...on-t-exit-if-configuration-files-are.patch | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 package/privoxy/0001-GNUmakefile-in-Don-t-exit-if-configuration-files-are.patch diff --git a/package/privoxy/0001-GNUmakefile-in-Don-t-exit-if-configuration-files-are.patch b/package/privoxy/0001-GNUmakefile-in-Don-t-exit-if-configuration-files-are.patch new file mode 100644 index 0000000000..e04d191ce0 --- /dev/null +++ b/package/privoxy/0001-GNUmakefile-in-Don-t-exit-if-configuration-files-are.patch @@ -0,0 +1,30 @@ +From 4b3b267db159dc23314de3062859481b7c397e32 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 17 Mar 2024 12:36:31 +0100 +Subject: [PATCH] GNUmakefile.in: Don't exit if configuration files are + installed as root + +... as this can be considered acceptable when cross-compiling +Privoxy inside an autobuilder with only a root user. + +Upstream: https://www.privoxy.org/gitweb/?p=privoxy.git;a=commit;h=4b3b267db159dc23314de3062859481b7c397e32 +Signed-off-by: Fabrice Fontaine +--- + GNUmakefile.in | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/GNUmakefile.in b/GNUmakefile.in +index 04cceb15..cf79aae1 100644 +--- a/GNUmakefile.in ++++ b/GNUmakefile.in +@@ -927,7 +927,6 @@ install: CONF_DEST LOG_DEST PID_DEST check_doc GROUP_T + $(ECHO) " and to install the config files as that user and/or group!" ;\ + $(ECHO) " Please read INSTALL, and create a privoxy user and group!" ;\ + $(ECHO) "*******************************************************************" ;\ +- exit 1 ;\ + fi ;\ + else \ + GROUP_T=$(GROUP) ;\ +-- +2.39.2 + From 77c86888f41bc6e15de8e24736b7b153f1fbab5a Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Tue, 12 Mar 2024 19:38:36 +0100 Subject: [PATCH 5432/5754] package/bitcoin: add the wallet support option The bitcoin Buildroot package has always disabled the wallet support. This commit adds a config option to enable this support. This allows the bitcoin-cli command to create wallets, generate addresses and send an amount to a given address. Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle (cherry picked from commit 958085d5f6a90c46f812c64bbe4ac2963f83bca1) Signed-off-by: Peter Korsgaard --- package/bitcoin/Config.in | 10 ++++++++++ package/bitcoin/bitcoin.mk | 15 ++++++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/package/bitcoin/Config.in b/package/bitcoin/Config.in index c4a2447fc9..060cae24f5 100644 --- a/package/bitcoin/Config.in +++ b/package/bitcoin/Config.in @@ -36,6 +36,16 @@ config BR2_PACKAGE_BITCOIN https://bitcoincore.org +if BR2_PACKAGE_BITCOIN + +config BR2_PACKAGE_BITCOIN_WALLET + bool "wallet support" + select BR2_PACKAGE_SQLITE + help + Enable bitcoin wallet support. + +endif + comment "bitcoin needs a toolchain w/ C++, threads, wchar, gcc >= 9" depends on BR2_PACKAGE_BITCOIN_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS diff --git a/package/bitcoin/bitcoin.mk b/package/bitcoin/bitcoin.mk index 493c569336..2f8a1777a2 100644 --- a/package/bitcoin/bitcoin.mk +++ b/package/bitcoin/bitcoin.mk @@ -13,14 +13,27 @@ BITCOIN_CPE_ID_VENDOR = bitcoin BITCOIN_CPE_ID_PRODUCT = bitcoin_core BITCOIN_DEPENDENCIES = host-pkgconf boost libevent BITCOIN_MAKE_ENV = BITCOIN_GENBUILD_NO_GIT=1 +# Berkeley Database (bdb) support is always disabled. It is only +# needed for legacy wallet format. New wallets are using SQLite. BITCOIN_CONF_OPTS = \ --disable-bench \ - --disable-wallet \ --disable-tests \ --with-boost-libdir=$(STAGING_DIR)/usr/lib/ \ --disable-hardening \ + --without-bdb \ --without-gui +ifeq ($(BR2_PACKAGE_BITCOIN_WALLET),y) +BITCOIN_DEPENDENCIES += sqlite +BITCOIN_CONF_OPTS += \ + --enable-wallet \ + --with-sqlite +else +BITCOIN_CONF_OPTS += \ + --disable-wallet \ + --without-sqlite +endif + ifeq ($(BR2_PACKAGE_LIBMINIUPNPC),y) BITCOIN_DEPENDENCIES += libminiupnpc BITCOIN_CONF_OPTS += --with-miniupnpc From 456b9b3fd7f7c17fe76133a06f8724da3ec891de Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Fri, 15 Mar 2024 22:05:01 +0100 Subject: [PATCH 5433/5754] support/testing: add bitcoin runtime test Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle (cherry picked from commit bc76d786a40548333be5cb9c0833e458498c06dd) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + support/testing/tests/package/test_bitcoin.py | 184 ++++++++++++++++++ 2 files changed, 185 insertions(+) create mode 100644 support/testing/tests/package/test_bitcoin.py diff --git a/DEVELOPERS b/DEVELOPERS index f01874ab10..f6fc301373 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1770,6 +1770,7 @@ F: support/testing/tests/package/test_acpica.py F: support/testing/tests/package/test_acpica/ F: support/testing/tests/package/test_apache.py F: support/testing/tests/package/test_bc.py +F: support/testing/tests/package/test_bitcoin.py 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 diff --git a/support/testing/tests/package/test_bitcoin.py b/support/testing/tests/package/test_bitcoin.py new file mode 100644 index 0000000000..93aa9383ab --- /dev/null +++ b/support/testing/tests/package/test_bitcoin.py @@ -0,0 +1,184 @@ +import os +import time + +import infra.basetest + + +class TestBitcoin(infra.basetest.BRTest): + # infra.basetest.BASIC_TOOLCHAIN_CONFIG cannot be used as it does + # not include BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS + # needed by bitcoin. This config also uses an ext4 rootfs as + # bitcoind needs some free disk space to start (so we avoid having + # a larger initrd in RAM). + 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.81" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" + BR2_PACKAGE_BITCOIN=y + BR2_PACKAGE_BITCOIN_WALLET=y + BR2_TARGET_ROOTFS_EXT2=y + BR2_TARGET_ROOTFS_EXT2_4=y + BR2_TARGET_ROOTFS_EXT2_SIZE="256M" + # BR2_TARGET_ROOTFS_TAR is not set + """ + # Command prefix for the bitcoin command line interface. + cli_cmd = "bitcoin-cli -regtest" + + def create_btc_wallet(self, wallet_name): + """Create an empty wallet.""" + cmd = f"{self.cli_cmd} -named createwallet wallet_name={wallet_name}" + self.assertRunOk(cmd) + + def gen_btc_address(self, wallet_name): + """Generate an address in a wallet.""" + cmd = f"{self.cli_cmd} -rpcwallet={wallet_name} getnewaddress" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + return out[0] + + def init_wallet(self, wallet_name): + """Create a wallet and generate an address in it.""" + self.create_btc_wallet(wallet_name) + return self.gen_btc_address(wallet_name) + + def get_wallet_balance(self, wallet): + """Return the (confirmed) balance of a wallet.""" + cmd = f"{self.cli_cmd} -rpcwallet={wallet} getbalance" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + return float(out[0]) + + def get_wallet_unconfirmed_balance(self, wallet): + """Return the unconfirmed balance of a wallet.""" + cmd = f"{self.cli_cmd} -rpcwallet={wallet} getunconfirmedbalance" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + return float(out[0]) + + def get_block_count(self): + """Returns the height of the most-work fully-validated chain.""" + cmd = f"{self.cli_cmd} getblockcount" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + return int(out[0]) + + def test_run(self): + drive = os.path.join(self.builddir, "images", "rootfs.ext4") + kern = os.path.join(self.builddir, "images", "Image") + self.emulator.boot(arch="aarch64", + kernel=kern, + kernel_cmdline=["root=/dev/vda console=ttyAMA0"], + options=["-M", "virt", + "-cpu", "cortex-a53", + "-m", "256M", + "-drive", f"file={drive},if=virtio,format=raw"]) + self.emulator.login() + + # Values for the test. + wallet1 = "AliceWallet" + wallet2 = "BobWallet" + btc_test_amount = 10 + btc_fee = 0.00001 + req_blk_count = 101 + + # Check the binary can execute. + self.assertRunOk("bitcoind --version") + + # This cleanup is useful when run-test -k is used. It makes + # this test idempotent. Since the drive storage is preserved + # between reboots, this cleanup will make sure the test always + # starts from a clean state. + cmd = "rm -rf ~/.bitcoin" + self.assertRunOk(cmd) + + # The bitcoin daemon is not started. A client ping is expected + # to fail. + ping_cmd = f"{self.cli_cmd} ping" + _, ret = self.emulator.run(ping_cmd) + self.assertNotEqual(ret, 0) + + # Start the daemon. + cmd = f"bitcoind -regtest -daemonwait -fallbackfee={btc_fee:f}" + self.assertRunOk(cmd) + + time.sleep(2 * self.timeout_multiplier) + + # Now the daemon is started, the ping is expected to succeed. + self.assertRunOk(ping_cmd) + + # We create two wallets and addresses. + btc_addr1 = self.init_wallet(wallet1) + btc_addr2 = self.init_wallet(wallet2) + + # Since the regression test block chain is at its genesis + # block, we expect a height of zero. + cur_blk_cnt = self.get_block_count() + self.assertEqual(cur_blk_cnt, 0) + + # We also expect our wallets to be empty. + for wallet in [wallet1, wallet2]: + balance = self.get_wallet_balance(wallet) + self.assertAlmostEqual(balance, 0.0) + + # We request the generation of several blocks for address + # #1. We should receive the 50 BTC reward at this address. + cmd = self.cli_cmd + cmd += f" generatetoaddress {req_blk_count} {btc_addr1}" + self.assertRunOk(cmd) + + # We should now see the previously created blocks. + cur_blk_cnt = self.get_block_count() + self.assertEqual(cur_blk_cnt, req_blk_count) + + # We should also see the 50 BTC reward in the wallet #1. + balance = self.get_wallet_balance(wallet1) + self.assertAlmostEqual(balance, 50.0) + + # The wallet #2 should still be empty. + balance = self.get_wallet_balance(wallet2) + self.assertAlmostEqual(balance, 0.0) + + # We send an amount from wallet #1 to #2. + cmd = f"{self.cli_cmd} -rpcwallet={wallet1}" + cmd += f" sendtoaddress {btc_addr2} {btc_test_amount}" + self.assertRunOk(cmd) + + # The wallet #1 balance is expected to be subtracted by the + # spent amount and the transaction fees. + expected_balance = 50 - btc_test_amount - btc_fee + balance = self.get_wallet_balance(wallet1) + self.assertAlmostEqual(balance, expected_balance, places=4) + + # The transaction is sent, but not confirmed yet. So we should + # still see a (confirmed) balance of zero. + balance = self.get_wallet_balance(wallet2) + self.assertAlmostEqual(balance, 0.0) + + # We should see the transferred amount in the unconfirmed + # balance. + balance = self.get_wallet_unconfirmed_balance(wallet2) + self.assertAlmostEqual(balance, btc_test_amount) + + # We generate 1 block to address #2. This action will confirm + # the previous transaction (but this will not give the 50 BTC + # reward). + cmd = f"{self.cli_cmd} generatetoaddress 1 {btc_addr2}" + self.assertRunOk(cmd) + + # We should see one more block. + cur_blk_cnt = self.get_block_count() + self.assertEqual(cur_blk_cnt, req_blk_count + 1) + + # We should now see the amount in the confirmed balance. + balance = self.get_wallet_balance(wallet2) + self.assertAlmostEqual(balance, btc_test_amount) + + # The unconfirmed balance should now be zero. + balance = self.get_wallet_unconfirmed_balance(wallet2) + self.assertAlmostEqual(balance, 0.0) From d6b70f009a87ca539de0bfa1ce42f0da122bc06b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 16 Mar 2024 09:43:32 +0100 Subject: [PATCH 5434/5754] package/busybox: remove tc from default config Busybox tc fails to build with kernel >= 6.8 For details see https://bugs.busybox.net/show_bug.cgi?id=15934 In addition, tc is a very rarely used tool, so not something that you expect to be available in busybox by default. Therefore, remove it from the default config. Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (cherry picked from commit 44c221c856a473179daeb9e49bcb89af2b1b1405) Signed-off-by: Peter Korsgaard --- package/busybox/busybox-minimal.config | 3 +-- package/busybox/busybox.config | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/package/busybox/busybox-minimal.config b/package/busybox/busybox-minimal.config index 1e7ad1d357..5d2a30806a 100644 --- a/package/busybox/busybox-minimal.config +++ b/package/busybox/busybox-minimal.config @@ -955,8 +955,7 @@ CONFIG_PING=y CONFIG_ROUTE=y # CONFIG_SLATTACH is not set # CONFIG_SSL_CLIENT is not set -CONFIG_TC=y -CONFIG_FEATURE_TC_INGRESS=y +# CONFIG_TC is not set # CONFIG_TCPSVD is not set # CONFIG_UDPSVD is not set CONFIG_TELNET=y diff --git a/package/busybox/busybox.config b/package/busybox/busybox.config index 6e8bd2799d..cfd16172fa 100644 --- a/package/busybox/busybox.config +++ b/package/busybox/busybox.config @@ -968,8 +968,7 @@ CONFIG_FEATURE_FANCY_PING=y CONFIG_ROUTE=y # CONFIG_SLATTACH is not set # CONFIG_SSL_CLIENT is not set -CONFIG_TC=y -CONFIG_FEATURE_TC_INGRESS=y +# CONFIG_TC is not set # CONFIG_TCPSVD is not set # CONFIG_UDPSVD is not set CONFIG_TELNET=y From 2c465da71f599281a076fc29a591561b4b100f56 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 24 Mar 2024 18:28:55 +0100 Subject: [PATCH 5435/5754] package/giflib: bump to version 5.2.2 - Refresh first and fourth patches - Drop second nad third patches (already in version) https://sourceforge.net/p/giflib/code/ci/5.2.2/tree/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (cherry picked from commit f98239dada59270efe19de9d9fae50ec9ab9d28c) Signed-off-by: Peter Korsgaard --- .checkpackageignore | 1 - ...dd-targets-to-manage-static-building.patch | 44 ++++++------- package/giflib/0002-Fix-CVE-2022-28506.patch | 34 ----------- ...veral-defects-found-by-Coverity-scan.patch | 59 ++++++++++++++++++ package/giflib/0003-Fix-CVE-2023-39742.patch | 36 ----------- ...veral-defects-found-by-Coverity-scan.patch | 61 ------------------- package/giflib/giflib.hash | 5 +- package/giflib/giflib.mk | 7 +-- 8 files changed, 86 insertions(+), 161 deletions(-) delete mode 100644 package/giflib/0002-Fix-CVE-2022-28506.patch create mode 100644 package/giflib/0002-Fix-several-defects-found-by-Coverity-scan.patch delete mode 100644 package/giflib/0003-Fix-CVE-2023-39742.patch delete mode 100644 package/giflib/0004-Fix-several-defects-found-by-Coverity-scan.patch diff --git a/.checkpackageignore b/.checkpackageignore index aa1679f509..e678d64498 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -462,7 +462,6 @@ package/genromfs/0001-build-system.patch Sob Upstream package/gensio/0001-Fix-missing-EVP_PKEY_ED25519-build-error-on-libressl.patch Upstream package/gerbera/S99gerbera Indent 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/glog/0001-added-emscripten-support.patch Upstream package/glorytun/0001-Add-support-for-Apple-silicon.patch Upstream diff --git a/package/giflib/0001-Makefile-add-targets-to-manage-static-building.patch b/package/giflib/0001-Makefile-add-targets-to-manage-static-building.patch index 384457d0bd..ba8d426bea 100644 --- a/package/giflib/0001-Makefile-add-targets-to-manage-static-building.patch +++ b/package/giflib/0001-Makefile-add-targets-to-manage-static-building.patch @@ -8,8 +8,7 @@ targets to allow the user to build giflib when dynamic library support is not available or enable on the toolchain Signed-off-by: Fabrice Fontaine -[Upstream status: -https://sourceforge.net/p/giflib/code/merge-requests/7] +Upstream: https://sourceforge.net/p/giflib/code/merge-requests/7 --- Makefile | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) @@ -18,16 +17,19 @@ diff --git a/Makefile b/Makefile index b2bf6de..111f52f 100644 --- a/Makefile +++ b/Makefile -@@ -61,10 +61,17 @@ UTILS = $(INSTALLABLE) \ +@@ -91,13 +91,20 @@ LIBUTILSO = libutil.$(SOEXTENSION) + LIBUTILSOMAJOR = libutil.$(LIBMAJOR).$(SOEXTENSION) + endif - LDLIBS=libgif.a -lm - --all: libgif.so libgif.a libutil.so libutil.a $(UTILS) -+SHARED_LIBS = libgif.so libutil.so +-all: $(LIBGIFSO) libgif.a $(LIBUTILSO) libutil.a $(UTILS) ++SHARED_LIBS = $(LIBGIFSO) $(LIBUTILSO) +STATIC_LIBS = libgif.a libutil.a + +all: shared-lib static-lib $(UTILS) + ifeq ($(UNAME), Darwin) + else $(MAKE) -C doc + endif -$(UTILS):: libgif.a libutil.a +$(UTILS):: $(STATIC_LIBS) @@ -36,18 +38,18 @@ index b2bf6de..111f52f 100644 + +static-lib: $(STATIC_LIBS) - libgif.so: $(OBJECTS) $(HEADERS) - $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname -Wl,libgif.so.$(LIBMAJOR) -o libgif.so $(OBJECTS) -@@ -79,7 +86,7 @@ libutil.a: $(UOBJECTS) $(UHEADERS) + $(LIBGIFSO): $(OBJECTS) $(HEADERS) + ifeq ($(UNAME), Darwin) +@@ -120,7 +127,7 @@ libutil.a: $(UOBJECTS) $(UHEADERS) $(AR) rcs libutil.a $(UOBJECTS) clean: -- rm -f $(UTILS) $(TARGET) libgetarg.a libgif.a libgif.so libutil.a libutil.so *.o +- rm -f $(UTILS) $(TARGET) libgetarg.a libgif.a $(LIBGIFSO) libutil.a $(LIBUTILSO) *.o + rm -f $(UTILS) $(TARGET) libgetarg.a $(SHARED_LIBS) $(STATIC_LIBS) *.o - rm -f libgif.so.$(LIBMAJOR).$(LIBMINOR).$(LIBPOINT) - rm -f libgif.so.$(LIBMAJOR) - rm -fr doc/*.1 *.html doc/staging -@@ -96,12 +103,15 @@ install-bin: $(INSTALLABLE) + rm -f $(LIBGIFSOVER) + rm -f $(LIBGIFSOMAJOR) + rm -fr doc/*.[17] *.html doc/staging +@@ -145,12 +152,15 @@ install-bin: $(INSTALLABLE) install-include: $(INSTALL) -d "$(DESTDIR)$(INCDIR)" $(INSTALL) -m 644 gif_lib.h "$(DESTDIR)$(INCDIR)" @@ -57,13 +59,13 @@ index b2bf6de..111f52f 100644 $(INSTALL) -m 644 libgif.a "$(DESTDIR)$(LIBDIR)/libgif.a" +install-shared-lib: + $(INSTALL) -d "$(DESTDIR)$(LIBDIR)" - $(INSTALL) -m 755 libgif.so "$(DESTDIR)$(LIBDIR)/libgif.so.$(LIBVER)" - ln -sf libgif.so.$(LIBVER) "$(DESTDIR)$(LIBDIR)/libgif.so.$(LIBMAJOR)" - ln -sf libgif.so.$(LIBMAJOR) "$(DESTDIR)$(LIBDIR)/libgif.so" + $(INSTALL) -m 755 $(LIBGIFSO) "$(DESTDIR)$(LIBDIR)/$(LIBGIFSOVER)" + ln -sf $(LIBGIFSOVER) "$(DESTDIR)$(LIBDIR)/$(LIBGIFSOMAJOR)" + ln -sf $(LIBGIFSOMAJOR) "$(DESTDIR)$(LIBDIR)/$(LIBGIFSO)" +install-lib: install-static-lib install-shared-lib install-man: - $(INSTALL) -d "$(DESTDIR)$(MANDIR)/man1" - $(INSTALL) -m 644 doc/*.1 "$(DESTDIR)$(MANDIR)/man1" + $(INSTALL) -d "$(DESTDIR)$(MANDIR)/man1" "$(DESTDIR)$(MANDIR)/man7" + $(INSTALL) -m 644 $(MANUAL_PAGES_1:xml=1) "$(DESTDIR)$(MANDIR)/man1" -- -2.20.1 +2.43.0 diff --git a/package/giflib/0002-Fix-CVE-2022-28506.patch b/package/giflib/0002-Fix-CVE-2022-28506.patch deleted file mode 100644 index 35d5f60a95..0000000000 --- a/package/giflib/0002-Fix-CVE-2022-28506.patch +++ /dev/null @@ -1,34 +0,0 @@ -From c0cca041fc4fb6748d8dff3675fe7a839253d668 Mon Sep 17 00:00:00 2001 -From: Sandro Mani -Date: Tue, 5 Dec 2023 16:24:32 -0700 -Subject: [PATCH] Fix CVE-2022-28506 - -From: giflib-5.2.1-17.fc39.src.rpm -Fixes https://nvd.nist.gov/vuln/detail/CVE-2022-28506 -Upstream: https://sourceforge.net/p/giflib/bugs/159/ - -Signed-off-by: Sandro Mani -Signed-off-by: Adam Duskett ---- - gif2rgb.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/gif2rgb.c b/gif2rgb.c -index 8d7c0ff..d9a469f 100644 ---- a/gif2rgb.c -+++ b/gif2rgb.c -@@ -294,6 +294,11 @@ static void DumpScreen2RGB(char *FileName, int OneFileFlag, - GifRow = ScreenBuffer[i]; - GifQprintf("\b\b\b\b%-4d", ScreenHeight - i); - for (j = 0, BufferP = Buffer; j < ScreenWidth; j++) { -+ /* Check if color is within color palete */ -+ if (GifRow[j] >= ColorMap->ColorCount) -+ { -+ GIF_EXIT(GifErrorString(D_GIF_ERR_IMAGE_DEFECT)); -+ } - ColorMapEntry = &ColorMap->Colors[GifRow[j]]; - *BufferP++ = ColorMapEntry->Red; - *BufferP++ = ColorMapEntry->Green; --- -2.43.0 - diff --git a/package/giflib/0002-Fix-several-defects-found-by-Coverity-scan.patch b/package/giflib/0002-Fix-several-defects-found-by-Coverity-scan.patch new file mode 100644 index 0000000000..f6816d0753 --- /dev/null +++ b/package/giflib/0002-Fix-several-defects-found-by-Coverity-scan.patch @@ -0,0 +1,59 @@ +From a1c48b91cd1cf1e9bf7077709b69f4bfd4c4abc7 Mon Sep 17 00:00:00 2001 +From: Sandro Mani +Date: Tue, 5 Dec 2023 16:38:48 -0700 +Subject: [PATCH] Fix several defects found by Coverity scan + +From: giflib-5.2.1-17.fc39.src.rpm +Upstream: Not submitted + +Signed-off-by: Sandro Mani +Signed-off-by: Adam Duskett +[Fabrice: updated for 5.2.2] +Signed-off-by: Fabrice Fontaine +--- + gif2rgb.c | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git a/gif2rgb.c b/gif2rgb.c +index d9a469f..02cea41 100644 +--- a/gif2rgb.c ++++ b/gif2rgb.c +@@ -170,6 +170,8 @@ static void SaveGif(GifByteType *OutputBuffer, + /* Open stdout for the output file: */ + if ((GifFile = EGifOpenFileHandle(1, &Error)) == NULL) { + PrintGifError(Error); ++ free(OutputBuffer); ++ GifFreeMapObject(OutputColorMap); + exit(EXIT_FAILURE); + } + +@@ -179,6 +181,8 @@ static void SaveGif(GifByteType *OutputBuffer, + EGifPutImageDesc(GifFile, 0, 0, Width, Height, false, NULL) == + GIF_ERROR) { + PrintGifError(Error); ++ free(OutputBuffer); ++ GifFreeMapObject(OutputColorMap); + exit(EXIT_FAILURE); + } + +@@ -187,6 +191,8 @@ static void SaveGif(GifByteType *OutputBuffer, + + for (i = 0; i < Height; i++) { + if (EGifPutLine(GifFile, Ptr, Width) == GIF_ERROR) { ++ free(OutputBuffer); ++ GifFreeMapObject(OutputColorMap); + exit(EXIT_FAILURE); + } + GifQprintf("\b\b\b\b%-4d", Height - i - 1); +@@ -196,6 +203,8 @@ static void SaveGif(GifByteType *OutputBuffer, + + if (EGifCloseFile(GifFile, &Error) == GIF_ERROR) { + PrintGifError(Error); ++ free(OutputBuffer); ++ GifFreeMapObject(OutputColorMap); + exit(EXIT_FAILURE); + } + } +-- +2.43.0 + diff --git a/package/giflib/0003-Fix-CVE-2023-39742.patch b/package/giflib/0003-Fix-CVE-2023-39742.patch deleted file mode 100644 index 2ba01ac8a4..0000000000 --- a/package/giflib/0003-Fix-CVE-2023-39742.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 4288b993ee9df6550a367fe06ede3c003dc7bbc6 Mon Sep 17 00:00:00 2001 -From: Sandro Mani -Date: Tue, 5 Dec 2023 16:35:40 -0700 -Subject: [PATCH] Fix CVE-2023-39742 - -From: giflib-5.2.1-17.fc39.src.rpm -Fix segmentation faults due to non correct checking for args -Fixes: https://nvd.nist.gov/vuln/detail/CVE-2023-39742 -Upstream: https://sourceforge.net/p/giflib/bugs/166/ - -Signed-off-by: Sandro Mani -Signed-off-by: Adam Duskett ---- - getarg.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/getarg.c b/getarg.c -index d569f6c..51fbe0b 100644 ---- a/getarg.c -+++ b/getarg.c -@@ -307,6 +307,12 @@ GAGetParmeters(void *Parameters[], - int i = 0, ScanRes; - - while (!(ISSPACE(CtrlStrCopy[i]))) { -+ -+ if ((*argv) == argv_end) { -+ GAErrorToken = Option; -+ return CMD_ERR_NumRead; -+ } -+ - switch (CtrlStrCopy[i + 1]) { - case 'd': /* Get signed integers. */ - ScanRes = sscanf(*((*argv)++), "%d", --- -2.43.0 - diff --git a/package/giflib/0004-Fix-several-defects-found-by-Coverity-scan.patch b/package/giflib/0004-Fix-several-defects-found-by-Coverity-scan.patch deleted file mode 100644 index 1719769872..0000000000 --- a/package/giflib/0004-Fix-several-defects-found-by-Coverity-scan.patch +++ /dev/null @@ -1,61 +0,0 @@ -From a1c48b91cd1cf1e9bf7077709b69f4bfd4c4abc7 Mon Sep 17 00:00:00 2001 -From: Sandro Mani -Date: Tue, 5 Dec 2023 16:38:48 -0700 -Subject: [PATCH] Fix several defects found by Coverity scan - -From: giflib-5.2.1-17.fc39.src.rpm -Upstream: Not submitted - -Signed-off-by: Sandro Mani -Signed-off-by: Adam Duskett ---- - gif2rgb.c | 11 ++++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) - -diff --git a/gif2rgb.c b/gif2rgb.c -index d9a469f..02cea41 100644 ---- a/gif2rgb.c -+++ b/gif2rgb.c -@@ -170,6 +170,8 @@ static void SaveGif(GifByteType *OutputBuffer, - /* Open stdout for the output file: */ - if ((GifFile = EGifOpenFileHandle(1, &Error)) == NULL) { - PrintGifError(Error); -+ free(OutputBuffer); -+ GifFreeMapObject(OutputColorMap); - exit(EXIT_FAILURE); - } - -@@ -179,6 +181,8 @@ static void SaveGif(GifByteType *OutputBuffer, - EGifPutImageDesc(GifFile, - 0, 0, Width, Height, false, NULL) == GIF_ERROR) { - PrintGifError(Error); -+ free(OutputBuffer); -+ GifFreeMapObject(OutputColorMap); - exit(EXIT_FAILURE); - } - -@@ -187,8 +191,11 @@ static void SaveGif(GifByteType *OutputBuffer, - GifFile->Image.Width, GifFile->Image.Height); - - for (i = 0; i < Height; i++) { -- if (EGifPutLine(GifFile, Ptr, Width) == GIF_ERROR) -+ if (EGifPutLine(GifFile, Ptr, Width) == GIF_ERROR) { -+ free(OutputBuffer); -+ GifFreeMapObject(OutputColorMap); - exit(EXIT_FAILURE); -+ } - GifQprintf("\b\b\b\b%-4d", Height - i - 1); - - Ptr += Width; -@@ -196,6 +203,8 @@ static void SaveGif(GifByteType *OutputBuffer, - - if (EGifCloseFile(GifFile, &Error) == GIF_ERROR) { - PrintGifError(Error); -+ free(OutputBuffer); -+ GifFreeMapObject(OutputColorMap); - exit(EXIT_FAILURE); - } - } --- -2.43.0 - diff --git a/package/giflib/giflib.hash b/package/giflib/giflib.hash index 445e9c4b3d..f11d4f1505 100644 --- a/package/giflib/giflib.hash +++ b/package/giflib/giflib.hash @@ -1,5 +1,6 @@ # From http://sourceforge.net/projects/giflib/files -md5 6f03aee4ebe54ac2cc1ab3e4b0a049e5 giflib-5.2.1.tar.gz -sha1 c3f774dcbdf26afded7788979c8081d33c6426dc giflib-5.2.1.tar.gz +md5 913dd251492134e235ee3c9a91987a4d giflib-5.2.2.tar.gz +sha1 608ba98d2dd8d03dfa7476f434d57de50a33e10b giflib-5.2.2.tar.gz # Locally computed +sha256 be7ffbd057cadebe2aa144542fd90c6838c6a083b5e8a9048b8ee3b66b29d5fb giflib-5.2.2.tar.gz sha256 0c9b7990ecdca88b676db232c226548ac408b279f550d424d996f0d83591dd8e COPYING diff --git a/package/giflib/giflib.mk b/package/giflib/giflib.mk index 3ac74f9244..770338507b 100644 --- a/package/giflib/giflib.mk +++ b/package/giflib/giflib.mk @@ -4,18 +4,13 @@ # ################################################################################ -GIFLIB_VERSION = 5.2.1 +GIFLIB_VERSION = 5.2.2 GIFLIB_SITE = http://downloads.sourceforge.net/project/giflib GIFLIB_INSTALL_STAGING = YES GIFLIB_LICENSE = MIT GIFLIB_LICENSE_FILES = COPYING GIFLIB_CPE_ID_VALID = YES -# 0002-Fix-CVE-2022-28506.patch -GIFLIB_IGNORE_CVES = CVE-2022-28506 -# 0003-Fix-CVE-2023-39742.patch -GIFLIB_IGNORE_CVES += CVE-2023-39742 - ifeq ($(BR2_STATIC_LIBS),y) GIFLIB_BUILD_LIBS = static-lib GIFLIB_INSTALL_LIBS = install-static-lib From 800ae4d99149f2ba90d0c96382a88211c0481ccb Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 25 Mar 2024 09:41:51 +0100 Subject: [PATCH 5436/5754] package/openssh: drop autoreconf Commit 9496ff57e54c (package/openssh: bump to version 9.7p1) dropped 0001-better-detection-of-broken-fzero-call-used-regs.patch but forgot to drop the autoreconf. Do that now. Signed-off-by: Peter Korsgaard (cherry picked from commit 7a480207fda5ebfba0b4138f491975880ed773cc) Signed-off-by: Peter Korsgaard --- package/openssh/openssh.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk index ce55253120..f0b499590a 100644 --- a/package/openssh/openssh.mk +++ b/package/openssh/openssh.mk @@ -13,9 +13,6 @@ OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable OPENSSH_LICENSE = BSD-3-Clause, BSD-2-Clause, Public Domain OPENSSH_LICENSE_FILES = LICENCE -# 0001-better-detection-of-broken-fzero-call-used-regs.patch -OPENSSH_AUTORECONF = YES - OPENSSH_CONF_ENV = \ LD="$(TARGET_CC)" \ LDFLAGS="$(TARGET_CFLAGS)" \ From 39466535d0ff49948557430ade1439130d147d65 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 25 Mar 2024 13:23:14 +0100 Subject: [PATCH 5437/5754] package/xvisor: use BR2_PYTHON3_HOST_DEPENDENCY to ensure python3 is available Commit 24e996d14d28d (package/xvisor: fix build without python interpreter) added a dependency on host-python3 for the d2c.py script, but this script does not use any non-standard python modules so we can instead use BR2_PYTHON3_HOST_DEPENDENCY to only build host-python3 if the build host does not have python3. Signed-off-by: Peter Korsgaard (cherry picked from commit 7f08dc612c2a52a297c50bc047d5fabd7ef7317c) Signed-off-by: Peter Korsgaard --- package/xvisor/xvisor.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/xvisor/xvisor.mk b/package/xvisor/xvisor.mk index 2a51706b55..c1b61270f1 100644 --- a/package/xvisor/xvisor.mk +++ b/package/xvisor/xvisor.mk @@ -11,7 +11,7 @@ XVISOR_LICENSE = GPL-2.0+ XVISOR_LICENSE_FILES = COPYING XVISOR_INSTALL_IMAGES = YES XVISOR_INSTALL_TARGET = NO -XVISOR_DEPENDENCIES = host-bison host-dtc host-flex host-python3 +XVISOR_DEPENDENCIES = host-bison host-dtc host-flex $(BR2_PYTHON3_HOST_DEPENDENCY) XVISOR_MAKE_TARGETS = all From 9a3d34139b018bf79ac1c37b0212b5b775e3ae77 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 26 Mar 2024 10:25:25 +0100 Subject: [PATCH 5438/5754] Update for 2024.02.1 Signed-off-by: Peter Korsgaard --- CHANGES | 33 +++++++++++++++++++++++++++++++++ Makefile | 4 ++-- support/misc/Vagrantfile | 2 +- 3 files changed, 36 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index 8f0b4042fa..9643d52423 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,36 @@ +2024.02.1, released March 26th, 2024 + + Important / security related fixes. + + Toolchain: Dropped old Codesourcery ARM / AARCH64 and + Codescape MIPS external toolchains as they use old Glibc + versions not compatible with 64-bit time_t + + Defconfigs: Starfive visionfive2: Use correct genimage + configuration. TI am62x_sk / am64_sk: Use correct optee-os + platform setting and use a fixed ti-k3-r5-loader version. + + Infrastructure: Use git to fetch CVE data from the FKIE + repository to work around an issue with missing meta files in + the releases. + + Updated/fixed packages: axel, bash, bitcoin, botan, busybox, + containerd, cryptsetup, cvs, docker-compose, docker-engine, + ell, expat, giflib, gmp, go, harfbuzz, intel-gmmlib, + intel-mediadriver, iwd, kodi, kodi-pvr-hts, libcgroup, libdrm, + libgit2, libkrb5, libnfs, libunwind, libvpl, + libtorrent-rasterbar, libxml2, linux, mariadb, mesa3d, + mmc-utils, msmtp, multipath-tools, neon, onevpl-intel-gpu, + openssh, openvpn, osm2pgsql, owfs, php, poco, policycoreutils, + postgis, privoxy, pulseaudio, pure-ftpd, putty, + python-configshell-fb, python-rtslib-fb, rauc, restorecond, + spice, squid, targetcli-fb, tzdata, util-linux, vdr, xmrig, + xvisor, zic + + Issues resolved (http://bugs.uclibc.org): + + #15997: Build Squid with GCC12.3 in Buildroot 2024.02 will fail + 2024.02, released March 5th, 2024 Various fixes. diff --git a/Makefile b/Makefile index 6d5e9a7972..a9d54aa28b 100644 --- a/Makefile +++ b/Makefile @@ -90,9 +90,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2024.02 +export BR2_VERSION := 2024.02.1 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1709640000 +BR2_VERSION_EPOCH = 1711445000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile index 73bdcc8b5e..cb7a81af6e 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2024.02' +RELEASE='2024.02.1' ### Change here for more memory/cores ### VM_MEMORY=2048 From 70c699ec7f8fc2e05083ce44a95b2b09bc2af9e9 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Wed, 6 Mar 2024 17:51:05 -0800 Subject: [PATCH 5439/5754] package/go-bootstrap-stage2: bump version to go1.19.13 Update to the latest 1.19.x version available. Signed-off-by: Christian Stewart Signed-off-by: Arnout Vandecappelle (cherry picked from commit e999c9fbaec0ab3f31fb3058b3f6e37c4cad9abe) Signed-off-by: Peter Korsgaard --- package/go-bootstrap-stage2/go-bootstrap-stage2.hash | 2 +- package/go-bootstrap-stage2/go-bootstrap-stage2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/go-bootstrap-stage2/go-bootstrap-stage2.hash b/package/go-bootstrap-stage2/go-bootstrap-stage2.hash index 6d4c718a40..d61663cac9 100644 --- a/package/go-bootstrap-stage2/go-bootstrap-stage2.hash +++ b/package/go-bootstrap-stage2/go-bootstrap-stage2.hash @@ -1,3 +1,3 @@ # From https://go.dev/dl -sha256 e25c9ab72d811142b7f41ff6da5165fec2d1be5feec3ef2c66bc0bdecb431489 go1.19.11.src.tar.gz +sha256 ccf36b53fb0024a017353c3ddb22c1f00bc7a8073c6aac79042da24ee34434d3 go1.19.13.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go-bootstrap-stage2/go-bootstrap-stage2.mk b/package/go-bootstrap-stage2/go-bootstrap-stage2.mk index 72f3200a2e..98bf624b57 100644 --- a/package/go-bootstrap-stage2/go-bootstrap-stage2.mk +++ b/package/go-bootstrap-stage2/go-bootstrap-stage2.mk @@ -6,7 +6,7 @@ # Use last Go version that go-bootstrap-stage1 can build: v1.19.x # See https://golang.org/doc/install/source#bootstrapFromSource -GO_BOOTSTRAP_STAGE2_VERSION = 1.19.11 +GO_BOOTSTRAP_STAGE2_VERSION = 1.19.13 GO_BOOTSTRAP_STAGE2_SITE = https://storage.googleapis.com/golang GO_BOOTSTRAP_STAGE2_SOURCE = go$(GO_BOOTSTRAP_STAGE2_VERSION).src.tar.gz From b14e8aa5ee25133c9fe16188ac20e7fface9f3a0 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 28 Apr 2024 12:51:53 +0200 Subject: [PATCH 5440/5754] package/go: security bump to version 1.21.9 go1.21.9 (released 2024-04-03) includes a security fix to the net/http package, as well as bug fixes to the linker, and the go/types and net/http packages. 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 b1aed10c7c..0c6a8f230e 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://go.dev/dl -sha256 dc806cf75a87e1414b5b4c3dcb9dd3e9cc98f4cfccec42b7af617d5a658a3c43 go1.21.8.src.tar.gz +sha256 58f0c5ced45a0012bce2ff7a9df03e128abcc8818ebabe5027bb92bafe20e421 go1.21.9.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index 3ca055b25d..fdd956e439 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.21.8 +GO_VERSION = 1.21.9 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz From abd0d26e0828bea3387a9a036539791fddc44959 Mon Sep 17 00:00:00 2001 From: Christian Hitz Date: Mon, 25 Mar 2024 22:37:24 +0100 Subject: [PATCH 5441/5754] package/googlefontdirectory: fix command to generate license file hashes In commit ebe5d9edfe8d07eafd7b61c4f77ce509bb98a0ad ("boot, package, support, toolchain: switch to 2 spaces for the hash file"), all hash files were migrated to use 2 spaces as the separator. However, in the googlefontdirectory hash file, a command is present in a comment to indicate how to generate the part of the hash file that provides the list of license file hashes. This command was not updated as part of ebe5d9edfe8d07eafd7b61c4f77ce509bb98a0ad, so it still emits a result in which a single space is used a separator between the hash type (sha256) and the hash value. This commit fixes that by using a 2-space separator. Signed-off-by: Christian Hitz [Thomas: extracted from https://patchwork.ozlabs.org/project/buildroot/patch/20240228145013.411919-2-christian@klarinett.li/ into a separate patch] Signed-off-by: Thomas Petazzoni (cherry picked from commit f139aab6fedfe1d9924fc205c0a61c51351e4972) Signed-off-by: Peter Korsgaard --- package/googlefontdirectory/googlefontdirectory.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/googlefontdirectory/googlefontdirectory.hash b/package/googlefontdirectory/googlefontdirectory.hash index 10f3bf60b1..a92015f509 100644 --- a/package/googlefontdirectory/googlefontdirectory.hash +++ b/package/googlefontdirectory/googlefontdirectory.hash @@ -1,7 +1,7 @@ # Locally calculated sha256 ec2ddbeee673cce1b0796e3b20fbff5fd836ce9ba6d88deed8b59154fa255f06 googlefontdirectory-94dff3eaa9301b6640cccc63c56d6ff33d82882c.tar.gz # Locally calculated with -# for i in $(find apache/ ofl/ ufl/ -name 'LICENSE.txt' -o -name 'OFL.txt' -o -name 'LICENCE.txt') ; do printf "sha256 %s\n" "$(sha256sum $i)" ; done +# for i in $(find apache/ ofl/ ufl/ -name 'LICENSE.txt' -o -name 'OFL.txt' -o -name 'LICENCE.txt') ; do printf "sha256 %s\n" "$(sha256sum $i)" ; done sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/robotocondensed/LICENSE.txt sha256 3ddf9be5c28fe27dad143a5dc76eea25222ad1dd68934a047064e56ed2fa40c5 apache/opensanscondensed/LICENSE.txt sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/walterturncoat/LICENSE.txt From d7b3791382144180b73b58c9f4cd5c24bd767ccd Mon Sep 17 00:00:00 2001 From: Christian Hitz Date: Mon, 25 Mar 2024 22:42:06 +0100 Subject: [PATCH 5442/5754] package/googlefontdirectory: sort license file hashes The current command listed in the hash file to generate the list of license files hashes does not sort files. Due to this, depending on who runs the command, the result can potentially be different. In order to address this, this commit changes the command to sort license files, and updates the hash file accordingly. Signed-off-by: Christian Hitz [Thomas: extract from https://patchwork.ozlabs.org/project/buildroot/patch/20240228145013.411919-2-christian@klarinett.li/ into a separate patch] Signed-off-by: Thomas Petazzoni (cherry picked from commit 7b355f5d9801e8d215fba864a33e6bf62623eda0) Signed-off-by: Peter Korsgaard --- .../googlefontdirectory.hash | 1860 ++++++++--------- 1 file changed, 930 insertions(+), 930 deletions(-) diff --git a/package/googlefontdirectory/googlefontdirectory.hash b/package/googlefontdirectory/googlefontdirectory.hash index a92015f509..320647c43e 100644 --- a/package/googlefontdirectory/googlefontdirectory.hash +++ b/package/googlefontdirectory/googlefontdirectory.hash @@ -1,994 +1,994 @@ # Locally calculated sha256 ec2ddbeee673cce1b0796e3b20fbff5fd836ce9ba6d88deed8b59154fa255f06 googlefontdirectory-94dff3eaa9301b6640cccc63c56d6ff33d82882c.tar.gz # Locally calculated with -# for i in $(find apache/ ofl/ ufl/ -name 'LICENSE.txt' -o -name 'OFL.txt' -o -name 'LICENCE.txt') ; do printf "sha256 %s\n" "$(sha256sum $i)" ; done -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/robotocondensed/LICENSE.txt -sha256 3ddf9be5c28fe27dad143a5dc76eea25222ad1dd68934a047064e56ed2fa40c5 apache/opensanscondensed/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/walterturncoat/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/fontdinerswanky/LICENSE.txt +# for i in $(find apache/ ofl/ ufl/ -name 'LICENSE.txt' -o -name 'OFL.txt' -o -name 'LICENCE.txt' | sort) ; do printf "sha256 %s\n" "$(sha256sum $i)" ; done sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/aclonica/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/sunshiney/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/ultra/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/unkempt/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/slackey/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/satisfy/LICENSE.txt -sha256 3ddf9be5c28fe27dad143a5dc76eea25222ad1dd68934a047064e56ed2fa40c5 apache/opensans/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/montez/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/kranky/LICENSE.txt sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/arimo/LICENSE.txt -sha256 3ddf9be5c28fe27dad143a5dc76eea25222ad1dd68934a047064e56ed2fa40c5 apache/opensanshebrew/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/tinos/LICENSE.txt -sha256 3ddf9be5c28fe27dad143a5dc76eea25222ad1dd68934a047064e56ed2fa40c5 apache/opensanshebrewcondensed/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/justanotherhand/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/robotoslab/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/homemadeapple/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/calligraffitti/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/cherrycreamsoda/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/chewy/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/comingsoon/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/cousine/LICENSE.txt sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/craftygirls/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/creepstercaps/LICENSE.txt sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/crushed/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/robotomono/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/fontdinerswanky/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/homemadeapple/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/irishgrover/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/justanotherhand/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/kranky/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/luckiestguy/LICENSE.txt sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/maidenorange/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/roboto/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/rochester/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/rocksalt/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/creepstercaps/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/nokora/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/montez/LICENSE.txt sha256 3ddf9be5c28fe27dad143a5dc76eea25222ad1dd68934a047064e56ed2fa40c5 apache/mountainsofchristmas/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/cousine/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/syncopate/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/specialelite/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/luckiestguy/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/nokora/LICENSE.txt +sha256 3ddf9be5c28fe27dad143a5dc76eea25222ad1dd68934a047064e56ed2fa40c5 apache/opensanscondensed/LICENSE.txt +sha256 3ddf9be5c28fe27dad143a5dc76eea25222ad1dd68934a047064e56ed2fa40c5 apache/opensanshebrewcondensed/LICENSE.txt +sha256 3ddf9be5c28fe27dad143a5dc76eea25222ad1dd68934a047064e56ed2fa40c5 apache/opensanshebrew/LICENSE.txt +sha256 3ddf9be5c28fe27dad143a5dc76eea25222ad1dd68934a047064e56ed2fa40c5 apache/opensans/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/permanentmarker/LICENSE.txt sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/rancho/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/smokum/LICENSE.txt sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/redressed/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/irishgrover/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/comingsoon/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/cherrycreamsoda/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/robotocondensed/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/roboto/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/robotomono/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/robotoslab/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/rochester/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/rocksalt/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/satisfy/LICENSE.txt sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/schoolbell/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/slackey/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/smokum/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/specialelite/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/sunshiney/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/syncopate/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/tinos/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/ultra/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/unkempt/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/walterturncoat/LICENSE.txt sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/yellowtail/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/calligraffitti/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/permanentmarker/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/chewy/LICENSE.txt -sha256 0fc8e6675568c02aac6b41dd3cccaf2264fc5969601effe68e09b26635879b2c ofl/ranchers/OFL.txt -sha256 ff72e4d89860e64ee38ccf8a5a7e9dc085d5e36115b096a6c7f8bc988e9bec61 ofl/kumarone/OFL.txt -sha256 643c63caf03855ae29be68035d8888e95eadc767a1d92f163d686da1b0a1cd3c ofl/cantarell/OFL.txt +sha256 5e80642a11aff2ead815949a8a929aff3fb7b9b6a24391406068a1b204dcc8ba ofl/abeezee/OFL.txt +sha256 4f4bc3806a1e55789c6ef75ca5fc628297b05292f74966474dc0d40324abc609 ofl/abel/OFL.txt +sha256 fe9183a0b7c1ae626b14004cd533c89ec7c192aba017f81ab71ede910256abb2 ofl/abhayalibre/OFL.txt +sha256 aba8997e16b1e3888c6e855ba883c70d96bd4375bff8cb9c7ce0f097200f74b8 ofl/abrilfatface/OFL.txt +sha256 ed80dd9539708a531313f98fb081aeeaa395ab5726931a433845d667b019c855 ofl/abyssinicasil/OFL.txt +sha256 e5ccbfc32e4d7fae98b467a9af310ac8d2efd5d90e684426cd24f3eb36090a2c ofl/acme/OFL.txt +sha256 c1bcd16ffc9d095822fd6b7fa1a24c7918b24815ed05711421f804293d2efa62 ofl/actor/OFL.txt +sha256 16a8be6ac4b009ba1dd1e17cea48762f4915609ea5dca1303f716cf63998739d ofl/adamina/OFL.txt +sha256 794d72ffdd25e8f7ca8e1d68db088c30ddbf2fdb369b6cc8217d4fa5fa6dc62f ofl/adobeblank/OFL.txt sha256 1d242ab6fbb2dfbba2e7119b00a6328bc59cb2faf7299b844e9b92a2f12c0d8b ofl/adventpro/OFL.txt -sha256 01af2625d6247ecd2430d1d1603c579f85989d43b2d9129e08e0ac0df8909918 ofl/tienne/OFL.txt -sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1 ofl/baloobhaina/OFL.txt -sha256 f3bc8767749fc133d9b35e84ca024b82f1ac4d1b38deca0adcf8300892303022 ofl/faustina/OFL.txt -sha256 69c34ca1873308c667ddde663cbf59c0d1cf14cbb945ad010f71d21264249e24 ofl/aubrey/OFL.txt -sha256 4febcc8d6e539db3e0c652da87bc8704f6d48e71e07f8ddb0974094a3de8da81 ofl/flavors/OFL.txt -sha256 d24ff874133ecd133e55d7c4070d2edab14d3933477c2bccb3a0d8d1cc9c33bf ofl/muktavaani/OFL.txt -sha256 ab5499b975c2dc82f533c6f13c5fca589df4d57c7c400db5f6ca8565ad9c2fd3 ofl/butchermancaps/OFL.txt -sha256 6a28d4d5d8b4d1ea89ace5a047ac6e0de182acdb8bfa22897bf7702102094f69 ofl/shadowsintolighttwo/OFL.txt -sha256 7a1d085067cd589026b256dd85af1eaa1087fa0f3d468192724c5138cc14d894 ofl/copse/OFL.txt -sha256 fd17f80dc48ff767d91d0dd9f821eebfd8b73ee82f55537a9052b6b0107622c8 ofl/voces/OFL.txt -sha256 186d750eb496a4c17a76385f82be6aea2ac1cf2de074a811d63786cf374ea73f ofl/barlowsemicondensed/OFL.txt -sha256 4aa1da66597f4c5cfde67790992ee55926ef6aaa87b9a10d529ab35e8b91070c ofl/asapcondensed/OFL.txt +sha256 520a0c239d39b379b61c4de5f8e3b02db20b0dfc137481843eac01f02c41f4a2 ofl/aguafinascript/OFL.txt +sha256 f15a9a3a9a665c2d17655b8fedad86d9a8f30081d46bb91236beb1bc7294a589 ofl/akronim/OFL.txt +sha256 c39e284759a441660d4c4d852c537e271d0fd5c301fe46d065a972b6ee144ba8 ofl/aksarabaligalang/OFL.txt +sha256 aac8f0cda6159b7251d1034651bcb42e07611495bc8cd764c89d22f3123032f8 ofl/aladin/OFL.txt +sha256 de985adf63cff6b1bcb7c5cb55f1c5850fb1d36289d20a0e26d97a281bfcf956 ofl/aldrich/OFL.txt +sha256 c267a00c9476c78a2336d7b372b536885b8b24173a29ed53496f67a742c14961 ofl/alefhebrew/OFL.txt +sha256 c267a00c9476c78a2336d7b372b536885b8b24173a29ed53496f67a742c14961 ofl/alef/OFL.txt +sha256 f6f60d5d4cf4f4b1fc4e41353c897a2f5a16e6396c0cd8fa8bdfd2f4586a9a68 ofl/alegreya/OFL.txt +sha256 0677891e6a143f297350d260ad766ad33bfc18ed5fa4f213acf648d6b597ec1a ofl/alegreyasans/OFL.txt +sha256 0677891e6a143f297350d260ad766ad33bfc18ed5fa4f213acf648d6b597ec1a ofl/alegreyasanssc/OFL.txt +sha256 f6f60d5d4cf4f4b1fc4e41353c897a2f5a16e6396c0cd8fa8bdfd2f4586a9a68 ofl/alegreyasc/OFL.txt +sha256 de08ff7a460541753999b1208f1254f1d31f16b421312aca4d4b8179d997de38 ofl/aleo/OFL.txt +sha256 513b7871a360a6eccd426bab59743fbff36764588f47381423f04ad6b3d821d9 ofl/alexbrush/OFL.txt +sha256 e315abc82a78710c7242e2f2e6529651fd631d4d50e6ad98ea194f9b54c3d701 ofl/alfaslabone/OFL.txt +sha256 c026db4c1a557cae47e6930876965f9cbc05758eb1f5d6f59b6b61c8f342a57f ofl/alice/OFL.txt +sha256 f480fd19e7018942ecaf460f7a4ab9ccee0aec579abcb07d559dbede913864c6 ofl/alikeangular/OFL.txt +sha256 ecc91fac753ad9ba5bb7e7819a5c59ee1e3cf89032133c6b4b0318d63c35933b ofl/alike/OFL.txt +sha256 ab721b35816e470fb11619ad3705f75d08dccd0864505e3d782e94fd937f6620 ofl/allan/OFL.txt +sha256 08fba9df5c9890f3ab00ee63f63e005ad93a23746f7484f5fe9501a1ad32730e ofl/allerta/OFL.txt +sha256 08fba9df5c9890f3ab00ee63f63e005ad93a23746f7484f5fe9501a1ad32730e ofl/allertastencil/OFL.txt +sha256 87e8d9aca71dbe0481ba8611fc90d7e3aebfa3e2546420c403e7078898b0c484 ofl/allura/OFL.txt +sha256 b7eae5e3c3447f70caa14e0c43f5e0d953f54ee59df406f6362863bcee1a0a95 ofl/almendradisplay/OFL.txt +sha256 b7eae5e3c3447f70caa14e0c43f5e0d953f54ee59df406f6362863bcee1a0a95 ofl/almendra/OFL.txt +sha256 b7eae5e3c3447f70caa14e0c43f5e0d953f54ee59df406f6362863bcee1a0a95 ofl/almendrasc/OFL.txt +sha256 89bf0833b785c49b0f271273ab440bdc20c85bf0322537dc901df940bf1579da ofl/amarante/OFL.txt +sha256 5eca89cdd576df5e4b7c694e0425b126a9ca839aa067df85fab33904a8187076 ofl/amaranth/OFL.txt +sha256 e36d420a3b382b337c386338d8abc3635e10de5dfca7f822fc63ac659a0dcfc3 ofl/amaticasc/OFL.txt sha256 301f77908df2b00141b4dcea50cc1a586c3afcee78843bd811088e8263623f9d ofl/amaticsc/OFL.txt -sha256 6b6c6721a30480a323cf33acf6a7703dfce46b846827a65f8ee96230060e3c3e ofl/homenaje/OFL.txt -sha256 393d494f9ebb5db6a3552ffa03a4c6f3746c22808b40d011b391681da55ca3f6 ofl/kellyslab/OFL.txt -sha256 ca19ac21c7656f493189093eca52b4239fcc5eacc15ab2e3d67cfbfc0e6e443b ofl/sirinstencil/OFL.txt -sha256 980c2b058d331f3c5ca4a1223e549511b71630e4f4a5533879d436d583cb5665 ofl/arbutus/OFL.txt -sha256 2758cf7a872827f39661cf8cc24188113c030447aefb5ca7145993650076ca8c ofl/ptsans/OFL.txt -sha256 7527e73a61f742a0dd050ab2fc7333de71ac7886023c100bca66a0a93b37498e ofl/headlandone/OFL.txt -sha256 39b26527bf9ed27b4c85b86341eceea0579f3550bcf448cf06345eaadf947ec9 ofl/rugeboogie/OFL.txt +sha256 ca424122f42a8d8442bc4cfd902f5f027ea67b5417705f5af1d1235927781720 ofl/amethysta/OFL.txt +sha256 bd8323cd1d2b6bbdfbbf99cb41ec1156d0352ced170de4aa3a96d95e6e20bf5b ofl/amiko/OFL.txt +sha256 1edecf3f971a11dcfd777cbda6f08c0f9a77bf57a0a2a89d8142fb933894ce16 ofl/amiri/OFL.txt +sha256 0dd8e32457e18621737b593ab0fac49905cd948a078ed0e64f4890df714a1dfb ofl/amita/OFL.txt +sha256 06c79c896894160a5810d869a822fa7d02a0e2ccffd97920b8cf3b880380f6e5 ofl/amstelvaralpha/OFL.txt sha256 2ac164969308ac200eefc516151934701044f0db5695ae2acc15df2a8d22e5cb ofl/anaheim/OFL.txt -sha256 88d3abd47414e7912d0d2eb44ca89e0b1bd7c43cc2ebe58a8a75281ad75a0f60 ofl/stardosstencil/OFL.txt -sha256 01003114b77326df223f291c48cdf12e95f6a5937437f164347919f2bbde12d4 ofl/josefinslab/OFL.txt +sha256 f8779e6871bbab04e0a1ddd9997f4d8173b56792a1e7f8b9d691d967a49c7dc3 ofl/andada/OFL.txt +sha256 e6ac721b16f309c89fb443680afda427ea34968bad190a80edf281d01d65fa99 ofl/andadasc/OFL.txt +sha256 e55c615ed00ce0054bd356041a41e5942b4a8cadceac1e32696ba2ef5f06f748 ofl/andika/OFL.txt +sha256 1e4015251ca58d4f349b4ac930259c6f3d6381ce68f8b4b27d54d53f8f63f972 ofl/angkor/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/annieuseyourtelescope/OFL.txt +sha256 8594350034ab1cb85a1946ef8852e69290255816c311450a66fed6eeda9d6292 ofl/anonymouspro/OFL.txt +sha256 60ddc0ee6e443b78940b5f92bcbab76c98ec6965e0da9fbdaf267383ab72bba8 ofl/anticdidone/OFL.txt +sha256 c1f8e0feb0babaacf774b971bcfd791e44125b9d61ff074e4c20924e9661556e ofl/antic/OFL.txt +sha256 22d1914919d3fe08b179dc31169fc743ca7eede7827b91a5d48c23c8cdc7cb81 ofl/anticslab/OFL.txt +sha256 9e262d6d7fb789aab6a8ecc53fc9c78387eeb9f935dcd289282d8e751b6bf743 ofl/antonio/OFL.txt +sha256 9608d22ae5c586628c9904e773b7c6a6520fc16e1492ebcb5ea55d9523399964 ofl/anton/OFL.txt +sha256 cf6dd07485d67d20f105afb9981dffdb6b180b59af45a228839cf3fb0277c9fb ofl/arapey/OFL.txt +sha256 980c2b058d331f3c5ca4a1223e549511b71630e4f4a5533879d436d583cb5665 ofl/arbutus/OFL.txt +sha256 1c023b4aca0e441c55c45c86cdff57fa524a96778f291d9a29a4ad777b70e2e3 ofl/arbutusslab/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/architectsdaughter/OFL.txt +sha256 3173acd82f8c6159b5b1037b539fcbd4edff68e65c2ea8b9412b5a5ca97b08ff ofl/archivoblack/OFL.txt +sha256 3173acd82f8c6159b5b1037b539fcbd4edff68e65c2ea8b9412b5a5ca97b08ff ofl/archivonarrow/OFL.txt +sha256 95d23e4559ea8c6a36aa04fab56e1dca0780f5d93734072d4501023296543102 ofl/archivo/OFL.txt +sha256 95d23e4559ea8c6a36aa04fab56e1dca0780f5d93734072d4501023296543102 ofl/archivovfbeta/OFL.txt +sha256 8218df19bcd9786311bf1126815e8d591027aaf7611ef031af5a31c3fd66e928 ofl/arefruqaa/OFL.txt +sha256 12af42b715a3901bfa7add1351e45b6ce22f3061555d52db45e963274c349360 ofl/arimamadurai/OFL.txt +sha256 203693528d6d2e8dc5e639c6ea42b3e825b59dd6447294e37b306fe734650091 ofl/arizonia/OFL.txt +sha256 47a0b7e315bc56ca0326fca46302d87d48a61e3528d4196e966b62f5bf0243f2 ofl/armata/OFL.txt +sha256 a94cfd8d1f5c33f9a7506def359b907f3313f7008bb57fc893985963cd342f8f ofl/arsenal/OFL.txt +sha256 812fc4af0c63d31e0e81cc153af74e397407b0630e918b8b965bcbb192bc0656 ofl/artifika/OFL.txt +sha256 359671bf16c00cae69cb66d041296b2adc7a4becd73a463cb8c5e101d97c7986 ofl/arvo/OFL.txt +sha256 dd028a807788d5e22e9f8cc18f026cda23369954673658f2ecc7d30bdb364b89 ofl/arya/OFL.txt +sha256 4aa1da66597f4c5cfde67790992ee55926ef6aaa87b9a10d529ab35e8b91070c ofl/asapcondensed/OFL.txt +sha256 7c05152b2380228795cb474819744653fb03ddbfe5990b912ec7d9a41387230d ofl/asap/OFL.txt +sha256 7c05152b2380228795cb474819744653fb03ddbfe5990b912ec7d9a41387230d ofl/asapvfbeta/OFL.txt +sha256 223fa23e8419ee762c662e0faf912dfcf386fa7093ac9ff690e380ce1993ba55 ofl/asar/OFL.txt +sha256 694d5c15c1dac5e26653e18b94394d911e471549ec9b7d6247ade62e486b4915 ofl/asset/OFL.txt +sha256 1152ca18eaa6159634f1eb209c60df360c1c09a52991e392f8033702036634d4 ofl/assistant/OFL.txt +sha256 4e69611ba5017f1fde74c31d342f5c85604814b1b45387b9ab46205996dec38e ofl/astloch/OFL.txt +sha256 ea274e87939d38032b31fb741af75bff9fa3f8d4a8b652265f9e0ce1ad7e9f80 ofl/asul/OFL.txt +sha256 1d08c63944e639bbfe8a1b81e3c6a63836806c126b3573b9cda0db83fd27ffe9 ofl/athiti/OFL.txt +sha256 96d82a96abc02fb457ddde0227833dbde9d1d02876c91f0a4e27845ca0d692fa ofl/atomicage/OFL.txt +sha256 69c34ca1873308c667ddde663cbf59c0d1cf14cbb945ad010f71d21264249e24 ofl/aubrey/OFL.txt +sha256 4fe01b13ffb41faa8f030d84843a95dab32792dfeeca7c072abbfd3f4d6896ad ofl/audiowide/OFL.txt +sha256 793891edf1f4f4f35b52fcc9706b03f779c7ea18ab8e9e441242d63ef0279488 ofl/autourone/OFL.txt sha256 83aa5adca2418f091b732a19cc7c30dcb5c00c217051a58f34f5eecb19be0cd3 ofl/average/OFL.txt -sha256 585c6d2da8bcd8ffa651e0016f2e992a6891b625143a46a1dacf00699a817d9a ofl/monoton/OFL.txt -sha256 96e65d9c227a972e38035b849bba1e8b7879eecbb52f278be1e71dd481187f02 ofl/domine/OFL.txt -sha256 d1bf0acea511ad1f4de53e942cffb8ab0e67c03c6203d6f390d71105d52c33f0 ofl/missfajardose/OFL.txt -sha256 131d19126a0e7ddd25540fd6bee219cebbc8aee7e8374882998ee6c2f4ff6cf4 ofl/mergeone/OFL.txt -sha256 042a570b306ab893c6168be7e6e79bbceae46097141357ad0af7ef8bb179ed7b ofl/goblinone/OFL.txt -sha256 91c25c350d3cac39da2736d74f7ba37ef648f5237a4e330a240615bc8d8c4360 ofl/ibmplexserif/OFL.txt -sha256 bc80ea18223ea0db2ed73ab5bfd0cd601906a2b7a163183c6c4ea333be309ce4 ofl/baumans/OFL.txt -sha256 5f5dbf452c1657370d9280b50d647212a53c80acae6d78e0b5e8c2b26dc62b09 ofl/puritan/OFL.txt -sha256 90bd333a5cf0ed09264fc3e559d44979373f6c3d983b0f65cc46e952b4eb61f0 ofl/contrailone/OFL.txt -sha256 1d08c63944e639bbfe8a1b81e3c6a63836806c126b3573b9cda0db83fd27ffe9 ofl/taviraj/OFL.txt -sha256 62fab0ba1d5593782cbf048da193f4b1edc16b817577a99d707827513ad80e9a ofl/overlock/OFL.txt -sha256 75798d56e448ba4d2aec3ef5f3c2d805d9c6fe2ba688cd3d7162b2dd31e9cf48 ofl/textmeone/OFL.txt -sha256 eef925ad6afcbba33f7989f5ad826fd68d50cc1ab4d679c52927c8afd40bddf0 ofl/sedansc/OFL.txt -sha256 466aaa3bbd245e4c91c4e82c0828efe9fcfd913f5b020d75f0918516c2540fa8 ofl/spicyrice/OFL.txt -sha256 88ac81fcd30e64f6e6b91b61b159c9b700bb3dd59012b72ec61629abcfc7fba1 ofl/medulaone/OFL.txt -sha256 1d567f7c5f579d9031ae5edfb0108b4681bdd2e036249b228cc2843d3f052a0f ofl/redactedscript/OFL.txt -sha256 ce78cc8de3f6edd2738e8c02f2079db7086c9a74314baa5854675f83c33954ff ofl/kenia/OFL.txt -sha256 76af3e9e5d8768b17647813a443fcf5df3eb3ced017ee285796625e714d5ea2c ofl/ruslandisplay/OFL.txt -sha256 6e54fc004ebeb61322ecab1d86334ebf69e7051632d48eca489beee505d70762 ofl/hermeneusone/OFL.txt -sha256 8586a7e75681c7297af4cc0641eb2b29e882c5187fe189a1160eceb4e95d4163 ofl/fenix/OFL.txt -sha256 d8eb8611f8c98d20cbf18a28425652d6022dc2a5cca15026b920f1f2bc92a612 ofl/deliusunicase/OFL.txt -sha256 197c3f48cff4df3d768230e0bbdbc4305d8b8b9041ea6fb5e00872af66adc5ae ofl/novamono/OFL.txt -sha256 08fba9df5c9890f3ab00ee63f63e005ad93a23746f7484f5fe9501a1ad32730e ofl/allerta/OFL.txt -sha256 af88d31020bb48a1f78f4384249814d04a44d22feeede2ff4ae79fbb4fcf74da ofl/rammettoone/OFL.txt -sha256 397e83b05703a4240be51e2c3a2be1d0d7693d7a2d8b1ff367c26a2b9afc013e ofl/singleday/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/cedarvillecursive/OFL.txt -sha256 d416bc9437e1d7d8aba0613395ee49c95ce72d680672e910c6205b545cfcbad8 ofl/cherryswash/OFL.txt -sha256 513346ac60af1dde9d4a7bcfad3f39909d5697373a8aa1a6ee4376e6d22d3cdf ofl/niramit/OFL.txt -sha256 0b1bada9befa95a40d55830fe83fc7f8064e245fea33bdf0f96f57848f3866fa ofl/coda/OFL.txt -sha256 2a7b0a41ef401e4e0e955280b07c0a2698932d56aad3181089bdbbaad5760491 ofl/habibi/OFL.txt -sha256 2d62278530348951887211d79d1dba04acebd6ed3b1c413f6154702efea3ea62 ofl/iceberg/OFL.txt -sha256 a20db45220b6c4dc9776f24c77dc9ec7a98977d8b3c65b03aabe66b2d08e0791 ofl/cabincondensed/OFL.txt -sha256 fc1e501d419d84a8f1a800adae092045002d7141241f498237611dbb8ea763d7 ofl/stintultracondensed/OFL.txt -sha256 9a51726e5f247cb1f07bb8f49c163bc3e9ddee5f367bb5a1871d09b854ed1b7c ofl/basic/OFL.txt -sha256 ce0023bc03e1428feb5abfaa939b601d2d827ee5a6c84a2657993a7b16c5290a ofl/diplomatasc/OFL.txt -sha256 e30f893523e50ebbe07acd783ae29c7d604e6208cae7646d993e8528ce13e35a ofl/federo/OFL.txt -sha256 9d96f445b6e9c701428811d0177f894874f8d6f07ecc30d568c506542368f3ff ofl/sharetechmono/OFL.txt +sha256 37d5360d8d2433689e78302a93cd88e9add8a2294046476625edada2d4328deb ofl/averagesans/OFL.txt +sha256 46239ba6485d28553fd944da4ad32a00d9c403aa1c3e111676b0b96fe458d1d4 ofl/averiagruesalibre/OFL.txt +sha256 46239ba6485d28553fd944da4ad32a00d9c403aa1c3e111676b0b96fe458d1d4 ofl/averialibre/OFL.txt sha256 46239ba6485d28553fd944da4ad32a00d9c403aa1c3e111676b0b96fe458d1d4 ofl/averiasanslibre/OFL.txt -sha256 5951473ab31533bfe1452bbcece47f237a5546c7e7d45ff1aec0289619623294 ofl/fugazone/OFL.txt -sha256 aa5d677391db4e54ad324b6888792e533c5d800de7ab713302a2fc8bff2f4f6e ofl/miltonian/OFL.txt -sha256 e0cde1a4993ed689d463d5e2401f4a60c54cc48a14253ab0f8012d722c417038 ofl/mavenpro/OFL.txt -sha256 c1eed37b6d213df4edf8f92ec7d1e972f751abd68ecd649b4f0b8e5d8e8561f6 ofl/yrsa/OFL.txt -sha256 5bbeae56b9db61a9bf85b64d5ed9a74cfcf9ee3e9b005bc2906859ddecd5eaa1 ofl/esteban/OFL.txt -sha256 7b826efb1b74a50b1c1aef0a1ba4530925b993ceadc3016d1d787c68a61649dd ofl/tenorsans/OFL.txt -sha256 28c6d2887c3dfa42488c5418c6c16ead580d33ff0afe60c05159689201f9ec63 ofl/jollylodger/OFL.txt -sha256 ce0023bc03e1428feb5abfaa939b601d2d827ee5a6c84a2657993a7b16c5290a ofl/diplomata/OFL.txt -sha256 8f2e5a9b52cf355023104413827e17dd7126c5a3656492d45eaa1ceb270aa4f1 ofl/yantramanav/OFL.txt -sha256 fe079cdbbad0f6520eb0a8235bce65b21596dd0c4c5a2694b3325cc87313b618 ofl/shortstack/OFL.txt -sha256 018d17b5e04c0a217a21979fa6b6d77bd5a143a5f06ea2ea102e427abd1ebfa2 ofl/tradewinds/OFL.txt -sha256 31c59bcdd538c113ef5c048f56827439facb12b7e5cfd158b04c83727edc453b ofl/salsa/OFL.txt -sha256 eeacf16032901d0ed0456876ec77b8f0fda6b3fecec7d972f8543eb602e6c30f ofl/nanumpenscript/OFL.txt -sha256 ddf311c28ddf5a5ad9747649837346b67bed9d356789c3072bb27dbce49e514d ofl/ptserifcaption/OFL.txt -sha256 c867d1a613bebc4932cf28c060fefb3bcfba3be56ed498b873c79f4eb786af1d ofl/librebaskerville/OFL.txt -sha256 694282197de3d750a43689dc64a8116cd19578cd516e7b2490c7b5362c064dbe ofl/kameron/OFL.txt -sha256 cb30d3086a8b3ce0b9e3690bf48d6620402b61160bc658076f95180ccd9e9dae ofl/sourcecodepro/OFL.txt -sha256 a40c3a6d0c968d3a10b17a2614606de6f20178deccc2447305f31fb106a57fb0 ofl/fresca/OFL.txt -sha256 5d3457831b42632d958fe1a14a09706d8acb006486a5ca5b2b419cd61cb22e32 ofl/chelaone/OFL.txt -sha256 6b53fb03a50914cc382f4d025ee595c17c43f24ae870f840bc51969d3e316c7e ofl/limelight/OFL.txt -sha256 574430e571a6928624f4bdf044420f7547a26309b7ebf6962296d33294e0a1e0 ofl/combo/OFL.txt -sha256 fd20b82eb12d16ec31a58fc44f7e6c533b14b425b569d83f616a1f7a9a401e75 ofl/gochihand/OFL.txt -sha256 0e74984817cdd51dbfbd8309022aa75f733e80dff0cb1d26ad2157e90446ba97 ofl/enriqueta/OFL.txt -sha256 ddf311c28ddf5a5ad9747649837346b67bed9d356789c3072bb27dbce49e514d ofl/ptserif/OFL.txt -sha256 4e69611ba5017f1fde74c31d342f5c85604814b1b45387b9ab46205996dec38e ofl/astloch/OFL.txt -sha256 013e33b6b2919fd0ffbdde6080a1c0f4521689fdce0f4876a59cf49ff8ae31c0 ofl/geostarfill/OFL.txt -sha256 14b3fbd06078a869cf2ba96e6dacb852d373703c86ca7ad54a4cdd6e20fbab19 ofl/knewave/OFL.txt -sha256 a8103c045a88bf9b28dcd7eb60a6662008f49afc0f3721bc46aaf761fc0409e7 ofl/englebert/OFL.txt -sha256 bd22e766af8f8e58eb520cb4fa73538826d04f7371b45e82295d22d1e32a4e58 ofl/gidugu/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/justmeagaindownhere/OFL.txt -sha256 5fba78215eb4e42aed6cb0b5c5df52e0f71246281a866cd4493dfcfcbcab9518 ofl/playball/OFL.txt -sha256 e75230ee246a04912366cd8d759d081200d80fb0756766c96dd52f73e8b40bed ofl/romanesco/OFL.txt -sha256 39de3de5f1873f89bca4af37823ab22e28e88d0d8f7fe2f07e82e9e6e9bf7b70 ofl/gamjaflower/OFL.txt -sha256 244ca4ef7b106d8c660e9a00cecf5d581b6a222f447d7d59a8f61711b2ad3400 ofl/uncialantiqua/OFL.txt -sha256 36e2f1debc9778bac79fac1a0cb5a5ef51c102f00b58ef7d8a05324144b68166 ofl/didactgothic/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/giveyouglory/OFL.txt -sha256 638774cdf8233b5ddaf9ebee1821e9de1d5d59c335d8ee3ba0b47fb17833b502 ofl/glegoo/OFL.txt -sha256 842b4f4605b32518a1269c4d030d719ea2c4c317d699fc4441d0219658e18893 ofl/seoulnamsan/OFL.txt -sha256 a10a07aaa150c147fa3cb22e845013f38e6c2b45fe5ba32a74ed1be9d4c417ae ofl/odormeanchey/OFL.txt -sha256 a74380bba78a364ec70b3a5fb6a1161b83cb05cc3e75a0910afbd1b5aff4f9c8 ofl/jaldi/OFL.txt -sha256 9b8405bf5f503f92401fc990f372b34d469670ab60041d5298d1015d3d0b45f8 ofl/thabit/OFL.txt -sha256 7c05152b2380228795cb474819744653fb03ddbfe5990b912ec7d9a41387230d ofl/asap/OFL.txt -sha256 ca9fe3a0e10bbb082f83ecdc07f5f04845c4bd689c46456da3e6bae23e11aae2 ofl/inder/OFL.txt -sha256 5b158abb3406e69b7408b562b7199f6ff55a41ea56e260b87176d693b0095e47 ofl/piedra/OFL.txt -sha256 b7eae5e3c3447f70caa14e0c43f5e0d953f54ee59df406f6362863bcee1a0a95 ofl/almendradisplay/OFL.txt -sha256 87b7d831a81fe8b37e7e6c672937493f710ff81883eee3adec7b5423297efd16 ofl/sharetech/OFL.txt -sha256 4ec46c3e4469afa19f0156bac6917472974f9c85c189f9220cf8735d3e810401 ofl/kristi/OFL.txt -sha256 93f60741563b4f51f2fcdb207fde72b2b23292a47022c729aecd998b360d8038 ofl/bilbo/OFL.txt -sha256 4b255eb44f613a8e426e195f0d0b7e10fcba1af7eb6047d9a7f4f3c449940e19 ofl/hindcolombo/OFL.txt -sha256 afc1b710d644c1262e1765d2401abcf93a545a4cb051955e2243fbabb8164e25 ofl/carroisgothicsc/OFL.txt -sha256 930fed5b06a415736dc3b4e5f4f01585523b672717564bf677f93966bcd57636 ofl/lustria/OFL.txt -sha256 9a536e5a3b55c2605b0a553eed383cd3efa42ba48dc45cc6f0635b3c53ee791e ofl/warnes/OFL.txt -sha256 879ec56fcc9a961937fd24d542b3b7b3f2b8cb3236b7351e62d16719e25de14c ofl/griffy/OFL.txt -sha256 29cca754098468057880970c604e55c4e2bcb8479742e4130c94f2ddc0363f9c ofl/sixcaps/OFL.txt -sha256 67261c7ceb3e627da5c94d6617dac6da29bf36b910bee304a7680ad62e2c8b46 ofl/changaone/OFL.txt -sha256 327bac41d89cf9f32e0efe353228018e1661cff458a5d4905714958514df7bd5 ofl/lalezar/OFL.txt -sha256 525411e604e7a1d85a4cd42641869f94388f04a6ed77829d6c4edd7fd740ceab ofl/ramaraja/OFL.txt -sha256 3d08baba63f1f2427fd96dee8da30b1ef6c1421b3be0e1f07cc2a78abb27c91d ofl/seaweedscript/OFL.txt -sha256 4c0a1150a363b42bd8681ff4a00315ac49510a944c4c9978237ff8b90a8920a5 ofl/grandhotel/OFL.txt -sha256 bc4c7eb365ea342b1a027fb8417fb0152f5d482a2e31c012fbfa29b668827b04 ofl/cutivemono/OFL.txt +sha256 46239ba6485d28553fd944da4ad32a00d9c403aa1c3e111676b0b96fe458d1d4 ofl/averiaseriflibre/OFL.txt +sha256 a815f65bc72d90494b01842d3171f7cb0f9f935e023d9cc260904d221ef1064a ofl/b612mono/OFL.txt +sha256 a815f65bc72d90494b01842d3171f7cb0f9f935e023d9cc260904d221ef1064a ofl/b612/OFL.txt +sha256 d38acce513eccb51d7ac34ca47be279e1fcfdeca1ed088bdd2d281dc6ca939ee ofl/badscript/OFL.txt +sha256 e3ed3ad6cb257e16dc1789900707c5cd1cdef2d60d155389342604991cf693f9 ofl/bahiana/OFL.txt +sha256 fe5e822667a4b2e083b8fdd7a37546163f26f6481b58742236abffdcfb3e6c71 ofl/baijamjuree/OFL.txt +sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1 ofl/baloobhaijaan/OFL.txt +sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1 ofl/baloobhaina/OFL.txt +sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1 ofl/baloobhai/OFL.txt +sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1 ofl/baloochettan/OFL.txt +sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1 ofl/balooda/OFL.txt +sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1 ofl/baloo/OFL.txt +sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1 ofl/baloopaaji/OFL.txt +sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1 ofl/balootamma/OFL.txt +sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1 ofl/balootammudu/OFL.txt +sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1 ofl/baloothambi/OFL.txt +sha256 876db27db250a9b9c03fc2ef30a5efe1f37c2ed2686d368c3779583bdf746912 ofl/balthazar/OFL.txt +sha256 ad4f6ede2e8a017255822a6abee8d10717f1d34c20223de80285ff59e28a1cba ofl/bangers/OFL.txt +sha256 186d750eb496a4c17a76385f82be6aea2ac1cf2de074a811d63786cf374ea73f ofl/barlowcondensed/OFL.txt +sha256 186d750eb496a4c17a76385f82be6aea2ac1cf2de074a811d63786cf374ea73f ofl/barlow/OFL.txt +sha256 186d750eb496a4c17a76385f82be6aea2ac1cf2de074a811d63786cf374ea73f ofl/barlowsemicondensed/OFL.txt +sha256 e2f2dc7a667954c16a919acff5351e8ea89813d10f5a7504e1f4668fffbfa14b ofl/barrio/OFL.txt +sha256 9a51726e5f247cb1f07bb8f49c163bc3e9ddee5f367bb5a1871d09b854ed1b7c ofl/basic/OFL.txt sha256 1818771d183d203703c4b134f028527b535810e2a0666c8fe2785354ddbef686 ofl/battambang/OFL.txt -sha256 b7eae5e3c3447f70caa14e0c43f5e0d953f54ee59df406f6362863bcee1a0a95 ofl/almendra/OFL.txt -sha256 9e0d3db586ba0abf5ca398683809dacdf4c81b2960f592bd085fbf206a67ddb0 ofl/sansitaone/OFL.txt -sha256 fb1dbf3725bbdd389b2c569e0eed5091d8d10eed2833ec7efacfc3542e408615 ofl/scheherazade/OFL.txt -sha256 9134ca6996bd33ea2022e109f13f20e29dee1dcd8b2e8878aad576d2ca334e9f ofl/cormorant/OFL.txt -sha256 156ea6985861158c7dea63ecaac4c78ab0ed737d168ddffc3e34c687985a033b ofl/sansation/OFL.txt -sha256 a9b3e7e1cf5735dc49d802b88b1858a2a50307ba2a877ddf3f0b27d8b1d0abc5 ofl/blackandwhitepicture/OFL.txt -sha256 5fe7f3c9410c29534ddd9dfaf64d3994ed4236096d0d543ae69eacc3b25632b1 ofl/bitter/OFL.txt -sha256 f6f60d5d4cf4f4b1fc4e41353c897a2f5a16e6396c0cd8fa8bdfd2f4586a9a68 ofl/alegreya/OFL.txt -sha256 e88691a5e0a8a3f788f31db959701ec90a1d5e7505f1cc53c5663180a7d23c81 ofl/lohitbengali/OFL.txt -sha256 ac55580be2df22a06d29a47501e2ae11e1d399620f5a779e17a66f016ba6d5ff ofl/portersansblock/OFL.txt -sha256 27d9af34210253e7ca1251fbace86c6f65b40031d6ce1a75493a1b2093631298 ofl/vt323/OFL.txt -sha256 9452ef55386e77bd284ca466587d72802337621d7f10aa700e449753883b3397 ofl/trocchi/OFL.txt -sha256 a9b3e7e1cf5735dc49d802b88b1858a2a50307ba2a877ddf3f0b27d8b1d0abc5 ofl/stylish/OFL.txt -sha256 4b255eb44f613a8e426e195f0d0b7e10fcba1af7eb6047d9a7f4f3c449940e19 ofl/hindkochi/OFL.txt -sha256 3173acd82f8c6159b5b1037b539fcbd4edff68e65c2ea8b9412b5a5ca97b08ff ofl/archivoblack/OFL.txt -sha256 c832a4230a713d080aa2f2544d9a298ed911f689b2c48f7f276a0196b16d2b8a ofl/cookie/OFL.txt -sha256 ae28423a5e63cb65e651ccf62c9091b322fff1d2d4e87ad9f98b1096c2e7abb5 ofl/metrophobic/OFL.txt -sha256 4b255eb44f613a8e426e195f0d0b7e10fcba1af7eb6047d9a7f4f3c449940e19 ofl/hindsiliguri/OFL.txt -sha256 8c22fb3866eaebd77a2cb8e8ecbb095381ff32300db57758326fef35a26132f5 ofl/ranga/OFL.txt -sha256 d2875ded3e44e9ae53ea2b35e825dafffa19e82c5d14addb9f1150fcd7a3463d ofl/mina/OFL.txt -sha256 8242e7737bce317f7a7f2b887ac87f5bb21305ab96bee92aadc3febac16c35bf ofl/voltaire/OFL.txt -sha256 fca01a37b10879d7685c7d03fc5a04086b15cdb2cb4f870cb687aa5a9a0a1361 ofl/jimnightshade/OFL.txt -sha256 2492bb8645caaf622bdc3e880cdc9b069921e7341346d7b193666c866a1935d0 ofl/condiment/OFL.txt -sha256 e6ac721b16f309c89fb443680afda427ea34968bad190a80edf281d01d65fa99 ofl/andadasc/OFL.txt -sha256 1e5d6660366ddcfca4f2fc10e2acfba9fa4d97d40aec80d7dbfd41d730a420ae ofl/cinzeldecorative/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/coveredbyyourgrace/OFL.txt -sha256 4b255eb44f613a8e426e195f0d0b7e10fcba1af7eb6047d9a7f4f3c449940e19 ofl/hindvadodara/OFL.txt -sha256 5c36e7ec460b285185ea23847aa1f508708d9ce15d5c055279defd022972f836 ofl/rakkas/OFL.txt -sha256 0b7eae990329ac175a2e1c329060b3a4d6876e4e0cd7e5235511578352f7b191 ofl/biorhyme/OFL.txt -sha256 c54957d55e7c9e66c28e474cd39de75dc044e8f69056788cae44eb78841ceef1 ofl/montserratsubrayada/OFL.txt -sha256 fccf4916b5f84ef5f88d93fec464421aaf4121d11d4be8d74ee2d032f7661d6c ofl/padauk/OFL.txt -sha256 9ca8b9e5db7184105da255bb110023cf1cce6caa56186341bb7b09ba97b20ba5 ofl/prociono/OFL.txt -sha256 0c3f4763f49c2cd37757a2856ad470aec6a416981ac6d6e3f900c1128be39de7 ofl/elsie/OFL.txt +sha256 bc80ea18223ea0db2ed73ab5bfd0cd601906a2b7a163183c6c4ea333be309ce4 ofl/baumans/OFL.txt +sha256 ecb52bab55d8d6185712fe8fd2fd98300f5c8c07fad0d0a97b1e579462b0dd3f ofl/bayon/OFL.txt +sha256 284a5a26e6db9a04259a5690ad57d52c56a4c515ca2ece1943d950f99e709dcd ofl/belgrano/OFL.txt +sha256 2348c4852e6322105d130aa2addbe24c962e330094ad6dfbfd9fbd2281d76b0b ofl/bellefair/OFL.txt +sha256 15b1a21c3fa37a475ba6b0c0cfe289c7952548caf6e432068ddaf98d139ce419 ofl/belleza/OFL.txt +sha256 460966d12f306a007930575c3b8bc336fe0c32f880d622af6d3b745a06ca79a4 ofl/benchnine/OFL.txt +sha256 4a7d2f227b91046ef7a54f8f735668d86e45f4fd4089268de292a6e9de108253 ofl/bentham/OFL.txt +sha256 d941aa56e280b4f204272c4b1add01a8ebc7af3e8e69ba8ba9118aa2a5306dde ofl/berkshireswash/OFL.txt +sha256 9437c26410bcd543607a6775e7d0e359c1df3926d68c92dbaceb26ce79cc0fd3 ofl/bevan/OFL.txt +sha256 012b1870f81b0d97ca756edd9eea315c7fc22657ac2f1cbdfcb6772fed3e20f3 ofl/bhavuka/OFL.txt +sha256 0409c6582424508453ce41648067efaacf0c790622918493d8f1d934bc5329a0 ofl/bigelowrules/OFL.txt sha256 0d5fa0cce86012de872273700eef4fd162459e7c24a6a314911380627391071b ofl/bigshotone/OFL.txt -sha256 ca64dee162bf239c7b92d854d388bcd30552edc3ae1ef5e31714acda34c988db ofl/jomhuria/OFL.txt -sha256 bd77eae571de83ba3884c74c7983e8ac5cdf858badc36906179346dcd7e82454 ofl/gentiumbookbasic/OFL.txt -sha256 2ce1c4fcf4ab9c8474d0824434497d4afa4425db4de5629103698b170ac4ee74 ofl/bungeehairline/OFL.txt -sha256 9c56b4e2e4e922cc37e19e1a9e2e1128beaa17a812e1b67c8ac371b0fb57ae03 ofl/kopubbatang/OFL.txt -sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/tillana/OFL.txt -sha256 486c4d5b9baf0d0ba5546ef3c43fcfe22c062299ab6948045a43efffe4b0f74b ofl/italiana/OFL.txt -sha256 4539710406c656519f8ddc789056a7cd6f4fe66b44cc2f52ebca6e251bb26e13 ofl/imprima/OFL.txt -sha256 7f55affd2bce8ed9be13297ba8df1a4a7e9835c2a006126dc2a1eb4ce75a7943 ofl/muli/OFL.txt -sha256 867b506cb023eae20c1accde77b2e0abf7d8a9e2620da8dbebac9f7b1117ca0b ofl/cantoraone/OFL.txt -sha256 aa72b0185d828cb2fafa62a154e84bd3e20c88ada30326089bb20542b6363aaa ofl/manuale/OFL.txt -sha256 4664e83780a263c53dbab95d3590a5a9db914aeb9a3c78f7e7ad451f9151c998 ofl/spacemono/OFL.txt -sha256 fc59ca3cd3bcb47bd4df597519111ec130c25cabcc57a8808dd2d243cdcec6ae ofl/oldenburg/OFL.txt -sha256 43c372f43d145c22e654781860506a75cb85b086dc76028a62a28a446506d253 ofl/italianno/OFL.txt -sha256 a7fe1f3d23034092b015aaeb53d2ecbc9e592be96b10bdfbcf8700ec6a6ffc97 ofl/fascinateinline/OFL.txt +sha256 93f60741563b4f51f2fcdb207fde72b2b23292a47022c729aecd998b360d8038 ofl/bilbo/OFL.txt +sha256 93f60741563b4f51f2fcdb207fde72b2b23292a47022c729aecd998b360d8038 ofl/bilboswashcaps/OFL.txt +sha256 0b7eae990329ac175a2e1c329060b3a4d6876e4e0cd7e5235511578352f7b191 ofl/biorhymeexpanded/OFL.txt +sha256 0b7eae990329ac175a2e1c329060b3a4d6876e4e0cd7e5235511578352f7b191 ofl/biorhyme/OFL.txt +sha256 505bb8f3c30f2006b4e02d250fda31ed94b651a35f1124a201ca1c405ce989af ofl/biryani/OFL.txt +sha256 5fe7f3c9410c29534ddd9dfaf64d3994ed4236096d0d543ae69eacc3b25632b1 ofl/bitter/OFL.txt +sha256 a9b3e7e1cf5735dc49d802b88b1858a2a50307ba2a877ddf3f0b27d8b1d0abc5 ofl/blackandwhitepicture/OFL.txt +sha256 a02e8715fcdf3325c474b7209399f50230897bfa828fe4eea2639ced1a1d574b ofl/blackhansans/OFL.txt +sha256 8af83da84dd4299842f871285a88049352ab301ffa1f233d2595b29506158635 ofl/blackopsone/OFL.txt +sha256 52caec7d90533523fa7da64e95faf90ea32a663ce21847a39234b61e18d25044 ofl/bokor/OFL.txt sha256 d13a278247ce39695f5ea6b721103faa668083022c5280b78c6392263e473929 ofl/bonbon/OFL.txt -sha256 f0be7437bbb8b91ad4a4f7a5f3d0020368e494a803d892df03e8886d51f2db3a ofl/candal/OFL.txt -sha256 a68d8ec6bea7f277053ae93bf563d4b97c233f09f8e79f86ffe5db66f31fdddf ofl/prozalibre/OFL.txt -sha256 b00c646b7d04a6da1665a148815b8c589c1e05ed7e1febf7ccbd91758747cb03 ofl/quattrocentosans/OFL.txt -sha256 a3deaae17ab9a15dc3c2778126aa6f80d41d567741853f84b16a9e1318ed799a ofl/koulen/OFL.txt -sha256 50f7b09af5ff677f611a96cdf5eb916307c59b29f2e8144942718cb432a9bf6f ofl/margarine/OFL.txt -sha256 72a22b6dd29b6b0cdcc98de30701b46532c9f7314ee095df3063d10775dd70c3 ofl/trochut/OFL.txt -sha256 325e890b8b26fe0a683c3ba24c506d902bdd7034d9c47bd7fa2bb72b5433b9c9 ofl/shrikhand/OFL.txt -sha256 62fab0ba1d5593782cbf048da193f4b1edc16b817577a99d707827513ad80e9a ofl/overlocksc/OFL.txt -sha256 d941aa56e280b4f204272c4b1add01a8ebc7af3e8e69ba8ba9118aa2a5306dde ofl/berkshireswash/OFL.txt -sha256 9134ca6996bd33ea2022e109f13f20e29dee1dcd8b2e8878aad576d2ca334e9f ofl/cormorantsc/OFL.txt -sha256 36c285c5472c625901d4a13da7e31c5ea6126678d31d56cf95572c49f27c8950 ofl/passionone/OFL.txt -sha256 fbc351e1b5428e4f45834647dc23a5f8aaa3e744e2f4117ca03c44f640b9a3a2 ofl/stintultraexpanded/OFL.txt -sha256 021d5f1df697848da51620394659187be77cbe382ff2f896bc84ffb89c0c2d52 ofl/portlligatsans/OFL.txt -sha256 85b700bfba1250a6f8bdf930cd7113faf3d8e9dc52cd89eb98c3ac8a038a4aa9 ofl/londrinasketch/OFL.txt -sha256 c972795e48b096b6d4e3a947b0bb21c1baf1922a6e07ff9ada587c058f228740 ofl/coustard/OFL.txt -sha256 eb4a7a082fb0e7dde0a8f975d33f02907ccbe40751c8115e790cf3679787d01c ofl/strait/OFL.txt -sha256 9b1cfccef4a7e19f90e2901f808f3aec4335d3cc81f978453ad0c8ded14447a0 ofl/novascript/OFL.txt -sha256 43c89012c2b640187aae7e0c83d5ffa8381a0368c00e8426594358d44d3811e3 ofl/nunitosans/OFL.txt -sha256 fdecdad755f4e5e95bee491c7521f31625dc08283562ea8579543c90430eb269 ofl/karlatamilinclined/OFL.txt -sha256 5e80642a11aff2ead815949a8a929aff3fb7b9b6a24391406068a1b204dcc8ba ofl/abeezee/OFL.txt -sha256 bd77eae571de83ba3884c74c7983e8ac5cdf858badc36906179346dcd7e82454 ofl/gentiumbasic/OFL.txt -sha256 f2fcbde4b8968400d661e7dcc23052b1885815c8e3b45323b26cbb833352f5de ofl/timmana/OFL.txt -sha256 c8af073a60e30b55ef5d0e4f80cea168e06dd65bdee7ec18c1ea8de8f7228780 ofl/strong/OFL.txt +sha256 4653c63a4bab99aa50de5190853fa21ea6c0a25d69d49f5a42cd51f0f67665e0 ofl/boogaloo/OFL.txt +sha256 f3ee3eb20a9d565bee2bbc0d616de382a113327d7506565b2f3d3bee5f489375 ofl/bowlbyone/OFL.txt +sha256 f3ee3eb20a9d565bee2bbc0d616de382a113327d7506565b2f3d3bee5f489375 ofl/bowlbyonesc/OFL.txt +sha256 44b51296985184d9b27fc2c8e5b317906c5d65d9dc834e81c07902d3e5e1cf1a ofl/brawler/OFL.txt +sha256 fbe0442a6b1ce162c95e241df76cab5ef2daf6a5ac84ae1a7a6749f32c051098 ofl/breeserif/OFL.txt +sha256 f8a20490ee8ad3adb2205ea44b279b19099a3a1d6b62849e90b4db20a77deeb8 ofl/brunoace/OFL.txt +sha256 3c187c861dc291b9f7f96f655656f9ac2d57b33da425bd5962810be728344f57 ofl/brunoacesc/OFL.txt +sha256 26daffa24723bb188643085cfc5423f9d78d22a395df4a7928380e430545a201 ofl/bubblegumsans/OFL.txt +sha256 39602407e30d466bf169f46d690aaae4f5f039258e5642f91a80bb132ce6e14a ofl/bubblerone/OFL.txt +sha256 a9ef1db03f660130790beeb3b5d91b68536a44a98ec2db3097d02a1c5f91c599 ofl/buda/OFL.txt +sha256 3bbcf1617d93d3a949a10da78ae91c58be536fb04567ab4b5b9fd207126f1db5 ofl/buenard/OFL.txt +sha256 2ce1c4fcf4ab9c8474d0824434497d4afa4425db4de5629103698b170ac4ee74 ofl/bungeehairline/OFL.txt sha256 2ce1c4fcf4ab9c8474d0824434497d4afa4425db4de5629103698b170ac4ee74 ofl/bungeeinline/OFL.txt -sha256 013e33b6b2919fd0ffbdde6080a1c0f4521689fdce0f4876a59cf49ff8ae31c0 ofl/geostar/OFL.txt -sha256 e55c615ed00ce0054bd356041a41e5942b4a8cadceac1e32696ba2ef5f06f748 ofl/andika/OFL.txt -sha256 4705fc9bceb299b2a951d23c321d31f3679871bb99ceadb978907704d211f4f2 ofl/pacifico/OFL.txt -sha256 2887c5bb38abbde9ccc608c4dcc4b0dba0fefc0c74eec011033bcfbd3ffcb235 ofl/jacquesfrancois/OFL.txt -sha256 99d67fff016522688b8f913377f8ae9f6da6ffeae42cf67c0e5e87cfb0928d33 ofl/unna/OFL.txt -sha256 bba4a13f03d0fd5b476cc148feda6895dd8d65f34b2107ba9d010ad9539d6c0a ofl/faunaone/OFL.txt -sha256 842b4f4605b32518a1269c4d030d719ea2c4c317d699fc4441d0219658e18893 ofl/seoulhangang/OFL.txt -sha256 58bbdbe5c48dd1d7cfd658425a455c29811181873d3a46a4932c29e5b0ec16e6 ofl/euphoriascript/OFL.txt -sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/laila/OFL.txt +sha256 2ce1c4fcf4ab9c8474d0824434497d4afa4425db4de5629103698b170ac4ee74 ofl/bungee/OFL.txt +sha256 2ce1c4fcf4ab9c8474d0824434497d4afa4425db4de5629103698b170ac4ee74 ofl/bungeeoutline/OFL.txt +sha256 2ce1c4fcf4ab9c8474d0824434497d4afa4425db4de5629103698b170ac4ee74 ofl/bungeeshade/OFL.txt +sha256 ab5499b975c2dc82f533c6f13c5fca589df4d57c7c400db5f6ca8565ad9c2fd3 ofl/butchermancaps/OFL.txt +sha256 a0369b1d5f654110f2fe101db56a02d02806f1e609ab233368bc573ec45050e5 ofl/butcherman/OFL.txt +sha256 d64c91b0306b53fabed08762068eea8b918d654fb0721c288f13cefa4aaf088c ofl/butterflykids/OFL.txt +sha256 a20db45220b6c4dc9776f24c77dc9ec7a98977d8b3c65b03aabe66b2d08e0791 ofl/cabincondensed/OFL.txt +sha256 8b89f3af5fd02216793ff3dfe9a04dc22dfe5c213422ae21558ff1da6a1e94dd ofl/cabin/OFL.txt +sha256 f6fc9fbae062e4efc1b0306e27715d43cd64a48b8ffba81c22034b8efee4fce2 ofl/cabinsketch/OFL.txt +sha256 8b89f3af5fd02216793ff3dfe9a04dc22dfe5c213422ae21558ff1da6a1e94dd ofl/cabinvfbeta/OFL.txt +sha256 bcb0bda74430ccc281a616a81d0a287fed5a423815b00b222e0b7f603f85b26f ofl/caesardressing/OFL.txt +sha256 c0a8947de199b422d30c16137e4decd5362e3a1d504422880d69c02bd6046dac ofl/cagliostro/OFL.txt sha256 17b90cece30db64934b7299fd76b033a3774c8a990e78badc74c59a5be8e0727 ofl/cairo/OFL.txt -sha256 5f8ff4a3f951c104e99245bdb952be08c73369222048bbf19fa3bf7170d10949 ofl/sanchez/OFL.txt -sha256 8eb1c1019fe7fe6d0b6e7d7bbbba1d9cbdd969d8c5f26455708f6cfb8a77284c ofl/nanummyeongjo/OFL.txt -sha256 942d51cf079299e83e9dd7a9a37eb92260524e8d1d576b2f0b3f7ca207c53f8e ofl/newrocker/OFL.txt -sha256 117fa195cff980e3b10fd8e8e21658c6ec954b0886647970a03c9694d3553b69 ofl/galindo/OFL.txt -sha256 1d08c63944e639bbfe8a1b81e3c6a63836806c126b3573b9cda0db83fd27ffe9 ofl/athiti/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/annieuseyourtelescope/OFL.txt -sha256 f2ab7e5c5c750fa03a8d8f64c72a089ed86fbd3dc172440fcc704b27816d5957 ofl/noticiatext/OFL.txt +sha256 846e8cc6dc69bf685d2db14cfa758ff3d9d771d54c9e0d3b511f0ecb97ac0e8a ofl/cambay/OFL.txt +sha256 5454dc5cf2f46a2005f42f13ee2a998c7d0afd7f556f32fda208c72b266f7adc ofl/cambo/OFL.txt +sha256 f0be7437bbb8b91ad4a4f7a5f3d0020368e494a803d892df03e8886d51f2db3a ofl/candal/OFL.txt +sha256 643c63caf03855ae29be68035d8888e95eadc767a1d92f163d686da1b0a1cd3c ofl/cantarell/OFL.txt +sha256 f8fbefb5b1004615e6d1e84b1c75e68520d91196f600cb1b07620dd2748eff64 ofl/cantataone/OFL.txt +sha256 867b506cb023eae20c1accde77b2e0abf7d8a9e2620da8dbebac9f7b1117ca0b ofl/cantoraone/OFL.txt +sha256 13e862ac3f67130f58bd4bebb61c588d147b5a555b1ac6959570799c4f648cd0 ofl/capriola/OFL.txt +sha256 8e28b778b6e1a7ff9ca72f4dee2d53120aa2856dc1bfd0be44307e365b0e45bb ofl/cardo/OFL.txt +sha256 806cb93632b8091cd36554642a96b2752bab50015da6a2b456d786c1f9aef5a5 ofl/carme/OFL.txt +sha256 afc1b710d644c1262e1765d2401abcf93a545a4cb051955e2243fbabb8164e25 ofl/carroisgothic/OFL.txt +sha256 afc1b710d644c1262e1765d2401abcf93a545a4cb051955e2243fbabb8164e25 ofl/carroisgothicsc/OFL.txt +sha256 c4afe82f49c05689c40dd4e262803b29c6e611e7b4efd3a0418f574b2be79d9a ofl/carterone/OFL.txt +sha256 c88333734ad7cd30540ec6614d12aa829a0395715de30e336d22ddfa3005db42 ofl/catamaran/OFL.txt +sha256 1e5bf8207a40678bc401e2e5456d0db1f2a183b550a30976b48dcdd6a4e4c46c ofl/caudex/OFL.txt +sha256 21b54eb0d7513524798a00dfbaf99a02c003a0012a728cc5f0e02d24c50482fb ofl/caveatbrush/OFL.txt +sha256 21b54eb0d7513524798a00dfbaf99a02c003a0012a728cc5f0e02d24c50482fb ofl/caveat/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/cedarvillecursive/OFL.txt sha256 9a33b452a3107542c35fc5fcee80e4d8798c82aca071c2f6f58a0f8dc5ad61fe ofl/cevicheone/OFL.txt -sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1 ofl/balootammudu/OFL.txt -sha256 8f24842e9174beda18a556c2ae7d54f5dc444340c19a3a9ef77e23bca366adbd ofl/firasansextracondensed/OFL.txt -sha256 746b384383888d9325ed2fa9c40d2456b458aa190dd2b8c515ed4f02a1075bb7 ofl/magra/OFL.txt -sha256 8f24842e9174beda18a556c2ae7d54f5dc444340c19a3a9ef77e23bca366adbd ofl/firasanscondensed/OFL.txt -sha256 fe9183a0b7c1ae626b14004cd533c89ec7c192aba017f81ab71ede910256abb2 ofl/abhayalibre/OFL.txt -sha256 876db27db250a9b9c03fc2ef30a5efe1f37c2ed2686d368c3779583bdf746912 ofl/balthazar/OFL.txt -sha256 4342add6f0f2261f8579f31c10a55938930559703eed18be4a33b74eb749d298 ofl/doppioone/OFL.txt -sha256 d8eb8611f8c98d20cbf18a28425652d6022dc2a5cca15026b920f1f2bc92a612 ofl/deliusswashcaps/OFL.txt -sha256 16a8be6ac4b009ba1dd1e17cea48762f4915609ea5dca1303f716cf63998739d ofl/adamina/OFL.txt -sha256 1d567f7c5f579d9031ae5edfb0108b4681bdd2e036249b228cc2843d3f052a0f ofl/redacted/OFL.txt -sha256 866669fde730bf2785f44905ec162f05f2b8d9f6dcf366aca99360fedbfe502c ofl/dancingscript/OFL.txt -sha256 008445a4d53fbd71bff9cf733bdfd841a1b15fb58ef3473f7bab4c456e3b2930 ofl/ovo/OFL.txt -sha256 b7eae5e3c3447f70caa14e0c43f5e0d953f54ee59df406f6362863bcee1a0a95 ofl/almendrasc/OFL.txt -sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfellgreatprimersc/OFL.txt -sha256 95d23e4559ea8c6a36aa04fab56e1dca0780f5d93734072d4501023296543102 ofl/archivo/OFL.txt -sha256 3747fdcbfe4f51d6a2f101c35105bacde3715b3c32b34b6b03e5fb37983f89fc ofl/quando/OFL.txt -sha256 38a83f1f8b6efc3ab354b8b6eed22e8524dc71280844dc24811d95ae27b34952 ofl/khyay/OFL.txt -sha256 b8fb5cd1bafb52e652c733fdb75ee20c763e97acb0398f6b4bbe1d8ada0c07e5 ofl/misssaintdelafield/OFL.txt -sha256 a3b0977c5c25101d45054cf9199b9127b05fddc79d4da7dcf400821824e5a6d0 ofl/radley/OFL.txt -sha256 41f82bb4d24b304f30f7136bc47abdd083782e4265c984160f5649d1e78ea49c ofl/montserratalternates/OFL.txt -sha256 7c05152b2380228795cb474819744653fb03ddbfe5990b912ec7d9a41387230d ofl/asapvfbeta/OFL.txt -sha256 d3909465d5838d9d1c72b975ff1ed4f410a85dccd43801be525bf2b2bde89f92 ofl/snippet/OFL.txt -sha256 2ee5e8e47cd7d08f60bb9555f72b25912c9e81b13f5bc9a0551ddf943da6ca98 ofl/mukta/OFL.txt -sha256 f323edc1e5a6d8fa16120aa15367cdfb15468474cc621f9bda1a2f73c5d08d73 ofl/sedgwickavedisplay/OFL.txt -sha256 eef925ad6afcbba33f7989f5ad826fd68d50cc1ab4d679c52927c8afd40bddf0 ofl/sedan/OFL.txt -sha256 4281c00ab5b8f672fc8d686f48cb886ffbe900c8c9ee22473ca7e72e7cef8fbe ofl/wellfleet/OFL.txt -sha256 8b89f3af5fd02216793ff3dfe9a04dc22dfe5c213422ae21558ff1da6a1e94dd ofl/cabinvfbeta/OFL.txt -sha256 4bf7256c8ee73577ee5e26643d3247ec77017ca04489befd3e0f3412827729c7 ofl/laomuangdon/OFL.txt -sha256 399b33eb38cdfc76b8665defa5f81d52e8193d630ad5858c893db6bc20031bc9 ofl/rye/OFL.txt -sha256 aa5d677391db4e54ad324b6888792e533c5d800de7ab713302a2fc8bff2f4f6e ofl/miltoniantattoo/OFL.txt -sha256 8594350034ab1cb85a1946ef8852e69290255816c311450a66fed6eeda9d6292 ofl/anonymouspro/OFL.txt +sha256 13831d02389d917d22fcfa6c79f98f8acbf61d230add0e73a4d4dc5f3bfb9e56 ofl/chakrapetch/OFL.txt +sha256 49f2a11271968a2ce019a43bf5401d1593652a18f27ea59037ff5e39856d2df7 ofl/changa/OFL.txt +sha256 67261c7ceb3e627da5c94d6617dac6da29bf36b910bee304a7680ad62e2c8b46 ofl/changaone/OFL.txt +sha256 e98ce988fba1c138f4e7c0c5120809706ab1b24a3c29638ca83ab2ff082e08db ofl/chango/OFL.txt +sha256 41423e9e1d0ea79d0e78bd5fe9e0b27f4c23140706f5dfbfe116839c83aae91c ofl/charm/OFL.txt +sha256 23b896f4937eac954a383340c92dfcac1c6e05ec21cc08ec6de47d30ad8496a3 ofl/charmonman/OFL.txt +sha256 8c495ddd455def58a45310376a747bb61bf86e4b071cc527b3618bccd3ef00fa ofl/chauphilomeneone/OFL.txt +sha256 5d3457831b42632d958fe1a14a09706d8acb006486a5ca5b2b419cd61cb22e32 ofl/chelaone/OFL.txt +sha256 ae6de2f6fc00f76cc7eb0d97c1ae5e0b7ec734f20ad7f58cf4c74738dc822d21 ofl/chelseamarket/OFL.txt +sha256 bb8fac04b8535d39fb9851c9d886248d25bc0c82000066c92dd577c3369f512b ofl/chenla/OFL.txt +sha256 d416bc9437e1d7d8aba0613395ee49c95ce72d680672e910c6205b545cfcbad8 ofl/cherryswash/OFL.txt +sha256 f27cbf1055db7b9dd80bce5cd12b462f2d9ed7313d84dd8bfef1ddd2b61bdfc5 ofl/chicle/OFL.txt +sha256 b054962de0af1397d5350fddb4d6bb20f5f2e073b543eeeb694c7c3b27144fc5 ofl/chivo/OFL.txt +sha256 74584d937293a9cacdcd2eb05851b71aa1527901c18b87961d2f877c77a1b486 ofl/chonburi/OFL.txt +sha256 1e5d6660366ddcfca4f2fc10e2acfba9fa4d97d40aec80d7dbfd41d730a420ae ofl/cinzeldecorative/OFL.txt sha256 1e5d6660366ddcfca4f2fc10e2acfba9fa4d97d40aec80d7dbfd41d730a420ae ofl/cinzel/OFL.txt -sha256 351740da2d452b48193483f22f64918a6dfd64a7abe225c6187ad3f36e0d9cd8 ofl/postnobillsjaffna/OFL.txt -sha256 64a73da7af818283168543e24bd214aded1bfec06f013bf9cebc20064a8560c5 ofl/elmessiri/OFL.txt -sha256 4fece81b541808b40293b0cd3f5b1990274e1100e1c20455dc2987cd96639d3f ofl/metamorphous/OFL.txt -sha256 8d325681662a30f58f57c92ab656dcbc9679deb78a493e4c0eab75321b2df6c3 ofl/worksans/OFL.txt -sha256 2887c5bb38abbde9ccc608c4dcc4b0dba0fefc0c74eec011033bcfbd3ffcb235 ofl/jacquesfrancoisshadow/OFL.txt -sha256 aac8f0cda6159b7251d1034651bcb42e07611495bc8cd764c89d22f3123032f8 ofl/aladin/OFL.txt -sha256 81d0973236b5b5709a80a217a330db36eabedf57bf4031de46b4660b69901234 ofl/leaguescript/OFL.txt -sha256 5454dc5cf2f46a2005f42f13ee2a998c7d0afd7f556f32fda208c72b266f7adc ofl/cambo/OFL.txt -sha256 b2d4b0c773afce947728ab99fca43b242b7edb0da26fe29f60c7c2d5094ec23e ofl/suwannaphum/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/labelleaurore/OFL.txt -sha256 6939af7114f0a33c7e6142d4c1320d1bbde11aebe6d8f3c48fc5fb3e0f676a7b ofl/jejumyeongjo/OFL.txt -sha256 cbdf9d35f32a9a2f02fb23c8b89c115a5a8e45feaaa2266920c4594c83dd5ed4 ofl/tenaliramakrishna/OFL.txt -sha256 95d23e4559ea8c6a36aa04fab56e1dca0780f5d93734072d4501023296543102 ofl/archivovfbeta/OFL.txt -sha256 967d75b89eef1f8a0ba1f5ee7dfb13427621f9116c6e7878ca04da8c9aa8641b ofl/mrssheppards/OFL.txt -sha256 8af83da84dd4299842f871285a88049352ab301ffa1f233d2595b29506158635 ofl/blackopsone/OFL.txt -sha256 548890e4083028f04e5feba04b6e00554654d840aab81c8664eb66c2216a571b ofl/palanquin/OFL.txt -sha256 c4cd9f38c3246ee6a68c264f017320dc1af09677d386166d8cda806d9a12e0d2 ofl/jockeyone/OFL.txt -sha256 a36ab46c8b1a74a480a1c51d6a5af08b643e870c6d247f233bc97c97c8ad2098 ofl/tuffy/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/nothingyoucoulddo/OFL.txt -sha256 b5c776129b160163c84620b35fd45dea45edf49789cda5a94c2290c230581e0b ofl/scopeone/OFL.txt -sha256 dd028a807788d5e22e9f8cc18f026cda23369954673658f2ecc7d30bdb364b89 ofl/sintony/OFL.txt -sha256 8928e999ff156e35852ab41d7a906598a8285acd3bcd81dff67213a6cd98d43e ofl/mallanna/OFL.txt -sha256 473c5e3123102434d05c66a9fc8b19cf285a3bf71cd8a91a41acef44d1448e62 ofl/sevillana/OFL.txt -sha256 22d1914919d3fe08b179dc31169fc743ca7eede7827b91a5d48c23c8cdc7cb81 ofl/anticslab/OFL.txt -sha256 026610186158060ad351fb20cd1452def5d35b2531634c090ce8cd1d9e9aeaf2 ofl/michroma/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/shadowsintolight/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/architectsdaughter/OFL.txt -sha256 61056041809e0ba18bf8b9d637a375ab1c725025428533d74d668d88b2cb8b89 ofl/simonetta/OFL.txt -sha256 0a852a06f0256a6684662663ccb1d8e08d131abd1f70cf8d972a344cf31aa381 ofl/scada/OFL.txt -sha256 f46c3ea04f38ea73c0731d73dfba3d7361d4b38970feb31a3558bd1b75e0656a ofl/lobstertwo/OFL.txt -sha256 f30a7045e4e21201182b2b9fc4e4b96189aaeaceb2c8e9b68d8bd3dc4e3c5a27 ofl/greatvibes/OFL.txt -sha256 9bc1eb1c679510b32d2e3f5f4f3b47726b1657aa121494aa68ba0b124a3c3a53 ofl/ewert/OFL.txt -sha256 1103d0731f1360eb156b0047a1337b2d62266fadcef1015d06f6263719c0200b ofl/librebarcode39/OFL.txt -sha256 359671bf16c00cae69cb66d041296b2adc7a4becd73a463cb8c5e101d97c7986 ofl/arvo/OFL.txt +sha256 ec1d7de447a90e4b6d8f2b4f95c7f89a70e315fdb41969bc716059e4f2461fa4 ofl/clickerscript/OFL.txt +sha256 0b1bada9befa95a40d55830fe83fc7f8064e245fea33bdf0f96f57848f3866fa ofl/codacaption/OFL.txt +sha256 0b1bada9befa95a40d55830fe83fc7f8064e245fea33bdf0f96f57848f3866fa ofl/coda/OFL.txt +sha256 35dca6122235851d236bd861124f4a893d409eba021cd8c6a292a19df0f4640d ofl/codystar/OFL.txt +sha256 5c289da4a19f054ace8e31a144a6a254601898cd7faf9eaa301141afda0adbbe ofl/coiny/OFL.txt +sha256 574430e571a6928624f4bdf044420f7547a26309b7ebf6962296d33294e0a1e0 ofl/combo/OFL.txt +sha256 bc85bae0b512b799bbfb2b916e4d0a34cfd963d09778cd783e248b479e67760a ofl/comfortaa/OFL.txt +sha256 162a3b5c72cba845280a6f887c11d02984540b924510138c8b1eb473bcdafb6a ofl/concertone/OFL.txt +sha256 2492bb8645caaf622bdc3e880cdc9b069921e7341346d7b193666c866a1935d0 ofl/condiment/OFL.txt +sha256 08a12877eda24767239f26b527bfce0c515efaf623c66da6baad92a6d5315e9a ofl/content/OFL.txt +sha256 90bd333a5cf0ed09264fc3e559d44979373f6c3d983b0f65cc46e952b4eb61f0 ofl/contrailone/OFL.txt +sha256 354b4be0340cd58e381fdf58793a108897bf944a7f8faf9e877c476ed6c730d1 ofl/convergence/OFL.txt +sha256 c832a4230a713d080aa2f2544d9a298ed911f689b2c48f7f276a0196b16d2b8a ofl/cookie/OFL.txt +sha256 7a1d085067cd589026b256dd85af1eaa1087fa0f3d468192724c5138cc14d894 ofl/copse/OFL.txt +sha256 aad1e82802172d4c1d22dd015a5b8b4275e5665a49c1df54ed64716fca7ae194 ofl/corben/OFL.txt +sha256 9134ca6996bd33ea2022e109f13f20e29dee1dcd8b2e8878aad576d2ca334e9f ofl/cormorantgaramond/OFL.txt +sha256 9134ca6996bd33ea2022e109f13f20e29dee1dcd8b2e8878aad576d2ca334e9f ofl/cormorantinfant/OFL.txt +sha256 9134ca6996bd33ea2022e109f13f20e29dee1dcd8b2e8878aad576d2ca334e9f ofl/cormorant/OFL.txt +sha256 9134ca6996bd33ea2022e109f13f20e29dee1dcd8b2e8878aad576d2ca334e9f ofl/cormorantsc/OFL.txt +sha256 9134ca6996bd33ea2022e109f13f20e29dee1dcd8b2e8878aad576d2ca334e9f ofl/cormorantunicase/OFL.txt +sha256 9134ca6996bd33ea2022e109f13f20e29dee1dcd8b2e8878aad576d2ca334e9f ofl/cormorantupright/OFL.txt +sha256 0836fd874230b17f840efcf7d3bb529f5a7b5befbfeef94478519cfe2d8551c2 ofl/courgette/OFL.txt +sha256 c972795e48b096b6d4e3a947b0bb21c1baf1922a6e07ff9ada587c058f228740 ofl/coustard/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/coveredbyyourgrace/OFL.txt sha256 c09e3b81d9cfeec46bc29a3374000e8ad013d694bdf24a288088491dd4cd5c69 ofl/creepster/OFL.txt -sha256 29bd0cfd0fb2a45f9b057c834a057724bae1f63b525a8ac83d3e7525706d9f80 ofl/inconsolata/OFL.txt -sha256 85814924eca98e1fa530901cc5167d0012aaf31122f9570d7e9755443dd9335b ofl/siamreap/OFL.txt -sha256 223fa23e8419ee762c662e0faf912dfcf386fa7093ac9ff690e380ce1993ba55 ofl/asar/OFL.txt -sha256 a0369b1d5f654110f2fe101db56a02d02806f1e609ab233368bc573ec45050e5 ofl/butcherman/OFL.txt -sha256 4f8b437578b20bff261adfe6c02f63bcf7dbb6a45ab37804b3547e5d5f44927b ofl/nosifercaps/OFL.txt -sha256 793891edf1f4f4f35b52fcc9706b03f779c7ea18ab8e9e441242d63ef0279488 ofl/autourone/OFL.txt -sha256 842b4f4605b32518a1269c4d030d719ea2c4c317d699fc4441d0219658e18893 ofl/seoulhangangcondensed/OFL.txt -sha256 1c023b4aca0e441c55c45c86cdff57fa524a96778f291d9a29a4ad777b70e2e3 ofl/arbutusslab/OFL.txt -sha256 de61c87e08286ad3215398340e9403125ab03c91b33bdf29de6d3e8a386d2d28 ofl/dangrek/OFL.txt -sha256 53ad6a474f68ddfc3fe72449de3ede4d3f033b2f24b77833b1d56edf505486d2 ofl/sura/OFL.txt +sha256 4938e917ac54665be1dd862f54634d991b39c5d1eef69345d66a5089e401bfb4 ofl/creteround/OFL.txt +sha256 490b8f3acbce2331adc9b9d3e75ee6fe07946fb29af429a300c7d066b1250b2d ofl/crimsontext/OFL.txt +sha256 eba176d3ae86af6b41e9b744e4d18fb56e2a6ad671381bddb61fabb86b1d39c1 ofl/croissantone/OFL.txt sha256 247edbf968c0a5b8defd6a9e420080a8bbca6ea002bfb326d12a472a6f95637b ofl/cuprum/OFL.txt +sha256 1a2debd5ad8e656b26bb3b29213caa8f7e557a2f31454b11ebb6c3e3b59aa5d4 ofl/cutefont/OFL.txt +sha256 bc4c7eb365ea342b1a027fb8417fb0152f5d482a2e31c012fbfa29b668827b04 ofl/cutivemono/OFL.txt +sha256 1404cc9279d4ad713a372a5e1e1d20d7b9b000d2397c8529aeb3df5402446600 ofl/cutive/OFL.txt +sha256 a21fa252efb7a1ff84de6a36df4386959668aa046f28161b4047829f7d9cd1b5 ofl/damion/OFL.txt +sha256 866669fde730bf2785f44905ec162f05f2b8d9f6dcf366aca99360fedbfe502c ofl/dancingscript/OFL.txt +sha256 de61c87e08286ad3215398340e9403125ab03c91b33bdf29de6d3e8a386d2d28 ofl/dangrek/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/dawningofanewday/OFL.txt +sha256 cacad5bf45bf5c81f4b6cbd114261bc8a08f6110b66a4c6fad8bbc16618a3096 ofl/daysone/OFL.txt +sha256 64ecb0c6bf5cd80c3da76035c00671272966afbd32ffbdbcad95a8b56501fb08 ofl/decovaralpha/OFL.txt +sha256 f139d6f43d2a63a8fb3ded48b8ec747d9d59a7fbb13d077d9b96ac88580bc1ad ofl/dekko/OFL.txt +sha256 d8eb8611f8c98d20cbf18a28425652d6022dc2a5cca15026b920f1f2bc92a612 ofl/delius/OFL.txt +sha256 d8eb8611f8c98d20cbf18a28425652d6022dc2a5cca15026b920f1f2bc92a612 ofl/deliusswashcaps/OFL.txt +sha256 d8eb8611f8c98d20cbf18a28425652d6022dc2a5cca15026b920f1f2bc92a612 ofl/deliusunicase/OFL.txt +sha256 19e186a088a50835b38b59409a76b8df2d0252ce114a99e79e306231bbe253b7 ofl/dellarespira/OFL.txt +sha256 2e2fe5f1d8916a5160060594a96c1a5116406d26847afdbd09618481e2abd6fc ofl/denkone/OFL.txt +sha256 bac36a7fcafc5702d9d928bb81c7de9f8739eaa820e546c3d2cc52730b652af4 ofl/devonshire/OFL.txt +sha256 9e53298e3629e00ae4c31531cca09051ddaa654a5de4f7b55e596132fff86e1f ofl/dhurjati/OFL.txt +sha256 00a6fe8dfdc48d6206bcc4f10a765515a73433dfba7255eff966963beb26facb ofl/dhyana/OFL.txt +sha256 36e2f1debc9778bac79fac1a0cb5a5ef51c102f00b58ef7d8a05324144b68166 ofl/didactgothic/OFL.txt +sha256 cdf5fc4014abe91588666a9592ec86200e5a4d743b4b6e05d28d47e850bbe5fa ofl/digitalnumbers/OFL.txt +sha256 ce0023bc03e1428feb5abfaa939b601d2d827ee5a6c84a2657993a7b16c5290a ofl/diplomata/OFL.txt +sha256 ce0023bc03e1428feb5abfaa939b601d2d827ee5a6c84a2657993a7b16c5290a ofl/diplomatasc/OFL.txt +sha256 de5ff32211a4340b01477af39ee339d639438955e409f79b666d4b9207f3c92c ofl/dohyeon/OFL.txt +sha256 dcc832bd71ea62cbf97f06327a1b5442905b49ea446801421d71f7d1362db215 ofl/dokdo/OFL.txt +sha256 96e65d9c227a972e38035b849bba1e8b7879eecbb52f278be1e71dd481187f02 ofl/domine/OFL.txt +sha256 8aa063e3a1299c5e1821f386f5ca8bc157ac561bd12c739ffa81c6f0821450c0 ofl/donegalone/OFL.txt +sha256 4342add6f0f2261f8579f31c10a55938930559703eed18be4a33b74eb749d298 ofl/doppioone/OFL.txt +sha256 92f750829545386017c3418d890769778b76fd01dfb41c62fcbb0d42ba0303eb ofl/dorsa/OFL.txt +sha256 faf47a1ceab38b07205b9d58fbbf9ac39772ea47cc731aca7816276da7226a22 ofl/dosis/OFL.txt +sha256 3621f156cc7a26e0a9cb413332e0bb35a0e76b36dbfe0b1c885b565a7bf3051e ofl/drsugiyama/OFL.txt +sha256 9df0700fcd0ef48abd74459a8650d35f59397fbaa00c5b00527e57cc155689c0 ofl/durusans/OFL.txt +sha256 ee2c069b30f3e9a5aaf52357117ee3443ee27f17c29a2ec68861db283379905c ofl/dynalight/OFL.txt +sha256 3184f6a99f589c78740fbff6ddaaabb43b8cc2f3852da36e60aeb024ea8d6f00 ofl/eaglelake/OFL.txt +sha256 39de3de5f1873f89bca4af37823ab22e28e88d0d8f7fe2f07e82e9e6e9bf7b70 ofl/eastseadokdo/OFL.txt +sha256 5946eec3a7d3bda02825930156e4716198e7753641dd3303a3e8c386c8011909 ofl/eatercaps/OFL.txt +sha256 5946eec3a7d3bda02825930156e4716198e7753641dd3303a3e8c386c8011909 ofl/eater/OFL.txt +sha256 6f9e3a1c51f617e7b110862426204ec7a56d8c6d2f731373b5de6b8d069099b6 ofl/ebgaramond/OFL.txt +sha256 1b3b78123c94dcbc9fd4ec174317336c8c93423da62dc946b8852553cb13ddee ofl/economica/OFL.txt +sha256 b4cff421cb89d1e32036e818f291f8ab0d3294ada70b5883d5bcc6470b869702 ofl/eczar/OFL.txt +sha256 2ee5e8e47cd7d08f60bb9555f72b25912c9e81b13f5bc9a0551ddf943da6ca98 ofl/ekmukta/OFL.txt +sha256 c4955dfe15a5db10326aa58ef767460c42cd12a3acdb3e698eee2704eb373d94 ofl/electrolize/OFL.txt +sha256 64a73da7af818283168543e24bd214aded1bfec06f013bf9cebc20064a8560c5 ofl/elmessiri/OFL.txt +sha256 0c3f4763f49c2cd37757a2856ad470aec6a416981ac6d6e3f900c1128be39de7 ofl/elsie/OFL.txt +sha256 0c3f4763f49c2cd37757a2856ad470aec6a416981ac6d6e3f900c1128be39de7 ofl/elsieswashcaps/OFL.txt +sha256 8f94e5901c371537043e0c762c827ce33963e7bd186fbea0abafc035ef7120a7 ofl/emblemaone/OFL.txt sha256 0623888cc2391c6c9853c04eafa7f687fef1a8328bbb848feab05d9e2a98764d ofl/emilyscandy/OFL.txt -sha256 1c43e70c49ef7a9b35fcb3758fec8ec5969ff1274c4834b4466b9014f3b9f55f ofl/volkhov/OFL.txt -sha256 cc31fe974951d56d542f33782d07b2d5577a4afdddba89744e6bd69bcbf3a853 ofl/karlatamilupright/OFL.txt -sha256 cd354a6084383c50398fae709ebe3a5dd98b947c486c1fe9de5f89caf81f980c ofl/snowburstone/OFL.txt -sha256 8a59454b7f1cc0b1fa29805781769047e5c269aa629e3422c2d7fc04b89e5c1f ofl/rosarivo/OFL.txt +sha256 cc8c0c3e81cf543e190f128b83ba7c30959f15865c14dd972fca4917faeceec1 ofl/encodesanscondensed/OFL.txt +sha256 cc8c0c3e81cf543e190f128b83ba7c30959f15865c14dd972fca4917faeceec1 ofl/encodesansexpanded/OFL.txt +sha256 cc8c0c3e81cf543e190f128b83ba7c30959f15865c14dd972fca4917faeceec1 ofl/encodesans/OFL.txt +sha256 cc8c0c3e81cf543e190f128b83ba7c30959f15865c14dd972fca4917faeceec1 ofl/encodesanssemicondensed/OFL.txt +sha256 cc8c0c3e81cf543e190f128b83ba7c30959f15865c14dd972fca4917faeceec1 ofl/encodesanssemiexpanded/OFL.txt +sha256 ef0bdccd20de76d517fb3939161d05ecd5808382fb8fa82cde5fcdb3adcb8029 ofl/engagement/OFL.txt +sha256 a8103c045a88bf9b28dcd7eb60a6662008f49afc0f3721bc46aaf761fc0409e7 ofl/englebert/OFL.txt +sha256 0e74984817cdd51dbfbd8309022aa75f733e80dff0cb1d26ad2157e90446ba97 ofl/enriqueta/OFL.txt +sha256 d484e0dce424a9e360adabb568b6773db5f1566df71ce3e9dcd66a6cc2c38d33 ofl/ericaone/OFL.txt +sha256 5bbeae56b9db61a9bf85b64d5ed9a74cfcf9ee3e9b005bc2906859ddecd5eaa1 ofl/esteban/OFL.txt +sha256 58bbdbe5c48dd1d7cfd658425a455c29811181873d3a46a4932c29e5b0ec16e6 ofl/euphoriascript/OFL.txt +sha256 9bc1eb1c679510b32d2e3f5f4f3b47726b1657aa121494aa68ba0b124a3c3a53 ofl/ewert/OFL.txt +sha256 9e2d92fb24b4a548ab030c509ba88267e224f2523728ee9bb35cf334811106bd ofl/exo2/OFL.txt +sha256 2da0fa5707f1fab1c802969b098fd1b92ca0b3b233a80e27fca416647c064dfc ofl/exo/OFL.txt sha256 de71817dafdecfee21268b8c4f106146e1d00988c4fd6546b10445eb26b24cc0 ofl/expletussans/OFL.txt +sha256 f2c0dfa02d6f5c444b4babd7bc0b43be77ea85706e8524342516bc41e43c2f01 ofl/fahkwang/OFL.txt +sha256 9ca8b9e5db7184105da255bb110023cf1cce6caa56186341bb7b09ba97b20ba5 ofl/fanwoodtext/OFL.txt +sha256 afc1cda4eedcfe27c8cf30fe3e9879587cb43cc2882d4cb91dd3e3fc9eecd0bf ofl/farsan/OFL.txt +sha256 a7fe1f3d23034092b015aaeb53d2ecbc9e592be96b10bdfbcf8700ec6a6ffc97 ofl/fascinateinline/OFL.txt +sha256 a7fe1f3d23034092b015aaeb53d2ecbc9e592be96b10bdfbcf8700ec6a6ffc97 ofl/fascinate/OFL.txt +sha256 2cd51b11e821dad2fb7acc54d68bd9a139fc7a1207e17c432ba9ce49bba3d493 ofl/fasterone/OFL.txt +sha256 19849b33c59d0cffeaad0dbdc38db767e95e03cd36fbbfe6b67a9878aa5758df ofl/fasthand/OFL.txt +sha256 bba4a13f03d0fd5b476cc148feda6895dd8d65f34b2107ba9d010ad9539d6c0a ofl/faunaone/OFL.txt +sha256 f3bc8767749fc133d9b35e84ca024b82f1ac4d1b38deca0adcf8300892303022 ofl/faustina/OFL.txt +sha256 f3bc8767749fc133d9b35e84ca024b82f1ac4d1b38deca0adcf8300892303022 ofl/faustinavfbeta/OFL.txt +sha256 17d7a7f5d9f0139535ecec516988c4c73a2ec0f225987288f3fd6ee2622d4450 ofl/federant/OFL.txt +sha256 e30f893523e50ebbe07acd783ae29c7d604e6208cae7646d993e8528ce13e35a ofl/federo/OFL.txt +sha256 75c7ccf4f537a7a3ebbedd299c1d2542e13d3b27aaf76a0a2d9fa91a2a8fcd3a ofl/felipa/OFL.txt +sha256 8586a7e75681c7297af4cc0641eb2b29e882c5187fe189a1160eceb4e95d4163 ofl/fenix/OFL.txt +sha256 d336c098ea798bf14de111cd90dff7d6bc340852405246511345d0f8564fe76e ofl/fingerpaint/OFL.txt sha256 d1829ff3455bbf3b9d13dfb0a57758a863107c9108aab48558f26f37f1094180 ofl/firamono/OFL.txt -sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/rajdhani/OFL.txt -sha256 26e4c39c4905bd7f1068b0bab008f5a4a9b945e2d7fda31e52719fc5aa9655bf ofl/vibur/OFL.txt -sha256 49f2a11271968a2ce019a43bf5401d1593652a18f27ea59037ff5e39856d2df7 ofl/changa/OFL.txt -sha256 1d08c63944e639bbfe8a1b81e3c6a63836806c126b3573b9cda0db83fd27ffe9 ofl/maitree/OFL.txt -sha256 2758cf7a872827f39661cf8cc24188113c030447aefb5ca7145993650076ca8c ofl/ptsanscaption/OFL.txt -sha256 4b255eb44f613a8e426e195f0d0b7e10fcba1af7eb6047d9a7f4f3c449940e19 ofl/hindmadurai/OFL.txt -sha256 f354ef1e7256644b320c5e1d9a07a819c2e2b930166003c96680894f9fba81be ofl/mrssaintdelafield/OFL.txt -sha256 5c289da4a19f054ace8e31a144a6a254601898cd7faf9eaa301141afda0adbbe ofl/coiny/OFL.txt -sha256 0886960207bb5bcf81a46ce663bab6c52a742dad80ee2cff5cbcda6f1df88568 ofl/rhodiumlibre/OFL.txt -sha256 8f94e5901c371537043e0c762c827ce33963e7bd186fbea0abafc035ef7120a7 ofl/emblemaone/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/gloriahallelujah/OFL.txt -sha256 24af1fb3ab8dfeddc83162b7f3b6c1104149b6c3022f1aa948ef4f8ff7e6bf7c ofl/poetsenone/OFL.txt -sha256 f3ee3eb20a9d565bee2bbc0d616de382a113327d7506565b2f3d3bee5f489375 ofl/bowlbyone/OFL.txt -sha256 70f664de65e7bb62e1ac728f20a9bb28de7fdc18be594186137a9e15ce9dcee5 ofl/niconne/OFL.txt -sha256 e604b133509815768e6ec4738bb04844ce9a23e80099d2b61e5d75ef46acbeb0 ofl/ruluko/OFL.txt -sha256 42ad5a49e171bec80308a1c9e8e66b03e638b3ea65af7fafa6fc0e42f45e7626 ofl/suravaram/OFL.txt -sha256 4fe81901e6f84cfce1145c715e931352a9a12aa7ac75cc193eb523c0cb0e5eb5 ofl/lohitdevanagari/OFL.txt -sha256 2937c7789b0e4fdeda6eafe93164a2ab36e20386704c4cb6f87b1deb620ec0da ofl/leckerlione/OFL.txt -sha256 91c25c350d3cac39da2736d74f7ba37ef648f5237a4e330a240615bc8d8c4360 ofl/ibmplexmono/OFL.txt -sha256 fce9f9e2fb268507a89fceea0b3eccc044f39fc3492968a04fd9e04df5ae95fa ofl/sourcesanspro/OFL.txt -sha256 e12a3e737fa75c0ee072d965b6185710f35e38a4f7a0793ebc66ba14a216109b ofl/meiescript/OFL.txt -sha256 d2f9c74aba2716333b0a3d283083f9fdc93b2e060c5ae094c79e97e8cba9d7e6 ofl/squadaone/OFL.txt -sha256 5d6517d497bea6116ed35079b30374043f6d90b19c8d97fc4e5ec48520d1e08b ofl/zcoolkuaile/OFL.txt -sha256 f8a20490ee8ad3adb2205ea44b279b19099a3a1d6b62849e90b4db20a77deeb8 ofl/brunoace/OFL.txt -sha256 75b2a5f39a53b4cf9286eb3d2cc1f895a8f3442680013c77124121bc347a6448 ofl/lemonada/OFL.txt -sha256 715ba72697e14daa9b29a333545f69bde7c497b9f77d0a2a4c4a5a752d961801 ofl/marcellus/OFL.txt -sha256 1103d0731f1360eb156b0047a1337b2d62266fadcef1015d06f6263719c0200b ofl/librebarcode128text/OFL.txt -sha256 eba176d3ae86af6b41e9b744e4d18fb56e2a6ad671381bddb61fabb86b1d39c1 ofl/croissantone/OFL.txt -sha256 12404fcefccc3cb964cb2406510ba679b30f7d7ae689db08df5b455ae24b3feb ofl/paytoneone/OFL.txt +sha256 8f24842e9174beda18a556c2ae7d54f5dc444340c19a3a9ef77e23bca366adbd ofl/firasanscondensed/OFL.txt +sha256 8f24842e9174beda18a556c2ae7d54f5dc444340c19a3a9ef77e23bca366adbd ofl/firasansextracondensed/OFL.txt +sha256 8f24842e9174beda18a556c2ae7d54f5dc444340c19a3a9ef77e23bca366adbd ofl/firasans/OFL.txt +sha256 2bb0c0200723d923f8e20d08b8bd1c7af7f5cef8bb2d63ce44bd268b54334621 ofl/fjallaone/OFL.txt +sha256 df9fcd8f62ae79aba7fa5b0563a08dfede1fa0909d668287d70c395d88f5fe02 ofl/fjordone/OFL.txt +sha256 e3ea566dbf689a9110b2094f9f2e5d16d7ec31720147651efc1005ca20420dd4 ofl/flamenco/OFL.txt +sha256 4febcc8d6e539db3e0c652da87bc8704f6d48e71e07f8ddb0974094a3de8da81 ofl/flavors/OFL.txt +sha256 382232d1add5623ba5b06394afa071f4eeecccb6d2b2bd02cfecff4a8a45065a ofl/fondamento/OFL.txt +sha256 1bfe7d2aca99042eabf37079152fef8abdda2c36dad454ae89b858a3cb1078c5 ofl/forum/OFL.txt +sha256 09685e225ba9b697b2ccd2d4098cac5ecbed0679960605258a271af60749887b ofl/francoisone/OFL.txt sha256 e2a176ce310235bf281f1124454e21331390ae1b4c429a2d80ae642d333a5a7f ofl/frankruhllibre/OFL.txt +sha256 60fea3a0da19167a3efb9c3792a3a15dc9235405d01bbec1233fdf3e79c74296 ofl/freckleface/OFL.txt +sha256 f8e2b58dd7a8c8e21e5d744b45876bce7e010a647c071c1ed42ff0e618d4ea59 ofl/frederickathegreat/OFL.txt +sha256 43186c592361336474683e302dcc988831a53857bef188c4466f6b45dc238f84 ofl/fredokaone/OFL.txt +sha256 59b91c9912b80714852a43897cbc9414d6457e22072dc99a4cea6e2bb4f3c65c ofl/freehand/OFL.txt +sha256 a40c3a6d0c968d3a10b17a2614606de6f20178deccc2447305f31fb106a57fb0 ofl/fresca/OFL.txt +sha256 c2368518f12463a93cfed44e1460f36085dc60df06f415ee9b0319809987ccce ofl/frijole/OFL.txt +sha256 e43f121c788cca4a14049e58864e28021174b055710ba38e0964e816dbf905af ofl/fruktur/OFL.txt +sha256 5951473ab31533bfe1452bbcece47f237a5546c7e7d45ff1aec0289619623294 ofl/fugazone/OFL.txt +sha256 64dc6a7e2a77aa340c49c3e0829703f540f8d64afa506f44eaa6741580716d0f ofl/gabriela/OFL.txt +sha256 53a9ce47085d9fef613c7ecb3730dc80d25962510bbea231b89564f58240f251 ofl/gaegu/OFL.txt +sha256 eb6c70cb6b575ad22df022d454df7a20582915e6e8da19b579c6cbef37a26bb5 ofl/gafata/OFL.txt +sha256 6a809aeba8af2115ca4b4c3597b1fbeb836a45f0489070f330f9c2dff870da8d ofl/galada/OFL.txt +sha256 d102f22055cfa31a9659228483de3c726010f0b3b416b78e3cbefcb54816e812 ofl/galdeano/OFL.txt +sha256 117fa195cff980e3b10fd8e8e21658c6ec954b0886647970a03c9694d3553b69 ofl/galindo/OFL.txt +sha256 39de3de5f1873f89bca4af37823ab22e28e88d0d8f7fe2f07e82e9e6e9bf7b70 ofl/gamjaflower/OFL.txt +sha256 c6b9c7322fe0203d4d8a0f98541136d8d76da76b92c79d206b09991b98338cc8 ofl/gemunulibre/OFL.txt +sha256 bd77eae571de83ba3884c74c7983e8ac5cdf858badc36906179346dcd7e82454 ofl/gentiumbasic/OFL.txt +sha256 bd77eae571de83ba3884c74c7983e8ac5cdf858badc36906179346dcd7e82454 ofl/gentiumbookbasic/OFL.txt +sha256 cd059851dc2abcd2865ae318e8b949736f958794210acb90316530fd100fc904 ofl/geo/OFL.txt +sha256 013e33b6b2919fd0ffbdde6080a1c0f4521689fdce0f4876a59cf49ff8ae31c0 ofl/geostarfill/OFL.txt +sha256 013e33b6b2919fd0ffbdde6080a1c0f4521689fdce0f4876a59cf49ff8ae31c0 ofl/geostar/OFL.txt +sha256 b7574cd4c76770e5e3915d16bd93f09663bd77cb041a4ec09d824c52b540529a ofl/germaniaone/OFL.txt +sha256 9e19c0d2e7e7adcbe9dfd0749e34dda41e7e356e0f2cc082d61d2fc9b6e0cef7 ofl/gfsdidot/OFL.txt +sha256 bfc205682f5454b42a732ec857b665293ab8bc6f0ee901a0967219ba7ffdb190 ofl/gfsneohellenic/OFL.txt +sha256 bd22e766af8f8e58eb520cb4fa73538826d04f7371b45e82295d22d1e32a4e58 ofl/gidugu/OFL.txt +sha256 d324289a26909a519fb16c3d468a56ab909ad6d9070cac5742e5d59ad9bd9815 ofl/gildadisplay/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/giveyouglory/OFL.txt +sha256 2950994bcfb8e903f0539d28a8ec4af077e0aa1fa7946c33c912d2d6969c2971 ofl/glassantiqua/OFL.txt +sha256 638774cdf8233b5ddaf9ebee1821e9de1d5d59c335d8ee3ba0b47fb17833b502 ofl/glegoo/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/gloriahallelujah/OFL.txt +sha256 042a570b306ab893c6168be7e6e79bbceae46097141357ad0af7ef8bb179ed7b ofl/goblinone/OFL.txt +sha256 fd20b82eb12d16ec31a58fc44f7e6c533b14b425b569d83f616a1f7a9a401e75 ofl/gochihand/OFL.txt +sha256 860cbfdc9dbc3f0e8d35af80c31e8f20945bff393d4f483dfc157469e01d321c ofl/gorditas/OFL.txt +sha256 ed95c33f80ccca002e3a360b683c43368f9c5eb024e5b992abb51af3c10b59bc ofl/gothica1/OFL.txt +sha256 58bdc69f4c6177125c6e7cdbc78f710f5f9952f11bba7bd5b17bd7ef169d731f ofl/goudybookletter1911/OFL.txt +sha256 742a6a4386db47a2987c7c3b4aeedfb5adedfb3356c118de450a664735686535 ofl/graduate/OFL.txt +sha256 4c0a1150a363b42bd8681ff4a00315ac49510a944c4c9978237ff8b90a8920a5 ofl/grandhotel/OFL.txt +sha256 9860b97028024085855e503e32c1971bfd603374641cd018c136433ebcf5a338 ofl/gravitasone/OFL.txt +sha256 f30a7045e4e21201182b2b9fc4e4b96189aaeaceb2c8e9b68d8bd3dc4e3c5a27 ofl/greatvibes/OFL.txt +sha256 879ec56fcc9a961937fd24d542b3b7b3f2b8cb3236b7351e62d16719e25de14c ofl/griffy/OFL.txt +sha256 4579982a484a9745864de2cda666fd7b5017f9182b74dbb4cd53d84c1d1b2231 ofl/gruppo/OFL.txt +sha256 315a576cbc7ab61c9e347b5725893bc8498fdcb8fc10831793c6864bc2cefba8 ofl/gudea/OFL.txt +sha256 391ac3126dacc95b92a8f3408467879edb3245344bc411530a30d5aada52df92 ofl/gugi/OFL.txt +sha256 2bd35914efa381c80f9fb62d6ea7d736d3c0739196a3783c3122593c3408392c ofl/gurajada/OFL.txt +sha256 2a7b0a41ef401e4e0e955280b07c0a2698932d56aad3181089bdbbaad5760491 ofl/habibi/OFL.txt +sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/halant/OFL.txt +sha256 b43e2530c7af69fe1800f180d210b6d2745915ed4e0e404495038c861bb6dbf7 ofl/hammersmithone/OFL.txt +sha256 1f581506286e960436548dba0701aab278f7e67f2adc6bdae2958923867d1e64 ofl/hanaleifill/OFL.txt +sha256 1f581506286e960436548dba0701aab278f7e67f2adc6bdae2958923867d1e64 ofl/hanalei/OFL.txt +sha256 5f1f5510eff7922864bf326ffa1d4a62f01add5193e9367b542378e5a808b500 ofl/handlee/OFL.txt +sha256 d724dea493d89a7a9681186e2fb462b7cd551674960ee4142ae6b325261b5115 ofl/hanna/OFL.txt +sha256 de2246895f0ac21fe05b095d586d36cbc9f987ebcaed1e050c61e69667caf1c6 ofl/hannari/OFL.txt +sha256 1a5e3792a425687a523fc7c0f8ab5d01d58bf853149d57f3dec4b4fc6932fcf6 ofl/hanuman/OFL.txt +sha256 bff4e5087ece354afccd073621197bbb7dd9349943b5ee6aa12b1adf0b133081 ofl/happymonkey/OFL.txt +sha256 757f49d04406c93c40d1781e7867fd85a1f9fdfbfe03a5ae332900da802fffc6 ofl/harmattan/OFL.txt +sha256 7527e73a61f742a0dd050ab2fc7333de71ac7886023c100bca66a0a93b37498e ofl/headlandone/OFL.txt +sha256 a90a8ebe28f3c2905a44557166010a3d219ffcce1703c3c3280ea8728d5e2ebd ofl/heebo/OFL.txt sha256 2d83a49d05906b5e23285168e72c0d019fc15e3ad110376f640feeeda34c27d1 ofl/hennypenny/OFL.txt -sha256 d7d8074c2dd46804990c184e25849947ab76c5ac7607fbf3966543455769bb73 ofl/yeonsung/OFL.txt -sha256 13831d02389d917d22fcfa6c79f98f8acbf61d230add0e73a4d4dc5f3bfb9e56 ofl/chakrapetch/OFL.txt -sha256 c39e284759a441660d4c4d852c537e271d0fd5c301fe46d065a972b6ee144ba8 ofl/aksarabaligalang/OFL.txt +sha256 6e54fc004ebeb61322ecab1d86334ebf69e7051632d48eca489beee505d70762 ofl/hermeneusone/OFL.txt +sha256 50265d2b41f8ad2dd350532d2286509aa694021b4aa0490b06f0068e4ed78c27 ofl/herrvonmuellerhoff/OFL.txt +sha256 39de3de5f1873f89bca4af37823ab22e28e88d0d8f7fe2f07e82e9e6e9bf7b70 ofl/himelody/OFL.txt +sha256 4b255eb44f613a8e426e195f0d0b7e10fcba1af7eb6047d9a7f4f3c449940e19 ofl/hindcolombo/OFL.txt +sha256 4b255eb44f613a8e426e195f0d0b7e10fcba1af7eb6047d9a7f4f3c449940e19 ofl/hindguntur/OFL.txt +sha256 4b255eb44f613a8e426e195f0d0b7e10fcba1af7eb6047d9a7f4f3c449940e19 ofl/hindjalandhar/OFL.txt +sha256 4b255eb44f613a8e426e195f0d0b7e10fcba1af7eb6047d9a7f4f3c449940e19 ofl/hindkochi/OFL.txt +sha256 4b255eb44f613a8e426e195f0d0b7e10fcba1af7eb6047d9a7f4f3c449940e19 ofl/hindmadurai/OFL.txt sha256 4b255eb44f613a8e426e195f0d0b7e10fcba1af7eb6047d9a7f4f3c449940e19 ofl/hindmysuru/OFL.txt -sha256 0da6a3e5b24a9fa04085c20a2a1d3101eeb1e0bff56a2291f407187e1b2adcf2 ofl/mrdafoe/OFL.txt -sha256 a815f65bc72d90494b01842d3171f7cb0f9f935e023d9cc260904d221ef1064a ofl/b612/OFL.txt -sha256 e2f2dc7a667954c16a919acff5351e8ea89813d10f5a7504e1f4668fffbfa14b ofl/barrio/OFL.txt -sha256 8c495ddd455def58a45310376a747bb61bf86e4b071cc527b3618bccd3ef00fa ofl/chauphilomeneone/OFL.txt -sha256 b687f920fe20fe48d8f7709421e5deeb4becea295c80ce62aadcffc54132fa1b ofl/stalinone/OFL.txt -sha256 a90a8ebe28f3c2905a44557166010a3d219ffcce1703c3c3280ea8728d5e2ebd ofl/heebo/OFL.txt -sha256 c267a00c9476c78a2336d7b372b536885b8b24173a29ed53496f67a742c14961 ofl/alefhebrew/OFL.txt -sha256 2cd51b11e821dad2fb7acc54d68bd9a139fc7a1207e17c432ba9ce49bba3d493 ofl/fasterone/OFL.txt -sha256 ca424122f42a8d8442bc4cfd902f5f027ea67b5417705f5af1d1235927781720 ofl/amethysta/OFL.txt -sha256 bb8fac04b8535d39fb9851c9d886248d25bc0c82000066c92dd577c3369f512b ofl/chenla/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/lovedbytheking/OFL.txt -sha256 53a9ce47085d9fef613c7ecb3730dc80d25962510bbea231b89564f58240f251 ofl/gaegu/OFL.txt -sha256 9d96f445b6e9c701428811d0177f894874f8d6f07ecc30d568c506542368f3ff ofl/share/OFL.txt -sha256 9465823369fbe1ae0b5a3065021d53ef8c56e113e664229455dc80b237fa6a07 ofl/nobile/OFL.txt -sha256 0dd8e32457e18621737b593ab0fac49905cd948a078ed0e64f4890df714a1dfb ofl/amita/OFL.txt -sha256 791936b10381b512512317572fb5eee91bf503344d52c37335e402fc1cf19992 ofl/reemkufi/OFL.txt -sha256 898a9cf80636e86d6b6009b96795fda29e431ee701c28c36f274a7e8a7d8246b ofl/rubik/OFL.txt -sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1 ofl/baloothambi/OFL.txt -sha256 382232d1add5623ba5b06394afa071f4eeecccb6d2b2bd02cfecff4a8a45065a ofl/fondamento/OFL.txt -sha256 0c3f4763f49c2cd37757a2856ad470aec6a416981ac6d6e3f900c1128be39de7 ofl/elsieswashcaps/OFL.txt -sha256 d849309d514833fe3d7a610e10f6cd5d99b4f9552bfa304969acbf89c66e4422 ofl/smythe/OFL.txt -sha256 53f9c99fa3d47f7d632a42ee7bab4a834a60a744f6026d676c3a223cef2b2ef3 ofl/vollkorn/OFL.txt -sha256 a1077580b649c7b0e05ea0e9369d48687b4ab1c585573bf86b0dcce7dde177c0 ofl/junge/OFL.txt -sha256 a9b40759b5821a0c2ad07cbd2c2a61dca4b3e222e6370a7d5bfb6b373bf4fb10 ofl/sunflower/OFL.txt -sha256 4b255eb44f613a8e426e195f0d0b7e10fcba1af7eb6047d9a7f4f3c449940e19 ofl/hindguntur/OFL.txt -sha256 84b11cc0aac8fdb93af94872bc4b8f015caabf4919db63ab7f916ccff8e52f56 ofl/josefinsans/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/dawningofanewday/OFL.txt -sha256 f27cbf1055db7b9dd80bce5cd12b462f2d9ed7313d84dd8bfef1ddd2b61bdfc5 ofl/chicle/OFL.txt -sha256 aba8997e16b1e3888c6e855ba883c70d96bd4375bff8cb9c7ce0f097200f74b8 ofl/abrilfatface/OFL.txt -sha256 8f24842e9174beda18a556c2ae7d54f5dc444340c19a3a9ef77e23bca366adbd ofl/firasans/OFL.txt -sha256 d484e0dce424a9e360adabb568b6773db5f1566df71ce3e9dcd66a6cc2c38d33 ofl/ericaone/OFL.txt -sha256 1b3b78123c94dcbc9fd4ec174317336c8c93423da62dc946b8852553cb13ddee ofl/economica/OFL.txt -sha256 74584d937293a9cacdcd2eb05851b71aa1527901c18b87961d2f877c77a1b486 ofl/kanit/OFL.txt -sha256 a6a74417db7c37f69495da556a3eb86a22a784ffb0131e3e0a5a47ce8d7fa5fb ofl/shanti/OFL.txt -sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfelldoublepicasc/OFL.txt -sha256 963f283b5410c7df62067a35cd7def0802c583a880e7cd7e326832ec3985ec87 ofl/spectral/OFL.txt -sha256 11bdf9c7abd81f46a88b0b017d78a0e51f451e9dc0c2272813aa9f456ee886ca ofl/kiteone/OFL.txt -sha256 6827fa45930d5847fca5b3d3898b3d87a229fba772a5b6c5bc33bf73ec83478d ofl/khmer/OFL.txt -sha256 5ae0cfa62a70251d9a2c3c5430ed3bafa480005f23e4b9525488f2318e5c10ca ofl/mrbedfort/OFL.txt -sha256 34b8afbcab7508bea23847288332a8c05a507364ca6f0c8756ce560d7d59d506 ofl/mada/OFL.txt -sha256 b67eed9578defb59cc4ff4b58428fb816786e499e84cdeafca54723b055c169e ofl/viga/OFL.txt -sha256 afc1cda4eedcfe27c8cf30fe3e9879587cb43cc2882d4cb91dd3e3fc9eecd0bf ofl/farsan/OFL.txt -sha256 cc8c0c3e81cf543e190f128b83ba7c30959f15865c14dd972fca4917faeceec1 ofl/encodesanscondensed/OFL.txt -sha256 9ca8b9e5db7184105da255bb110023cf1cce6caa56186341bb7b09ba97b20ba5 ofl/lindenhill/OFL.txt -sha256 a89ac8075be60f2beba79bed3fa253415a373dbdc3bb108b23f4854d0dd495b8 ofl/pathwaygothicone/OFL.txt -sha256 4b255eb44f613a8e426e195f0d0b7e10fcba1af7eb6047d9a7f4f3c449940e19 ofl/hindjalandhar/OFL.txt -sha256 f22a2beea88d631a620b15683fd03e79f13ad3297ad97fa5e42283c0b1a3a038 ofl/marckscript/OFL.txt -sha256 faf47a1ceab38b07205b9d58fbbf9ac39772ea47cc731aca7816276da7226a22 ofl/terminaldosis/OFL.txt -sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfellgreatprimer/OFL.txt -sha256 d2f87f90d108a947f98c030d9d8e4bf27e761ce83f222453b9a7230c5fb309e1 ofl/novaflat/OFL.txt -sha256 2da0fa5707f1fab1c802969b098fd1b92ca0b3b233a80e27fca416647c064dfc ofl/exo/OFL.txt -sha256 f9e5dfcdb2947c0db70465668706b0617cd052b6f86e582dff8741d9e5cded0a ofl/yinmar/OFL.txt -sha256 bcb0bda74430ccc281a616a81d0a287fed5a423815b00b222e0b7f603f85b26f ofl/caesardressing/OFL.txt -sha256 a94cfd8d1f5c33f9a7506def359b907f3313f7008bb57fc893985963cd342f8f ofl/arsenal/OFL.txt -sha256 52caec7d90533523fa7da64e95faf90ea32a663ce21847a39234b61e18d25044 ofl/bokor/OFL.txt -sha256 ef0bdccd20de76d517fb3939161d05ecd5808382fb8fa82cde5fcdb3adcb8029 ofl/engagement/OFL.txt -sha256 0d75673e4c98de3e11337dbd90b05d0232edfcade5c1c02fbc0118c85aea25da ofl/macondo/OFL.txt -sha256 9cd20277e2c89d47e3997435e3a16539d20173d850fbb42474990f71642e473e ofl/matesc/OFL.txt -sha256 a7ba785ad99b6eae0444ab89910e512d4af9865937fddbcb5c72c4f59f55d6ad ofl/merriweather/OFL.txt -sha256 010cb216e8f3fbb2836fa3f38787a412b749352de546797f57c03c3bcfe46b1f ofl/nunito/OFL.txt +sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/hind/OFL.txt +sha256 4b255eb44f613a8e426e195f0d0b7e10fcba1af7eb6047d9a7f4f3c449940e19 ofl/hindsiliguri/OFL.txt +sha256 4b255eb44f613a8e426e195f0d0b7e10fcba1af7eb6047d9a7f4f3c449940e19 ofl/hindvadodara/OFL.txt +sha256 ac987f9cbc5b18d3239d88adb57a4e134049811d24ddda2f6383faa589fd2727 ofl/holtwoodonesc/OFL.txt +sha256 6b6c6721a30480a323cf33acf6a7703dfce46b846827a65f8ee96230060e3c3e ofl/homenaje/OFL.txt +sha256 91c25c350d3cac39da2736d74f7ba37ef648f5237a4e330a240615bc8d8c4360 ofl/ibmplexmono/OFL.txt +sha256 91c25c350d3cac39da2736d74f7ba37ef648f5237a4e330a240615bc8d8c4360 ofl/ibmplexsanscondensed/OFL.txt sha256 91c25c350d3cac39da2736d74f7ba37ef648f5237a4e330a240615bc8d8c4360 ofl/ibmplexsans/OFL.txt -sha256 cb8bbf7a86eefa8c146f24ae5be74fffa887ba83719ab3c87036be8e3d0191e2 ofl/montaga/OFL.txt -sha256 1103d0731f1360eb156b0047a1337b2d62266fadcef1015d06f6263719c0200b ofl/librebarcode128/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/overtherainbow/OFL.txt -sha256 3621f156cc7a26e0a9cb413332e0bb35a0e76b36dbfe0b1c885b565a7bf3051e ofl/drsugiyama/OFL.txt -sha256 fbb941b371c6348ee2572ce8c78fb66128a61885f960dec1906c4e44ca4b4d3c ofl/reeniebeanie/OFL.txt -sha256 9e19c0d2e7e7adcbe9dfd0749e34dda41e7e356e0f2cc082d61d2fc9b6e0cef7 ofl/gfsdidot/OFL.txt -sha256 812fc4af0c63d31e0e81cc153af74e397407b0630e918b8b965bcbb192bc0656 ofl/artifika/OFL.txt -sha256 e8ad3f3de5baeff6bac6e711d8c406e0a6b8a61d2944741532d8965d893a2681 ofl/pirataone/OFL.txt -sha256 9134ca6996bd33ea2022e109f13f20e29dee1dcd8b2e8878aad576d2ca334e9f ofl/cormorantupright/OFL.txt -sha256 65f43260cf7e66b57ddca8d148384a6602e2c06edd389a8b3cf388045127b47d ofl/lusitana/OFL.txt +sha256 91c25c350d3cac39da2736d74f7ba37ef648f5237a4e330a240615bc8d8c4360 ofl/ibmplexserif/OFL.txt +sha256 2d62278530348951887211d79d1dba04acebd6ed3b1c413f6154702efea3ea62 ofl/iceberg/OFL.txt sha256 518962c41d4a5e96b0016bd8d8acc965413ea1a0102467e4955931e702b14a0d ofl/iceland/OFL.txt -sha256 2171558d2482764644a2f793696fa2e48c361730ecc87686b9a29082d6daeb10 ofl/khula/OFL.txt -sha256 d336c098ea798bf14de111cd90dff7d6bc340852405246511345d0f8564fe76e ofl/fingerpaint/OFL.txt -sha256 ea274e87939d38032b31fb741af75bff9fa3f8d4a8b652265f9e0ce1ad7e9f80 ofl/asul/OFL.txt -sha256 eb1992aec1cf892ec94ffc116d79b62c7cb03dc108141b94a57a4195d210b514 ofl/meddon/OFL.txt -sha256 9b584984f9db0ee30347391a76eff9c0a6b03dc450c3c6afe3757a2cb3a4db87 ofl/tajawal/OFL.txt -sha256 1dd84b611f4bed7f9ff9089e76a96337b187e6f283a4ab33bcb987f844f2c4db ofl/parisienne/OFL.txt -sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/hind/OFL.txt +sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfelldoublepica/OFL.txt +sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfelldoublepicasc/OFL.txt sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfelldwpica/OFL.txt -sha256 de08ff7a460541753999b1208f1254f1d31f16b421312aca4d4b8179d997de38 ofl/aleo/OFL.txt -sha256 7706a84d7e49e2273877106334a1eded8ae89fb5839fb81e0f2bb27c846f667e ofl/lora/OFL.txt -sha256 cc31fe974951d56d542f33782d07b2d5577a4afdddba89744e6bd69bcbf3a853 ofl/karla/OFL.txt -sha256 0409c6582424508453ce41648067efaacf0c790622918493d8f1d934bc5329a0 ofl/bigelowrules/OFL.txt -sha256 9e2d92fb24b4a548ab030c509ba88267e224f2523728ee9bb35cf334811106bd ofl/exo2/OFL.txt -sha256 f480fd19e7018942ecaf460f7a4ab9ccee0aec579abcb07d559dbede913864c6 ofl/alikeangular/OFL.txt -sha256 6ea7a3ef1d07feb592693f3f22c26d0b09321ff81814292b49be99888d0da9d7 ofl/ponnala/OFL.txt -sha256 0b7eae990329ac175a2e1c329060b3a4d6876e4e0cd7e5235511578352f7b191 ofl/biorhymeexpanded/OFL.txt -sha256 21b54eb0d7513524798a00dfbaf99a02c003a0012a728cc5f0e02d24c50482fb ofl/caveat/OFL.txt -sha256 adadb8d5d34fe2218dca0f4a4919a9b6f81dfaebb289e5446ac7b3063d6965e9 ofl/tangerine/OFL.txt -sha256 16741ac498178f645283cfb45b7a487b6d361b5de5730c5ea729f056f414f6b0 ofl/ropasans/OFL.txt -sha256 1e5bf8207a40678bc401e2e5456d0db1f2a183b550a30976b48dcdd6a4e4c46c ofl/caudex/OFL.txt -sha256 6f9e3a1c51f617e7b110862426204ec7a56d8c6d2f731373b5de6b8d069099b6 ofl/ebgaramond/OFL.txt -sha256 c2368518f12463a93cfed44e1460f36085dc60df06f415ee9b0319809987ccce ofl/frijole/OFL.txt -sha256 5f247fad3e8a86b6c0779dff09277047c1ce2b0b7580a1093347a8af755352ba ofl/sawarabigothic/OFL.txt -sha256 6627b9c2c8ff8e0c6ef23f1b0125dd5b293320c10c916d402fef64916c296d0e ofl/kreon/OFL.txt -sha256 723764a50d4e6985dfcbd75fcb40dbd3abab37ba25ae626486d4a32084854487 ofl/kdamthmor/OFL.txt -sha256 846ce83956a732edd57b74d9ba988d58abc8c8e6d0926859559318ce6aed139d ofl/mclaren/OFL.txt -sha256 ba01480319f922ecebbc73f1a523e7f8876e92b16553a32c494bcd3f6f5a27fa ofl/ledger/OFL.txt -sha256 c3bfad2900a83f571d5c984d490d51c56aef14806c28dde38125593e1e71daca ofl/mrdehaviland/OFL.txt -sha256 12af42b715a3901bfa7add1351e45b6ce22f3061555d52db45e963274c349360 ofl/arimamadurai/OFL.txt -sha256 aa8a8196a3e22c3bd985e33cd3245ae9a38accba5e79fc0e3b292612a8d6b337 ofl/miriamlibre/OFL.txt -sha256 3169e7e0e87168908218f11d660a52c0b81b5952fd73918a596e70721d68d3e5 ofl/inika/OFL.txt -sha256 e711c816f7de931244976f51166baa15446fc307e5d0ea04fdca1bc2c04afb1c ofl/nixieone/OFL.txt -sha256 1ba345a91338581e5f8fccc3e37e447ddea5b99ec9caec1b76c7c39492387d2f ofl/signika/OFL.txt -sha256 b01cec9e5e2035b70a6aeb61c673d1f6d5c91539845be07733bd9880fddeb9f0 ofl/kadwa/OFL.txt -sha256 d7577acbab1d70f2e6bd1b21d8f61db189d6aabe6375bc2d96564b8d94031664 ofl/stalemate/OFL.txt -sha256 5946eec3a7d3bda02825930156e4716198e7753641dd3303a3e8c386c8011909 ofl/eatercaps/OFL.txt -sha256 ae6de2f6fc00f76cc7eb0d97c1ae5e0b7ec734f20ad7f58cf4c74738dc822d21 ofl/chelseamarket/OFL.txt -sha256 860cbfdc9dbc3f0e8d35af80c31e8f20945bff393d4f483dfc157469e01d321c ofl/gorditas/OFL.txt -sha256 9a2d8c5a3de0a6e62432322115dce136139948411dba33cd86525c0a02749fb8 ofl/unicaone/OFL.txt -sha256 4fe01b13ffb41faa8f030d84843a95dab32792dfeeca7c072abbfd3f4d6896ad ofl/audiowide/OFL.txt -sha256 173ea2d0bdda981829719623c35699e8c0e4aa508e0af12817ad7ccbfa4c6137 ofl/originalsurfer/OFL.txt -sha256 1d08c63944e639bbfe8a1b81e3c6a63836806c126b3573b9cda0db83fd27ffe9 ofl/trirong/OFL.txt -sha256 58bdc69f4c6177125c6e7cdbc78f710f5f9952f11bba7bd5b17bd7ef169d731f ofl/goudybookletter1911/OFL.txt -sha256 2950994bcfb8e903f0539d28a8ec4af077e0aa1fa7946c33c912d2d6969c2971 ofl/glassantiqua/OFL.txt -sha256 7344b8b8c97c4f88c0ff8bb72bb024bba72f404be1c740b6596a73ed15d28df3 ofl/vampiroone/OFL.txt -sha256 cacad5bf45bf5c81f4b6cbd114261bc8a08f6110b66a4c6fad8bbc16618a3096 ofl/daysone/OFL.txt -sha256 0677891e6a143f297350d260ad766ad33bfc18ed5fa4f213acf648d6b597ec1a ofl/alegreyasanssc/OFL.txt -sha256 c8155eb9337078a9ea9f1e576ac813a03030ca43e2694593e90cd4fee6fce937 ofl/sumana/OFL.txt -sha256 95803fae1b063e592c67b5867f1f36df1df526e5ebf33c6cd4d4afa31a9d5586 ofl/sitara/OFL.txt -sha256 c254ae01c407f4a2bd0ad163e4c1a795d57ddfa8967c21b8a28c250b44d13963 ofl/sawarabimincho/OFL.txt +sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfelldwpicasc/OFL.txt +sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfellenglish/OFL.txt +sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfellenglishsc/OFL.txt sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfellfrenchcanon/OFL.txt -sha256 25995bcf8e8ddea1aafa5449870567cbbeae7e26b27ba30aca5642f2c02e9757 ofl/quantico/OFL.txt -sha256 455755e2e7ce9dbac6beb3729c97c57d6f74a638dcb5be548ec953021fbdbfb3 ofl/ntr/OFL.txt -sha256 ad6f73fa3edb7aea340aadbc63c0d7ef7663abed82664432ae09a6b377fa313f ofl/librefranklin/OFL.txt -sha256 581f08727777cb2a1a1ec95c0f981ce64fb1ad4354f78a0ac4f3481afa605577 ofl/moulpali/OFL.txt -sha256 4bf7256c8ee73577ee5e26643d3247ec77017ca04489befd3e0f3412827729c7 ofl/laomuangkhong/OFL.txt -sha256 08fdc7cbd92b9bbc4d41d0945ae7f25450d91c5fc8c66c68df331af3505e4ec3 ofl/rougescript/OFL.txt -sha256 694d5c15c1dac5e26653e18b94394d911e471549ec9b7d6247ade62e486b4915 ofl/asset/OFL.txt -sha256 bddfe669338d0dbc24c15ccd31dbf5c101a213da38049c24baca9ccb7fde45a4 ofl/wallpoet/OFL.txt -sha256 2758cf7a872827f39661cf8cc24188113c030447aefb5ca7145993650076ca8c ofl/ptsansnarrow/OFL.txt -sha256 3cbf579238e4eacd90ad67883d971aa346ce8990d658635f78f98d608a6830a2 ofl/zillaslabhighlight/OFL.txt -sha256 87000f71a897c8c130c7777d058c5868f84316f99a32644b3bf595cd11edeb12 ofl/sancreek/OFL.txt -sha256 08fba9df5c9890f3ab00ee63f63e005ad93a23746f7484f5fe9501a1ad32730e ofl/allertastencil/OFL.txt -sha256 9608d22ae5c586628c9904e773b7c6a6520fc16e1492ebcb5ea55d9523399964 ofl/anton/OFL.txt -sha256 f3758ee70600ecd5450f01ea373204b202e048d0454c9db2d1175c5a5dd1e92f ofl/vesperlibre/OFL.txt -sha256 e43f121c788cca4a14049e58864e28021174b055710ba38e0964e816dbf905af ofl/fruktur/OFL.txt -sha256 5e0da210fb04058a8c0087985d2d456b931c2579811a49655721d3cf0c36b6d6 ofl/notoserif/OFL.txt -sha256 a1580ba69a8d706bd95e1e72ee0b5cfda0a478fbbab6a4af13b4a9e1b28faac0 ofl/revalia/OFL.txt -sha256 f323edc1e5a6d8fa16120aa15367cdfb15468474cc621f9bda1a2f73c5d08d73 ofl/sedgwickave/OFL.txt sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfellfrenchcanonsc/OFL.txt -sha256 0836fd874230b17f840efcf7d3bb529f5a7b5befbfeef94478519cfe2d8551c2 ofl/courgette/OFL.txt -sha256 e3ed3ad6cb257e16dc1789900707c5cd1cdef2d60d155389342604991cf693f9 ofl/bahiana/OFL.txt -sha256 391ac3126dacc95b92a8f3408467879edb3245344bc411530a30d5aada52df92 ofl/gugi/OFL.txt -sha256 88dcde7d08e509a3eec64886292a36cbd58ed9bb52f37f91f55656fb9d21ddb8 ofl/supermercadoone/OFL.txt -sha256 41423e9e1d0ea79d0e78bd5fe9e0b27f4c23140706f5dfbfe116839c83aae91c ofl/charm/OFL.txt -sha256 43186c592361336474683e302dcc988831a53857bef188c4466f6b45dc238f84 ofl/fredokaone/OFL.txt -sha256 a21fa252efb7a1ff84de6a36df4386959668aa046f28161b4047829f7d9cd1b5 ofl/damion/OFL.txt -sha256 842b4f4605b32518a1269c4d030d719ea2c4c317d699fc4441d0219658e18893 ofl/seoulnamsancondensed/OFL.txt -sha256 bfc205682f5454b42a732ec857b665293ab8bc6f0ee901a0967219ba7ffdb190 ofl/gfsneohellenic/OFL.txt -sha256 59b91c9912b80714852a43897cbc9414d6457e22072dc99a4cea6e2bb4f3c65c ofl/freehand/OFL.txt -sha256 8b89f3af5fd02216793ff3dfe9a04dc22dfe5c213422ae21558ff1da6a1e94dd ofl/cabin/OFL.txt -sha256 b598b7fddfd578950aa1fe6e0e2607b779abfaa686b83af8ec65c860f646b2cd ofl/rumraisin/OFL.txt -sha256 2bd35914efa381c80f9fb62d6ea7d736d3c0739196a3783c3122593c3408392c ofl/gurajada/OFL.txt -sha256 5625e91bd7c2a45c8b9f59106d587bd025470b462ea901df691defe0099621e1 ofl/taprom/OFL.txt -sha256 37d5360d8d2433689e78302a93cd88e9add8a2294046476625edada2d4328deb ofl/averagesans/OFL.txt -sha256 f8e2b58dd7a8c8e21e5d744b45876bce7e010a647c071c1ed42ff0e618d4ea59 ofl/frederickathegreat/OFL.txt -sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1 ofl/balootamma/OFL.txt -sha256 09685e225ba9b697b2ccd2d4098cac5ecbed0679960605258a271af60749887b ofl/francoisone/OFL.txt -sha256 39de3de5f1873f89bca4af37823ab22e28e88d0d8f7fe2f07e82e9e6e9bf7b70 ofl/himelody/OFL.txt -sha256 08a12877eda24767239f26b527bfce0c515efaf623c66da6baad92a6d5315e9a ofl/content/OFL.txt -sha256 0e2ccc5da1dd979f08ba82bca2fb61592506a1e58d3cbfc26d904f0db71bd812 ofl/saira/OFL.txt -sha256 d8eb8611f8c98d20cbf18a28425652d6022dc2a5cca15026b920f1f2bc92a612 ofl/delius/OFL.txt -sha256 1d08c63944e639bbfe8a1b81e3c6a63836806c126b3573b9cda0db83fd27ffe9 ofl/pridi/OFL.txt -sha256 c1eed37b6d213df4edf8f92ec7d1e972f751abd68ecd649b4f0b8e5d8e8561f6 ofl/rasa/OFL.txt -sha256 4e66943af352059c059dd658774f25fbc831f1ad478f9f0890c06ecc2dd324c7 ofl/metalmania/OFL.txt -sha256 f5b03ea0b27c7f5afb9702771ee57679ae8ba6b471b6ba9e62d985d3256f1929 ofl/playfairdisplay/OFL.txt -sha256 593f0bc55c75b673772b378eaee314f128283745c4bb1cfdb9b8012a3b6c46fe ofl/skranji/OFL.txt -sha256 46239ba6485d28553fd944da4ad32a00d9c403aa1c3e111676b0b96fe458d1d4 ofl/averiagruesalibre/OFL.txt -sha256 14d28541780d90f6577bb7abcc6f005bf6969614294e75c82abb8758a696ad46 ofl/quicksand/OFL.txt -sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1 ofl/baloochettan/OFL.txt -sha256 35dca6122235851d236bd861124f4a893d409eba021cd8c6a292a19df0f4640d ofl/codystar/OFL.txt -sha256 ab721b35816e470fb11619ad3705f75d08dccd0864505e3d782e94fd937f6620 ofl/allan/OFL.txt +sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfellgreatprimer/OFL.txt +sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfellgreatprimersc/OFL.txt +sha256 4539710406c656519f8ddc789056a7cd6f4fe66b44cc2f52ebca6e251bb26e13 ofl/imprima/OFL.txt +sha256 29bd0cfd0fb2a45f9b057c834a057724bae1f63b525a8ac83d3e7525706d9f80 ofl/inconsolata/OFL.txt +sha256 ca9fe3a0e10bbb082f83ecdc07f5f04845c4bd689c46456da3e6bae23e11aae2 ofl/inder/OFL.txt sha256 d9cdb075679d15a99bab2a8541b9c4fdc71347502111fbe9affd1d462219d96b ofl/indieflower/OFL.txt -sha256 1313ae342eae4e1810304b6cd32f6815dd11b8e45812a2af98e58b6960684fa0 ofl/petrona/OFL.txt -sha256 1e4015251ca58d4f349b4ac930259c6f3d6381ce68f8b4b27d54d53f8f63f972 ofl/angkor/OFL.txt -sha256 46239ba6485d28553fd944da4ad32a00d9c403aa1c3e111676b0b96fe458d1d4 ofl/averialibre/OFL.txt -sha256 8e28b778b6e1a7ff9ca72f4dee2d53120aa2856dc1bfd0be44307e365b0e45bb ofl/cardo/OFL.txt -sha256 a02e8715fcdf3325c474b7209399f50230897bfa828fe4eea2639ced1a1d574b ofl/blackhansans/OFL.txt -sha256 d530c14e9cc263c567b47742ef20df2a41374f00732ba4f290f52adad428b1a2 ofl/meerainimai/OFL.txt -sha256 2e2fe5f1d8916a5160060594a96c1a5116406d26847afdbd09618481e2abd6fc ofl/denkone/OFL.txt -sha256 56c4ff36faaaf336bc5fee659ff6fab2413d67499cc22acc29079b3892d8931b ofl/miniver/OFL.txt -sha256 0d75673e4c98de3e11337dbd90b05d0232edfcade5c1c02fbc0118c85aea25da ofl/macondoswashcaps/OFL.txt -sha256 742a6a4386db47a2987c7c3b4aeedfb5adedfb3356c118de450a664735686535 ofl/graduate/OFL.txt -sha256 9e53298e3629e00ae4c31531cca09051ddaa654a5de4f7b55e596132fff86e1f ofl/dhurjati/OFL.txt -sha256 df9fcd8f62ae79aba7fa5b0563a08dfede1fa0909d668287d70c395d88f5fe02 ofl/fjordone/OFL.txt -sha256 02faa476b17db0044d0c502a3ce12fdc81eeeb9bd618e6a005407c79d6081bbb ofl/monofett/OFL.txt -sha256 1edecf3f971a11dcfd777cbda6f08c0f9a77bf57a0a2a89d8142fb933894ce16 ofl/amiri/OFL.txt -sha256 6e6efa9b0556d100cfe60690cff5d9be7144df77adabfd2c278dbfee451351ea ofl/phetsarath/OFL.txt -sha256 2348c4852e6322105d130aa2addbe24c962e330094ad6dfbfd9fbd2281d76b0b ofl/bellefair/OFL.txt -sha256 3bbcf1617d93d3a949a10da78ae91c58be536fb04567ab4b5b9fd207126f1db5 ofl/buenard/OFL.txt -sha256 faf47a1ceab38b07205b9d58fbbf9ac39772ea47cc731aca7816276da7226a22 ofl/dosis/OFL.txt -sha256 3ac1301549523d9861fedca12871f24e575fbd26d520632fc00ba849b471d275 ofl/russoone/OFL.txt -sha256 44b51296985184d9b27fc2c8e5b317906c5d65d9dc834e81c07902d3e5e1cf1a ofl/brawler/OFL.txt -sha256 afb8c471158619593df0fb501453bd39fda42396e2cc3911e2a0a471c11b863c ofl/sarala/OFL.txt -sha256 de985adf63cff6b1bcb7c5cb55f1c5850fb1d36289d20a0e26d97a281bfcf956 ofl/aldrich/OFL.txt -sha256 194e25172d0144f29aff4b6fb2931ff0be0139448a5cd867db37863c9179330a ofl/stalinistone/OFL.txt -sha256 ae05f8781a5ef38380ef3efe8cad86783610b6a780c6c278d7472f95310fccee ofl/oswald/OFL.txt -sha256 2dab153a33dcb2101bba3f194d27d953c848a0fabf2e336650a81f84a0c33b3f ofl/pragatinarrow/OFL.txt -sha256 9d61931b909f9a738964f8fb311eb8fa40dba1ef9f1688b36039ebb15ee1805e ofl/questrial/OFL.txt -sha256 e315abc82a78710c7242e2f2e6529651fd631d4d50e6ad98ea194f9b54c3d701 ofl/alfaslabone/OFL.txt -sha256 4653c63a4bab99aa50de5190853fa21ea6c0a25d69d49f5a42cd51f0f67665e0 ofl/boogaloo/OFL.txt -sha256 bd8323cd1d2b6bbdfbbf99cb41ec1156d0352ced170de4aa3a96d95e6e20bf5b ofl/amiko/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/sueellenfrancisco/OFL.txt -sha256 ed93e9833f18acc2775380a28139fd88d3ebf82df7cb814042498467be3463bb ofl/lemon/OFL.txt -sha256 1f00d1f970b4ea469b6936e599b599bb217edaab792e586658ef2e71cf438685 ofl/itim/OFL.txt -sha256 fa28ba897eb819768d6bc00c30aa03ef560e80e5f6fb872eaea089c66992f502 ofl/notable/OFL.txt -sha256 96199bf9ff12dd471a66911dee95440737b437e7f5a6fd30e9e950c16d66e8df ofl/unifrakturmaguntia/OFL.txt -sha256 36e2f1debc9778bac79fac1a0cb5a5ef51c102f00b58ef7d8a05324144b68166 ofl/judson/OFL.txt -sha256 ad4f6ede2e8a017255822a6abee8d10717f1d34c20223de80285ff59e28a1cba ofl/bangers/OFL.txt -sha256 f8779e6871bbab04e0a1ddd9997f4d8173b56792a1e7f8b9d691d967a49c7dc3 ofl/andada/OFL.txt -sha256 49b9214f7b40024abec2fc89a32bdda380f2174ba7005d7636e6ea340157c5a6 ofl/jomolhari/OFL.txt -sha256 a815f65bc72d90494b01842d3171f7cb0f9f935e023d9cc260904d221ef1064a ofl/b612mono/OFL.txt -sha256 5eca89cdd576df5e4b7c694e0425b126a9ca839aa067df85fab33904a8187076 ofl/amaranth/OFL.txt -sha256 e0cde1a4993ed689d463d5e2401f4a60c54cc48a14253ab0f8012d722c417038 ofl/mavenprovfbeta/OFL.txt -sha256 eeacf16032901d0ed0456876ec77b8f0fda6b3fecec7d972f8543eb602e6c30f ofl/nanumgothiccoding/OFL.txt -sha256 0fbae33ac3aa455c8c0d598347c87f1abfac0d215483f40f5a0e8dd08076df1b ofl/librebarcode39extended/OFL.txt -sha256 3670ddaf348c62ada22a2f606158dedcd9ca5fd5422a6173d6593204a8f53d4f ofl/varta/OFL.txt -sha256 ab592d1abca19428b89d851706fa7815ec25139c6affb45d366577ca63fb91b7 ofl/yesevaone/OFL.txt -sha256 e8dd8f53b2fa502ace0636debbe7e357c4888d8d02b8b41d6a9a22d3058a63dc ofl/peralta/OFL.txt -sha256 cdf5fc4014abe91588666a9592ec86200e5a4d743b4b6e05d28d47e850bbe5fa ofl/digitalnumbers/OFL.txt -sha256 f8c2225a5fdb50e2e75f98cf6e69f198571f605f1b7f6f7eacc0947e2fcdbe8d ofl/sreekrushnadevaraya/OFL.txt -sha256 a80ee908b60f5bec9c10b135d3da93730e2194107d1f7fd3f61bd8c1a97b3e0c ofl/yesteryear/OFL.txt -sha256 6d216cec166b6e139adaa599053dd49720c053e1f2adb4845de3cc9c3704344d ofl/play/OFL.txt -sha256 46751a31966477e3f038d1e5ff1146a33234a3a523a0e6a21be3221cba082a34 ofl/muktamahee/OFL.txt -sha256 505bb8f3c30f2006b4e02d250fda31ed94b651a35f1124a201ca1c405ce989af ofl/biryani/OFL.txt -sha256 5641212407f956b828bf632afc4bbb3344f461f82255ab56756d9e3e8604c7b1 ofl/martelsans/OFL.txt -sha256 1ed119b01f03187dbe2f5f89c95431b9a4ca46db604fd263164d8b4055189f46 ofl/lateef/OFL.txt -sha256 4938e917ac54665be1dd862f54634d991b39c5d1eef69345d66a5089e401bfb4 ofl/creteround/OFL.txt -sha256 9263f9488a9ed1d5f4218581b642e0f054f9a20d208f1a53c19c9f7dbd27eaf2 ofl/peddana/OFL.txt -sha256 e75ed24435d1711de0bebfaa621c3eb5564798c88cc0c1d1f8d529bbaae703a9 ofl/yanonekaffeesatz/OFL.txt -sha256 708e33bed791c40638926a7577bcef8ff8748f84045f3825277540cbb8d483ba ofl/poiretone/OFL.txt -sha256 f1d1a3536fa4b9c71d04fe4c8d8bbfc0cc5c457d6883f45086b04d0bc07ed12d ofl/vastshadow/OFL.txt -sha256 f9f28345ffcd6cea6e3c6699e4579cd1948053d80fe89a6a5a2ecb269afc95f8 ofl/nikukyu/OFL.txt -sha256 c1bcd16ffc9d095822fd6b7fa1a24c7918b24815ed05711421f804293d2efa62 ofl/actor/OFL.txt -sha256 ae629d13b06d9afc5cf3c07d585f3192b89b7decaffc5c4dfcfa7ce11a2a2b11 ofl/raviprakash/OFL.txt -sha256 bdce62dd98db969b73f93f8e8e2151004c20ad871ceb15ad9bfcbdf2cf939dba ofl/pompiere/OFL.txt -sha256 39de3de5f1873f89bca4af37823ab22e28e88d0d8f7fe2f07e82e9e6e9bf7b70 ofl/poorstory/OFL.txt -sha256 757f49d04406c93c40d1781e7867fd85a1f9fdfbfe03a5ae332900da802fffc6 ofl/harmattan/OFL.txt -sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/khand/OFL.txt -sha256 74ba064d03f1f1c4a952da936c3eb71866c34404916734de3cae73b34357e59e ofl/lato/OFL.txt -sha256 94625b91cba99cf9c8e580febf5e738b2e3c7cde9034a16bcfb7538b672137e5 ofl/zcoolxiaowei/OFL.txt -sha256 3e908f3a95680bdf3c8456bfbf76392605b34cb3fba109e46441056ab966cb35 ofl/modernantiqua/OFL.txt -sha256 6a809aeba8af2115ca4b4c3597b1fbeb836a45f0489070f330f9c2dff870da8d ofl/galada/OFL.txt -sha256 2c3737ea83b48d48624068d1bbd1d9f8049eb7cf2e1f67435e420375c42e0686 ofl/spirax/OFL.txt -sha256 92f750829545386017c3418d890769778b76fd01dfb41c62fcbb0d42ba0303eb ofl/dorsa/OFL.txt -sha256 656a20870fbcb8f559f1c6308c1df90ac93d7cd0279aab49b43a43b5e58534e6 ofl/neucha/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/zeyada/OFL.txt -sha256 4bf7256c8ee73577ee5e26643d3247ec77017ca04489befd3e0f3412827729c7 ofl/laosanspro/OFL.txt -sha256 33e3a83e377c6a41149044bd919f50d9a971d801052d4e0c0a98cb417b42ae38 ofl/risque/OFL.txt -sha256 b4fc1d55ce610f255c5712f8169543f9610536d002deb99bbc99bfbba9f8a560 ofl/pangolin/OFL.txt -sha256 511125dc85198375795fdbc109d088654d3b7f9dbd3ccb7bf93d844aef0b153c ofl/ptmono/OFL.txt -sha256 819e3b25f9b50f12299a3db1638be3813efc6b938f2b86693a218d20ec4e3209 ofl/londrinashadow/OFL.txt -sha256 e3ea566dbf689a9110b2094f9f2e5d16d7ec31720147651efc1005ca20420dd4 ofl/flamenco/OFL.txt -sha256 186d750eb496a4c17a76385f82be6aea2ac1cf2de074a811d63786cf374ea73f ofl/barlowcondensed/OFL.txt -sha256 705960c3281a5765ecc0b59bd4ed7ca59eed165748076bc2fc3e8fdbfeb944b0 ofl/pressstart2p/OFL.txt -sha256 7e896665d0863d2a17a671001dbe2528a5f9302f1dff9222af8b0834e9088d0c ofl/kiranghaerang/OFL.txt -sha256 5f1f5510eff7922864bf326ffa1d4a62f01add5193e9367b542378e5a808b500 ofl/handlee/OFL.txt -sha256 3173acd82f8c6159b5b1037b539fcbd4edff68e65c2ea8b9412b5a5ca97b08ff ofl/archivonarrow/OFL.txt -sha256 82831e8f12ecb6deb2f4d9919a04049895b4619e0301fa6b699c861bd7311c54 ofl/kavoon/OFL.txt -sha256 1a5e3792a425687a523fc7c0f8ab5d01d58bf853149d57f3dec4b4fc6932fcf6 ofl/hanuman/OFL.txt -sha256 7f91d7d8854e5cb4fc630807c0f4d57c07777769dc597173fe0aef5e58f0992c ofl/qwigley/OFL.txt -sha256 354b4be0340cd58e381fdf58793a108897bf944a7f8faf9e877c476ed6c730d1 ofl/convergence/OFL.txt -sha256 1e20933206ca06421c7c378184da5476d195314cf4bcda2bf122cd45d69a956e ofl/oxygenmono/OFL.txt -sha256 a7fe1f3d23034092b015aaeb53d2ecbc9e592be96b10bdfbcf8700ec6a6ffc97 ofl/fascinate/OFL.txt -sha256 4dbbe5c21b46f2647d227dde69b971a1b46de1435e0752a9eda1ce120725a93c ofl/norican/OFL.txt -sha256 1f581506286e960436548dba0701aab278f7e67f2adc6bdae2958923867d1e64 ofl/hanalei/OFL.txt -sha256 56edbe5fff7981dae6f6eff32f61ba04cd54324e5abfa44b1257b2a307ea561c ofl/poly/OFL.txt -sha256 59bda6b53e28d388de5eac7bbb8f3e65889dc8489be3d922f95a525354110c0e ofl/tharlon/OFL.txt -sha256 3fa0ceff4b9a2d28dde43bc63cde3acfb5e6e92d13a53e484ca0e501e18c7e2e ofl/lekton/OFL.txt -sha256 ad9ce814ff266b57d3c4698d3fadca4b41a6f942a0ddd215db5cc66abf92d668 ofl/mako/OFL.txt -sha256 c4afe82f49c05689c40dd4e262803b29c6e611e7b4efd3a0418f574b2be79d9a ofl/carterone/OFL.txt -sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/karma/OFL.txt -sha256 d38acce513eccb51d7ac34ca47be279e1fcfdeca1ed088bdd2d281dc6ca939ee ofl/badscript/OFL.txt -sha256 31eb7046f4c80e0f96944c4b40b0772de68b34783b794fc13aab3f54c2ef6d9b ofl/thasadith/OFL.txt -sha256 06c79c896894160a5810d869a822fa7d02a0e2ccffd97920b8cf3b880380f6e5 ofl/amstelvaralpha/OFL.txt -sha256 4faa2d9e2ce0a4b5b37e62ee6fafe474a539b31578f7214ed97cc3503aeb8ebd ofl/oldstandardtt/OFL.txt +sha256 3169e7e0e87168908218f11d660a52c0b81b5952fd73918a596e70721d68d3e5 ofl/inika/OFL.txt +sha256 16f8621a8dda01f044b8a58489334dbaadfad44ef2fa1d5ce0864cc2f309df01 ofl/inknutantiqua/OFL.txt sha256 1e511bb01d29562932157365418c02d954d8faeef794bcd54729177fb2b03db0 ofl/istokweb/OFL.txt -sha256 846e8cc6dc69bf685d2db14cfa758ff3d9d771d54c9e0d3b511f0ecb97ac0e8a ofl/cambay/OFL.txt -sha256 6c181f5a0045e8f414e1c232c35972ab83ea084ac44825f517ba001628d97b21 ofl/kronaone/OFL.txt -sha256 d7f96801a28ea11eaa51bc4a9c87fd91f2133bc298068e6e2847a15ddda23089 ofl/librecaslontext/OFL.txt -sha256 1f00d1f970b4ea469b6936e599b599bb217edaab792e586658ef2e71cf438685 ofl/sriracha/OFL.txt -sha256 22c4588bdc14621220ba14515d52041d1312541e034a15d1f5c2a88fc6075276 ofl/merriweathersans/OFL.txt -sha256 1103d0731f1360eb156b0047a1337b2d62266fadcef1015d06f6263719c0200b ofl/librebarcode39text/OFL.txt -sha256 5b26c88d163b1430561f53fd3d9021d6057f3c67d25534a5d8d232cfbf8ee2a4 ofl/wireone/OFL.txt -sha256 57f8d60cfe9212b971f07253e303746128edd06b21e3a0e4e188308e569f03e5 ofl/orienta/OFL.txt -sha256 c87702d8b70f714fbefb554660e8ca57a43ef62a59089d11cbf0c6bd51d56928 ofl/lohittamil/OFL.txt +sha256 486c4d5b9baf0d0ba5546ef3c43fcfe22c062299ab6948045a43efffe4b0f74b ofl/italiana/OFL.txt +sha256 43c372f43d145c22e654781860506a75cb85b086dc76028a62a28a446506d253 ofl/italianno/OFL.txt +sha256 1f00d1f970b4ea469b6936e599b599bb217edaab792e586658ef2e71cf438685 ofl/itim/OFL.txt +sha256 2887c5bb38abbde9ccc608c4dcc4b0dba0fefc0c74eec011033bcfbd3ffcb235 ofl/jacquesfrancois/OFL.txt +sha256 2887c5bb38abbde9ccc608c4dcc4b0dba0fefc0c74eec011033bcfbd3ffcb235 ofl/jacquesfrancoisshadow/OFL.txt +sha256 a74380bba78a364ec70b3a5fb6a1161b83cb05cc3e75a0910afbd1b5aff4f9c8 ofl/jaldi/OFL.txt +sha256 6939af7114f0a33c7e6142d4c1320d1bbde11aebe6d8f3c48fc5fb3e0f676a7b ofl/jejugothic/OFL.txt sha256 6939af7114f0a33c7e6142d4c1320d1bbde11aebe6d8f3c48fc5fb3e0f676a7b ofl/jejuhallasan/OFL.txt -sha256 9437c26410bcd543607a6775e7d0e359c1df3926d68c92dbaceb26ce79cc0fd3 ofl/bevan/OFL.txt -sha256 50265d2b41f8ad2dd350532d2286509aa694021b4aa0490b06f0068e4ed78c27 ofl/herrvonmuellerhoff/OFL.txt -sha256 9acc45e5ba18b5b38868fad1f51c03df4f5d7a43061d46314843de45c4444233 ofl/ribeyemarrow/OFL.txt -sha256 1fac7a3e4e43b091c2d31aef7a375d2b969c42b2d5fce8e2d40b5f7b1233ddb7 ofl/moul/OFL.txt -sha256 331c71cbd8f1d8a70cd6eec3d55553b64e6261a9bb0982fa12e6e48baca827c5 ofl/philosopher/OFL.txt -sha256 1e20933206ca06421c7c378184da5476d195314cf4bcda2bf122cd45d69a956e ofl/oxygen/OFL.txt -sha256 89418a3c7b5726c3f8828a7b7c3f1cad661cf5b7a1be3d2bd9ea243f8d9890c8 ofl/sniglet/OFL.txt -sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1 ofl/balooda/OFL.txt -sha256 89d9d01291eeb91074ccf1f7ce07e7a1d9d421ec1191f8e84d440cb50830ed92 ofl/purplepurse/OFL.txt -sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1 ofl/baloopaaji/OFL.txt -sha256 9acc45e5ba18b5b38868fad1f51c03df4f5d7a43061d46314843de45c4444233 ofl/ribeye/OFL.txt -sha256 f938d4076b66a13cf984ce88d92a07ff9802e8ae5e1f4a28cdc43fad122ae611 ofl/spinnaker/OFL.txt -sha256 89bf0833b785c49b0f271273ab440bdc20c85bf0322537dc901df940bf1579da ofl/amarante/OFL.txt -sha256 377f4f9c19e935228552478eb68cc2ed82910988a60ba60e2ac73b09f32d02d1 ofl/patrickhand/OFL.txt -sha256 684ef102ca4c5ff61cf1c1e5c2c6326f3c26f848446f98b8862dcca716a87601 ofl/quattrocento/OFL.txt -sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/rozhaone/OFL.txt -sha256 61be7c29f4835e2be7243db12213d75d53ff028f29f4b493212a1688b1d3a1ba ofl/titanone/OFL.txt -sha256 9df0700fcd0ef48abd74459a8650d35f59397fbaa00c5b00527e57cc155689c0 ofl/durusans/OFL.txt -sha256 b1958132ff727bd74409aa37ec0abbe4be13b1b379e1210e6fb77fc608c607d5 ofl/kodchasan/OFL.txt -sha256 f1888ed385b528866a472d02f4e06ef0873aca5b3c63ff1f6116cbb150dc9a13 ofl/metal/OFL.txt -sha256 e36d420a3b382b337c386338d8abc3635e10de5dfca7f822fc63ac659a0dcfc3 ofl/amaticasc/OFL.txt -sha256 8fbe530adcbe30c658393c3f2b5a4785d6765afcefdfe47f594730131f3a0abd ofl/oleoscript/OFL.txt -sha256 60ddc0ee6e443b78940b5f92bcbab76c98ec6965e0da9fbdaf267383ab72bba8 ofl/anticdidone/OFL.txt -sha256 afc1b710d644c1262e1765d2401abcf93a545a4cb051955e2243fbabb8164e25 ofl/carroisgothic/OFL.txt -sha256 3184f6a99f589c78740fbff6ddaaabb43b8cc2f3852da36e60aeb024ea8d6f00 ofl/eaglelake/OFL.txt -sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/halant/OFL.txt -sha256 9a9f089005f389717106bb3ba427cda9bd51b8a477078644566543f2a60ca85d ofl/rambla/OFL.txt -sha256 99d2f30e282d6174af8ff68597f58bb53c0dcb2b104a4c1b8d19da49021d00d3 ofl/unifrakturcook/OFL.txt -sha256 2bb0c0200723d923f8e20d08b8bd1c7af7f5cef8bb2d63ce44bd268b54334621 ofl/fjallaone/OFL.txt -sha256 72afba97d1ac9409a9fd3bb91a02a639427ca1988977909dad273e293a508d7e ofl/staatliches/OFL.txt -sha256 88aece7d90f2bb7049719f11619a560af22af3451af141f12aa4f46bb157a99b ofl/lobster/OFL.txt +sha256 6939af7114f0a33c7e6142d4c1320d1bbde11aebe6d8f3c48fc5fb3e0f676a7b ofl/jejumyeongjo/OFL.txt +sha256 fca01a37b10879d7685c7d03fc5a04086b15cdb2cb4f870cb687aa5a9a0a1361 ofl/jimnightshade/OFL.txt +sha256 c4cd9f38c3246ee6a68c264f017320dc1af09677d386166d8cda806d9a12e0d2 ofl/jockeyone/OFL.txt +sha256 28c6d2887c3dfa42488c5418c6c16ead580d33ff0afe60c05159689201f9ec63 ofl/jollylodger/OFL.txt +sha256 ca64dee162bf239c7b92d854d388bcd30552edc3ae1ef5e31714acda34c988db ofl/jomhuria/OFL.txt +sha256 49b9214f7b40024abec2fc89a32bdda380f2174ba7005d7636e6ea340157c5a6 ofl/jomolhari/OFL.txt +sha256 84b11cc0aac8fdb93af94872bc4b8f015caabf4919db63ab7f916ccff8e52f56 ofl/josefinsans/OFL.txt +sha256 84b11cc0aac8fdb93af94872bc4b8f015caabf4919db63ab7f916ccff8e52f56 ofl/josefinsansstdlight/OFL.txt +sha256 01003114b77326df223f291c48cdf12e95f6a5937437f164347919f2bbde12d4 ofl/josefinslab/OFL.txt +sha256 dc35123e99a857674b3e8807e9d7df82220d298423d9fc50ce084fbcdecf602d ofl/jotione/OFL.txt +sha256 44a7c6e4c5572392ae122d3b1d8c6ba6fd640a7797e675384585d947f2773e3c ofl/jua/OFL.txt +sha256 36e2f1debc9778bac79fac1a0cb5a5ef51c102f00b58ef7d8a05324144b68166 ofl/judson/OFL.txt +sha256 f76c1013cffb3e0de0e7dad19ee5b4b7849c7ab10b67218515e39cfd87e554a7 ofl/julee/OFL.txt sha256 955655cafa13f187f45a79dcf451942fd1118a8426abc5a25ffc5dbb00709da6 ofl/juliussansone/OFL.txt -sha256 9e1c955538817c3fab7160cb3110501e73ce109eeb58c4992a14e8323d900849 ofl/pecita/OFL.txt -sha256 96d82a96abc02fb457ddde0227833dbde9d1d02876c91f0a4e27845ca0d692fa ofl/atomicage/OFL.txt -sha256 7729f005b7a087368e2cf61fc4b65cdc85988e47d0e6e38c93a72de345e86b41 ofl/newscycle/OFL.txt -sha256 336fab6956d78eb34b50cd7bc6b16116c44735fbd0bf9f4def769ca4d8e218a9 ofl/sofia/OFL.txt -sha256 b26cae1321380296ba8311b632a397d5eac11b47197f9d0aa0b9310f1531ad60 ofl/sarabun/OFL.txt -sha256 aa8a8196a3e22c3bd985e33cd3245ae9a38accba5e79fc0e3b292612a8d6b337 ofl/suezone/OFL.txt -sha256 d3711c90a7deda6210d30e41b945f16bdaa00662b30ee0b7c36abfee82525bfe ofl/kokoro/OFL.txt -sha256 513b7871a360a6eccd426bab59743fbff36764588f47381423f04ad6b3d821d9 ofl/alexbrush/OFL.txt -sha256 67f64c5509e5151796599e3ad47c3131cbe0c80c4f9430b90236a1249c2eacc9 ofl/roundedmplus1c/OFL.txt -sha256 4a7d2f227b91046ef7a54f8f735668d86e45f4fd4089268de292a6e9de108253 ofl/bentham/OFL.txt -sha256 3c187c861dc291b9f7f96f655656f9ac2d57b33da425bd5962810be728344f57 ofl/brunoacesc/OFL.txt +sha256 a1077580b649c7b0e05ea0e9369d48687b4ab1c585573bf86b0dcce7dde177c0 ofl/junge/OFL.txt +sha256 ee9d043332991eb6bf2bd56fb04db3c558c1ee2f0cb9aa7b18366c77e34fef30 ofl/jura/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/justmeagaindownhere/OFL.txt sha256 869e4c29978c318b33c2e5c7c8f24d2e947f249071bb1471620036a9d1ba87ad ofl/k2d/OFL.txt -sha256 6383249ddffbd87f2bbd7878ceba2dee0f1a2193cd7a4f41c00aaceb8e6d8b5b ofl/meriendaone/OFL.txt -sha256 ed50ebe2fa922554980909192526fe94966556626d6d440a462c8e7eaed74cdc ofl/sortsmillgoudy/OFL.txt -sha256 d64c91b0306b53fabed08762068eea8b918d654fb0721c288f13cefa4aaf088c ofl/butterflykids/OFL.txt -sha256 bc1175730d609233043cde47e48f69831f012e85537c5ec1a2cf4836757c1540 ofl/mali/OFL.txt -sha256 fe5e822667a4b2e083b8fdd7a37546163f26f6481b58742236abffdcfb3e6c71 ofl/baijamjuree/OFL.txt -sha256 b0316f404a7b291e40921c605160181065791a5010a2d2d5691fc7e28cdbdff2 ofl/underdog/OFL.txt -sha256 c026db4c1a557cae47e6930876965f9cbc05758eb1f5d6f59b6b61c8f342a57f ofl/alice/OFL.txt -sha256 aad1e82802172d4c1d22dd015a5b8b4275e5665a49c1df54ed64716fca7ae194 ofl/corben/OFL.txt +sha256 b01cec9e5e2035b70a6aeb61c673d1f6d5c91539845be07733bd9880fddeb9f0 ofl/kadwa/OFL.txt +sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/kalam/OFL.txt +sha256 694282197de3d750a43689dc64a8116cd19578cd516e7b2490c7b5362c064dbe ofl/kameron/OFL.txt +sha256 74584d937293a9cacdcd2eb05851b71aa1527901c18b87961d2f877c77a1b486 ofl/kanit/OFL.txt +sha256 136a256d6050ed32bbf96736d70b9099c6359e83dabeb6847cdf6b8ef84319cc ofl/kantumruy/OFL.txt +sha256 cc31fe974951d56d542f33782d07b2d5577a4afdddba89744e6bd69bcbf3a853 ofl/karla/OFL.txt +sha256 fdecdad755f4e5e95bee491c7521f31625dc08283562ea8579543c90430eb269 ofl/karlatamilinclined/OFL.txt +sha256 cc31fe974951d56d542f33782d07b2d5577a4afdddba89744e6bd69bcbf3a853 ofl/karlatamilupright/OFL.txt +sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/karma/OFL.txt +sha256 251f65282ff48a7e8ef3fb661fc99254d9b3b0c368427c98b1edbfe4ca66e888 ofl/katibeh/OFL.txt +sha256 3336bf5d4e7eedba48ecb831f37bf676e901c39f2e6a422cceadd9d2ffa55be8 ofl/kaushanscript/OFL.txt +sha256 0acef93ca37cf19eeb83a1c6a29b78b08377a211c8d80cd27626e210176828da ofl/kavivanar/OFL.txt +sha256 82831e8f12ecb6deb2f4d9919a04049895b4619e0301fa6b699c861bd7311c54 ofl/kavoon/OFL.txt +sha256 723764a50d4e6985dfcbd75fcb40dbd3abab37ba25ae626486d4a32084854487 ofl/kdamthmor/OFL.txt +sha256 ca13e9cd1faaa6afb9e43dcb534a8984cec3218993fb4b436468a79a1657ee19 ofl/keaniaone/OFL.txt +sha256 393d494f9ebb5db6a3552ffa03a4c6f3746c22808b40d011b391681da55ca3f6 ofl/kellyslab/OFL.txt +sha256 ce78cc8de3f6edd2738e8c02f2079db7086c9a74314baa5854675f83c33954ff ofl/kenia/OFL.txt +sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/khand/OFL.txt +sha256 6827fa45930d5847fca5b3d3898b3d87a229fba772a5b6c5bc33bf73ec83478d ofl/khmer/OFL.txt +sha256 2171558d2482764644a2f793696fa2e48c361730ecc87686b9a29082d6daeb10 ofl/khula/OFL.txt +sha256 38a83f1f8b6efc3ab354b8b6eed22e8524dc71280844dc24811d95ae27b34952 ofl/khyay/OFL.txt +sha256 7e896665d0863d2a17a671001dbe2528a5f9302f1dff9222af8b0834e9088d0c ofl/kiranghaerang/OFL.txt +sha256 11bdf9c7abd81f46a88b0b017d78a0e51f451e9dc0c2272813aa9f456ee886ca ofl/kiteone/OFL.txt +sha256 14b3fbd06078a869cf2ba96e6dacb852d373703c86ca7ad54a4cdd6e20fbab19 ofl/knewave/OFL.txt +sha256 b1958132ff727bd74409aa37ec0abbe4be13b1b379e1210e6fb77fc608c607d5 ofl/kodchasan/OFL.txt +sha256 0878e7d6e842bc3c45154059a1c2812de0d31dca343fe6bc16abc9afdee3e3de ofl/koho/OFL.txt +sha256 d3711c90a7deda6210d30e41b945f16bdaa00662b30ee0b7c36abfee82525bfe ofl/kokoro/OFL.txt +sha256 9c56b4e2e4e922cc37e19e1a9e2e1128beaa17a812e1b67c8ac371b0fb57ae03 ofl/kopubbatang/OFL.txt +sha256 e39d6ec64a37ed1523a59940695a61ea5e7882d9bbe0e7eb11653fda4b04fc79 ofl/kottaone/OFL.txt +sha256 a3deaae17ab9a15dc3c2778126aa6f80d41d567741853f84b16a9e1318ed799a ofl/koulen/OFL.txt +sha256 6627b9c2c8ff8e0c6ef23f1b0125dd5b293320c10c916d402fef64916c296d0e ofl/kreon/OFL.txt +sha256 4ec46c3e4469afa19f0156bac6917472974f9c85c189f9220cf8735d3e810401 ofl/kristi/OFL.txt +sha256 6c181f5a0045e8f414e1c232c35972ab83ea084ac44825f517ba001628d97b21 ofl/kronaone/OFL.txt +sha256 8f187da1eb4f23e3fe7ba68b1cb2e92881a415dd34c46489698454517e273c4f ofl/krub/OFL.txt +sha256 ff72e4d89860e64ee38ccf8a5a7e9dc085d5e36115b096a6c7f8bc988e9bec61 ofl/kumarone/OFL.txt +sha256 b712dacdda5da76c0213f8478886f893b855665c1153ae438bc3e55a7dc525ef ofl/kurale/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/labelleaurore/OFL.txt +sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/laila/OFL.txt +sha256 b5c3d12a3085b96011fee65555234bb9d31fa7444cf6f8d5ae6b1f5771394399 ofl/lakkireddy/OFL.txt +sha256 327bac41d89cf9f32e0efe353228018e1661cff458a5d4905714958514df7bd5 ofl/lalezar/OFL.txt +sha256 d51f3341fd7b3dfa1114d3ef0bdabbe57f60eef86a1458019e0077d676fa1fcb ofl/lancelot/OFL.txt +sha256 4bf7256c8ee73577ee5e26643d3247ec77017ca04489befd3e0f3412827729c7 ofl/laomuangdon/OFL.txt +sha256 4bf7256c8ee73577ee5e26643d3247ec77017ca04489befd3e0f3412827729c7 ofl/laomuangkhong/OFL.txt +sha256 4bf7256c8ee73577ee5e26643d3247ec77017ca04489befd3e0f3412827729c7 ofl/laosanspro/OFL.txt +sha256 1ed119b01f03187dbe2f5f89c95431b9a4ca46db604fd263164d8b4055189f46 ofl/lateef/OFL.txt +sha256 74ba064d03f1f1c4a952da936c3eb71866c34404916734de3cae73b34357e59e ofl/lato/OFL.txt +sha256 81d0973236b5b5709a80a217a330db36eabedf57bf4031de46b4660b69901234 ofl/leaguescript/OFL.txt +sha256 2937c7789b0e4fdeda6eafe93164a2ab36e20386704c4cb6f87b1deb620ec0da ofl/leckerlione/OFL.txt +sha256 ba01480319f922ecebbc73f1a523e7f8876e92b16553a32c494bcd3f6f5a27fa ofl/ledger/OFL.txt +sha256 3fa0ceff4b9a2d28dde43bc63cde3acfb5e6e92d13a53e484ca0e501e18c7e2e ofl/lekton/OFL.txt +sha256 75b2a5f39a53b4cf9286eb3d2cc1f895a8f3442680013c77124121bc347a6448 ofl/lemonada/OFL.txt +sha256 ed93e9833f18acc2775380a28139fd88d3ebf82df7cb814042498467be3463bb ofl/lemon/OFL.txt +sha256 1103d0731f1360eb156b0047a1337b2d62266fadcef1015d06f6263719c0200b ofl/librebarcode128/OFL.txt +sha256 1103d0731f1360eb156b0047a1337b2d62266fadcef1015d06f6263719c0200b ofl/librebarcode128text/OFL.txt +sha256 0fbae33ac3aa455c8c0d598347c87f1abfac0d215483f40f5a0e8dd08076df1b ofl/librebarcode39extended/OFL.txt +sha256 0fbae33ac3aa455c8c0d598347c87f1abfac0d215483f40f5a0e8dd08076df1b ofl/librebarcode39extendedtext/OFL.txt +sha256 1103d0731f1360eb156b0047a1337b2d62266fadcef1015d06f6263719c0200b ofl/librebarcode39/OFL.txt +sha256 1103d0731f1360eb156b0047a1337b2d62266fadcef1015d06f6263719c0200b ofl/librebarcode39text/OFL.txt +sha256 c867d1a613bebc4932cf28c060fefb3bcfba3be56ed498b873c79f4eb786af1d ofl/librebaskerville/OFL.txt +sha256 d7f96801a28ea11eaa51bc4a9c87fd91f2133bc298068e6e2847a15ddda23089 ofl/librecaslontext/OFL.txt +sha256 ad6f73fa3edb7aea340aadbc63c0d7ef7663abed82664432ae09a6b377fa313f ofl/librefranklin/OFL.txt +sha256 aa36087ecd7e9085e5a1439b0a6d0ee35966e8cd2ccaa649bebe62cae5815e82 ofl/lifesavers/OFL.txt +sha256 255d5debbb80eb2ea762644311f266a279e8778f00156655a516e2b7781a63e1 ofl/lilitaone/OFL.txt sha256 878aec7282ab41d058cedbf90e14512bcb4fbd0658496de8c2dfc592ed1f0cd0 ofl/lilyscriptone/OFL.txt -sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfellenglishsc/OFL.txt -sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/sarpanch/OFL.txt -sha256 aff3cea99bf300b4b29f4dc04867cf9b49d83de8c5ecaf991c446d506b56173e ofl/wendyone/OFL.txt -sha256 b054962de0af1397d5350fddb4d6bb20f5f2e073b543eeeb694c7c3b27144fc5 ofl/chivo/OFL.txt -sha256 19849b33c59d0cffeaad0dbdc38db767e95e03cd36fbbfe6b67a9878aa5758df ofl/fasthand/OFL.txt -sha256 a57810cbca0b4715ae8610dd7a268260cebbdd4fd76d304e371517f828150669 ofl/stoke/OFL.txt -sha256 47a0b7e315bc56ca0326fca46302d87d48a61e3528d4196e966b62f5bf0243f2 ofl/armata/OFL.txt -sha256 eeacf16032901d0ed0456876ec77b8f0fda6b3fecec7d972f8543eb602e6c30f ofl/nanumgothic/OFL.txt +sha256 6b53fb03a50914cc382f4d025ee595c17c43f24ae870f840bc51969d3e316c7e ofl/limelight/OFL.txt +sha256 9ca8b9e5db7184105da255bb110023cf1cce6caa56186341bb7b09ba97b20ba5 ofl/lindenhill/OFL.txt +sha256 88aece7d90f2bb7049719f11619a560af22af3451af141f12aa4f46bb157a99b ofl/lobster/OFL.txt +sha256 f46c3ea04f38ea73c0731d73dfba3d7361d4b38970feb31a3558bd1b75e0656a ofl/lobstertwo/OFL.txt +sha256 e88691a5e0a8a3f788f31db959701ec90a1d5e7505f1cc53c5663180a7d23c81 ofl/lohitbengali/OFL.txt +sha256 4fe81901e6f84cfce1145c715e931352a9a12aa7ac75cc193eb523c0cb0e5eb5 ofl/lohitdevanagari/OFL.txt +sha256 c87702d8b70f714fbefb554660e8ca57a43ef62a59089d11cbf0c6bd51d56928 ofl/lohittamil/OFL.txt +sha256 9551ade371e7bcb1f6d9959273bbf1fed3bdf398efb5c57cc1fd85d6a13e9e5e ofl/londrinaoutline/OFL.txt +sha256 819e3b25f9b50f12299a3db1638be3813efc6b938f2b86693a218d20ec4e3209 ofl/londrinashadow/OFL.txt +sha256 85b700bfba1250a6f8bdf930cd7113faf3d8e9dc52cd89eb98c3ac8a038a4aa9 ofl/londrinasketch/OFL.txt +sha256 66b5c49d384cba754806a891ebd52f2ca08dd05c0eb3c56170192da466a00a20 ofl/londrinasolid/OFL.txt +sha256 7706a84d7e49e2273877106334a1eded8ae89fb5839fb81e0f2bb27c846f667e ofl/lora/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/lovedbytheking/OFL.txt +sha256 1d1b7f3480c8d9b65c26d205e41dcbfa85731588d6ea50bccfa78e91f242d629 ofl/loversquarrel/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/loveyalikeasister/OFL.txt +sha256 65f43260cf7e66b57ddca8d148384a6602e2c06edd389a8b3cf388045127b47d ofl/lusitana/OFL.txt +sha256 930fed5b06a415736dc3b4e5f4f01585523b672717564bf677f93966bcd57636 ofl/lustria/OFL.txt +sha256 0d75673e4c98de3e11337dbd90b05d0232edfcade5c1c02fbc0118c85aea25da ofl/macondo/OFL.txt +sha256 0d75673e4c98de3e11337dbd90b05d0232edfcade5c1c02fbc0118c85aea25da ofl/macondoswashcaps/OFL.txt +sha256 34b8afbcab7508bea23847288332a8c05a507364ca6f0c8756ce560d7d59d506 ofl/mada/OFL.txt +sha256 746b384383888d9325ed2fa9c40d2456b458aa190dd2b8c515ed4f02a1075bb7 ofl/magra/OFL.txt +sha256 1d08c63944e639bbfe8a1b81e3c6a63836806c126b3573b9cda0db83fd27ffe9 ofl/maitree/OFL.txt sha256 616e75d879831bedfa7725c078e09bb56f8a17f40b194e16691b12251bb42b3e ofl/majormonodisplay/OFL.txt -sha256 75c7ccf4f537a7a3ebbedd299c1d2542e13d3b27aaf76a0a2d9fa91a2a8fcd3a ofl/felipa/OFL.txt -sha256 ee2c069b30f3e9a5aaf52357117ee3443ee27f17c29a2ec68861db283379905c ofl/dynalight/OFL.txt -sha256 fbe0442a6b1ce162c95e241df76cab5ef2daf6a5ac84ae1a7a6749f32c051098 ofl/breeserif/OFL.txt -sha256 43d530580461a574f6dfed9e15af6a74e95f7c04d9bfa1174a63ff036e8eee07 ofl/rubikmonoone/OFL.txt -sha256 40bd3f35477284c021978816e9d3b8723ff2283fd7065fafaa5bb3004e41b237 ofl/songmyung/OFL.txt -sha256 460966d12f306a007930575c3b8bc336fe0c32f880d622af6d3b745a06ca79a4 ofl/benchnine/OFL.txt -sha256 f6f60d5d4cf4f4b1fc4e41353c897a2f5a16e6396c0cd8fa8bdfd2f4586a9a68 ofl/alegreyasc/OFL.txt -sha256 0c922e2d65050677c26ae8dc501bc9ad3e0059c4b10df2fc9717d7bdacdfeb6d ofl/ramabhadra/OFL.txt -sha256 548890e4083028f04e5feba04b6e00554654d840aab81c8664eb66c2216a571b ofl/palanquindark/OFL.txt -sha256 e39d6ec64a37ed1523a59940695a61ea5e7882d9bbe0e7eb11653fda4b04fc79 ofl/kottaone/OFL.txt -sha256 1bfe7d2aca99042eabf37079152fef8abdda2c36dad454ae89b858a3cb1078c5 ofl/forum/OFL.txt -sha256 5505d1a010ee0f2eeecdf624984d2a6170480adab3091170abbcedd85361f1b9 ofl/novacut/OFL.txt +sha256 ad9ce814ff266b57d3c4698d3fadca4b41a6f942a0ddd215db5cc66abf92d668 ofl/mako/OFL.txt +sha256 bc1175730d609233043cde47e48f69831f012e85537c5ec1a2cf4836757c1540 ofl/mali/OFL.txt +sha256 8928e999ff156e35852ab41d7a906598a8285acd3bcd81dff67213a6cd98d43e ofl/mallanna/OFL.txt +sha256 1b8eef90c567309fef17962cc969dd9ed1de69176517238e744018bb983e7c1c ofl/mandali/OFL.txt +sha256 aa72b0185d828cb2fafa62a154e84bd3e20c88ada30326089bb20542b6363aaa ofl/manuale/OFL.txt +sha256 715ba72697e14daa9b29a333545f69bde7c497b9f77d0a2a4c4a5a752d961801 ofl/marcellus/OFL.txt sha256 715ba72697e14daa9b29a333545f69bde7c497b9f77d0a2a4c4a5a752d961801 ofl/marcellussc/OFL.txt -sha256 0786594992757ea0290ae4a490ab9249728f372adb13959c0c8ae4fec83057ff ofl/quintessential/OFL.txt -sha256 ca13e9cd1faaa6afb9e43dcb534a8984cec3218993fb4b436468a79a1657ee19 ofl/keaniaone/OFL.txt -sha256 760fb433c515570f6b77ebc60299c2c91d5f03848c659452a9d2458b28935768 ofl/numans/OFL.txt -sha256 9134ca6996bd33ea2022e109f13f20e29dee1dcd8b2e8878aad576d2ca334e9f ofl/cormorantunicase/OFL.txt -sha256 1d1b7f3480c8d9b65c26d205e41dcbfa85731588d6ea50bccfa78e91f242d629 ofl/loversquarrel/OFL.txt -sha256 1d08c63944e639bbfe8a1b81e3c6a63836806c126b3573b9cda0db83fd27ffe9 ofl/prompt/OFL.txt -sha256 eb6c70cb6b575ad22df022d454df7a20582915e6e8da19b579c6cbef37a26bb5 ofl/gafata/OFL.txt -sha256 93f60741563b4f51f2fcdb207fde72b2b23292a47022c729aecd998b360d8038 ofl/bilboswashcaps/OFL.txt -sha256 4579982a484a9745864de2cda666fd7b5017f9182b74dbb4cd53d84c1d1b2231 ofl/gruppo/OFL.txt -sha256 cd059851dc2abcd2865ae318e8b949736f958794210acb90316530fd100fc904 ofl/geo/OFL.txt -sha256 af9b97696048d509e3d70f8108b7c4381084f95c8fedd97acaa76b0b287668be ofl/molle/OFL.txt -sha256 6958d8c61b6b223f81bdc2109941e5d0004996dde61e197d628e0293f4f1bc58 ofl/miama/OFL.txt +sha256 f22a2beea88d631a620b15683fd03e79f13ad3297ad97fa5e42283c0b1a3a038 ofl/marckscript/OFL.txt +sha256 50f7b09af5ff677f611a96cdf5eb916307c59b29f2e8144942718cb432a9bf6f ofl/margarine/OFL.txt +sha256 a345b13576140008a697ac66ca8c76cd63b1dd076712bc30a0f5e97dcc53cc83 ofl/markoone/OFL.txt sha256 7e98b49a12b51240c85b04eb0d9919a6fec7dbd491bef6cbddc22d3f851bd1f1 ofl/marmelad/OFL.txt -sha256 b9d592c3bf421197d9b7e353416b8e2ec81584988824b43d38c86d997a08b868 ofl/myanmarsanspro/OFL.txt -sha256 e414e07f7a4da16ed47ebec80d52dd79f21d3ca42bc92385a755d8078a038814 ofl/playfairdisplaysc/OFL.txt -sha256 0e2ccc5da1dd979f08ba82bca2fb61592506a1e58d3cbfc26d904f0db71bd812 ofl/sairaextracondensed/OFL.txt -sha256 bc85bae0b512b799bbfb2b916e4d0a34cfd963d09778cd783e248b479e67760a ofl/comfortaa/OFL.txt -sha256 caa697668c3cf3e622753fb202c6c2e29648b94a3499dc7b869a14192e38c553 ofl/sourceserifpro/OFL.txt -sha256 81d6c3788a6b641cb9f543389d9d5c0cd3bf94fbb5639be19c102b9274c34291 ofl/mousememoirs/OFL.txt -sha256 dd028a807788d5e22e9f8cc18f026cda23369954673658f2ecc7d30bdb364b89 ofl/arya/OFL.txt -sha256 53f9c99fa3d47f7d632a42ee7bab4a834a60a744f6026d676c3a223cef2b2ef3 ofl/vollkornsc/OFL.txt -sha256 6506b2fa2a14259a8859608a6148a4591d67bbaef4d8e1948b43c4078561b0e5 ofl/tauri/OFL.txt +sha256 f177d98c67b84250ec87a03ca6ad161e84cab15b435e960039b971797a065f4a ofl/martel/OFL.txt +sha256 5641212407f956b828bf632afc4bbb3344f461f82255ab56756d9e3e8604c7b1 ofl/martelsans/OFL.txt sha256 6cca1abc09d677cf00a55674ce2775e0eeb6dc5c0137b0401816680b9e500f81 ofl/marvel/OFL.txt -sha256 e98ce988fba1c138f4e7c0c5120809706ab1b24a3c29638ca83ab2ff082e08db ofl/chango/OFL.txt -sha256 0e2ccc5da1dd979f08ba82bca2fb61592506a1e58d3cbfc26d904f0db71bd812 ofl/sairasemicondensed/OFL.txt +sha256 9cd20277e2c89d47e3997435e3a16539d20173d850fbb42474990f71642e473e ofl/mate/OFL.txt +sha256 9cd20277e2c89d47e3997435e3a16539d20173d850fbb42474990f71642e473e ofl/matesc/OFL.txt +sha256 e0cde1a4993ed689d463d5e2401f4a60c54cc48a14253ab0f8012d722c417038 ofl/mavenpro/OFL.txt +sha256 e0cde1a4993ed689d463d5e2401f4a60c54cc48a14253ab0f8012d722c417038 ofl/mavenprovfbeta/OFL.txt +sha256 846ce83956a732edd57b74d9ba988d58abc8c8e6d0926859559318ce6aed139d ofl/mclaren/OFL.txt +sha256 eb1992aec1cf892ec94ffc116d79b62c7cb03dc108141b94a57a4195d210b514 ofl/meddon/OFL.txt +sha256 45b1f44d2cb859ea4b7be2f322c57b8ff7be55075c336744e62b5550cd0a97eb ofl/medievalsharp/OFL.txt +sha256 88ac81fcd30e64f6e6b91b61b159c9b700bb3dd59012b72ec61629abcfc7fba1 ofl/medulaone/OFL.txt +sha256 d530c14e9cc263c567b47742ef20df2a41374f00732ba4f290f52adad428b1a2 ofl/meerainimai/OFL.txt +sha256 36e2f1debc9778bac79fac1a0cb5a5ef51c102f00b58ef7d8a05324144b68166 ofl/megrim/OFL.txt +sha256 e12a3e737fa75c0ee072d965b6185710f35e38a4f7a0793ebc66ba14a216109b ofl/meiescript/OFL.txt +sha256 131d19126a0e7ddd25540fd6bee219cebbc8aee7e8374882998ee6c2f4ff6cf4 ofl/mergeone/OFL.txt +sha256 c264f64bb2b91ca0dfdeab75d71719120271fa6a30035396416af235ef481c1e ofl/merienda/OFL.txt +sha256 6383249ddffbd87f2bbd7878ceba2dee0f1a2193cd7a4f41c00aaceb8e6d8b5b ofl/meriendaone/OFL.txt +sha256 a7ba785ad99b6eae0444ab89910e512d4af9865937fddbcb5c72c4f59f55d6ad ofl/merriweather/OFL.txt +sha256 22c4588bdc14621220ba14515d52041d1312541e034a15d1f5c2a88fc6075276 ofl/merriweathersans/OFL.txt +sha256 2f871c2e81de6d0c72c981615002c30bc9f1637003d6d3d4c3f0149886b70569 ofl/mervalescript/OFL.txt +sha256 4e66943af352059c059dd658774f25fbc831f1ad478f9f0890c06ecc2dd324c7 ofl/metalmania/OFL.txt +sha256 f1888ed385b528866a472d02f4e06ef0873aca5b3c63ff1f6116cbb150dc9a13 ofl/metal/OFL.txt +sha256 4fece81b541808b40293b0cd3f5b1990274e1100e1c20455dc2987cd96639d3f ofl/metamorphous/OFL.txt +sha256 ae28423a5e63cb65e651ccf62c9091b322fff1d2d4e87ad9f98b1096c2e7abb5 ofl/metrophobic/OFL.txt +sha256 6958d8c61b6b223f81bdc2109941e5d0004996dde61e197d628e0293f4f1bc58 ofl/miama/OFL.txt +sha256 026610186158060ad351fb20cd1452def5d35b2531634c090ce8cd1d9e9aeaf2 ofl/michroma/OFL.txt +sha256 3997621a219c7758e31dbafdd3cbd2bcb0b6144a41d1ca068d04dbcc4bafcde6 ofl/milonga/OFL.txt +sha256 aa5d677391db4e54ad324b6888792e533c5d800de7ab713302a2fc8bff2f4f6e ofl/miltonian/OFL.txt +sha256 aa5d677391db4e54ad324b6888792e533c5d800de7ab713302a2fc8bff2f4f6e ofl/miltoniantattoo/OFL.txt +sha256 d2875ded3e44e9ae53ea2b35e825dafffa19e82c5d14addb9f1150fcd7a3463d ofl/mina/OFL.txt +sha256 56c4ff36faaaf336bc5fee659ff6fab2413d67499cc22acc29079b3892d8931b ofl/miniver/OFL.txt +sha256 aa8a8196a3e22c3bd985e33cd3245ae9a38accba5e79fc0e3b292612a8d6b337 ofl/miriamlibre/OFL.txt +sha256 d1bf0acea511ad1f4de53e942cffb8ab0e67c03c6203d6f390d71105d52c33f0 ofl/missfajardose/OFL.txt +sha256 b8fb5cd1bafb52e652c733fdb75ee20c763e97acb0398f6b4bbe1d8ada0c07e5 ofl/misssaintdelafield/OFL.txt +sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1 ofl/modak/OFL.txt +sha256 3e908f3a95680bdf3c8456bfbf76392605b34cb3fba109e46441056ab966cb35 ofl/modernantiqua/OFL.txt +sha256 4dee45deee99672fbe342b2f4b7aa75b0cd12de18a68f9732c77f096bab47e0e ofl/molengo/OFL.txt +sha256 af9b97696048d509e3d70f8108b7c4381084f95c8fedd97acaa76b0b287668be ofl/molle/OFL.txt +sha256 04b895d77ccec5034191e953e8e5884637269be15fe0675fc25039014eb46349 ofl/monda/OFL.txt +sha256 02faa476b17db0044d0c502a3ce12fdc81eeeb9bd618e6a005407c79d6081bbb ofl/monofett/OFL.txt +sha256 585c6d2da8bcd8ffa651e0016f2e992a6891b625143a46a1dacf00699a817d9a ofl/monoton/OFL.txt +sha256 a5fc033225d145b43fd7391482ae7689825414ce29a01614d651a3012b57c81e ofl/monsieurladoulaise/OFL.txt +sha256 cb8bbf7a86eefa8c146f24ae5be74fffa887ba83719ab3c87036be8e3d0191e2 ofl/montaga/OFL.txt +sha256 41f82bb4d24b304f30f7136bc47abdd083782e4265c984160f5649d1e78ea49c ofl/montserratalternates/OFL.txt +sha256 41f82bb4d24b304f30f7136bc47abdd083782e4265c984160f5649d1e78ea49c ofl/montserrat/OFL.txt +sha256 c54957d55e7c9e66c28e474cd39de75dc044e8f69056788cae44eb78841ceef1 ofl/montserratsubrayada/OFL.txt +sha256 1fac7a3e4e43b091c2d31aef7a375d2b969c42b2d5fce8e2d40b5f7b1233ddb7 ofl/moul/OFL.txt +sha256 581f08727777cb2a1a1ec95c0f981ce64fb1ad4354f78a0ac4f3481afa605577 ofl/moulpali/OFL.txt +sha256 81d6c3788a6b641cb9f543389d9d5c0cd3bf94fbb5639be19c102b9274c34291 ofl/mousememoirs/OFL.txt +sha256 da15da6b1496d4de18f97e2ad1b722ef8a1c121149c2c93b2cf7eac6ac27b35c ofl/mplus1p/OFL.txt +sha256 5ae0cfa62a70251d9a2c3c5430ed3bafa480005f23e4b9525488f2318e5c10ca ofl/mrbedford/OFL.txt +sha256 5ae0cfa62a70251d9a2c3c5430ed3bafa480005f23e4b9525488f2318e5c10ca ofl/mrbedfort/OFL.txt +sha256 0da6a3e5b24a9fa04085c20a2a1d3101eeb1e0bff56a2291f407187e1b2adcf2 ofl/mrdafoe/OFL.txt +sha256 c3bfad2900a83f571d5c984d490d51c56aef14806c28dde38125593e1e71daca ofl/mrdehaviland/OFL.txt +sha256 f354ef1e7256644b320c5e1d9a07a819c2e2b930166003c96680894f9fba81be ofl/mrssaintdelafield/OFL.txt +sha256 967d75b89eef1f8a0ba1f5ee7dfb13427621f9116c6e7878ca04da8c9aa8641b ofl/mrssheppards/OFL.txt +sha256 46751a31966477e3f038d1e5ff1146a33234a3a523a0e6a21be3221cba082a34 ofl/muktamahee/OFL.txt +sha256 d24ff874133ecd133e55d7c4070d2edab14d3933477c2bccb3a0d8d1cc9c33bf ofl/muktamalar/OFL.txt +sha256 2ee5e8e47cd7d08f60bb9555f72b25912c9e81b13f5bc9a0551ddf943da6ca98 ofl/mukta/OFL.txt +sha256 d24ff874133ecd133e55d7c4070d2edab14d3933477c2bccb3a0d8d1cc9c33bf ofl/muktavaani/OFL.txt +sha256 7f55affd2bce8ed9be13297ba8df1a4a7e9835c2a006126dc2a1eb4ce75a7943 ofl/muli/OFL.txt +sha256 b9d592c3bf421197d9b7e353416b8e2ec81584988824b43d38c86d997a08b868 ofl/myanmarsanspro/OFL.txt +sha256 965bd2c907f7bb6f36da4f85e83f29aea8b2f720783deebd7ed7b40678e67672 ofl/mysteryquest/OFL.txt +sha256 eeacf16032901d0ed0456876ec77b8f0fda6b3fecec7d972f8543eb602e6c30f ofl/nanumbrushscript/OFL.txt +sha256 eeacf16032901d0ed0456876ec77b8f0fda6b3fecec7d972f8543eb602e6c30f ofl/nanumgothiccoding/OFL.txt +sha256 eeacf16032901d0ed0456876ec77b8f0fda6b3fecec7d972f8543eb602e6c30f ofl/nanumgothic/OFL.txt +sha256 8eb1c1019fe7fe6d0b6e7d7bbbba1d9cbdd969d8c5f26455708f6cfb8a77284c ofl/nanummyeongjo/OFL.txt +sha256 eeacf16032901d0ed0456876ec77b8f0fda6b3fecec7d972f8543eb602e6c30f ofl/nanumpenscript/OFL.txt +sha256 c0a7efe98e77cbfcf1a5ca43e874e25cf53d9185c56295bc3b5c407f95dae638 ofl/nats/OFL.txt +sha256 656a20870fbcb8f559f1c6308c1df90ac93d7cd0279aab49b43a43b5e58534e6 ofl/neucha/OFL.txt +sha256 636d62f04d7bda9fcf9354f258f6244e7e18288cae036b95122e204f1acbec80 ofl/neuton/OFL.txt +sha256 942d51cf079299e83e9dd7a9a37eb92260524e8d1d576b2f0b3f7ca207c53f8e ofl/newrocker/OFL.txt +sha256 7729f005b7a087368e2cf61fc4b65cdc85988e47d0e6e38c93a72de345e86b41 ofl/newscycle/OFL.txt +sha256 6aa923334ec515d26b1a61bb978a0bb5bd8884de7529add1625beef2f4a53f74 ofl/nicomoji/OFL.txt +sha256 70f664de65e7bb62e1ac728f20a9bb28de7fdc18be594186137a9e15ce9dcee5 ofl/niconne/OFL.txt +sha256 f9f28345ffcd6cea6e3c6699e4579cd1948053d80fe89a6a5a2ecb269afc95f8 ofl/nikukyu/OFL.txt +sha256 513346ac60af1dde9d4a7bcfad3f39909d5697373a8aa1a6ee4376e6d22d3cdf ofl/niramit/OFL.txt +sha256 e711c816f7de931244976f51166baa15446fc307e5d0ea04fdca1bc2c04afb1c ofl/nixieone/OFL.txt +sha256 9465823369fbe1ae0b5a3065021d53ef8c56e113e664229455dc80b237fa6a07 ofl/nobile/OFL.txt +sha256 4dbbe5c21b46f2647d227dde69b971a1b46de1435e0752a9eda1ce120725a93c ofl/norican/OFL.txt +sha256 4f8b437578b20bff261adfe6c02f63bcf7dbb6a45ab37804b3547e5d5f44927b ofl/nosifercaps/OFL.txt +sha256 b41b99f35b507564e54f6b2f5162ad1c21f94a16837c632da6632b376a341f42 ofl/nosifer/OFL.txt +sha256 fa28ba897eb819768d6bc00c30aa03ef560e80e5f6fb872eaea089c66992f502 ofl/notable/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/nothingyoucoulddo/OFL.txt +sha256 f2ab7e5c5c750fa03a8d8f64c72a089ed86fbd3dc172440fcc704b27816d5957 ofl/noticiatext/OFL.txt +sha256 5e0da210fb04058a8c0087985d2d456b931c2579811a49655721d3cf0c36b6d6 ofl/notosans/OFL.txt +sha256 6a73f9541c2de74158c0e7cf6b0a58ef774f5a780bf191f2d7ec9cc53efe2bf2 ofl/notosanstamil/OFL.txt +sha256 5e0da210fb04058a8c0087985d2d456b931c2579811a49655721d3cf0c36b6d6 ofl/notoserif/OFL.txt +sha256 5505d1a010ee0f2eeecdf624984d2a6170480adab3091170abbcedd85361f1b9 ofl/novacut/OFL.txt +sha256 d2f87f90d108a947f98c030d9d8e4bf27e761ce83f222453b9a7230c5fb309e1 ofl/novaflat/OFL.txt +sha256 197c3f48cff4df3d768230e0bbdbc4305d8b8b9041ea6fb5e00872af66adc5ae ofl/novamono/OFL.txt +sha256 bb655534b6c7bf3e547c1368a68a5b1032d0e96fd08b5cc75f3d7a78528784ef ofl/novaoval/OFL.txt +sha256 f1ef4c3ef43322403f5c30e4fb46496969cb5c34a2a6e7247b507254b69caa6a ofl/novaround/OFL.txt +sha256 9b1cfccef4a7e19f90e2901f808f3aec4335d3cc81f978453ad0c8ded14447a0 ofl/novascript/OFL.txt sha256 42e7b456fee0d0dc86927579b3d2626d42bb0f4cc9778f3a92ca8ada4e46348e ofl/novaslim/OFL.txt -sha256 1b8eef90c567309fef17962cc969dd9ed1de69176517238e744018bb983e7c1c ofl/mandali/OFL.txt -sha256 9e262d6d7fb789aab6a8ecc53fc9c78387eeb9f935dcd289282d8e751b6bf743 ofl/antonio/OFL.txt -sha256 07dbf75115edfc1fd75580aa19c4c730201a099e8f86a9869887dfbed0547266 ofl/offside/OFL.txt -sha256 f177d98c67b84250ec87a03ca6ad161e84cab15b435e960039b971797a065f4a ofl/martel/OFL.txt -sha256 bb3e8082faf86b1474a6b042125ef0f83669d28110b72f70416a7587b7b9f144 ofl/unlock/OFL.txt -sha256 c4955dfe15a5db10326aa58ef767460c42cd12a3acdb3e698eee2704eb373d94 ofl/electrolize/OFL.txt -sha256 cf6dd07485d67d20f105afb9981dffdb6b180b59af45a228839cf3fb0277c9fb ofl/arapey/OFL.txt -sha256 87e8d9aca71dbe0481ba8611fc90d7e3aebfa3e2546420c403e7078898b0c484 ofl/allura/OFL.txt -sha256 55e13d77a4457aa9c60f10c5b97baea3343d3bac30960d49554a033cb9eaff7c ofl/sail/OFL.txt -sha256 1c5bc055869d5e9151ec7774082727db720ec4293c65be67f91a4bdcaeb02998 ofl/righteous/OFL.txt -sha256 de5ff32211a4340b01477af39ee339d639438955e409f79b666d4b9207f3c92c ofl/dohyeon/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/waitingforthesunrise/OFL.txt -sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfellenglish/OFL.txt -sha256 44a7c6e4c5572392ae122d3b1d8c6ba6fd640a7797e675384585d947f2773e3c ofl/jua/OFL.txt -sha256 1ba345a91338581e5f8fccc3e37e447ddea5b99ec9caec1b76c7c39492387d2f ofl/signikanegative/OFL.txt -sha256 9134ca6996bd33ea2022e109f13f20e29dee1dcd8b2e8878aad576d2ca334e9f ofl/cormorantgaramond/OFL.txt -sha256 9ee6b2ec20a06c599a07412690876eb457bf192c10e886e60d8bdffb80bc21a3 ofl/sahitya/OFL.txt -sha256 dcc832bd71ea62cbf97f06327a1b5442905b49ea446801421d71f7d1362db215 ofl/dokdo/OFL.txt -sha256 8aa063e3a1299c5e1821f386f5ca8bc157ac561bd12c739ffa81c6f0821450c0 ofl/donegalone/OFL.txt -sha256 e588abf45ca2b19c340c4b27349c9b6b6e5e198316fd965128ed9f4422942cbe ofl/raleway/OFL.txt -sha256 9860b97028024085855e503e32c1971bfd603374641cd018c136433ebcf5a338 ofl/gravitasone/OFL.txt -sha256 ee9d043332991eb6bf2bd56fb04db3c558c1ee2f0cb9aa7b18366c77e34fef30 ofl/jura/OFL.txt -sha256 15b1a21c3fa37a475ba6b0c0cfe289c7952548caf6e432068ddaf98d139ce419 ofl/belleza/OFL.txt -sha256 c5a77946a56488790364d060628385d51226da62a18f30d2be0181d82ee62b00 ofl/suranna/OFL.txt -sha256 36e2f1debc9778bac79fac1a0cb5a5ef51c102f00b58ef7d8a05324144b68166 ofl/megrim/OFL.txt -sha256 0fbae33ac3aa455c8c0d598347c87f1abfac0d215483f40f5a0e8dd08076df1b ofl/librebarcode39extendedtext/OFL.txt -sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/teko/OFL.txt -sha256 d324289a26909a519fb16c3d468a56ab909ad6d9070cac5742e5d59ad9bd9815 ofl/gildadisplay/OFL.txt sha256 c0bcb72e68dd416db0bb9fcec7a7fa62321b0147cde00d8c8f82748e33aefd34 ofl/novasquare/OFL.txt -sha256 794d72ffdd25e8f7ca8e1d68db088c30ddbf2fdb369b6cc8217d4fa5fa6dc62f ofl/adobeblank/OFL.txt -sha256 806cb93632b8091cd36554642a96b2752bab50015da6a2b456d786c1f9aef5a5 ofl/carme/OFL.txt -sha256 0677891e6a143f297350d260ad766ad33bfc18ed5fa4f213acf648d6b597ec1a ofl/alegreyasans/OFL.txt -sha256 08b6f5cceaefcf2881eb009adeb78edd0fabf9c8f0eaf8b88f07a690222227e6 ofl/varelaround/OFL.txt -sha256 3f0f27931c92453994176af3b1e7954f9aac39fe145374d6d08c47c822e82e59 ofl/princesssofia/OFL.txt -sha256 2ce1c4fcf4ab9c8474d0824434497d4afa4425db4de5629103698b170ac4ee74 ofl/bungeeoutline/OFL.txt -sha256 455397ca15d39e9178bbbf4b485a29187751d60f7ceb7829980a521d5ab6848d ofl/sofadione/OFL.txt -sha256 b7574cd4c76770e5e3915d16bd93f09663bd77cb041a4ec09d824c52b540529a ofl/germaniaone/OFL.txt -sha256 39de3de5f1873f89bca4af37823ab22e28e88d0d8f7fe2f07e82e9e6e9bf7b70 ofl/eastseadokdo/OFL.txt -sha256 520a0c239d39b379b61c4de5f8e3b02db20b0dfc137481843eac01f02c41f4a2 ofl/aguafinascript/OFL.txt +sha256 455755e2e7ce9dbac6beb3729c97c57d6f74a638dcb5be548ec953021fbdbfb3 ofl/ntr/OFL.txt +sha256 760fb433c515570f6b77ebc60299c2c91d5f03848c659452a9d2458b28935768 ofl/numans/OFL.txt +sha256 010cb216e8f3fbb2836fa3f38787a412b749352de546797f57c03c3bcfe46b1f ofl/nunito/OFL.txt +sha256 43c89012c2b640187aae7e0c83d5ffa8381a0368c00e8426594358d44d3811e3 ofl/nunitosans/OFL.txt +sha256 a10a07aaa150c147fa3cb22e845013f38e6c2b45fe5ba32a74ed1be9d4c417ae ofl/odormeanchey/OFL.txt +sha256 07dbf75115edfc1fd75580aa19c4c730201a099e8f86a9869887dfbed0547266 ofl/offside/OFL.txt +sha256 ed50ebe2fa922554980909192526fe94966556626d6d440a462c8e7eaed74cdc ofl/oflsortsmillgoudytt/OFL.txt +sha256 fc59ca3cd3bcb47bd4df597519111ec130c25cabcc57a8808dd2d243cdcec6ae ofl/oldenburg/OFL.txt +sha256 4faa2d9e2ce0a4b5b37e62ee6fafe474a539b31578f7214ed97cc3503aeb8ebd ofl/oldstandardtt/OFL.txt +sha256 8fbe530adcbe30c658393c3f2b5a4785d6765afcefdfe47f594730131f3a0abd ofl/oleoscript/OFL.txt +sha256 8fbe530adcbe30c658393c3f2b5a4785d6765afcefdfe47f594730131f3a0abd ofl/oleoscriptswashcaps/OFL.txt +sha256 d941c5b788d47aa469ee54e30f4c12d6a43c45a295f10c568bdf9772f2893b7b ofl/oranienbaum/OFL.txt sha256 ffaf7bc750bdaa0b95b09eb80e419748bfaf46268c6612860f0a5e19e17abb12 ofl/orbitron/OFL.txt -sha256 c6b9c7322fe0203d4d8a0f98541136d8d76da76b92c79d206b09991b98338cc8 ofl/gemunulibre/OFL.txt -sha256 2f871c2e81de6d0c72c981615002c30bc9f1637003d6d3d4c3f0149886b70569 ofl/mervalescript/OFL.txt -sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1 ofl/baloobhaijaan/OFL.txt -sha256 842b4f4605b32518a1269c4d030d719ea2c4c317d699fc4441d0219658e18893 ofl/seoulnamsanvertical/OFL.txt -sha256 00a6fe8dfdc48d6206bcc4f10a765515a73433dfba7255eff966963beb26facb ofl/dhyana/OFL.txt -sha256 cd2dea62cd4b0c5fb335cf07ff04fd5c4bacb49b8d6c2bbbef9766c663d79b1c ofl/patuaone/OFL.txt -sha256 c0a8947de199b422d30c16137e4decd5362e3a1d504422880d69c02bd6046dac ofl/cagliostro/OFL.txt -sha256 c267a00c9476c78a2336d7b372b536885b8b24173a29ed53496f67a742c14961 ofl/alef/OFL.txt -sha256 2cc926050c4c6ccd9a0288b7792e2fcf93e5629ee6269e35986f092275e5a1b9 ofl/sarina/OFL.txt -sha256 f1bce31b817dee01c1e4ef8bc45d8ecb95f01f4abbf0a985007cb3cd0fd8123d ofl/zcoolqingkehuangyou/OFL.txt -sha256 9788e3b3e67f22ab5846a0bb867a230e7df2468c3cd20f730a5d9c34e673d090 ofl/rubikone/OFL.txt -sha256 f3bc8767749fc133d9b35e84ca024b82f1ac4d1b38deca0adcf8300892303022 ofl/faustinavfbeta/OFL.txt -sha256 ee81f11dd1970e9749afd2a572256f8eefce65532872762a4d7a3d5daa0812c8 ofl/shojumaru/OFL.txt -sha256 4f4bc3806a1e55789c6ef75ca5fc628297b05292f74966474dc0d40324abc609 ofl/abel/OFL.txt -sha256 064539f87826887d2062b7823b2b97b7625d68b642f6c945c99c0b8dc8084195 ofl/rationale/OFL.txt -sha256 a345b13576140008a697ac66ca8c76cd63b1dd076712bc30a0f5e97dcc53cc83 ofl/markoone/OFL.txt -sha256 203693528d6d2e8dc5e639c6ea42b3e825b59dd6447294e37b306fe734650091 ofl/arizonia/OFL.txt -sha256 9ca8b9e5db7184105da255bb110023cf1cce6caa56186341bb7b09ba97b20ba5 ofl/fanwoodtext/OFL.txt -sha256 3997621a219c7758e31dbafdd3cbd2bcb0b6144a41d1ca068d04dbcc4bafcde6 ofl/milonga/OFL.txt -sha256 2ce1c4fcf4ab9c8474d0824434497d4afa4425db4de5629103698b170ac4ee74 ofl/bungeeshade/OFL.txt -sha256 162a3b5c72cba845280a6f887c11d02984540b924510138c8b1eb473bcdafb6a ofl/concertone/OFL.txt -sha256 21b54eb0d7513524798a00dfbaf99a02c003a0012a728cc5f0e02d24c50482fb ofl/caveatbrush/OFL.txt -sha256 186d750eb496a4c17a76385f82be6aea2ac1cf2de074a811d63786cf374ea73f ofl/barlow/OFL.txt -sha256 9551ade371e7bcb1f6d9959273bbf1fed3bdf398efb5c57cc1fd85d6a13e9e5e ofl/londrinaoutline/OFL.txt -sha256 f15a9a3a9a665c2d17655b8fedad86d9a8f30081d46bb91236beb1bc7294a589 ofl/akronim/OFL.txt -sha256 76a55594c9a18b7d94b8119de838237eb834bae4e8c646d6d363aee587b7b427 ofl/slabo13px/OFL.txt -sha256 0e2ccc5da1dd979f08ba82bca2fb61592506a1e58d3cbfc26d904f0db71bd812 ofl/sairacondensed/OFL.txt sha256 96b7bc175186cd0153a9682a1c9bb1da7103ab13a83abef8026bc64582ca616f ofl/oregano/OFL.txt -sha256 6fc386ac48a529b85c21f90a6c8d2111c6271b3063f9ddd78e92645db5259510 ofl/tulpenone/OFL.txt -sha256 13e862ac3f67130f58bd4bebb61c588d147b5a555b1ac6959570799c4f648cd0 ofl/capriola/OFL.txt -sha256 d24ff874133ecd133e55d7c4070d2edab14d3933477c2bccb3a0d8d1cc9c33bf ofl/muktamalar/OFL.txt -sha256 85814924eca98e1fa530901cc5167d0012aaf31122f9570d7e9755443dd9335b ofl/siemreap/OFL.txt -sha256 f76c1013cffb3e0de0e7dad19ee5b4b7849c7ab10b67218515e39cfd87e554a7 ofl/julee/OFL.txt -sha256 c264f64bb2b91ca0dfdeab75d71719120271fa6a30035396416af235ef481c1e ofl/merienda/OFL.txt -sha256 d102f22055cfa31a9659228483de3c726010f0b3b416b78e3cbefcb54816e812 ofl/galdeano/OFL.txt -sha256 2db02cb5d05d5f8a003ffefce36a32a16520ad4cab9ed90635ff953b583e4e82 ofl/sigmarone/OFL.txt -sha256 cdcc959c42ab255b4cea4bd82f2db5c24a2da7ecabe615d02d5a5dba3716e446 ofl/racingsansone/OFL.txt -sha256 c88333734ad7cd30540ec6614d12aa829a0395715de30e336d22ddfa3005db42 ofl/catamaran/OFL.txt -sha256 26daffa24723bb188643085cfc5423f9d78d22a395df4a7928380e430545a201 ofl/bubblegumsans/OFL.txt -sha256 de2246895f0ac21fe05b095d586d36cbc9f987ebcaed1e050c61e69667caf1c6 ofl/hannari/OFL.txt -sha256 b54d54664cddcbf05f5b4ea3aec7e89317eb917cf465920969e7b22361e0f4a5 ofl/seymourone/OFL.txt -sha256 46239ba6485d28553fd944da4ad32a00d9c403aa1c3e111676b0b96fe458d1d4 ofl/averiaseriflibre/OFL.txt -sha256 91c25c350d3cac39da2736d74f7ba37ef648f5237a4e330a240615bc8d8c4360 ofl/ibmplexsanscondensed/OFL.txt -sha256 5802c9e3509199c7aa9a13ea410ae27febbc0cdea184bf7d227170fac703bba8 ofl/passeroone/OFL.txt -sha256 2400b30a72d2b1555255b81625576dfb552584a19a9c85ad8d43ff77bceab13b ofl/plaster/OFL.txt -sha256 4bed7eaae70cab1bdf2bcf9b1cb562fcd9cc26d1c3533c4ade0ec70516dfb3a4 ofl/trykker/OFL.txt -sha256 45b1f44d2cb859ea4b7be2f322c57b8ff7be55075c336744e62b5550cd0a97eb ofl/medievalsharp/OFL.txt +sha256 57f8d60cfe9212b971f07253e303746128edd06b21e3a0e4e188308e569f03e5 ofl/orienta/OFL.txt +sha256 173ea2d0bdda981829719623c35699e8c0e4aa508e0af12817ad7ccbfa4c6137 ofl/originalsurfer/OFL.txt +sha256 ae05f8781a5ef38380ef3efe8cad86783610b6a780c6c278d7472f95310fccee ofl/oswald/OFL.txt +sha256 62fab0ba1d5593782cbf048da193f4b1edc16b817577a99d707827513ad80e9a ofl/overlock/OFL.txt +sha256 62fab0ba1d5593782cbf048da193f4b1edc16b817577a99d707827513ad80e9a ofl/overlocksc/OFL.txt +sha256 19c6ecf65a6b0687dd324b093ced5f1020a1fcabfc8ddaaeca6906cd05153e23 ofl/overpassmono/OFL.txt sha256 19c6ecf65a6b0687dd324b093ced5f1020a1fcabfc8ddaaeca6906cd05153e23 ofl/overpass/OFL.txt -sha256 ff1f38ac4e694a4ad5bd3d7a5146cd8bd73fd57aae794ced76a24b0d68e41206 ofl/pinyonscript/OFL.txt -sha256 6aa923334ec515d26b1a61bb978a0bb5bd8884de7529add1625beef2f4a53f74 ofl/nicomoji/OFL.txt -sha256 cc8c0c3e81cf543e190f128b83ba7c30959f15865c14dd972fca4917faeceec1 ofl/encodesansexpanded/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/overtherainbow/OFL.txt +sha256 008445a4d53fbd71bff9cf733bdfd841a1b15fb58ef3473f7bab4c456e3b2930 ofl/ovo/OFL.txt +sha256 1e20933206ca06421c7c378184da5476d195314cf4bcda2bf122cd45d69a956e ofl/oxygenmono/OFL.txt +sha256 1e20933206ca06421c7c378184da5476d195314cf4bcda2bf122cd45d69a956e ofl/oxygen/OFL.txt +sha256 4705fc9bceb299b2a951d23c321d31f3679871bb99ceadb978907704d211f4f2 ofl/pacifico/OFL.txt +sha256 fccf4916b5f84ef5f88d93fec464421aaf4121d11d4be8d74ee2d032f7661d6c ofl/padauk/OFL.txt +sha256 548890e4083028f04e5feba04b6e00554654d840aab81c8664eb66c2216a571b ofl/palanquindark/OFL.txt +sha256 548890e4083028f04e5feba04b6e00554654d840aab81c8664eb66c2216a571b ofl/palanquin/OFL.txt +sha256 b4fc1d55ce610f255c5712f8169543f9610536d002deb99bbc99bfbba9f8a560 ofl/pangolin/OFL.txt sha256 38fab5a643fa935a4e11edae2d7b2bbe9866b4f4828c2be2f41451b3f27cb67a ofl/paprika/OFL.txt -sha256 a5fc033225d145b43fd7391482ae7689825414ce29a01614d651a3012b57c81e ofl/monsieurladoulaise/OFL.txt -sha256 ecc91fac753ad9ba5bb7e7819a5c59ee1e3cf89032133c6b4b0318d63c35933b ofl/alike/OFL.txt -sha256 6939af7114f0a33c7e6142d4c1320d1bbde11aebe6d8f3c48fc5fb3e0f676a7b ofl/jejugothic/OFL.txt -sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfelldoublepica/OFL.txt -sha256 9cd20277e2c89d47e3997435e3a16539d20173d850fbb42474990f71642e473e ofl/mate/OFL.txt -sha256 351740da2d452b48193483f22f64918a6dfd64a7abe225c6187ad3f36e0d9cd8 ofl/postnobillscolombo/OFL.txt -sha256 aa8a8196a3e22c3bd985e33cd3245ae9a38accba5e79fc0e3b292612a8d6b337 ofl/secularone/OFL.txt -sha256 cc8c0c3e81cf543e190f128b83ba7c30959f15865c14dd972fca4917faeceec1 ofl/encodesans/OFL.txt -sha256 136a256d6050ed32bbf96736d70b9099c6359e83dabeb6847cdf6b8ef84319cc ofl/kantumruy/OFL.txt +sha256 1dd84b611f4bed7f9ff9089e76a96337b187e6f283a4ab33bcb987f844f2c4db ofl/parisienne/OFL.txt +sha256 5802c9e3509199c7aa9a13ea410ae27febbc0cdea184bf7d227170fac703bba8 ofl/passeroone/OFL.txt +sha256 36c285c5472c625901d4a13da7e31c5ea6126678d31d56cf95572c49f27c8950 ofl/passionone/OFL.txt +sha256 a89ac8075be60f2beba79bed3fa253415a373dbdc3bb108b23f4854d0dd495b8 ofl/pathwaygothicone/OFL.txt +sha256 377f4f9c19e935228552478eb68cc2ed82910988a60ba60e2ac73b09f32d02d1 ofl/patrickhand/OFL.txt +sha256 377f4f9c19e935228552478eb68cc2ed82910988a60ba60e2ac73b09f32d02d1 ofl/patrickhandsc/OFL.txt sha256 72060253bd481a8dc18664bb9117072dc07c0f0270a40617c230654821774850 ofl/pattaya/OFL.txt -sha256 56d9c3529facf93873a2a1626dd038054d244b3af30a1e3ffe0e78bbda1c7622 ofl/preahvihear/OFL.txt -sha256 1a2debd5ad8e656b26bb3b29213caa8f7e557a2f31454b11ebb6c3e3b59aa5d4 ofl/cutefont/OFL.txt -sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/kalam/OFL.txt -sha256 d941c5b788d47aa469ee54e30f4c12d6a43c45a295f10c568bdf9772f2893b7b ofl/oranienbaum/OFL.txt -sha256 5e0da210fb04058a8c0087985d2d456b931c2579811a49655721d3cf0c36b6d6 ofl/notosans/OFL.txt -sha256 5ae0cfa62a70251d9a2c3c5430ed3bafa480005f23e4b9525488f2318e5c10ca ofl/mrbedford/OFL.txt -sha256 0acef93ca37cf19eeb83a1c6a29b78b08377a211c8d80cd27626e210176828da ofl/kavivanar/OFL.txt -sha256 c0562e066174197902a4a10606673d189f067970ef89c6013943b9cf182aadbc ofl/titilliumweb/OFL.txt -sha256 f8fbefb5b1004615e6d1e84b1c75e68520d91196f600cb1b07620dd2748eff64 ofl/cantataone/OFL.txt -sha256 2e2cb5a98da665f2ab82a9fd01fb18c2337f845761b0c163f690ed65f3b94677 ofl/sacramento/OFL.txt -sha256 251f65282ff48a7e8ef3fb661fc99254d9b3b0c368427c98b1edbfe4ca66e888 ofl/katibeh/OFL.txt +sha256 cd2dea62cd4b0c5fb335cf07ff04fd5c4bacb49b8d6c2bbbef9766c663d79b1c ofl/patuaone/OFL.txt +sha256 75a77451968e55a1ab404bd953bd8778983e21116d507b890fbcf838e58c8e8b ofl/pavanam/OFL.txt +sha256 12404fcefccc3cb964cb2406510ba679b30f7d7ae689db08df5b455ae24b3feb ofl/paytoneone/OFL.txt +sha256 9e1c955538817c3fab7160cb3110501e73ce109eeb58c4992a14e8323d900849 ofl/pecita/OFL.txt +sha256 9263f9488a9ed1d5f4218581b642e0f054f9a20d208f1a53c19c9f7dbd27eaf2 ofl/peddana/OFL.txt +sha256 e8dd8f53b2fa502ace0636debbe7e357c4888d8d02b8b41d6a9a22d3058a63dc ofl/peralta/OFL.txt +sha256 cf5c4103b0ecf3c38e7c26768b5caf05e1b3e16d4d87b32d859b3c19ce7c216c ofl/petitformalscript/OFL.txt +sha256 1313ae342eae4e1810304b6cd32f6815dd11b8e45812a2af98e58b6960684fa0 ofl/petrona/OFL.txt +sha256 6e6efa9b0556d100cfe60690cff5d9be7144df77adabfd2c278dbfee451351ea ofl/phetsarath/OFL.txt +sha256 331c71cbd8f1d8a70cd6eec3d55553b64e6261a9bb0982fa12e6e48baca827c5 ofl/philosopher/OFL.txt +sha256 5b158abb3406e69b7408b562b7199f6ff55a41ea56e260b87176d693b0095e47 ofl/piedra/OFL.txt +sha256 ff1f38ac4e694a4ad5bd3d7a5146cd8bd73fd57aae794ced76a24b0d68e41206 ofl/pinyonscript/OFL.txt +sha256 e8ad3f3de5baeff6bac6e711d8c406e0a6b8a61d2944741532d8965d893a2681 ofl/pirataone/OFL.txt +sha256 2400b30a72d2b1555255b81625576dfb552584a19a9c85ad8d43ff77bceab13b ofl/plaster/OFL.txt +sha256 5fba78215eb4e42aed6cb0b5c5df52e0f71246281a866cd4493dfcfcbcab9518 ofl/playball/OFL.txt +sha256 f5b03ea0b27c7f5afb9702771ee57679ae8ba6b471b6ba9e62d985d3256f1929 ofl/playfairdisplay/OFL.txt +sha256 e414e07f7a4da16ed47ebec80d52dd79f21d3ca42bc92385a755d8078a038814 ofl/playfairdisplaysc/OFL.txt +sha256 6d216cec166b6e139adaa599053dd49720c053e1f2adb4845de3cc9c3704344d ofl/play/OFL.txt +sha256 5866fd437bf701cd93f2c41ca2a8b33786975c947bee27882d256b408c9b424a ofl/podkova/OFL.txt +sha256 5866fd437bf701cd93f2c41ca2a8b33786975c947bee27882d256b408c9b424a ofl/podkovavfbeta/OFL.txt +sha256 24af1fb3ab8dfeddc83162b7f3b6c1104149b6c3022f1aa948ef4f8ff7e6bf7c ofl/poetsenone/OFL.txt +sha256 708e33bed791c40638926a7577bcef8ff8748f84045f3825277540cbb8d483ba ofl/poiretone/OFL.txt +sha256 de318dcb99e332a746edb9f83180ee206fc3bce74ff96ad7d1cb219967ec74af ofl/pollerone/OFL.txt +sha256 56edbe5fff7981dae6f6eff32f61ba04cd54324e5abfa44b1257b2a307ea561c ofl/poly/OFL.txt +sha256 bdce62dd98db969b73f93f8e8e2151004c20ad871ceb15ad9bfcbdf2cf939dba ofl/pompiere/OFL.txt +sha256 6ea7a3ef1d07feb592693f3f22c26d0b09321ff81814292b49be99888d0da9d7 ofl/ponnala/OFL.txt +sha256 ae30055f1e31d12f6235802c25a8872bb7053fca8ed4a604c530f4b2ee83e572 ofl/pontanosans/OFL.txt +sha256 39de3de5f1873f89bca4af37823ab22e28e88d0d8f7fe2f07e82e9e6e9bf7b70 ofl/poorstory/OFL.txt sha256 31bc966c36352bfd33717382786d0458c38ecf540628ab134e0ce35fde801d28 ofl/poppins/OFL.txt -sha256 f016385cb4b360e7698d22a48c6b58c0634b1ed5c9c17df78515d43887511df6 ofl/yaldevicolombo/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/swankyandmoomoo/OFL.txt -sha256 b712dacdda5da76c0213f8478886f893b855665c1153ae438bc3e55a7dc525ef ofl/kurale/OFL.txt -sha256 74584d937293a9cacdcd2eb05851b71aa1527901c18b87961d2f877c77a1b486 ofl/chonburi/OFL.txt -sha256 8f187da1eb4f23e3fe7ba68b1cb2e92881a415dd34c46489698454517e273c4f ofl/krub/OFL.txt -sha256 3336bf5d4e7eedba48ecb831f37bf676e901c39f2e6a422cceadd9d2ffa55be8 ofl/kaushanscript/OFL.txt -sha256 bb655534b6c7bf3e547c1368a68a5b1032d0e96fd08b5cc75f3d7a78528784ef ofl/novaoval/OFL.txt -sha256 04b895d77ccec5034191e953e8e5884637269be15fe0675fc25039014eb46349 ofl/monda/OFL.txt -sha256 d724dea493d89a7a9681186e2fb462b7cd551674960ee4142ae6b325261b5115 ofl/hanna/OFL.txt -sha256 64ecb0c6bf5cd80c3da76035c00671272966afbd32ffbdbcad95a8b56501fb08 ofl/decovaralpha/OFL.txt -sha256 0cf28cdcf1cdfd35054352816b2d8c81bd6d6f73632198b61507f26dd4dcbeea ofl/sansita/OFL.txt -sha256 d69bcd35f4a121b312a64f7e8eb15bed61c9056e9e9cdaa8d513366142c8e005 ofl/rosario/OFL.txt -sha256 b4cff421cb89d1e32036e818f291f8ab0d3294ada70b5883d5bcc6470b869702 ofl/eczar/OFL.txt -sha256 ecb52bab55d8d6185712fe8fd2fd98300f5c8c07fad0d0a97b1e579462b0dd3f ofl/bayon/OFL.txt -sha256 ed95c33f80ccca002e3a360b683c43368f9c5eb024e5b992abb51af3c10b59bc ofl/gothica1/OFL.txt -sha256 66b5c49d384cba754806a891ebd52f2ca08dd05c0eb3c56170192da466a00a20 ofl/londrinasolid/OFL.txt -sha256 284a5a26e6db9a04259a5690ad57d52c56a4c515ca2ece1943d950f99e709dcd ofl/belgrano/OFL.txt -sha256 6cbe0f55c154b5dee71ca4f2418d69e4e916448ef2ab52dc4541197b292efa24 ofl/sonsieone/OFL.txt -sha256 255d5debbb80eb2ea762644311f266a279e8778f00156655a516e2b7781a63e1 ofl/lilitaone/OFL.txt -sha256 490b8f3acbce2331adc9b9d3e75ee6fe07946fb29af429a300c7d066b1250b2d ofl/crimsontext/OFL.txt -sha256 eeacf16032901d0ed0456876ec77b8f0fda6b3fecec7d972f8543eb602e6c30f ofl/nanumbrushscript/OFL.txt -sha256 f2c0dfa02d6f5c444b4babd7bc0b43be77ea85706e8524342516bc41e43c2f01 ofl/fahkwang/OFL.txt -sha256 4398885e6b303830d81eea03444aae6fb08a44f41b6acd193c88a2f8cd17606e ofl/srisakdi/OFL.txt -sha256 c1f8e0feb0babaacf774b971bcfd791e44125b9d61ff074e4c20924e9661556e ofl/antic/OFL.txt -sha256 6a73f9541c2de74158c0e7cf6b0a58ef774f5a780bf191f2d7ec9cc53efe2bf2 ofl/notosanstamil/OFL.txt -sha256 0b1bada9befa95a40d55830fe83fc7f8064e245fea33bdf0f96f57848f3866fa ofl/codacaption/OFL.txt -sha256 b41b99f35b507564e54f6b2f5162ad1c21f94a16837c632da6632b376a341f42 ofl/nosifer/OFL.txt -sha256 e8d0118fa9d640543e7f6848d1d93f47313c7f56b64f73f37291d859cd5932bf ofl/souliyo/OFL.txt -sha256 bff4e5087ece354afccd073621197bbb7dd9349943b5ee6aa12b1adf0b133081 ofl/happymonkey/OFL.txt -sha256 1f581506286e960436548dba0701aab278f7e67f2adc6bdae2958923867d1e64 ofl/hanaleifill/OFL.txt +sha256 ac55580be2df22a06d29a47501e2ae11e1d399620f5a779e17a66f016ba6d5ff ofl/portersansblock/OFL.txt +sha256 021d5f1df697848da51620394659187be77cbe382ff2f896bc84ffb89c0c2d52 ofl/portlligatsans/OFL.txt +sha256 e37fcc467040ecd81bf4cf59c99ef56b20f57918995e82b3de1d5b4e931bc2e6 ofl/portlligatslab/OFL.txt +sha256 351740da2d452b48193483f22f64918a6dfd64a7abe225c6187ad3f36e0d9cd8 ofl/postnobillscolombo/OFL.txt +sha256 351740da2d452b48193483f22f64918a6dfd64a7abe225c6187ad3f36e0d9cd8 ofl/postnobillsjaffna/OFL.txt +sha256 2dab153a33dcb2101bba3f194d27d953c848a0fabf2e336650a81f84a0c33b3f ofl/pragatinarrow/OFL.txt +sha256 56d9c3529facf93873a2a1626dd038054d244b3af30a1e3ffe0e78bbda1c7622 ofl/preahvihear/OFL.txt +sha256 705960c3281a5765ecc0b59bd4ed7ca59eed165748076bc2fc3e8fdbfeb944b0 ofl/pressstart2p/OFL.txt +sha256 1d08c63944e639bbfe8a1b81e3c6a63836806c126b3573b9cda0db83fd27ffe9 ofl/pridi/OFL.txt +sha256 3f0f27931c92453994176af3b1e7954f9aac39fe145374d6d08c47c822e82e59 ofl/princesssofia/OFL.txt +sha256 9ca8b9e5db7184105da255bb110023cf1cce6caa56186341bb7b09ba97b20ba5 ofl/prociono/OFL.txt +sha256 1d08c63944e639bbfe8a1b81e3c6a63836806c126b3573b9cda0db83fd27ffe9 ofl/prompt/OFL.txt +sha256 7039124ec9c84f9d637637da9f80158f0d3681c82d4e6a811053467f7c33d587 ofl/prostoone/OFL.txt +sha256 a68d8ec6bea7f277053ae93bf563d4b97c233f09f8e79f86ffe5db66f31fdddf ofl/prozalibre/OFL.txt +sha256 511125dc85198375795fdbc109d088654d3b7f9dbd3ccb7bf93d844aef0b153c ofl/ptmono/OFL.txt +sha256 2758cf7a872827f39661cf8cc24188113c030447aefb5ca7145993650076ca8c ofl/ptsanscaption/OFL.txt +sha256 2758cf7a872827f39661cf8cc24188113c030447aefb5ca7145993650076ca8c ofl/ptsansnarrow/OFL.txt +sha256 2758cf7a872827f39661cf8cc24188113c030447aefb5ca7145993650076ca8c ofl/ptsans/OFL.txt +sha256 ddf311c28ddf5a5ad9747649837346b67bed9d356789c3072bb27dbce49e514d ofl/ptserifcaption/OFL.txt +sha256 ddf311c28ddf5a5ad9747649837346b67bed9d356789c3072bb27dbce49e514d ofl/ptserif/OFL.txt +sha256 5f5dbf452c1657370d9280b50d647212a53c80acae6d78e0b5e8c2b26dc62b09 ofl/puritan/OFL.txt +sha256 89d9d01291eeb91074ccf1f7ce07e7a1d9d421ec1191f8e84d440cb50830ed92 ofl/purplepurse/OFL.txt +sha256 3747fdcbfe4f51d6a2f101c35105bacde3715b3c32b34b6b03e5fb37983f89fc ofl/quando/OFL.txt +sha256 25995bcf8e8ddea1aafa5449870567cbbeae7e26b27ba30aca5642f2c02e9757 ofl/quantico/OFL.txt +sha256 684ef102ca4c5ff61cf1c1e5c2c6326f3c26f848446f98b8862dcca716a87601 ofl/quattrocento/OFL.txt +sha256 b00c646b7d04a6da1665a148815b8c589c1e05ed7e1febf7ccbd91758747cb03 ofl/quattrocentosans/OFL.txt +sha256 9d61931b909f9a738964f8fb311eb8fa40dba1ef9f1688b36039ebb15ee1805e ofl/questrial/OFL.txt +sha256 14d28541780d90f6577bb7abcc6f005bf6969614294e75c82abb8758a696ad46 ofl/quicksand/OFL.txt +sha256 0786594992757ea0290ae4a490ab9249728f372adb13959c0c8ae4fec83057ff ofl/quintessential/OFL.txt +sha256 7f91d7d8854e5cb4fc630807c0f4d57c07777769dc597173fe0aef5e58f0992c ofl/qwigley/OFL.txt +sha256 cdcc959c42ab255b4cea4bd82f2db5c24a2da7ecabe615d02d5a5dba3716e446 ofl/racingsansone/OFL.txt +sha256 a3b0977c5c25101d45054cf9199b9127b05fddc79d4da7dcf400821824e5a6d0 ofl/radley/OFL.txt +sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/rajdhani/OFL.txt +sha256 5c36e7ec460b285185ea23847aa1f508708d9ce15d5c055279defd022972f836 ofl/rakkas/OFL.txt +sha256 e31de7000a2a13b2e54ad01e788fd29e979fe05ea1fded44d6e71cc06e33bb2b ofl/ralewaydots/OFL.txt +sha256 e588abf45ca2b19c340c4b27349c9b6b6e5e198316fd965128ed9f4422942cbe ofl/raleway/OFL.txt +sha256 0c922e2d65050677c26ae8dc501bc9ad3e0059c4b10df2fc9717d7bdacdfeb6d ofl/ramabhadra/OFL.txt +sha256 525411e604e7a1d85a4cd42641869f94388f04a6ed77829d6c4edd7fd740ceab ofl/ramaraja/OFL.txt +sha256 9a9f089005f389717106bb3ba427cda9bd51b8a477078644566543f2a60ca85d ofl/rambla/OFL.txt +sha256 af88d31020bb48a1f78f4384249814d04a44d22feeede2ff4ae79fbb4fcf74da ofl/rammettoone/OFL.txt +sha256 0fc8e6675568c02aac6b41dd3cccaf2264fc5969601effe68e09b26635879b2c ofl/ranchers/OFL.txt +sha256 8c22fb3866eaebd77a2cb8e8ecbb095381ff32300db57758326fef35a26132f5 ofl/ranga/OFL.txt +sha256 c1eed37b6d213df4edf8f92ec7d1e972f751abd68ecd649b4f0b8e5d8e8561f6 ofl/rasa/OFL.txt +sha256 064539f87826887d2062b7823b2b97b7625d68b642f6c945c99c0b8dc8084195 ofl/rationale/OFL.txt +sha256 ae629d13b06d9afc5cf3c07d585f3192b89b7decaffc5c4dfcfa7ce11a2a2b11 ofl/raviprakash/OFL.txt +sha256 1d567f7c5f579d9031ae5edfb0108b4681bdd2e036249b228cc2843d3f052a0f ofl/redacted/OFL.txt +sha256 1d567f7c5f579d9031ae5edfb0108b4681bdd2e036249b228cc2843d3f052a0f ofl/redactedscript/OFL.txt +sha256 791936b10381b512512317572fb5eee91bf503344d52c37335e402fc1cf19992 ofl/reemkufi/OFL.txt +sha256 fbb941b371c6348ee2572ce8c78fb66128a61885f960dec1906c4e44ca4b4d3c ofl/reeniebeanie/OFL.txt +sha256 a1580ba69a8d706bd95e1e72ee0b5cfda0a478fbbab6a4af13b4a9e1b28faac0 ofl/revalia/OFL.txt +sha256 0886960207bb5bcf81a46ce663bab6c52a742dad80ee2cff5cbcda6f1df88568 ofl/rhodiumlibre/OFL.txt +sha256 9acc45e5ba18b5b38868fad1f51c03df4f5d7a43061d46314843de45c4444233 ofl/ribeyemarrow/OFL.txt +sha256 9acc45e5ba18b5b38868fad1f51c03df4f5d7a43061d46314843de45c4444233 ofl/ribeye/OFL.txt +sha256 1c5bc055869d5e9151ec7774082727db720ec4293c65be67f91a4bdcaeb02998 ofl/righteous/OFL.txt +sha256 33e3a83e377c6a41149044bd919f50d9a971d801052d4e0c0a98cb417b42ae38 ofl/risque/OFL.txt sha256 03082243ebc53e2090bc59987f693982ccee83b30516457b11f6a2349b78f5f8 ofl/rokkitt/OFL.txt -sha256 1152ca18eaa6159634f1eb209c60df360c1c09a52991e392f8033702036634d4 ofl/assistant/OFL.txt -sha256 012b1870f81b0d97ca756edd9eea315c7fc22657ac2f1cbdfcb6772fed3e20f3 ofl/bhavuka/OFL.txt +sha256 e75230ee246a04912366cd8d759d081200d80fb0756766c96dd52f73e8b40bed ofl/romanesco/OFL.txt +sha256 16741ac498178f645283cfb45b7a487b6d361b5de5730c5ea729f056f414f6b0 ofl/ropasans/OFL.txt +sha256 d69bcd35f4a121b312a64f7e8eb15bed61c9056e9e9cdaa8d513366142c8e005 ofl/rosario/OFL.txt +sha256 8a59454b7f1cc0b1fa29805781769047e5c269aa629e3422c2d7fc04b89e5c1f ofl/rosarivo/OFL.txt +sha256 08fdc7cbd92b9bbc4d41d0945ae7f25450d91c5fc8c66c68df331af3505e4ec3 ofl/rougescript/OFL.txt +sha256 67f64c5509e5151796599e3ad47c3131cbe0c80c4f9430b90236a1249c2eacc9 ofl/roundedmplus1c/OFL.txt +sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/rozhaone/OFL.txt +sha256 43d530580461a574f6dfed9e15af6a74e95f7c04d9bfa1174a63ff036e8eee07 ofl/rubikmonoone/OFL.txt +sha256 898a9cf80636e86d6b6009b96795fda29e431ee701c28c36f274a7e8a7d8246b ofl/rubik/OFL.txt +sha256 9788e3b3e67f22ab5846a0bb867a230e7df2468c3cd20f730a5d9c34e673d090 ofl/rubikone/OFL.txt +sha256 1c45059cea5c6798c8591b0a17961a30328747d44214ff9b8f9c62a683bd6598 ofl/ruda/OFL.txt sha256 ce1108854c91696a8549bb21459f1dc74e8a1ec11664d712c3868c40042f1a8a ofl/rufina/OFL.txt -sha256 bac36a7fcafc5702d9d928bb81c7de9f8739eaa820e546c3d2cc52730b652af4 ofl/devonshire/OFL.txt -sha256 ac987f9cbc5b18d3239d88adb57a4e134049811d24ddda2f6383faa589fd2727 ofl/holtwoodonesc/OFL.txt -sha256 f3ee3eb20a9d565bee2bbc0d616de382a113327d7506565b2f3d3bee5f489375 ofl/bowlbyonesc/OFL.txt -sha256 965bd2c907f7bb6f36da4f85e83f29aea8b2f720783deebd7ed7b40678e67672 ofl/mysteryquest/OFL.txt -sha256 cc8c0c3e81cf543e190f128b83ba7c30959f15865c14dd972fca4917faeceec1 ofl/encodesanssemiexpanded/OFL.txt -sha256 19e186a088a50835b38b59409a76b8df2d0252ce114a99e79e306231bbe253b7 ofl/dellarespira/OFL.txt -sha256 aa36087ecd7e9085e5a1439b0a6d0ee35966e8cd2ccaa649bebe62cae5815e82 ofl/lifesavers/OFL.txt -sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfelldwpicasc/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/loveyalikeasister/OFL.txt -sha256 a9ef1db03f660130790beeb3b5d91b68536a44a98ec2db3097d02a1c5f91c599 ofl/buda/OFL.txt -sha256 de318dcb99e332a746edb9f83180ee206fc3bce74ff96ad7d1cb219967ec74af ofl/pollerone/OFL.txt -sha256 315a576cbc7ab61c9e347b5725893bc8498fdcb8fc10831793c6864bc2cefba8 ofl/gudea/OFL.txt -sha256 41f82bb4d24b304f30f7136bc47abdd083782e4265c984160f5649d1e78ea49c ofl/montserrat/OFL.txt -sha256 5866fd437bf701cd93f2c41ca2a8b33786975c947bee27882d256b408c9b424a ofl/podkovavfbeta/OFL.txt -sha256 377f4f9c19e935228552478eb68cc2ed82910988a60ba60e2ac73b09f32d02d1 ofl/patrickhandsc/OFL.txt -sha256 ec1d7de447a90e4b6d8f2b4f95c7f89a70e315fdb41969bc716059e4f2461fa4 ofl/clickerscript/OFL.txt -sha256 7039124ec9c84f9d637637da9f80158f0d3681c82d4e6a811053467f7c33d587 ofl/prostoone/OFL.txt -sha256 16f8621a8dda01f044b8a58489334dbaadfad44ef2fa1d5ce0864cc2f309df01 ofl/inknutantiqua/OFL.txt -sha256 ae30055f1e31d12f6235802c25a8872bb7053fca8ed4a604c530f4b2ee83e572 ofl/pontanosans/OFL.txt -sha256 f1ef4c3ef43322403f5c30e4fb46496969cb5c34a2a6e7247b507254b69caa6a ofl/novaround/OFL.txt -sha256 cf5c4103b0ecf3c38e7c26768b5caf05e1b3e16d4d87b32d859b3c19ce7c216c ofl/petitformalscript/OFL.txt -sha256 ed80dd9539708a531313f98fb081aeeaa395ab5726931a433845d667b019c855 ofl/abyssinicasil/OFL.txt -sha256 1404cc9279d4ad713a372a5e1e1d20d7b9b000d2397c8529aeb3df5402446600 ofl/cutive/OFL.txt -sha256 19c6ecf65a6b0687dd324b093ced5f1020a1fcabfc8ddaaeca6906cd05153e23 ofl/overpassmono/OFL.txt -sha256 0878e7d6e842bc3c45154059a1c2812de0d31dca343fe6bc16abc9afdee3e3de ofl/koho/OFL.txt -sha256 636d62f04d7bda9fcf9354f258f6244e7e18288cae036b95122e204f1acbec80 ofl/neuton/OFL.txt -sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1 ofl/baloo/OFL.txt -sha256 5866fd437bf701cd93f2c41ca2a8b33786975c947bee27882d256b408c9b424a ofl/podkova/OFL.txt -sha256 2ce1c4fcf4ab9c8474d0824434497d4afa4425db4de5629103698b170ac4ee74 ofl/bungee/OFL.txt -sha256 dc35123e99a857674b3e8807e9d7df82220d298423d9fc50ce084fbcdecf602d ofl/jotione/OFL.txt +sha256 39b26527bf9ed27b4c85b86341eceea0579f3550bcf448cf06345eaadf947ec9 ofl/rugeboogie/OFL.txt +sha256 e604b133509815768e6ec4738bb04844ce9a23e80099d2b61e5d75ef46acbeb0 ofl/ruluko/OFL.txt +sha256 b598b7fddfd578950aa1fe6e0e2607b779abfaa686b83af8ec65c860f646b2cd ofl/rumraisin/OFL.txt +sha256 76af3e9e5d8768b17647813a443fcf5df3eb3ced017ee285796625e714d5ea2c ofl/ruslandisplay/OFL.txt +sha256 3ac1301549523d9861fedca12871f24e575fbd26d520632fc00ba849b471d275 ofl/russoone/OFL.txt +sha256 bb49cbf811dafcb11e0de081efcdc8385e45ccc85a5bfc3231ec4861d444dc42 ofl/ruthie/OFL.txt +sha256 399b33eb38cdfc76b8665defa5f81d52e8193d630ad5858c893db6bc20031bc9 ofl/rye/OFL.txt +sha256 2e2cb5a98da665f2ab82a9fd01fb18c2337f845761b0c163f690ed65f3b94677 ofl/sacramento/OFL.txt +sha256 9ee6b2ec20a06c599a07412690876eb457bf192c10e886e60d8bdffb80bc21a3 ofl/sahitya/OFL.txt +sha256 55e13d77a4457aa9c60f10c5b97baea3343d3bac30960d49554a033cb9eaff7c ofl/sail/OFL.txt +sha256 0e2ccc5da1dd979f08ba82bca2fb61592506a1e58d3cbfc26d904f0db71bd812 ofl/sairacondensed/OFL.txt +sha256 0e2ccc5da1dd979f08ba82bca2fb61592506a1e58d3cbfc26d904f0db71bd812 ofl/sairaextracondensed/OFL.txt +sha256 0e2ccc5da1dd979f08ba82bca2fb61592506a1e58d3cbfc26d904f0db71bd812 ofl/saira/OFL.txt +sha256 0e2ccc5da1dd979f08ba82bca2fb61592506a1e58d3cbfc26d904f0db71bd812 ofl/sairasemicondensed/OFL.txt +sha256 31c59bcdd538c113ef5c048f56827439facb12b7e5cfd158b04c83727edc453b ofl/salsa/OFL.txt +sha256 5f8ff4a3f951c104e99245bdb952be08c73369222048bbf19fa3bf7170d10949 ofl/sanchez/OFL.txt +sha256 87000f71a897c8c130c7777d058c5868f84316f99a32644b3bf595cd11edeb12 ofl/sancreek/OFL.txt +sha256 156ea6985861158c7dea63ecaac4c78ab0ed737d168ddffc3e34c687985a033b ofl/sansation/OFL.txt +sha256 0cf28cdcf1cdfd35054352816b2d8c81bd6d6f73632198b61507f26dd4dcbeea ofl/sansita/OFL.txt +sha256 9e0d3db586ba0abf5ca398683809dacdf4c81b2960f592bd085fbf206a67ddb0 ofl/sansitaone/OFL.txt +sha256 b26cae1321380296ba8311b632a397d5eac11b47197f9d0aa0b9310f1531ad60 ofl/sarabun/OFL.txt +sha256 afb8c471158619593df0fb501453bd39fda42396e2cc3911e2a0a471c11b863c ofl/sarala/OFL.txt +sha256 2cc926050c4c6ccd9a0288b7792e2fcf93e5629ee6269e35986f092275e5a1b9 ofl/sarina/OFL.txt +sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/sarpanch/OFL.txt +sha256 5f247fad3e8a86b6c0779dff09277047c1ce2b0b7580a1093347a8af755352ba ofl/sawarabigothic/OFL.txt +sha256 c254ae01c407f4a2bd0ad163e4c1a795d57ddfa8967c21b8a28c250b44d13963 ofl/sawarabimincho/OFL.txt +sha256 0a852a06f0256a6684662663ccb1d8e08d131abd1f70cf8d972a344cf31aa381 ofl/scada/OFL.txt +sha256 fb1dbf3725bbdd389b2c569e0eed5091d8d10eed2833ec7efacfc3542e408615 ofl/scheherazade/OFL.txt +sha256 b5c776129b160163c84620b35fd45dea45edf49789cda5a94c2290c230581e0b ofl/scopeone/OFL.txt +sha256 3d08baba63f1f2427fd96dee8da30b1ef6c1421b3be0e1f07cc2a78abb27c91d ofl/seaweedscript/OFL.txt +sha256 aa8a8196a3e22c3bd985e33cd3245ae9a38accba5e79fc0e3b292612a8d6b337 ofl/secularone/OFL.txt +sha256 eef925ad6afcbba33f7989f5ad826fd68d50cc1ab4d679c52927c8afd40bddf0 ofl/sedan/OFL.txt +sha256 eef925ad6afcbba33f7989f5ad826fd68d50cc1ab4d679c52927c8afd40bddf0 ofl/sedansc/OFL.txt +sha256 f323edc1e5a6d8fa16120aa15367cdfb15468474cc621f9bda1a2f73c5d08d73 ofl/sedgwickavedisplay/OFL.txt +sha256 f323edc1e5a6d8fa16120aa15367cdfb15468474cc621f9bda1a2f73c5d08d73 ofl/sedgwickave/OFL.txt +sha256 842b4f4605b32518a1269c4d030d719ea2c4c317d699fc4441d0219658e18893 ofl/seoulhangangcondensed/OFL.txt +sha256 842b4f4605b32518a1269c4d030d719ea2c4c317d699fc4441d0219658e18893 ofl/seoulhangang/OFL.txt +sha256 842b4f4605b32518a1269c4d030d719ea2c4c317d699fc4441d0219658e18893 ofl/seoulnamsancondensed/OFL.txt +sha256 842b4f4605b32518a1269c4d030d719ea2c4c317d699fc4441d0219658e18893 ofl/seoulnamsan/OFL.txt +sha256 842b4f4605b32518a1269c4d030d719ea2c4c317d699fc4441d0219658e18893 ofl/seoulnamsanvertical/OFL.txt +sha256 473c5e3123102434d05c66a9fc8b19cf285a3bf71cd8a91a41acef44d1448e62 ofl/sevillana/OFL.txt +sha256 b54d54664cddcbf05f5b4ea3aec7e89317eb917cf465920969e7b22361e0f4a5 ofl/seymourone/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/shadowsintolight/OFL.txt +sha256 6a28d4d5d8b4d1ea89ace5a047ac6e0de182acdb8bfa22897bf7702102094f69 ofl/shadowsintolighttwo/OFL.txt +sha256 a6a74417db7c37f69495da556a3eb86a22a784ffb0131e3e0a5a47ce8d7fa5fb ofl/shanti/OFL.txt +sha256 9d96f445b6e9c701428811d0177f894874f8d6f07ecc30d568c506542368f3ff ofl/share/OFL.txt +sha256 9d96f445b6e9c701428811d0177f894874f8d6f07ecc30d568c506542368f3ff ofl/sharetechmono/OFL.txt +sha256 87b7d831a81fe8b37e7e6c672937493f710ff81883eee3adec7b5423297efd16 ofl/sharetech/OFL.txt +sha256 ee81f11dd1970e9749afd2a572256f8eefce65532872762a4d7a3d5daa0812c8 ofl/shojumaru/OFL.txt +sha256 fe079cdbbad0f6520eb0a8235bce65b21596dd0c4c5a2694b3325cc87313b618 ofl/shortstack/OFL.txt +sha256 325e890b8b26fe0a683c3ba24c506d902bdd7034d9c47bd7fa2bb72b5433b9c9 ofl/shrikhand/OFL.txt +sha256 85814924eca98e1fa530901cc5167d0012aaf31122f9570d7e9755443dd9335b ofl/siamreap/OFL.txt +sha256 85814924eca98e1fa530901cc5167d0012aaf31122f9570d7e9755443dd9335b ofl/siemreap/OFL.txt +sha256 2db02cb5d05d5f8a003ffefce36a32a16520ad4cab9ed90635ff953b583e4e82 ofl/sigmarone/OFL.txt +sha256 1ba345a91338581e5f8fccc3e37e447ddea5b99ec9caec1b76c7c39492387d2f ofl/signikanegative/OFL.txt +sha256 1ba345a91338581e5f8fccc3e37e447ddea5b99ec9caec1b76c7c39492387d2f ofl/signika/OFL.txt +sha256 61056041809e0ba18bf8b9d637a375ab1c725025428533d74d668d88b2cb8b89 ofl/simonetta/OFL.txt +sha256 397e83b05703a4240be51e2c3a2be1d0d7693d7a2d8b1ff367c26a2b9afc013e ofl/singleday/OFL.txt +sha256 dd028a807788d5e22e9f8cc18f026cda23369954673658f2ecc7d30bdb364b89 ofl/sintony/OFL.txt +sha256 ca19ac21c7656f493189093eca52b4239fcc5eacc15ab2e3d67cfbfc0e6e443b ofl/sirinstencil/OFL.txt +sha256 95803fae1b063e592c67b5867f1f36df1df526e5ebf33c6cd4d4afa31a9d5586 ofl/sitara/OFL.txt +sha256 29cca754098468057880970c604e55c4e2bcb8479742e4130c94f2ddc0363f9c ofl/sixcaps/OFL.txt +sha256 593f0bc55c75b673772b378eaee314f128283745c4bb1cfdb9b8012a3b6c46fe ofl/skranji/OFL.txt +sha256 76a55594c9a18b7d94b8119de838237eb834bae4e8c646d6d363aee587b7b427 ofl/slabo13px/OFL.txt sha256 76a55594c9a18b7d94b8119de838237eb834bae4e8c646d6d363aee587b7b427 ofl/slabo27px/OFL.txt -sha256 ed50ebe2fa922554980909192526fe94966556626d6d440a462c8e7eaed74cdc ofl/oflsortsmillgoudytt/OFL.txt +sha256 d849309d514833fe3d7a610e10f6cd5d99b4f9552bfa304969acbf89c66e4422 ofl/smythe/OFL.txt +sha256 89418a3c7b5726c3f8828a7b7c3f1cad661cf5b7a1be3d2bd9ea243f8d9890c8 ofl/sniglet/OFL.txt +sha256 d3909465d5838d9d1c72b975ff1ed4f410a85dccd43801be525bf2b2bde89f92 ofl/snippet/OFL.txt +sha256 cd354a6084383c50398fae709ebe3a5dd98b947c486c1fe9de5f89caf81f980c ofl/snowburstone/OFL.txt +sha256 455397ca15d39e9178bbbf4b485a29187751d60f7ceb7829980a521d5ab6848d ofl/sofadione/OFL.txt +sha256 336fab6956d78eb34b50cd7bc6b16116c44735fbd0bf9f4def769ca4d8e218a9 ofl/sofia/OFL.txt +sha256 40bd3f35477284c021978816e9d3b8723ff2283fd7065fafaa5bb3004e41b237 ofl/songmyung/OFL.txt +sha256 6cbe0f55c154b5dee71ca4f2418d69e4e916448ef2ab52dc4541197b292efa24 ofl/sonsieone/OFL.txt +sha256 ed50ebe2fa922554980909192526fe94966556626d6d440a462c8e7eaed74cdc ofl/sortsmillgoudy/OFL.txt +sha256 e8d0118fa9d640543e7f6848d1d93f47313c7f56b64f73f37291d859cd5932bf ofl/souliyo/OFL.txt +sha256 cb30d3086a8b3ce0b9e3690bf48d6620402b61160bc658076f95180ccd9e9dae ofl/sourcecodepro/OFL.txt +sha256 fce9f9e2fb268507a89fceea0b3eccc044f39fc3492968a04fd9e04df5ae95fa ofl/sourcesanspro/OFL.txt +sha256 caa697668c3cf3e622753fb202c6c2e29648b94a3499dc7b869a14192e38c553 ofl/sourceserifpro/OFL.txt +sha256 4664e83780a263c53dbab95d3590a5a9db914aeb9a3c78f7e7ad451f9151c998 ofl/spacemono/OFL.txt +sha256 963f283b5410c7df62067a35cd7def0802c583a880e7cd7e326832ec3985ec87 ofl/spectral/OFL.txt +sha256 466aaa3bbd245e4c91c4e82c0828efe9fcfd913f5b020d75f0918516c2540fa8 ofl/spicyrice/OFL.txt +sha256 f938d4076b66a13cf984ce88d92a07ff9802e8ae5e1f4a28cdc43fad122ae611 ofl/spinnaker/OFL.txt +sha256 2c3737ea83b48d48624068d1bbd1d9f8049eb7cf2e1f67435e420375c42e0686 ofl/spirax/OFL.txt +sha256 d2f9c74aba2716333b0a3d283083f9fdc93b2e060c5ae094c79e97e8cba9d7e6 ofl/squadaone/OFL.txt +sha256 f8c2225a5fdb50e2e75f98cf6e69f198571f605f1b7f6f7eacc0947e2fcdbe8d ofl/sreekrushnadevaraya/OFL.txt +sha256 1f00d1f970b4ea469b6936e599b599bb217edaab792e586658ef2e71cf438685 ofl/sriracha/OFL.txt +sha256 4398885e6b303830d81eea03444aae6fb08a44f41b6acd193c88a2f8cd17606e ofl/srisakdi/OFL.txt +sha256 72afba97d1ac9409a9fd3bb91a02a639427ca1988977909dad273e293a508d7e ofl/staatliches/OFL.txt +sha256 d7577acbab1d70f2e6bd1b21d8f61db189d6aabe6375bc2d96564b8d94031664 ofl/stalemate/OFL.txt +sha256 194e25172d0144f29aff4b6fb2931ff0be0139448a5cd867db37863c9179330a ofl/stalinistone/OFL.txt +sha256 b687f920fe20fe48d8f7709421e5deeb4becea295c80ce62aadcffc54132fa1b ofl/stalinone/OFL.txt +sha256 88d3abd47414e7912d0d2eb44ca89e0b1bd7c43cc2ebe58a8a75281ad75a0f60 ofl/stardosstencil/OFL.txt +sha256 fc1e501d419d84a8f1a800adae092045002d7141241f498237611dbb8ea763d7 ofl/stintultracondensed/OFL.txt +sha256 fbc351e1b5428e4f45834647dc23a5f8aaa3e744e2f4117ca03c44f640b9a3a2 ofl/stintultraexpanded/OFL.txt +sha256 a57810cbca0b4715ae8610dd7a268260cebbdd4fd76d304e371517f828150669 ofl/stoke/OFL.txt +sha256 eb4a7a082fb0e7dde0a8f975d33f02907ccbe40751c8115e790cf3679787d01c ofl/strait/OFL.txt +sha256 c8af073a60e30b55ef5d0e4f80cea168e06dd65bdee7ec18c1ea8de8f7228780 ofl/strong/OFL.txt +sha256 a9b3e7e1cf5735dc49d802b88b1858a2a50307ba2a877ddf3f0b27d8b1d0abc5 ofl/stylish/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/sueellenfrancisco/OFL.txt +sha256 aa8a8196a3e22c3bd985e33cd3245ae9a38accba5e79fc0e3b292612a8d6b337 ofl/suezone/OFL.txt +sha256 c8155eb9337078a9ea9f1e576ac813a03030ca43e2694593e90cd4fee6fce937 ofl/sumana/OFL.txt +sha256 a9b40759b5821a0c2ad07cbd2c2a61dca4b3e222e6370a7d5bfb6b373bf4fb10 ofl/sunflower/OFL.txt +sha256 88dcde7d08e509a3eec64886292a36cbd58ed9bb52f37f91f55656fb9d21ddb8 ofl/supermercadoone/OFL.txt +sha256 c5a77946a56488790364d060628385d51226da62a18f30d2be0181d82ee62b00 ofl/suranna/OFL.txt +sha256 53ad6a474f68ddfc3fe72449de3ede4d3f033b2f24b77833b1d56edf505486d2 ofl/sura/OFL.txt +sha256 42ad5a49e171bec80308a1c9e8e66b03e638b3ea65af7fafa6fc0e42f45e7626 ofl/suravaram/OFL.txt +sha256 b2d4b0c773afce947728ab99fca43b242b7edb0da26fe29f60c7c2d5094ec23e ofl/suwannaphum/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/swankyandmoomoo/OFL.txt +sha256 9b584984f9db0ee30347391a76eff9c0a6b03dc450c3c6afe3757a2cb3a4db87 ofl/tajawal/OFL.txt +sha256 adadb8d5d34fe2218dca0f4a4919a9b6f81dfaebb289e5446ac7b3063d6965e9 ofl/tangerine/OFL.txt +sha256 5625e91bd7c2a45c8b9f59106d587bd025470b462ea901df691defe0099621e1 ofl/taprom/OFL.txt +sha256 6506b2fa2a14259a8859608a6148a4591d67bbaef4d8e1948b43c4078561b0e5 ofl/tauri/OFL.txt +sha256 1d08c63944e639bbfe8a1b81e3c6a63836806c126b3573b9cda0db83fd27ffe9 ofl/taviraj/OFL.txt +sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/teko/OFL.txt +sha256 5a5cf278190adf8be3e9905c2b21460241cb376c600bdfd6eb7aceb66036c4bf ofl/telex/OFL.txt +sha256 cbdf9d35f32a9a2f02fb23c8b89c115a5a8e45feaaa2266920c4594c83dd5ed4 ofl/tenaliramakrishna/OFL.txt +sha256 7b826efb1b74a50b1c1aef0a1ba4530925b993ceadc3016d1d787c68a61649dd ofl/tenorsans/OFL.txt sha256 d7b108fc1f23fb016a47bb40c63d6f6e04cc35a1edfb991638d7f03621bf7f33 ofl/terminaldosislight/OFL.txt -sha256 71e5222c549d85a1403b6e709b4328b81d7b51ba021b8bd20df89550da80c087 ofl/yatraone/OFL.txt -sha256 f139d6f43d2a63a8fb3ded48b8ec747d9d59a7fbb13d077d9b96ac88580bc1ad ofl/dekko/OFL.txt -sha256 84b11cc0aac8fdb93af94872bc4b8f015caabf4919db63ab7f916ccff8e52f56 ofl/josefinsansstdlight/OFL.txt -sha256 8fbe530adcbe30c658393c3f2b5a4785d6765afcefdfe47f594730131f3a0abd ofl/oleoscriptswashcaps/OFL.txt -sha256 64dc6a7e2a77aa340c49c3e0829703f540f8d64afa506f44eaa6741580716d0f ofl/gabriela/OFL.txt -sha256 17d7a7f5d9f0139535ecec516988c4c73a2ec0f225987288f3fd6ee2622d4450 ofl/federant/OFL.txt -sha256 c0a7efe98e77cbfcf1a5ca43e874e25cf53d9185c56295bc3b5c407f95dae638 ofl/nats/OFL.txt -sha256 2ee5e8e47cd7d08f60bb9555f72b25912c9e81b13f5bc9a0551ddf943da6ca98 ofl/ekmukta/OFL.txt -sha256 e5ccbfc32e4d7fae98b467a9af310ac8d2efd5d90e684426cd24f3eb36090a2c ofl/acme/OFL.txt -sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1 ofl/modak/OFL.txt -sha256 75a77451968e55a1ab404bd953bd8778983e21116d507b890fbcf838e58c8e8b ofl/pavanam/OFL.txt -sha256 36931b77dd81fa96fffad91b6acb54931e600845eb81f91ecf1b4459012c621a ofl/vidaloka/OFL.txt -sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1 ofl/baloobhai/OFL.txt -sha256 1c45059cea5c6798c8591b0a17961a30328747d44214ff9b8f9c62a683bd6598 ofl/ruda/OFL.txt +sha256 faf47a1ceab38b07205b9d58fbbf9ac39772ea47cc731aca7816276da7226a22 ofl/terminaldosis/OFL.txt +sha256 75798d56e448ba4d2aec3ef5f3c2d805d9c6fe2ba688cd3d7162b2dd31e9cf48 ofl/textmeone/OFL.txt +sha256 9b8405bf5f503f92401fc990f372b34d469670ab60041d5298d1015d3d0b45f8 ofl/thabit/OFL.txt +sha256 59bda6b53e28d388de5eac7bbb8f3e65889dc8489be3d922f95a525354110c0e ofl/tharlon/OFL.txt +sha256 31eb7046f4c80e0f96944c4b40b0772de68b34783b794fc13aab3f54c2ef6d9b ofl/thasadith/OFL.txt sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/thegirlnextdoor/OFL.txt -sha256 4dee45deee99672fbe342b2f4b7aa75b0cd12de18a68f9732c77f096bab47e0e ofl/molengo/OFL.txt -sha256 5a5cf278190adf8be3e9905c2b21460241cb376c600bdfd6eb7aceb66036c4bf ofl/telex/OFL.txt -sha256 bb49cbf811dafcb11e0de081efcdc8385e45ccc85a5bfc3231ec4861d444dc42 ofl/ruthie/OFL.txt -sha256 b5c3d12a3085b96011fee65555234bb9d31fa7444cf6f8d5ae6b1f5771394399 ofl/lakkireddy/OFL.txt -sha256 23b896f4937eac954a383340c92dfcac1c6e05ec21cc08ec6de47d30ad8496a3 ofl/charmonman/OFL.txt -sha256 39602407e30d466bf169f46d690aaae4f5f039258e5642f91a80bb132ce6e14a ofl/bubblerone/OFL.txt -sha256 e31de7000a2a13b2e54ad01e788fd29e979fe05ea1fded44d6e71cc06e33bb2b ofl/ralewaydots/OFL.txt -sha256 8218df19bcd9786311bf1126815e8d591027aaf7611ef031af5a31c3fd66e928 ofl/arefruqaa/OFL.txt -sha256 e37fcc467040ecd81bf4cf59c99ef56b20f57918995e82b3de1d5b4e931bc2e6 ofl/portlligatslab/OFL.txt -sha256 60fea3a0da19167a3efb9c3792a3a15dc9235405d01bbec1233fdf3e79c74296 ofl/freckleface/OFL.txt -sha256 da15da6b1496d4de18f97e2ad1b722ef8a1c121149c2c93b2cf7eac6ac27b35c ofl/mplus1p/OFL.txt -sha256 d51f3341fd7b3dfa1114d3ef0bdabbe57f60eef86a1458019e0077d676fa1fcb ofl/lancelot/OFL.txt -sha256 9134ca6996bd33ea2022e109f13f20e29dee1dcd8b2e8878aad576d2ca334e9f ofl/cormorantinfant/OFL.txt -sha256 cc8c0c3e81cf543e190f128b83ba7c30959f15865c14dd972fca4917faeceec1 ofl/encodesanssemicondensed/OFL.txt -sha256 5946eec3a7d3bda02825930156e4716198e7753641dd3303a3e8c386c8011909 ofl/eater/OFL.txt -sha256 b43e2530c7af69fe1800f180d210b6d2745915ed4e0e404495038c861bb6dbf7 ofl/hammersmithone/OFL.txt +sha256 01af2625d6247ecd2430d1d1603c579f85989d43b2d9129e08e0ac0df8909918 ofl/tienne/OFL.txt +sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/tillana/OFL.txt +sha256 f2fcbde4b8968400d661e7dcc23052b1885815c8e3b45323b26cbb833352f5de ofl/timmana/OFL.txt +sha256 61be7c29f4835e2be7243db12213d75d53ff028f29f4b493212a1688b1d3a1ba ofl/titanone/OFL.txt +sha256 c0562e066174197902a4a10606673d189f067970ef89c6013943b9cf182aadbc ofl/titilliumweb/OFL.txt +sha256 018d17b5e04c0a217a21979fa6b6d77bd5a143a5f06ea2ea102e427abd1ebfa2 ofl/tradewinds/OFL.txt +sha256 1d08c63944e639bbfe8a1b81e3c6a63836806c126b3573b9cda0db83fd27ffe9 ofl/trirong/OFL.txt +sha256 9452ef55386e77bd284ca466587d72802337621d7f10aa700e449753883b3397 ofl/trocchi/OFL.txt +sha256 72a22b6dd29b6b0cdcc98de30701b46532c9f7314ee095df3063d10775dd70c3 ofl/trochut/OFL.txt +sha256 4bed7eaae70cab1bdf2bcf9b1cb562fcd9cc26d1c3533c4ade0ec70516dfb3a4 ofl/trykker/OFL.txt +sha256 a36ab46c8b1a74a480a1c51d6a5af08b643e870c6d247f233bc97c97c8ad2098 ofl/tuffy/OFL.txt +sha256 6fc386ac48a529b85c21f90a6c8d2111c6271b3063f9ddd78e92645db5259510 ofl/tulpenone/OFL.txt +sha256 244ca4ef7b106d8c660e9a00cecf5d581b6a222f447d7d59a8f61711b2ad3400 ofl/uncialantiqua/OFL.txt +sha256 b0316f404a7b291e40921c605160181065791a5010a2d2d5691fc7e28cdbdff2 ofl/underdog/OFL.txt +sha256 9a2d8c5a3de0a6e62432322115dce136139948411dba33cd86525c0a02749fb8 ofl/unicaone/OFL.txt +sha256 99d2f30e282d6174af8ff68597f58bb53c0dcb2b104a4c1b8d19da49021d00d3 ofl/unifrakturcook/OFL.txt +sha256 96199bf9ff12dd471a66911dee95440737b437e7f5a6fd30e9e950c16d66e8df ofl/unifrakturmaguntia/OFL.txt +sha256 bb3e8082faf86b1474a6b042125ef0f83669d28110b72f70416a7587b7b9f144 ofl/unlock/OFL.txt +sha256 99d67fff016522688b8f913377f8ae9f6da6ffeae42cf67c0e5e87cfb0928d33 ofl/unna/OFL.txt +sha256 7344b8b8c97c4f88c0ff8bb72bb024bba72f404be1c740b6596a73ed15d28df3 ofl/vampiroone/OFL.txt sha256 5a8751bef5a4fc867ae015099267905034345260f14060fa276aac4051ddd8b4 ofl/varela/OFL.txt -sha256 f6fc9fbae062e4efc1b0306e27715d43cd64a48b8ffba81c22034b8efee4fce2 ofl/cabinsketch/OFL.txt +sha256 08b6f5cceaefcf2881eb009adeb78edd0fabf9c8f0eaf8b88f07a690222227e6 ofl/varelaround/OFL.txt +sha256 3670ddaf348c62ada22a2f606158dedcd9ca5fd5422a6173d6593204a8f53d4f ofl/varta/OFL.txt +sha256 f1d1a3536fa4b9c71d04fe4c8d8bbfc0cc5c457d6883f45086b04d0bc07ed12d ofl/vastshadow/OFL.txt +sha256 f3758ee70600ecd5450f01ea373204b202e048d0454c9db2d1175c5a5dd1e92f ofl/vesperlibre/OFL.txt +sha256 26e4c39c4905bd7f1068b0bab008f5a4a9b945e2d7fda31e52719fc5aa9655bf ofl/vibur/OFL.txt +sha256 36931b77dd81fa96fffad91b6acb54931e600845eb81f91ecf1b4459012c621a ofl/vidaloka/OFL.txt +sha256 b67eed9578defb59cc4ff4b58428fb816786e499e84cdeafca54723b055c169e ofl/viga/OFL.txt +sha256 fd17f80dc48ff767d91d0dd9f821eebfd8b73ee82f55537a9052b6b0107622c8 ofl/voces/OFL.txt +sha256 1c43e70c49ef7a9b35fcb3758fec8ec5969ff1274c4834b4466b9014f3b9f55f ofl/volkhov/OFL.txt +sha256 53f9c99fa3d47f7d632a42ee7bab4a834a60a744f6026d676c3a223cef2b2ef3 ofl/vollkorn/OFL.txt +sha256 53f9c99fa3d47f7d632a42ee7bab4a834a60a744f6026d676c3a223cef2b2ef3 ofl/vollkornsc/OFL.txt +sha256 8242e7737bce317f7a7f2b887ac87f5bb21305ab96bee92aadc3febac16c35bf ofl/voltaire/OFL.txt +sha256 27d9af34210253e7ca1251fbace86c6f65b40031d6ce1a75493a1b2093631298 ofl/vt323/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/waitingforthesunrise/OFL.txt +sha256 bddfe669338d0dbc24c15ccd31dbf5c101a213da38049c24baca9ccb7fde45a4 ofl/wallpoet/OFL.txt +sha256 9a536e5a3b55c2605b0a553eed383cd3efa42ba48dc45cc6f0635b3c53ee791e ofl/warnes/OFL.txt +sha256 4281c00ab5b8f672fc8d686f48cb886ffbe900c8c9ee22473ca7e72e7cef8fbe ofl/wellfleet/OFL.txt +sha256 aff3cea99bf300b4b29f4dc04867cf9b49d83de8c5ecaf991c446d506b56173e ofl/wendyone/OFL.txt +sha256 5b26c88d163b1430561f53fd3d9021d6057f3c67d25534a5d8d232cfbf8ee2a4 ofl/wireone/OFL.txt +sha256 8d325681662a30f58f57c92ab656dcbc9679deb78a493e4c0eab75321b2df6c3 ofl/worksans/OFL.txt +sha256 f016385cb4b360e7698d22a48c6b58c0634b1ed5c9c17df78515d43887511df6 ofl/yaldevicolombo/OFL.txt +sha256 e75ed24435d1711de0bebfaa621c3eb5564798c88cc0c1d1f8d529bbaae703a9 ofl/yanonekaffeesatz/OFL.txt +sha256 8f2e5a9b52cf355023104413827e17dd7126c5a3656492d45eaa1ceb270aa4f1 ofl/yantramanav/OFL.txt +sha256 71e5222c549d85a1403b6e709b4328b81d7b51ba021b8bd20df89550da80c087 ofl/yatraone/OFL.txt +sha256 d7d8074c2dd46804990c184e25849947ab76c5ac7607fbf3966543455769bb73 ofl/yeonsung/OFL.txt +sha256 ab592d1abca19428b89d851706fa7815ec25139c6affb45d366577ca63fb91b7 ofl/yesevaone/OFL.txt +sha256 a80ee908b60f5bec9c10b135d3da93730e2194107d1f7fd3f61bd8c1a97b3e0c ofl/yesteryear/OFL.txt +sha256 f9e5dfcdb2947c0db70465668706b0617cd052b6f86e582dff8741d9e5cded0a ofl/yinmar/OFL.txt +sha256 c1eed37b6d213df4edf8f92ec7d1e972f751abd68ecd649b4f0b8e5d8e8561f6 ofl/yrsa/OFL.txt +sha256 5d6517d497bea6116ed35079b30374043f6d90b19c8d97fc4e5ec48520d1e08b ofl/zcoolkuaile/OFL.txt +sha256 f1bce31b817dee01c1e4ef8bc45d8ecb95f01f4abbf0a985007cb3cd0fd8123d ofl/zcoolqingkehuangyou/OFL.txt +sha256 94625b91cba99cf9c8e580febf5e738b2e3c7cde9034a16bcfb7538b672137e5 ofl/zcoolxiaowei/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/zeyada/OFL.txt +sha256 3cbf579238e4eacd90ad67883d971aa346ce8990d658635f78f98d608a6830a2 ofl/zillaslabhighlight/OFL.txt sha256 2f0015108d68627bd788d313f529c21ff4da2c2c42a5e1f3883acc83480f9002 ufl/ubuntucondensed/LICENCE.txt -sha256 2f0015108d68627bd788d313f529c21ff4da2c2c42a5e1f3883acc83480f9002 ufl/ubuntumono/LICENCE.txt sha256 2f0015108d68627bd788d313f529c21ff4da2c2c42a5e1f3883acc83480f9002 ufl/ubuntu/LICENCE.txt +sha256 2f0015108d68627bd788d313f529c21ff4da2c2c42a5e1f3883acc83480f9002 ufl/ubuntumono/LICENCE.txt From 848c672254e1fb95669dcb48c82ed94ed1048280 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 26 Mar 2024 15:29:04 +0100 Subject: [PATCH 5443/5754] DEVELOPERS: remove David Bachelart David's e-mail is bouncing: : host aspmx.l.google.com[2a00:1450:400c:c0c::1a] 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. For more information, go to 550 5.1.1 https://support.google.com/mail/?p=NoSuchUser n19-20020a05600c4f9300b00414111d4396si2497070wmq.117 - gsmtp (in reply to RCPT TO command) Signed-off-by: Thomas Petazzoni (cherry picked from commit e8fcd9876d9e0d0fff8b8aca2462d89d69b0601b) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 9 --------- 1 file changed, 9 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index f6fc301373..bb1dfb023a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -764,15 +764,6 @@ N: Dario Binacchi F: package/uboot-bootcount/ F: package/libmnl/ -N: David Bachelart -F: package/ccrypt/ -F: package/dos2unix/ -F: package/ipmiutil/ -F: package/jsmn/ -F: package/python-daemon/ -F: package/sslh/ -F: package/udpxy/ - N: David Bender F: package/benejson/ F: package/cgic/ From 8a9ca36ec6246742931ec3fffc84b069c0113e90 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 24 Mar 2024 22:17:00 +0100 Subject: [PATCH 5444/5754] package/domoticz: bump to version 2024.4 openzwave dependency is back since https://github.com/domoticz/domoticz/commit/b0eadaa2ec6d6340df7eeba0e6e373b71ba393fc https://github.com/domoticz/domoticz/blob/2024.4/History.txt Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (cherry picked from commit 9ff9d5f8861aac2521e2ab72188bc85e1668def9) Signed-off-by: Peter Korsgaard --- package/domoticz/domoticz.hash | 2 +- package/domoticz/domoticz.mk | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/package/domoticz/domoticz.hash b/package/domoticz/domoticz.hash index 546177332e..ae86a67b79 100644 --- a/package/domoticz/domoticz.hash +++ b/package/domoticz/domoticz.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 9effa792f856d8d9036c53b9ae500ee3bffa1488addf9d6f1fe4bf960f73f740 domoticz-2024.1.tar.gz +sha256 d87113d7cacd0b52b9126fcc1ef24e140a4f7042d5bc6262e86e4b4752f5cf38 domoticz-2024.4.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 License.txt diff --git a/package/domoticz/domoticz.mk b/package/domoticz/domoticz.mk index 88bad15427..95d3335adb 100644 --- a/package/domoticz/domoticz.mk +++ b/package/domoticz/domoticz.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOMOTICZ_VERSION = 2024.1 +DOMOTICZ_VERSION = 2024.4 DOMOTICZ_SITE = $(call github,domoticz,domoticz,$(DOMOTICZ_VERSION)) DOMOTICZ_LICENSE = GPL-3.0 DOMOTICZ_LICENSE_FILES = License.txt @@ -51,6 +51,16 @@ else DOMOTICZ_CONF_OPTS += -DWITH_LIBUSB=OFF endif +ifeq ($(BR2_PACKAGE_OPENZWAVE),y) +DOMOTICZ_DEPENDENCIES += openzwave + +# Due to the dependency on mosquitto, domoticz depends on +# !BR2_STATIC_LIBS so set USE_STATIC_OPENZWAVE to OFF otherwise +# domoticz will not find the openzwave library as it searches by +# default a static library. +DOMOTICZ_CONF_OPTS += -DUSE_STATIC_OPENZWAVE=OFF +endif + ifeq ($(BR2_PACKAGE_PYTHON3),y) DOMOTICZ_DEPENDENCIES += python3 DOMOTICZ_CONF_OPTS += -DUSE_PYTHON=ON From a2ce536193d828f023b7315263143d2aa119a87d Mon Sep 17 00:00:00 2001 From: Heiko Thiery Date: Thu, 28 Mar 2024 21:32:31 +0100 Subject: [PATCH 5445/5754] system: expose BR2_ROOTFS_POST_SCRIPT_ARGS for PRE_BUILD scripts Currently, we pass BR2_ROOTFS_POST_SCRIPT_ARGS to each of the scripts in BR2_ROOTFS_PRE_BUILD_SCRIPT, but the option is not exposed in menuconfig when only pre-build scripts are used. Add the pre-build scripts to the condition exposing the extra args option. Signed-off-by: Heiko Thiery Signed-off-by: Yann E. MORIN (cherry picked from commit 96b3295ca1fc00973fa2754dafb80fe6db23f48f) Signed-off-by: Peter Korsgaard --- system/Config.in | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/system/Config.in b/system/Config.in index 33ca69b933..e590a8a3ff 100644 --- a/system/Config.in +++ b/system/Config.in @@ -695,12 +695,13 @@ config BR2_ROOTFS_POST_IMAGE_SCRIPT config BR2_ROOTFS_POST_SCRIPT_ARGS string "Extra arguments passed to custom scripts" - depends on BR2_ROOTFS_POST_BUILD_SCRIPT != "" \ + depends on BR2_ROOTFS_PRE_BUILD_SCRIPT != "" \ + || BR2_ROOTFS_POST_BUILD_SCRIPT != "" \ || BR2_ROOTFS_POST_FAKEROOT_SCRIPT != "" \ || BR2_ROOTFS_POST_IMAGE_SCRIPT != "" help - Pass these additional arguments to each post-build or - post-image scripts. + Pass these additional arguments to each pre-build, post-build, + post-fakeroot and post-image scripts. Note that all the post-build and post-image scripts will be passed the same set of arguments, you can not pass different From 39643530f54e8ef0b7dc685b5a2259bf5935df63 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 31 Mar 2024 22:21:52 +0200 Subject: [PATCH 5446/5754] utils/check-package: don't ignore check-package Commit 32934b526b64 (utils/checkpackagelib: check for Upstream trailers) introduced a new python module to check Upstream tags in patch files. In doing so, it introduced a flake8 coding style issue. That was not caught when applying the change, and neither was it caught by our daily checks, because the .checkpackagefile was regenerated right just in the next commit, to apply ignore patterns to existing patch files. It is a bit sad that one of our checks does not itself passes all our checks... Fix that trivial issue now. Signed-off-by: Yann E. MORIN (cherry picked from commit 81bb14a93535da0fbf02ca715ac9ebdca3486732) Signed-off-by: Peter Korsgaard --- .checkpackageignore | 1 - utils/checkpackagelib/lib_patch.py | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.checkpackageignore b/.checkpackageignore index e678d64498..829fd7d0f1 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1471,4 +1471,3 @@ 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/checkpackagelib/lib_patch.py Flake8 diff --git a/utils/checkpackagelib/lib_patch.py b/utils/checkpackagelib/lib_patch.py index 1909d3acd0..b01d28a7e7 100644 --- a/utils/checkpackagelib/lib_patch.py +++ b/utils/checkpackagelib/lib_patch.py @@ -62,6 +62,7 @@ def after(self): "({}#_format_and_licensing_of_the_package_patches)" .format(self.filename, self.url_to_manual)] + class Upstream(_CheckFunction): UPSTREAM_ENTRY = re.compile(r"^Upstream: .*$") From b300a1ed8548c96fd1448d1a9c819f443d15e341 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Mon, 1 Apr 2024 13:24:21 +0200 Subject: [PATCH 5447/5754] package/zic: fix host compile (needs CC/HOST_CONFIGURE_OPTS set) zic needs CC defined since version bump to 2024a, and upstream commit c3ebd8e98846 (make Makefile more compatible with POSIX). Use HOST_CONFIGURE_OPTS which contains the appropriate host CC setting, as well as our host CFLAGS and LDFLAGS. Fixes: c99 -O1 -c -o zic.o zic.c make[2]: c99: No such file or directory Signed-off-by: Peter Seiderer [yann.morin.1998@free.fr: reword commit log, refer to upstream commit] Signed-off-by: Yann E. MORIN (cherry picked from commit 9139159d3917d8d5f1db0c7e84562c0ba4922048) Signed-off-by: Peter Korsgaard --- package/zic/zic.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/zic/zic.mk b/package/zic/zic.mk index 95fa1eaa96..8abcec9360 100644 --- a/package/zic/zic.mk +++ b/package/zic/zic.mk @@ -12,7 +12,7 @@ ZIC_LICENSE = Public domain ZIC_LICENSE_FILES = LICENSE define HOST_ZIC_BUILD_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) zic + $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) zic endef define HOST_ZIC_INSTALL_CMDS From b25d8ea66aa1be672273ee171368c9ea47c2c81f Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Sun, 31 Mar 2024 00:46:13 -0700 Subject: [PATCH 5448/5754] package/docker-engine: security bump to version v26.0.0 Update to the latest major release of docker-engine. Fixes CVE-2024-29018: potential data exfiltration from 'internal' networks via authoritative DNS servers. Do not forward requests to external DNS servers for a container that is only connected to an 'internal' network. https://github.com/moby/moby/releases/tag/v26.0.0 Signed-off-by: Christian Stewart Signed-off-by: Yann E. MORIN (cherry picked from commit 1c178b6892a7f54e38cb4edfe63a4c52fd5e3a85) 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 931d6529e1..5c76b99af3 100644 --- a/package/docker-engine/docker-engine.hash +++ b/package/docker-engine/docker-engine.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 16a2cb4cf4d314a070085e0df06e3a6bd9ec678d28715b64060af694fc9051d5 docker-engine-24.0.7.tar.gz +sha256 fae1aabb63ed5cf6d302a5f4266ed092716b1cea9a974a9d61154ef31b03c302 docker-engine-26.0.0.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index 05bf23ad3d..86106d3ccb 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_ENGINE_VERSION = 24.0.7 +DOCKER_ENGINE_VERSION = 26.0.0 DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 From eece956d7a9a44745c51cdea967ace6c4aa85f43 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Sun, 31 Mar 2024 00:46:14 -0700 Subject: [PATCH 5449/5754] package/docker-cli: bump version to v26.0.0 Update to the latest major release of docker-cli. https://github.com/moby/moby/releases/tag/v26.0.0 Signed-off-by: Christian Stewart Signed-off-by: Yann E. MORIN (cherry picked from commit ff8f48055fb14a64b4d815fea04b75e4674fd3d2) 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 9c8d08bba5..26558814c1 100644 --- a/package/docker-cli/docker-cli.hash +++ b/package/docker-cli/docker-cli.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 72a54d131c28938221c81bd08364459fed9c71c093d4d615d324aaf31de6db1d docker-cli-24.0.7.tar.gz +sha256 96ed5d7c33a12f505d13fa03fa48f94cb41cf871178df0df84aa0b76839ad321 docker-cli-26.0.0.tar.gz sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE diff --git a/package/docker-cli/docker-cli.mk b/package/docker-cli/docker-cli.mk index 95fce27ffb..5f9242329a 100644 --- a/package/docker-cli/docker-cli.mk +++ b/package/docker-cli/docker-cli.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CLI_VERSION = 24.0.7 +DOCKER_CLI_VERSION = 26.0.0 DOCKER_CLI_SITE = $(call github,docker,cli,v$(DOCKER_CLI_VERSION)) DOCKER_CLI_LICENSE = Apache-2.0 From ee27dfff40c4e9c6a084c1f64e7604a02ff3ff1c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 28 Mar 2024 23:06:05 +0100 Subject: [PATCH 5450/5754] package/mbedtls: security bump to version 2.28.8 - Use official tar.bz2 tarball - Fix CVE-2024-28960 https://github.com/Mbed-TLS/mbedtls-docs/blob/main/security-advisories/mbedtls-security-advisory-2024-03.md https://github.com/Mbed-TLS/mbedtls/releases/tag/v2.28.8 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit ea8f0d72b305913d3349c6ab6899f653d68d1820) Signed-off-by: Peter Korsgaard --- package/mbedtls/mbedtls.hash | 4 ++-- package/mbedtls/mbedtls.mk | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/mbedtls/mbedtls.hash b/package/mbedtls/mbedtls.hash index 3ec151a859..5466b0e7de 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.7: -sha256 1df6073f0cf6a4e1953890bf5e0de2a8c7e6be50d6d6c69fa9fefcb1d14e981a mbedtls-2.28.7.tar.gz +# From https://github.com/ARMmbed/mbedtls/releases/tag/v2.28.8: +sha256 241c68402cef653e586be3ce28d57da24598eb0df13fcdea9d99bfce58717132 mbedtls-2.28.8.tar.bz2 # Locally calculated sha256 9b405ef4c89342f5eae1dd828882f931747f71001cfba7d114801039b52ad09b LICENSE diff --git a/package/mbedtls/mbedtls.mk b/package/mbedtls/mbedtls.mk index cdb4aef4f4..9757b8b080 100644 --- a/package/mbedtls/mbedtls.mk +++ b/package/mbedtls/mbedtls.mk @@ -4,8 +4,9 @@ # ################################################################################ -MBEDTLS_VERSION = 2.28.7 -MBEDTLS_SITE = $(call github,ARMmbed,mbedtls,v$(MBEDTLS_VERSION)) +MBEDTLS_VERSION = 2.28.8 +MBEDTLS_SITE = https://github.com/Mbed-TLS/mbedtls/releases/download/v$(MBEDTLS_VERSION) +MBEDTLS_SOURCE = mbedtls-$(MBEDTLS_VERSION).tar.bz2 MBEDTLS_CONF_OPTS = \ -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -std=c99" \ -DENABLE_PROGRAMS=$(if $(BR2_PACKAGE_MBEDTLS_PROGRAMS),ON,OFF) \ From e14d5578d603cfbc776c94fbbf8f318d307c52ac Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Thu, 28 Mar 2024 10:50:24 +0100 Subject: [PATCH 5451/5754] package/libcurl: security bump to 8.7.1 Drop patch that is included in this release. Drop autoreconf that was introduced for this patch. Fixes the following security issues: * CVE-2024-2004 * CVE-2024-2379 * CVE-2024-2398 * CVE-2024-2466 Signed-off-by: Marcus Hoffmann Signed-off-by: Yann E. MORIN (cherry picked from commit fbeec56312e1d2a5ec7c2803c0d2aa3f0e673c5f) Signed-off-by: Peter Korsgaard --- ...igure.ac-find-libpsl-with-pkg-config.patch | 109 ------------------ package/libcurl/libcurl.hash | 4 +- package/libcurl/libcurl.mk | 4 +- 3 files changed, 3 insertions(+), 114 deletions(-) delete mode 100644 package/libcurl/0001-configure.ac-find-libpsl-with-pkg-config.patch diff --git a/package/libcurl/0001-configure.ac-find-libpsl-with-pkg-config.patch b/package/libcurl/0001-configure.ac-find-libpsl-with-pkg-config.patch deleted file mode 100644 index 46df1e36a2..0000000000 --- a/package/libcurl/0001-configure.ac-find-libpsl-with-pkg-config.patch +++ /dev/null @@ -1,109 +0,0 @@ -From 9b3f67e267d1fa8d7867655d133bdbf8830a0ab3 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 15 Feb 2024 20:59:25 +0100 -Subject: [PATCH] configure.ac: find libpsl with pkg-config - -Find libpsl with pkg-config to avoid static build failures. - -Ref: http://autobuild.buildroot.org/results/1fb15e1a99472c403d0d3b1a688902f32e78d002 - -Signed-off-by: Fabrice Fontaine -Closes #12947 - -Upstream: https://github.com/curl/curl/commit/9b3f67e267d1fa8d7867655d133bdbf8830a0ab3 ---- - configure.ac | 79 ++++++++++++++++++++++++++++++++++++++++++++-------- - docs/TODO | 7 ----- - 2 files changed, 67 insertions(+), 19 deletions(-) - -diff --git a/configure.ac b/configure.ac -index cd0e2d07d8d164..09d5364f4de575 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2075,19 +2075,74 @@ dnl ********************************************************************** - dnl Check for libpsl - dnl ********************************************************************** - --AC_ARG_WITH(libpsl, -- AS_HELP_STRING([--without-libpsl], -- [disable support for libpsl]), -- with_libpsl=$withval, -- with_libpsl=yes) --curl_psl_msg="no (libpsl disabled)" --if test $with_libpsl != "no"; then -- AC_SEARCH_LIBS(psl_builtin, psl, -- [curl_psl_msg="enabled"; -- AC_DEFINE([USE_LIBPSL], [1], [PSL support enabled]) -- ], -- [AC_MSG_ERROR([libpsl was not found]) ] -+dnl Default to compiler & linker defaults for LIBPSL files & libraries. -+OPT_LIBPSL=off -+AC_ARG_WITH(libpsl,dnl -+AS_HELP_STRING([--with-libpsl=PATH],[Where to look for libpsl, PATH points to the LIBPSL installation; when possible, set the PKG_CONFIG_PATH environment variable instead of using this option]) -+AS_HELP_STRING([--without-libpsl], [disable LIBPSL]), -+ OPT_LIBPSL=$withval) -+ -+if test X"$OPT_LIBPSL" != Xno; then -+ dnl backup the pre-libpsl variables -+ CLEANLDFLAGS="$LDFLAGS" -+ CLEANCPPFLAGS="$CPPFLAGS" -+ CLEANLIBS="$LIBS" -+ -+ case "$OPT_LIBPSL" in -+ yes) -+ dnl --with-libpsl (without path) used -+ CURL_CHECK_PKGCONFIG(libpsl) -+ -+ if test "$PKGCONFIG" != "no" ; then -+ LIB_PSL=`$PKGCONFIG --libs-only-l libpsl` -+ LD_PSL=`$PKGCONFIG --libs-only-L libpsl` -+ CPP_PSL=`$PKGCONFIG --cflags-only-I libpsl` -+ else -+ dnl no libpsl pkg-config found -+ LIB_PSL="-lpsl" -+ fi -+ -+ ;; -+ off) -+ dnl no --with-libpsl option given, just check default places -+ LIB_PSL="-lpsl" -+ ;; -+ *) -+ dnl use the given --with-libpsl spot -+ LIB_PSL="-lpsl" -+ PREFIX_PSL=$OPT_LIBPSL -+ ;; -+ esac -+ -+ dnl if given with a prefix, we set -L and -I based on that -+ if test -n "$PREFIX_PSL"; then -+ LD_PSL=-L${PREFIX_PSL}/lib$libsuff -+ CPP_PSL=-I${PREFIX_PSL}/include -+ fi -+ -+ LDFLAGS="$LDFLAGS $LD_PSL" -+ CPPFLAGS="$CPPFLAGS $CPP_PSL" -+ LIBS="$LIB_PSL $LIBS" -+ -+ AC_CHECK_LIB(psl, psl_builtin, -+ [ -+ AC_CHECK_HEADERS(libpsl.h, -+ curl_psl_msg="enabled" -+ LIBPSL_ENABLED=1 -+ AC_DEFINE(USE_LIBPSL, 1, [if libpsl is in use]) -+ AC_SUBST(USE_LIBPSL, [1]) -+ ) -+ ], -+ dnl not found, revert back to clean variables -+ LDFLAGS=$CLEANLDFLAGS -+ CPPFLAGS=$CLEANCPPFLAGS -+ LIBS=$CLEANLIBS - ) -+ -+ if test X"$OPT_LIBPSL" != Xoff && -+ test "$LIBPSL_ENABLED" != "1"; then -+ AC_MSG_ERROR([libpsl libs and/or directories were not found where specified!]) -+ fi - fi - AM_CONDITIONAL([USE_LIBPSL], [test "$curl_psl_msg" = "enabled"]) - diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash index 1f3dce0fd5..7fcad973c3 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.6.0.tar.xz.asc +# https://curl.se/download/curl-8.7.1.tar.xz.asc # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 -sha256 3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15 curl-8.6.0.tar.xz +sha256 6fea2aac6a4610fbd0400afb0bcddbe7258a64c63f1f68e5855ebc0c659710cd curl-8.7.1.tar.xz sha256 adb1fc06547fd136244179809f7b7c2d2ae6c4534f160aa513af9b6a12866a32 COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 4281cfabb1..99320c1315 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 8.6.0 +LIBCURL_VERSION = 8.7.1 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ @@ -14,8 +14,6 @@ LIBCURL_LICENSE = curl LIBCURL_LICENSE_FILES = COPYING LIBCURL_CPE_ID_VENDOR = haxx LIBCURL_INSTALL_STAGING = YES -# 0001-configure.ac-find-libpsl-with-pkg-config.patch -LIBCURL_AUTORECONF = YES # We disable NTLM delegation to winbinds ntlm_auth ('--disable-ntlm-wb') # support because it uses fork(), which doesn't work on non-MMU platforms. From 00da8187cd21a5526ae521d537b69a7cbe984e5e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 31 Mar 2024 10:53:19 +0200 Subject: [PATCH 5452/5754] package/lxc: fix m68k build with gcc 12 Fix the following m68k build failure with gcc 12: In file included from ../src/lxc/syscall_wrappers.h:19, from ../src/lxc/mount_utils.h:15, from ../src/lxc/conf.h:24, from ../src/lxc/log.h:19, from ../src/lxc/storage/btrfs.c:20: ../src/lxc/syscall_numbers.h:423:25: error: macro names must be identifiers 423 | #define -1 | ^ Fixes: - http://autobuild.buildroot.org/results/f40a517eba86838b11b4b1d6a8a05b8233a3394d Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit f6453835d69f6a5bc9c2794464c3e4599f6c9fa0) Signed-off-by: Peter Korsgaard --- ...-lxc-syscall_numbers.h-drop-define-1.patch | 133 ++++++++++++++++++ 1 file changed, 133 insertions(+) create mode 100644 package/lxc/0001-src-lxc-syscall_numbers.h-drop-define-1.patch diff --git a/package/lxc/0001-src-lxc-syscall_numbers.h-drop-define-1.patch b/package/lxc/0001-src-lxc-syscall_numbers.h-drop-define-1.patch new file mode 100644 index 0000000000..4a944e35b1 --- /dev/null +++ b/package/lxc/0001-src-lxc-syscall_numbers.h-drop-define-1.patch @@ -0,0 +1,133 @@ +From 82fe01821cd5cb8548598d7d93b07d6ef3f6b604 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 30 Mar 2024 16:50:46 +0100 +Subject: [PATCH] src/lxc/syscall_numbers.h: drop define -1 + +Drop "#define -1" to avoid the following m68k build failure with gcc 12: + +In file included from ../src/lxc/syscall_wrappers.h:19, + from ../src/lxc/mount_utils.h:15, + from ../src/lxc/conf.h:24, + from ../src/lxc/log.h:19, + from ../src/lxc/storage/btrfs.c:20: +../src/lxc/syscall_numbers.h:423:25: error: macro names must be identifiers + 423 | #define -1 + | ^ + +Fixes: + - http://autobuild.buildroot.org/results/f40a517eba86838b11b4b1d6a8a05b8233a3394d + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/lxc/lxc/commit/82fe01821cd5cb8548598d7d93b07d6ef3f6b604 +--- + src/lxc/syscall_numbers.h | 13 ------------- + 1 file changed, 13 deletions(-) + +diff --git a/src/lxc/syscall_numbers.h b/src/lxc/syscall_numbers.h +index 58840a5981..5e659d1b81 100644 +--- a/src/lxc/syscall_numbers.h ++++ b/src/lxc/syscall_numbers.h +@@ -53,7 +53,6 @@ + #elif defined __loongarch64 + #define __NR_keyctl 219 + #else +- #define -1 + #warning "__NR_keyctl not defined for your architecture" + #endif + #endif +@@ -92,7 +91,6 @@ + #elif defined __loongarch64 + #define __NR_memfd_create 279 + #else +- #define -1 + #warning "__NR_memfd_create not defined for your architecture" + #endif + #endif +@@ -129,7 +127,6 @@ + #elif defined __loongarch64 + #define __NR_pivot_root 41 + #else +- #define -1 + #warning "__NR_pivot_root not defined for your architecture" + #endif + #endif +@@ -166,7 +163,6 @@ + #elif defined __loongarch64 + #define __NR_setns 268 + #else +- #define -1 + #warning "__NR_setns not defined for your architecture" + #endif + #endif +@@ -203,7 +199,6 @@ + #elif defined __loongarch64 + #define __NR_sethostname 161 + #else +- #define -1 + #warning "__NR_sethostname not defined for your architecture" + #endif + #endif +@@ -272,7 +267,6 @@ + #elif defined __loongarch64 + #define __NR_signalfd4 74 + #else +- #define -1 + #warning "__NR_signalfd4 not defined for your architecture" + #endif + #endif +@@ -309,7 +303,6 @@ + #elif defined __loongarch64 + #define __NR_unshare 97 + #else +- #define -1 + #warning "__NR_unshare not defined for your architecture" + #endif + #endif +@@ -346,7 +339,6 @@ + #elif defined __loongarch64 + #define __NR_bpf 280 + #else +- #define -1 + #warning "__NR_bpf not defined for your architecture" + #endif + #endif +@@ -383,7 +375,6 @@ + #elif defined __loongarch64 + #define __NR_faccessat 48 + #else +- #define -1 + #warning "__NR_faccessat not defined for your architecture" + #endif + #endif +@@ -440,7 +431,6 @@ + #elif defined __loongarch64 + #define __NR_seccomp 277 + #else +- #define -1 + #warning "__NR_seccomp not defined for your architecture" + #endif + #endif +@@ -477,7 +467,6 @@ + #elif defined __loongarch64 + #define __NR_gettid 178 + #else +- #define -1 + #warning "__NR_gettid not defined for your architecture" + #endif + #endif +@@ -518,7 +507,6 @@ + #elif defined __loongarch64 + #define __NR_execveat 281 + #else +- #define -1 + #warning "__NR_execveat not defined for your architecture" + #endif + #endif +@@ -759,7 +747,6 @@ + #elif defined __loongarch64 + #define __NR_personality 92 + #else +- #define -1 + #warning "__NR_personality not defined for your architecture" + #endif + #endif From d34c7934241229d1a1d5e74be80eb55db9bdb830 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 31 Mar 2024 18:43:54 +0200 Subject: [PATCH 5453/5754] package/giflib: fix host build without convert Do not build docs for host-giflib to avoid the following build failure without convert on host raised since bump to version 5.2.2 in commit f98239dada59270efe19de9d9fae50ec9ab9d28c and https://sourceforge.net/p/giflib/code/ci/d565f6fa04be8973425bd7cd3f169908ac9e95c2: convert ../pic/gifgrid.gif -resize 50x50 giflib-logo.gif make[2]: convert: No such file or directory Fixes: f98239dada59270efe19de9d9fae50ec9ab9d28c - http://autobuild.buildroot.org/results/04dd54f5060881cb8aa030de34edb4ceea863fa6 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 51fd4b4109852cf547d41ea85ec2e93eb6330a1d) Signed-off-by: Peter Korsgaard --- package/giflib/giflib.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/giflib/giflib.mk b/package/giflib/giflib.mk index 770338507b..f37ec8af21 100644 --- a/package/giflib/giflib.mk +++ b/package/giflib/giflib.mk @@ -27,7 +27,7 @@ define GIFLIB_BUILD_CMDS endef define HOST_GIFLIB_BUILD_CMDS - $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) + $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) shared-lib endef define GIFLIB_INSTALL_STAGING_CMDS @@ -42,7 +42,7 @@ endef define HOST_GIFLIB_INSTALL_CMDS $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) DESTDIR=$(HOST_DIR) \ - PREFIX=/usr install + PREFIX=/usr install-include install-shared-lib endef $(eval $(generic-package)) From 9b689f8f5ccb7c6d3c7437d9ae94de9b911346a3 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Sat, 30 Mar 2024 23:59:31 -0700 Subject: [PATCH 5454/5754] package/containerd: bump version to v1.7.14 Updates containerd to v1.7.14. Highlights Fix various timing issues with docker pusher Register imagePullThroughput and count with MiB Move high volume event logs to Trace level Container Runtime Interface (CRI) Handle pod transition states gracefully while listing pod stats Runtime Update runc-shim to process exec exits before init https://github.com/containerd/containerd/releases/tag/1.7.14 Signed-off-by: Christian Stewart Signed-off-by: Yann E. MORIN (cherry picked from commit 2fa0f383b6d3edd1d3963b2fe4bee2bb2ef11ad8) 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 25dc7ff55d..193003e5a3 100644 --- a/package/containerd/containerd.hash +++ b/package/containerd/containerd.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 ae2b914bff0ddbb9b29d5fc689a51e1ce89ea4edfc4df9ae10517c6f5d2d5aaf containerd-1.7.13.tar.gz +sha256 ae55b25fb04b45dfbbde8280b034783a48ae7c40350d17fd272be5cbf0284cf1 containerd-1.7.14.tar.gz sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4 LICENSE diff --git a/package/containerd/containerd.mk b/package/containerd/containerd.mk index 9bf51c93ae..81875f763c 100644 --- a/package/containerd/containerd.mk +++ b/package/containerd/containerd.mk @@ -4,7 +4,7 @@ # ################################################################################ -CONTAINERD_VERSION = 1.7.13 +CONTAINERD_VERSION = 1.7.14 CONTAINERD_SITE = $(call github,containerd,containerd,v$(CONTAINERD_VERSION)) CONTAINERD_LICENSE = Apache-2.0 CONTAINERD_LICENSE_FILES = LICENSE From 3c2463c9cf50dd32930f0d577a5863da99eb2921 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 31 Mar 2024 22:14:23 +0200 Subject: [PATCH 5455/5754] support/testing: add ed runtime test Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN (cherry picked from commit dc101babfd5fd36062b8c7551e41cace84192a70) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + support/testing/tests/package/test_ed.py | 98 ++++++++++++++++++++++++ 2 files changed, 99 insertions(+) create mode 100644 support/testing/tests/package/test_ed.py diff --git a/DEVELOPERS b/DEVELOPERS index bb1dfb023a..a38b681a8a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1771,6 +1771,7 @@ F: support/testing/tests/package/test_cryptsetup/ 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_ed.py F: support/testing/tests/package/test_file.py F: support/testing/tests/package/test_file/ F: support/testing/tests/package/test_fluidsynth.py diff --git a/support/testing/tests/package/test_ed.py b/support/testing/tests/package/test_ed.py new file mode 100644 index 0000000000..eee5f8c4fc --- /dev/null +++ b/support/testing/tests/package/test_ed.py @@ -0,0 +1,98 @@ +import os + +import infra.basetest + + +class TestEd(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_ED=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def run_ed_cmds(self, ed_cmds): + cmd = "ed < Date: Sun, 10 Mar 2024 00:44:25 +0100 Subject: [PATCH 5456/5754] support/scripts/mkusers: fix UID/GID confusion Commit 41ea61d59c3e (support/scripts/mkusers: allow option for system uid/gid) confused GID and UID variables: the GID limits were used to create UIDs. Fix that. Note that this fixes a shellcheck error; although there are many more shellcheck errors, these fixes are semantically a bug that need to be fixed separately from the coding style issues reported by shellcheck. Signed-off-by: Yann E. MORIN Cc: Norbert Lange Cc: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit ebbcf5a0a752519efffeba432f347b49950b1f16) Signed-off-by: Peter Korsgaard --- support/scripts/mkusers | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/support/scripts/mkusers b/support/scripts/mkusers index 4fc06f8fdf..d786943cf8 100755 --- a/support/scripts/mkusers +++ b/support/scripts/mkusers @@ -324,9 +324,9 @@ add_one_user() { # Generate a new UID if needed if [ ${uid} -eq ${AUTO_USER_ID} ]; then - uid="$( generate_uid "${username}" $FIRST_USER_GID $LAST_USER_GID )" + uid="$( generate_uid "${username}" $FIRST_USER_UID $LAST_USER_UID )" elif [ ${uid} -eq ${AUTO_SYSTEM_ID} ]; then - uid="$( generate_uid "${username}" $FIRST_SYSTEM_GID $LAST_SYSTEM_GID )" + uid="$( generate_uid "${username}" $FIRST_SYSTEM_UID $LAST_SYSTEM_UID )" fi # Remove any previous instance of this user From 1f46f563465535b748db10863f7fae8b09cc7bbc Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 10 Mar 2024 00:44:26 +0100 Subject: [PATCH 5457/5754] support/scripts/mkusers: fix shellcheck errors the user tables do not use trailing backslash \ to continue lines, so we don't want them to be interpreted thusly, so we use 'read -r' (SC2162). Integer variables need not be quoted (SC2086). In any case, should there be an actual issue and they be set empty, that would cause a runtime issue, wether they be quoted or not. The binary -o and -a ar perfectly defined in bash's test (SC2166). Signed-off-by: Yann E. MORIN (cherry picked from commit 01b3053ceccad2486e25a17af6dfc5039b7eea3e) Signed-off-by: Peter Korsgaard --- .checkpackageignore | 1 - support/scripts/mkusers | 27 +++++++++++++++++++++------ 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 829fd7d0f1..15ddbf8ea7 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1466,7 +1466,6 @@ support/scripts/expunge-gconv-modules Shellcheck support/scripts/fix-configure-powerpc64.sh EmptyLastLine 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 diff --git a/support/scripts/mkusers b/support/scripts/mkusers index d786943cf8..ee09bbd1f2 100755 --- a/support/scripts/mkusers +++ b/support/scripts/mkusers @@ -26,6 +26,7 @@ error() { shift printf "%s: " "${myname}" >&2 + # shellcheck disable=SC2059 # fmt is the format passed to error() printf "${fmt}" "${@}" >&2 } fail() { @@ -145,6 +146,8 @@ check_user_validity() { fail "invalid username '%s\n'" "${username}" fi + # shellcheck disable=SC2086 # gid is a non-empty int + # shellcheck disable=SC2166 # [ .. -o .. ] works well in this case if [ ${gid} -lt -2 -o ${gid} -eq 0 ]; then fail "invalid gid '%d' for '%s'\n" ${gid} "${username}" elif [ ${gid} -ge 0 ]; then @@ -171,6 +174,8 @@ check_user_validity() { fi fi + # shellcheck disable=SC2086 # uid is a non-empty int + # shellcheck disable=SC2166 # [ .. -o .. ] works well in this case if [ ${uid} -lt -2 -o ${uid} -eq 0 ]; then fail "invalid uid '%d' for '%s'\n" ${uid} "${username}" elif [ ${uid} -ge 0 ]; then @@ -190,6 +195,7 @@ check_user_validity() { fi # check the user does not already exist in another group + # shellcheck disable=SC2166 # [ .. -a .. ] works well in this case if [ -n "${_ugroup}" -a "${_ugroup}" != "${group}" ]; then fail "user '%s' already exists with group '%s' (wants '%s')\n" \ "${username}" "${_ugroup}" "${group}" @@ -218,6 +224,7 @@ generate_gid() { break fi done + # shellcheck disable=SC2086 # gid and maxgid are non-empty ints if [ ${gid} -gt ${maxgid} ]; then fail "can not allocate a GID for group '%s'\n" "${group}" fi @@ -233,6 +240,7 @@ add_one_group() { local members # Generate a new GID if needed + # shellcheck disable=SC2086 # gid is a non-empty int if [ ${gid} -eq ${AUTO_USER_ID} ]; then gid="$( generate_gid "${group}" $FIRST_USER_GID $LAST_USER_GID )" elif [ ${gid} -eq ${AUTO_SYSTEM_ID} ]; then @@ -272,6 +280,7 @@ generate_uid() { break fi done + # shellcheck disable=SC2086 # uid is a non-empty int if [ ${uid} -gt ${maxuid} ]; then fail "can not allocate a UID for user '%s'\n" "${username}" fi @@ -323,6 +332,7 @@ add_one_user() { check_user_validity "${username}" "${uid}" "${group}" "${gid}" # Generate a new UID if needed + # shellcheck disable=SC2086 # uid is a non-empty int if [ ${uid} -eq ${AUTO_USER_ID} ]; then uid="$( generate_uid "${username}" $FIRST_USER_UID $LAST_USER_UID )" elif [ ${uid} -eq ${AUTO_SYSTEM_ID} ]; then @@ -399,7 +409,7 @@ main() { fi # Read in all the file in memory, exclude empty lines and comments - while read line; do + while read -r line; do ENTRIES+=( "${line}" ) done < <( sed -r -e 's/#.*//; /^[[:space:]]*$/d;' "${USERS_TABLE}" ) @@ -410,14 +420,16 @@ main() { # First, create all the main groups which gid is *not* automatic for line in "${ENTRIES[@]}"; do - read username uid group gid passwd home shell groups comment <<<"${line}" + read -r username uid group gid passwd home shell groups comment <<<"${line}" + # shellcheck disable=SC2086 # gid is a non-empty int [ ${gid} -ge 0 ] || continue # Automatic gid add_one_group "${group}" "${gid}" done # Then, create all the main groups which gid *is* automatic for line in "${ENTRIES[@]}"; do - read username uid group gid passwd home shell groups comment <<<"${line}" + read -r username uid group gid passwd home shell groups comment <<<"${line}" + # shellcheck disable=SC2086 # gid is a non-empty int [ ${gid} -lt 0 ] || continue # Non-automatic gid add_one_group "${group}" "${gid}" done @@ -428,8 +440,9 @@ main() { # system gid if the uid is a system user (<= LAST_SYSTEM_UID), # otherwise a user gid. for line in "${ENTRIES[@]}"; do - read username uid group gid passwd home shell groups comment <<<"${line}" + read -r username uid group gid passwd home shell groups comment <<<"${line}" if [ "${groups}" != "-" ]; then + # shellcheck disable=SC2086 # uid is a non-empty int if [ ${uid} -le 0 ]; then auto_id=${uid} elif [ ${uid} -le ${LAST_SYSTEM_UID} ]; then @@ -450,8 +463,9 @@ main() { # Now, add users whose uid is *not* automatic for line in "${ENTRIES[@]}"; do - read username uid group gid passwd home shell groups comment <<<"${line}" + read -r username uid group gid passwd home shell groups comment <<<"${line}" [ "${username}" != "-" ] || continue # Magic string to skip user creation + # shellcheck disable=SC2086 # uid is a non-empty int [ ${uid} -ge 0 ] || continue # Automatic uid add_one_user "${username}" "${uid}" "${group}" "${gid}" "${passwd}" \ "${home}" "${shell}" "${groups}" "${comment}" @@ -459,8 +473,9 @@ main() { # Finally, add users whose uid *is* automatic for line in "${ENTRIES[@]}"; do - read username uid group gid passwd home shell groups comment <<<"${line}" + read -r username uid group gid passwd home shell groups comment <<<"${line}" [ "${username}" != "-" ] || continue # Magic string to skip user creation + # shellcheck disable=SC2086 # uid is a non-empty int [ ${uid} -lt 0 ] || continue # Non-automatic uid add_one_user "${username}" "${uid}" "${group}" "${gid}" "${passwd}" \ "${home}" "${shell}" "${groups}" "${comment}" From 4a27953e8b679a461713e86bc51a8564ca4aed56 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 10 Mar 2024 00:44:28 +0100 Subject: [PATCH 5458/5754] support/download/check-hash: fix shellcheck errors The hash files do not use trailing backslash \ to continue lines, so we don't want them to be interpreted thusly, so we use 'read -r' (SC2162). The h_file is used twice in the same loop, once for reading from it, and once just to print it, so there is no conflict (SC2094). Integrer variables need not be quoted (SC2086). In any case, should there be an actual issue and they be set empty, that would cause a runtime issue, wether they be quoted or not. Signed-off-by: Yann E. MORIN (cherry picked from commit 9cb421c16f9aa026eabe050d94664c137f93eff5) Signed-off-by: Peter Korsgaard --- .checkpackageignore | 1 - support/download/check-hash | 8 ++++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 15ddbf8ea7..426aedd476 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1443,7 +1443,6 @@ 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 diff --git a/support/download/check-hash b/support/download/check-hash index 03a6557187..9db647885a 100755 --- a/support/download/check-hash +++ b/support/download/check-hash @@ -57,7 +57,7 @@ check_one_hash() { esac # Do the hashes match? - _hash=$( ${_h}sum "${_file}" |cut -d ' ' -f 1 ) + _hash="$( "${_h}sum" "${_file}" |cut -d ' ' -f 1 )" if [ "${_hash}" = "${_known}" ]; then printf "%s: OK (%s: %s)\n" "${base}" "${_h}" "${_hash}" return 0 @@ -78,7 +78,8 @@ nb_checks=0 for h_file in "${h_files[@]}"; do [ -f "${h_file}" ] || continue : $((nb_h_files++)) - while read t h f; do + # shellcheck disable=SC2094 # we're really reading it only once + while read -r t h f; do case "${t}" in ''|'#'*) # Skip comments and empty lines @@ -86,6 +87,7 @@ for h_file in "${h_files[@]}"; do ;; *) if [ "${f}" = "${base}" ]; then + # shellcheck disable=SC2094 # we're only printing the h_file filename check_one_hash "${t}" "${h}" "${file}" "${h_file}" : $((nb_checks++)) fi @@ -94,11 +96,13 @@ for h_file in "${h_files[@]}"; do done <"${h_file}" done +# shellcheck disable=SC2086 # nb_h_files is a non-empty int if [ ${nb_h_files} -eq 0 ]; then printf "WARNING: no hash file for %s\n" "${base}" >&2 exit 0 fi +# shellcheck disable=SC2086 # nb_checks is a non-empty int if [ ${nb_checks} -eq 0 ]; then case " ${BR_NO_CHECK_HASH_FOR} " in *" ${base} "*) From a2ade71578a978926bb47985594cc2d2ce5432f2 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Mon, 1 Apr 2024 19:20:51 +0200 Subject: [PATCH 5459/5754] support/testing: fix trace-cmd runtime test The trace-cmd runtime test has a typo and fails with output: Traceback (most recent call last): File "/build/buildroot/support/testing/tests/package/test_trace_cmd.py", line 53, in test_run self.assertEquals(exit_code, 0) ^^^^^^^^^^^^^^^^^ AttributeError: 'TestTraceCmd' object has no attribute 'assertEquals'. Did you mean: 'assertEqual'? The issue can be reproduced with the command: support/testing/run-tests \ -d dl -o output_test \ tests.package.test_trace_cmd This commit fixes the issue by removing the extra 's'. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN (cherry picked from commit 2f507f1da564cce807b809c893fcf2408ca26bfe) Signed-off-by: Peter Korsgaard --- support/testing/tests/package/test_trace_cmd.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/testing/tests/package/test_trace_cmd.py b/support/testing/tests/package/test_trace_cmd.py index e7d5e13bce..5d37aef375 100644 --- a/support/testing/tests/package/test_trace_cmd.py +++ b/support/testing/tests/package/test_trace_cmd.py @@ -50,5 +50,5 @@ def test_run(self): # Check we have occurrences of "kmalloc:" in the trace report. cmd = "grep -Fc kmalloc: trace.txt" output, exit_code = self.emulator.run(cmd) - self.assertEquals(exit_code, 0) + self.assertEqual(exit_code, 0) self.assertTrue(int(output[0]) > 0) From bcafe4be058074848d661f5a38d6a2b4a3ad73d2 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Tue, 13 Feb 2024 21:49:15 +0100 Subject: [PATCH 5460/5754] support/testing: add lvm2 runtime test Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle (cherry picked from commit 79f7d71640061f65aedfa4f8845a6757e8b0f3fc) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 + support/testing/tests/package/test_lvm2.py | 163 ++++++++++++++++++ .../package/test_lvm2/linux-lvm2.fragment | 2 + 3 files changed, 167 insertions(+) create mode 100644 support/testing/tests/package/test_lvm2.py create mode 100644 support/testing/tests/package/test_lvm2/linux-lvm2.fragment diff --git a/DEVELOPERS b/DEVELOPERS index a38b681a8a..8ccf6ff46c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1805,6 +1805,8 @@ 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_ltrace.py +F: support/testing/tests/package/test_lvm2.py +F: support/testing/tests/package/test_lvm2/ F: support/testing/tests/package/test_lzip.py F: support/testing/tests/package/test_lsof.py F: support/testing/tests/package/test_lz4.py diff --git a/support/testing/tests/package/test_lvm2.py b/support/testing/tests/package/test_lvm2.py new file mode 100644 index 0000000000..bdbae7a4ec --- /dev/null +++ b/support/testing/tests/package/test_lvm2.py @@ -0,0 +1,163 @@ +import os +import subprocess + +import infra.basetest + + +class TestLvm2(infra.basetest.BRTest): + # This test creates a lvm2 volume. A specific Kernel need to be + # built with a config fragment enabling this support. This test + # also uses resize2fs from e2fsprogs. + kernel_fragment = \ + infra.filepath("tests/package/test_lvm2/linux-lvm2.fragment") + config = \ + f""" + 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.77" + 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="{kernel_fragment}" + BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + BR2_PACKAGE_E2FSPROGS=y + BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y + BR2_PACKAGE_LVM2=y + BR2_TARGET_ROOTFS_CPIO=y + BR2_TARGET_ROOTFS_CPIO_GZIP=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def get_free_disk_space(self, path): + out, ret = self.emulator.run(f"df -k {path}") + self.assertEqual(ret, 0) + return int(out[1].split()[3]) + + def test_run(self): + # Test configuration: + storage_devs = ["/dev/vda", "/dev/vdb", "/dev/vdc"] + storage_size = 16 # Mega Bytes + lvm_vg = "br_vg" # Volume Group name + lvm_lv = "br_lv" # Logical Volume name + lv_dev = f"/dev/{lvm_vg}/{lvm_lv}" # Logical Volume dev name + mnt_pt = "/mnt/lvm2-storage" + data_file = f"{mnt_pt}/data.bin" + + qemu_storage_opts = [] + for i in range(len(storage_devs)): + disk_file = os.path.join(self.builddir, "images", f"disk{i}.img") + self.emulator.logfile.write(f"Creating disk image: {disk_file}\n") + self.emulator.logfile.flush() + subprocess.check_call( + ["dd", "if=/dev/zero", f"of={disk_file}", + "bs=1M", f"count={storage_size}"], + stdout=self.emulator.logfile, + stderr=self.emulator.logfile) + opts = ["-drive", f"file={disk_file},if=virtio,format=raw"] + qemu_storage_opts += opts + + 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] + qemu_storage_opts) + self.emulator.login() + + # Test the program can execute. + self.assertRunOk("lvm version") + + # We did not created any Physical Volume yet. We should NOT + # see any of our storage devices in a pvscan. + out, ret = self.emulator.run("pvscan") + self.assertEqual(ret, 0) + for dev in storage_devs: + self.assertNotIn(dev, "\n".join(out)) + + # We initialize our Physical Volumes (PVs). + pv_devs = " ".join(storage_devs) + self.assertRunOk(f"pvcreate {pv_devs}") + + # We run few diagnostic commands related to PVs. + self.assertRunOk(f"pvck {pv_devs}") + self.assertRunOk(f"pvdisplay {pv_devs}") + self.assertRunOk("pvs") + + # Now we initialized the PVs, we should see them in a pvscan. + out, ret = self.emulator.run("pvscan") + self.assertEqual(ret, 0) + for dev in storage_devs: + self.assertIn(dev, "\n".join(out)) + + # We create a Volume Group (VG) including two of our three + # PVs. + cmd = f"vgcreate {lvm_vg} {storage_devs[0]} {storage_devs[1]}" + self.assertRunOk(cmd) + + # We run few diagnostic commands related to VGs. + self.assertRunOk(f"vgck {lvm_vg}") + self.assertRunOk(f"vgdisplay {lvm_vg}") + self.assertRunOk("vgscan") + self.assertRunOk("vgs") + + # We create a Logical Volume (LV) in our VG. + self.assertRunOk(f"lvcreate -l 100%FREE -n {lvm_lv} {lvm_vg}") + + # We check LVM created the LV device. + self.assertRunOk(f"ls -al {lv_dev}") + + # We run few diagnostic commands related to LVs. + self.assertRunOk("lvscan") + self.assertRunOk("lvs") + + # We create a ext4 filesystem on our LV. + self.assertRunOk(f"mkfs.ext4 {lv_dev}") + + # We create a mount point directory and mount the device. + self.assertRunOk(f"mkdir -p {mnt_pt}") + self.assertRunOk(f"mount {lv_dev} {mnt_pt}") + + # We create a data file in our new filesystem. Note: this file + # is slightly larger than a single PV. This data file should + # span over the two PVs in the VG. + data_size = storage_size + 4 + cmd = f"dd if=/dev/urandom of={data_file} bs=1M count={data_size}" + self.assertRunOk(cmd) + + # We compute the hash of our data, and save it for later. + hash_cmd = f"sha256sum {data_file}" + out, ret = self.emulator.run(hash_cmd) + self.assertEqual(ret, 0) + data_sha256 = out[0] + + # We compute the free space of the mount point. + fs_free_space = self.get_free_disk_space(mnt_pt) + + # We extend of VG with our third PV. + self.assertRunOk(f"vgextend {lvm_vg} {storage_devs[2]}") + + # We grow the LV to use all the space of the VG. + self.assertRunOk(f"lvresize -l +100%FREE {lvm_vg}/{lvm_lv}") + + # We resize the filesystem to use all the LV space. + self.assertRunOk(f"resize2fs {lv_dev}") + + # Now we grew the LV and resized the filesystem, we recompute + # the free space and check we have more. + fs2_free_space = self.get_free_disk_space(mnt_pt) + self.assertGreater(fs2_free_space, fs_free_space) + + # With all those on-the-fly operations on the mounted + # filesystem, the data file should be intact. We should + # recompute the same data checksum as before. + out, ret = self.emulator.run(hash_cmd) + self.assertEqual(ret, 0) + self.assertEqual(out[0], data_sha256) + + # Finally, we unmount the filesystem. It should not contain + # any error. + self.assertRunOk(f"umount {mnt_pt}") + self.assertRunOk(f"e2fsck -f -n {lv_dev}") diff --git a/support/testing/tests/package/test_lvm2/linux-lvm2.fragment b/support/testing/tests/package/test_lvm2/linux-lvm2.fragment new file mode 100644 index 0000000000..0fade167a3 --- /dev/null +++ b/support/testing/tests/package/test_lvm2/linux-lvm2.fragment @@ -0,0 +1,2 @@ +CONFIG_MD=y +CONFIG_BLK_DEV_DM=y From 2ab350b279742e802efae973c55f7e485bd1c841 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 28 Mar 2024 22:49:54 +0100 Subject: [PATCH 5461/5754] package/{mesa3d, mesa3d-headers}: bump version to 24.0.4 Release notes: https://lists.freedesktop.org/archives/mesa-dev/2024-March/226176.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit eedba64ab217a5b15dffe77565ffc129f1097ac3) 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 7f39fefaf5..0756296a01 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 = 24.0.3 +MESA3D_HEADERS_VERSION = 24.0.4 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 1e94c2c612..e2e0be2641 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2024-March/000752.html -sha256 77aec9a2a37b7d3596ea1640b3cc53d0b5d9b3b52abed89de07e3717e91bfdbe mesa-24.0.3.tar.xz -sha512 76b3b479877c40f729d7f530af4e3577fa74363edcd3d9474350d498a51dbb761fc034b39bee8547e97c30fd3a520cbc50c742d5a187746e83ddab1df44f37e9 mesa-24.0.3.tar.xz +# From https://lists.freedesktop.org/archives/mesa-dev/2024-March/226176.html +sha256 90febd30a098cbcd97ff62ecc3dcf5c93d76f7fa314de944cfce81951ba745f0 mesa-24.0.4.tar.xz +sha512 1d05b07026417fbe9cf18f7b18f2db9fe5fe327555c590283d87f69bbdd51f64135928a1dbe155d750187fc268bbdbb070bc1ae9ffc3e013b8707b391969d515 mesa-24.0.4.tar.xz # License sha256 a00275a53178e2645fb65be99a785c110513446a5071ff2c698ed260ad917d75 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index bdb7ea9a6c..c2343488ed 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 = 24.0.3 +MESA3D_VERSION = 24.0.4 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos From 6f5451096b523ffc331696393d057b095252266c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 28 Mar 2024 22:55:47 +0100 Subject: [PATCH 5462/5754] package/freeipmi: bump to version 1.6.14 https://lists.gnu.org/archive/html/freeipmi-announce/2024-01/msg00001.html https://lists.gnu.org/archive/html/freeipmi-announce/2024-01/msg00000.html Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 38db0df41a8989226a7170f8998982a1173c6b58) Signed-off-by: Peter Korsgaard --- package/freeipmi/freeipmi.hash | 2 +- package/freeipmi/freeipmi.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/freeipmi/freeipmi.hash b/package/freeipmi/freeipmi.hash index ac24b7c64e..2f81d90c1d 100644 --- a/package/freeipmi/freeipmi.hash +++ b/package/freeipmi/freeipmi.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 65fbd6910fc010457748695414f27c5755b4e8d75734221221f3858c6230a897 freeipmi-1.6.11.tar.gz +sha256 1a3dac5c76b7ccc4d4f86aa12b8ef9b212baef7489bf05e899b89abb7e14edb5 freeipmi-1.6.14.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.bmc-watchdog sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.ipmiconsole diff --git a/package/freeipmi/freeipmi.mk b/package/freeipmi/freeipmi.mk index ecff6f9925..e28f63f715 100644 --- a/package/freeipmi/freeipmi.mk +++ b/package/freeipmi/freeipmi.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREEIPMI_VERSION = 1.6.11 +FREEIPMI_VERSION = 1.6.14 FREEIPMI_SITE = https://ftp.gnu.org/gnu/freeipmi FREEIPMI_LICENSE = GPL-3.0+, BSD-like (sunbmc) FREEIPMI_LICENSE_FILES = \ From 81764dcfc66f5f50444994fd8706e887c4026153 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20M=C3=A9lotte?= Date: Fri, 29 Mar 2024 17:03:58 +0100 Subject: [PATCH 5463/5754] docs/manual: fix host-python-setuptools typo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Raphaël Mélotte Signed-off-by: Thomas Petazzoni (cherry picked from commit f12c77442e1184427eee0960646833728a4c47db) Signed-off-by: Peter Korsgaard --- docs/manual/adding-packages-python.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/manual/adding-packages-python.adoc b/docs/manual/adding-packages-python.adoc index 9953be6639..67f2f6081d 100644 --- a/docs/manual/adding-packages-python.adoc +++ b/docs/manual/adding-packages-python.adoc @@ -92,7 +92,7 @@ Note that: dependencies are automatically added as needed by the Python package infrastructure. - * Similarly, it is not needed to add +host-setuptools+ to + * Similarly, it is not needed to add +host-python-setuptools+ to +PYTHON_FOO_DEPENDENCIES+ for setuptools-based packages, since it's automatically added by the Python infrastructure as needed. From 907bbae1e4b146c47c4e48fbd43ecd12a55c7b1a Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 3 Apr 2024 10:40:29 +0200 Subject: [PATCH 5464/5754] package/gnupg2: bump to version 2.4.5 Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN (cherry picked from commit e5d0543292817341b0ca2e9d2f4486954f1f3dac) Signed-off-by: Peter Korsgaard --- 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 c821afb55e..8bb64c9eda 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 228b3984325fdeebc5e3f2d165c6419a5ebc28de gnupg-2.4.4.tar.bz2 -sha256 67ebe016ca90fa7688ce67a387ebd82c6261e95897db7b23df24ff335be85bc6 gnupg-2.4.4.tar.bz2 +sha1 ae0935ead29a2dfa34d6b48d70808652bc3ca73b gnupg-2.4.5.tar.bz2 +sha256 f68f7d75d06cb1635c336d34d844af97436c3f64ea14bcb7c869782f96f44277 gnupg-2.4.5.tar.bz2 # Locally calculated sha256 bc2d6664f6276fa0a72d57633b3ae68dc7dcb677b71018bf08c8e93e509f1357 COPYING diff --git a/package/gnupg2/gnupg2.mk b/package/gnupg2/gnupg2.mk index 986da4790c..39b0a066f6 100644 --- a/package/gnupg2/gnupg2.mk +++ b/package/gnupg2/gnupg2.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNUPG2_VERSION = 2.4.4 +GNUPG2_VERSION = 2.4.5 GNUPG2_SOURCE = gnupg-$(GNUPG2_VERSION).tar.bz2 GNUPG2_SITE = https://gnupg.org/ftp/gcrypt/gnupg GNUPG2_LICENSE = GPL-3.0+ From 2acbf5f16776e372c37b857ada883348640ee5f6 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 3 Apr 2024 10:40:30 +0200 Subject: [PATCH 5465/5754] package/libassuan: bump to version 2.5.7 Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN (cherry picked from commit 439525ced972299c8fa60d5e68e710075b9dce79) Signed-off-by: Peter Korsgaard --- package/libassuan/libassuan.hash | 4 ++-- package/libassuan/libassuan.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libassuan/libassuan.hash b/package/libassuan/libassuan.hash index 084a09848c..6bb5022d13 100644 --- a/package/libassuan/libassuan.hash +++ b/package/libassuan/libassuan.hash @@ -1,6 +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 +sha1 b6ccd955085dac902a09871f94a3d41a7667d0c8 libassuan-2.5.7.tar.bz2 +sha256 0103081ffc27838a2e50479153ca105e873d3d65d8a9593282e9c94c7e6afb76 libassuan-2.5.7.tar.bz2 # Locally calculated sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LIB sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING diff --git a/package/libassuan/libassuan.mk b/package/libassuan/libassuan.mk index fb95a6fd67..9553c630a2 100644 --- a/package/libassuan/libassuan.mk +++ b/package/libassuan/libassuan.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBASSUAN_VERSION = 2.5.6 +LIBASSUAN_VERSION = 2.5.7 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) From cd6e65ff1e9b441dda86daf800be3a7978e70653 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 3 Apr 2024 10:40:31 +0200 Subject: [PATCH 5466/5754] package/libksba: bump to version 1.6.6 Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN (cherry picked from commit dd5d0240d241f8bf88af2c9799b9f13f0e99b515) Signed-off-by: Peter Korsgaard --- package/libksba/libksba.hash | 4 ++-- package/libksba/libksba.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libksba/libksba.hash b/package/libksba/libksba.hash index 3ac36e19ca..e74cde2cc0 100644 --- a/package/libksba/libksba.hash +++ b/package/libksba/libksba.hash @@ -1,6 +1,6 @@ # From https://www.gnupg.org/download/integrity_check.html -sha1 0ada15ac00baa7df677a05bcb517621708f9c2f2 libksba-1.6.5.tar.bz2 -sha256 a564628c574c99287998753f98d750babd91a4e9db451f46ad140466ef2a6d16 libksba-1.6.5.tar.bz2 +sha1 1db4222e052656700021a30d517f5aa2f882da4a libksba-1.6.6.tar.bz2 +sha256 5dec033d211559338838c0c4957c73dfdc3ee86f73977d6279640c9cd08ce6a4 libksba-1.6.6.tar.bz2 # Hash for license files: sha256 f9c59ea5a5e1dfdeebcd134e6a594c21eb088cc95f6653ee99ff2e187c105380 AUTHORS diff --git a/package/libksba/libksba.mk b/package/libksba/libksba.mk index 52ad5fbeec..b87efda226 100644 --- a/package/libksba/libksba.mk +++ b/package/libksba/libksba.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBKSBA_VERSION = 1.6.5 +LIBKSBA_VERSION = 1.6.6 LIBKSBA_SOURCE = libksba-$(LIBKSBA_VERSION).tar.bz2 LIBKSBA_SITE = https://gnupg.org/ftp/gcrypt/libksba LIBKSBA_LICENSE = LGPL-3.0+ or GPL-2.0+ (library, headers), GPL-3.0+ (manual, tests, build system) From 3909492646dbd69a771c24808474f3c7fae4b90d Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 3 Apr 2024 10:40:32 +0200 Subject: [PATCH 5467/5754] package/libnpth: bump to version 1.7 Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN (cherry picked from commit 3ef4d24192b20bd1eb5e34c9fa2a6aa5bde91f91) Signed-off-by: Peter Korsgaard --- package/libnpth/libnpth.hash | 7 +++---- package/libnpth/libnpth.mk | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package/libnpth/libnpth.hash b/package/libnpth/libnpth.hash index b9f72e0770..a140a23f64 100644 --- a/package/libnpth/libnpth.hash +++ b/package/libnpth/libnpth.hash @@ -1,7 +1,6 @@ -# Locally calculated after checking signature -# https://gnupg.org/ftp/gcrypt/npth/npth-1.6.tar.bz2.sig -# using key D8692123C4065DEA5E0F3AB5249B39D24F25E3B6 -sha256 1393abd9adcf0762d34798dc34fdcf4d0d22a8410721e76f1e3afcd1daa4e2d1 npth-1.6.tar.bz2 +# From https://www.gnupg.org/download/integrity_check.html +sha1 a9f7adc1b1f6707071d29bfb3338c28b995ca1ce npth-1.7.tar.bz2 +sha256 8589f56937b75ce33b28d312fccbf302b3b71ec3f3945fde6aaa74027914ad05 npth-1.7.tar.bz2 # Hash for license file: sha256 ce64d5f7b49ea6d80fdb6d4cdee6839d1a94274f7493dc797c3b55b65ec8e9ed COPYING.LIB diff --git a/package/libnpth/libnpth.mk b/package/libnpth/libnpth.mk index ecfef863f4..dc603b607f 100644 --- a/package/libnpth/libnpth.mk +++ b/package/libnpth/libnpth.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNPTH_VERSION = 1.6 +LIBNPTH_VERSION = 1.7 LIBNPTH_SOURCE = npth-$(LIBNPTH_VERSION).tar.bz2 LIBNPTH_SITE = https://www.gnupg.org/ftp/gcrypt/npth LIBNPTH_LICENSE = LGPL-2.0+ From 1ecaf17202a9aea9d390ada5ce8b16a5e4ec2ac7 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 3 Apr 2024 10:40:33 +0200 Subject: [PATCH 5468/5754] package/libgpg-error: bump to version 1.48 Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN (cherry picked from commit 6f663219d0368f9367bdd133aad43987fff3b916) Signed-off-by: Peter Korsgaard --- package/libgpg-error/libgpg-error.hash | 5 +++-- package/libgpg-error/libgpg-error.mk | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/libgpg-error/libgpg-error.hash b/package/libgpg-error/libgpg-error.hash index 5c445ba0b2..3b3464592a 100644 --- a/package/libgpg-error/libgpg-error.hash +++ b/package/libgpg-error/libgpg-error.hash @@ -1,6 +1,7 @@ # From https://www.gnupg.org/download/integrity_check.html -sha1 94668233fd7bd8e7c0ec5e363134cd53c575da60 libgpg-error-1.47.tar.bz2 -sha256 9e3c670966b96ecc746c28c2c419541e3bcb787d1a73930f5e5f5e1bcbbb9bdb libgpg-error-1.47.tar.bz2 +sha1 8bdb504750b4da9e7daffa164cf1ed9900671f32 libgpg-error-1.48.tar.bz2 +sha256 89ce1ae893e122924b858de84dc4f67aae29ffa610ebf668d5aa539045663d6f libgpg-error-1.48.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 60e3da9de1..3dd0ec94da 100644 --- a/package/libgpg-error/libgpg-error.mk +++ b/package/libgpg-error/libgpg-error.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGPG_ERROR_VERSION = 1.47 +LIBGPG_ERROR_VERSION = 1.48 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 db08c123305cd22ea60b03ebf322410fd70cbbfc Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 3 Apr 2024 10:42:03 +0200 Subject: [PATCH 5469/5754] package/libressl: bump to version 3.8.4 Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN (cherry picked from commit 9d8f9c73a2fd087dd2e8d8853a80da605fa64e4b) 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 40b49dbb82..5d3b54ea9c 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 6d4b8d5bbb25a1f8336639e56ec5088052d43a95256697a85c4ce91323c25954 libressl-3.8.2.tar.gz +sha256 c0cef9cfe174ac366ce482f542fddb07721e7fa0caface34b49a8720fa37fe7d libressl-3.8.4.tar.gz # Locally computed sha256 5c63613f008f16a9c0025c096bbd736cecf720494d121b5c5203e0ec6e5955b1 COPYING diff --git a/package/libressl/libressl.mk b/package/libressl/libressl.mk index b72f3b38ce..1d90aa853d 100644 --- a/package/libressl/libressl.mk +++ b/package/libressl/libressl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBRESSL_VERSION = 3.8.2 +LIBRESSL_VERSION = 3.8.4 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 7045d2905e67158f5fe2ae5e497bc923c114e4d5 Mon Sep 17 00:00:00 2001 From: Francois Dugast Date: Wed, 15 Nov 2023 13:38:21 +0000 Subject: [PATCH 5470/5754] package/libdrm/intel: Remove dependency to x86 BR2_PACKAGE_LIBDRM_INTEL was dependent on BR2_i386 or BR2_x86_64, which made sense for integrated GPUs. This is no longer valid with discrete GPUs so remove this dependency to allow building on other CPU architectures. Signed-off-by: Francois Dugast Signed-off-by: Yann E. MORIN (cherry picked from commit 02e30af0d059aabb694daa54cbad4cae900af29a) Signed-off-by: Peter Korsgaard --- package/libdrm/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/libdrm/Config.in b/package/libdrm/Config.in index 3cb0e02a41..fab8289be6 100644 --- a/package/libdrm/Config.in +++ b/package/libdrm/Config.in @@ -20,7 +20,6 @@ config BR2_PACKAGE_LIBDRM_ENABLE_ATOMIC config BR2_PACKAGE_LIBDRM_INTEL bool "intel" - depends on BR2_i386 || BR2_x86_64 depends on BR2_PACKAGE_LIBDRM_HAS_ATOMIC select BR2_PACKAGE_LIBDRM_ENABLE_ATOMIC select BR2_PACKAGE_LIBPCIACCESS From 99f6397a80d92bbaf64a07816a555d531655d799 Mon Sep 17 00:00:00 2001 From: Wojciech Nizinski Date: Thu, 14 Sep 2023 18:50:46 +0200 Subject: [PATCH 5471/5754] board/freescale/common/imx/imx8-bootloader-prepare.sh: enable error checking Run script with 'errexit' bash option to detect any errors from subcommands. It will fix situation where 'ddr_fw.bin' was missing but successfull build created broken boot image. Post image script report this by: cat: /home/user/buildroot/output/images/ddr_fw.bin: No such file or directory and build finish with success. Signed-off-by: Wojciech Nizinski Signed-off-by: Thomas Petazzoni (cherry picked from commit 4a1bcbe17e83c78de31a4cdf9161c1342d1021ae) Signed-off-by: Peter Korsgaard --- board/freescale/common/imx/imx8-bootloader-prepare.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/board/freescale/common/imx/imx8-bootloader-prepare.sh b/board/freescale/common/imx/imx8-bootloader-prepare.sh index 7ebf15b6ff..a9ee154e9c 100755 --- a/board/freescale/common/imx/imx8-bootloader-prepare.sh +++ b/board/freescale/common/imx/imx8-bootloader-prepare.sh @@ -73,4 +73,5 @@ main () exit $? } +set -e main $@ From 330386fef9179b169d3619818a6c692098f3f0e4 Mon Sep 17 00:00:00 2001 From: Norbert Lange Date: Tue, 16 Jan 2024 12:00:02 +0100 Subject: [PATCH 5472/5754] package/psplash: fix systemd unit ordering and dependencies Fix a typo in the dependencies, and switch the type to 'exec'. This ensures that the psplash-systemd service will find the FIFO created by psplash. Change the psplash-systemd dependency to BindsTo, so stopping psplash itself will also end this service and free resources. psplash-start service need to start early, otherwise it might try to compete/take away the framebuffer from the final graphical stack. Order it before sysinit.target. Signed-off-by: Norbert Lange Signed-off-by: Arnout Vandecappelle (cherry picked from commit 087115b96a6b053a333de2960aa75c6dd122f087) Signed-off-by: Peter Korsgaard --- package/psplash/psplash-start.service | 2 ++ package/psplash/psplash-systemd.service | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/package/psplash/psplash-start.service b/package/psplash/psplash-start.service index b97e883e54..74cbc33955 100644 --- a/package/psplash/psplash-start.service +++ b/package/psplash/psplash-start.service @@ -2,8 +2,10 @@ Description=Starts Psplash Boot screen DefaultDependencies=no RequiresMountsFor=/run +Before=sysinit.target [Service] +Type=exec ExecStart=/usr/bin/psplash -n [Install] diff --git a/package/psplash/psplash-systemd.service b/package/psplash/psplash-systemd.service index 249aa54039..f89bc5f4fe 100644 --- a/package/psplash/psplash-systemd.service +++ b/package/psplash/psplash-systemd.service @@ -1,8 +1,8 @@ [Unit] Description=Start psplash-systemd progress communication helper DefaultDependencies=no -After=systemd-start.service -Requires=psplash-start.service +After=psplash-start.service +BindsTo=psplash-start.service RequiresMountsFor=/run [Service] From aefc8730aaed3639692de8e0f93715d846a1100e Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Wed, 27 Mar 2024 16:36:02 +0100 Subject: [PATCH 5473/5754] DEVELOPERS: remove Thomas De Schampheleire No longer active in Buildroot. Keeping my name in the list sets the wrong expectation regarding package updates or support. Signed-off-by: Thomas De Schampheleire Signed-off-by: Peter Korsgaard (cherry picked from commit 1a015540278ba742b5a77e90e80e2f858af14f04) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 41 ----------------------------------------- 1 file changed, 41 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 8ccf6ff46c..a2a2c56a13 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2949,47 +2949,6 @@ F: package/openlayers/ F: package/vuejs/ F: package/vuejs-router/ -N: Thomas De Schampheleire -F: docs/manual/ -F: package/cereal/ -F: package/chartjs/ -F: package/datatables/ -F: package/datatables-buttons/ -F: package/datatables-fixedcolumns/ -F: package/datatables-responsive/ -F: package/jszip/ -F: package/libtelnet/ -F: package/opkg-utils/ -F: package/perl-convert-asn1/ -F: package/perl-crypt-blowfish/ -F: package/perl-crypt-cbc/ -F: package/perl-crypt-openssl-aes/ -F: package/perl-devel-cycle/ -F: package/perl-devel-size/ -F: package/perl-i18n/ -F: package/perl-locale-maketext-lexicon/ -F: package/perl-lwp-protocol-https/ -F: package/perl-math-int64/ -F: package/perl-math-prime-util/ -F: package/perl-mime-base64-urlsafe/ -F: package/perl-mojolicious-plugin-authentication/ -F: package/perl-mojolicious-plugin-authorization/ -F: package/perl-mojolicious-plugin-cspheader/ -F: package/perl-mojolicious-plugin-i18n/ -F: package/perl-mojolicious-plugin-securityheader/ -F: package/perl-mozilla-ca/ -F: package/perl-net-snmp/ -F: package/perl-net-ssh2/ -F: package/perl-net-telnet/ -F: package/perl-path-class/ -F: package/pigz/ -F: package/popperjs/ -F: package/xenomai/ -F: support/scripts/size-stats -F: support/testing/tests/package/test_perl_lwp_protocol_https.py -F: utils/size-stats-compare -F: toolchain/ - N: Thomas Devoogdt F: package/fluent-bit/ F: package/libsoup3/ From f658e8c9f8ce715a225318fa6c58feeaace30d44 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 4 Apr 2024 17:11:15 +0200 Subject: [PATCH 5474/5754] package/apache: security bump version to 2.4.59 Changelog: https://dlcdn.apache.org/httpd/CHANGES_2.4.59 Fixes CVE-2023-38709, CVE-2024-27316 & CVE-2024-24795. Removed patch which is included in this release. Updated _SITE and hash file URLs according to https://httpd.apache.org/download.cgi#apache24 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit e0bbfaea0e983c1ce42a9c3085f3ca3dd796852f) Signed-off-by: Peter Korsgaard --- ...emove-dependency-on-xmlstring-header.patch | 47 ------------------- package/apache/apache.hash | 6 +-- package/apache/apache.mk | 4 +- 3 files changed, 5 insertions(+), 52 deletions(-) delete mode 100644 package/apache/0004-mod_xml2enc-remove-dependency-on-xmlstring-header.patch diff --git a/package/apache/0004-mod_xml2enc-remove-dependency-on-xmlstring-header.patch b/package/apache/0004-mod_xml2enc-remove-dependency-on-xmlstring-header.patch deleted file mode 100644 index 8ff7076589..0000000000 --- a/package/apache/0004-mod_xml2enc-remove-dependency-on-xmlstring-header.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 27a68e54b7c6d2ae80dca396fd2727852897dab1 Mon Sep 17 00:00:00 2001 -From: Eric Covener -Date: Tue, 21 Nov 2023 12:58:47 +0000 -Subject: [PATCH] mod_xml2enc: remove dependency on xmlstring header - -Submitted by: ttachi - -Github: closes #393 - -git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1914013 13f79535-47bb-0310-9956-ffa450edef68 - -Upstream: https://github.com/apache/httpd/commit/27a68e54b7c6d2ae80dca396fd2727852897dab1 - -Signed-off-by: Bernd Kuhls ---- - changes-entries/xmlchar.txt | 2 ++ - modules/filters/mod_xml2enc.c | 6 +++--- - 2 files changed, 5 insertions(+), 3 deletions(-) - create mode 100644 changes-entries/xmlchar.txt - -diff --git a/changes-entries/xmlchar.txt b/changes-entries/xmlchar.txt -new file mode 100644 -index 00000000000..d0e06300411 ---- /dev/null -+++ b/changes-entries/xmlchar.txt -@@ -0,0 +1,2 @@ -+ *) mod_xml2enc: Tolerate libxml2 2.12.0 and later. -+ [ttachi ] -diff --git a/modules/filters/mod_xml2enc.c b/modules/filters/mod_xml2enc.c -index 34f8e8ee090..e8ee2647955 100644 ---- a/modules/filters/mod_xml2enc.c -+++ b/modules/filters/mod_xml2enc.c -@@ -206,11 +206,11 @@ static void sniff_encoding(request_rec* r, xml2ctx* ctx) - } - } - } -- -+ - /* to sniff, first we look for BOM */ - if (ctx->xml2enc == XML_CHAR_ENCODING_NONE) { -- ctx->xml2enc = xmlDetectCharEncoding((const xmlChar*)ctx->buf, -- ctx->bytes); -+ ctx->xml2enc = xmlDetectCharEncoding((const unsigned char*)ctx->buf, -+ ctx->bytes); - if (HAVE_ENCODING(ctx->xml2enc)) { - ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, APLOGNO(01432) - "Got charset from XML rules.") ; diff --git a/package/apache/apache.hash b/package/apache/apache.hash index 854bc85dcc..84248761b9 100644 --- a/package/apache/apache.hash +++ b/package/apache/apache.hash @@ -1,5 +1,5 @@ -# From https://archive.apache.org/dist/httpd/httpd-2.4.58.tar.bz2.{sha256,sha512} -sha256 fa16d72a078210a54c47dd5bef2f8b9b8a01d94909a51453956b3ec6442ea4c5 httpd-2.4.58.tar.bz2 -sha512 d6e73bf413a507ec16b621ff635e178206207a9e9810ce3944b3dc98d39cde8f225307110167fc9da5822175796c8cb66f98be5b9f0d8b76dcd83a401d39b2c1 httpd-2.4.58.tar.bz2 +# From https://downloads.apache.org/httpd/httpd-2.4.59.tar.bz2.{sha256,sha512} +sha256 ec51501ec480284ff52f637258135d333230a7d229c3afa6f6c2f9040e321323 httpd-2.4.59.tar.bz2 +sha512 209da0bbac5e2564d4590302515b35495be6402273ff4024aa93e85e44554c95e053201d606383936425a41e1b5b97e6b40055dcbb385eb691a5029a6f3158c2 httpd-2.4.59.tar.bz2 # Locally computed sha256 47b8c2b6c3309282a99d4a3001575c790fead690cc14734628c4667d2bbffc43 LICENSE diff --git a/package/apache/apache.mk b/package/apache/apache.mk index 3efa6b0ac1..1b095c5eb1 100644 --- a/package/apache/apache.mk +++ b/package/apache/apache.mk @@ -4,9 +4,9 @@ # ################################################################################ -APACHE_VERSION = 2.4.58 +APACHE_VERSION = 2.4.59 APACHE_SOURCE = httpd-$(APACHE_VERSION).tar.bz2 -APACHE_SITE = https://downloads.apache.org/httpd +APACHE_SITE = https://dlcdn.apache.org/httpd APACHE_LICENSE = Apache-2.0 APACHE_LICENSE_FILES = LICENSE APACHE_CPE_ID_VENDOR = apache From b788c8cd0ae3a36d9f1cc3cd325b5e0e6d38f977 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 4 Apr 2024 17:34:36 +0200 Subject: [PATCH 5475/5754] package/tiff: explicitly disable lerc support for host and target We do not have liblerc in Buildroot and it may cause linking issues for host-tiff on build hosts with liblerc: libtool: link: /usr/bin/gcc -O2 -I/home/dragon/src/ft/ftcommunity-TXT/output/build/rootfs/per-package/host-tiff/host/include -Wall -W -Wl,-rpath -Wl,/home/dragon/src/ft/ftcommunity-TXT/output/build/rootfs/per-package/host-tiff/host/lib -o tiffcp tiffcp.o -L/home/dragon/src/ft/ftcommunity-TXT/output/build/rootfs/per-package/host-tiff/host/lib ../libtiff/.libs/libtiff.so ../port/.libs/libport.a -lLerc -ljbig -lm -Wl,-rpath -Wl,/home/dragon/src/ft/ftcommunity-TXT/output/build/rootfs/build/host-tiff-4.6.0/libtiff/.libs -Wl,-rpath -Wl,/home/dragon/src/ft/ftcommunity-TXT/output/build/rootfs/per-package/host-tiff/host/lib /usr/bin/ld: ../libtiff/.libs/libtiff.so: undefined reference to `deflateInit_' /usr/bin/ld: ../libtiff/.libs/libtiff.so: undefined reference to `deflate' /usr/bin/ld: ../libtiff/.libs/libtiff.so: undefined reference to `deflateEnd' /usr/bin/ld: ../libtiff/.libs/libtiff.so: undefined reference to `inflate' Signed-off-by: Peter Korsgaard (cherry picked from commit a4011ec1e13baa1190a41d949ad2cd945a9ecbe2) Signed-off-by: Peter Korsgaard --- package/tiff/tiff.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk index e384e8b814..8ec53d4fe1 100644 --- a/package/tiff/tiff.mk +++ b/package/tiff/tiff.mk @@ -16,6 +16,7 @@ TIFF_INSTALL_STAGING = YES # support in tiff, or that would create a circular dependency. TIFF_CONF_OPTS = \ --disable-contrib \ + --disable-lerc \ --disable-tests \ --disable-webp @@ -24,6 +25,7 @@ TIFF_DEPENDENCIES = host-pkgconf HOST_TIFF_CONF_OPTS = \ --disable-cxx \ --disable-zlib \ + --disable-lerc \ --disable-libdeflate \ --disable-lzma \ --disable-jpeg \ From 02ff38a44ac38b98ce7b15dedd7af82d1315ca90 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 4 Apr 2024 17:34:37 +0200 Subject: [PATCH 5476/5754] package/tiff: explicitly disable jbig support for host and target BR2_PACKAGE_TIFF_JBIG did actually not do anything, as no explicit --enable-jbig was passed to configure and there is no libjbig in Buildroot, so drop it and instead explicitly disable jbig support. Also add --disable-jbig for the host build, which was missed when host support was added in commit 91b16fbbf9db (tiff: add host variant). As the TIFF_JBIG option was a noop, do not add legacy handling for it. Signed-off-by: Peter Korsgaard (cherry picked from commit a7d491b0ffc5c0876053cc94c4112e73096aa5c2) Signed-off-by: Peter Korsgaard --- package/tiff/Config.in | 4 ---- package/tiff/tiff.mk | 6 ++---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/package/tiff/Config.in b/package/tiff/Config.in index d1004d6668..d357d08406 100644 --- a/package/tiff/Config.in +++ b/package/tiff/Config.in @@ -63,10 +63,6 @@ config BR2_PACKAGE_TIFF_OLD_JPEG bool "Old JPEG decompression" default y -config BR2_PACKAGE_TIFF_JBIG - bool "JBIG compression" - default y - config BR2_PACKAGE_TIFF_UTILITIES bool "tiff utilities" help diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk index 8ec53d4fe1..0e5e0dd48a 100644 --- a/package/tiff/tiff.mk +++ b/package/tiff/tiff.mk @@ -17,6 +17,7 @@ TIFF_INSTALL_STAGING = YES TIFF_CONF_OPTS = \ --disable-contrib \ --disable-lerc \ + --disable-jbig \ --disable-tests \ --disable-webp @@ -28,6 +29,7 @@ HOST_TIFF_CONF_OPTS = \ --disable-lerc \ --disable-libdeflate \ --disable-lzma \ + --disable-jbig \ --disable-jpeg \ --disable-tests \ --disable-webp \ @@ -101,10 +103,6 @@ ifneq ($(BR2_PACKAGE_TIFF_OLD_JPEG),y) TIFF_CONF_OPTS += --disable-old-jpeg endif -ifneq ($(BR2_PACKAGE_TIFF_JBIG),y) -TIFF_CONF_OPTS += --disable-jbig -endif - ifeq ($(BR2_PACKAGE_TIFF_UTILITIES),y) TIFF_CONF_OPTS += --enable-tools else From fe8897edff7da06e71eb7abddd96aa69b30a4071 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 7 Apr 2024 11:34:07 +0200 Subject: [PATCH 5477/5754] package/gdb: bump 14.x series from 14.1 to 14.2 According to https://www.sourceware.org/gdb/: This is a minor corrective release over GDB 14.1, fixing the following issues: PR symtab/31112 (DLL export forwarding is broken) PR c++/31128 (gdb crashes when trying to print a global variable stub without a running inferior) PR tdep/31254 ([gdb/tdep, arm] FAIL: gdb.threads/staticthreads.exp: up 10) PR gdb/31256 (Crash with basic 'list .') PR python/31366 (Frame.static_link() segfaults) Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN (cherry picked from commit bfefed17a9e5a421b3217685003d3b22c99de4ab) Signed-off-by: Peter Korsgaard --- package/gdb/Config.in.host | 2 +- package/gdb/gdb.hash | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host index 891e45948e..53706cd3ee 100644 --- a/package/gdb/Config.in.host +++ b/package/gdb/Config.in.host @@ -67,5 +67,5 @@ config BR2_GDB_VERSION default "13.2" if BR2_GDB_VERSION_13 || !BR2_PACKAGE_HOST_GDB # When making 14.x the default, or 14.x becomes the oldest version, # be sure to update the target variant to properly select mpfr. - default "14.1" if BR2_GDB_VERSION_14 + default "14.2" if BR2_GDB_VERSION_14 depends on BR2_PACKAGE_GDB || BR2_PACKAGE_HOST_GDB diff --git a/package/gdb/gdb.hash b/package/gdb/gdb.hash index c62da28cbf..144f6da296 100644 --- a/package/gdb/gdb.hash +++ b/package/gdb/gdb.hash @@ -3,7 +3,7 @@ sha512 3653762ac008e065c37cd641653184c9ff7ce51ee2222ade1122bec9d6cc64dffd4fb748 sha512 07e9026423438049b11f4f784d57401ece4e940570f613bd6958b3714fe7fbc2c048470bcce3e7d7d9f93331cdf3881d30dcc964cb113a071143a02b28e5b127 gdb-11.2.tar.xz sha512 425568d2e84672177d0fb87b1ad7daafdde097648d605e30cf0656970f66adc6a82ca2d83375ea4be583e9683a340e5bfdf5819668ddf66728200141ae50ff2d gdb-12.1.tar.xz sha512 8185d3e11ab60dafff5860a5016577bfe7dd7547ef01ebc867bc247603d82b74ff74c4f29492c7d2aee57076f52be33e289f4c6b414a4b870d4b3004909f4c34 gdb-13.2.tar.xz -sha512 575e198105076fc4a88f68591aa114ab9c1196e84386a3f7b9b58fe5f30cdeed33f6a5f957b68f08c47284ec922bb60c964627e238471419673fd913575ce427 gdb-14.1.tar.xz +sha512 7e07941f1fe661288cc571b4964012ceabc1760624fce20320db2f470c01439b2386f859b5288da13204b758e2e3b22a74c68c012178db93b9529b06f1e22ede gdb-14.2.tar.xz # Locally calculated (fetched from Github) sha512 3518b47d5c11d1fb478ee152bde1719363f9391db73f3b9f5491217c17742bef8ebca6a51a40302dfaa9476c5a32a8b8f70a4bf64289422dea5f750ae53ab88d gdb-arc-2023.09-release.tar.gz From f9ea43199dfbdcf654349e5675692d1b7059f115 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 24 Feb 2024 12:59:22 +0100 Subject: [PATCH 5478/5754] package/cmake: bump version to 3.28.3 Release notes: https://www.kitware.com/cmake-3-28-3-available-for-download/ https://www.kitware.com/cmake-3-28-2-available-for-download/ Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (cherry picked from commit 529c47862e0dfc369605824716759cbbd1f0f87b) Signed-off-by: Peter Korsgaard --- 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 51fff6c3ef..74b4a0a3a8 100644 --- a/package/cmake/cmake.hash +++ b/package/cmake/cmake.hash @@ -1,5 +1,5 @@ -# From https://cmake.org/files/v3.28/cmake-3.28.1-SHA-256.txt -sha256 15e94f83e647f7d620a140a7a5da76349fc47a1bfed66d0f5cdee8e7344079ad cmake-3.28.1.tar.gz +# From https://cmake.org/files/v3.28/cmake-3.28.3-SHA-256.txt +sha256 72b7570e5c8593de6ac4ab433b73eab18c5fb328880460c86ce32608141ad5c1 cmake-3.28.3.tar.gz # Locally calculated sha256 4a01ccf2dc580ba570d02bc015bbe0ec92f1f318717aae9540ba841ba7946756 Copyright.txt diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk index 23d00b95c5..49d1f9fea5 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.28 -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 a22a40a1dc7a459e0f8a503aae182f2c50791f05 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 25 Feb 2024 10:24:25 +0100 Subject: [PATCH 5479/5754] package/gdal: add openssl optional dependency Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (cherry picked from commit d2f59ef0c4ae67827f62933a8db51eb0e2043b24) Signed-off-by: Peter Korsgaard --- package/gdal/gdal.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/gdal/gdal.mk b/package/gdal/gdal.mk index 247e13663c..77ffb514c2 100644 --- a/package/gdal/gdal.mk +++ b/package/gdal/gdal.mk @@ -46,7 +46,6 @@ GDAL_CONF_OPTS = \ -DGDAL_USE_BLOSC=OFF \ -DGDAL_USE_BRUNSLI=OFF \ -DGDAL_USE_CFITSIO=OFF \ - -DGDAL_USE_OPENSSL=OFF \ -DGDAL_USE_CRYPTOPP=OFF \ -DGDAL_USE_CRNLIB=OFF \ -DGDAL_USE_ECW=OFF \ @@ -130,6 +129,13 @@ else GDAL_CONF_OPTS += -DENABLE_DEFLATE64=OFF endif +ifeq ($(BR2_PACKAGE_OPENSSL),y) +GDAL_DEPENDENCIES += openssl +GDAL_CONF_OPTS += -DGDAL_USE_OPENSSL=ON +else +GDAL_CONF_OPTS += -DGDAL_USE_OPENSSL=OFF +endif + ifeq ($(BR2_PACKAGE_POSTGRESQL),y) GDAL_DEPENDENCIES += postgresql GDAL_CONF_OPTS += -DGDAL_USE_POSTGRESQL=ON From 762717fdcfc56664f5b4ff183d2faf90006f4337 Mon Sep 17 00:00:00 2001 From: Nisarg Jhaveri Date: Thu, 29 Feb 2024 10:52:36 +0530 Subject: [PATCH 5480/5754] package/brcmfmac_sdio-firmware-rpi: bump version to 26ff205 The current version is more than 2 years old. Update to the latest. This fixes runtime issues with the newer kernel used in our defconfigs since commit 13ba668a2da3a0dcb386578ce15b00a444101dbe. License file changed name from LICENCE to LICENSE but is otherwise unchanged. There is a new directory "synaptics", install this one as well. A lot of the files are symlinks. "install" creates copies for these, which consumes a lot of unnecessary space. Instead of individually restoring the links, using `cp --remove-destination --no-dereference` and `chmod` instead of `install`. Fixes: 13ba668a2da3a0dcb386578ce15b00a444101dbe Signed-off-by: Nisarg Jhaveri [Arnout: correct license file name] Signed-off-by: Arnout Vandecappelle (cherry picked from commit ab2410053770b92ec1ee12d9da271b432053c38c) Signed-off-by: Peter Korsgaard --- .../brcmfmac_sdio-firmware-rpi.hash | 4 +-- .../brcmfmac_sdio-firmware-rpi.mk | 27 +++++++------------ 2 files changed, 12 insertions(+), 19 deletions(-) diff --git a/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.hash b/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.hash index a12e92cbac..c20abfc26c 100644 --- a/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.hash +++ b/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e51b717c2a60ca29fcdd8e04e07c00996226cb48fa56a8ad1934b5f4ddee2e3d brcmfmac_sdio-firmware-rpi-ea9963f3f77b4bb6cd280577eb115152bdd67e8d.tar.gz -sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx +sha256 2f0917b104739455dd488dd8f5af2ee4430801a7ac8fe8d9866e74bfbb185356 brcmfmac_sdio-firmware-rpi-26ff205b45dc109b498a70aaf182804ad9dbfea5.tar.gz +sha256 ea8b7b7b6cfc6fd30587ed977100f6a542734ce53218b5b63de16180acddd599 LICENSE diff --git a/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk b/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk index 5332bf53d7..95707487a9 100644 --- a/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk +++ b/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk @@ -4,33 +4,26 @@ # ################################################################################ -BRCMFMAC_SDIO_FIRMWARE_RPI_VERSION = ea9963f3f77b4bb6cd280577eb115152bdd67e8d +BRCMFMAC_SDIO_FIRMWARE_RPI_VERSION = 26ff205b45dc109b498a70aaf182804ad9dbfea5 BRCMFMAC_SDIO_FIRMWARE_RPI_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(BRCMFMAC_SDIO_FIRMWARE_RPI_VERSION)) BRCMFMAC_SDIO_FIRMWARE_RPI_LICENSE = PROPRIETARY -BRCMFMAC_SDIO_FIRMWARE_RPI_LICENSE_FILES = LICENCE.broadcom_bcm43xx +BRCMFMAC_SDIO_FIRMWARE_RPI_LICENSE_FILES = LICENSE ifeq ($(BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT),y) define BRCMFMAC_SDIO_FIRMWARE_RPI_INSTALL_TARGET_BT - $(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm - $(INSTALL) -m 0644 $(@D)/firmware/brcm/*.hcd $(TARGET_DIR)/lib/firmware/brcm + $(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm $(TARGET_DIR)/lib/firmware/synaptics + cp --remove-destination --no-dereference $(@D)/firmware/brcm/*.hcd $(TARGET_DIR)/lib/firmware/brcm + cp --remove-destination --no-dereference $(@D)/firmware/synaptics/*.hcd $(TARGET_DIR)/lib/firmware/synaptics + chmod 644 $(TARGET_DIR)/lib/firmware/brcm/*.hcd $(TARGET_DIR)/lib/firmware/synaptics/*.hcd endef endif ifeq ($(BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI),y) define BRCMFMAC_SDIO_FIRMWARE_RPI_INSTALL_TARGET_WIFI - $(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm - $(INSTALL) -m 0644 $(@D)/firmware/brcm/brcmfmac* $(TARGET_DIR)/lib/firmware/brcm - ln -sf ../cypress/cyfmac43430-sdio.bin $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43430-sdio.bin - ln -sf ../cypress/cyfmac43430-sdio.clm_blob $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43430-sdio.clm_blob - ln -sf brcmfmac43430-sdio.txt $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt - ln -sf brcmfmac43430-sdio.txt $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43430-sdio.raspberrypi,model-zero-w.txt - ln -sf ../cypress/cyfmac43455-sdio.bin $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43455-sdio.bin - ln -sf ../cypress/cyfmac43455-sdio.clm_blob $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43455-sdio.clm_blob - ln -sf brcmfmac43455-sdio.txt $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.txt - ln -sf brcmfmac43455-sdio.txt $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt - ln -sf brcmfmac43455-sdio.txt $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt - $(INSTALL) -d $(TARGET_DIR)/lib/firmware/cypress - $(INSTALL) -m 0644 $(@D)/firmware/cypress/cyfmac* $(TARGET_DIR)/lib/firmware/cypress + $(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm $(TARGET_DIR)/lib/firmware/cypress + cp --remove-destination --no-dereference $(@D)/firmware/brcm/brcmfmac* $(TARGET_DIR)/lib/firmware/brcm + cp --remove-destination --no-dereference $(@D)/firmware/cypress/cyfmac* $(TARGET_DIR)/lib/firmware/cypress + chmod 644 $(TARGET_DIR)/lib/firmware/brcm/brcmfmac* $(TARGET_DIR)/lib/firmware/cypress/cyfmac* endef endif From eb80cd6563320cde6a9f7dd2b820c80d1360d728 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 3 Mar 2024 14:22:22 +0100 Subject: [PATCH 5481/5754] package/google-breakpad: needs C++17 Fix the following build failure raised since commit 32c1fbad554d4c2bfbe56a652333195c8ae67904: configure: error: *** A compiler with support for C++17 language features is required. Fixes: 32c1fbad554d4c2bfbe56a652333195c8ae67904 - http://autobuild.buildroot.org/results/451bae7151a74cbcb5d199b8516e9c255a0953fe Signed-off-by: Fabrice Fontaine [Arnout: also update BR2_GOOGLE_BREAKPAD_ENABLE] Signed-off-by: Arnout Vandecappelle (cherry picked from commit 109362c90418d9595e3bab0c9ab6d1c8a24f01db) Signed-off-by: Peter Korsgaard --- Config.in | 2 +- package/google-breakpad/Config.in | 6 +++--- package/sentry-native/Config.in | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Config.in b/Config.in index 113adf0755..e4f58f3f66 100644 --- a/Config.in +++ b/Config.in @@ -586,7 +586,7 @@ config BR2_ENABLE_LTO config BR2_GOOGLE_BREAKPAD_ENABLE bool "Enable google-breakpad support" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_USES_GLIBC diff --git a/package/google-breakpad/Config.in b/package/google-breakpad/Config.in index 5c7f4bb7ba..4e2d98eb04 100644 --- a/package/google-breakpad/Config.in +++ b/package/google-breakpad/Config.in @@ -6,7 +6,7 @@ config BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS config BR2_PACKAGE_GOOGLE_BREAKPAD bool "google-breakpad" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_USES_GLIBC @@ -45,10 +45,10 @@ config BR2_PACKAGE_GOOGLE_BREAKPAD_TOOLS endif -comment "google-breakpad requires a glibc toolchain w/ wchar, thread, C++, gcc >= 4.8" +comment "google-breakpad requires a glibc toolchain w/ wchar, threads, C++, gcc >= 7" depends on BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS depends on BR2_PACKAGE_HOST_GOOGLE_BREAKPAD_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_USES_GLIBC || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + !BR2_TOOLCHAIN_GCC_AT_LEAST_7 diff --git a/package/sentry-native/Config.in b/package/sentry-native/Config.in index 7a3cbd36ad..88db2779f1 100644 --- a/package/sentry-native/Config.in +++ b/package/sentry-native/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_SENTRY_NATIVE bool "sentry-native" depends on BR2_INSTALL_LIBSTDCPP # google-breakpad - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # google-breakpad + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # google-breakpad depends on BR2_USE_WCHAR # google-breakpad depends on BR2_TOOLCHAIN_HAS_THREADS # google-breakpad # google-breakpad is restricted to glibc or uClibc, but @@ -19,10 +19,10 @@ config BR2_PACKAGE_SENTRY_NATIVE https://github.com/getsentry/sentry-native -comment "sentry-native needs a glibc toolchain with w/ wchar, thread, C++, gcc >= 4.8" +comment "sentry-native needs a glibc toolchain with w/ wchar, threads, C++, gcc >= 7" depends on BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS depends on BR2_PACKAGE_HOST_GOOGLE_BREAKPAD_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_USES_GLIBC || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + !BR2_TOOLCHAIN_GCC_AT_LEAST_7 From 3b0771d4d5834eb39af313e065efd4623ec3f338 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 7 Apr 2024 15:59:51 +0200 Subject: [PATCH 5482/5754] package/oatpp: disable tests Fix the following build failure raised since the addition of the package in commit d5bba26801b352f591451cf73e0b7509de0e6850: [100%] Linking CXX executable oatppAllTests /home/buildroot/instance-0/output-1/per-package/oatpp/host/opt/ext-toolchain/m68k-buildroot-uclinux-uclibc/bin/ld.real: cannot find -latomic: No such file or directory Fixes: d5bba26801b352f591451cf73e0b7509de0e6850 - http://autobuild.buildroot.org/results/1587b391baecdbb5a24a0c0b2c33d63cb71a2f7f Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 0af98ea2d889dd63bc6934236a625732ce28b059) Signed-off-by: Peter Korsgaard --- package/oatpp/oatpp.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/oatpp/oatpp.mk b/package/oatpp/oatpp.mk index c8b0c9694a..d3f6e1a9c2 100644 --- a/package/oatpp/oatpp.mk +++ b/package/oatpp/oatpp.mk @@ -8,7 +8,7 @@ OATPP_VERSION = 1.3.0 OATPP_SITE = $(call github,oatpp,oatpp,$(OATPP_VERSION)) OATPP_LICENSE = Apache-2.0 OATPP_LICENSE_FILES = LICENSE -OATPP_CONF_OPTS = -DBUILD_SHARED_LIBS=OFF +OATPP_CONF_OPTS = -DBUILD_SHARED_LIBS=OFF -DOATPP_BUILD_TESTS=OFF OATPP_INSTALL_STAGING = YES # Only builds a static lib and headers OATPP_INSTALL_TARGET = NO From 344bcb651b944105cea6b5c3b7c442a1f135f9f2 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 3 Mar 2024 18:38:51 +0100 Subject: [PATCH 5483/5754] package/libtracefs: fix musl build Fix the following musl build failure raised since the addition of the package in commit b1dbd3f679e6660325472e3fdca72127d74e6929 if cunit is found: ../utest/tracefs-utest.c: In function 'test_uprobes_instance': ../utest/tracefs-utest.c:2492:19: error: 'PATH_MAX' undeclared (first use in this function) 2492 | char self[PATH_MAX] = { 0 }; | ^~~~~~~~ Fixes: b1dbd3f679e6660325472e3fdca72127d74e6929 - http://autobuild.buildroot.org/results/1a01883231dbc8a7688de26db9a08751165fe8fe Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (cherry picked from commit dece32b6f3957320bcb689394164151dd8707f3b) Signed-off-by: Peter Korsgaard --- ...ATH_MAX-if-it-is-not-already-defined.patch | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 package/libtracefs/0002-libtracefs-utest-Add-PATH_MAX-if-it-is-not-already-defined.patch diff --git a/package/libtracefs/0002-libtracefs-utest-Add-PATH_MAX-if-it-is-not-already-defined.patch b/package/libtracefs/0002-libtracefs-utest-Add-PATH_MAX-if-it-is-not-already-defined.patch new file mode 100644 index 0000000000..121fee5adf --- /dev/null +++ b/package/libtracefs/0002-libtracefs-utest-Add-PATH_MAX-if-it-is-not-already-defined.patch @@ -0,0 +1,40 @@ +From ba750812f68f0f3314494558496c23f934f8faff Mon Sep 17 00:00:00 2001 +From: "Steven Rostedt (Google)" +Date: Thu, 22 Feb 2024 11:02:46 -0500 +Subject: libtracefs utest: Add PATH_MAX if it is not already defined + +In some setups PATH_MAX may not be defined (it is usually defined in +linux/limits.h), but we just use PATH_MAX as something to hold the paths +to the tracing files. In that case, just define it to 1024 if it's not +already defined. + +Link: https://lore.kernel.org/linux-trace-devel/20240222-utest-fixes-v2-1-7b8ee8dca0b7@gmail.com/ + +Fixes: 845f16976929 ("libtracefs: Add unit tests") +Reported-by: Miko Larsson +Signed-off-by: Steven Rostedt (Google) + +Upstream: https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/commit/?id=ba750812f68f0f3314494558496c23f934f8faff +Signed-off-by: Fabrice Fontaine +--- + utest/tracefs-utest.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/utest/tracefs-utest.c b/utest/tracefs-utest.c +index 963fac7..07ecd32 100644 +--- a/utest/tracefs-utest.c ++++ b/utest/tracefs-utest.c +@@ -26,6 +26,10 @@ + + #define gettid() syscall(__NR_gettid) + ++#ifndef PATH_MAX ++#define PATH_MAX 1024 ++#endif ++ + #define TRACEFS_SUITE "tracefs library" + #define TEST_INSTANCE_NAME "cunit_test_iter" + #define TEST_TRACE_DIR "/tmp/trace_utest.XXXXXX" +-- +cgit 1.2.3-korg + From 81deca8719c0fd5cd707df040dee7c525106c5ed Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 1 Mar 2024 22:37:22 +0100 Subject: [PATCH 5484/5754] package/tcf-agent: fix x86 build Fix the following x86 build failure raised since bump to version 1.8.0 in commit 81802e263a12e173e0e1028449d1e1e11b2e5974 and https://gitlab.eclipse.org/eclipse/tcf/tcf.agent/-/commit/8df5540c53b862d516ac25f908c2fff4a547b4a6: /home/buildroot/autobuild/run/instance-1/output-1/build/tcf-agent-1.8.0/agent/tcf/services/tcf_elf.c: In function 'unpack_elf_symbol_info': /home/buildroot/autobuild/run/instance-1/output-1/build/tcf-agent-1.8.0/agent/tcf/services/tcf_elf.c:2079:27: error: 'STT_ARM_16BIT' undeclared (first use in this function) 2079 | if (info->type == STT_ARM_16BIT) { | ^~~~~~~~~~~~~ /home/buildroot/autobuild/run/instance-1/output-1/build/tcf-agent-1.8.0/agent/tcf/services/tcf_elf.c:2079:27: note: each undeclared identifier is reported only once for each function it appears in /home/buildroot/autobuild/run/instance-1/output-1/build/tcf-agent-1.8.0/agent/tcf/services/tcf_elf.c: In function 'create_symbol_addr_search_index': /home/buildroot/autobuild/run/instance-1/output-1/build/tcf-agent-1.8.0/agent/tcf/services/tcf_elf.c:2228:78: error: 'STT_ARM_16BIT' undeclared (first use in this function) 2228 | if (type == STT_FUNC || type == STT_ARM_TFUNC || type == STT_ARM_16BIT) { | ^~~~~~~~~~~~~ Fixes: 81802e263a12e173e0e1028449d1e1e11b2e5974 - http://autobuild.buildroot.org/results/8388acf59689ed7e621bdf158483e3df1cf9bef7 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (cherry picked from commit dd595d3b06a355f58efcc547ff1f001dd55c99c6) Signed-off-by: Peter Korsgaard --- ...tcf-services-tcf_elf.c-fix-x86-build.patch | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 package/tcf-agent/0001-agent-tcf-services-tcf_elf.c-fix-x86-build.patch diff --git a/package/tcf-agent/0001-agent-tcf-services-tcf_elf.c-fix-x86-build.patch b/package/tcf-agent/0001-agent-tcf-services-tcf_elf.c-fix-x86-build.patch new file mode 100644 index 0000000000..5f08fa485e --- /dev/null +++ b/package/tcf-agent/0001-agent-tcf-services-tcf_elf.c-fix-x86-build.patch @@ -0,0 +1,60 @@ +From 0a847ca035113540ee44d17f364bf4701fe78355 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 1 Mar 2024 22:31:05 +0100 +Subject: [PATCH] agent/tcf/services/tcf_elf.c: fix x86 build + +Fix the following x86 build failure raised since version 1.8.0 and +https://gitlab.eclipse.org/eclipse/tcf/tcf.agent/-/commit/8df5540c53b862d516ac25f908c2fff4a547b4a6: + +/home/buildroot/autobuild/run/instance-1/output-1/build/tcf-agent-1.8.0/agent/tcf/services/tcf_elf.c: In function 'unpack_elf_symbol_info': +/home/buildroot/autobuild/run/instance-1/output-1/build/tcf-agent-1.8.0/agent/tcf/services/tcf_elf.c:2079:27: error: 'STT_ARM_16BIT' undeclared (first use in this function) + 2079 | if (info->type == STT_ARM_16BIT) { + | ^~~~~~~~~~~~~ +/home/buildroot/autobuild/run/instance-1/output-1/build/tcf-agent-1.8.0/agent/tcf/services/tcf_elf.c:2079:27: note: each undeclared identifier is reported only once for each function it appears in +/home/buildroot/autobuild/run/instance-1/output-1/build/tcf-agent-1.8.0/agent/tcf/services/tcf_elf.c: In function 'create_symbol_addr_search_index': +/home/buildroot/autobuild/run/instance-1/output-1/build/tcf-agent-1.8.0/agent/tcf/services/tcf_elf.c:2228:78: error: 'STT_ARM_16BIT' undeclared (first use in this function) + 2228 | if (type == STT_FUNC || type == STT_ARM_TFUNC || type == STT_ARM_16BIT) { + | ^~~~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/8388acf59689ed7e621bdf158483e3df1cf9bef7 + +Signed-off-by: Fabrice Fontaine +Upstream: https://gitlab.eclipse.org/eclipse/tcf/tcf.agent/-/merge_requests/1 +--- + agent/tcf/services/tcf_elf.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/agent/tcf/services/tcf_elf.c b/agent/tcf/services/tcf_elf.c +index 1b3900ec..b0b948e4 100644 +--- a/agent/tcf/services/tcf_elf.c ++++ b/agent/tcf/services/tcf_elf.c +@@ -2076,10 +2076,12 @@ void unpack_elf_symbol_info(ELF_Section * sym_sec, U4_T index, ELF_SymbolInfo * + } + + if (file->machine == EM_ARM) { ++#ifdef STT_ARM_16BIT + if (info->type == STT_ARM_16BIT) { + info->type = STT_OBJECT; + info->type16bit = 1; + } ++#endif + if (info->type == STT_ARM_TFUNC) { + info->type = STT_FUNC; + info->type16bit = 1; +@@ -2225,7 +2227,11 @@ static void create_symbol_addr_search_index(ELF_Section * sec) { + } + add = add && type != STT_GNU_IFUNC; + if (add && file->machine == EM_ARM) { +- if (type == STT_FUNC || type == STT_ARM_TFUNC || type == STT_ARM_16BIT) { ++ if (type == STT_FUNC || type == STT_ARM_TFUNC ++#ifdef STT_ARM_16BIT ++ || type == STT_ARM_16BIT ++#endif ++ ) { + addr = addr & ~(U8_T)1; + } + } +-- +2.43.0 + From 59c153dbcd0b47e35f65dc911ee2bfb1bca0b895 Mon Sep 17 00:00:00 2001 From: Sen Hastings Date: Sun, 25 Feb 2024 14:05:44 -0800 Subject: [PATCH 5485/5754] support/scripts/pkg-stats: fix bug when sorting by hashfile Because the div_class variable was not reassigned a value, cells in the latest_version column were still being assigned hash_file classes and so were being picked up as elements in the hash_file sort. This lead to execessive grid gap elements stacking up and creating huge blank spaces at the top of the page. This is very noticable on pages with a large number of packages, like the ones the autobuilder creates. original behaviour(click the "Hash file" column label twice): http://autobuild.buildroot.org/stats/master.html demo of fixed behaviour: https://sen-h.codeberg.page/pkg-stats-demos/@pages/fix-bug-when-sorting-by-hash-file.html Signed-off-by: Sen Hastings Signed-off-by: Arnout Vandecappelle (cherry picked from commit 6e3d79f52ef0e1b2b6fe1e660820cabdca6179c2) Signed-off-by: Peter Korsgaard --- support/scripts/pkg-stats | 1 + 1 file changed, 1 insertion(+) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index 53898a36f2..3295eb7a48 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -977,6 +977,7 @@ def dump_html_pkg(f, pkg): # Latest version data_field_id = f'latest_version__{pkg_css_class}' + div_class = ["centered"] div_class.append(f'_{pkg_css_class}') div_class.append("latest_version data") if pkg.latest_version['status'] == RM_API_STATUS_ERROR: From 7a5eda5009b13bd434521436f9a3fa68d25e29b2 Mon Sep 17 00:00:00 2001 From: Sen Hastings Date: Tue, 5 Mar 2024 01:33:34 -0800 Subject: [PATCH 5486/5754] support/scripts/pkg-stats: fix/improve git hash sorting sortGrid()'s handling of git hashes and other large hex numbers has been inconsistent, they can be detected as strings or numbers depending on what type of character they start with. This patch fixes the behaviour by using a regex to capture everything that looks like a big hex number and treat it as a string. This means when you sort by current version ascending all the version strings with big hex numbers should show up first, sorted 0-9,a-f. First we check for a string length >= 39, and then apply a regex to return an array with every char from that string that matched the regex. If the length of this array is still >= 39 we can assume we are looking at something containing a git hash. The reason why the length is defined as ">= 39" and not "40" or "39 or 40" is twofold: Firstly, 39 was chosen as a minimum to match stuff with 39 char git hashes, like the rockchip-mali package. Secondly, there is no max because we actually want to catch not just explicitly git hashes, but any verson string with big gnarly hex numbers in it. Stuff like: "1.4.2-168-ged3039cdbeeb28fc0011c3585d8f7dfb91038292" Why? Well, the idea is less about git hashes and sorting and more about grouping similarly formatted version strings. It would be impossble (or at least annoyingly complicated) and of dubious utility to get a real sequential sort out of the current version column, so the attempt here is to at the very least collect all the similarly formatted things together. This isn't perfect, but it's a (arguably) more useful sorted output than before. A demo is available here: https://sen-h.codeberg.page/pkg-stats-demos/@pages/fix-improve-git-hash-sorting.html Signed-off-by: Sen Hastings Signed-off-by: Arnout Vandecappelle (cherry picked from commit ce7363524c172e65571e4b5d76ef65a36f7c3020) Signed-off-by: Peter Korsgaard --- support/scripts/pkg-stats | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index 3295eb7a48..4dc1857a9e 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -741,6 +741,7 @@ addedCSSRules.forEach(rule => styleSheet.insertRule(rule)); function sortGrid(sortLabel){ let i = 0; let pkgSortArray = [], sortedPkgArray = [], pkgStringSortArray = [], pkgNumSortArray = []; + const git_hash_regex = /[a-f,0-9]/gi; const columnValues = Array.from(document.getElementsByClassName(sortLabel)); const columnName = document.getElementById(sortLabel); let lastStyle = document.getElementById("sort-css"); @@ -765,7 +766,9 @@ function sortGrid(sortLabel){ pkgSortArray.push(sortArr); }); pkgSortArray.forEach((listing) => { - if ( isNaN(parseInt(listing[1], 10)) ){ + if ( listing[1].length >= 39 && listing[1].match(git_hash_regex).length >= 39){ + pkgStringSortArray.push(listing); + } else if ( isNaN(parseInt(listing[1], 10)) ){ pkgStringSortArray.push(listing); } else { listing[1] = parseFloat(listing[1]); From e5c204820dcfec70e15ae904f7c629eecc732127 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 5 Mar 2024 12:11:34 +0100 Subject: [PATCH 5487/5754] package/dmenu-wayland: fix uclibc build Set -std=gnu99 to fix the following uclibc build failure raised since the addition of the package in commit 2f6b1b8e6893003efcc72185cd468dcb0b088b2d: ../draw.c:37:23: error: 'CLOCK_REALTIME' undeclared (first use in this function) 37 | clock_gettime(CLOCK_REALTIME, &ts); | ^~~~~~~~~~~~~~ Fixes: 2f6b1b8e6893003efcc72185cd468dcb0b088b2d - http://autobuild.buildroot.org/results/4b9db67fb444ec35d741e5d3e74263ac0c4d4a7d Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (cherry picked from commit 46bb598f1a67ed2bf7acef8b17ea09ee0f425d8e) Signed-off-by: Peter Korsgaard --- package/dmenu-wayland/dmenu-wayland.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/dmenu-wayland/dmenu-wayland.mk b/package/dmenu-wayland/dmenu-wayland.mk index 33a73c0153..fec984194c 100644 --- a/package/dmenu-wayland/dmenu-wayland.mk +++ b/package/dmenu-wayland/dmenu-wayland.mk @@ -8,6 +8,7 @@ DMENU_WAYLAND_VERSION = a380201dff5bfac2dace553d7eaedb6cea6855f9 DMENU_WAYLAND_SITE = $(call github,nyyManni,dmenu-wayland,$(DMENU_WAYLAND_VERSION)) DMENU_WAYLAND_LICENSE = MIT DMENU_WAYLAND_LICENSE_FILES = LICENSE +DMENU_WAYLAND_CFLAGS = $(TARGET_CFLAGS) -std=gnu99 # host-wayland is for wayland-scanner DMENU_WAYLAND_DEPENDENCIES = \ From 3710b671cad96d81c85d91f2384b6c6f6280a507 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 6 Mar 2024 10:19:30 +0100 Subject: [PATCH 5488/5754] package/dmraid: fix musl build dmraid is a very old package from 2010 with an awkward configure script which doesn't honor CFLAGS: ac_cv_env_CFLAGS_set=set ac_cv_env_CFLAGS_value='-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 ' [...] ## ----------------- ## ## Output variables. ## ## ----------------- ## AWK='gawk' CC='/home/autobuild/autobuild/instance-3/output-1/host/bin/sh4a-buildroot-linux-musl-gcc' CFLAGS='-O2' resulting in the following build failure with musl >= 1.2.4 and https://github.com/bminor/musl/commit/25e6fee27f4a293728dd15b659170e7b9c7db9bc because _LARGEFILE64_SOURCE is not set: /home/autobuild/autobuild/instance-3/output-1/host/lib/gcc/sh4a-buildroot-linux-musl/12.3.0/../../../../sh4a-buildroot-linux-musl/bin/ld: misc/file.o: in function `rw_file': file.c:(.text+0x150): undefined reference to `lseek64' To fix this issue, pass TARGET_CONFIGURE_OPTS through DMRAID_MAKE_OPTS Fixes: - http://autobuild.buildroot.org/results/5c7c82959ce92db908d3ca20e2c1137509c2f981 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (cherry picked from commit de6415ad9c35b2013af1f1821bcac12ba3959674) Signed-off-by: Peter Korsgaard --- package/dmraid/dmraid.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/dmraid/dmraid.mk b/package/dmraid/dmraid.mk index 0382cd4d99..9a78c2ae07 100644 --- a/package/dmraid/dmraid.mk +++ b/package/dmraid/dmraid.mk @@ -13,6 +13,7 @@ DMRAID_MAKE = $(MAKE1) DMRAID_INSTALL_STAGING = YES DMRAID_LICENSE = GPL-2.0 DMRAID_LICENSE_FILES = $(DMRAID_SUBDIR)/LICENSE_GPL $(DMRAID_SUBDIR)/LICENSE +DMRAID_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) DMRAID_DEPENDENCIES = lvm2 From bf3225e55137b5c565d37981b6be0348a52a2cd4 Mon Sep 17 00:00:00 2001 From: Andreas Naumann Date: Wed, 6 Mar 2024 12:12:12 +0100 Subject: [PATCH 5489/5754] package/imx-gpu-viv: fix masking fb option Only the 32bit ARM blob provides the framebuffer backend. This is apparently independent of which imx8 derivate is used, so changed the condition for the config option accordingly. Signed-off-by: Andreas Naumann Signed-off-by: Arnout Vandecappelle (cherry picked from commit 47a02a5afcdf5d6a72d203c31dabd5727547057c) Signed-off-by: Peter Korsgaard --- package/freescale-imx/imx-gpu-viv/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/freescale-imx/imx-gpu-viv/Config.in b/package/freescale-imx/imx-gpu-viv/Config.in index 3e095b730c..b8dff8f9ab 100644 --- a/package/freescale-imx/imx-gpu-viv/Config.in +++ b/package/freescale-imx/imx-gpu-viv/Config.in @@ -45,8 +45,8 @@ choice config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_FB bool "Framebuffer" - # The i.MX8 blob doesn't support FB output - depends on !BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M + # The i.MX8 aarch64 blob doesn't support FB output + depends on BR2_arm config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL bool "Wayland" From 6e8ae6b661355bb56368fa8dc7fd9289e6d4d226 Mon Sep 17 00:00:00 2001 From: David Gouarin Date: Wed, 6 Mar 2024 12:37:24 +0100 Subject: [PATCH 5490/5754] package/fmc: enable also for aarch64 QorIQ processors QorIQ processors family also includes LS Series wich are based on aarch64 Signed-off-by: David Gouarin Signed-off-by: Arnout Vandecappelle (cherry picked from commit 2656ca8912e151e874ceb366e6eef0bfe4228ac0) Signed-off-by: Peter Korsgaard --- package/fmc/Config.in | 6 +++--- package/fmlib/Config.in | 10 ++++++++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/package/fmc/Config.in b/package/fmc/Config.in index c89a87c99e..1c6ae5e80a 100644 --- a/package/fmc/Config.in +++ b/package/fmc/Config.in @@ -1,14 +1,14 @@ comment "fmc needs a toolchain w/ C++" - depends on BR2_powerpc_e500mc || BR2_powerpc_e6500 + depends on BR2_powerpc_e500mc || BR2_powerpc_e6500 || BR2_aarch64 depends on !BR2_INSTALL_LIBSTDCPP comment "fmc needs a Linux kernel to be built" - depends on BR2_powerpc_e500mc || BR2_powerpc_e6500 + depends on BR2_powerpc_e500mc || BR2_powerpc_e6500 || BR2_aarch64 depends on !BR2_LINUX_KERNEL config BR2_PACKAGE_FMC bool "fmc" - depends on BR2_powerpc_e500mc || BR2_powerpc_e6500 + depends on BR2_powerpc_e500mc || BR2_powerpc_e6500 || BR2_aarch64 depends on BR2_INSTALL_LIBSTDCPP depends on BR2_LINUX_KERNEL # fmlib select BR2_PACKAGE_TCLAP diff --git a/package/fmlib/Config.in b/package/fmlib/Config.in index 97d55d1250..459d5bf102 100644 --- a/package/fmlib/Config.in +++ b/package/fmlib/Config.in @@ -1,10 +1,10 @@ comment "fmlib needs a Linux kernel to be built" - depends on BR2_powerpc_e500mc || BR2_powerpc_e6500 + depends on BR2_powerpc_e500mc || BR2_powerpc_e6500 || BR2_aarch64 depends on !BR2_LINUX_KERNEL config BR2_PACKAGE_FMLIB bool "fmlib" - depends on BR2_powerpc_e500mc || BR2_powerpc_e6500 + depends on BR2_powerpc_e500mc || BR2_powerpc_e6500 || BR2_aarch64 depends on BR2_LINUX_KERNEL help The Frame Manager library provides Freescale PowerPC platforms @@ -33,6 +33,10 @@ config BR2_FMLIB_QORIQ_FAMILY_T2080 bool "t208x" depends on BR2_powerpc_e6500 +config BR2_FMLIB_QORIQ_FAMILY_ARM + bool "arm" + depends on BR2_aarch64 + endchoice config BR2_PACKAGE_FMLIB_ARCHTYPE @@ -40,11 +44,13 @@ config BR2_PACKAGE_FMLIB_ARCHTYPE default "ppce500mc" if BR2_powerpc_e500mc default "ppc64e6500" if BR2_powerpc_e6500 && BR2_powerpc64 default "ppc32e6500" if BR2_powerpc_e6500 && BR2_powerpc + default "arm" if BR2_aarch64 config BR2_PACKAGE_FMLIB_PLATFORM string default "P4080" if BR2_FMLIB_QORIQ_FAMILY_P4080 default "T4240" if BR2_FMLIB_QORIQ_FAMILY_T4240 default "FMAN_V3H" if BR2_FMLIB_QORIQ_FAMILY_T2080 + default "arm" if BR2_aarch64 endif From 69ab6d066b14036eb8d35db3aa57686f22898a52 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 7 Apr 2024 14:45:50 +0200 Subject: [PATCH 5491/5754] package/perl-net-ssleay: bump to version 1.94 This bump will fix the following build failure with libressl raised since commit 9d8f9c73a2fd087dd2e8d8853a80da605fa64e4b: SSLeay.c: In function 'XS_Net__SSLeay_X509_policy_tree_free': SSLeay.c:17730:9: error: unknown type name 'X509_POLICY_TREE' 17730 | X509_POLICY_TREE * tree = INT2PTR(X509_POLICY_TREE *,SvIV(ST(0))) | ^~~~~~~~~~~~~~~~ https://metacpan.org/dist/Net-SSLeay/changes Fixes: 9d8f9c73a2fd087dd2e8d8853a80da605fa64e4b - http://autobuild.buildroot.org/results/974b7cdd275249c888fc6205f6ca31a3cf28b18f Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (cherry picked from commit 241b18b51e3219a06e19010ec874b3bb681ca110) Signed-off-by: Peter Korsgaard --- package/perl-net-ssleay/perl-net-ssleay.hash | 4 ++-- package/perl-net-ssleay/perl-net-ssleay.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/perl-net-ssleay/perl-net-ssleay.hash b/package/perl-net-ssleay/perl-net-ssleay.hash index 9caff68edd..219edd4e0f 100644 --- a/package/perl-net-ssleay/perl-net-ssleay.hash +++ b/package/perl-net-ssleay/perl-net-ssleay.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 c73821e9790b3bdb3471d9b8faf48bbb Net-SSLeay-1.93_01.tar.gz -sha256 876d022fbc719631b11d6bb4b6e78db3c19bbca578093c376c8f9900a4432aa3 Net-SSLeay-1.93_01.tar.gz +md5 1b22c764e5a094c6261e37a4b1f148ce Net-SSLeay-1.94.tar.gz +sha256 9d7be8a56d1bedda05c425306cc504ba134307e0c09bda4a788c98744ebcd95d Net-SSLeay-1.94.tar.gz # computed by scancpan sha256 685e534b60d4e2b4fbb1a259a83b5a86e877a919bbb9efc95994276f706a3a71 LICENSE diff --git a/package/perl-net-ssleay/perl-net-ssleay.mk b/package/perl-net-ssleay/perl-net-ssleay.mk index 8b7b2b973b..7f58093082 100644 --- a/package/perl-net-ssleay/perl-net-ssleay.mk +++ b/package/perl-net-ssleay/perl-net-ssleay.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_NET_SSLEAY_VERSION = 1.93_01 +PERL_NET_SSLEAY_VERSION = 1.94 PERL_NET_SSLEAY_SOURCE = Net-SSLeay-$(PERL_NET_SSLEAY_VERSION).tar.gz PERL_NET_SSLEAY_SITE = $(BR2_CPAN_MIRROR)/authors/id/C/CH/CHRISN PERL_NET_SSLEAY_DEPENDENCIES = openssl From d3e13a40c4ba96036c59d158403ada64e47c1c68 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 7 Apr 2024 15:16:49 +0200 Subject: [PATCH 5492/5754] package/inih: bump to version 58 This bump will fix the following build failure with gcc 5 raised since bump to version 57 in commit 65c8a9b6626de83365865dea6fff1749466a36aa thanks to https://github.com/benhoyt/inih/commit/4e618f77d4bae216865c5abd972d99b1ba5031e2: In file included from /home/buildroot/autobuild/run/instance-1/output-1/host/opt/ext-toolchain/mips-linux-gnu/include/c++/5.3.0/cstdint:35:0, from ../cpp/INIReader.h:17, from ../cpp/INIReader.cpp:16: /home/buildroot/autobuild/run/instance-1/output-1/host/opt/ext-toolchain/mips-linux-gnu/include/c++/5.3.0/bits/c++0x_warning.h:32:2: error: #error This file requires compiler and library support for the ISO C++ 2011 standard. This support is currently experimental, and must be enabled with the -std=c++11 or -std=gnu++11 compiler options. #error This file requires compiler and library support for the \ ^ https://github.com/benhoyt/inih/releases/tag/r58 Fixes: 65c8a9b6626de83365865dea6fff1749466a36aa - http://autobuild.buildroot.org/results/7a5ba516cde536e103669a0422d336dd8a3b1dbc Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (cherry picked from commit bfa4dd299f1346d5e246a552c491b630c64a6a97) Signed-off-by: Peter Korsgaard --- package/inih/inih.hash | 2 +- package/inih/inih.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/inih/inih.hash b/package/inih/inih.hash index 476b544ce6..f20d7ac0b6 100644 --- a/package/inih/inih.hash +++ b/package/inih/inih.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 f03f98ca35c3adb56b2358573c8d3eda319ccd5287243d691e724b7eafa970b3 inih-57.tar.gz +sha256 e79216260d5dffe809bda840be48ab0eec7737b2bb9f02d2275c1b46344ea7b7 inih-58.tar.gz sha256 9ae3b39e83e9158e44b67733baa3bb2d84e80efdcfb14a5820210a42c7abdf7f LICENSE.txt diff --git a/package/inih/inih.mk b/package/inih/inih.mk index 93032f1ed5..80cde0942b 100644 --- a/package/inih/inih.mk +++ b/package/inih/inih.mk @@ -4,7 +4,7 @@ # ################################################################################ -INIH_VERSION = 57 +INIH_VERSION = 58 INIH_SITE = $(call github,benhoyt,inih,r$(INIH_VERSION)) INIH_INSTALL_STAGING = YES INIH_LICENSE = BSD-3-Clause From a1bb09101e283c53eb0314d6881c7483628df4d8 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 7 Apr 2024 18:13:39 +0200 Subject: [PATCH 5493/5754] package/clamav: fix CLAMAV_LIBS The LIBS environment variable is ignored since bump to version 1.0.1 and switch to cmake build system in commit 203725a46bc6b61ed7e4fdb3d76f62327d3e47fa resulting in the following build failure: /home/buildroot/autobuild/run/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-musleabihf/12.3.0/../../../../arm-buildroot-linux-musleabihf/bin/ld: CMakeFiles/clamonacc.dir/inotif/hash.c.o: in function `onas_ht_add_hierarchy': hash.c:(.text+0xa84): undefined reference to `fts_open' Fixes: 203725a46bc6b61ed7e4fdb3d76f62327d3e47fa - http://autobuild.buildroot.org/results/fe71ab29d02caeed609f1a181fccbd46b6feff65 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (cherry picked from commit b526b2aa1546c42384ba1af21afea1a0f08073d7) Signed-off-by: Peter Korsgaard --- package/clamav/clamav.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/clamav/clamav.mk b/package/clamav/clamav.mk index 7c6dfce6f2..c548897c37 100644 --- a/package/clamav/clamav.mk +++ b/package/clamav/clamav.mk @@ -45,9 +45,8 @@ CLAMAV_DEPENDENCIES += musl-fts CLAMAV_LIBS += -lfts endif -CLAMAV_CONF_ENV += LIBS="$(CLAMAV_LIBS)" - CLAMAV_CONF_OPTS = \ + -DCMAKE_EXE_LINKER_FLAGS="$(CLAMAV_LIBS)" \ -DCMAKE_SKIP_INSTALL_RPATH=ON \ -DENABLE_JSON_SHARED=ON \ -DENABLE_MAN_PAGES=OFF \ From bb94d3d0fba4d59c43c19c3a00df909831e1a7af Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 7 Apr 2024 19:07:06 +0200 Subject: [PATCH 5494/5754] package/wolfssl: security bump to version 5.7.0 Vulnerabilities - [High] CVE-2024-0901 Potential denial of service and out of bounds read. Affects TLS 1.3 on the server side when accepting a connection from a malicious TLS 1.3 client. If using TLS 1.3 on the server side it is recommended to update the version of wolfSSL used. - [Med] CVE-2024-1545 Fault Injection vulnerability in RsaPrivateDecryption function that potentially allows an attacker that has access to the same system with a victims process to perform a Rowhammer fault injection. - [Med] Fault injection attack with EdDSA signature operations. This affects ed25519 sign operations where the system could be susceptible to Rowhammer attacks. No official tarball provided so switch to github and set autoreconf https://github.com/wolfSSL/wolfssl/releases/tag/v5.7.0-stable Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (cherry picked from commit 3a2891621c35fea394b135256c7a0846ece442aa) Signed-off-by: Peter Korsgaard --- package/wolfssl/wolfssl.hash | 2 +- package/wolfssl/wolfssl.mk | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/wolfssl/wolfssl.hash b/package/wolfssl/wolfssl.hash index 59e42e98b9..e705bba9fd 100644 --- a/package/wolfssl/wolfssl.hash +++ b/package/wolfssl/wolfssl.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 75aaafe3b8c776d1ac417288116c8d444115f9fac5acb382a39a7d163dfd618d wolfssl-5.6.6.tar.gz +sha256 2de93e8af588ee856fe67a6d7fce23fc1b226b74d710b0e3946bc8061f6aa18f wolfssl-5.7.0.tar.gz # Hash for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/wolfssl/wolfssl.mk b/package/wolfssl/wolfssl.mk index 68c69afd59..893408eca4 100644 --- a/package/wolfssl/wolfssl.mk +++ b/package/wolfssl/wolfssl.mk @@ -4,14 +4,16 @@ # ################################################################################ -WOLFSSL_VERSION = 5.6.6 -WOLFSSL_SITE = https://github.com/wolfSSL/wolfssl/releases/download/v$(WOLFSSL_VERSION)-stable +WOLFSSL_VERSION = 5.7.0 +WOLFSSL_SITE = $(call github,wolfSSL,wolfssl,v$(WOLFSSL_VERSION)-stable) WOLFSSL_INSTALL_STAGING = YES WOLFSSL_LICENSE = GPL-2.0+ WOLFSSL_LICENSE_FILES = COPYING LICENSING WOLFSSL_CPE_ID_VENDOR = wolfssl WOLFSSL_CONFIG_SCRIPTS = wolfssl-config +# From git +WOLFSSL_AUTORECONF = YES WOLFSSL_DEPENDENCIES = host-pkgconf WOLFSSL_CONF_OPTS = --disable-examples --disable-crypttests From 8c2144727c93b8dc209c95825b36fdbfaf3b641d Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 7 Apr 2024 19:09:36 +0200 Subject: [PATCH 5495/5754] package/botan: security bump to version 3.3.0 - Fix a potential denial of service caused by accepting arbitrary length primes as potential elliptic curve parameters in ASN.1 encodings. With very large inputs the primality verification can become computationally expensive. Now any prime field larger than 1024 bits is rejected immediately. https://botan.randombit.net/news.html#version-3-3-0-2024-02-20 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (cherry picked from commit 2fcc74594c457bed7f0f2a4826ada265861be6bf) Signed-off-by: Peter Korsgaard --- package/botan/botan.hash | 2 +- package/botan/botan.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/botan/botan.hash b/package/botan/botan.hash index 840191aa4b..37e00ea9cc 100644 --- a/package/botan/botan.hash +++ b/package/botan/botan.hash @@ -1,4 +1,4 @@ # From https://botan.randombit.net/releases/sha256sums.txt -sha256 049c847835fcf6ef3a9e206b33de05dd38999c325e247482772a5598d9e5ece3 Botan-3.2.0.tar.xz +sha256 368f11f426f1205aedb9e9e32368a16535dc11bd60351066e6f6664ec36b85b9 Botan-3.3.0.tar.xz # Locally computed sha256 1833cde7c7cc03296b1ef2ddc178b1cd7fd1c476840f32cf6aedb09ab0bc9004 license.txt diff --git a/package/botan/botan.mk b/package/botan/botan.mk index 95352ea41b..e0bd258f57 100644 --- a/package/botan/botan.mk +++ b/package/botan/botan.mk @@ -4,7 +4,7 @@ # ################################################################################ -BOTAN_VERSION = 3.2.0 +BOTAN_VERSION = 3.3.0 BOTAN_SOURCE = Botan-$(BOTAN_VERSION).tar.xz BOTAN_SITE = http://botan.randombit.net/releases BOTAN_LICENSE = BSD-2-Clause From 04b72604bc0c96b2a78fe90b46c165d1808ab460 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 7 Apr 2024 20:41:52 +0200 Subject: [PATCH 5496/5754] package/systemd: fix build with gcc >= 13 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix the following build failure with gcc >= 13: In file included from ../src/basic/macro.h:446, from ../src/basic/alloc-util.h:10, from ../src/shared/install.c:12: ../src/shared/install.c: In function ‘install_changes_dump’: ../src/shared/install.c:444:64: error: ‘%s’ directive argument is null [-Werror=format-overflow=] 444 | err = log_error_errno(changes[i].type, "Failed to %s unit, unit %s does not exist.", | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/e0d6b7d41fefec539a17a3ef5c89c192ce29fd04 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (cherry picked from commit 066c3e67d7f117f7810597e1ab36e2346fe8f7c2) Signed-off-by: Peter Korsgaard --- ...rning-about-empty-directive-argument.patch | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 package/systemd/0001-install-fix-compiler-warning-about-empty-directive-argument.patch diff --git a/package/systemd/0001-install-fix-compiler-warning-about-empty-directive-argument.patch b/package/systemd/0001-install-fix-compiler-warning-about-empty-directive-argument.patch new file mode 100644 index 0000000000..9408a6da0e --- /dev/null +++ b/package/systemd/0001-install-fix-compiler-warning-about-empty-directive-argument.patch @@ -0,0 +1,45 @@ +From 8040fa55a1cbc34dede3205a902095ecd26c21e3 Mon Sep 17 00:00:00 2001 +From: Luca Boccassi +Date: Sat, 24 Feb 2024 12:05:44 +0000 +Subject: [PATCH] install: fix compiler warning about empty directive argument +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +On ppc64el with gcc 13.2 on Ubuntu 24.04: + +3s In file included from ../src/basic/macro.h:386, +483s from ../src/basic/alloc-util.h:10, +483s from ../src/shared/install.c:12: +483s ../src/shared/install.c: In function ‘install_changes_dump’: +483s ../src/shared/install.c:432:64: error: ‘%s’ directive argument is null [-Werror=format-overflow=] +483s 432 | err = log_error_errno(changes[i].type, "Failed to %s unit, unit %s does not exist.", +483s | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +483s ../src/shared/install.c:432:75: note: format string is defined here +483s 432 | err = log_error_errno(changes[i].type, "Failed to %s unit, unit %s does not exist.", + +Upstream: https://github.com/systemd/systemd/commit/8040fa55a1cbc34dede3205a902095ecd26c21e3 +Signed-off-by: Fabrice Fontaine +--- + src/shared/install.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/src/shared/install.c b/src/shared/install.c +index fabf5db7ed2e1..c3a94d1912165 100644 +--- a/src/shared/install.c ++++ b/src/shared/install.c +@@ -340,9 +340,12 @@ void install_changes_dump(int r, const char *verb, const InstallChange *changes, + assert(verb || r >= 0); + + for (size_t i = 0; i < n_changes; i++) { +- if (changes[i].type < 0) +- assert(verb); + assert(changes[i].path); ++ /* This tries to tell the compiler that it's safe to use 'verb' in a string format if there ++ * was an error, but the compiler doesn't care and fails anyway, so strna(verb) is used ++ * too. */ ++ assert(verb || changes[i].type >= 0); ++ verb = strna(verb); + + /* When making changes here, make sure to also change install_error() in dbus-manager.c. */ + From 98a1ed7ae3557ac2522f48c23b21a65708630720 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 7 Apr 2024 20:49:07 +0200 Subject: [PATCH 5497/5754] package/oprofile: drop unrecognized option --enable-gui is unrecognized since bump to version 1.0.0 in commit 7f7dc71cc8545dacf23f9a25f33c184d15bed65c and https://github.com/wcohen/oprofile/commit/0c142c3a096d3e9ec42cc9b0ddad994fea60d135: 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, --enable-gui Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (cherry picked from commit caf3f7fb5dc289c0c25254af78dc655687ad4bec) Signed-off-by: Peter Korsgaard --- package/oprofile/oprofile.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/oprofile/oprofile.mk b/package/oprofile/oprofile.mk index 265d6ebd18..512fbf9ea1 100644 --- a/package/oprofile/oprofile.mk +++ b/package/oprofile/oprofile.mk @@ -11,7 +11,6 @@ OPROFILE_LICENSE_FILES = COPYING OPROFILE_CPE_ID_VENDOR = maynard_johnson OPROFILE_CONF_OPTS = \ --disable-account-check \ - --enable-gui=no \ --with-kernel=$(STAGING_DIR)/usr OPROFILE_DEPENDENCIES = popt binutils host-pkgconf From 2ebf2a85c0fe64384660def2621e37d7ee04c603 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 7 Apr 2024 21:29:44 +0200 Subject: [PATCH 5498/5754] package/opensc: openssl is optional, not mandatory openssl is optional, not mandatory since the addition of the package in commit 8aaa7ecbce1d10cbcd880c3da5e429988f96176a Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (cherry picked from commit b097ed3a4b32c074130c4f4c6b97ce9983fa675a) Signed-off-by: Peter Korsgaard --- package/opensc/Config.in | 1 - package/opensc/opensc.mk | 9 ++++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/package/opensc/Config.in b/package/opensc/Config.in index 8c6a95a41d..13b085f389 100644 --- a/package/opensc/Config.in +++ b/package/opensc/Config.in @@ -5,7 +5,6 @@ config BR2_PACKAGE_OPENSC depends on BR2_USE_MMU # fork() depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pcsc-lite select BR2_PACKAGE_PCSC_LITE - select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL select BR2_PACKAGE_LIBOPENSSL_ENABLE_RMD160 if BR2_PACKAGE_LIBOPENSSL help diff --git a/package/opensc/opensc.mk b/package/opensc/opensc.mk index aa82bd18da..f4dc2206ea 100644 --- a/package/opensc/opensc.mk +++ b/package/opensc/opensc.mk @@ -9,8 +9,15 @@ OPENSC_SITE = https://github.com/OpenSC/OpenSC/releases/download/$(OPENSC_VERSIO OPENSC_LICENSE = LGPL-2.1+ OPENSC_LICENSE_FILES = COPYING OPENSC_CPE_ID_VALID = YES -OPENSC_DEPENDENCIES = openssl pcsc-lite +OPENSC_DEPENDENCIES = pcsc-lite OPENSC_INSTALL_STAGING = YES OPENSC_CONF_OPTS = --disable-cmocka --disable-strict --disable-tests +ifeq ($(BR2_PACKAGE_OPENSSL),y) +OPENSC_DEPENDENCIES += openssl +OPENSC_CONF_OPTS += --enable-openssl +else +OPENSC_CONF_OPTS += --disable-openssl +endif + $(eval $(autotools-package)) From 5efb91c2bff4714c1c6a0b8afca977bee07ded56 Mon Sep 17 00:00:00 2001 From: Petr Vorel Date: Wed, 3 Apr 2024 19:03:51 +0200 Subject: [PATCH 5499/5754] toolchain/helpers.mk: use int as main() return type in checks Although -Wmain-return-type is not considered as error (unlike -Wimplicit-int), but just a warning, let's fix it for the future. :1:1: warning: return type of 'main' is not 'int' [-Wmain-return-type] Signed-off-by: Petr Vorel Signed-off-by: Thomas Petazzoni (cherry picked from commit 3c9d06759051b3c23e3794f443af96d824aae239) Signed-off-by: Peter Korsgaard --- toolchain/helpers.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk index e5c838c0af..839ee278d0 100644 --- a/toolchain/helpers.mk +++ b/toolchain/helpers.mk @@ -483,7 +483,7 @@ check_unusable_toolchain = \ # check_toolchain_ssp = \ __CROSS_CC=$(strip $1) ; \ - __HAS_SSP=`echo 'void main(){}' | $${__CROSS_CC} -Werror -fstack-protector -x c - -o $(BUILD_DIR)/.br-toolchain-test.tmp >/dev/null 2>&1 && echo y` ; \ + __HAS_SSP=`echo 'int main(){}' | $${__CROSS_CC} -Werror -fstack-protector -x c - -o $(BUILD_DIR)/.br-toolchain-test.tmp >/dev/null 2>&1 && echo y` ; \ if [ "$(BR2_TOOLCHAIN_HAS_SSP)" != "y" -a "$${__HAS_SSP}" = "y" ] ; then \ echo "SSP support available in this toolchain, please enable BR2_TOOLCHAIN_EXTERNAL_HAS_SSP" ; \ exit 1 ; \ @@ -494,7 +494,7 @@ check_toolchain_ssp = \ fi ; \ __SSP_OPTION=$(2); \ if [ -n "$${__SSP_OPTION}" ] ; then \ - if ! echo 'void main(){}' | $${__CROSS_CC} -Werror $${__SSP_OPTION} -x c - -o $(BUILD_DIR)/.br-toolchain-test.tmp >/dev/null 2>&1 ; then \ + if ! echo 'int main(){}' | $${__CROSS_CC} -Werror $${__SSP_OPTION} -x c - -o $(BUILD_DIR)/.br-toolchain-test.tmp >/dev/null 2>&1 ; then \ echo "SSP option $${__SSP_OPTION} not available in this toolchain, please select another SSP level" ; \ exit 1 ; \ fi; \ From 8773e0aba0bb6778cd8c1dddbce51c3cd4b2069d Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 7 Apr 2024 11:21:04 +0200 Subject: [PATCH 5500/5754] package/libnpth: fix musl build Fix the following musl build failure raised since bump to version 1.7 in commit 3ef4d24192b20bd1eb5e34c9fa2a6aa5bde91f91 and https://git.gnupg.org/cgi-bin/gitweb.cgi?p=npth.git;a=commit;h=575573b5b63e147b1906240f192dbe37a26ca4b9: npth.c:392:21: error: unknown type name 'npth_rwlock_t'; did you mean 'npth_cond_t'? 392 | npth_rwlock_rdlock (npth_rwlock_t *rwlock) | ^~~~~~~~~~~~~ | npth_cond_t Fixes: 3ef4d24192b20bd1eb5e34c9fa2a6aa5bde91f91 - http://autobuild.buildroot.org/results/d986ba27b734679fd70b4e0f23278ebd38e13c5d Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 8c456a564643c49915a8c9ab5a9f0583d3a64ad9) Signed-off-by: Peter Korsgaard --- ...EXPOSE_RWLOCK_API-for-musl-C-library.patch | 37 +++++++++++++++++++ package/libnpth/libnpth.mk | 2 + 2 files changed, 39 insertions(+) create mode 100644 package/libnpth/0001-Fix-INSERT_EXPOSE_RWLOCK_API-for-musl-C-library.patch diff --git a/package/libnpth/0001-Fix-INSERT_EXPOSE_RWLOCK_API-for-musl-C-library.patch b/package/libnpth/0001-Fix-INSERT_EXPOSE_RWLOCK_API-for-musl-C-library.patch new file mode 100644 index 0000000000..bc5ed70a9c --- /dev/null +++ b/package/libnpth/0001-Fix-INSERT_EXPOSE_RWLOCK_API-for-musl-C-library.patch @@ -0,0 +1,37 @@ +From 417abd56fd7bf45cd4948414050615cb1ad59134 Mon Sep 17 00:00:00 2001 +From: NIIBE Yutaka +Date: Fri, 1 Mar 2024 13:53:52 +0900 +Subject: [PATCH] Fix INSERT_EXPOSE_RWLOCK_API for musl C library. + +* configure.ac: Add a case for musl system. + +-- + +GnuPG-bug-id: 5664 +Signed-off-by: NIIBE Yutaka + +Upstream: https://git.gnupg.org/cgi-bin/gitweb.cgi?p=npth.git;a=commit;h=417abd56fd7bf45cd4948414050615cb1ad59134 +Signed-off-by: Fabrice Fontaine +--- + configure.ac | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index c1091b1..576a26e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -381,7 +381,10 @@ fi + AC_SUBST(INSERT_NO_RWLOCK) + + case "${host}" in +- *-*-linux*|*-*-gnu*) ++ *-*-linux-musl*) ++ INSERT_EXPOSE_RWLOCK_API="1" ++ ;; ++ *-*-linux-gnu*|*-*-gnu*) + INSERT_EXPOSE_RWLOCK_API="defined(__USE_UNIX98) || defined(__USE_XOPEN2K)" + ;; + *) +-- +2.30.2 + diff --git a/package/libnpth/libnpth.mk b/package/libnpth/libnpth.mk index dc603b607f..46c8154021 100644 --- a/package/libnpth/libnpth.mk +++ b/package/libnpth/libnpth.mk @@ -10,5 +10,7 @@ LIBNPTH_SITE = https://www.gnupg.org/ftp/gcrypt/npth LIBNPTH_LICENSE = LGPL-2.0+ LIBNPTH_LICENSE_FILES = COPYING.LIB LIBNPTH_INSTALL_STAGING = YES +# 0001-Fix-INSERT_EXPOSE_RWLOCK_API-for-musl-C-library.patch +LIBNPTH_AUTORECONF = YES $(eval $(autotools-package)) From 258a2d54b69c8ef4200ef18c2cf970f80cabf109 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 7 Apr 2024 11:21:05 +0200 Subject: [PATCH 5501/5754] package/libnpth: disable tests tests are enabled by default since the addition of the package in commit 5d74d39cb421611e7be8ee73a308d608c47cfa28 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit e9e3579555d3cccac1b5ecda0c9de375b8056d11) Signed-off-by: Peter Korsgaard --- package/libnpth/libnpth.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libnpth/libnpth.mk b/package/libnpth/libnpth.mk index 46c8154021..3fa5e1f905 100644 --- a/package/libnpth/libnpth.mk +++ b/package/libnpth/libnpth.mk @@ -12,5 +12,6 @@ LIBNPTH_LICENSE_FILES = COPYING.LIB LIBNPTH_INSTALL_STAGING = YES # 0001-Fix-INSERT_EXPOSE_RWLOCK_API-for-musl-C-library.patch LIBNPTH_AUTORECONF = YES +LIBNPTH_CONF_OPTS = --disable-tests $(eval $(autotools-package)) From 6ea8073519718aa403977a8d9cc7061cc6ce0bd8 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 4 Apr 2024 20:37:07 +0200 Subject: [PATCH 5502/5754] package/xmrig: bump version to 6.21.2 Changelog: https://github.com/xmrig/xmrig/blob/master/CHANGELOG.md Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit c8800c34feef5f6df2220a6e704517d6fe4baa91) 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 9d84ab7957..116855fdba 100644 --- a/package/xmrig/xmrig.hash +++ b/package/xmrig/xmrig.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c45baea5a210143b647349b5234a2192164d3473a39d2b1cab7fb35b1a2a8ba9 xmrig-6.21.1.tar.gz +sha256 68b4be51e99687bad15d5bf4ac9eed79a080ba89141f7363457a957ce9304e4d xmrig-6.21.2.tar.gz sha256 589ed823e9a84c56feb95ac58e7cf384626b9cbf4fda2a907bc36e103de1bad2 LICENSE diff --git a/package/xmrig/xmrig.mk b/package/xmrig/xmrig.mk index 37a613820d..45538fa77e 100644 --- a/package/xmrig/xmrig.mk +++ b/package/xmrig/xmrig.mk @@ -4,7 +4,7 @@ # ################################################################################ -XMRIG_VERSION = 6.21.1 +XMRIG_VERSION = 6.21.2 XMRIG_SITE = $(call github,xmrig,xmrig,v$(XMRIG_VERSION)) XMRIG_LICENSE = GPL-3.0+ XMRIG_LICENSE_FILES = LICENSE From 69125a8fb8f0c87152be936c7816f5f83d3ee3ce Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Fri, 5 Apr 2024 09:52:30 +0200 Subject: [PATCH 5503/5754] package/uuu: bump to version 1.5.177 - Support i.MX91 - Fix a crash with -d option when change back file. Release notes: https://github.com/nxp-imx/mfgtools/releases/tag/uuu_1.5.177 Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni (cherry picked from commit dfe02734bfbbab680cd9ceb98e10d0344abbe058) Signed-off-by: Peter Korsgaard --- 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 e45cbb8680..0f746a7633 100644 --- a/package/uuu/uuu.hash +++ b/package/uuu/uuu.hash @@ -1,3 +1,3 @@ # locally computed -sha256 6e65fc028afacc94b805ae376e3da3864dcb2570d425037820e716207ab70373 uuu_source-uuu_1.5.165.tar.gz +sha256 fac38e93714181fbfb0ff52b9cd29395c7eb342def5c3857da87e5429beb3927 uuu_source-uuu_1.5.177.tar.gz sha256 cc8d47f7b9260f6669ecd41c24554c552f17581d81ee8fc602c6d23edb8bf495 LICENSE diff --git a/package/uuu/uuu.mk b/package/uuu/uuu.mk index 5800277b10..b6611dc3d4 100644 --- a/package/uuu/uuu.mk +++ b/package/uuu/uuu.mk @@ -4,7 +4,7 @@ # ################################################################################ -UUU_VERSION = 1.5.165 +UUU_VERSION = 1.5.177 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 1faf9b2987d4475e92778977651f58a0a278cdbb Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Thu, 4 Apr 2024 14:55:52 -0300 Subject: [PATCH 5504/5754] package/crucible: update LICENSE information Since crucible commit 7fe0bb96da65 ("move to BSD style license") the license has been changed to BSD-3. This changed happened for the 2023.11.02 release of crucible, to which the Buildroot package was bumped in Buildroot commit be3f95ed14559f8a9739a12cff604add622b0416. Change the license type and hash accordingly. Fixes: - http://autobuild.buildroot.net/results/14dfa0a47be54929c527c12fe9b95f34c1d8c7f5/ Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni (cherry picked from commit 9f4cae383a061b52424bf37900aaa221e3a2f3c5) Signed-off-by: Peter Korsgaard --- 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 d5fee0068d..3a9a716732 100644 --- a/package/crucible/crucible.hash +++ b/package/crucible/crucible.hash @@ -1,2 +1,2 @@ sha256 d21842f050163765269290d72fe79d3f95005038e865138d94e247cb455098da crucible-2023.11.02.tar.gz -sha256 d88514630470aec9fa7abdc990a1e0a8751a752321bffa868188c49009d64d59 LICENSE +sha256 a89c50d83be30fe7ec75be69a07f6c1b5dfaae0a6b94a678d2394fff34acb69c LICENSE diff --git a/package/crucible/crucible.mk b/package/crucible/crucible.mk index 2206663e24..5eedbca8ee 100644 --- a/package/crucible/crucible.mk +++ b/package/crucible/crucible.mk @@ -6,7 +6,7 @@ CRUCIBLE_VERSION = 2023.11.02 CRUCIBLE_SITE = $(call github,usbarmory,crucible,v$(CRUCIBLE_VERSION)) -CRUCIBLE_LICENSE = GPL-3.0 +CRUCIBLE_LICENSE = BSD-3-Clause CRUCIBLE_LICENSE_FILES = LICENSE CRUCIBLE_GOMOD = ./cmd/crucible From 58ba95b064267cd759d51a099cabfd9128d4151d Mon Sep 17 00:00:00 2001 From: Vincent Fazio Date: Wed, 3 Apr 2024 16:18:05 -0500 Subject: [PATCH 5505/5754] package/python3: fix cross builds when host and target use the same SOABI When python performs a cross compile, it uses a host interpreter to run steps on behalf of the foreign architecture to finalize the build. When performing these steps, foreign modules may be loaded if the SOABI matches that of the host. This can lead to issues if the modules are linked against a libc not available on the host or if the binaries include instructions unsupported by the host. For now, patch the foreign libraries out of PYTHONPATH and explicitly define the path to sysconfigdata so builds can complete without error. This method currently passes all upstream CI pipelines [0] and should also work (with some modifications) for the migration to 3.12 [1]. Fixes: http://autobuild.buildroot.net/results/c854080e003e9a7d525325073190b472a8f982aa/ [0]: https://github.com/python/cpython/pull/116294 [1]: https://lists.buildroot.org/pipermail/buildroot/2024-February/685369.html Signed-off-by: Vincent Fazio Tested-by: Yann E. MORIN Signed-off-by: Yann E. MORIN (cherry picked from commit d01e13c4d419ca2fc31d6300033eacb1d19cb615) Signed-off-by: Peter Korsgaard --- ...oss-compiles-when-host-and-target-us.patch | 140 ++++++++++++++++++ 1 file changed, 140 insertions(+) create mode 100644 package/python3/0032-gh-115382-Fix-cross-compiles-when-host-and-target-us.patch diff --git a/package/python3/0032-gh-115382-Fix-cross-compiles-when-host-and-target-us.patch b/package/python3/0032-gh-115382-Fix-cross-compiles-when-host-and-target-us.patch new file mode 100644 index 0000000000..4d5afeb3cb --- /dev/null +++ b/package/python3/0032-gh-115382-Fix-cross-compiles-when-host-and-target-us.patch @@ -0,0 +1,140 @@ +From 8d8cc9087fd44c097775ca0a9ebb6c877605baec Mon Sep 17 00:00:00 2001 +From: Vincent Fazio <5265893+vfazio@users.noreply.github.com> +Date: Wed, 28 Feb 2024 13:55:04 -0600 +Subject: [PATCH] gh-115382: Fix cross compiles when host and target use same + SOABI + +Previously, when a build was configured to use a host interpreter via +--with-build-python, the PYTHON_FOR_BUILD config value included a path +in PYTHONPATH that pointed to the target's built external modules. + +For "normal" foreign architecture cross compiles, when loading compiled +external libraries, the target libraries were processed first due to +their precedence in sys.path. These libraries were then ruled out due to +a mismatch in the SOABI so the import mechanism continued searching +until it found the host's native modules. + +However, if the host interpreter and the target python were on the same +version + SOABI combination, the host interpreter would attempt to load +the target's external modules due to their precedence in sys.path. + +Despite the "match", the target build may have been linked against a +different libc or may include unsupported instructions so loading or +executing the target's external modules can lead to crashes. + +Now, the path to the target's external modules is no longer defined in +PYTHONPATH to prevent accidentally loading these foreign modules. + +One caveat is that during certain build stages, the target's sysconfig +module requires higher precedence than the host's version in order to +accurately query the target build's configuration. + +This worked previously due to the target's sysconfig data module having +precedence over the host's (see above). In order to keep this desired +behavior, a new environment variable, _PYTHON_SYSCONFIGDATA_PATH, has +been defined so sysconfig can search this directory for the target's +sysconfig data. + +Signed-off-by: Vincent Fazio +Upstream-issue: https://github.com/python/cpython/issues/115382 +Upstream: https://github.com/python/cpython/pull/116294 +--- + Lib/sysconfig.py | 15 ++++++++++++++- + Lib/test/libregrtest/main.py | 1 + + Lib/test/pythoninfo.py | 1 + + Tools/scripts/run_tests.py | 1 + + configure | 2 +- + configure.ac | 2 +- + 6 files changed, 19 insertions(+), 3 deletions(-) + +diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py +index 6328ec41af..744f715fe2 100644 +--- a/Lib/sysconfig.py ++++ b/Lib/sysconfig.py +@@ -535,7 +535,20 @@ def _init_posix(vars): + """Initialize the module as appropriate for POSIX systems.""" + # _sysconfigdata is generated at build time, see _generate_posix_vars() + name = _get_sysconfigdata_name() +- _temp = __import__(name, globals(), locals(), ['build_time_vars'], 0) ++ ++ # For cross builds, the path to the target's sysconfigdata must be specified ++ # so it can be imported. It cannot be in PYTHONPATH, as foreign modules in ++ # sys.path can cause crashes when loaded by the host interpreter. ++ # Rely on truthiness as a valueless env variable is still an empty string. ++ # See OS X note in _generate_posix_vars re _sysconfigdata. ++ if (path := os.environ.get('_PYTHON_SYSCONFIGDATA_PATH')): ++ from importlib.machinery import FileFinder, SourceFileLoader, SOURCE_SUFFIXES ++ from importlib.util import module_from_spec ++ spec = FileFinder(path, (SourceFileLoader, SOURCE_SUFFIXES)).find_spec(name) ++ _temp = module_from_spec(spec) ++ spec.loader.exec_module(_temp) ++ else: ++ _temp = __import__(name, globals(), locals(), ['build_time_vars'], 0) + build_time_vars = _temp.build_time_vars + vars.update(build_time_vars) + +diff --git a/Lib/test/libregrtest/main.py b/Lib/test/libregrtest/main.py +index a9725fa967..121e2e7393 100644 +--- a/Lib/test/libregrtest/main.py ++++ b/Lib/test/libregrtest/main.py +@@ -519,6 +519,7 @@ def _add_cross_compile_opts(self, regrtest_opts): + '_PYTHON_PROJECT_BASE', + '_PYTHON_HOST_PLATFORM', + '_PYTHON_SYSCONFIGDATA_NAME', ++ "_PYTHON_SYSCONFIGDATA_PATH", + 'PYTHONPATH' + } + old_environ = os.environ +diff --git a/Lib/test/pythoninfo.py b/Lib/test/pythoninfo.py +index 74ebb5e5b8..fa7fbca34e 100644 +--- a/Lib/test/pythoninfo.py ++++ b/Lib/test/pythoninfo.py +@@ -326,6 +326,7 @@ def format_groups(groups): + "_PYTHON_HOST_PLATFORM", + "_PYTHON_PROJECT_BASE", + "_PYTHON_SYSCONFIGDATA_NAME", ++ "_PYTHON_SYSCONFIGDATA_PATH", + "__PYVENV_LAUNCHER__", + + # Sanitizer options +diff --git a/Tools/scripts/run_tests.py b/Tools/scripts/run_tests.py +index 445a34ae3e..4077a83424 100644 +--- a/Tools/scripts/run_tests.py ++++ b/Tools/scripts/run_tests.py +@@ -42,6 +42,7 @@ def main(regrtest_args): + '_PYTHON_PROJECT_BASE', + '_PYTHON_HOST_PLATFORM', + '_PYTHON_SYSCONFIGDATA_NAME', ++ "_PYTHON_SYSCONFIGDATA_PATH", + 'PYTHONPATH' + } + environ = { +diff --git a/configure b/configure +index a1ad0ae251..0657162d1a 100755 +--- a/configure ++++ b/configure +@@ -3262,7 +3262,7 @@ fi + fi + ac_cv_prog_PYTHON_FOR_REGEN=$with_build_python + PYTHON_FOR_FREEZE="$with_build_python" +- PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH) '$with_build_python ++ PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH) _PYTHON_SYSCONFIGDATA_PATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`) '$with_build_python + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_build_python" >&5 + $as_echo "$with_build_python" >&6; } + +diff --git a/configure.ac b/configure.ac +index e5fb8bd99e..d444f5ec09 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -162,7 +162,7 @@ AC_ARG_WITH( + dnl Build Python interpreter is used for regeneration and freezing. + ac_cv_prog_PYTHON_FOR_REGEN=$with_build_python + PYTHON_FOR_FREEZE="$with_build_python" +- PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH) '$with_build_python ++ PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH) _PYTHON_SYSCONFIGDATA_PATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`) '$with_build_python + AC_MSG_RESULT([$with_build_python]) + ], [ + AS_VAR_IF([cross_compiling], [yes], +-- +2.34.1 + From 4d266550af0eb1b0b00cd3558ca6ce857f4a6f4a Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 7 Apr 2024 21:56:24 +0200 Subject: [PATCH 5506/5754] package/opensc: add zlib optional dependency zlib is an optional dependency dependency (enabled by default) since the addition of the package in commit 8aaa7ecbce1d10cbcd880c3da5e429988f96176a Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (cherry picked from commit 05f5e5b6f8e8363043b6136e9d622023ccf9eb52) Signed-off-by: Peter Korsgaard --- package/opensc/opensc.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/opensc/opensc.mk b/package/opensc/opensc.mk index f4dc2206ea..008de9d4c2 100644 --- a/package/opensc/opensc.mk +++ b/package/opensc/opensc.mk @@ -20,4 +20,11 @@ else OPENSC_CONF_OPTS += --disable-openssl endif +ifeq ($(BR2_PACKAGE_ZLIB),y) +OPENSC_DEPENDENCIES += zlib +OPENSC_CONF_OPTS += --enable-zlib +else +OPENSC_CONF_OPTS += --disable-zlib +endif + $(eval $(autotools-package)) From e11b804443d4e3bf5cbe447096a888fa825681a4 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Sat, 30 Mar 2024 10:29:02 +0100 Subject: [PATCH 5507/5754] configs/mangopi_mq1rdw1_defconfig: fix build failure due to undefined linux headers Add BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6 to prevent error: Incorrect selection of kernel headers: expected 6.8.x, got 6.6.x Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6498278078 Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni (cherry picked from commit c245b37190f18d1f0551dd95027b2b65fa63e704) Signed-off-by: Peter Korsgaard --- configs/mangopi_mq1rdw2_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/mangopi_mq1rdw2_defconfig b/configs/mangopi_mq1rdw2_defconfig index a2f8a1299b..2249fa4be5 100644 --- a/configs/mangopi_mq1rdw2_defconfig +++ b/configs/mangopi_mq1rdw2_defconfig @@ -1,6 +1,7 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_VFPV4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_TARGET_GENERIC_HOSTNAME="mangopi-mq1rdw2" BR2_TARGET_GENERIC_ISSUE="Welcome to MangoPI MQ1RDW2" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y From ba45833429c5d86a01917f68564ee9e620c771b2 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 30 Mar 2024 10:03:34 +0100 Subject: [PATCH 5508/5754] package/php-xdebug: drop unrecognized variable --with-xdebug is not recognized since the addition of the package in commit 7b7dffd0984e1b274273f5638a975165606384f9: configure: WARNING: unrecognized options: --disable-gtk-doc, --disable-gtk-doc-html, --disable-doc, --disable-docs, --disable-documentation, --with-xmlto, --with-fop, --disable-dependency-tracking, --enable-ipv6, --disable-nls, --with-xdebug Fixes: 7b7dffd0984e1b274273f5638a975165606384f9 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 98ee9f8b49ebd7aa6d9dc2c726030ec396910f6c) Signed-off-by: Peter Korsgaard --- package/php-xdebug/php-xdebug.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/php-xdebug/php-xdebug.mk b/package/php-xdebug/php-xdebug.mk index c5a1e10ebc..62ef3fa997 100644 --- a/package/php-xdebug/php-xdebug.mk +++ b/package/php-xdebug/php-xdebug.mk @@ -14,8 +14,7 @@ PHP_XDEBUG_LICENSE_FILES = LICENSE PHP_XDEBUG_DEPENDENCIES = php host-autoconf PHP_XDEBUG_CONF_OPTS = \ --enable-xdebug \ - --with-php-config=$(STAGING_DIR)/usr/bin/php-config \ - --with-xdebug=$(STAGING_DIR)/usr + --with-php-config=$(STAGING_DIR)/usr/bin/php-config define PHP_XDEBUG_PHPIZE (cd $(@D); \ From 71e6b2765b0fec5cd55aab2fc2907d076a92ec17 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 30 Mar 2024 10:03:35 +0100 Subject: [PATCH 5509/5754] package/php-xdebug: add zlib optional dependency zlib is an optional dependency (enabled by default) since bump to version 3.2.0 in commit 8280400fbadde09e51ccff312d7a4ef6a386f589 and https://github.com/xdebug/xdebug/commit/3954e5cd9e48eec0a8a2a0c6a2fc120bbe562656 Fixes: 8280400fbadde09e51ccff312d7a4ef6a386f589 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 4b7aeee28ed2f62370084dac4a92bdef89046b41) Signed-off-by: Peter Korsgaard --- package/php-xdebug/php-xdebug.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/php-xdebug/php-xdebug.mk b/package/php-xdebug/php-xdebug.mk index 62ef3fa997..3bc197e556 100644 --- a/package/php-xdebug/php-xdebug.mk +++ b/package/php-xdebug/php-xdebug.mk @@ -25,4 +25,11 @@ endef PHP_XDEBUG_PRE_CONFIGURE_HOOKS += PHP_XDEBUG_PHPIZE +ifeq ($(BR2_PACKAGE_ZLIB),y) +PHP_XDEBUG_CONF_OPTS += --with-xdebug-compression +PHP_XDEBUG_DEPENDENCIES += zlib +else +PHP_XDEBUG_CONF_OPTS += --without-xdebug-compression +endif + $(eval $(autotools-package)) From 233ba540f5c21a2305fcd29217a9767e819cfdd1 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Tue, 26 Mar 2024 23:50:31 +0100 Subject: [PATCH 5510/5754] package/libblockdev: bump to version 3.1.1 Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni (cherry picked from commit dd79b8dd60ab6817f2d3a0db9eedc1526005c9be) Signed-off-by: Peter Korsgaard --- package/libblockdev/libblockdev.hash | 2 +- package/libblockdev/libblockdev.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libblockdev/libblockdev.hash b/package/libblockdev/libblockdev.hash index 79700a4996..1438fad741 100644 --- a/package/libblockdev/libblockdev.hash +++ b/package/libblockdev/libblockdev.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 41e4af66c9d78e795302d37825dfd88a4970f82da7b4ebe6487feba2afae44fb libblockdev-3.1.0.tar.gz +sha256 a5cb33a53ff5969067982704f45399d02555fdb2313ed0c56eac9555397dc2db libblockdev-3.1.1.tar.gz sha256 97bdc721d875501b6243a456333fdfdb1ab64d31c4da2554de845caf4674b946 LICENSE diff --git a/package/libblockdev/libblockdev.mk b/package/libblockdev/libblockdev.mk index ebf01acfb5..9ffa15a7a9 100644 --- a/package/libblockdev/libblockdev.mk +++ b/package/libblockdev/libblockdev.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBBLOCKDEV_VERSION = 3.1.0 +LIBBLOCKDEV_VERSION = 3.1.1 LIBBLOCKDEV_SITE = https://github.com/storaged-project/libblockdev/releases/download/$(LIBBLOCKDEV_VERSION)-1 LIBBLOCKDEV_LICENSE = LGPL-2.1 LIBBLOCKDEV_LICENSE_FILES = LICENSE From 3948fb33272a5c013f0b76c2e1b57daf16f5eb26 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 27 Mar 2024 17:23:19 +0100 Subject: [PATCH 5511/5754] support/testing: TestFileCapabilities: update kernel to 4.19.310 Since the toolchain Bootlin update to 2023.11-1 [1], the arm Linux kernel build is broken with binutils >= 2.41 with: arch/arm/mm/proc-v7.S: Assembler messages: arch/arm/mm/proc-v7.S:640: Error: junk at end of line, first unrecognized character is `#' A similar issue has already be fixed for qemu m68k [2]. Bump to the latest kernel 4.19 that already include the backport of 790756c7e022 ("ARM: 8933/1: replace Sun/Solaris style flag on section directive") [1] 7e0e6e3b8618ab942f25b11ee72fbc5a4deefdf1 [2] a1ce9474e40f731f327035d8c0962abb16f00ff7 Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6414160106 (TestFileCapabilities) Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni (cherry picked from commit 07ef00df9bdff1486622fe8248168137aa531c9d) Signed-off-by: Peter Korsgaard --- support/testing/tests/core/test_file_capabilities.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/testing/tests/core/test_file_capabilities.py b/support/testing/tests/core/test_file_capabilities.py index fe21d76c94..e2600ae794 100644 --- a/support/testing/tests/core/test_file_capabilities.py +++ b/support/testing/tests/core/test_file_capabilities.py @@ -13,7 +13,7 @@ class TestFileCapabilities(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.19.204" + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.310" BR2_LINUX_KERNEL_DEFCONFIG="vexpress" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{}" BR2_LINUX_KERNEL_DTS_SUPPORT=y From 14e1388a95e3df3732d70c0b94a89836f3e072e2 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 27 Mar 2024 18:23:51 +0100 Subject: [PATCH 5512/5754] package/python-segno: add missing python3-{pyexpat, zlib} dependencies The last version bump removed python-setuptools runtime dependency but doing so also removed the python3-pyexpat and python3-zlib runtime depdencies [1] that are actually direct runtime dependencies. [1] 081162580f99d1a68133f7f513bf2cd6d1b8b6b6 Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6477656982 (TestPythonPy3Segno) Cc: James Hilliard Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni (cherry picked from commit d4833cc14df8496bb98e5ccbf0c020fdd502edc9) Signed-off-by: Peter Korsgaard --- package/python-segno/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-segno/Config.in b/package/python-segno/Config.in index 7107e67443..e6080fd417 100644 --- a/package/python-segno/Config.in +++ b/package/python-segno/Config.in @@ -1,5 +1,7 @@ config BR2_PACKAGE_PYTHON_SEGNO bool "python-segno" + select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime + select BR2_PACKAGE_PYTHON3_ZLIB # runtime help QR Code and Micro QR Code generator for Python. From 63d5a3b88e345a620ffebf04f18b81ef659db609 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 27 Mar 2024 17:22:07 +0100 Subject: [PATCH 5513/5754] package/python-service-identity: add missing python-cryptography dependency The last version bump removed python-pyopenssl runtime dependency but doing so also removed the python-cryptography runtime depdency [1] that is actually a direct runtime dependency. While at it, update BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS dependency comment. [1] 6008f2b1b901be1374ac201b5e560cca61b4b61e Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6477656983 (TestPythonPy3ServiceIdentity) Cc: James Hilliard Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni (cherry picked from commit ee074ddf6f0d00a97a1cae4ba62c1cffc77bb6e4) Signed-off-by: Peter Korsgaard --- package/python-service-identity/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/python-service-identity/Config.in b/package/python-service-identity/Config.in index dccd8f37c0..3bb5c08c6f 100644 --- a/package/python-service-identity/Config.in +++ b/package/python-service-identity/Config.in @@ -1,8 +1,8 @@ config BR2_PACKAGE_PYTHON_SERVICE_IDENTITY bool "python-service-identity" - # python-pyopenssl -> python-cryptography - depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-cryptography select BR2_PACKAGE_PYTHON_ATTRS # runtime + select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime select BR2_PACKAGE_PYTHON_PYASN1 # runtime select BR2_PACKAGE_PYTHON_PYASN1_MODULES # runtime help From c28be13d01d7aa216d64817f4e9c728b73157a51 Mon Sep 17 00:00:00 2001 From: Laurent Vivier Date: Tue, 26 Mar 2024 13:16:34 +0100 Subject: [PATCH 5514/5754] package/petitboot: bump to version 1.15 Signed-off-by: Laurent Vivier Signed-off-by: Thomas Petazzoni (cherry picked from commit 5652306f7e72792655f0b2b2ea978734fc2e5938) Signed-off-by: Peter Korsgaard --- package/petitboot/petitboot.hash | 2 +- package/petitboot/petitboot.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/petitboot/petitboot.hash b/package/petitboot/petitboot.hash index a9a21f2c1b..3a90bc5296 100644 --- a/package/petitboot/petitboot.hash +++ b/package/petitboot/petitboot.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 fa2367370d3ce5dd9910ab08a0832071e2508c8bf75cfec6d3b9807fbefc507a petitboot-v1.14.tar.gz +sha256 eed29ec841c2bcd5ecc65347f5b95a0087a541bd9c04ca3c17c55d1f7357d189 petitboot-v1.15.tar.gz sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/package/petitboot/petitboot.mk b/package/petitboot/petitboot.mk index 4c8bc35adb..cd7631fa5c 100644 --- a/package/petitboot/petitboot.mk +++ b/package/petitboot/petitboot.mk @@ -4,7 +4,7 @@ # ################################################################################ -PETITBOOT_VERSION = 1.14 +PETITBOOT_VERSION = 1.15 PETITBOOT_SOURCE = petitboot-v$(PETITBOOT_VERSION).tar.gz PETITBOOT_SITE = https://github.com/open-power/petitboot/releases/download/v$(PETITBOOT_VERSION) PETITBOOT_DEPENDENCIES = \ From 2e929607565c479fffe6cfe1e0379f7c53abdf09 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Thu, 11 Apr 2024 00:18:04 +0200 Subject: [PATCH 5515/5754] support/testing: sync TestATFAllwinner with orangepi_zero_plus2_defconfig u-boot-2021.04 seems to be broken when pylibfdt support is enabled and the latest python3/setuptools are used. Since the TestATFAllwinner is using bananapi_m64 as u-boot defconfig but the Buildroot defconfig of this board was removed in 2022.11 [1] update TestATFAllwinner to use a newer BSP. Use the one provided by orangepi_zero_plus2_defconfig. [1] daf3c6661f823e566b6310042884c36c1d73f1de Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6477656317 (TestATFAllwinner) Signed-off-by: Romain Naour Signed-off-by: Yann E. MORIN (cherry picked from commit eb16148dddc6be39b0d850181c2461fdaba1ee6f) Signed-off-by: Peter Korsgaard --- support/testing/tests/boot/test_atf.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/support/testing/tests/boot/test_atf.py b/support/testing/tests/boot/test_atf.py index 4fcb9b241c..1995f83a54 100644 --- a/support/testing/tests/boot/test_atf.py +++ b/support/testing/tests/boot/test_atf.py @@ -34,15 +34,15 @@ class TestATFAllwinner(infra.basetest.BRTest): BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64=y 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_SSP is not set 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="2021.04" - BR2_TARGET_UBOOT_BOARD_DEFCONFIG="bananapi_m64" + BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10" + BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero_plus2" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y From 0bbae94e2292bdf83437dbf31efe73bf889eaa53 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Thu, 11 Apr 2024 00:18:05 +0200 Subject: [PATCH 5516/5754] support/testing: remove TestATFVexpress TestATFVexpress is using vexpress_aemv8a_juno as as u-boot defconfig but the Buildroot defconfig of this board was removed in 2022.11 [1] Since both TestATFVexpress and TestATFAllwinner are now using mainline ATF, we don't really need several ATF test anymore. Initially [2], several runtime test were added to test ATF/U-Boot combinations when ATF was provided by a vendor: vexpress (mainline), Allwinner and Marvell. Keep TestATFAllwinner as ATF mainline test. [1] 347c1087388d7782e6865f112f195e6780d473a7 [2] 8cf3ce04e9c4a4c4685b80edd9e8e873fe44d8e8 Signed-off-by: Romain Naour Signed-off-by: Yann E. MORIN (cherry picked from commit 107bcd536dae1bc26e4f34ed510484d3abcc6b5f) Signed-off-by: Peter Korsgaard --- support/testing/tests/boot/test_atf.py | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/support/testing/tests/boot/test_atf.py b/support/testing/tests/boot/test_atf.py index 1995f83a54..352725e721 100644 --- a/support/testing/tests/boot/test_atf.py +++ b/support/testing/tests/boot/test_atf.py @@ -1,31 +1,6 @@ import infra.basetest -class TestATFVexpress(infra.basetest.BRTest): - config = \ - """ - BR2_aarch64=y - BR2_TOOLCHAIN_EXTERNAL=y - BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64=y - BR2_TARGET_ARM_TRUSTED_FIRMWARE=y - BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y - BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" - BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v2.5" - BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="juno" - BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y - BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y - BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC=y - BR2_TARGET_UBOOT=y - BR2_TARGET_UBOOT_BOARDNAME="vexpress_aemv8a_juno" - BR2_TARGET_UBOOT_CUSTOM_VERSION=y - BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.07" - BR2_TARGET_VEXPRESS_FIRMWARE=y - """ - - def test_run(self): - pass - - class TestATFAllwinner(infra.basetest.BRTest): config = \ """ From 549aaab347586c2f1636a78c4e14185a14e00740 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Thu, 11 Apr 2024 00:18:03 +0200 Subject: [PATCH 5517/5754] package/python-pypng: add missing python3-zlib dependency png.py import zlib [1] so python3-zlib needs to be installed at runtime. [1] https://gitlab.com/drj11/pypng/-/blob/pypng-0.20220715.0/code/png.py?ref_type=tags#L185 Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6477656971 (TestPythonPy3Qrcode) Cc: James Hilliard Signed-off-by: Romain Naour Signed-off-by: Yann E. MORIN (cherry picked from commit 15381b57559182693f6d5530544937f8fcf3b471) Signed-off-by: Peter Korsgaard --- package/python-pypng/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-pypng/Config.in b/package/python-pypng/Config.in index c1ed405615..952b46c2c5 100644 --- a/package/python-pypng/Config.in +++ b/package/python-pypng/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_PYPNG bool "python-pypng" + select BR2_PACKAGE_PYTHON3_ZLIB # runtime help Pure Python library for saving and loading PNG images. From 3d1c04c05c27c206e336ad7338d0a882c9c4736d Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Thu, 11 Apr 2024 17:20:16 +0200 Subject: [PATCH 5518/5754] package/skeleton-init-sysv: Set sticky bit on /dev/shm /dev/shm is a world-writable directory, like /tmp, and should also have the sticky bit set. Without this, any user can delete and replace another user's files in /dev/shm. This bug has been present since /dev/shm was added to the skeleton /etc/fstab, but appears to have been fixed for systems using systemd by commit 76fc9275f14e "system: separate sysv and systemd parts of the skeleton" which went into Buildroot 2017.08. Signed-off-by: Ben Hutchings Fixes: 22fde22e35f98f7830c2f8955465532328348cd1 Signed-off-by: Yann E. MORIN (cherry picked from commit 0b2967e15800421efbdfe3a7a6061cf6bd84134d) Signed-off-by: Peter Korsgaard --- package/skeleton-init-sysv/skeleton/etc/fstab | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/skeleton-init-sysv/skeleton/etc/fstab b/package/skeleton-init-sysv/skeleton/etc/fstab index 169054b74f..06c20fe9d5 100644 --- a/package/skeleton-init-sysv/skeleton/etc/fstab +++ b/package/skeleton-init-sysv/skeleton/etc/fstab @@ -2,7 +2,7 @@ /dev/root / ext2 rw,noauto 0 1 proc /proc proc defaults 0 0 devpts /dev/pts devpts defaults,gid=5,mode=620,ptmxmode=0666 0 0 -tmpfs /dev/shm tmpfs mode=0777 0 0 +tmpfs /dev/shm tmpfs mode=1777 0 0 tmpfs /tmp tmpfs mode=1777 0 0 tmpfs /run tmpfs mode=0755,nosuid,nodev 0 0 sysfs /sys sysfs defaults 0 0 From 0155095c558e915d6c5261a4d8cb4ec9ee9953a7 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 7 May 2024 09:30:06 +0200 Subject: [PATCH 5519/5754] Update for 2024.02.2 Signed-off-by: Peter Korsgaard --- CHANGES | 28 ++++++++++++++++++++++++++++ Makefile | 4 ++-- support/misc/Vagrantfile | 2 +- 3 files changed, 31 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index 9643d52423..e5956a5138 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,31 @@ +2024.02.2, released May 7th, 2024 + + Important / security related fixes. + + Security: The /dev/shm entry in the default /etc/fstab used + for busybox and sysv init systems was missing the sticky bit, + allowing users to delete and replace other users files. + + Defconfigs: Mangopi mq1rdw1: Lock kernel headers to 6.6.x. + + Updated/fixed packages: apache, botan, + brcmfmac_sdio-firmware-rpi, clamav, cmake, containerd, + crucible, dmenu-wayland, dmraid, docker-cli, docker-engine, + domoticz, fmc, freeipmi, gdal, gdb, giflib, gnupg2, go, + google-breakpad, googlefontdirectory, imx-gpu-viv, inih, + libassuan, libblockdev, libcurl, libdrm, libgpg-error, + libksba, libnpth, libressl, libtracefs, lxc, mbedtls, mesa3d, + oatpp, opensc, oprofile, perl-net-ssleay, petitboot, + php-xdebug, psplash, python-pypng, python-segno, + python-service-identity, python3, skeleton-init-sysv, systemd, + tcf-agent, tiff, uuu, wolfssl, xmrig, zic + + Issues resolved (http://bugs.uclibc.org): + + #14416: Mesa3D missing DRI3 support for various Gallium drivers + #16009: 'select' does not work with 'choice' + #16036: android-tools version is too old + 2024.02.1, released March 26th, 2024 Important / security related fixes. diff --git a/Makefile b/Makefile index a9d54aa28b..4a62be9ff3 100644 --- a/Makefile +++ b/Makefile @@ -90,9 +90,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2024.02.1 +export BR2_VERSION := 2024.02.2 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1711445000 +BR2_VERSION_EPOCH = 1715067000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile index cb7a81af6e..ac595f5749 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2024.02.1' +RELEASE='2024.02.2' ### Change here for more memory/cores ### VM_MEMORY=2048 From c681f1dc7d3c6b88621fb77ad34bcbc85558cafe Mon Sep 17 00:00:00 2001 From: TIAN Yuanhao Date: Fri, 12 Apr 2024 20:39:57 +0200 Subject: [PATCH 5520/5754] package/ttyd: set CPE_ID_VALID cpe:2.3:a:ttyd_project:ttyd is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/DBEDA75E-4E19-48C1-92D7-43E4035BC048 Signed-off-by: TIAN Yuanhao [yann.morin.1998@free.fr: Move to its own patch] Signed-off-by: Yann E. MORIN (cherry picked from commit 7d4ba7eaf9ef352edbb120e256a270bbe0e2115d) Signed-off-by: Peter Korsgaard --- package/ttyd/ttyd.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/ttyd/ttyd.mk b/package/ttyd/ttyd.mk index d17e21d60b..b629e5a29c 100644 --- a/package/ttyd/ttyd.mk +++ b/package/ttyd/ttyd.mk @@ -9,5 +9,6 @@ TTYD_SITE = $(call github,tsl0922,ttyd,$(TTYD_VERSION)) TTYD_LICENSE = MIT TTYD_LICENSE_FILES = LICENSE TTYD_DEPENDENCIES = json-c libuv libwebsockets openssl zlib +TTYD_CPE_ID_VALID = YES $(eval $(cmake-package)) From 95f301fe98d357114f52b3a9ebb4cffae7ca0f7e Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 24 Apr 2024 18:11:36 +0200 Subject: [PATCH 5521/5754] package/elf2flt: fix riscv64 noMMU build Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6655119961 Signed-off-by: Waldemar Brodkorb Signed-off-by: Romain Naour (cherry picked from commit 8d366dbf562a959a3dca3ee6972d5a67f67aa885) Signed-off-by: Peter Korsgaard --- ...r-new-style-ctors-when-using-riscv64.patch | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 package/elf2flt/0001-fix-alignment-for-new-style-ctors-when-using-riscv64.patch diff --git a/package/elf2flt/0001-fix-alignment-for-new-style-ctors-when-using-riscv64.patch b/package/elf2flt/0001-fix-alignment-for-new-style-ctors-when-using-riscv64.patch new file mode 100644 index 0000000000..fea726dab2 --- /dev/null +++ b/package/elf2flt/0001-fix-alignment-for-new-style-ctors-when-using-riscv64.patch @@ -0,0 +1,34 @@ +From eead8d5e9f3911243182311f16178c25c6ea03c4 Mon Sep 17 00:00:00 2001 +From: Waldemar Brodkorb +Date: Sat, 23 Mar 2024 07:23:45 +0100 +Subject: [PATCH] fix alignment for new-style ctors when using riscv64 + +Recently uClibc-ng enabled UCLIBC_CTOR_DTOR for riscv64, so +that f.e. C++ applications are running fine. As a side effect +this breaks noMMU support. The problem is the alignment for +the ctors in elf2flt. This patch fixes it. + +Tested with Qemu for ARM, M68k and Xtensa with no regressions. + +Signed-off-by: Waldemar Brodkorb +Upstream: https://github.com/uclinux-dev/elf2flt/commit/eead8d5e9f3911243182311f16178c25c6ea03c4 +--- + elf2flt.ld.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/elf2flt.ld.in b/elf2flt.ld.in +index a99c69e..230c382 100644 +--- a/elf2flt.ld.in ++++ b/elf2flt.ld.in +@@ -139,7 +139,7 @@ R_RODAT: *(.gnu.linkonce.r*) + @SYMBOL_PREFIX@_ssro_size = @SYMBOL_PREFIX@_essro - @SYMBOL_PREFIX@_ssro; + PROVIDE(@SYMBOL_PREFIX@_SDA2_BASE_ = @SYMBOL_PREFIX@_ssro + (@SYMBOL_PREFIX@_ssro_size / 2)); + +- . = ALIGN(4) ; ++ . = ALIGN(8) ; + TOR: @SYMBOL_PREFIX@__CTOR_LIST__ = .; + TOR: LONG((@SYMBOL_PREFIX@__CTOR_END__ - @SYMBOL_PREFIX@__CTOR_LIST__) / 4 - 2) + SINGLE_LINK: /* gcc uses crtbegin.o to find the start of +-- +2.30.2 + From 35e8608c4ce40c27902cb7d1deabb1287e6080f5 Mon Sep 17 00:00:00 2001 From: Thomas Devoogdt Date: Wed, 24 Apr 2024 19:53:59 +0200 Subject: [PATCH 5522/5754] .github: add a pull request warning that explains the mailing list workflow MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Thomas Devoogdt Reviewed-by: J. Neuschäfer Signed-off-by: Yann E. MORIN (cherry picked from commit 32753c6f9d7c61e1c5b79925b00ad03fa76b5b22) Signed-off-by: Peter Korsgaard --- .github/pull_request_template.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .github/pull_request_template.md diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md new file mode 100644 index 0000000000..319e67d861 --- /dev/null +++ b/.github/pull_request_template.md @@ -0,0 +1,6 @@ +Please do not submit a Pull Request via GitHub. Buildroot makes use of a +[mailing list](http://lists.buildroot.org/mailman/listinfo/buildroot) for patch submission and review. +See [submitting your own patches](http://buildroot.org/manual.html#submitting-patches) for more info. + +Thanks for your help! + From 30ce03a445ed81706929953c289a4de08c958034 Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Thu, 25 Apr 2024 18:07:32 +0200 Subject: [PATCH 5523/5754] package/python-pillow: security bumo to version 10.3.0 In _imagingcms.c in Pillow before 10.3.0, a buffer overflow exists because strcpy is used instead of strncpy. Signed-off-by: Angelo Compagnucci Signed-off-by: Peter Korsgaard (cherry picked from commit dfaa34ddd3398f22718f7361d617d98d53b51630) Signed-off-by: Peter Korsgaard --- 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 001fb62676..073b758dfe 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 13de96f9f98bc1c26439d64576a48ac6 pillow-10.2.0.tar.gz -sha256 e87f0b2c78157e12d7686b27d63c070fd65d994e8ddae6f328e0dcf4a0cd007e pillow-10.2.0.tar.gz +# md5, sha256 https://pypi.org/project/pillow/10.3.0/#copy-hash-modal-125abe0d-59be-40cd-89a3-3e2f78136be0 +md5 6c21a12849ae42f93881f614d8f6f651 pillow-10.3.0.tar.gz +sha256 9d2455fbf44c914840c793e89aa82d0e1763a14253a000743719ae5946814b2d pillow-10.3.0.tar.gz # Locally computed sha256 checksums sha256 e706384c6f299d1b6fa782ae657740b372b4bd7938a1a318bf94ac249114758a LICENSE diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk index 10939d8467..b583d93d4c 100644 --- a/package/python-pillow/python-pillow.mk +++ b/package/python-pillow/python-pillow.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_PILLOW_VERSION = 10.2.0 -PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/f8/3e/32cbd0129a28686621434cbf17bb64bf1458bfb838f1f668262fefce145c +PYTHON_PILLOW_VERSION = 10.3.0 +PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/ef/43/c50c17c5f7d438e836c169e343695534c38c77f60e7c90389bd77981bc21 PYTHON_PILLOW_SOURCE = pillow-$(PYTHON_PILLOW_VERSION).tar.gz PYTHON_PILLOW_LICENSE = HPND PYTHON_PILLOW_LICENSE_FILES = LICENSE From 5177d62dce792246088a2b9a6d7bd0c24bd290b1 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 1 May 2024 23:26:27 +0200 Subject: [PATCH 5524/5754] package/python-pillow: fix legal info Commit dfaa34ddd3398f22718f7361d617d98d53b51630 forgot to update hash of LICENSE file: ERROR: LICENSE has wrong sha256 hash: ERROR: expected: e706384c6f299d1b6fa782ae657740b372b4bd7938a1a318bf94ac249114758a ERROR: got : cf234c27a3f275f5a050f4df3946f8855704226fe4e7ca8b33928cbcecbced37 LICENSE file has been updated to clean up authors and contributors: https://github.com/python-pillow/Pillow/commit/4197263dff19a79f13cd86f6cdc9a0ec6c06da92 Fixes: dfaa34ddd3398f22718f7361d617d98d53b51630 - http://autobuild.buildroot.org/results/5a35d83c73367e1b20534b1bc7f2f564cf653a38 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit b8a86f5a8fcf2930b17a165ead7274618b7aba75) Signed-off-by: Peter Korsgaard --- package/python-pillow/python-pillow.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-pillow/python-pillow.hash b/package/python-pillow/python-pillow.hash index 073b758dfe..352536a035 100644 --- a/package/python-pillow/python-pillow.hash +++ b/package/python-pillow/python-pillow.hash @@ -3,4 +3,4 @@ md5 6c21a12849ae42f93881f614d8f6f651 pillow-10.3.0.tar.gz sha256 9d2455fbf44c914840c793e89aa82d0e1763a14253a000743719ae5946814b2d pillow-10.3.0.tar.gz # Locally computed sha256 checksums -sha256 e706384c6f299d1b6fa782ae657740b372b4bd7938a1a318bf94ac249114758a LICENSE +sha256 cf234c27a3f275f5a050f4df3946f8855704226fe4e7ca8b33928cbcecbced37 LICENSE From e83045c4822072698bcfc6580707c2f2e70331ad Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 7 May 2024 22:03:21 +0200 Subject: [PATCH 5525/5754] package/php: security bump version to 8.2.18 Fixes CVE-2024-1874, CVE-2024-2756 & CVE-2024-3096. Changelog: https://www.php.net/ChangeLog-8.php#PHP_8_2 Release notes: https://news-web.php.net/php.announce/423 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 4ce3616de3..e8dc16bd61 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 28cdc995b7d5421711c7044294885fcde4390c9f67504a994b4cf9bc1b5cc593 php-8.2.16.tar.xz +sha256 44b306fc021e56441f691da6c3108788bd9e450f293b3bc70fcd64b08dd41a50 php-8.2.18.tar.xz # License file sha256 b42e4df5e50e6ecda1047d503d6d91d71032d09ed1027ba1ef29eed26f890c5a LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index 28893be4c6..e99e627389 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.2.16 +PHP_VERSION = 8.2.18 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From f357412f131a3200695aa8c8acfcba5b5a3e4f14 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 17 Apr 2024 18:19:14 +0200 Subject: [PATCH 5526/5754] package/tinycbor: override prefix at build time as well To ensure the correct prefix is used in the generated tinycbor.pc instead of /usr/local: >>> tinycbor 0.6.0 Building .. sed > tinycbor.pc < tinycbor.pc.in \ -e 's,@prefix@,/usr/local,' \ -e 's,@exec_prefix@,/usr/local,' \ -e 's,@libdir@,/usr/local/lib,' \ -e 's,@includedir@,/usr/local/include,' \ -e 's,@version@,0.6.0,' >>> tinycbor 0.6.0 Installing to staging directory .. install -m 644 tinycbor.pc /path/to/buildroot/output/host/aarch64-buildroot-linux-gnu/sysroot/usr/lib/pkgconfig/tinycbor.pc Signed-off-by: Peter Korsgaard (cherry picked from commit b059e084201108255db61a27824d4bb8159d1054) Signed-off-by: Peter Korsgaard --- package/tinycbor/tinycbor.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/tinycbor/tinycbor.mk b/package/tinycbor/tinycbor.mk index cad50e633b..d2fb583e67 100644 --- a/package/tinycbor/tinycbor.mk +++ b/package/tinycbor/tinycbor.mk @@ -16,7 +16,7 @@ ifeq ($(BR2_PACKAGE_CJSON),y) TINYCBOR_DEPENDENCIES += cjson endif -TINYCBOR_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) DISABLE_WERROR=1 V=1 +TINYCBOR_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) DISABLE_WERROR=1 V=1 prefix=/usr ifeq ($(BR2_STATIC_LIBS),y) TINYCBOR_MAKE_OPTS += BUILD_STATIC=1 BUILD_SHARED=0 @@ -34,12 +34,12 @@ endef define TINYCBOR_INSTALL_STAGING_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(TINYCBOR_MAKE_OPTS) -C $(@D) \ - DESTDIR=$(STAGING_DIR) prefix=/usr install + DESTDIR=$(STAGING_DIR) install endef define TINYCBOR_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(TINYCBOR_MAKE_OPTS) -C $(@D) \ - DESTDIR=$(TARGET_DIR) prefix=/usr install + DESTDIR=$(TARGET_DIR) install endef $(eval $(generic-package)) From 23337c0674b039cbd16ae9d655f83b2810e7a143 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 18 Apr 2024 19:09:34 +0200 Subject: [PATCH 5527/5754] package/freerdp: security bump to version 2.11.6 Fix the following CVEs: - CVE-2024-32041 [Low[ OutOfBound Read in zgfx_decompress_segment - CVE-2024-32039 [Moderate] Integer overflow & OutOfBound Write in clear_decompress_residual_data - CVE-2024-32040 [Low] integer underflow in nsc_rle_decode - CVE-2024-32458 [Low] OutOfBound Read in planar_skip_plane_rle - CVE-2024-32459 [Low] OutOfBound Read in ncrush_decompress - CVE-2024-32460 [Low] OutOfBound Read in interleaved_decompress https://github.com/FreeRDP/FreeRDP/releases/tag/2.11.6 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 1126be70ffb5c2b3255ceb9219362a8a45dd68d7) Signed-off-by: Peter Korsgaard --- package/freerdp/freerdp.hash | 4 ++-- package/freerdp/freerdp.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/freerdp/freerdp.hash b/package/freerdp/freerdp.hash index daf933e0af..9ac9b25066 100644 --- a/package/freerdp/freerdp.hash +++ b/package/freerdp/freerdp.hash @@ -1,5 +1,5 @@ -# From https://pub.freerdp.com/releases/freerdp-2.11.5.tar.gz.sha256 -sha256 70785ad9934d75aed1734f8918a05aff95788e58e53081e84651106b24303dc2 freerdp-2.11.5.tar.gz +# From https://pub.freerdp.com/releases/freerdp-2.11.6.tar.gz.sha256 +sha256 ad5a0c7761b18af914041ed50902d6c9fd553e65eeba8a1bea41c4149980b84c freerdp-2.11.6.tar.gz # Locally calculated sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk index 29b33f61c3..8e359cbb4f 100644 --- a/package/freerdp/freerdp.mk +++ b/package/freerdp/freerdp.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREERDP_VERSION = 2.11.5 +FREERDP_VERSION = 2.11.6 FREERDP_SITE = https://pub.freerdp.com/releases FREERDP_DEPENDENCIES = libglib2 openssl zlib FREERDP_LICENSE = Apache-2.0 From 6a9b7909bb3780c79625e3ca8d58f7494304a5cf Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Thu, 25 Apr 2024 17:55:42 +0200 Subject: [PATCH 5528/5754] package/openjpeg: security bump to version 2.5.2 Fixes the following security issues: CVE-2021-3575: A heap-based buffer overflow was found in openjpeg in color.c:379:42 in sycc420_to_rgb when decompressing a crafted .j2k file. An attacker could use this to execute arbitrary code with the permissions of the application compiled against openjpeg. Signed-off-by: Angelo Compagnucci Signed-off-by: Peter Korsgaard (cherry picked from commit ff36bc68cdba30f2a76da2b9f2047aa9a514e07e) Signed-off-by: Peter Korsgaard --- package/openjpeg/openjpeg.hash | 2 +- package/openjpeg/openjpeg.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/openjpeg/openjpeg.hash b/package/openjpeg/openjpeg.hash index cfa0e01b7d..1e72054724 100644 --- a/package/openjpeg/openjpeg.hash +++ b/package/openjpeg/openjpeg.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 0333806d6adecc6f7a91243b2b839ff4d2053823634d4f6ed7a59bc87409122a openjpeg-2.5.0.tar.gz +sha256 90e3896fed910c376aaf79cdd98bdfdaf98c6472efd8e1debf0a854938cbda6a openjpeg-2.5.2.tar.gz sha256 a6af136f3e15038a666b61f376612a07d9a4e48cb7c01adbf3e33b3f14ab49b6 LICENSE diff --git a/package/openjpeg/openjpeg.mk b/package/openjpeg/openjpeg.mk index 5b03a6cf58..e7cb7505e9 100644 --- a/package/openjpeg/openjpeg.mk +++ b/package/openjpeg/openjpeg.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENJPEG_VERSION = 2.5.0 +OPENJPEG_VERSION = 2.5.2 OPENJPEG_SITE = $(call github,uclouvain,openjpeg,v$(OPENJPEG_VERSION)) OPENJPEG_LICENSE = BSD-2-Clause OPENJPEG_LICENSE_FILES = LICENSE From 1f3d93d773d1d058016402624e0d73374625cfea Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 14 Apr 2024 16:16:53 +0200 Subject: [PATCH 5529/5754] {linux, linux-headers}: bump 4.19.x / 5.{4, 10, 15}.x / 6.{1, 6, 8}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (cherry picked from commit 9c592ecd3e599598856668736468b3ee54d8ceee) [Peter: drop 6.8.x bump] 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 d520dc379f..0a73bb9d67 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.6.22" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.6.27" 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 734ff27a58..ff681acbaf 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 23e3e7b56407250f5411bdab95763d0bc4e3a19dfa431d951df7eacabd61a2f4 linux-6.6.22.tar.xz -sha256 d150d2d9d416877668d8b56f75759f166168d192419eefaa942ed67225cbec06 linux-6.1.82.tar.xz +sha256 639e50060e3c8f23ed017cb10cfeacc6ba88ff5583812bb76859b4cc6a128291 linux-6.6.27.tar.xz +sha256 d3d3c8c44f0f0a870a95bd2823f9d91979d1aa6f266da5d8cccd0c4b15e3115b linux-6.1.86.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 f0805225f4a5b24d0bba9302c2c2f261c04f737ac5dd931da9b112e9f3e4a47e linux-5.15.152.tar.xz -sha256 84cf30223239ec3333a5f7b2a7fba2042bba70d1582a139f7543956af871ad80 linux-5.10.213.tar.xz -sha256 3599d5959a403e64be407d7f05e56cb270d6ddd154e89a596609919ab1e2e366 linux-5.4.272.tar.xz +sha256 c85859b86d2e6d1fc91ca1be8b44f24a9b5bb9f86869b04a8665a3a6559126e4 linux-5.15.155.tar.xz +sha256 879ca159c34ea9d3a6775f292cc59c2d3931d57dca00f0bebe2675ea0c82c6a9 linux-5.10.215.tar.xz +sha256 eac7b421a43cd46a3dbebf7c85d075faa7e164d80d215d31fcd35544b6f79ed4 linux-5.4.274.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 95ec94c4ab8f46d8a54430893f9bd653c46b0f1587d216818aa8f52fd313de69 linux-4.19.310.tar.xz +sha256 a394fa5ffe321ee43dae9cccc724572f49fbb289875d39ea695adf712e51f74a linux-4.19.312.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 f95fb703f0..70e4493a64 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -403,12 +403,12 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.19.310" if BR2_KERNEL_HEADERS_4_19 - default "5.4.272" if BR2_KERNEL_HEADERS_5_4 - default "5.10.213" if BR2_KERNEL_HEADERS_5_10 - default "5.15.152" if BR2_KERNEL_HEADERS_5_15 - default "6.1.82" if BR2_KERNEL_HEADERS_6_1 - default "6.6.22" if BR2_KERNEL_HEADERS_6_6 + default "4.19.312" if BR2_KERNEL_HEADERS_4_19 + default "5.4.274" if BR2_KERNEL_HEADERS_5_4 + default "5.10.215" if BR2_KERNEL_HEADERS_5_10 + default "5.15.155" if BR2_KERNEL_HEADERS_5_15 + default "6.1.86" if BR2_KERNEL_HEADERS_6_1 + default "6.6.27" 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 fe069fe639f5963882602a184841fa8235a22469 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 28 Apr 2024 19:01:00 +0200 Subject: [PATCH 5530/5754] package/docker-engine: security bump to version 26.0.2 Fixes the following security issues: CVE-2024-32473: Ensure IPv6 is disabled on interfaces only allocated an IPv4 address by the engine https://github.com/moby/moby/security/advisories/GHSA-x84c-p2g9-rqv9 Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 8e37a887e6c65ba5ef685e4ffb5b11a5d364592f) 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 5c76b99af3..91bc3d8df2 100644 --- a/package/docker-engine/docker-engine.hash +++ b/package/docker-engine/docker-engine.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 fae1aabb63ed5cf6d302a5f4266ed092716b1cea9a974a9d61154ef31b03c302 docker-engine-26.0.0.tar.gz +sha256 f1cf6a2e69607daa0e2ae9b5be752dc269ab30dee16f5f2180f7ff7f29270606 docker-engine-26.0.2.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index 86106d3ccb..f8dc87050f 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_ENGINE_VERSION = 26.0.0 +DOCKER_ENGINE_VERSION = 26.0.2 DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 From 5e039782c36bf348436aeea850d46f57b7bdf40d Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 28 Apr 2024 19:01:01 +0200 Subject: [PATCH 5531/5754] package/docker-cli: bump version to 26.0.2 https://github.com/moby/moby/releases/tag/v26.0.2 Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 49c8154ee7bb2b6e720652af77961b230106ffa6) 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 26558814c1..d8bfb1d824 100644 --- a/package/docker-cli/docker-cli.hash +++ b/package/docker-cli/docker-cli.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 96ed5d7c33a12f505d13fa03fa48f94cb41cf871178df0df84aa0b76839ad321 docker-cli-26.0.0.tar.gz +sha256 b047e180c94452b4375f7e43997286e5a5712e66b1280574974b2e117b4e43bd docker-cli-26.0.2.tar.gz sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE diff --git a/package/docker-cli/docker-cli.mk b/package/docker-cli/docker-cli.mk index 5f9242329a..69c6f12f3c 100644 --- a/package/docker-cli/docker-cli.mk +++ b/package/docker-cli/docker-cli.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CLI_VERSION = 26.0.0 +DOCKER_CLI_VERSION = 26.0.2 DOCKER_CLI_SITE = $(call github,docker,cli,v$(DOCKER_CLI_VERSION)) DOCKER_CLI_LICENSE = Apache-2.0 From 0d9357b3ccadb96d9ff9bff829e582bed8b100a1 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Mon, 22 Apr 2024 09:38:39 +0200 Subject: [PATCH 5532/5754] package/speechd: set CPE_ID_VENDOR (to silence mismatched CVE warning) - set CPE_ID_VENDOR to silence mismatched CVE-2001-0956 ([1], [2]) warning clearly aiming some other product/version ("speechd 0.54 with Festival or rsynth speech synthesis package") [1] https://security-tracker.debian.org/tracker/CVE-2001-0956 [2] https://github.com/advisories/GHSA-67cw-4jhh-3jm7 Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN (cherry picked from commit 206527347c1f63d24d871bf5dcb065861bd1c2a4) Signed-off-by: Peter Korsgaard --- package/speechd/speechd.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/speechd/speechd.mk b/package/speechd/speechd.mk index 7d50f88c1d..669bec0634 100644 --- a/package/speechd/speechd.mk +++ b/package/speechd/speechd.mk @@ -8,6 +8,7 @@ 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 +SPEECHD_CPE_ID_VENDOR = brailcom SPEECHD_INSTALL_STAGING = YES # speechd source code is released without configure script SPEECHD_AUTORECONF = YES From f5a347c1dc11297f57d1b33aaf4f9c936fa2d241 Mon Sep 17 00:00:00 2001 From: Robert Marko Date: Mon, 8 Apr 2024 23:16:09 +0200 Subject: [PATCH 5533/5754] kconfig/lxdialog: fix check() with GCC14 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit GCC14 now treats implicit int types as error so when check() from check-lxdialog.sh is called to check whether we can link against ncurses it will fail silently and the help text indicating to install ncurses is printed. However, this is not due to missing ncurses but once the stderr redirect to /dev/null is removed we can see the root cause: :2:1: error: return type defaults to ‘int’ [-Wimplicit-int] So, in order for menuconfig to work with GCC14 lets just specify the return type of main() as int. Npte that the upstream kconfig in the linux kernel source tree no longer carries or uses the check-lxdialog.sh script since commit 1c5af5cf9308 (kconfig: refactor ncurses package checks for building mconf and nconf), so there is no commit we can backport to our kconfig copy. Signed-off-by: Robert Marko Reviewed-by: Petr Vorel Tested-by: Petr Vorel [yann.morin.1998@free.fr: add note about upstream kernel] Signed-off-by: Yann E. MORIN (cherry picked from commit a6210d28dbf66b2f0a42d945711dfd93c7329feb) Signed-off-by: Peter Korsgaard --- support/kconfig/lxdialog/check-lxdialog.sh | 2 +- ...config-lxdialog-fix-check-with-GCC14.patch | 43 +++++++++++++++++++ support/kconfig/patches/series | 1 + 3 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 support/kconfig/patches/22-kconfig-lxdialog-fix-check-with-GCC14.patch diff --git a/support/kconfig/lxdialog/check-lxdialog.sh b/support/kconfig/lxdialog/check-lxdialog.sh index 16cd9a3186..27d6c30a57 100755 --- a/support/kconfig/lxdialog/check-lxdialog.sh +++ b/support/kconfig/lxdialog/check-lxdialog.sh @@ -48,7 +48,7 @@ trap "rm -f $tmp" 0 1 2 3 15 check() { $cc -x c - -o $tmp 2>/dev/null <<'EOF' #include CURSES_LOC -main() {} +int main() {} EOF if [ $? != 0 ]; then echo " *** Unable to find the ncurses libraries or the" 1>&2 diff --git a/support/kconfig/patches/22-kconfig-lxdialog-fix-check-with-GCC14.patch b/support/kconfig/patches/22-kconfig-lxdialog-fix-check-with-GCC14.patch new file mode 100644 index 0000000000..41081bb45d --- /dev/null +++ b/support/kconfig/patches/22-kconfig-lxdialog-fix-check-with-GCC14.patch @@ -0,0 +1,43 @@ +From 3ae91337b53fa3ccf0bad7f181fcaf483fab22ee Mon Sep 17 00:00:00 2001 +From: Robert Marko +Date: Wed, 3 Apr 2024 14:18:07 +0200 +Subject: [PATCH] kconfig/lxdialog: fix check() with GCC14 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +GCC14 now treats implicit int types as error so when check() from +check-lxdialog.sh is called to check whether we can link against ncurses +it will fail silently and the help text indicating to install ncurses is +printed. + +However, this is not due to missing ncurses but once the stderr redirect +to /dev/null is removed we can see the root cause: +:2:1: error: return type defaults to ‘int’ [-Wimplicit-int] + +So, in order for menuconfig to work with GCC14 lets just specify the +return type of main() as int. + +Signed-off-by: Robert Marko +Reviewed-by: Petr Vorel +Tested-by: Petr Vorel +--- + kconfig/lxdialog/check-lxdialog.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/kconfig/lxdialog/check-lxdialog.sh b/kconfig/lxdialog/check-lxdialog.sh +index 16cd9a3186..27d6c30a57 100755 +--- a/kconfig/lxdialog/check-lxdialog.sh ++++ b/kconfig/lxdialog/check-lxdialog.sh +@@ -48,7 +48,7 @@ trap "rm -f $tmp" 0 1 2 3 15 + check() { + $cc -x c - -o $tmp 2>/dev/null <<'EOF' + #include CURSES_LOC +-main() {} ++int main() {} + EOF + if [ $? != 0 ]; then + echo " *** Unable to find the ncurses libraries or the" 1>&2 +-- +2.44.0 + diff --git a/support/kconfig/patches/series b/support/kconfig/patches/series index e5a6f69d8f..f120e323b7 100644 --- a/support/kconfig/patches/series +++ b/support/kconfig/patches/series @@ -10,3 +10,4 @@ 19-merge_config.sh-add-br2-external-support.patch 20-merge_config.sh-Allow-to-define-config-prefix.patch 21-Avoid-false-positive-matches-from-comment-lines.patch +22-kconfig-lxdialog-fix-check-with-GCC14.patch From c8a229c85015b1a44911b5daa30238dcf925c72c Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 24 Apr 2024 21:59:43 +0200 Subject: [PATCH 5534/5754] support/testing: TestATFAllwinner: add missing openssl dependency The commit [1] updated the u-boot version with the one used by orangepi_zero_plus2_defconfig but the dependency on openssl was forgotten. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6703221868 [1] eb16148dddc6be39b0d850181c2461fdaba1ee6f Signed-off-by: Romain Naour (cherry picked from commit bc75b09b1c18541abaa47fc34eab44e91e2018ca) Signed-off-by: Peter Korsgaard --- support/testing/tests/boot/test_atf.py | 1 + 1 file changed, 1 insertion(+) diff --git a/support/testing/tests/boot/test_atf.py b/support/testing/tests/boot/test_atf.py index 352725e721..b0e7696e86 100644 --- a/support/testing/tests/boot/test_atf.py +++ b/support/testing/tests/boot/test_atf.py @@ -19,6 +19,7 @@ class TestATFAllwinner(infra.basetest.BRTest): BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero_plus2" BR2_TARGET_UBOOT_NEEDS_DTC=y + BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y From 0b892513d02a3ce7cfb30127764652f676a28ffe Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 24 Apr 2024 22:10:33 +0200 Subject: [PATCH 5535/5754] support/testing: TestF2FS: update kernel to 4.19.310 Since the toolchain Bootlin update to 2023.11-1 [1], the arm Linux kernel build is broken with binutils >= 2.41 with: arch/arm/mm/proc-v7.S: Assembler messages: arch/arm/mm/proc-v7.S:640: Error: junk at end of line, first unrecognized character is `#' A similar issue has already be fixed for qemu m68k [2]. Bump to the latest kernel 4.19 that already include the backport of 790756c7e022 ("ARM: 8933/1: replace Sun/Solaris style flag on section directive") [1] 7e0e6e3b8618ab942f25b11ee72fbc5a4deefdf1 [2] a1ce9474e40f731f327035d8c0962abb16f00ff7 Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6703222383 Signed-off-by: Romain Naour (cherry picked from commit 7e126bd38d5eedb49cd29699c1afe8b53edd71e0) Signed-off-by: Peter Korsgaard --- support/testing/tests/fs/test_f2fs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/testing/tests/fs/test_f2fs.py b/support/testing/tests/fs/test_f2fs.py index 425fbe31ca..826077ac94 100644 --- a/support/testing/tests/fs/test_f2fs.py +++ b/support/testing/tests/fs/test_f2fs.py @@ -20,7 +20,7 @@ class TestF2FS(infra.basetest.BRTest): # BR2_TARGET_ROOTFS_TAR is not set 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="4.19.310" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="vexpress" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{}" From cd987cbcc13f4f6fa74be0b4dde511bc1642a31e Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Fri, 12 Apr 2024 21:53:46 +0200 Subject: [PATCH 5536/5754] configs/wandboard: uboot needs openssl Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6609466641 Signed-off-by: Julien Olivain Reviewed-by: Fabio Estevam Signed-off-by: Romain Naour (cherry picked from commit ffe920b6447a9138cd679f98ecffccbcae0d107c) Signed-off-by: Peter Korsgaard --- configs/wandboard_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/wandboard_defconfig b/configs/wandboard_defconfig index 522173b8ed..b110c292dd 100644 --- a/configs/wandboard_defconfig +++ b/configs/wandboard_defconfig @@ -26,6 +26,7 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="wandboard" BR2_TARGET_UBOOT_FORMAT_IMG=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" From f113543d83d57f9c5ef621e03b4934e2623e20f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gero=20Schw=C3=A4ricke?= Date: Tue, 2 Apr 2024 21:08:52 +0000 Subject: [PATCH 5537/5754] configs/sipeed_licheepi_nano_defconfig: fix missing linux headers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The build failed with: Incorrect selection of kernel headers: expected 6.8.x, got 6.5.x Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6498278078 Signed-off-by: Gero Schwäricke Signed-off-by: Romain Naour (cherry picked from commit f5aac04c362b593011ce245549d4bfc3311dbe9d) Signed-off-by: Peter Korsgaard --- configs/sipeed_licheepi_nano_defconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configs/sipeed_licheepi_nano_defconfig b/configs/sipeed_licheepi_nano_defconfig index 8be26165d9..6eb4a3069d 100644 --- a/configs/sipeed_licheepi_nano_defconfig +++ b/configs/sipeed_licheepi_nano_defconfig @@ -9,6 +9,9 @@ BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/sipeed/licheepi_nano/genimage.cfg" +# Linux headers same as kernel +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_5=y + # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y From e036a25271ceedb8b9839437832c3bccd2075e14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gero=20Schw=C3=A4ricke?= Date: Wed, 3 Apr 2024 22:24:44 +0000 Subject: [PATCH 5538/5754] configs/raspberrypizero2w_defconfig: fix typo in headers series option MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The build for this defconfig fails with: Incorrect selection of kernel headers: expected 6.8.x, got 6.1.x Found with the following command while trying to find boards that have missing custom headers series: grep --null --recursive --files-without-match "BR2_TOOLCHAIN_EXTERNAL=y" ./configs \ | xargs --null grep --null --files-with-matches "BR2_LINUX_KERNEL_CUSTOM_.*=y" \ | xargs --null grep --null --files-without-match "BR2_KERNEL_HEADERS_[0-9]\+_[0-9]\+=y"\ | xargs --null grep --files-without-match "BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_[0-9]\+_[0-9]\+=y" ./configs/mangopi_mq1rdw2_defconfig # patch pending ./configs/raspberrypizero2w_defconfig ./configs/sipeed_licheepi_nano_defconfig # patch pending Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6712162631 Signed-off-by: Gero Schwäricke [Romain: add gitlab-ci link] Signed-off-by: Romain Naour (cherry picked from commit dc18b639c93f972246fce345b43dc091d07d35ca) Signed-off-by: Peter Korsgaard --- configs/raspberrypizero2w_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/raspberrypizero2w_defconfig b/configs/raspberrypizero2w_defconfig index 1bf335c076..e152889f2d 100644 --- a/configs/raspberrypizero2w_defconfig +++ b/configs/raspberrypizero2w_defconfig @@ -3,7 +3,7 @@ BR2_cortex_a53=y BR2_ARM_FPU_NEON_VFPV4=y # Linux headers same as kernel, 6.1 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6.1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_TOOLCHAIN_BUILDROOT_CXX=y From 3c14bcebcb657fee1bed615a6b8073add9a0975b Mon Sep 17 00:00:00 2001 From: Konstantin Aladyshev Date: Sun, 31 Mar 2024 00:22:00 +0300 Subject: [PATCH 5539/5754] configs/pc_x86_64_{bios, efi}_defconfig: add wireless regdb Wireless regulatory database lists the allowed radio frequencies for each local jurisdiction. Since linux-4.15 the kernel supports loading the files regulatory.db/regulatory.db.p7s directly from the /lib/firmware directory. Currently this package is not enabled and kernel complains with the following message on every boot: """ platform regulatory.0: Direct firmware load for regulatory.db failed with error -2 cfg80211: failed to load regulatory.db """ Add wireless regulatory database package to fix the issue. Signed-off-by: Konstantin Aladyshev Signed-off-by: Thomas Petazzoni (cherry picked from commit 16e9f514905a12caab1d1b308dd95f8b79977828) Signed-off-by: Peter Korsgaard --- 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 6032544d2d..cba92ad93d 100644 --- a/configs/pc_x86_64_bios_defconfig +++ b/configs/pc_x86_64_bios_defconfig @@ -62,3 +62,4 @@ BR2_PACKAGE_ACPID=y BR2_PACKAGE_CONNMAN=y BR2_PACKAGE_CONNMAN_CLIENT=y BR2_PACKAGE_CONNMAN_WIFI=y +BR2_PACKAGE_WIRELESS_REGDB=y diff --git a/configs/pc_x86_64_efi_defconfig b/configs/pc_x86_64_efi_defconfig index afb652f3fc..fe6686b4a2 100644 --- a/configs/pc_x86_64_efi_defconfig +++ b/configs/pc_x86_64_efi_defconfig @@ -63,3 +63,4 @@ BR2_PACKAGE_ACPID=y BR2_PACKAGE_CONNMAN=y BR2_PACKAGE_CONNMAN_CLIENT=y BR2_PACKAGE_CONNMAN_WIFI=y +BR2_PACKAGE_WIRELESS_REGDB=y From 8811a2d0ebaff24bb6e94da1897378c52ebf24b9 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Mon, 1 Apr 2024 21:17:20 +0200 Subject: [PATCH 5540/5754] package/fluidsynth: bump to version 2.3.5 For change log since v2.3.4, see: - https://github.com/FluidSynth/fluidsynth/releases/tag/v2.3.5 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit 0215a6d6f68e03909f54f4bbb160161b8d80503d) Signed-off-by: Peter Korsgaard --- 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 824f246a2c..91d8778cbf 100644 --- a/package/fluidsynth/fluidsynth.hash +++ b/package/fluidsynth/fluidsynth.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 1529ef5bc3b9ef3adc2a7964505912f7305103e269e50cc0316f500b22053ac9 fluidsynth-2.3.4.tar.gz +sha256 f89e8e983ecfb4a5b4f5d8c2b9157ed18d15ed2e36246fa782f18abaea550e0d fluidsynth-2.3.5.tar.gz sha256 9b872a8a070b8ad329c4bd380fb1bf0000f564c75023ec8e1e6803f15364b9e9 LICENSE diff --git a/package/fluidsynth/fluidsynth.mk b/package/fluidsynth/fluidsynth.mk index 4317c6e460..ef05b6a569 100644 --- a/package/fluidsynth/fluidsynth.mk +++ b/package/fluidsynth/fluidsynth.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLUIDSYNTH_VERSION = 2.3.4 +FLUIDSYNTH_VERSION = 2.3.5 FLUIDSYNTH_SITE = $(call github,FluidSynth,fluidsynth,v$(FLUIDSYNTH_VERSION)) FLUIDSYNTH_LICENSE = LGPL-2.1+ FLUIDSYNTH_LICENSE_FILES = LICENSE From bb7a0c27d4bca705089f7d17d5a6c302545f2539 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 30 Mar 2024 23:11:22 +0100 Subject: [PATCH 5541/5754] package/apcupsd: set ac_cv_path_SHUTDOWN Set ac_cv_path_SHUTDOWN to /sbin/shutdown to avoid the following build failure when shutdown is not available on host raised since the addition of the package in commit d12b63b741586b89c4017551308c43512a617287: configure: error: Missing required tool; need any one of: shutdown shutdown.bsd Fixes: d12b63b741586b89c4017551308c43512a617287 - http://autobuild.buildroot.org/results/a8bbb5ced8343e08070361f260050de422144710 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 640a79000b028eef3f54ba18e450c27bbeea9f56) Signed-off-by: Peter Korsgaard --- package/apcupsd/apcupsd.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/apcupsd/apcupsd.mk b/package/apcupsd/apcupsd.mk index 97e6d6a558..43a016678d 100644 --- a/package/apcupsd/apcupsd.mk +++ b/package/apcupsd/apcupsd.mk @@ -11,6 +11,7 @@ APCUPSD_LICENSE_FILES = COPYING APCUPSD_CPE_ID_VENDOR = apcupsd APCUPSD_SELINUX_MODULES = apache apcupsd APCUPSD_CONF_OPTS = --disable-test +APCUPSD_CONF_ENV = ac_cv_path_SHUTDOWN=/sbin/shutdown ifneq ($(BR2_PACKAGE_APCUPSD_MODBUS_USB)$(BR2_PACKAGE_APCUPSD_USB),) APCUPSD_CONF_ENV += ac_cv_path_usbcfg=$(STAGING_DIR)/usr/bin/libusb-config From f2eb2273170e9d12e44fd56c707e54ddc245b949 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 30 Mar 2024 19:56:20 +0100 Subject: [PATCH 5542/5754] package/coreutils: drop gmp optional dependency libgmp is included in coreutils (through bootstrap.conf) since bump to version 9.0 in commit 2ee43bad85693d1c96e14f5b39ccb13a8982f50a and https://git.savannah.gnu.org/cgit/coreutils.git/commit/?id=13046444888a7e96f48d28fdd5a6ffe03d4ab036: configure: WARNING: unrecognized options: --disable-gtk-doc, --disable-gtk-doc-html, --disable-doc, --disable-docs, --disable-documentation, --with-xmlto, --with-fop, --enable-ipv6, --enable-static, --enable-shared, --without-gmp Fixes: 2ee43bad85693d1c96e14f5b39ccb13a8982f50a Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 16463a00affa0ba4814e583bcd544174528f371e) Signed-off-by: Peter Korsgaard --- package/coreutils/coreutils.mk | 6 ------ 1 file changed, 6 deletions(-) diff --git a/package/coreutils/coreutils.mk b/package/coreutils/coreutils.mk index e9cb7b67cb..846d4fa567 100644 --- a/package/coreutils/coreutils.mk +++ b/package/coreutils/coreutils.mk @@ -75,12 +75,6 @@ ifeq ($(BR2_PACKAGE_GETTEXT_PROVIDES_LIBINTL),y) COREUTILS_CONF_OPTS += --with-libintl-prefix=$(STAGING_DIR)/usr endif -ifeq ($(BR2_PACKAGE_GMP),y) -COREUTILS_DEPENDENCIES += gmp -else -COREUTILS_CONF_OPTS += --without-gmp -endif - ifeq ($(BR2_PACKAGE_LIBCAP),y) COREUTILS_DEPENDENCIES += libcap else From 1f383f120e5f32c597d767ed202bc10a88f99898 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 20 Apr 2024 12:54:41 +0200 Subject: [PATCH 5543/5754] support/testing: add iperf runtime test Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit 6317f6c9a4107d3409530b653c5900bff17ffb6e) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + support/testing/tests/package/test_iperf.py | 23 +++++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 support/testing/tests/package/test_iperf.py diff --git a/DEVELOPERS b/DEVELOPERS index a2a2c56a13..cab7258cb1 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1789,6 +1789,7 @@ 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_iozone.py +F: support/testing/tests/package/test_iperf.py F: support/testing/tests/package/test_iperf3.py F: support/testing/tests/package/test_iptables.py F: support/testing/tests/package/test_jailhouse.py diff --git a/support/testing/tests/package/test_iperf.py b/support/testing/tests/package/test_iperf.py new file mode 100644 index 0000000000..31f04d9896 --- /dev/null +++ b/support/testing/tests/package/test_iperf.py @@ -0,0 +1,23 @@ +import os + +import infra.basetest + + +class TestIperf(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_IPERF=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("iperf --version") + self.assertRunOk("iperf -s -D") + self.assertRunOk("iperf -c 127.0.0.1 -t 3") From 2b8ca3cfbeb221a787c60d705f1670be8da2e539 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 20 Apr 2024 15:28:17 +0200 Subject: [PATCH 5544/5754] support/testing: add fwts runtime test Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit 7c1faf997f868586a40a9cb6f03166d85a67b8f8) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + support/testing/tests/package/test_fwts.py | 67 ++++++++++++++++++++++ 2 files changed, 68 insertions(+) create mode 100644 support/testing/tests/package/test_fwts.py diff --git a/DEVELOPERS b/DEVELOPERS index cab7258cb1..8f58b47fe0 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1777,6 +1777,7 @@ F: support/testing/tests/package/test_file/ F: support/testing/tests/package/test_fluidsynth.py F: support/testing/tests/package/test_fluidsynth/ F: support/testing/tests/package/test_fping.py +F: support/testing/tests/package/test_fwts.py F: support/testing/tests/package/test_gawk.py F: support/testing/tests/package/test_ghostscript.py F: support/testing/tests/package/test_ghostscript/ diff --git a/support/testing/tests/package/test_fwts.py b/support/testing/tests/package/test_fwts.py new file mode 100644 index 0000000000..ef792136c2 --- /dev/null +++ b/support/testing/tests/package/test_fwts.py @@ -0,0 +1,67 @@ +import os + +import infra.basetest + + +class TestFwts(infra.basetest.BRTest): + config = \ + """ + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_TARGET_ROOTFS_EXT2=y + BR2_TARGET_ROOTFS_EXT2_4=y + # BR2_TARGET_ROOTFS_TAR is not set + BR2_TARGET_ROOTFS_EXT2_SIZE="128M" + BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/aarch64-sbsa/assemble-flash-images support/scripts/genimage.sh" + BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/qemu/aarch64-sbsa/genimage.cfg" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.28" + BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y + BR2_TARGET_EDK2=y + BR2_TARGET_EDK2_PLATFORM_QEMU_SBSA=y + 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_FWTS=y + BR2_PACKAGE_FWTS_EFI_RUNTIME_MODULE=y + BR2_PACKAGE_HOST_GENIMAGE=y + BR2_PACKAGE_HOST_DOSFSTOOLS=y + BR2_PACKAGE_HOST_MTOOLS=y + """ + + def test_run(self): + hda = os.path.join(self.builddir, "images", "disk.img") + flash0 = os.path.join(self.builddir, "images", "SBSA_FLASH0.fd") + flash1 = os.path.join(self.builddir, "images", "SBSA_FLASH1.fd") + self.emulator.boot(arch="aarch64", + options=["-M", "sbsa-ref", + "-cpu", "cortex-a57", + "-m", "512M", + "-pflash", flash0, + "-pflash", flash1, + "-hda", hda]) + self.emulator.login() + + # Check the program can execute. + self.assertRunOk("fwts --version") + + # We run a simple UEFI runtime service variable interface test + # suite. Those tests are using the fwts efi_runtime kernel + # module. + self.assertRunOk("fwts -q uefirtvariable", timeout=30) + + # The previous fwts invocation is expected to have created a + # "results.log" report. We check the file exists and contains + # a known header string. + expected_str = "Results generated by fwts:" + cmd = f"grep -F '{expected_str}' results.log" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + self.assertTrue(out[0].startswith(expected_str)) From 48275e431f5f3ba3ef1c1290d3b28d5c31821172 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 20 Apr 2024 16:36:17 +0200 Subject: [PATCH 5545/5754] package/fwts: update _SITE url to use https The http URL redirects to https. This commit updates this URL to directly use https. Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit 2aa3a23bbe755ef73af7dfbb65dd8ec60c8c1865) Signed-off-by: Peter Korsgaard --- package/fwts/fwts.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/fwts/fwts.mk b/package/fwts/fwts.mk index f06609777d..a3f91ee495 100644 --- a/package/fwts/fwts.mk +++ b/package/fwts/fwts.mk @@ -6,7 +6,7 @@ FWTS_VERSION = 23.07.00 FWTS_SOURCE = fwts-V$(FWTS_VERSION).tar.gz -FWTS_SITE = http://fwts.ubuntu.com/release +FWTS_SITE = https://fwts.ubuntu.com/release FWTS_STRIP_COMPONENTS = 0 FWTS_LICENSE = GPL-2.0, LGPL-2.1, Custom FWTS_LICENSE_FILES = debian/copyright From 4415daf635e56f55993eafdd196864ebab5b6d3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= Date: Fri, 26 Apr 2024 09:13:03 +0200 Subject: [PATCH 5546/5754] package/linux-pam: bump to version 1.6.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bump to latest version, fixing couple of bugs. Remove patch already included in this release. https://github.com/linux-pam/linux-pam/releases/tag/v1.6.1 Signed-off-by: Jan Čermák Signed-off-by: Thomas Petazzoni (cherry picked from commit 0d394c39b8f26ba6e65771cd4afdcc4fac0ed0e8) Signed-off-by: Peter Korsgaard --- .../0001-pam_namespace-include-stdint-h.patch | 42 ------------------- package/linux-pam/linux-pam.hash | 4 +- package/linux-pam/linux-pam.mk | 2 +- 3 files changed, 3 insertions(+), 45 deletions(-) delete mode 100644 package/linux-pam/0001-pam_namespace-include-stdint-h.patch diff --git a/package/linux-pam/0001-pam_namespace-include-stdint-h.patch b/package/linux-pam/0001-pam_namespace-include-stdint-h.patch deleted file mode 100644 index 5eda619505..0000000000 --- a/package/linux-pam/0001-pam_namespace-include-stdint-h.patch +++ /dev/null @@ -1,42 +0,0 @@ -From cc9d40b7cdbd3e15ccaa324a0dda1680ef9dea13 Mon Sep 17 00:00:00 2001 -From: Jacob Heider -Date: Wed, 17 Jan 2024 11:49:26 -0500 -Subject: [PATCH] pam_namespace: include stdint.h - -pam_namespace.c makes use of SIZE_MAX but doesn't include stdint.h, -resulting in the following build failures on 1.6.0: - - pam_namespace.c: In function 'process_line': - pam_namespace.c:649:41: error: 'SIZE_MAX' undeclared (first use in this function) - 649 | if (count > UINT_MAX || count > SIZE_MAX / sizeof(uid_t)) { - | ^~~~~~~~ - pam_namespace.c:41:1: note: 'SIZE_MAX' is defined in header ''; did you forget to '#include '? - 40 | #include "argv_parse.h" - +++ |+#include - 41 | - pam_namespace.c:649:41: note: each undeclared identifier is reported only once for each function it appears in - 649 | if (count > UINT_MAX || count > SIZE_MAX / sizeof(uid_t)) { - | ^~~~~~~~ - -Fixes: v1.6.0~100 ("pam_namespace: validate amount of uids in config") -Resolves: https://github.com/linux-pam/linux-pam/issues/733 - -Upstream: https://github.com/linux-pam/linux-pam/commit/cc9d40b7cdbd3e15ccaa324a0dda1680ef9dea13 -Signed-off-by: Fabrice Fontaine ---- - modules/pam_namespace/pam_namespace.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/modules/pam_namespace/pam_namespace.c b/modules/pam_namespace/pam_namespace.c -index f72d67189..b16731c22 100644 ---- a/modules/pam_namespace/pam_namespace.c -+++ b/modules/pam_namespace/pam_namespace.c -@@ -34,6 +34,8 @@ - - #define _ATFILE_SOURCE - -+#include "config.h" -+#include - #include "pam_cc_compat.h" - #include "pam_inline.h" - #include "pam_namespace.h" diff --git a/package/linux-pam/linux-pam.hash b/package/linux-pam/linux-pam.hash index cd882715cb..353613e6e6 100644 --- a/package/linux-pam/linux-pam.hash +++ b/package/linux-pam/linux-pam.hash @@ -1,6 +1,6 @@ # Locally computed hashes after checking signature at -# https://github.com/linux-pam/linux-pam/releases/download/v1.6.0/Linux-PAM-1.6.0.tar.xz.asc +# https://github.com/linux-pam/linux-pam/releases/download/v1.6.1/Linux-PAM-1.6.1.tar.xz.asc # signed with the key 8C6BFD92EE0F42EDF91A6A736D1A7F052E5924BB -sha256 fff4a34e5bbee77e2e8f1992f27631e2329bcbf8a0563ddeb5c3389b4e3169ad Linux-PAM-1.6.0.tar.xz +sha256 f8923c740159052d719dbfc2a2f81942d68dd34fcaf61c706a02c9b80feeef8e Linux-PAM-1.6.1.tar.xz # Locally computed sha256 133d98e7a2ab3ffd330b4debb0bfc10fea21e4b2b5a5b09de2e924293be5ff08 Copyright diff --git a/package/linux-pam/linux-pam.mk b/package/linux-pam/linux-pam.mk index 89a46e81df..a205d67c54 100644 --- a/package/linux-pam/linux-pam.mk +++ b/package/linux-pam/linux-pam.mk @@ -4,7 +4,7 @@ # ################################################################################ -LINUX_PAM_VERSION = 1.6.0 +LINUX_PAM_VERSION = 1.6.1 LINUX_PAM_SOURCE = Linux-PAM-$(LINUX_PAM_VERSION).tar.xz LINUX_PAM_SITE = https://github.com/linux-pam/linux-pam/releases/download/v$(LINUX_PAM_VERSION) LINUX_PAM_INSTALL_STAGING = YES From 27e7c199cf14804e038c5b550e050c76ec27ac9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?= Date: Thu, 18 Apr 2024 15:30:35 +0200 Subject: [PATCH 5547/5754] DEVELOPERS: add myself for Armadeus boards MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sébastien Szymanski Signed-off-by: Romain Naour (cherry picked from commit 74c0cf2152415ab99c93d4d03acd7bfec39fd511) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 8f58b47fe0..88c266293b 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2761,6 +2761,8 @@ F: support/testing/tests/package/sample_nu.nu F: support/testing/tests/package/test_nu.py N: Sébastien Szymanski +F: board/armadeus/ +F: configs/armadeus* F: package/mmc-utils/ F: package/python-flask-jsonrpc/ F: package/python-flask-login/ From 99eafd1cc66fabeb8b5e7c12cfb97b7c6b9781a9 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 1 May 2024 23:12:43 +0200 Subject: [PATCH 5548/5754] DEVELOPERS: remove Sebastian Weyer Sebastian email address at Smile is bouncing, so drop it from the DEVELOPERS file. Signed-off-by: Romain Naour Signed-off-by: Yann E. MORIN (cherry picked from commit 7b973daac3f24ffce0246c5bbf80541499d86189) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 8 -------- 1 file changed, 8 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 88c266293b..6a1ec436ff 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2752,14 +2752,6 @@ F: support/misc/toolchainfile.cmake.in N: Sam Voss F: package/ripgrep/ -N: Sebastian Weyer -F: package/amlogic-boot-fip/ -F: package/nushell/ -F: package/rust-bindgen/ -F: package/spirv-headers/ -F: support/testing/tests/package/sample_nu.nu -F: support/testing/tests/package/test_nu.py - N: Sébastien Szymanski F: board/armadeus/ F: configs/armadeus* From b392df5443d885eff53e50f055189b8e82fb6908 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 15 Apr 2024 19:05:56 +0200 Subject: [PATCH 5549/5754] package/libarchive: bump to version 3.7.3 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni (cherry picked from commit 566eb38bdff666a11034e6543c42647d655e1e73) Signed-off-by: Peter Korsgaard --- .../0002-autotools-do-not-add-iconv-for-Requires.private.patch | 2 +- package/libarchive/libarchive.hash | 2 +- package/libarchive/libarchive.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libarchive/0002-autotools-do-not-add-iconv-for-Requires.private.patch b/package/libarchive/0002-autotools-do-not-add-iconv-for-Requires.private.patch index 338dad46e0..3cbd304109 100644 --- a/package/libarchive/0002-autotools-do-not-add-iconv-for-Requires.private.patch +++ b/package/libarchive/0002-autotools-do-not-add-iconv-for-Requires.private.patch @@ -17,7 +17,7 @@ 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 +@@ -434,7 +434,6 @@ if test "x$with_iconv" != "xno"; then AC_CHECK_HEADERS([localcharset.h]) am_save_LIBS="$LIBS" LIBS="${LIBS} ${LIBICONV}" diff --git a/package/libarchive/libarchive.hash b/package/libarchive/libarchive.hash index 818113585e..ab6813686e 100644 --- a/package/libarchive/libarchive.hash +++ b/package/libarchive/libarchive.hash @@ -1,4 +1,4 @@ # From https://www.libarchive.de/downloads/sha256sums -sha256 04357661e6717b6941682cde02ad741ae4819c67a260593dfb2431861b251acb libarchive-3.7.2.tar.xz +sha256 63e7a7174638fc7d6b79b4c8b0ad954e0f4f45abe7239c1ecb200232aa9a43d2 libarchive-3.7.3.tar.xz # Locally computed: sha256 b2cdf763345de2de34cebf54394df3c61a105c3b71288603c251f2fa638200ba COPYING diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk index 136f7a9c09..9c35856ff9 100644 --- a/package/libarchive/libarchive.mk +++ b/package/libarchive/libarchive.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBARCHIVE_VERSION = 3.7.2 +LIBARCHIVE_VERSION = 3.7.3 LIBARCHIVE_SOURCE = libarchive-$(LIBARCHIVE_VERSION).tar.xz LIBARCHIVE_SITE = https://www.libarchive.de/downloads LIBARCHIVE_INSTALL_STAGING = YES From a685e7866bc11dbdd7777c88d0a26c38151948e8 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 11 Apr 2024 22:59:41 +0200 Subject: [PATCH 5550/5754] package/tor: bump version to 0.4.8.11 Release notes: https://gitlab.torproject.org/tpo/core/tor/-/raw/release-0.4.8/ReleaseNotes https://forum.torproject.org/t/stable-release-0-4-8-11/12265 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit f1723c93b59c021f16181b3ac62397b128cb9677) 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 8cc8eb435f..4052f11736 100644 --- a/package/tor/tor.hash +++ b/package/tor/tor.hash @@ -1,4 +1,4 @@ -# From https://dist.torproject.org/tor-0.4.8.10.tar.gz.sha256sum -sha256 e628b4fab70edb4727715b23cf2931375a9f7685ac08f2c59ea498a178463a86 tor-0.4.8.10.tar.gz +# From https://dist.torproject.org/tor-0.4.8.11.tar.gz.sha256sum +sha256 8f2bdf90e63380781235aa7d604e159570f283ecee674670873d8bb7052c8e07 tor-0.4.8.11.tar.gz # Locally computed sha256 47b54ed17e8fdcab3c44729a1789a09b208f9a63a845a7e50def9df729eebad0 LICENSE diff --git a/package/tor/tor.mk b/package/tor/tor.mk index 12dcf3f07c..9986a5f472 100644 --- a/package/tor/tor.mk +++ b/package/tor/tor.mk @@ -4,7 +4,7 @@ # ################################################################################ -TOR_VERSION = 0.4.8.10 +TOR_VERSION = 0.4.8.11 TOR_SITE = https://dist.torproject.org TOR_LICENSE = BSD-3-Clause TOR_LICENSE_FILES = LICENSE From 00d911b9c6398acf71de189ee2ca39c03706e875 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 11 Apr 2024 23:00:12 +0200 Subject: [PATCH 5551/5754] package/intel-gmmlib: bump version to 22.3.19 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit d476d2e7e53a92d4e2c038875cb3255dfb11d167) 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 d9cad026c4..aadf01a169 100644 --- a/package/intel-gmmlib/intel-gmmlib.hash +++ b/package/intel-gmmlib/intel-gmmlib.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 381f7ad104e3d0d8dd6c3ec0c8304e410a479c439e72db35c83fb7e2b0ec556f intel-gmmlib-22.3.18.tar.gz +sha256 ea9c418b0fd84a982850f230cb2d783dfe2e1f9923065f54b2fcaad1e9b33417 intel-gmmlib-22.3.19.tar.gz sha256 8b7446825df3f8b0268307e272aa6aaaf78351c83161d860d02c913c22666c48 LICENSE.md diff --git a/package/intel-gmmlib/intel-gmmlib.mk b/package/intel-gmmlib/intel-gmmlib.mk index 94a07ebfb8..74e19e93fd 100644 --- a/package/intel-gmmlib/intel-gmmlib.mk +++ b/package/intel-gmmlib/intel-gmmlib.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_GMMLIB_VERSION = 22.3.18 +INTEL_GMMLIB_VERSION = 22.3.19 INTEL_GMMLIB_SITE = https://github.com/intel/gmmlib/archive INTEL_GMMLIB_LICENSE = MIT INTEL_GMMLIB_LICENSE_FILES = LICENSE.md From de61d8390a8374366cd6692a6057636040cb07b6 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 13 Apr 2024 08:42:03 +0200 Subject: [PATCH 5552/5754] package/cmake: add BR2_HOST_CMAKE_AT_LEAST_3_28 Buildroot commit 38d07349daece6393800619ecb3ef98299711819 forgot to add the corresponding BR2_HOST_CMAKE_AT_LEAST_X_Y option. Signed-off-by: Bernd Kuhls Signed-off-by: Romain Naour (cherry picked from commit 81d7103a10b6837bfb22c314c90b46adda78bf7d) Signed-off-by: Peter Korsgaard --- package/cmake/Config.in.host | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/cmake/Config.in.host b/package/cmake/Config.in.host index 0935e9a564..c38bb9daaa 100644 --- a/package/cmake/Config.in.host +++ b/package/cmake/Config.in.host @@ -47,10 +47,15 @@ config BR2_HOST_CMAKE_AT_LEAST_3_27 bool select BR2_HOST_CMAKE_AT_LEAST_3_26 +config BR2_HOST_CMAKE_AT_LEAST_3_28 + bool + select BR2_HOST_CMAKE_AT_LEAST_3_27 + # 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.28" if BR2_HOST_CMAKE_AT_LEAST_3_28 default "3.27" if BR2_HOST_CMAKE_AT_LEAST_3_27 default "3.26" if BR2_HOST_CMAKE_AT_LEAST_3_26 default "3.25" if BR2_HOST_CMAKE_AT_LEAST_3_25 From f5c0965c24711f8960788fd537c82f3699137018 Mon Sep 17 00:00:00 2001 From: Michael Nosthoff Date: Mon, 15 Apr 2024 14:08:19 +0200 Subject: [PATCH 5553/5754] package/catch2: bump to version 3.5.4 Signed-off-by: Michael Nosthoff Signed-off-by: Thomas Petazzoni (cherry picked from commit 30a88f4ab07a1ae7e9860d2f07960d994c6008dc) Signed-off-by: Peter Korsgaard --- 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 5136785513..ec3450836a 100644 --- a/package/catch2/catch2.hash +++ b/package/catch2/catch2.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 269543a49eb76f40b3f93ff231d4c24c27a7e16c90e47d2e45bcc564de470c6e catch2-3.5.2.tar.gz +sha256 b7754b711242c167d8f60b890695347f90a1ebc95949a045385114165d606dbb catch2-3.5.4.tar.gz sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE.txt diff --git a/package/catch2/catch2.mk b/package/catch2/catch2.mk index ee0940642f..918f1b4319 100644 --- a/package/catch2/catch2.mk +++ b/package/catch2/catch2.mk @@ -4,7 +4,7 @@ # ################################################################################ -CATCH2_VERSION = 3.5.2 +CATCH2_VERSION = 3.5.4 CATCH2_SITE = $(call github,catchorg,Catch2,v$(CATCH2_VERSION)) CATCH2_INSTALL_STAGING = YES CATCH2_INSTALL_TARGET = NO From 535c0a5ada8f9a086b0db341a4e11df1ddf43c9f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 11 Apr 2024 23:02:45 +0200 Subject: [PATCH 5554/5754] package/libpng: bump version to 1.6.43 Release notes: https://sourceforge.net/p/png-mng/mailman/message/58741099/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit ce3ce432feda336e4476eb930353fed8e3318539) Signed-off-by: Peter Korsgaard --- package/libpng/libpng.hash | 4 ++-- package/libpng/libpng.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libpng/libpng.hash b/package/libpng/libpng.hash index fbae14c51d..356c0e3e5d 100644 --- a/package/libpng/libpng.hash +++ b/package/libpng/libpng.hash @@ -1,4 +1,4 @@ -# From https://sourceforge.net/p/png-mng/mailman/message/58731120/ -sha256 c919dbc11f4c03b05aba3f8884d8eb7adfe3572ad228af972bb60057bdb48450 libpng-1.6.42.tar.xz +# From https://sourceforge.net/p/png-mng/mailman/message/58741099/ +sha256 6a5ca0652392a2d7c9db2ae5b40210843c0bbc081cbd410825ab00cc59f14a6c libpng-1.6.43.tar.xz # Locally computed: sha256 7317e078e2d3b5d7ba5a6159e650945153262b44b76f6700f8e9edb261c5143e LICENSE diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk index c4da9f89c7..af38afde47 100644 --- a/package/libpng/libpng.mk +++ b/package/libpng/libpng.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBPNG_VERSION = 1.6.42 +LIBPNG_VERSION = 1.6.43 LIBPNG_SERIES = 16 LIBPNG_SOURCE = libpng-$(LIBPNG_VERSION).tar.xz LIBPNG_SITE = http://downloads.sourceforge.net/project/libpng/libpng$(LIBPNG_SERIES)/$(LIBPNG_VERSION) From 5c7927f6986a53a0bb329785058b03f40e640d03 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 17 Sep 2023 20:51:16 +0200 Subject: [PATCH 5555/5754] package/libglib2: fix atomic handling Correctly fix atomic handling to avoid the following build failure with all users of libglib2 (e.g. gdk-pixbuf) raised since bump to version 2.76.1 in commit 3f9622fe3d85b4d9f734b879abc1d485afea19b2: /usr/lib/libglib-2.0.a(gthread-posix.c.o): in function `g_mutex_trylock': gthread-posix.c:(.text+0xda8): undefined reference to `__atomic_compare_exchange_4' Fixes: - http://autobuild.buildroot.org/results/24a358869b98d83ab374c7c3a185ced450064d35 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 929bffbf4bf8fcb91bda446777f907f32c782656) Signed-off-by: Peter Korsgaard --- .../0005-link-with-latomic-when-needed.patch | 45 +++++++++++++++++++ package/libglib2/libglib2.mk | 5 --- 2 files changed, 45 insertions(+), 5 deletions(-) create mode 100644 package/libglib2/0005-link-with-latomic-when-needed.patch diff --git a/package/libglib2/0005-link-with-latomic-when-needed.patch b/package/libglib2/0005-link-with-latomic-when-needed.patch new file mode 100644 index 0000000000..275d86032b --- /dev/null +++ b/package/libglib2/0005-link-with-latomic-when-needed.patch @@ -0,0 +1,45 @@ +From d1814dbd3a88c95a43d4c9805bb4a523cf62d97b Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 17 Sep 2023 20:42:00 +0200 +Subject: [PATCH] link with -latomic when needed + +Some architecture such as sparc and some flavors of arm needs -latomic +to avoid the following build failure: + +gthread-posix.c:(.text+0xda8): undefined reference to `__atomic_compare_exchange_4' + +Signed-off-by: Fabrice Fontaine +Upstream: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3586 +--- + glib/meson.build | 1 + + meson.build | 2 ++ + 2 files changed, 3 insertions(+) + +diff --git a/glib/meson.build b/glib/meson.build +index c26a35e42..7a761306b 100644 +--- a/glib/meson.build ++++ b/glib/meson.build +@@ -426,6 +426,7 @@ libglib = library('glib-2.0', + pcre2, + platform_deps, + thread_dep, ++ atomic_dep + ], + c_args : glib_c_args, + objc_args : glib_c_args, +diff --git a/meson.build b/meson.build +index 25ae10fc2..5ae84b3b3 100644 +--- a/meson.build ++++ b/meson.build +@@ -2130,6 +2130,8 @@ libffi_dep = dependency('libffi', version : '>= 3.0.0') + + libz_dep = dependency('zlib') + ++atomic_dep = cc.find_library('atomic', required: false) ++ + # First check in libc, fallback to libintl, and as last chance build + # proxy-libintl subproject. + # FIXME: glib-gettext.m4 has much more checks to detect broken/uncompatible +-- +2.40.1 + diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index c06ded2a5b..bffc565f11 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -64,11 +64,6 @@ 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_DEPENDENCIES += libiconv endif From e26c33a4b9d85deaceb6de22989a21320aef064c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 3 May 2024 20:31:32 +0200 Subject: [PATCH 5556/5754] package/libglib2: update atomic patch Commit 929bffbf4bf8fcb91bda446777f907f32c782656 forgot to update patch number Moreover, replace it with a new iteration to follow upstream request [1] and avoid the following build host build failure with br-autobuild-1: /usr/bin/ld: cannot find /usr/lib64/libatomic.so.1.2.0: No such file or directory Fixes: 929bffbf4bf8fcb91bda446777f907f32c782656 - http://autobuild.buildroot.org/results/a12b9c4436594818f4ce128595b429adf7d90e31 [1]: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3606 Signed-off-by: Fabrice Fontaine [yann.morin.1998@free.fr: mention upstream commit now it's merged] Signed-off-by: Yann E. MORIN (cherry picked from commit f5257789d6f088f1e2a0a8b00e1d21d32d2497ac) Signed-off-by: Peter Korsgaard --- .../0005-link-with-latomic-when-needed.patch | 45 ---------------- .../0006-link-with-latomic-when-needed.patch | 52 +++++++++++++++++++ 2 files changed, 52 insertions(+), 45 deletions(-) delete mode 100644 package/libglib2/0005-link-with-latomic-when-needed.patch create mode 100644 package/libglib2/0006-link-with-latomic-when-needed.patch diff --git a/package/libglib2/0005-link-with-latomic-when-needed.patch b/package/libglib2/0005-link-with-latomic-when-needed.patch deleted file mode 100644 index 275d86032b..0000000000 --- a/package/libglib2/0005-link-with-latomic-when-needed.patch +++ /dev/null @@ -1,45 +0,0 @@ -From d1814dbd3a88c95a43d4c9805bb4a523cf62d97b Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 17 Sep 2023 20:42:00 +0200 -Subject: [PATCH] link with -latomic when needed - -Some architecture such as sparc and some flavors of arm needs -latomic -to avoid the following build failure: - -gthread-posix.c:(.text+0xda8): undefined reference to `__atomic_compare_exchange_4' - -Signed-off-by: Fabrice Fontaine -Upstream: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3586 ---- - glib/meson.build | 1 + - meson.build | 2 ++ - 2 files changed, 3 insertions(+) - -diff --git a/glib/meson.build b/glib/meson.build -index c26a35e42..7a761306b 100644 ---- a/glib/meson.build -+++ b/glib/meson.build -@@ -426,6 +426,7 @@ libglib = library('glib-2.0', - pcre2, - platform_deps, - thread_dep, -+ atomic_dep - ], - c_args : glib_c_args, - objc_args : glib_c_args, -diff --git a/meson.build b/meson.build -index 25ae10fc2..5ae84b3b3 100644 ---- a/meson.build -+++ b/meson.build -@@ -2130,6 +2130,8 @@ libffi_dep = dependency('libffi', version : '>= 3.0.0') - - libz_dep = dependency('zlib') - -+atomic_dep = cc.find_library('atomic', required: false) -+ - # First check in libc, fallback to libintl, and as last chance build - # proxy-libintl subproject. - # FIXME: glib-gettext.m4 has much more checks to detect broken/uncompatible --- -2.40.1 - diff --git a/package/libglib2/0006-link-with-latomic-when-needed.patch b/package/libglib2/0006-link-with-latomic-when-needed.patch new file mode 100644 index 0000000000..3b5a071010 --- /dev/null +++ b/package/libglib2/0006-link-with-latomic-when-needed.patch @@ -0,0 +1,52 @@ +From 4e6dc4dee0e1c6407113597180d9616b4f275f94 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 2 May 2024 14:02:17 +0200 +Subject: [PATCH] link with -latomic when needed + +Some architecture such as sparc and some flavors of arm needs -latomic +to avoid the following build failure: + +gthread-posix.c:(.text+0xda8): undefined reference to `__atomic_compare_exchange_4' + +Signed-off-by: Fabrice Fontaine +Upstream: https://gitlab.gnome.org/GNOME/glib/-/commit/4e6dc4dee0e1c6407113597180d9616b4f275f94 +--- + glib/meson.build | 1 + + meson.build | 9 +++++++++ + 2 files changed, 10 insertions(+) + +diff --git a/glib/meson.build b/glib/meson.build +index 24cbb664d4..b2dd569e1e 100644 +--- a/glib/meson.build ++++ b/glib/meson.build +@@ -419,6 +419,7 @@ libglib = library('glib-2.0', + include_directories : configinc, + link_with: [charset_lib, gnulib_lib], + dependencies : [ ++ atomic_dep, + gnulib_libm_dependency, + libiconv, + libintl_deps, +diff --git a/meson.build b/meson.build +index 46c5aa200a..8b42940558 100644 +--- a/meson.build ++++ b/meson.build +@@ -2233,6 +2233,15 @@ libffi_dep = dependency('libffi', version : '>= 3.0.0') + + libz_dep = dependency('zlib') + ++libatomic_test_code = ''' ++ int main (int argc, char ** argv) { ++ return 0; ++ }''' ++atomic_dep = [] ++if cc.links(libatomic_test_code, args : '-latomic', name : 'check for -latomic') ++ atomic_dep = cc.find_library('atomic') ++endif ++ + # First check in libc, fallback to libintl, and as last chance build + # proxy-libintl subproject. + # FIXME: glib-gettext.m4 has much more checks to detect broken/uncompatible +-- +2.44.0 + From 222220d06eaf0fada91c5b651bd3b2d43a4cb0fb Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 4 May 2024 11:34:46 +0200 Subject: [PATCH 5557/5754] package/proj: needs NPTL NPTL is mandatory since bump to version 9.3.0 in commit 57aba033e6cc81b95d006227c45a15eb3fc77d07 and https://github.com/OSGeo/PROJ/commit/ce080251225d16e11e139a5ebe07cf608fe022b2: /home/buildroot/instance-0/output-1/build/proj-9.3.0/src/iso19111/factory.cpp: In member function 'std::shared_ptr osgeo::proj::io::SQLiteHandleCache::getHandle(const std::string&, PJ_CONTEXT*)': /home/buildroot/instance-0/output-1/build/proj-9.3.0/src/iso19111/factory.cpp:622:9: error: 'pthread_atfork' was not declared in this scope; did you mean 'pthread_attr_t'? 622 | pthread_atfork(nullptr, nullptr, | ^~~~~~~~~~~~~~ | pthread_attr_t Fixes: 57aba033e6cc81b95d006227c45a15eb3fc77d07 - http://autobuild.buildroot.org/results/392664375c5bc5f047d39bff31534a226e8ea526 Signed-off-by: Fabrice Fontaine Reviewed-by: Maxim Kochetkov Signed-off-by: Yann E. MORIN (cherry picked from commit 4eeb69c9835450da8af8f55c776a7774914e2102) Signed-off-by: Peter Korsgaard --- package/gdal/Config.in | 6 +++--- package/libgeotiff/Config.in | 6 +++--- package/postgis/Config.in | 6 +++--- package/proj/Config.in | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/package/gdal/Config.in b/package/gdal/Config.in index 24a1f06af2..fe96f4a7d9 100644 --- a/package/gdal/Config.in +++ b/package/gdal/Config.in @@ -6,7 +6,7 @@ config BR2_PACKAGE_GDAL depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11, proj depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 - depends on BR2_TOOLCHAIN_HAS_THREADS # proj + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # proj depends on BR2_USE_WCHAR # proj select BR2_PACKAGE_GIFLIB select BR2_PACKAGE_JPEG @@ -26,9 +26,9 @@ config BR2_PACKAGE_GDAL https://gdal.org/ -comment "gdal needs a toolchain w/ C++, dynamic library, gcc >= 4.7, not binutils bug 27597, threads, wchar" +comment "gdal needs a toolchain w/ C++, dynamic library, gcc >= 4.7, not binutils bug 27597, NPTL, wchar" depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || \ BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 || \ - !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR + !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_USE_WCHAR diff --git a/package/libgeotiff/Config.in b/package/libgeotiff/Config.in index 7ed296fb25..f07c994361 100644 --- a/package/libgeotiff/Config.in +++ b/package/libgeotiff/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_LIBGEOTIFF bool "libgeotiff" depends on BR2_INSTALL_LIBSTDCPP # proj depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # proj - depends on BR2_TOOLCHAIN_HAS_THREADS # proj + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # proj depends on BR2_USE_WCHAR # proj select BR2_PACKAGE_PROJ select BR2_PACKAGE_TIFF @@ -12,7 +12,7 @@ config BR2_PACKAGE_LIBGEOTIFF https://github.com/OSGeo/libgeotiff -comment "libgeotiff needs a toolchain w/ C++, gcc >= 4.7, threads, wchar" +comment "libgeotiff needs a toolchain w/ C++, gcc >= 4.7, NPTL, wchar" depends on !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || \ - !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR + !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_USE_WCHAR diff --git a/package/postgis/Config.in b/package/postgis/Config.in index 7d42390677..7f85c03007 100644 --- a/package/postgis/Config.in +++ b/package/postgis/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_POSTGIS depends on BR2_PACKAGE_POSTGRESQL_FULL depends on BR2_INSTALL_LIBSTDCPP # libgeos, proj depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libgeos - depends on BR2_TOOLCHAIN_HAS_THREADS # libgeos, proj + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # proj depends on BR2_USE_WCHAR # libgeos, proj depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 # libgeos select BR2_PACKAGE_LIBGEOS @@ -18,7 +18,7 @@ config BR2_PACKAGE_POSTGIS https://postgis.net/ -comment "postgis needs a toolchain w/ C++, threads, wchar, gcc >= 4.9, not binutils bug 27597" +comment "postgis needs a toolchain w/ C++, NPTL, wchar, gcc >= 4.9, not binutils bug 27597" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ - !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_USE_WCHAR || \ BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 diff --git a/package/proj/Config.in b/package/proj/Config.in index 1952fc7d9a..6d172e2ee9 100644 --- a/package/proj/Config.in +++ b/package/proj/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_PROJ bool "proj" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11 - depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_USE_WCHAR select BR2_PACKAGE_SQLITE help @@ -14,7 +14,7 @@ config BR2_PACKAGE_PROJ http://proj4.org/ -comment "proj needs a toolchain w/ C++, gcc >= 4.7, threads, wchar" +comment "proj needs a toolchain w/ C++, gcc >= 4.7, NPTL, wchar" depends on !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || \ - !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR + !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_USE_WCHAR From ad20908243763804f859429cd4bf7f3ca82eae86 Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Fri, 12 Apr 2024 21:12:22 +0000 Subject: [PATCH 5558/5754] boot/arm-trusted-firmware: enable verbose output Signed-off-by: Brandon Maier Signed-off-by: Thomas Petazzoni (cherry picked from commit a8c7a53985a62fd8a25cbe803628c64527da21fc) Signed-off-by: Peter Korsgaard --- boot/arm-trusted-firmware/arm-trusted-firmware.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm-trusted-firmware/arm-trusted-firmware.mk index 2d554c1da8..abf917948e 100644 --- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk @@ -59,6 +59,7 @@ endif endif ARM_TRUSTED_FIRMWARE_MAKE_OPTS += \ + $(if $(VERBOSE),V=1) \ CROSS_COMPILE="$(TARGET_CROSS)" \ BUILD_STRING=$(ARM_TRUSTED_FIRMWARE_VERSION) \ $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES)) \ From 3edd6d9fceba1ea53447d6586c2a573704847918 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 11 Apr 2024 19:43:28 +0200 Subject: [PATCH 5559/5754] package/ti-sgx-km: needs BR2_ARM_EABIHF ti-sgx-km raises the following build failure without BR2_ARM_EABIHF: eurasiacon/build/linux2/toplevel.mk:230: eurasiacon/build/linux2/moduledefs/target_armel.mk: No such file or directory Fixes: - http://autobuild.buildroot.org/results/17e4da346d062570b9a84ab8eb1ce93c6d7384be - http://autobuild.buildroot.org/results/04fd659472f1928c2621354bb0ea3b60c5dfadec Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 5924a5c2c649c067a4bc434da5aa180170cbc30c) Signed-off-by: Peter Korsgaard --- package/ti-sgx-km/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ti-sgx-km/Config.in b/package/ti-sgx-km/Config.in index 964889ff40..3e8a41b755 100644 --- a/package/ti-sgx-km/Config.in +++ b/package/ti-sgx-km/Config.in @@ -1,10 +1,10 @@ comment "ti-sgx-km needs a Linux kernel to be built" - depends on BR2_arm + depends on BR2_ARM_EABIHF depends on !BR2_LINUX_KERNEL config BR2_PACKAGE_TI_SGX_KM bool "ti-sgx-km" - depends on BR2_LINUX_KERNEL && BR2_arm + depends on BR2_LINUX_KERNEL && BR2_ARM_EABIHF select BR2_LINUX_NEEDS_MODULES help Kernel modules for TI CPUs with SGX GPU. From 8ee092e337c6b255a689e9b92ef2e78533ff97bf Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Sun, 19 May 2024 15:31:13 +0200 Subject: [PATCH 5560/5754] package/git: security bump version to 2.43.4 Fixes CVE-2024-32002, CVE-2024-32004, CVE-2024-32020 and CVE-2024-32021 (for details see [1]). [1] https://lore.kernel.org/lkml/xmqqv83g4937.fsf@gitster.g/ Signed-off-by: Peter Seiderer 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 9cf044cc07..f24023f2f3 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 5446603e73d911781d259e565750dcd277a42836c8e392cac91cf137aa9b76ec git-2.43.0.tar.xz +sha256 6b7aadda1787f0c1eaa257c1df56bb12e43d12bce55cfe7e5ade00228ee3d886 git-2.43.4.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 1502968186..15a29d1f6c 100644 --- a/package/git/git.mk +++ b/package/git/git.mk @@ -4,7 +4,7 @@ # ################################################################################ -GIT_VERSION = 2.43.0 +GIT_VERSION = 2.43.4 GIT_SOURCE = git-$(GIT_VERSION).tar.xz GIT_SITE = $(BR2_KERNEL_MIRROR)/software/scm/git GIT_LICENSE = GPL-2.0, LGPL-2.1+ From 330a987a5396d13e20b385a0c14a8936d9d2bba7 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 5 May 2024 13:22:27 +0200 Subject: [PATCH 5561/5754] package/kexec: fix x86_64 build with binutils 2.41 Fix the following x86_64 build failure with binutils 2.41: purgatory/arch/i386/entry32-16.S:23: Error: 64bit mode not supported on `i386'. Fixes: - http://autobuild.buildroot.org/results/60f2f163b491879a8ea7f2d56a6b0d38b3cf439c Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit a2be1561693a05e09aee57e50c81b5d6dac05a49) Signed-off-by: Peter Korsgaard --- ...uilding-on-x86_64-with-binutils-2-41.patch | 94 +++++++++++++++++++ 1 file changed, 94 insertions(+) create mode 100644 package/kexec/0001-Fix-building-on-x86_64-with-binutils-2-41.patch diff --git a/package/kexec/0001-Fix-building-on-x86_64-with-binutils-2-41.patch b/package/kexec/0001-Fix-building-on-x86_64-with-binutils-2-41.patch new file mode 100644 index 0000000000..ae44c21fe1 --- /dev/null +++ b/package/kexec/0001-Fix-building-on-x86_64-with-binutils-2-41.patch @@ -0,0 +1,94 @@ +From 328de8e00e298f00d7ba6b25dc3950147e9642e6 Mon Sep 17 00:00:00 2001 +From: Michel Lind +Date: Tue, 30 Jan 2024 04:14:31 -0600 +Subject: Fix building on x86_64 with binutils 2.41 + +Newer versions of the GNU assembler (observed with binutils 2.41) will +complain about the ".arch i386" in files assembled with "as --64", +with the message "Error: 64bit mode not supported on 'i386'". + +Fix by moving ".arch i386" below the relevant ".code32" directive, so +that the assembler is no longer expecting 64-bit instructions to be used +by the time that the ".arch i386" directive is encountered. + +Based on similar iPXE fix: +https://github.com/ipxe/ipxe/commit/6ca597eee + +Signed-off-by: Michel Lind +Signed-off-by: Simon Horman +Upstream: https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git/commit/?id=328de8e00e298f00d7ba6b25dc3950147e9642e6 +Signed-off-by: Fabrice Fontaine +--- + purgatory/arch/i386/entry32-16-debug.S | 2 +- + purgatory/arch/i386/entry32-16.S | 2 +- + purgatory/arch/i386/entry32.S | 2 +- + purgatory/arch/i386/setup-x86.S | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/purgatory/arch/i386/entry32-16-debug.S b/purgatory/arch/i386/entry32-16-debug.S +index 5167944d..12e11649 100644 +--- a/purgatory/arch/i386/entry32-16-debug.S ++++ b/purgatory/arch/i386/entry32-16-debug.S +@@ -25,10 +25,10 @@ + .globl entry16_debug_pre32 + .globl entry16_debug_first32 + .globl entry16_debug_old_first32 +- .arch i386 + .balign 16 + entry16_debug: + .code32 ++ .arch i386 + /* Compute where I am running at (assumes esp valid) */ + call 1f + 1: popl %ebx +diff --git a/purgatory/arch/i386/entry32-16.S b/purgatory/arch/i386/entry32-16.S +index c051aab0..eace0958 100644 +--- a/purgatory/arch/i386/entry32-16.S ++++ b/purgatory/arch/i386/entry32-16.S +@@ -20,10 +20,10 @@ + #undef i386 + .text + .globl entry16, entry16_regs +- .arch i386 + .balign 16 + entry16: + .code32 ++ .arch i386 + /* Compute where I am running at (assumes esp valid) */ + call 1f + 1: popl %ebx +diff --git a/purgatory/arch/i386/entry32.S b/purgatory/arch/i386/entry32.S +index f7a494f1..8ce9e316 100644 +--- a/purgatory/arch/i386/entry32.S ++++ b/purgatory/arch/i386/entry32.S +@@ -20,10 +20,10 @@ + #undef i386 + + .text +- .arch i386 + .globl entry32, entry32_regs + entry32: + .code32 ++ .arch i386 + + /* Setup a gdt that should that is generally usefully */ + lgdt %cs:gdt +diff --git a/purgatory/arch/i386/setup-x86.S b/purgatory/arch/i386/setup-x86.S +index 201bb2cb..a212eed4 100644 +--- a/purgatory/arch/i386/setup-x86.S ++++ b/purgatory/arch/i386/setup-x86.S +@@ -21,10 +21,10 @@ + #undef i386 + + .text +- .arch i386 + .globl purgatory_start + purgatory_start: + .code32 ++ .arch i386 + + /* Load a gdt so I know what the segment registers are */ + lgdt %cs:gdt +-- +cgit 1.2.3-korg + From 55a7000a7d369e14d935b966ab986cb040c662d8 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Thu, 2 May 2024 09:23:26 +0200 Subject: [PATCH 5562/5754] package/qemu: fix disabling fp-bench test compilation With the bump to version 8.1.1, the patch that disabled the compilation of the fp-bench test is no longer applicable, even though the package compilation process does not report any errors in applying the patch itself. The new patch does not disable the test by default but only if the file fenv.h is not missing, with the hope that this approach will be considered acceptable by the maintainer and merged upstream. The patch is an adaptation of the one sent upstream. Link: https://lists.nongnu.org/archive/html/qemu-devel/2021-03/msg00492.html Signed-off-by: Dario Binacchi Signed-off-by: Yann E. MORIN (cherry picked from commit 2bb0c57ca273d9a2348e468bcdedad696b24ee8d) Signed-off-by: Peter Korsgaard --- .checkpackageignore | 1 - ...fp-disable-fp-bench-build-by-default.patch | 28 ----------- ...on-t-build-fp-bench-test-if-fenv.h-i.patch | 49 +++++++++++++++++++ 3 files changed, 49 insertions(+), 29 deletions(-) delete mode 100644 package/qemu/0001-tests-fp-disable-fp-bench-build-by-default.patch create mode 100644 package/qemu/0001-tests-fp-meson-don-t-build-fp-bench-test-if-fenv.h-i.patch diff --git a/.checkpackageignore b/.checkpackageignore index 426aedd476..a5d56b3d8e 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1081,7 +1081,6 @@ 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/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 diff --git a/package/qemu/0001-tests-fp-disable-fp-bench-build-by-default.patch b/package/qemu/0001-tests-fp-disable-fp-bench-build-by-default.patch deleted file mode 100644 index fb7a9a6989..0000000000 --- a/package/qemu/0001-tests-fp-disable-fp-bench-build-by-default.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 83d976d6d7f0357659d5daa0f01c52048a609e88 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Wed, 25 Aug 2021 21:55:53 +0200 -Subject: [PATCH] tests/fp: disable fp-bench build by default - -Fixes: -https://lists.nongnu.org/archive/html/qemu-devel/2021-03/msg00947.html - -Signed-off-by: Romain Naour ---- - tests/fp/meson.build | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tests/fp/meson.build b/tests/fp/meson.build -index 8bd0979f67..2fe019d2c6 100644 ---- a/tests/fp/meson.build -+++ b/tests/fp/meson.build -@@ -640,6 +640,7 @@ fpbench = executable( - dependencies: [qemuutil], - include_directories: [sfinc, include_directories(tfdir)], - c_args: fpcflags, -+ build_by_default: false, - ) - - fptestlog2 = executable( --- -2.35.1 - diff --git a/package/qemu/0001-tests-fp-meson-don-t-build-fp-bench-test-if-fenv.h-i.patch b/package/qemu/0001-tests-fp-meson-don-t-build-fp-bench-test-if-fenv.h-i.patch new file mode 100644 index 0000000000..b7e41d6f23 --- /dev/null +++ b/package/qemu/0001-tests-fp-meson-don-t-build-fp-bench-test-if-fenv.h-i.patch @@ -0,0 +1,49 @@ +From b4a692f46135af1011bf0adbfeb19abf354ca191 Mon Sep 17 00:00:00 2001 +From: Dario Binacchi +Date: Tue, 30 Apr 2024 09:40:55 +0200 +Subject: [PATCH] tests/fp/meson: don't build fp-bench test if fenv.h is + missing + +The fp-bench test (i. e. tests/fp/fp-bench.c) use fenv.h that is not +always provided by the libc (uClibc). The patch disables its compilation +in case the header is not available. + +The patch is based on a suggestion from Paolo Bonzini, which you can +find at the following link. + +Link: https://lists.nongnu.org/archive/html/qemu-devel/2021-03/msg00492.html +Suggested-by: Paolo Bonzini +Signed-off-by: Dario Binacchi +Upstream: https://patchwork.ozlabs.org/project/qemu-devel/patch/20240430164752.645521-1-dario.binacchi@amarulasolutions.com/ +--- + tests/fp/meson.build | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) + +diff --git a/tests/fp/meson.build b/tests/fp/meson.build +index cbc17392d678..cd052667e940 100644 +--- a/tests/fp/meson.build ++++ b/tests/fp/meson.build +@@ -126,12 +126,14 @@ test('fp-test-mulAdd', fptest, + ['f16_mulAdd', 'f32_mulAdd', 'f64_mulAdd', 'f128_mulAdd'], + suite: ['softfloat-slow', 'softfloat-ops-slow', 'slow'], timeout: 90) + +-executable( +- 'fp-bench', +- ['fp-bench.c', '../../fpu/softfloat.c'], +- dependencies: [qemuutil, libtestfloat, libsoftfloat], +- c_args: fpcflags, +-) ++if cc.has_header('fenv.h') ++ executable( ++ 'fp-bench', ++ ['fp-bench.c', '../../fpu/softfloat.c'], ++ dependencies: [qemuutil, libtestfloat, libsoftfloat], ++ c_args: fpcflags, ++ ) ++endif + + fptestlog2 = executable( + 'fp-test-log2', +-- +2.43.0 + From aa11275c9d3b278112d2f011f826bfacd7d7139b Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Thu, 2 May 2024 09:23:27 +0200 Subject: [PATCH 5563/5754] package/qemu: renumber patch Commit 3fa1ae00681ca ("package/qemu: add option to enable tracing") added a patch with a wrong number. Signed-off-by: Dario Binacchi Signed-off-by: Yann E. MORIN (cherry picked from commit bf8e4c2052b4b1fc07aa89b8134a1385855aaa45) Signed-off-by: Peter Korsgaard --- ...003-tracing-install-trace-events-file-only-if-necessary.patch} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename package/qemu/{0004-tracing-install-trace-events-file-only-if-necessary.patch => 0003-tracing-install-trace-events-file-only-if-necessary.patch} (100%) diff --git a/package/qemu/0004-tracing-install-trace-events-file-only-if-necessary.patch b/package/qemu/0003-tracing-install-trace-events-file-only-if-necessary.patch similarity index 100% rename from package/qemu/0004-tracing-install-trace-events-file-only-if-necessary.patch rename to package/qemu/0003-tracing-install-trace-events-file-only-if-necessary.patch From 1cd481ac92e8be8e71190382fc64a297638220e5 Mon Sep 17 00:00:00 2001 From: Edgar Bonet Date: Mon, 6 May 2024 17:22:49 +0200 Subject: [PATCH 5564/5754] configs/acmesystems_acqua_a5_*: add hashes for Linux/at91bootstrap3 And enable BR2_DOWNLOAD_FORCE_CHECK_HASHES. Signed-off-by: Edgar Bonet Signed-off-by: Thomas Petazzoni (cherry picked from commit 7f5cd99dd7ee82d4b977a04b0809a77f89c853c1) Signed-off-by: Peter Korsgaard --- .../acqua-a5/patches/at91bootstrap3/at91bootstrap3.hash | 2 ++ .../acqua-a5/patches/linux-headers/linux-headers.hash | 1 + board/acmesystems/acqua-a5/patches/linux/linux.hash | 2 ++ configs/acmesystems_acqua_a5_256mb_defconfig | 2 ++ configs/acmesystems_acqua_a5_512mb_defconfig | 2 ++ 5 files changed, 9 insertions(+) create mode 100644 board/acmesystems/acqua-a5/patches/at91bootstrap3/at91bootstrap3.hash create mode 120000 board/acmesystems/acqua-a5/patches/linux-headers/linux-headers.hash create mode 100644 board/acmesystems/acqua-a5/patches/linux/linux.hash diff --git a/board/acmesystems/acqua-a5/patches/at91bootstrap3/at91bootstrap3.hash b/board/acmesystems/acqua-a5/patches/at91bootstrap3/at91bootstrap3.hash new file mode 100644 index 0000000000..06a63d449d --- /dev/null +++ b/board/acmesystems/acqua-a5/patches/at91bootstrap3/at91bootstrap3.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 cdc04cca9e811043efdea43ad203d70d897e23a8bd46f01896ba45c8df50f6ec at91bootstrap3-v3.10.3-br1.tar.gz diff --git a/board/acmesystems/acqua-a5/patches/linux-headers/linux-headers.hash b/board/acmesystems/acqua-a5/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/board/acmesystems/acqua-a5/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/acmesystems/acqua-a5/patches/linux/linux.hash b/board/acmesystems/acqua-a5/patches/linux/linux.hash new file mode 100644 index 0000000000..6dbbeca57f --- /dev/null +++ b/board/acmesystems/acqua-a5/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 1fd7ec8c3d9c4e4b3a41d11e2c6d151e5fbf875dd08b3577f73afd6ee6674605 linux-6.6.12.tar.xz diff --git a/configs/acmesystems_acqua_a5_256mb_defconfig b/configs/acmesystems_acqua_a5_256mb_defconfig index ef57734194..359b356cb4 100644 --- a/configs/acmesystems_acqua_a5_256mb_defconfig +++ b/configs/acmesystems_acqua_a5_256mb_defconfig @@ -3,6 +3,8 @@ BR2_cortex_a5=y BR2_ARM_ENABLE_VFP=y BR2_ARM_INSTRUCTIONS_THUMB2=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/acmesystems/acqua-a5/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/acmesystems/acqua-a5/genimage.cfg" diff --git a/configs/acmesystems_acqua_a5_512mb_defconfig b/configs/acmesystems_acqua_a5_512mb_defconfig index a69e2a2251..194de0b530 100644 --- a/configs/acmesystems_acqua_a5_512mb_defconfig +++ b/configs/acmesystems_acqua_a5_512mb_defconfig @@ -3,6 +3,8 @@ BR2_cortex_a5=y BR2_ARM_ENABLE_VFP=y BR2_ARM_INSTRUCTIONS_THUMB2=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/acmesystems/acqua-a5/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/acmesystems/acqua-a5/genimage.cfg" From 19b09e735b58f97f3032928d3fb64b60d0e1d5d7 Mon Sep 17 00:00:00 2001 From: Edgar Bonet Date: Mon, 6 May 2024 17:23:14 +0200 Subject: [PATCH 5565/5754] configs/acmesystems_acqua_a5_*: bump to Linux 6.6.30 Signed-off-by: Edgar Bonet Signed-off-by: Thomas Petazzoni (cherry picked from commit 74787fdd10543d482786fef582702bc24c1da626) Signed-off-by: Peter Korsgaard --- board/acmesystems/acqua-a5/patches/linux/linux.hash | 2 +- configs/acmesystems_acqua_a5_256mb_defconfig | 2 +- configs/acmesystems_acqua_a5_512mb_defconfig | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/board/acmesystems/acqua-a5/patches/linux/linux.hash b/board/acmesystems/acqua-a5/patches/linux/linux.hash index 6dbbeca57f..4b20a009a7 100644 --- a/board/acmesystems/acqua-a5/patches/linux/linux.hash +++ b/board/acmesystems/acqua-a5/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 1fd7ec8c3d9c4e4b3a41d11e2c6d151e5fbf875dd08b3577f73afd6ee6674605 linux-6.6.12.tar.xz +sha256 b66a5b863b0f8669448b74ca83bd641a856f164b29956e539bbcb5fdeeab9cc6 linux-6.6.30.tar.xz diff --git a/configs/acmesystems_acqua_a5_256mb_defconfig b/configs/acmesystems_acqua_a5_256mb_defconfig index 359b356cb4..b102dde0ba 100644 --- a/configs/acmesystems_acqua_a5_256mb_defconfig +++ b/configs/acmesystems_acqua_a5_256mb_defconfig @@ -10,7 +10,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/acmesystems/acqua-a5/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.12" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.30" BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/acmesystems/acqua-a5/at91-sama5d3_acqua.dts" diff --git a/configs/acmesystems_acqua_a5_512mb_defconfig b/configs/acmesystems_acqua_a5_512mb_defconfig index 194de0b530..da54eaf620 100644 --- a/configs/acmesystems_acqua_a5_512mb_defconfig +++ b/configs/acmesystems_acqua_a5_512mb_defconfig @@ -10,7 +10,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/acmesystems/acqua-a5/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.12" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.30" BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/acmesystems/acqua-a5/at91-sama5d3_acqua.dts" From a012c44201a1dbc04016bad04fbe33c666d78ca2 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Mon, 6 May 2024 16:45:44 +0200 Subject: [PATCH 5566/5754] boot/barebox/Config.in: source argument needs quotation marks Fixes the following error/warnings with kconfig from linux-6.9-rc5: boot/barebox/Config.in:79: syntax error boot/barebox/Config.in:79:warning: ignoring unsupported character '/' boot/barebox/Config.in:79:warning: ignoring unsupported character '/' boot/barebox/Config.in:79:warning: ignoring unsupported character '/' boot/barebox/Config.in:79:warning: ignoring unsupported character '.' boot/barebox/Config.in:79: invalid statement boot/barebox/Config.in:93: syntax error boot/barebox/Config.in:93:warning: ignoring unsupported character '/' boot/barebox/Config.in:93:warning: ignoring unsupported character '/' boot/barebox/Config.in:93:warning: ignoring unsupported character '/' boot/barebox/Config.in:93:warning: ignoring unsupported character '.' boot/barebox/Config.in:93: invalid statement Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni (cherry picked from commit e86aec1663357a9f1f7de56129dfd1ab1c5d2cda) Signed-off-by: Peter Korsgaard --- boot/barebox/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in index dba4a1a8d6..0bd3386795 100644 --- a/boot/barebox/Config.in +++ b/boot/barebox/Config.in @@ -76,7 +76,7 @@ config BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION endif -source boot/barebox/barebox/Config.in +source "boot/barebox/barebox/Config.in" menuconfig BR2_TARGET_BAREBOX_AUX bool "Build barebox with an auxiliary config" @@ -90,7 +90,7 @@ menuconfig BR2_TARGET_BAREBOX_AUX if BR2_TARGET_BAREBOX_AUX -source boot/barebox/barebox-aux/Config.in +source "boot/barebox/barebox-aux/Config.in" endif From 7dfb9a9ce9e60ebc06793b7183b2b7e9c407c72a Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Mon, 6 May 2024 16:45:45 +0200 Subject: [PATCH 5567/5754] package/cmocka/Config.in: bool argument needs quotation marks Fixes the following error/warnings with kconfig from linux-6.9-rc5: package/cmocka/Config.in:2: syntax error package/cmocka/Config.in:2: invalid statement package/cmocka/Config.in:3: invalid statement package/cmocka/Config.in:4: invalid statement [...] Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni (cherry picked from commit 4abda655e6148cc3607101cb24933706fb2b6801) Signed-off-by: Peter Korsgaard --- package/cmocka/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/cmocka/Config.in b/package/cmocka/Config.in index cf49d0f6be..80e29778d3 100644 --- a/package/cmocka/Config.in +++ b/package/cmocka/Config.in @@ -1,5 +1,5 @@ config BR2_PACKAGE_CMOCKA - bool cmocka + bool "cmocka" depends on !BR2_STATIC_LIBS help cmocka is an elegant unit testing framework for C with support From 033a9a64a6f9db0bc5f0313d1b24f8d385316874 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Mon, 6 May 2024 16:45:46 +0200 Subject: [PATCH 5568/5754] package/dovecot/Config.in: source argument needs quotation marks Fixes the following error/warnings with kconfig from linux-6.9-rc5: package/dovecot/Config.in:36: syntax error package/dovecot/Config.in:36:warning: ignoring unsupported character '/' package/dovecot/Config.in:36:warning: ignoring unsupported character '/' package/dovecot/Config.in:36:warning: ignoring unsupported character '.' package/dovecot/Config.in:36: invalid statement Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni (cherry picked from commit ff70f9ee4c7ea08471ce6aca948f5ae83e4e011d) Signed-off-by: Peter Korsgaard --- package/dovecot/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/dovecot/Config.in b/package/dovecot/Config.in index 20b08b62be..ad1b827612 100644 --- a/package/dovecot/Config.in +++ b/package/dovecot/Config.in @@ -32,7 +32,7 @@ config BR2_PACKAGE_DOVECOT_SQLITE help Enable SQLite support. -source package/dovecot-pigeonhole/Config.in +source "package/dovecot-pigeonhole/Config.in" endif # BR2_PACKAGE_DOVECOT From c3ce1d642cb9f1c237d308561bd1286bb2fa95d4 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Mon, 6 May 2024 16:45:47 +0200 Subject: [PATCH 5569/5754] package/python-pydal/Config.in: bool argument needs quotation marks Fixes the following error/warnings with kconfig from linux-6.9-rc5: package/python-pydal/Config.in:2: syntax error package/python-pydal/Config.in:2: invalid statement package/python-pydal/Config.in:3: invalid statement [...] Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni (cherry picked from commit 9f8d3f47d7caa395aa7c528891455389b0f0109e) Signed-off-by: Peter Korsgaard --- package/python-pydal/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-pydal/Config.in b/package/python-pydal/Config.in index f1c97f91a0..204b47a09a 100644 --- a/package/python-pydal/Config.in +++ b/package/python-pydal/Config.in @@ -1,5 +1,5 @@ config BR2_PACKAGE_PYTHON_PYDAL - bool python-pydal + bool "python-pydal" help pyDAL is a pure Python Database Abstraction Layer. It dynamically generates the SQL in real time using the From 2842ea60ff262acffc56eedf9fb017bdf85ce23b Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Mon, 6 May 2024 16:45:48 +0200 Subject: [PATCH 5570/5754] package/x11r7/Config.in: source argument needs quotation marks Fixes the following error/warnings with kconfig from linux-6.9-rc5: package/x11r7/Config.in:14: syntax error package/x11r7/Config.in:14:warning: ignoring unsupported character '/' package/x11r7/Config.in:14:warning: ignoring unsupported character '/' package/x11r7/Config.in:14:warning: ignoring unsupported character '/' package/x11r7/Config.in:14:warning: ignoring unsupported character '.' package/x11r7/Config.in:14: invalid statement [...] Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni (cherry picked from commit a214c4568b2b93984be39ff8d3f9f4acb6af898c) Signed-off-by: Peter Korsgaard --- package/x11r7/Config.in | 420 ++++++++++++++++++++-------------------- 1 file changed, 210 insertions(+), 210 deletions(-) diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in index b91f97bb34..0002dfe598 100644 --- a/package/x11r7/Config.in +++ b/package/x11r7/Config.in @@ -11,232 +11,232 @@ menuconfig BR2_PACKAGE_XORG7 if BR2_PACKAGE_XORG7 menu "X11R7 Servers" - source package/x11r7/xserver_xorg-server/Config.in - source package/x11r7/xwayland/Config.in + source "package/x11r7/xserver_xorg-server/Config.in" + source "package/x11r7/xwayland/Config.in" endmenu menu "X11R7 Libraries" - source package/x11r7/libxcb/Config.in - source package/x11r7/xcb-util/Config.in - source package/x11r7/xcb-util-cursor/Config.in - source package/x11r7/xcb-util-image/Config.in - source package/x11r7/xcb-util-keysyms/Config.in - source package/x11r7/xcb-util-renderutil/Config.in - source package/x11r7/xcb-util-wm/Config.in - source package/x11r7/xlib_libFS/Config.in - source package/x11r7/xlib_libICE/Config.in - source package/x11r7/xlib_libSM/Config.in - source package/x11r7/xlib_libX11/Config.in - source package/x11r7/xlib_libXScrnSaver/Config.in - source package/x11r7/xlib_libXau/Config.in - source package/x11r7/xlib_libXaw/Config.in - source package/x11r7/xlib_libXcomposite/Config.in - source package/x11r7/xlib_libXcursor/Config.in - source package/x11r7/xlib_libXdamage/Config.in - source package/x11r7/xlib_libXdmcp/Config.in - source package/x11r7/xlib_libXext/Config.in - source package/x11r7/xlib_libXfixes/Config.in - source package/x11r7/xlib_libXfont/Config.in - source package/x11r7/xlib_libXfont2/Config.in - source package/x11r7/xlib_libXft/Config.in - source package/x11r7/xlib_libXi/Config.in - source package/x11r7/xlib_libXinerama/Config.in - source package/x11r7/xlib_libXmu/Config.in - source package/x11r7/xlib_libXpm/Config.in - source package/x11r7/xlib_libXpresent/Config.in - source package/x11r7/xlib_libXrandr/Config.in - source package/x11r7/xlib_libXrender/Config.in - source package/x11r7/xlib_libXres/Config.in - source package/x11r7/xlib_libXt/Config.in - source package/x11r7/xlib_libXtst/Config.in - source package/x11r7/xlib_libXv/Config.in - source package/x11r7/xlib_libXvMC/Config.in - source package/x11r7/xlib_libXxf86dga/Config.in - source package/x11r7/xlib_libXxf86vm/Config.in - source package/x11r7/xlib_libdmx/Config.in - source package/x11r7/xlib_libfontenc/Config.in - source package/x11r7/xlib_libxcvt/Config.in - source package/x11r7/xlib_libxkbfile/Config.in - source package/x11r7/xlib_libxshmfence/Config.in - source package/x11r7/xlib_xtrans/Config.in + source "package/x11r7/libxcb/Config.in" + source "package/x11r7/xcb-util/Config.in" + source "package/x11r7/xcb-util-cursor/Config.in" + source "package/x11r7/xcb-util-image/Config.in" + source "package/x11r7/xcb-util-keysyms/Config.in" + source "package/x11r7/xcb-util-renderutil/Config.in" + source "package/x11r7/xcb-util-wm/Config.in" + source "package/x11r7/xlib_libFS/Config.in" + source "package/x11r7/xlib_libICE/Config.in" + source "package/x11r7/xlib_libSM/Config.in" + source "package/x11r7/xlib_libX11/Config.in" + source "package/x11r7/xlib_libXScrnSaver/Config.in" + source "package/x11r7/xlib_libXau/Config.in" + source "package/x11r7/xlib_libXaw/Config.in" + source "package/x11r7/xlib_libXcomposite/Config.in" + source "package/x11r7/xlib_libXcursor/Config.in" + source "package/x11r7/xlib_libXdamage/Config.in" + source "package/x11r7/xlib_libXdmcp/Config.in" + source "package/x11r7/xlib_libXext/Config.in" + source "package/x11r7/xlib_libXfixes/Config.in" + source "package/x11r7/xlib_libXfont/Config.in" + source "package/x11r7/xlib_libXfont2/Config.in" + source "package/x11r7/xlib_libXft/Config.in" + source "package/x11r7/xlib_libXi/Config.in" + source "package/x11r7/xlib_libXinerama/Config.in" + source "package/x11r7/xlib_libXmu/Config.in" + source "package/x11r7/xlib_libXpm/Config.in" + source "package/x11r7/xlib_libXpresent/Config.in" + source "package/x11r7/xlib_libXrandr/Config.in" + source "package/x11r7/xlib_libXrender/Config.in" + source "package/x11r7/xlib_libXres/Config.in" + source "package/x11r7/xlib_libXt/Config.in" + source "package/x11r7/xlib_libXtst/Config.in" + source "package/x11r7/xlib_libXv/Config.in" + source "package/x11r7/xlib_libXvMC/Config.in" + source "package/x11r7/xlib_libXxf86dga/Config.in" + source "package/x11r7/xlib_libXxf86vm/Config.in" + source "package/x11r7/xlib_libdmx/Config.in" + source "package/x11r7/xlib_libfontenc/Config.in" + source "package/x11r7/xlib_libxcvt/Config.in" + source "package/x11r7/xlib_libxkbfile/Config.in" + source "package/x11r7/xlib_libxshmfence/Config.in" + source "package/x11r7/xlib_xtrans/Config.in" endmenu menu "X11R7 Applications" - source package/x11r7/xapp_appres/Config.in - source package/x11r7/xapp_bdftopcf/Config.in - source package/x11r7/xapp_beforelight/Config.in - source package/x11r7/xapp_bitmap/Config.in - source package/x11r7/xapp_editres/Config.in - source package/x11r7/xapp_fonttosfnt/Config.in - source package/x11r7/xapp_fslsfonts/Config.in - source package/x11r7/xapp_fstobdf/Config.in - source package/x11r7/xapp_iceauth/Config.in - source package/x11r7/xapp_ico/Config.in - source package/x11r7/xapp_listres/Config.in - source package/x11r7/xapp_luit/Config.in - source package/x11r7/xapp_mkfontscale/Config.in - source package/x11r7/xapp_oclock/Config.in - source package/x11r7/xapp_rgb/Config.in - source package/x11r7/xapp_rstart/Config.in - source package/x11r7/xapp_scripts/Config.in - source package/x11r7/xapp_sessreg/Config.in - source package/x11r7/xapp_setxkbmap/Config.in - source package/x11r7/xapp_showfont/Config.in - source package/x11r7/xapp_smproxy/Config.in - source package/x11r7/xapp_twm/Config.in - source package/x11r7/xapp_viewres/Config.in - source package/x11r7/xapp_x11perf/Config.in - source package/x11r7/xapp_xauth/Config.in - source package/x11r7/xapp_xbacklight/Config.in - source package/x11r7/xapp_xbiff/Config.in - source package/x11r7/xapp_xcalc/Config.in - source package/x11r7/xapp_xclipboard/Config.in - source package/x11r7/xapp_xclock/Config.in - source package/x11r7/xapp_xcmsdb/Config.in - source package/x11r7/xapp_xcompmgr/Config.in - source package/x11r7/xapp_xconsole/Config.in - source package/x11r7/xapp_xcursorgen/Config.in - source package/x11r7/xapp_xdbedizzy/Config.in - source package/x11r7/xapp_xditview/Config.in - source package/x11r7/xapp_xdm/Config.in - source package/x11r7/xapp_xdpyinfo/Config.in - source package/x11r7/xapp_xdriinfo/Config.in - source package/x11r7/xapp_xedit/Config.in - source package/x11r7/xapp_xev/Config.in - source package/x11r7/xapp_xeyes/Config.in - source package/x11r7/xapp_xf86dga/Config.in - source package/x11r7/xapp_xfd/Config.in - source package/x11r7/xapp_xfindproxy/Config.in - source package/x11r7/xapp_xfontsel/Config.in - source package/x11r7/xapp_xfs/Config.in - source package/x11r7/xapp_xfsinfo/Config.in - source package/x11r7/xapp_xgamma/Config.in - source package/x11r7/xapp_xgc/Config.in - source package/x11r7/xapp_xhost/Config.in - source package/x11r7/xapp_xinit/Config.in - source package/x11r7/xapp_xinput/Config.in - source package/x11r7/xapp_xinput-calibrator/Config.in - source package/x11r7/xapp_xkbcomp/Config.in - source package/x11r7/xapp_xkbevd/Config.in - source package/x11r7/xapp_xkbprint/Config.in - source package/x11r7/xapp_xkbutils/Config.in - source package/x11r7/xapp_xkill/Config.in - source package/x11r7/xapp_xload/Config.in - source package/x11r7/xapp_xlogo/Config.in - source package/x11r7/xapp_xlsatoms/Config.in - source package/x11r7/xapp_xlsclients/Config.in - source package/x11r7/xapp_xlsfonts/Config.in - source package/x11r7/xapp_xmag/Config.in - source package/x11r7/xapp_xman/Config.in - source package/x11r7/xapp_xmessage/Config.in - source package/x11r7/xapp_xmh/Config.in - source package/x11r7/xapp_xmodmap/Config.in - source package/x11r7/xapp_xmore/Config.in - source package/x11r7/xapp_xpr/Config.in - source package/x11r7/xapp_xprop/Config.in - source package/x11r7/xapp_xrandr/Config.in - source package/x11r7/xapp_xrdb/Config.in - source package/x11r7/xapp_xrefresh/Config.in - source package/x11r7/xapp_xset/Config.in - source package/x11r7/xapp_xsetmode/Config.in - source package/x11r7/xapp_xsetpointer/Config.in - source package/x11r7/xapp_xsetroot/Config.in - source package/x11r7/xapp_xsm/Config.in - source package/x11r7/xapp_xstdcmap/Config.in - source package/x11r7/xapp_xvidtune/Config.in - source package/x11r7/xapp_xvinfo/Config.in - source package/x11r7/xapp_xwd/Config.in - source package/x11r7/xapp_xwininfo/Config.in - source package/x11r7/xapp_xwud/Config.in + source "package/x11r7/xapp_appres/Config.in" + source "package/x11r7/xapp_bdftopcf/Config.in" + source "package/x11r7/xapp_beforelight/Config.in" + source "package/x11r7/xapp_bitmap/Config.in" + source "package/x11r7/xapp_editres/Config.in" + source "package/x11r7/xapp_fonttosfnt/Config.in" + source "package/x11r7/xapp_fslsfonts/Config.in" + source "package/x11r7/xapp_fstobdf/Config.in" + source "package/x11r7/xapp_iceauth/Config.in" + source "package/x11r7/xapp_ico/Config.in" + source "package/x11r7/xapp_listres/Config.in" + source "package/x11r7/xapp_luit/Config.in" + source "package/x11r7/xapp_mkfontscale/Config.in" + source "package/x11r7/xapp_oclock/Config.in" + source "package/x11r7/xapp_rgb/Config.in" + source "package/x11r7/xapp_rstart/Config.in" + source "package/x11r7/xapp_scripts/Config.in" + source "package/x11r7/xapp_sessreg/Config.in" + source "package/x11r7/xapp_setxkbmap/Config.in" + source "package/x11r7/xapp_showfont/Config.in" + source "package/x11r7/xapp_smproxy/Config.in" + source "package/x11r7/xapp_twm/Config.in" + source "package/x11r7/xapp_viewres/Config.in" + source "package/x11r7/xapp_x11perf/Config.in" + source "package/x11r7/xapp_xauth/Config.in" + source "package/x11r7/xapp_xbacklight/Config.in" + source "package/x11r7/xapp_xbiff/Config.in" + source "package/x11r7/xapp_xcalc/Config.in" + source "package/x11r7/xapp_xclipboard/Config.in" + source "package/x11r7/xapp_xclock/Config.in" + source "package/x11r7/xapp_xcmsdb/Config.in" + source "package/x11r7/xapp_xcompmgr/Config.in" + source "package/x11r7/xapp_xconsole/Config.in" + source "package/x11r7/xapp_xcursorgen/Config.in" + source "package/x11r7/xapp_xdbedizzy/Config.in" + source "package/x11r7/xapp_xditview/Config.in" + source "package/x11r7/xapp_xdm/Config.in" + source "package/x11r7/xapp_xdpyinfo/Config.in" + source "package/x11r7/xapp_xdriinfo/Config.in" + source "package/x11r7/xapp_xedit/Config.in" + source "package/x11r7/xapp_xev/Config.in" + source "package/x11r7/xapp_xeyes/Config.in" + source "package/x11r7/xapp_xf86dga/Config.in" + source "package/x11r7/xapp_xfd/Config.in" + source "package/x11r7/xapp_xfindproxy/Config.in" + source "package/x11r7/xapp_xfontsel/Config.in" + source "package/x11r7/xapp_xfs/Config.in" + source "package/x11r7/xapp_xfsinfo/Config.in" + source "package/x11r7/xapp_xgamma/Config.in" + source "package/x11r7/xapp_xgc/Config.in" + source "package/x11r7/xapp_xhost/Config.in" + source "package/x11r7/xapp_xinit/Config.in" + source "package/x11r7/xapp_xinput/Config.in" + source "package/x11r7/xapp_xinput-calibrator/Config.in" + source "package/x11r7/xapp_xkbcomp/Config.in" + source "package/x11r7/xapp_xkbevd/Config.in" + source "package/x11r7/xapp_xkbprint/Config.in" + source "package/x11r7/xapp_xkbutils/Config.in" + source "package/x11r7/xapp_xkill/Config.in" + source "package/x11r7/xapp_xload/Config.in" + source "package/x11r7/xapp_xlogo/Config.in" + source "package/x11r7/xapp_xlsatoms/Config.in" + source "package/x11r7/xapp_xlsclients/Config.in" + source "package/x11r7/xapp_xlsfonts/Config.in" + source "package/x11r7/xapp_xmag/Config.in" + source "package/x11r7/xapp_xman/Config.in" + source "package/x11r7/xapp_xmessage/Config.in" + source "package/x11r7/xapp_xmh/Config.in" + source "package/x11r7/xapp_xmodmap/Config.in" + source "package/x11r7/xapp_xmore/Config.in" + source "package/x11r7/xapp_xpr/Config.in" + source "package/x11r7/xapp_xprop/Config.in" + source "package/x11r7/xapp_xrandr/Config.in" + source "package/x11r7/xapp_xrdb/Config.in" + source "package/x11r7/xapp_xrefresh/Config.in" + source "package/x11r7/xapp_xset/Config.in" + source "package/x11r7/xapp_xsetmode/Config.in" + source "package/x11r7/xapp_xsetpointer/Config.in" + source "package/x11r7/xapp_xsetroot/Config.in" + source "package/x11r7/xapp_xsm/Config.in" + source "package/x11r7/xapp_xstdcmap/Config.in" + source "package/x11r7/xapp_xvidtune/Config.in" + source "package/x11r7/xapp_xvinfo/Config.in" + source "package/x11r7/xapp_xwd/Config.in" + source "package/x11r7/xapp_xwininfo/Config.in" + source "package/x11r7/xapp_xwud/Config.in" endmenu if BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR menu "X11R7 Drivers" - source package/x11r7/xdriver_xf86-input-evdev/Config.in - source package/x11r7/xdriver_xf86-input-joystick/Config.in - source package/x11r7/xdriver_xf86-input-libinput/Config.in - source package/x11r7/xdriver_xf86-input-mouse/Config.in - source package/x11r7/xdriver_xf86-input-synaptics/Config.in - source package/x11r7/xdriver_xf86-input-tslib/Config.in - source package/x11r7/xdriver_xf86-input-vmmouse/Config.in - source package/x11r7/xdriver_xf86-video-amdgpu/Config.in - source package/x11r7/xdriver_xf86-video-ark/Config.in - source package/x11r7/xdriver_xf86-video-ast/Config.in - source package/x11r7/xdriver_xf86-video-ati/Config.in - source package/x11r7/xdriver_xf86-video-cirrus/Config.in - source package/x11r7/xdriver_xf86-video-dummy/Config.in - source package/x11r7/xdriver_xf86-video-fbdev/Config.in - source package/x11r7/xdriver_xf86-video-fbturbo/Config.in - source package/x11r7/xdriver_xf86-video-geode/Config.in - source package/x11r7/xdriver_xf86-video-i128/Config.in - source package/x11r7/xdriver_xf86-video-imx/Config.in - source package/x11r7/xdriver_xf86-video-intel/Config.in - source package/x11r7/xdriver_xf86-video-mach64/Config.in - source package/x11r7/xdriver_xf86-video-mga/Config.in - source package/x11r7/xdriver_xf86-video-neomagic/Config.in - source package/x11r7/xdriver_xf86-video-nouveau/Config.in - source package/x11r7/xdriver_xf86-video-nv/Config.in - source package/x11r7/xdriver_xf86-video-openchrome/Config.in - source package/x11r7/xdriver_xf86-video-qxl/Config.in - source package/x11r7/xdriver_xf86-video-r128/Config.in - source package/x11r7/xdriver_xf86-video-savage/Config.in - source package/x11r7/xdriver_xf86-video-siliconmotion/Config.in - source package/x11r7/xdriver_xf86-video-sis/Config.in - source package/x11r7/xdriver_xf86-video-tdfx/Config.in - source package/x11r7/xdriver_xf86-video-trident/Config.in - source package/x11r7/xdriver_xf86-video-vesa/Config.in - source package/x11r7/xdriver_xf86-video-vmware/Config.in - source package/x11r7/xdriver_xf86-video-voodoo/Config.in + source "package/x11r7/xdriver_xf86-input-evdev/Config.in" + source "package/x11r7/xdriver_xf86-input-joystick/Config.in" + source "package/x11r7/xdriver_xf86-input-libinput/Config.in" + source "package/x11r7/xdriver_xf86-input-mouse/Config.in" + source "package/x11r7/xdriver_xf86-input-synaptics/Config.in" + source "package/x11r7/xdriver_xf86-input-tslib/Config.in" + source "package/x11r7/xdriver_xf86-input-vmmouse/Config.in" + source "package/x11r7/xdriver_xf86-video-amdgpu/Config.in" + source "package/x11r7/xdriver_xf86-video-ark/Config.in" + source "package/x11r7/xdriver_xf86-video-ast/Config.in" + source "package/x11r7/xdriver_xf86-video-ati/Config.in" + source "package/x11r7/xdriver_xf86-video-cirrus/Config.in" + source "package/x11r7/xdriver_xf86-video-dummy/Config.in" + source "package/x11r7/xdriver_xf86-video-fbdev/Config.in" + source "package/x11r7/xdriver_xf86-video-fbturbo/Config.in" + source "package/x11r7/xdriver_xf86-video-geode/Config.in" + source "package/x11r7/xdriver_xf86-video-i128/Config.in" + source "package/x11r7/xdriver_xf86-video-imx/Config.in" + source "package/x11r7/xdriver_xf86-video-intel/Config.in" + source "package/x11r7/xdriver_xf86-video-mach64/Config.in" + source "package/x11r7/xdriver_xf86-video-mga/Config.in" + source "package/x11r7/xdriver_xf86-video-neomagic/Config.in" + source "package/x11r7/xdriver_xf86-video-nouveau/Config.in" + source "package/x11r7/xdriver_xf86-video-nv/Config.in" + source "package/x11r7/xdriver_xf86-video-openchrome/Config.in" + source "package/x11r7/xdriver_xf86-video-qxl/Config.in" + source "package/x11r7/xdriver_xf86-video-r128/Config.in" + source "package/x11r7/xdriver_xf86-video-savage/Config.in" + source "package/x11r7/xdriver_xf86-video-siliconmotion/Config.in" + source "package/x11r7/xdriver_xf86-video-sis/Config.in" + source "package/x11r7/xdriver_xf86-video-tdfx/Config.in" + source "package/x11r7/xdriver_xf86-video-trident/Config.in" + source "package/x11r7/xdriver_xf86-video-vesa/Config.in" + source "package/x11r7/xdriver_xf86-video-vmware/Config.in" + source "package/x11r7/xdriver_xf86-video-voodoo/Config.in" endmenu endif menu "X11R7 Fonts" - source package/x11r7/xfont_font-util/Config.in - source package/x11r7/xfont_encodings/Config.in - source package/x11r7/xfont_font-adobe-100dpi/Config.in - source package/x11r7/xfont_font-adobe-75dpi/Config.in - source package/x11r7/xfont_font-adobe-utopia-100dpi/Config.in - source package/x11r7/xfont_font-adobe-utopia-75dpi/Config.in - source package/x11r7/xfont_font-adobe-utopia-type1/Config.in - source package/x11r7/xfont_font-alias/Config.in - source package/x11r7/xfont_font-arabic-misc/Config.in - source package/x11r7/xfont_font-bh-100dpi/Config.in - source package/x11r7/xfont_font-bh-75dpi/Config.in - source package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/Config.in - source package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/Config.in - source package/x11r7/xfont_font-bh-ttf/Config.in - source package/x11r7/xfont_font-bh-type1/Config.in - source package/x11r7/xfont_font-bitstream-100dpi/Config.in - source package/x11r7/xfont_font-bitstream-75dpi/Config.in - source package/x11r7/xfont_font-bitstream-type1/Config.in - source package/x11r7/xfont_font-cronyx-cyrillic/Config.in - source package/x11r7/xfont_font-cursor-misc/Config.in - source package/x11r7/xfont_font-daewoo-misc/Config.in - source package/x11r7/xfont_font-dec-misc/Config.in - source package/x11r7/xfont_font-ibm-type1/Config.in - source package/x11r7/xfont_font-isas-misc/Config.in - source package/x11r7/xfont_font-jis-misc/Config.in - source package/x11r7/xfont_font-micro-misc/Config.in - source package/x11r7/xfont_font-misc-cyrillic/Config.in - source package/x11r7/xfont_font-misc-ethiopic/Config.in - source package/x11r7/xfont_font-misc-meltho/Config.in - source package/x11r7/xfont_font-misc-misc/Config.in - source package/x11r7/xfont_font-mutt-misc/Config.in - source package/x11r7/xfont_font-schumacher-misc/Config.in - source package/x11r7/xfont_font-screen-cyrillic/Config.in - source package/x11r7/xfont_font-sony-misc/Config.in - source package/x11r7/xfont_font-sun-misc/Config.in - source package/x11r7/xfont_font-winitzki-cyrillic/Config.in - source package/x11r7/xfont_font-xfree86-type1/Config.in + source "package/x11r7/xfont_font-util/Config.in" + source "package/x11r7/xfont_encodings/Config.in" + source "package/x11r7/xfont_font-adobe-100dpi/Config.in" + source "package/x11r7/xfont_font-adobe-75dpi/Config.in" + source "package/x11r7/xfont_font-adobe-utopia-100dpi/Config.in" + source "package/x11r7/xfont_font-adobe-utopia-75dpi/Config.in" + source "package/x11r7/xfont_font-adobe-utopia-type1/Config.in" + source "package/x11r7/xfont_font-alias/Config.in" + source "package/x11r7/xfont_font-arabic-misc/Config.in" + source "package/x11r7/xfont_font-bh-100dpi/Config.in" + source "package/x11r7/xfont_font-bh-75dpi/Config.in" + source "package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/Config.in" + source "package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/Config.in" + source "package/x11r7/xfont_font-bh-ttf/Config.in" + source "package/x11r7/xfont_font-bh-type1/Config.in" + source "package/x11r7/xfont_font-bitstream-100dpi/Config.in" + source "package/x11r7/xfont_font-bitstream-75dpi/Config.in" + source "package/x11r7/xfont_font-bitstream-type1/Config.in" + source "package/x11r7/xfont_font-cronyx-cyrillic/Config.in" + source "package/x11r7/xfont_font-cursor-misc/Config.in" + source "package/x11r7/xfont_font-daewoo-misc/Config.in" + source "package/x11r7/xfont_font-dec-misc/Config.in" + source "package/x11r7/xfont_font-ibm-type1/Config.in" + source "package/x11r7/xfont_font-isas-misc/Config.in" + source "package/x11r7/xfont_font-jis-misc/Config.in" + source "package/x11r7/xfont_font-micro-misc/Config.in" + source "package/x11r7/xfont_font-misc-cyrillic/Config.in" + source "package/x11r7/xfont_font-misc-ethiopic/Config.in" + source "package/x11r7/xfont_font-misc-meltho/Config.in" + source "package/x11r7/xfont_font-misc-misc/Config.in" + source "package/x11r7/xfont_font-mutt-misc/Config.in" + source "package/x11r7/xfont_font-schumacher-misc/Config.in" + source "package/x11r7/xfont_font-screen-cyrillic/Config.in" + source "package/x11r7/xfont_font-sony-misc/Config.in" + source "package/x11r7/xfont_font-sun-misc/Config.in" + source "package/x11r7/xfont_font-winitzki-cyrillic/Config.in" + source "package/x11r7/xfont_font-xfree86-type1/Config.in" endmenu menu "X11R7 X protocols" - source package/x11r7/xcb-proto/Config.in - source package/x11r7/xorgproto/Config.in + source "package/x11r7/xcb-proto/Config.in" + source "package/x11r7/xorgproto/Config.in" endmenu menu "X11R7 Utilities" - source package/x11r7/xutil_makedepend/Config.in - source package/x11r7/mcookie/Config.in + source "package/x11r7/xutil_makedepend/Config.in" + source "package/x11r7/mcookie/Config.in" endmenu menu "X11R7 Other data" - source package/x11r7/xdata_xbitmaps/Config.in - source package/x11r7/xdata_xcursor-themes/Config.in - source package/x11r7/xcursor-transparent-theme/Config.in + source "package/x11r7/xdata_xbitmaps/Config.in" + source "package/x11r7/xdata_xcursor-themes/Config.in" + source "package/x11r7/xcursor-transparent-theme/Config.in" endmenu endif From 20dc0f23f4df90bacfe0b78092eac833f6499f2d Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 5 May 2024 16:17:59 +0200 Subject: [PATCH 5571/5754] package/shadow: fix NLS build NLS is an optional dependency since the addition of the package in commit f78c5cb5cae93a9e63dad4361d78e1787759382f: /home/autobuild/autobuild/instance-0/output-1/host/lib/gcc/arm-buildroot-linux-musleabi/12.3.0/../../../../arm-buildroot-linux-musleabi/bin/ld: ../lib/.libs/libshadow.a(libshadow_la-alloc.o): in function `xcalloc': alloc.c:(.text+0x7c): undefined reference to `libintl_gettext' Fixes: f78c5cb5cae93a9e63dad4361d78e1787759382f - http://autobuild.buildroot.org/results/9f604d09745ffa1f4db3bdcfe0326c236effac0c Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit f82384652c0feed99dc07f08fae5ec1646d38dfc) Signed-off-by: Peter Korsgaard --- package/shadow/shadow.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/shadow/shadow.mk b/package/shadow/shadow.mk index 1e7ada6148..ce17ffc7a7 100644 --- a/package/shadow/shadow.mk +++ b/package/shadow/shadow.mk @@ -10,6 +10,8 @@ SHADOW_SOURCE = shadow-$(SHADOW_VERSION).tar.xz SHADOW_LICENSE = BSD-3-Clause SHADOW_LICENSE_FILES = COPYING SHADOW_CPE_ID_VENDOR = debian +SHADOW_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) +SHADOW_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) SHADOW_CONF_OPTS = \ --disable-man \ From 1cfabbf913a02d5b5116e7ca262f11adf02838eb Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 5 May 2024 17:53:49 +0200 Subject: [PATCH 5572/5754] package/pppd: fix build with kernel < 4.7 Fix the following build failure with kernel < 4.7 raised since bump to version 2.5.0 in commit 0c15169f5ae57d88a77df34cc896044a37c9597b and https://github.com/ppp-project/ppp/commit/81ad945630120cc1c27c8bb00503be42b76ff202: sys-linux.c: In function 'get_ppp_stats_rtnetlink': sys-linux.c:1783:29: error: field 'ifsm' has incomplete type 1783 | struct if_stats_msg ifsm; | ^~~~ Fixes: - http://autobuild.buildroot.org/results/82392df447f650f241f23e59e65131fb4a930010 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 45c1def9915ead52a5e4b874c33194653b598117) Signed-off-by: Peter Korsgaard --- ...pile-with-older-Linux-kernel-headers.patch | 66 +++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 package/pppd/0005-pppd-sys-linux-Fix-compile-with-older-Linux-kernel-headers.patch diff --git a/package/pppd/0005-pppd-sys-linux-Fix-compile-with-older-Linux-kernel-headers.patch b/package/pppd/0005-pppd-sys-linux-Fix-compile-with-older-Linux-kernel-headers.patch new file mode 100644 index 0000000000..46c293103a --- /dev/null +++ b/package/pppd/0005-pppd-sys-linux-Fix-compile-with-older-Linux-kernel-headers.patch @@ -0,0 +1,66 @@ +From 7a3f478a4b7128d4f70ea64d99fedec766b1c009 Mon Sep 17 00:00:00 2001 +From: Jaco Kroon +Date: Tue, 31 Oct 2023 11:47:21 +0200 +Subject: [PATCH] pppd/sys-linux: Fix compile with older Linux kernel headers + (#452) + +When compiling pppd against kernel headers which don't provide +the definitions for the NETLINK mechanisms, leave out the code +which uses NETLINK, so as to avoid getting compile errors. + +Upstream commit in Linux refers. + +commit 10c9ead9f3c6bb24bddc9a96681f7d58e6623966 +Author: Roopa Prabhu +Date: Wed Apr 20 08:43:43 2016 -0700 +rtnetlink: add new RTM_GETSTATS message to dump link stats + +This commit adds the #defines and structs used, so simply not compiling +this code if the required #defines isn't there should solve the problem. + +Closes: #450 + +Signed-off-by: Jaco Kroon +Upstream: https://github.com/ppp-project/ppp/commit/7a3f478a4b7128d4f70ea64d99fedec766b1c009 +Signed-off-by: Fabrice Fontaine +--- + pppd/sys-linux.c | 12 ++---------- + 1 file changed, 2 insertions(+), 10 deletions(-) + +diff --git a/pppd/sys-linux.c b/pppd/sys-linux.c +index 561b150f2..a8d6cd95b 100644 +--- a/pppd/sys-linux.c ++++ b/pppd/sys-linux.c +@@ -131,16 +131,6 @@ + #include + #include + #include +- +-/* Attempt at retaining compile-support with older than 4.7 kernels, or kernels +- * where RTM_NEWSTATS isn't defined for whatever reason. +- */ +-#ifndef RTM_NEWSTATS +-#define RTM_NEWSTATS 92 +-#define RTM_GETSTATS 94 +-#define IFLA_STATS_LINK_64 1 +-#endif +- + #include + + /* glibc versions prior to 2.24 do not define SOL_NETLINK */ +@@ -1776,6 +1766,7 @@ get_ppp_stats_ioctl(int u, struct pppd_stats *stats) + static int + get_ppp_stats_rtnetlink(int u, struct pppd_stats *stats) + { ++#ifdef RTM_NEWSTATS + static int fd = -1; + + struct { +@@ -1825,6 +1816,7 @@ get_ppp_stats_rtnetlink(int u, struct pppd_stats *stats) + err: + close(fd); + fd = -1; ++#endif + return 0; + } + From 97b20fa17cd3494f87de82281b3acd622c0ba751 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 6 May 2024 09:40:11 +0200 Subject: [PATCH 5573/5754] configs/sheevaplug_defconfig: bump Linux to fix binutils 2.41 build Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6761770801 The Linux kernel fails to build since commit e88225ed882 (package/binutils: make 2.41 the default version): arch/arm/mm/proc-feroceon.S: Assembler messages: arch/arm/mm/proc-feroceon.S:587: Error: junk at end of line, first unrecognized character is `#' make[3]: *** [scripts/Makefile.build:430: arch/arm/mm/proc-feroceon.o] Error 1 make[3]: *** Waiting for unfinished jobs.... Fix the build by bumping the kernel to 4.14.336, which includes commit 3ab03df64f77 (ARM: 8933/1: replace Sun/Solaris style flag on section directive): https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-4.14.y&id=3ab03df64f7754728a2257c47775a70a88428331 Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit c0dc1b3425ae3bade14553a96e7475a79d753d4e) Signed-off-by: Peter Korsgaard --- configs/sheevaplug_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/sheevaplug_defconfig b/configs/sheevaplug_defconfig index 7f186df22c..0879f17071 100644 --- a/configs/sheevaplug_defconfig +++ b/configs/sheevaplug_defconfig @@ -27,7 +27,7 @@ BR2_TARGET_UBOOT_FORMAT_KWB=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.253" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.336" BR2_LINUX_KERNEL_DEFCONFIG="mvebu_v5" BR2_LINUX_KERNEL_APPENDED_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" From a6f9dff3af57d046f5dfb92c2831267b30cd6132 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 6 May 2024 09:40:12 +0200 Subject: [PATCH 5574/5754] configs/sheevaplug_defconfig: add hashes for u-boot and Linux And enable BR2_DOWNLOAD_FORCE_CHECK_HASHES. Generated by utils/add-custom-hashes, with the (redundant) linux-headers.hash replaced by a symlink. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit 56ce35d235b7f7b297e33c118e4e7b64491f73c6) Signed-off-by: Peter Korsgaard --- board/sheevaplug/patches/linux-headers/linux-headers.hash | 1 + board/sheevaplug/patches/linux/linux.hash | 2 ++ board/sheevaplug/patches/uboot/uboot.hash | 2 ++ configs/sheevaplug_defconfig | 1 + 4 files changed, 6 insertions(+) create mode 120000 board/sheevaplug/patches/linux-headers/linux-headers.hash create mode 100644 board/sheevaplug/patches/linux/linux.hash create mode 100644 board/sheevaplug/patches/uboot/uboot.hash diff --git a/board/sheevaplug/patches/linux-headers/linux-headers.hash b/board/sheevaplug/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/board/sheevaplug/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/sheevaplug/patches/linux/linux.hash b/board/sheevaplug/patches/linux/linux.hash new file mode 100644 index 0000000000..b207306a2b --- /dev/null +++ b/board/sheevaplug/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 0820fdb7971c6974338081c11fbf2dc869870501e7bdcac4d0ed58ba1f57b61c linux-4.14.336.tar.xz diff --git a/board/sheevaplug/patches/uboot/uboot.hash b/board/sheevaplug/patches/uboot/uboot.hash new file mode 100644 index 0000000000..d6818bac36 --- /dev/null +++ b/board/sheevaplug/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 9f10df88bc91b35642e461217f73256bbaeeca9ae2db8db56197ba5e89e1f6d4 u-boot-2018.07.tar.bz2 diff --git a/configs/sheevaplug_defconfig b/configs/sheevaplug_defconfig index 0879f17071..6b3719a507 100644 --- a/configs/sheevaplug_defconfig +++ b/configs/sheevaplug_defconfig @@ -4,6 +4,7 @@ BR2_arm926t=y # system BR2_GLOBAL_PATCH_DIR="board/sheevaplug/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_SYSTEM_DHCP="eth0" From baaf5f569f8115c25d54198631eddcbc4710f766 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 6 May 2024 10:19:58 +0200 Subject: [PATCH 5575/5754] package/libhtp: security bump to version 0.5.48 Fix CVE-2024-23837 and CVE-2024-28871 https://github.com/OISF/libhtp/security/advisories/GHSA-f9wf-rrjj-qx8m https://github.com/OISF/libhtp/security/advisories/GHSA-ffr2-45w9-7wmg https://github.com/OISF/libhtp/blob/0.5.48/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit babb39c87366217ce84269ba11b29475d3d183b7) Signed-off-by: Peter Korsgaard --- package/libhtp/libhtp.hash | 2 +- package/libhtp/libhtp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libhtp/libhtp.hash b/package/libhtp/libhtp.hash index c016cb3439..1809bc93a3 100644 --- a/package/libhtp/libhtp.hash +++ b/package/libhtp/libhtp.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 d4214f94522fa5a1ec1909dbb52831c534788d93bc6b2ca8252de9332b11b606 libhtp-0.5.45.tar.gz +sha256 7f0719732fd0c82f9915e3df27e31548798590ad624fbad24f58b50885248ab8 libhtp-0.5.48.tar.gz sha256 87c93904e5434c81622ea690c2b90097b9f162aaa92a96542649a157dbf98d15 LICENSE diff --git a/package/libhtp/libhtp.mk b/package/libhtp/libhtp.mk index 8a732d1d5c..8735f593d9 100644 --- a/package/libhtp/libhtp.mk +++ b/package/libhtp/libhtp.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBHTP_VERSION = 0.5.45 +LIBHTP_VERSION = 0.5.48 LIBHTP_SITE = $(call github,OISF,libhtp,$(LIBHTP_VERSION)) LIBHTP_LICENSE = BSD-3-Clause LIBHTP_LICENSE_FILES = LICENSE From 47bc873569d40d776093750dff5646abb686a3b3 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 6 May 2024 10:19:59 +0200 Subject: [PATCH 5576/5754] package/suricata: security bump to version 6.0.19 Fixes: - CVE-2024-23839 - Critical severity - CVE-2024-23836 - Critical severity - CVE-2024-23835 - High severity - CVE-2024-24568 - Moderate severity - CVE-2024-28870 - HIGH - CVE-2024-32663 CRITICAL (HIGH for 6.0.x) - CVE-2024-32664 CRITICAL (HIGH for 7.0.x) - CVE-2024-32867 MODERATE https://forum.suricata.io/t/suricata-7-0-3-and-6-0-16-released/4468 https://forum.suricata.io/t/suricata-7-0-4-and-6-0-17-released/4534 https://forum.suricata.io/t/suricata-6-0-18-released/4539 https://forum.suricata.io/t/suricata-7-0-5-and-6-0-19-released/4617 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit a8e60c4600f42212cb8c42e5b288d6406bb80db4) Signed-off-by: Peter Korsgaard --- package/suricata/suricata.hash | 2 +- package/suricata/suricata.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/suricata/suricata.hash b/package/suricata/suricata.hash index 41befa61b9..58ab0d93b0 100644 --- a/package/suricata/suricata.hash +++ b/package/suricata/suricata.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 1bd546149ac6671c2476d520a38eab7755e10c3080fd2ec2dc8624b0cf89ee75 suricata-6.0.15.tar.gz +sha256 98c812faef466d337f107f13ae37843f1c719942b93832d70f1a2fd7ee1b5c2c suricata-6.0.19.tar.gz # Hash for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/suricata/suricata.mk b/package/suricata/suricata.mk index 5b52635328..2083e0caba 100644 --- a/package/suricata/suricata.mk +++ b/package/suricata/suricata.mk @@ -4,7 +4,7 @@ # ################################################################################ -SURICATA_VERSION = 6.0.15 +SURICATA_VERSION = 6.0.19 SURICATA_SITE = https://www.openinfosecfoundation.org/download SURICATA_LICENSE = GPL-2.0 SURICATA_LICENSE_FILES = COPYING LICENSE From 40205fa62b4fa578b9158810c0681f665142fb2f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 6 May 2024 09:00:49 +0200 Subject: [PATCH 5577/5754] package/oprofile: fix static build with binutils >= 2.40 sframe library was added by binutils 2.40 and https://github.com/bminor/binutils-gdb/commit/19e559f1c91bfaedbd2f91d85ee161f3f03fda3c resulting in the following static build failure: /home/buildroot/autobuild/run/instance-1/output-1/build/binutils-2.41/bfd/elf-sframe.c:220: undefined reference to `sframe_decode' [...] configure: error: bfd library not found Fixes: - http://autobuild.buildroot.org/results/a9f3e09e6543b3773440c011e93bd41e357691e4 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 5272c6bea1247e87a32947bd960757a19fdf8b90) Signed-off-by: Peter Korsgaard --- ...-fix-static-build-with-binutils-2.40.patch | 62 +++++++++++++++++++ package/oprofile/oprofile.mk | 7 +++ 2 files changed, 69 insertions(+) create mode 100644 package/oprofile/0002-fix-static-build-with-binutils-2.40.patch diff --git a/package/oprofile/0002-fix-static-build-with-binutils-2.40.patch b/package/oprofile/0002-fix-static-build-with-binutils-2.40.patch new file mode 100644 index 0000000000..3134363abc --- /dev/null +++ b/package/oprofile/0002-fix-static-build-with-binutils-2.40.patch @@ -0,0 +1,62 @@ +From 1e4cd78bca2bd6e0d17b6cb9caf1b172d7bac564 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 6 May 2024 08:41:49 +0200 +Subject: [PATCH] fix static build with binutils >= 2.40 + +sframe library was added by binutils 2.40 and +https://github.com/bminor/binutils-gdb/commit/19e559f1c91bfaedbd2f91d85ee161f3f03fda3c +resulting in the following static build failure: + +/home/buildroot/autobuild/run/instance-1/output-1/build/binutils-2.41/bfd/elf-sframe.c:220: undefined reference to `sframe_decode' + +[...] + +configure: error: bfd library not found + +Fixes: + - http://autobuild.buildroot.org/results/a9f3e09e6543b3773440c011e93bd41e357691e4 + +Signed-off-by: Fabrice Fontaine +Upstream: https://sourceforge.net/p/oprofile/bugs/295 +--- + configure.ac | 2 +- + m4/binutils.m4 | 7 +++++-- + 2 files changed, 6 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index dc447f89..72ef0a21 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -334,7 +334,7 @@ AX_CHECK_DOCBOOK + dnl finally restore the original libs setting + LIBS="$ORIG_SAVE_LIBS" + LIBERTY_LIBS="-liberty $DL_LIB $INTL_LIB" +-BFD_LIBS="-lbfd -liberty $DL_LIB $INTL_LIB $Z_LIB" ++BFD_LIBS="-lbfd -liberty $DL_LIB $INTL_LIB $SFRAME_LIB $Z_LIB" + POPT_LIBS="-lpopt" + AC_SUBST(LIBERTY_LIBS) + AC_SUBST(BFD_LIBS) +diff --git a/m4/binutils.m4 b/m4/binutils.m4 +index c50e2f3c..e1ccd8e7 100644 +--- a/m4/binutils.m4 ++++ b/m4/binutils.m4 +@@ -10,11 +10,14 @@ AC_CHECK_FUNCS(xmemdup) + AC_CHECK_LIB(dl, dlopen, LIBS="$LIBS -ldl"; DL_LIB="-ldl", DL_LIB="") + AC_CHECK_LIB(intl, main, LIBS="$LIBS -lintl"; INTL_LIB="-lintl", INTL_LIB="") + +-AC_CHECK_LIB(bfd, bfd_openr, LIBS="-lbfd $LIBS"; Z_LIB="", ++AC_CHECK_LIB(bfd, bfd_openr, LIBS="-lbfd $LIBS"; SFRAME_LIB=""; Z_LIB="", + [AC_CHECK_LIB(z, compress, + dnl Use a different bfd function here so as not to use cached result from above + [AC_CHECK_LIB(bfd, bfd_fdopenr, LIBS="-lbfd -lz $LIBS"; Z_LIB="-lz", +- [AC_MSG_ERROR([bfd library not found])], -lz) ++dnl Use a different bfd function here so as not to use cached result from above ++ [AC_CHECK_LIB(bfd, bfd_close, LIBS="-lbfd -lsframe -lz $LIBS"; SFRAME_LIB="-lsframe"; Z_LIB="-lz", ++ [AC_MSG_ERROR([bfd library not found])], -lsframe -lz) ++ ], -lz) + ], + [AC_MSG_ERROR([libz library not found; required by libbfd])]) + ] +-- +2.43.0 + diff --git a/package/oprofile/oprofile.mk b/package/oprofile/oprofile.mk index 512fbf9ea1..590e63b4ac 100644 --- a/package/oprofile/oprofile.mk +++ b/package/oprofile/oprofile.mk @@ -12,6 +12,13 @@ OPROFILE_CPE_ID_VENDOR = maynard_johnson OPROFILE_CONF_OPTS = \ --disable-account-check \ --with-kernel=$(STAGING_DIR)/usr +# 0002-fix-static-build-with-binutils-2.40.patch +OPROFILE_AUTORECONF = YES + +define OPROFILE_CREATE_MISSING_FILES + touch $(@D)/NEWS $(@D)/AUTHORS $(@D)/ChangeLog +endef +OPROFILE_POST_EXTRACT_HOOKS += OPROFILE_CREATE_MISSING_FILES OPROFILE_DEPENDENCIES = popt binutils host-pkgconf From 944a5d556af613792a2edd3491a9a4747f6dbc5d Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 5 May 2024 21:08:21 +0200 Subject: [PATCH 5578/5754] package/liburiparser: security bump to version 0.9.8 - Fixed: [CVE-2024-34402] Protect against integer overflow in ComposeQueryEngine - Fixed: [CVE-2024-34403] Protect against integer overflow in ComposeQueryMallocExMm https://github.com/uriparser/uriparser/blob/uriparser-0.9.8/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 6fe29e41ccd6682bca48b0d9d206ae3a631339f0) Signed-off-by: Peter Korsgaard --- package/liburiparser/liburiparser.hash | 2 +- package/liburiparser/liburiparser.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/liburiparser/liburiparser.hash b/package/liburiparser/liburiparser.hash index 73b4ec6867..f2e3317897 100644 --- a/package/liburiparser/liburiparser.hash +++ b/package/liburiparser/liburiparser.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1ddae35cb3cc2c36e8199829d46f1c7f8b222e74a723fdae67ec8561e1ac5a39 uriparser-0.9.7.tar.xz +sha256 1d71c054837ea32a31e462bce5a1af272379ecf511e33448e88100b87ff73b2e uriparser-0.9.8.tar.xz sha256 287f09e6546a9610f949f89e8fb937cacfeabd7bfaa8c8a0c18312193bf04ad3 COPYING diff --git a/package/liburiparser/liburiparser.mk b/package/liburiparser/liburiparser.mk index 6d25b1d9bb..b0ba8c387b 100644 --- a/package/liburiparser/liburiparser.mk +++ b/package/liburiparser/liburiparser.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBURIPARSER_VERSION = 0.9.7 +LIBURIPARSER_VERSION = 0.9.8 LIBURIPARSER_SOURCE = uriparser-$(LIBURIPARSER_VERSION).tar.xz LIBURIPARSER_SITE = https://github.com/uriparser/uriparser/releases/download/uriparser-$(LIBURIPARSER_VERSION) LIBURIPARSER_LICENSE = BSD-3-Clause From 3dd6a82e3a571a68cedf558c9755ae8b1da9c07e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 5 May 2024 21:00:44 +0200 Subject: [PATCH 5579/5754] package/libutempter: do not hardcode PIE PIE will be set by buildroot if the user wants it so set {COMPILE,LINK}_PIE to an empty value to fix the following build failure raised since the addition of the package in commit 02c818bc5c7a6967a212f12e4caa8ccdfa0b452b: /home/buildroot/autobuild/run/instance-3/output-1/host/bin/m68k-linux-gcc -W -Wall -Waggregate-return -Wcast-align -Wconversion -Wdisabled-optimization -Wmissing-declarations -Wmissing-format-attribute -Wmissing-noreturn -Wmissing-prototypes -Wpointer-arith -Wredundant-decls -Wshadow -Wstrict-prototypes -Wwrite-strings -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O2 -g0 -std=gnu99 -DLIBEXECDIR=\"/usr/lib\" -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wl,-z,relro -Wl,-stats -fPIE -pie -Wl,-z,now utempter.c -o utempter [...] /home/buildroot/autobuild/run/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/m68k-buildroot-linux-uclibc/12.3.0/../../../../m68k-buildroot-linux-uclibc/bin/ld: /home/buildroot/autobuild/run/instance-3/output-1/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/Scrt1.o: in function `lib_main': (.text+0x4): undefined reference to `__shared_flat_add_library' Fixes: 02c818bc5c7a6967a212f12e4caa8ccdfa0b452b - http://autobuild.buildroot.org/results/3a5581fd4edf56bbdc48ab111a2351fc70f1c703 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 36b06928c8d63ef82cc785aaa72c5818c8dec0bc) Signed-off-by: Peter Korsgaard --- package/libutempter/libutempter.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/libutempter/libutempter.mk b/package/libutempter/libutempter.mk index d51f70049c..aad98126f7 100644 --- a/package/libutempter/libutempter.mk +++ b/package/libutempter/libutempter.mk @@ -11,7 +11,8 @@ LIBUTEMPTER_LICENSE = LGPL-2.1+ LIBUTEMPTER_LICENSE_FILES = COPYING define LIBUTEMPTER_BUILD_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ + COMPILE_PIE= LINK_PIE= endef define LIBUTEMPTER_INSTALL_STAGING_CMDS From f25bd4508274deae95ffc4b02ec53f0f65874d7a Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 6 May 2024 22:02:06 +0200 Subject: [PATCH 5580/5754] package/pppd: add linux-pam optional dependency linux-pam is an optional dependency which is enbled by default since bump to version 2.5.0 in commit 0c15169f5ae57d88a77df34cc896044a37c9597b and https://github.com/ppp-project/ppp/commit/2883dd07101bf851e2ea368f0c04c91aea85cff2 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit bbcf02c7ff586a110a576a85b9634b5f11eb6ee3) Signed-off-by: Peter Korsgaard --- package/pppd/pppd.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/pppd/pppd.mk b/package/pppd/pppd.mk index 616b843e3d..0a1eaf9209 100644 --- a/package/pppd/pppd.mk +++ b/package/pppd/pppd.mk @@ -17,6 +17,13 @@ PPPD_AUTORECONF = YES PPPD_INSTALL_STAGING = YES PPPD_CONF_OPTS = --enable-multilink +ifeq ($(BR2_PACKAGE_LINUX_PAM),y) +PPPD_CONF_OPTS += --with-pam=$(STAGING_DIR)/usr +PPPD_DEPENDENCIES += linux-pam +else +PPPD_CONF_OPTS += --without-pam +endif + ifeq ($(BR2_PACKAGE_OPENSSL),y) PPPD_CONF_OPTS += \ --enable-eaptls \ From ed19064d162a294b175eab51324828c8f98f0dcf Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Tue, 30 Apr 2024 22:47:43 +0200 Subject: [PATCH 5581/5754] support/testing: TestPerlDBDmysql: use ext2 instead of cpio The CPIO filesystem generated by TestPerlDBDmysql is too large, and doesn't fit as an initramfs in the 256MB of RAM available in the versatilepb machine. This causes a failure while running a basic test "perl -MDBI -e '1'" since "/usr/lib/perl5", and many files being missing from the root filesystem, ultimately causing the test to fail. Can't locate DBI.pm in @INC (you may need to install the DBI module) (@INC entries checked: /usr/lib/perl5/site_perl/5.38.2/arm-linux /usr/lib/perl5/site_perl/5.38.2 /usr/lib/perl5/5.38.2/arm-linux /usr/lib/perl5/5.38.2). It would make sense to switch all test cases to use ext2 + a hard-drive, but for now, let's fix the few test cases that are causing problems. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6735654506 Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni (cherry picked from commit 8937cd065cb4004d9eade7e75ec808fc2400ba4b) Signed-off-by: Peter Korsgaard --- support/testing/tests/package/test_perl_dbd_mysql.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/support/testing/tests/package/test_perl_dbd_mysql.py b/support/testing/tests/package/test_perl_dbd_mysql.py index f8fe832b41..93551b420f 100644 --- a/support/testing/tests/package/test_perl_dbd_mysql.py +++ b/support/testing/tests/package/test_perl_dbd_mysql.py @@ -1,4 +1,5 @@ from tests.package.test_perl import TestPerlBase +import os class TestPerlDBDmysql(TestPerlBase): @@ -13,8 +14,18 @@ class TestPerlDBDmysql(TestPerlBase): """ BR2_PACKAGE_PERL=y BR2_PACKAGE_PERL_DBD_MYSQL=y + BR2_TARGET_ROOTFS_EXT2=y + BR2_TARGET_ROOTFS_EXT2_SIZE="120M" """ + def login(self): + ext2_file = os.path.join(self.builddir, "images", "rootfs.ext2") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-drive", "file=%s,if=scsi,format=raw" % ext2_file], + kernel_cmdline=["rootwait", "root=/dev/sda"]) + self.emulator.login() + def test_run(self): self.login() self.module_test("DBI") From 40d64599f4c22a5beb2e22892f74bd177191c1ae Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Tue, 30 Apr 2024 22:47:44 +0200 Subject: [PATCH 5582/5754] package/perl-dbd-mysql: fix runtime issue with MariaDB Now that the TestPerlDBDmysql can be run normally, a new runtime issue appear due to switch from oracle-mysql to MariaDB: # perl -MDBI -e '1' # echo $? 0 # perl -MDBD::mysql -e '1' Can't load '/usr/lib/perl5/site_perl/5.38.2/arm-linux/auto/DBD/mysql/mysql.so' for module DBD::mysql: /usr/lib/perl5/site_perl/5.38.2/arm-linux/auto/DBD/mysql/mysql.so: undefined symbol: net_buffer_length at /usr/lib/perl5/5.38.2/arm-linux/DynaLoader.pm line 206. This is fixed by an upstream commit [1] from 4.046_01 release. [1] https://github.com/perl5-dbi/DBD-mysql/commit/0f0cebe87fab335873fd3701bc304922da826940 Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6735654506 Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni (cherry picked from commit cefcd5bbadf2a8c8cb8c97049a478964ebddb95e) Signed-off-by: Peter Korsgaard --- ...net_buffer_length-macro-if-available.patch | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 package/perl-dbd-mysql/0001-Use-net_buffer_length-macro-if-available.patch diff --git a/package/perl-dbd-mysql/0001-Use-net_buffer_length-macro-if-available.patch b/package/perl-dbd-mysql/0001-Use-net_buffer_length-macro-if-available.patch new file mode 100644 index 0000000000..d7767c1f42 --- /dev/null +++ b/package/perl-dbd-mysql/0001-Use-net_buffer_length-macro-if-available.patch @@ -0,0 +1,41 @@ +From 9189ef77679c22de3bbd2142031858373236520b Mon Sep 17 00:00:00 2001 +From: Michiel Beijen +Date: Fri, 23 Feb 2018 07:52:33 +0000 +Subject: [PATCH] Use net_buffer_length macro if available + +Upstream: https://github.com/perl5-dbi/DBD-mysql/commit/0f0cebe87fab335873fd3701bc304922da826940 + +(cherry picked from commit 0f0cebe87fab335873fd3701bc304922da826940) +Signed-off-by: Romain Naour +--- + mysql.xs | 11 +++++------ + 1 file changed, 5 insertions(+), 6 deletions(-) + +diff --git a/mysql.xs b/mysql.xs +index 8edee55..9b4d60f 100644 +--- a/mysql.xs ++++ b/mysql.xs +@@ -819,15 +819,14 @@ dbd_mysql_get_info(dbh, sql_info_type) + retsv = newSVpvn("`", 1); + break; + case SQL_MAXIMUM_STATEMENT_LENGTH: +-#if !defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 50709 +- /* MariaDB 10 is not MySQL source level compatible so this +- only applies to MySQL*/ +- /* mysql_get_option() was added in mysql 5.7.3 */ +- /* MYSQL_OPT_NET_BUFFER_LENGTH was added in mysql 5.7.9 */ ++ /* net_buffer_length macro is not defined in MySQL 5.7 and some MariaDB ++ versions - if it is not available, use newer mysql_get_option */ ++#if !defined(net_buffer_length) ++ ; ++ unsigned long buffer_len; + mysql_get_option(NULL, MYSQL_OPT_NET_BUFFER_LENGTH, &buffer_len); + retsv = newSViv(buffer_len); + #else +- /* before mysql 5.7.9 use net_buffer_length macro */ + retsv = newSViv(net_buffer_length); + #endif + break; +-- +2.44.0 + From 9a40ae8b989ae040fd7aa1295cafb847df0ea729 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 1 May 2024 17:05:07 +0200 Subject: [PATCH 5583/5754] package/libjwt: add CPE variables cpe:2.3:a:bencollins:jwt_c_library is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/6335E595-6F38-4837-83BB-C78B687BB75B Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 1a2564e6880b70256c850a3fb54e9ec77d109d58) Signed-off-by: Peter Korsgaard --- package/libjwt/libjwt.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/libjwt/libjwt.mk b/package/libjwt/libjwt.mk index 1643aa7b7a..8929904d10 100644 --- a/package/libjwt/libjwt.mk +++ b/package/libjwt/libjwt.mk @@ -11,6 +11,8 @@ LIBJWT_AUTORECONF = YES LIBJWT_INSTALL_STAGING = YES LIBJWT_LICENSE = MPL-2.0 LIBJWT_LICENSE_FILES = LICENSE +LIBJWT_CPE_ID_VENDOR = bencollins +LIBJWT_CPE_ID_PRODUCT = jwt_c_library LIBJWT_CONF_OPTS = --without-examples ifeq ($(BR2_PACKAGE_OPENSSL),y) From 41ef581ac5681396ac19372ecdf4c53d58bc28be Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 6 May 2024 22:23:04 +0200 Subject: [PATCH 5584/5754] package/suricata: fix static build Fix the following static build failure raised since bump to version version 6.0.14 in commit ce17f93e828a07292e03653be04a49480250f23f and https://github.com/OISF/suricata/commit/31ba4fd1522dd0d7f933767b9205c67a4e726fe5: configure:22378: checking for pcap_open_dead in -lpcap configure:22407: /home/buildroot/autobuild/run/instance-3/output-1/host/bin/x86_64-linux-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O2 -g0 -static -std=c11 -march=native -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -static -rdynamic conftest.c -lpcap -ljansson -lpthread -lyaml -lpcre -latomic -lz >&5 /home/buildroot/autobuild/run/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-musl/12.3.0/../../../../x86_64-buildroot-linux-musl/bin/ld: /home/buildroot/autobuild/run/instance-3/output-1/host/x86_64-buildroot-linux-musl/sysroot/usr/lib/../lib64/libpcap.a(pcap-linux.o): in function `nl80211_init': pcap-linux.c:(.text+0xc34): undefined reference to `nl_socket_alloc' [...] checking for pcap_open_dead in -lpcap... no Fixes: ce17f93e828a07292e03653be04a49480250f23f - http://autobuild.buildroot.org/results/9e25c2508bd4100d2d1d3180e79060d762361213 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit a3ee47ef22f4035d715461e98ff8a2c4f76735ea) Signed-off-by: Peter Korsgaard --- .../0002-configure.ac-fix-static-build.patch | 52 +++++++++++++++++++ package/suricata/suricata.mk | 1 + 2 files changed, 53 insertions(+) create mode 100644 package/suricata/0002-configure.ac-fix-static-build.patch diff --git a/package/suricata/0002-configure.ac-fix-static-build.patch b/package/suricata/0002-configure.ac-fix-static-build.patch new file mode 100644 index 0000000000..fc5384a114 --- /dev/null +++ b/package/suricata/0002-configure.ac-fix-static-build.patch @@ -0,0 +1,52 @@ +From 6e1d8aceea8c4e49f00d8e630b681641a36c688f Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 6 May 2024 09:31:05 +0200 +Subject: [PATCH] configure.ac: fix static build + +static build is broken since +https://github.com/OISF/suricata/commit/31ba4fd1522dd0d7f933767b9205c67a4e726fe5 +because AC_CHECK_LIB is called before PKG_CHECK_MODULES: + +configure:22378: checking for pcap_open_dead in -lpcap +configure:22407: /home/buildroot/autobuild/run/instance-3/output-1/host/bin/x86_64-linux-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O2 -g0 -static -std=c11 -march=native -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -static -rdynamic conftest.c -lpcap -ljansson -lpthread -lyaml -lpcre -latomic -lz >&5 +/home/buildroot/autobuild/run/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-musl/12.3.0/../../../../x86_64-buildroot-linux-musl/bin/ld: /home/buildroot/autobuild/run/instance-3/output-1/host/x86_64-buildroot-linux-musl/sysroot/usr/lib/../lib64/libpcap.a(pcap-linux.o): in function `nl80211_init': +pcap-linux.c:(.text+0xc34): undefined reference to `nl_socket_alloc' + +[...] + +checking for pcap_open_dead in -lpcap... no + +Fixes: + - http://autobuild.buildroot.org/results/9e25c2508bd4100d2d1d3180e79060d762361213 + +Signed-off-by: Fabrice Fontaine +Upstream: https://redmine.openinfosecfoundation.org/issues/7008 +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 232ee9bed..6277cb9b6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1219,6 +1219,8 @@ + fi + fi + ++ PKG_CHECK_MODULES([PCAP],libpcap,[CPPFLAGS="${CPPFLAGS} ${PCAP_CFLAGS}" LIBS="${LIBS} ${PCAP_LIBS}"],[:]) ++ + if test "$have_wpcap" != "yes"; then + AC_CHECK_LIB(pcap, pcap_open_dead, [], [ + echo +@@ -1234,8 +1236,6 @@ + PCAP_LIB_NAME="pcap" + fi + +- PKG_CHECK_MODULES([PCAP],libpcap,[CPPFLAGS="${CPPFLAGS} ${PCAP_CFLAGS}" LIBS="${LIBS} ${PCAP_LIBS}"],[:]) +- + AC_PATH_PROG(HAVE_PCAP_CONFIG, pcap-config, "no") + if test "$HAVE_PCAP_CONFIG" = "no" -o "$cross_compiling" = "yes"; then + AC_MSG_RESULT(no pcap-config is use) +-- +2.43.0 + diff --git a/package/suricata/suricata.mk b/package/suricata/suricata.mk index 2083e0caba..e60ed2fce8 100644 --- a/package/suricata/suricata.mk +++ b/package/suricata/suricata.mk @@ -10,6 +10,7 @@ SURICATA_LICENSE = GPL-2.0 SURICATA_LICENSE_FILES = COPYING LICENSE SURICATA_CPE_ID_VENDOR = oisf # 0001-configure.ac-allow-the-user-to-override-RUST_TARGET.patch +# 0002-configure.ac-fix-static-build.patch SURICATA_AUTORECONF = YES SURICATA_DEPENDENCIES = \ From 7246f1951665e9c15f38f0b0fa21a2b1473cca33 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 6 May 2024 22:52:49 +0200 Subject: [PATCH 5585/5754] package/openocd: fix build with libgpiod2 openocd is not compatible with libgpiod2 resulting in the following build failure since the addition of libgpiod2 in commit 57391fad2e619395340b81957ddceab1b1df2e20: src/jtag/drivers/linuxgpiod.c: In function 'helper_get_line': src/jtag/drivers/linuxgpiod.c:283:19: error: 'GPIOD_LINE_REQUEST_DIRECTION_INPUT' undeclared (first use in this function); did you mean 'GPIOD_LINE_DIRECTION_INPUT'? 283 | int dir = GPIOD_LINE_REQUEST_DIRECTION_INPUT, flags = 0, val = 0, retval; | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | GPIOD_LINE_DIRECTION_INPUT Fixes: 57391fad2e619395340b81957ddceab1b1df2e20 - http://autobuild.buildroot.org/results/7195e8b76350f26ab3b963702d88b254512e6928 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit be3252fe01f39f8ac21d611861bd0c5dda58b09f) Signed-off-by: Peter Korsgaard --- package/openocd/openocd.mk | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/package/openocd/openocd.mk b/package/openocd/openocd.mk index 78c6e10c58..b24d1eacf0 100644 --- a/package/openocd/openocd.mk +++ b/package/openocd/openocd.mk @@ -56,8 +56,14 @@ OPENOCD_DEPENDENCIES = \ $(if $(BR2_PACKAGE_LIBUSB),libusb) \ $(if $(BR2_PACKAGE_LIBUSB_COMPAT),libusb-compat) \ $(if $(BR2_PACKAGE_LIBHID),libhid) \ - $(if $(BR2_PACKAGE_HIDAPI),hidapi) \ - $(if $(BR2_PACKAGE_LIBGPIOD),libgpiod) + $(if $(BR2_PACKAGE_HIDAPI),hidapi) + +ifeq ($(BR2_PACKAGE_LIBGPIOD),y) +OPENOCD_DEPENDENCIES += libgpiod +OPENOCD_CONF_OPTS += --enable-linuxgpiod +else +OPENOCD_CONF_OPTS += --disable-linuxgpiod +endif # Adapters OPENOCD_CONF_OPTS += \ From 4eb7098a1a6391fa8c4e32d5703a0abdf589a1f1 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Mon, 6 May 2024 23:30:38 +0200 Subject: [PATCH 5586/5754] package/python-rpds-py: bump to version 0.18.1 As reported by Antoine Coutant on the Buildroot mailing list [1]: rpds depends on the crate pyo3. This crate uses "std::sync::atomic::AtomicI64" which doesn't exist for 32 bits targets. That leads to an error as reported by Buildroot Gitlab-ci. An issue have been opened on pyo3's github [2]. A fix have been accepted by pyo3 [3] and merged in pyo3 0.20.3 release [4]. This pyo3 0.20.3 uses crate portable-atomic [5] to provide atomic types and compare and swap operations for all targets that can use std. python-rpds-py 0.18.1 is the first release that use pyo3 0.20.3. Before python-rpds-py 0.18.1 release fixing this issue would require that we be able to patch a package during the Cargo vendoring step [6]. [1] http://lists.busybox.net/pipermail/buildroot/2024-February/684867.html [2]: https://github.com/PyO3/pyo3/issues/3614 [3]: https://github.com/PyO3/pyo3/pull/3619 [4]: https://github.com/PyO3/pyo3/blob/v0.20.3/CHANGELOG.md [5]: https://github.com/taiki-e/portable-atomic [6]: http://lists.busybox.net/pipermail/buildroot/2024-February/684886.html Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6783811842 (TestPythonPy3Dtschema) https://gitlab.com/buildroot.org/buildroot/-/jobs/6783811860 (TestPythonPy3FlaskExpectsJson) Reported-by: Antoine Coutant Cc: James Hilliard Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni (cherry picked from commit 26b054083d36a0fb16340b10a9df239879a2c573) Signed-off-by: Peter Korsgaard --- package/python-rpds-py/python-rpds-py.hash | 2 +- package/python-rpds-py/python-rpds-py.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-rpds-py/python-rpds-py.hash b/package/python-rpds-py/python-rpds-py.hash index 4650d9c385..62b508ae6b 100644 --- a/package/python-rpds-py/python-rpds-py.hash +++ b/package/python-rpds-py/python-rpds-py.hash @@ -1,4 +1,4 @@ # Locally calculated after vendoring -sha256 760b05720269195d86071ac7cf627b3a4ab9366680d8d449a6a63b84d96a5bc0 rpds_py-0.17.1.tar.gz +sha256 d9b542bf5321495737005a78d9fbf40541b898d1e2b3309cbe36a2431977be8b rpds_py-0.18.1.tar.gz # Locally computed sha256 checksums sha256 314e4e91be3baa93c0fb4bccc9e4e97cd643eb839b065af921782c2175fe9909 LICENSE diff --git a/package/python-rpds-py/python-rpds-py.mk b/package/python-rpds-py/python-rpds-py.mk index 80670f2e4f..57fe0be7e8 100644 --- a/package/python-rpds-py/python-rpds-py.mk +++ b/package/python-rpds-py/python-rpds-py.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_RPDS_PY_VERSION = 0.17.1 +PYTHON_RPDS_PY_VERSION = 0.18.1 PYTHON_RPDS_PY_SOURCE = rpds_py-$(PYTHON_RPDS_PY_VERSION).tar.gz -PYTHON_RPDS_PY_SITE = https://files.pythonhosted.org/packages/b7/0a/e3bdcc977e6db3bf32a3f42172f583adfa7c3604091a03d512333e0161fe +PYTHON_RPDS_PY_SITE = https://files.pythonhosted.org/packages/2d/aa/e7c404bdee1db7be09860dff423d022ffdce9269ec8e6532cce09ee7beea PYTHON_RPDS_PY_SETUP_TYPE = maturin PYTHON_RPDS_PY_LICENSE = MIT PYTHON_RPDS_PY_LICENSE_FILES = LICENSE From c91995369462a1d613da1267e6e6ad11a545a2af Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 8 May 2024 13:54:57 +0200 Subject: [PATCH 5587/5754] package/zeromq: disable perf Disable performance measurement tools which are enabled by default since bump to version 4.2.5 in commit d3a8177e175e035ca3b19dca7868859f7cb238a1 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 8b1b43802419fabf19ac780f6106cccfb255718c) Signed-off-by: Peter Korsgaard --- package/zeromq/zeromq.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/zeromq/zeromq.mk b/package/zeromq/zeromq.mk index 137fad1a66..f1a1f02f9e 100644 --- a/package/zeromq/zeromq.mk +++ b/package/zeromq/zeromq.mk @@ -7,7 +7,7 @@ ZEROMQ_VERSION = 4.3.5 ZEROMQ_SITE = https://github.com/zeromq/libzmq/releases/download/v$(ZEROMQ_VERSION) ZEROMQ_INSTALL_STAGING = YES -ZEROMQ_CONF_OPTS = --disable-Werror --without-documentation +ZEROMQ_CONF_OPTS = --disable-perf --disable-Werror --without-documentation ZEROMQ_LICENSE = MPL-2.0 ZEROMQ_LICENSE_FILES = LICENSE ZEROMQ_CPE_ID_VENDOR = zeromq From 9faa2751f304a13ff7db91a84165fc845a7a74c1 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 7 May 2024 11:28:32 -0600 Subject: [PATCH 5588/5754] package/network-manager: drop CONTRIBUTING.md from license files This is irrelevant as of 402ad9fe5407 (package/network-manager: bump to version 1.22.10). Details: https://lore.kernel.org/all/ZgXKrtfSjahxswtP@landeda/ Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni (cherry picked from commit dc21afed0fec55b684be76b8d71d46a7177cf6f3) Signed-off-by: Peter Korsgaard --- package/network-manager/network-manager.hash | 1 - package/network-manager/network-manager.mk | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/package/network-manager/network-manager.hash b/package/network-manager/network-manager.hash index 0196d68c55..daf4c3fef6 100644 --- a/package/network-manager/network-manager.hash +++ b/package/network-manager/network-manager.hash @@ -3,4 +3,3 @@ sha256 4b58bf3ac57e2cefb5652efd0945eb0b4bc36a63d92a61ab471d8bb2c9a420e1 Networ # Locally computed sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL -sha256 e7cf3d92bda8e5365eaf4514d572146a19e93336f7a966493778d0d0c4476fae CONTRIBUTING.md diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index f6ef923d55..4a246fd904 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -10,7 +10,7 @@ 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 NETWORK_MANAGER_LICENSE = GPL-2.0+ (app), LGPL-2.1+ (libnm) -NETWORK_MANAGER_LICENSE_FILES = COPYING COPYING.LGPL CONTRIBUTING.md +NETWORK_MANAGER_LICENSE_FILES = COPYING COPYING.LGPL NETWORK_MANAGER_CPE_ID_VENDOR = gnome NETWORK_MANAGER_CPE_ID_PRODUCT = networkmanager NETWORK_MANAGER_SELINUX_MODULES = networkmanager From f9b33bfacb968bd3e068e915eb44e79606225024 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 31 May 2024 16:47:10 +0200 Subject: [PATCH 5589/5754] package/go: security bump to version 1.21.10 Fixes the following security issue: CVE-2024-24787: cmd/go: arbitrary code execution during build on darwin 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 0c6a8f230e..516f0a70de 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://go.dev/dl -sha256 58f0c5ced45a0012bce2ff7a9df03e128abcc8818ebabe5027bb92bafe20e421 go1.21.9.src.tar.gz +sha256 900e0afe8900c1ee65a8a8c4f0c5a3ca02dcf85c1d1cb13a652be22c21399394 go1.21.10.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index fdd956e439..c8089d71b1 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.21.9 +GO_VERSION = 1.21.10 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz From a513846df7cbc6f2390bf0dbc23bbccbb7980474 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 8 May 2024 22:49:10 +0200 Subject: [PATCH 5590/5754] package/libjwt: security bump to version 1.17.0 - Use official tarball and so drop autoreconf - Update hash of LICENSE file, verbatim copy of the current MPL 2.0 with https://github.com/benmcollins/libjwt/commit/ebebb5027f37a85c40c072a02681e206d31875ca - Fix CVE-2024-25189: libjwt 1.15.3 uses strcmp (which is not constant time) to verify authentication, which makes it easier to bypass authentication via a timing side channel. https://github.com/benmcollins/libjwt/compare/v1.15.3...v1.17.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit c65639ebd509cc6a9f6a616b6ef01a85ba32aff0) Signed-off-by: Peter Korsgaard --- package/libjwt/libjwt.hash | 4 ++-- package/libjwt/libjwt.mk | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/libjwt/libjwt.hash b/package/libjwt/libjwt.hash index 47e8b2c506..adc32c3a26 100644 --- a/package/libjwt/libjwt.hash +++ b/package/libjwt/libjwt.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 cb2fd95123689e7d209a3a8c060e02f68341c9a5ded524c0cd881a8cd20d711f libjwt-1.15.3.tar.gz -sha256 fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85 LICENSE +sha256 b8b257da9b64ba9075fce3a3f670ae02dee7fc95ab7009a2e1ad60905e3f8d48 libjwt-1.17.0.tar.bz2 +sha256 3f3d9e0024b1921b067d6f7f88deb4a60cbe7a78e76c64e3f1d7fc3b779b9d04 LICENSE diff --git a/package/libjwt/libjwt.mk b/package/libjwt/libjwt.mk index 8929904d10..f143ba4b62 100644 --- a/package/libjwt/libjwt.mk +++ b/package/libjwt/libjwt.mk @@ -4,10 +4,10 @@ # ################################################################################ -LIBJWT_VERSION = 1.15.3 -LIBJWT_SITE = $(call github,benmcollins,libjwt,v$(LIBJWT_VERSION)) +LIBJWT_VERSION = 1.17.0 +LIBJWT_SITE = https://github.com/benmcollins/libjwt/releases/download/v$(LIBJWT_VERSION) +LIBJWT_SOURCE = libjwt-$(LIBJWT_VERSION).tar.bz2 LIBJWT_DEPENDENCIES = host-pkgconf jansson -LIBJWT_AUTORECONF = YES LIBJWT_INSTALL_STAGING = YES LIBJWT_LICENSE = MPL-2.0 LIBJWT_LICENSE_FILES = LICENSE From a103e3dca826c8cbdd512308db03b0f30b66067f Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Tue, 16 Apr 2024 23:39:58 +0200 Subject: [PATCH 5591/5754] support/testing: add ethtool runtime test Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit 0623c53054e478bf6faa68a3b95e4e6ae0a84ee0) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 + support/testing/tests/package/test_ethtool.py | 71 +++++++++++++++++++ .../test_ethtool/linux-e1000e.fragment | 1 + 3 files changed, 74 insertions(+) create mode 100644 support/testing/tests/package/test_ethtool.py create mode 100644 support/testing/tests/package/test_ethtool/linux-e1000e.fragment diff --git a/DEVELOPERS b/DEVELOPERS index 6a1ec436ff..cc9bac809b 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1772,6 +1772,8 @@ 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_ed.py +F: support/testing/tests/package/test_ethtool.py +F: support/testing/tests/package/test_ethtool/ F: support/testing/tests/package/test_file.py F: support/testing/tests/package/test_file/ F: support/testing/tests/package/test_fluidsynth.py diff --git a/support/testing/tests/package/test_ethtool.py b/support/testing/tests/package/test_ethtool.py new file mode 100644 index 0000000000..7a2627c6e9 --- /dev/null +++ b/support/testing/tests/package/test_ethtool.py @@ -0,0 +1,71 @@ +import os + +import infra.basetest + + +class TestEthtool(infra.basetest.BRTest): + # This ethtool test uses an emulated Intel e1000e adapted (which + # is well supported by Qemu, the Kernel and ethtool). We are not + # using the usual virtio_net because it's not supporting some + # ethtool features like adapter testing. For that reason, we need + # to compile a Kernel. + kernel_fragment = \ + infra.filepath("tests/package/test_ethtool/linux-e1000e.fragment") + config = \ + f""" + 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.6.27" + 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="{kernel_fragment}" + BR2_PACKAGE_ETHTOOL=y + BR2_TARGET_ROOTFS_EXT2=y + BR2_TARGET_ROOTFS_EXT2_4=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + drive = os.path.join(self.builddir, "images", "rootfs.ext4") + kern = os.path.join(self.builddir, "images", "Image") + self.emulator.boot(arch="aarch64", + kernel=kern, + kernel_cmdline=["root=/dev/vda console=ttyAMA0"], + options=["-M", "virt", + "-cpu", "cortex-a57", + "-m", "256M", + "-netdev", "user,id=test_net", + "-net", "nic,model=e1000e,netdev=test_net", + "-drive", f"file={drive},if=virtio,format=raw"]) + self.emulator.login() + + # We check the program can run. + self.assertRunOk("ethtool --version") + + # We check a simple query runs correctly. + self.assertRunOk("ethtool eth0") + + # We query the driver name and check it's the expected e1000e. + out, ret = self.emulator.run("ethtool -i eth0") + self.assertEqual(ret, 0) + self.assertEqual(out[0], "driver: e1000e") + + # We request an adapter online self test. + self.assertRunOk("ethtool -t eth0 online", timeout=30) + + # We query offload parameters and check TSO are enabled (this + # is the driver default). + out, ret = self.emulator.run("ethtool -k eth0") + self.assertEqual(ret, 0) + self.assertIn("tcp-segmentation-offload: on", out) + + # We request to disable TSO. + self.assertRunOk("ethtool -K eth0 tcp-segmentation-offload off") + + # We check again. TSO should now be disabled. + out, ret = self.emulator.run("ethtool -k eth0") + self.assertEqual(ret, 0) + self.assertIn("tcp-segmentation-offload: off", out) diff --git a/support/testing/tests/package/test_ethtool/linux-e1000e.fragment b/support/testing/tests/package/test_ethtool/linux-e1000e.fragment new file mode 100644 index 0000000000..cc3fe0047e --- /dev/null +++ b/support/testing/tests/package/test_ethtool/linux-e1000e.fragment @@ -0,0 +1 @@ +CONFIG_E1000E=y From f4a7b485a3454d0f3cc42e26d98b12d2025178d9 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Thu, 18 Apr 2024 00:06:10 +0200 Subject: [PATCH 5592/5754] support/testing: add netsnmp runtime test Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit 639f5074795d7503d8f506bc5b675d0478031147) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 + support/testing/tests/package/test_netsnmp.py | 44 +++++++++++++++++++ .../rootfs-overlay/etc/snmp/snmpd.conf | 4 ++ 3 files changed, 50 insertions(+) create mode 100644 support/testing/tests/package/test_netsnmp.py create mode 100644 support/testing/tests/package/test_netsnmp/rootfs-overlay/etc/snmp/snmpd.conf diff --git a/DEVELOPERS b/DEVELOPERS index cc9bac809b..ed5962ed08 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1823,6 +1823,8 @@ F: support/testing/tests/package/test_mtools.py F: support/testing/tests/package/test_mtr.py F: support/testing/tests/package/test_ncdu.py F: support/testing/tests/package/test_netcat.py +F: support/testing/tests/package/test_netsnmp.py +F: support/testing/tests/package/test_netsnmp/ F: support/testing/tests/package/test_nftables.py F: support/testing/tests/package/test_nftables/ F: support/testing/tests/package/test_ngrep.py diff --git a/support/testing/tests/package/test_netsnmp.py b/support/testing/tests/package/test_netsnmp.py new file mode 100644 index 0000000000..9561e49828 --- /dev/null +++ b/support/testing/tests/package/test_netsnmp.py @@ -0,0 +1,44 @@ +import os + +import infra.basetest + + +class TestNetSNMP(infra.basetest.BRTest): + rootfs_overlay = \ + infra.filepath("tests/package/test_netsnmp/rootfs-overlay") + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + f""" + BR2_PACKAGE_NETSNMP=y + BR2_ROOTFS_OVERLAY="{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() + + # We check the daemon and a client program can execute. + self.assertRunOk("snmpd --version") + self.assertRunOk("snmpget --version") + + # The daemon is supposed to be started by the initscript, + # since we included a /etc/snmp/snmpd.conf file. We should be + # able to walk through the SNMPv2 system MIB. + self.assertRunOk("snmpwalk -v 2c -c public 127.0.0.1 system") + + # We check few OIDs has the expected values. sysContact and + # sysLocation are set in the snmpd.conf file. + tests = [ + ("system.sysName.0", "STRING: buildroot"), + ("system.sysContact.0", "STRING: Buildroot Test User"), + ("system.sysLocation.0", "STRING: Buildroot Test Infra") + ] + for oid, expected_out in tests: + cmd = f"snmpget -v 2c -c public -Ov 127.0.0.1 {oid}" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + self.assertEqual(out[0], expected_out) diff --git a/support/testing/tests/package/test_netsnmp/rootfs-overlay/etc/snmp/snmpd.conf b/support/testing/tests/package/test_netsnmp/rootfs-overlay/etc/snmp/snmpd.conf new file mode 100644 index 0000000000..63a33694f1 --- /dev/null +++ b/support/testing/tests/package/test_netsnmp/rootfs-overlay/etc/snmp/snmpd.conf @@ -0,0 +1,4 @@ +# This is a simple configuration for testing. +syslocation Buildroot Test Infra +syscontact Buildroot Test User +rocommunity public default system From 2e18fd6f074b36e5174635cb3a960de79cc4b592 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexis=20Lothor=C3=A9?= Date: Thu, 18 Apr 2024 10:58:58 +0200 Subject: [PATCH 5593/5754] package/pppd: bump package to fix startup issue MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit pppd fails to start on a systems with buildroot 2024.02.x because of missing pppd directory in /var/run. There are some logs hinting at this issue: Warning: couldn't open ppp database /var/run/pppd/pppd2.tdb Can't create lock file /var/run/pppd/lock/LCK..ppp-tty-fifo1: No such file or directory Can't create lock file /var/run/pppd/lock/LCK..ppp-tty-fifo1: No such file or directory Can't create lock file /var/run/pppd/lock/LCK..ppp-tty-fifo1: No such file or directory Can't create lock file /var/run/pppd/lock/LCK..ppp-tty-fifo1: No such file or directory Can't create lock file /var/run/pppd/lock/LCK..ppp-tty-fifo1: No such file or directory Can't create lock file /var/run/pppd/lock/LCK..ppp-tty-fifo1: No such file or directory Can't create lock file /var/run/pppd/lock/LCK..ppp-tty-fifo1: No such file or directory The issue has already been detected and fixed upstream (see [1]) and is expected to be released on a v2.5.1, but this release seems to be stalled for now (see [2]). Bump on current master, which currently reflects what will likely be the 2.5.1. [1] https://github.com/ppp-project/ppp/issues/419 [2] https://github.com/ppp-project/ppp/issues/460 Signed-off-by: Alexis Lothoré Signed-off-by: Thomas Petazzoni (cherry picked from commit c1b04a325447a3eca456856cadbff8f9d90ec362) Signed-off-by: Peter Korsgaard --- ...eck-to-see-if-we-have-struct-sockadd.patch | 44 ------------- ...xing-up-parsing-in-radiusclient.conf.patch | 56 ---------------- ...stray-include-of-an-openssl-header-w.patch | 31 --------- ....c-use-uint32_t-instead-of-u_int32_t.patch | 64 ------------------ ...pile-with-older-Linux-kernel-headers.patch | 66 ------------------- package/pppd/pppd.hash | 2 +- package/pppd/pppd.mk | 4 +- 7 files changed, 3 insertions(+), 264 deletions(-) delete mode 100644 package/pppd/0001-Add-configure-check-to-see-if-we-have-struct-sockadd.patch delete mode 100644 package/pppd/0002-Closes-411-Fixing-up-parsing-in-radiusclient.conf.patch delete mode 100644 package/pppd/0003-Fixes-issue-429-stray-include-of-an-openssl-header-w.patch delete mode 100644 package/pppd/0004-pppd-ppp-sha1.c-use-uint32_t-instead-of-u_int32_t.patch delete mode 100644 package/pppd/0005-pppd-sys-linux-Fix-compile-with-older-Linux-kernel-headers.patch diff --git a/package/pppd/0001-Add-configure-check-to-see-if-we-have-struct-sockadd.patch b/package/pppd/0001-Add-configure-check-to-see-if-we-have-struct-sockadd.patch deleted file mode 100644 index 9e41110400..0000000000 --- a/package/pppd/0001-Add-configure-check-to-see-if-we-have-struct-sockadd.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 9d6d326b2530cffb1414e4c401675117c42d43ce Mon Sep 17 00:00:00 2001 -From: Eivind Naess -Date: Sun, 23 Apr 2023 11:30:43 -0700 -Subject: [PATCH] Add configure check to see if we have struct sockaddr_ll - -Fixes issue #411. - -Signed-off-by: Eivind Naess - -Upstream: https://github.com/ppp-project/ppp/commit/9d6d326b2530cffb1414e4c401675117c42d43ce - -Signed-off-by: Bernd Kuhls ---- - configure.ac | 3 ++- - pppd/plugins/pppoe/config.h.in | 2 ++ - 2 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 1180f64..38b24af 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -75,7 +75,8 @@ AM_COND_IF([LINUX], [ - linux/if_ether.h \ - linux/if_packet.h \ - netinet/if_ether.h \ -- netpacket/packet.h])]) -+ netpacket/packet.h]) -+ AC_CHECK_TYPES([struct sockaddr_ll], [], [], [#include ])]) - - AC_CHECK_SIZEOF(unsigned int) - AC_CHECK_SIZEOF(unsigned long) -diff --git a/pppd/plugins/pppoe/config.h.in b/pppd/plugins/pppoe/config.h.in -index d447f5e..d7d61c0 100644 ---- a/pppd/plugins/pppoe/config.h.in -+++ b/pppd/plugins/pppoe/config.h.in -@@ -69,3 +69,5 @@ - /* The size of `unsigned short', as computed by sizeof. */ - #undef SIZEOF_UNSIGNED_SHORT - -+/* Define to 1 if the system has the type `struct sockaddr_ll'. */ -+#undef HAVE_STRUCT_SOCKADDR_LL --- -2.39.2 - diff --git a/package/pppd/0002-Closes-411-Fixing-up-parsing-in-radiusclient.conf.patch b/package/pppd/0002-Closes-411-Fixing-up-parsing-in-radiusclient.conf.patch deleted file mode 100644 index 5fa3ded756..0000000000 --- a/package/pppd/0002-Closes-411-Fixing-up-parsing-in-radiusclient.conf.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 7f89208b860ea0c41636410bfdb6a609b2772f47 Mon Sep 17 00:00:00 2001 -From: Eivind Naess -Date: Sun, 23 Apr 2023 11:37:01 -0700 -Subject: [PATCH] Closes #411, Fixing up parsing in radiusclient.conf - -Adding curly braces to fix the code. - -Signed-off-by: Eivind Naess - -Upstream: https://github.com/ppp-project/ppp/commit/7f89208b860ea0c41636410bfdb6a609b2772f47 - -Signed-off-by: Bernd Kuhls ---- - pppd/plugins/radius/config.c | 12 ++++++++---- - 1 file changed, 8 insertions(+), 4 deletions(-) - -diff --git a/pppd/plugins/radius/config.c b/pppd/plugins/radius/config.c -index 39744fc..e1a4814 100644 ---- a/pppd/plugins/radius/config.c -+++ b/pppd/plugins/radius/config.c -@@ -235,24 +235,28 @@ int rc_read_config(char *filename) - - switch (option->type) { - case OT_STR: -- if (set_option_str(filename, line, option, p) < 0) -+ if (set_option_str(filename, line, option, p) < 0) { - fclose(configfd); - return (-1); -+ } - break; - case OT_INT: -- if (set_option_int(filename, line, option, p) < 0) -+ if (set_option_int(filename, line, option, p) < 0) { - fclose(configfd); - return (-1); -+ } - break; - case OT_SRV: -- if (set_option_srv(filename, line, option, p) < 0) -+ if (set_option_srv(filename, line, option, p) < 0) { - fclose(configfd); - return (-1); -+ } - break; - case OT_AUO: -- if (set_option_auo(filename, line, option, p) < 0) -+ if (set_option_auo(filename, line, option, p) < 0) { - fclose(configfd); - return (-1); -+ } - break; - default: - fatal("rc_read_config: impossible case branch!"); --- -2.39.2 - diff --git a/package/pppd/0003-Fixes-issue-429-stray-include-of-an-openssl-header-w.patch b/package/pppd/0003-Fixes-issue-429-stray-include-of-an-openssl-header-w.patch deleted file mode 100644 index b5f9f319f9..0000000000 --- a/package/pppd/0003-Fixes-issue-429-stray-include-of-an-openssl-header-w.patch +++ /dev/null @@ -1,31 +0,0 @@ -From cf7ac82a610bbfee57512cba345f7d49c02563a2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Eivind=20N=C3=A6ss?= -Date: Wed, 14 Jun 2023 23:19:46 +0000 -Subject: [PATCH] Fixes issue #429, stray include of an openssl header was - removed -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Eivind Næss - -Upstream: https://github.com/ppp-project/ppp/pull/431 - -Signed-off-by: Bernd Kuhls ---- - pppd/crypto_ms.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/pppd/crypto_ms.c b/pppd/crypto_ms.c -index a9ddd5fda..ccf8129d4 100644 ---- a/pppd/crypto_ms.c -+++ b/pppd/crypto_ms.c -@@ -122,8 +122,6 @@ MakeKey(const unsigned char *key, unsigned char *des_key) - DES_set_odd_parity((DES_cblock *)des_key); - } - --#include -- - int - DesEncrypt(const unsigned char *clear, const unsigned char *key, unsigned char *cipher) - { diff --git a/package/pppd/0004-pppd-ppp-sha1.c-use-uint32_t-instead-of-u_int32_t.patch b/package/pppd/0004-pppd-ppp-sha1.c-use-uint32_t-instead-of-u_int32_t.patch deleted file mode 100644 index bce7687b9e..0000000000 --- a/package/pppd/0004-pppd-ppp-sha1.c-use-uint32_t-instead-of-u_int32_t.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 7eb0cc63e38a1fcaff24bc3ca146c13414a1420e Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Sun, 18 Jun 2023 15:53:43 +0200 -Subject: [PATCH] pppd/ppp-sha1.c: use uint32_t instead of u_int32_t - -Fixes build with musl-libc toolchains. - -Upstream: https://github.com/ppp-project/ppp/pull/432 - -Signed-off-by: Bernd Kuhls ---- - pppd/ppp-sha1.c | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/pppd/ppp-sha1.c b/pppd/ppp-sha1.c -index ab4dcd5..9ff3a24 100644 ---- a/pppd/ppp-sha1.c -+++ b/pppd/ppp-sha1.c -@@ -110,14 +110,14 @@ static void sha1_clean(PPP_MD_CTX *ctx) - #include /* htonl() */ - - typedef struct { -- u_int32_t state[5]; -- u_int32_t count[2]; -+ uint32_t state[5]; -+ uint32_t count[2]; - unsigned char buffer[64]; - } SHA1_CTX; - - - static void --SHA1_Transform(u_int32_t[5], const unsigned char[64]); -+SHA1_Transform(uint32_t[5], const unsigned char[64]); - - #define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits)))) - -@@ -138,12 +138,12 @@ SHA1_Transform(u_int32_t[5], const unsigned char[64]); - /* Hash a single 512-bit block. This is the core of the algorithm. */ - - static void --SHA1_Transform(u_int32_t state[5], const unsigned char buffer[64]) -+SHA1_Transform(uint32_t state[5], const unsigned char buffer[64]) - { -- u_int32_t a, b, c, d, e; -+ uint32_t a, b, c, d, e; - typedef union { - unsigned char c[64]; -- u_int32_t l[16]; -+ uint32_t l[16]; - } CHAR64LONG16; - CHAR64LONG16 *block; - -@@ -236,7 +236,7 @@ SHA1_Update(SHA1_CTX *context, const unsigned char *data, unsigned int len) - static void - SHA1_Final(unsigned char digest[20], SHA1_CTX *context) - { -- u_int32_t i, j; -+ uint32_t i, j; - unsigned char finalcount[8]; - - for (i = 0; i < 8; i++) { --- -2.39.2 - diff --git a/package/pppd/0005-pppd-sys-linux-Fix-compile-with-older-Linux-kernel-headers.patch b/package/pppd/0005-pppd-sys-linux-Fix-compile-with-older-Linux-kernel-headers.patch deleted file mode 100644 index 46c293103a..0000000000 --- a/package/pppd/0005-pppd-sys-linux-Fix-compile-with-older-Linux-kernel-headers.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 7a3f478a4b7128d4f70ea64d99fedec766b1c009 Mon Sep 17 00:00:00 2001 -From: Jaco Kroon -Date: Tue, 31 Oct 2023 11:47:21 +0200 -Subject: [PATCH] pppd/sys-linux: Fix compile with older Linux kernel headers - (#452) - -When compiling pppd against kernel headers which don't provide -the definitions for the NETLINK mechanisms, leave out the code -which uses NETLINK, so as to avoid getting compile errors. - -Upstream commit in Linux refers. - -commit 10c9ead9f3c6bb24bddc9a96681f7d58e6623966 -Author: Roopa Prabhu -Date: Wed Apr 20 08:43:43 2016 -0700 -rtnetlink: add new RTM_GETSTATS message to dump link stats - -This commit adds the #defines and structs used, so simply not compiling -this code if the required #defines isn't there should solve the problem. - -Closes: #450 - -Signed-off-by: Jaco Kroon -Upstream: https://github.com/ppp-project/ppp/commit/7a3f478a4b7128d4f70ea64d99fedec766b1c009 -Signed-off-by: Fabrice Fontaine ---- - pppd/sys-linux.c | 12 ++---------- - 1 file changed, 2 insertions(+), 10 deletions(-) - -diff --git a/pppd/sys-linux.c b/pppd/sys-linux.c -index 561b150f2..a8d6cd95b 100644 ---- a/pppd/sys-linux.c -+++ b/pppd/sys-linux.c -@@ -131,16 +131,6 @@ - #include - #include - #include -- --/* Attempt at retaining compile-support with older than 4.7 kernels, or kernels -- * where RTM_NEWSTATS isn't defined for whatever reason. -- */ --#ifndef RTM_NEWSTATS --#define RTM_NEWSTATS 92 --#define RTM_GETSTATS 94 --#define IFLA_STATS_LINK_64 1 --#endif -- - #include - - /* glibc versions prior to 2.24 do not define SOL_NETLINK */ -@@ -1776,6 +1766,7 @@ get_ppp_stats_ioctl(int u, struct pppd_stats *stats) - static int - get_ppp_stats_rtnetlink(int u, struct pppd_stats *stats) - { -+#ifdef RTM_NEWSTATS - static int fd = -1; - - struct { -@@ -1825,6 +1816,7 @@ get_ppp_stats_rtnetlink(int u, struct pppd_stats *stats) - err: - close(fd); - fd = -1; -+#endif - return 0; - } - diff --git a/package/pppd/pppd.hash b/package/pppd/pppd.hash index 9a293e7d8d..bf22650884 100644 --- a/package/pppd/pppd.hash +++ b/package/pppd/pppd.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 425a5b2df592f4b79e251e5b0d3af48265904162cb0906691a5d35ec355b426d pppd-2.5.0.tar.gz +sha256 535efa0e7c36e9d443b1b52c296d63ab2c1ec9458816ea0e37c701e0a921466d pppd-e1266c76d1ad39f98f11676e34f180f78c5a510c.tar.gz sha256 5d588eb3b157d52112afea935c88a7ff9efddc1e2d95a42c25d3b96ad9055008 LICENSE.BSD sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL-2 diff --git a/package/pppd/pppd.mk b/package/pppd/pppd.mk index 0a1eaf9209..d996a39120 100644 --- a/package/pppd/pppd.mk +++ b/package/pppd/pppd.mk @@ -6,8 +6,8 @@ # The tarball provided at https://download.samba.org/pub/ppp/ does not # include the license files yet so we use the github tarball. -PPPD_VERSION = 2.5.0 -PPPD_SITE = $(call github,ppp-project,ppp,ppp-$(PPPD_VERSION)) +PPPD_VERSION = e1266c76d1ad39f98f11676e34f180f78c5a510c +PPPD_SITE = $(call github,ppp-project,ppp,$(PPPD_VERSION)) PPPD_LICENSE = LGPL-2.0+, LGPL, BSD-4-Clause, BSD-3-Clause, GPL-2.0+ PPPD_LICENSE_FILES = LICENSE.BSD LICENSE.GPL-2 PPPD_CPE_ID_VENDOR = point-to-point_protocol_project From 404cbe8a425248769a53aacb539a3b75e1a0dd52 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Thu, 18 Apr 2024 15:56:15 +0200 Subject: [PATCH 5594/5754] package/elfutils: fix host build failure due to missing demangle support When building on hosts with libstdc++ without demangle support this error shows up: checking for __cxa_demangle in -lstdc++... no configure: error: __cxa_demangle not found in libstdc++, use --disable-demangler to disable demangler support. make[1]: *** [package/pkg-generic.mk:273: /home/giuliobenetti/br_reproduce/c2524c7580d97f7387ec22da62be71d77f2ed8ec/output/build/host-elfutils-0.189/.stamp_configured] Error 1 make: *** [Makefile:23: _all] Error 2 So let's disable demangler for host by default. Fixes: still not showed by autobuilders. Reproduced on Ubuntu 22.04 with Ubuntu APT g++ 11.4.0 Signed-off-by: Giulio Benetti Reviewed-by: Christian Stewart Signed-off-by: Thomas Petazzoni (cherry picked from commit 5f2c9f882d6ac693e758b30dcb489b1d05ad2644) Signed-off-by: Peter Korsgaard --- package/elfutils/elfutils.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/elfutils/elfutils.mk b/package/elfutils/elfutils.mk index 87b51aa5b5..4d8cc43342 100644 --- a/package/elfutils/elfutils.mk +++ b/package/elfutils/elfutils.mk @@ -27,6 +27,7 @@ HOST_ELFUTILS_CONF_OPTS = \ --with-bzlib \ --with-lzma \ --without-zstd \ + --disable-demangler \ --disable-progs ELFUTILS_LDFLAGS = $(TARGET_LDFLAGS) \ From 6331561b2a2357288b70453184b7391f43e25e28 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 11 Apr 2024 19:33:26 +0200 Subject: [PATCH 5595/5754] package/samba4: bump version to 4.19.6 Release notes: https://www.samba.org/samba/history/samba-4.19.6.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit e19eb8c29c47e9a54416c1ab41d0d87fba074577) 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 4e74e07bd0..49ce47705d 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.5.tar.asc -sha256 0e2405b4cec29d0459621f4340a1a74af771ec7cffedff43250cad7f1f87605e samba-4.19.5.tar.gz +# https://download.samba.org/pub/samba/stable/samba-4.19.6.tar.asc +sha256 653b52095554dbc223c63b96af5cdf9e98c3e048549c5f56143d3b33dce1cef1 samba-4.19.6.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index 0980d03175..994037c84b 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.19.5 +SAMBA4_VERSION = 4.19.6 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES From ca30429097249e9b8a2c6daa669511ab58c33699 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Thu, 11 Apr 2024 23:39:40 +0200 Subject: [PATCH 5596/5754] support/testing: add links runtime test Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit 449ae81faeff23a54693e337439f5c5685bd7bb8) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 ++ support/testing/tests/package/test_links.py | 33 +++++++++++++++++++ .../test_links/rootfs-overlay/root/file.html | 9 +++++ 3 files changed, 44 insertions(+) create mode 100644 support/testing/tests/package/test_links.py create mode 100644 support/testing/tests/package/test_links/rootfs-overlay/root/file.html diff --git a/DEVELOPERS b/DEVELOPERS index ed5962ed08..2fd801f55e 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1807,6 +1807,8 @@ F: support/testing/tests/package/test_libcamera.py F: support/testing/tests/package/test_libcamera/ F: support/testing/tests/package/test_libgpgme.py F: support/testing/tests/package/test_libjxl.py +F: support/testing/tests/package/test_links.py +F: support/testing/tests/package/test_links/ F: support/testing/tests/package/test_lrzip.py F: support/testing/tests/package/test_ltrace.py F: support/testing/tests/package/test_lvm2.py diff --git a/support/testing/tests/package/test_links.py b/support/testing/tests/package/test_links.py new file mode 100644 index 0000000000..ed52bb2d5f --- /dev/null +++ b/support/testing/tests/package/test_links.py @@ -0,0 +1,33 @@ +import os + +import infra.basetest + + +class TestLinks(infra.basetest.BRTest): + rootfs_overlay = \ + infra.filepath("tests/package/test_links/rootfs-overlay") + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + f""" + BR2_PACKAGE_LINKS=y + BR2_ROOTFS_OVERLAY="{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() + + self.assertRunOk("links -version") + + expected_str = "Hello Buildroot !" + html_file = "/root/file.html" + url = f"file://{html_file}" + + cmd = f"links -dump {url}" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + self.assertEqual(out[0].strip(), expected_str) diff --git a/support/testing/tests/package/test_links/rootfs-overlay/root/file.html b/support/testing/tests/package/test_links/rootfs-overlay/root/file.html new file mode 100644 index 0000000000..65b33cb5a7 --- /dev/null +++ b/support/testing/tests/package/test_links/rootfs-overlay/root/file.html @@ -0,0 +1,9 @@ + + + + Buildroot Test Page + + +

                                                              Hello Buildroot !

                                                              + + From f1d4de8a73f6a639c0c6bd7f9d8f46c28eac9405 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 13 Apr 2024 00:24:58 +0200 Subject: [PATCH 5597/5754] package/lvm2: enable device-mapper in Kernel config LVM2 has a hard dependency on the device-mapper presence in the Kernel. This commit enables those mandatory Kernel configuration by defining the _LINUX_CONFIG_FIXUPS macro. This will make sure the final system image will end up in a working configuration. This was suggested by Arnout in [1]. [1] https://lists.buildroot.org/pipermail/buildroot/2024-April/688776.html Suggested-by: Arnout Vandecappelle Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit 419d39b2615973711404fc143e848755f6692cfc) Signed-off-by: Peter Korsgaard --- package/lvm2/lvm2.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk index 810d668ec2..05b7388cf6 100644 --- a/package/lvm2/lvm2.mk +++ b/package/lvm2/lvm2.mk @@ -76,5 +76,10 @@ HOST_LVM2_CONF_OPTS = \ --disable-selinux \ --with-confdir=$(HOST_DIR)/etc +define LVM2_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_MD) + $(call KCONFIG_ENABLE_OPT,CONFIG_BLK_DEV_DM) +endef + $(eval $(autotools-package)) $(eval $(host-autotools-package)) From 107b3cb91c72e2ac498356407ad60667d61c897a Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 13 Apr 2024 00:24:59 +0200 Subject: [PATCH 5598/5754] support/testing: lvm2: remove kernel config fragment The lvm2 package now enables the required Kernel configuration. The Kernel config fragment included in this test is no longer needed. This commit removes it. Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit 9339343111a54a2648953f0bace70b01a68c37ec) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 - support/testing/tests/package/test_lvm2.py | 11 ++++------- .../tests/package/test_lvm2/linux-lvm2.fragment | 2 -- 3 files changed, 4 insertions(+), 10 deletions(-) delete mode 100644 support/testing/tests/package/test_lvm2/linux-lvm2.fragment diff --git a/DEVELOPERS b/DEVELOPERS index 2fd801f55e..853d8d6c90 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1812,7 +1812,6 @@ F: support/testing/tests/package/test_links/ F: support/testing/tests/package/test_lrzip.py F: support/testing/tests/package/test_ltrace.py F: support/testing/tests/package/test_lvm2.py -F: support/testing/tests/package/test_lvm2/ F: support/testing/tests/package/test_lzip.py F: support/testing/tests/package/test_lsof.py F: support/testing/tests/package/test_lz4.py diff --git a/support/testing/tests/package/test_lvm2.py b/support/testing/tests/package/test_lvm2.py index bdbae7a4ec..75ea3fa449 100644 --- a/support/testing/tests/package/test_lvm2.py +++ b/support/testing/tests/package/test_lvm2.py @@ -5,13 +5,11 @@ class TestLvm2(infra.basetest.BRTest): - # This test creates a lvm2 volume. A specific Kernel need to be - # built with a config fragment enabling this support. This test - # also uses resize2fs from e2fsprogs. - kernel_fragment = \ - infra.filepath("tests/package/test_lvm2/linux-lvm2.fragment") + # The lvm2 package has _LINUX_CONFIG_FIXUPS, so we cannot use + # the runtime test pre-built Kernel. We need to compile a Kernel + # to make sure it will include the required configuration. config = \ - f""" + """ BR2_aarch64=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" @@ -20,7 +18,6 @@ class TestLvm2(infra.basetest.BRTest): BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.77" 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="{kernel_fragment}" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_E2FSPROGS=y BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y diff --git a/support/testing/tests/package/test_lvm2/linux-lvm2.fragment b/support/testing/tests/package/test_lvm2/linux-lvm2.fragment deleted file mode 100644 index 0fade167a3..0000000000 --- a/support/testing/tests/package/test_lvm2/linux-lvm2.fragment +++ /dev/null @@ -1,2 +0,0 @@ -CONFIG_MD=y -CONFIG_BLK_DEV_DM=y From 72ca72c4b9d7eeb5046d2ebb8783ce7ddcc53c77 Mon Sep 17 00:00:00 2001 From: Charles Hardin Date: Wed, 17 Apr 2024 11:13:22 -0700 Subject: [PATCH 5599/5754] package/gstreamer1/gst1-plugins-good: add qt5tools as a dependency The following defconfig: BR2_aarch64=y BR2_cortex_a72=y BR2_TOOLCHAIN_EXTERNAL=y BR2_INIT_NONE=y BR2_SYSTEM_BIN_SH_NONE=y # BR2_PACKAGE_BUSYBOX is not set BR2_PACKAGE_GSTREAMER1=y BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL=y BR2_PACKAGE_GST1_PLUGINS_GOOD=y # BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AVI is not set # BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ISOMP4 is not set # BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_WAVPARSE is not set BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_QMLGL=y BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y BR2_PACKAGE_MESA3D_OPENGL_EGL=y BR2_PACKAGE_MESA3D_OPENGL_ES=y BR2_PACKAGE_QT5=y BR2_PACKAGE_WAYLAND=y # BR2_TARGET_ROOTFS_TAR is not set fails to build in gst1-plugins-good, with: build/gst1-plugins-good-1.22.9/ext/qt/meson.build:48:4: ERROR: Problem encountered: qt5 qmlglsink plugin is enabled, but qt specific tools were not found This is due to qt5tools being missing. This commit adds this missing dependency. Signed-off-by: Charles Hardin Signed-off-by: Thomas Petazzoni (cherry picked from commit c107dd33e679becf8b58d78d088b5320734d3e31) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-good/Config.in | 2 ++ package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/package/gstreamer1/gst1-plugins-good/Config.in b/package/gstreamer1/gst1-plugins-good/Config.in index e1e2674a4a..3cf227b78d 100644 --- a/package/gstreamer1/gst1-plugins-good/Config.in +++ b/package/gstreamer1/gst1-plugins-good/Config.in @@ -293,6 +293,8 @@ config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_QMLGL select BR2_PACKAGE_QT5BASE_WIDGETS select BR2_PACKAGE_QT5DECLARATIVE select BR2_PACKAGE_QT5DECLARATIVE_QUICK + select BR2_PACKAGE_QT5TOOLS + select BR2_PACKAGE_QT5TOOLS_LINGUIST_TOOLS select BR2_PACKAGE_QT5X11EXTRAS if BR2_PACKAGE_QT5BASE_XCB help QT5 plugin which includes elements qmlglsrc and qmlglsink diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk index a1ad63915d..2bb826d807 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk @@ -357,7 +357,7 @@ endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_QMLGL),y) GST1_PLUGINS_GOOD_CONF_OPTS += -Dqt5=enabled -GST1_PLUGINS_GOOD_DEPENDENCIES += qt5declarative +GST1_PLUGINS_GOOD_DEPENDENCIES += qt5declarative qt5tools ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y) GST1_PLUGINS_GOOD_DEPENDENCIES += qt5x11extras endif From 59a0b5c9fd736cf133b26956e5a93f7f9f2b294e Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Tue, 23 Apr 2024 00:06:32 +0200 Subject: [PATCH 5600/5754] support/testing: add lrzsz runtime test Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit dd45ac10d96b9a93be22a13dd3a4ac7973025008) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + support/testing/tests/package/test_lrzsz.py | 42 +++++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 support/testing/tests/package/test_lrzsz.py diff --git a/DEVELOPERS b/DEVELOPERS index 853d8d6c90..bba212def5 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1810,6 +1810,7 @@ F: support/testing/tests/package/test_libjxl.py F: support/testing/tests/package/test_links.py F: support/testing/tests/package/test_links/ F: support/testing/tests/package/test_lrzip.py +F: support/testing/tests/package/test_lrzsz.py F: support/testing/tests/package/test_ltrace.py F: support/testing/tests/package/test_lvm2.py F: support/testing/tests/package/test_lzip.py diff --git a/support/testing/tests/package/test_lrzsz.py b/support/testing/tests/package/test_lrzsz.py new file mode 100644 index 0000000000..23b4cdc531 --- /dev/null +++ b/support/testing/tests/package/test_lrzsz.py @@ -0,0 +1,42 @@ +import os + +import infra.basetest + + +class TestLrzsz(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_LRZSZ=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() + + fifo = "/tmp/return-fifo" + data_fname = "data" + data_path = f"/tmp/{data_fname}" + + # We check a program can execute. + self.assertRunOk("sz --version") + + # We create a data file, to be transferred. + cmd = f"dd if=/dev/urandom of={data_path} bs=1M count=1" + self.assertRunOk(cmd) + + # We create a fifo, used as a return fifo. + self.assertRunOk(f"mkfifo {fifo}") + + # We transfer the test data using ZMODEM over the pipe and our + # return fifo. + self.assertRunOk(f"sz {data_path} < {fifo} | rz > {fifo}") + + # The rz command is supposed to have created the received file + # in the current directory. We expect the received data to be + # the same as the original input file. + self.assertRunOk(f"cmp {data_path} {data_fname}") From 079b471563e92be1ba15dd044b4387db3a0e52f6 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Tue, 23 Apr 2024 19:11:18 +0200 Subject: [PATCH 5601/5754] support/testing: add socat runtime test Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit b1bbc7ac6ea90baef7559fc33d2a7e067428eebc) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + support/testing/tests/package/test_socat.py | 56 +++++++++++++++++++++ 2 files changed, 57 insertions(+) create mode 100644 support/testing/tests/package/test_socat.py diff --git a/DEVELOPERS b/DEVELOPERS index bba212def5..de9585bd3f 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1853,6 +1853,7 @@ 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_sed.py +F: support/testing/tests/package/test_socat.py F: support/testing/tests/package/test_sox.py F: support/testing/tests/package/test_sqlite.py F: support/testing/tests/package/test_strace.py diff --git a/support/testing/tests/package/test_socat.py b/support/testing/tests/package/test_socat.py new file mode 100644 index 0000000000..67b3244843 --- /dev/null +++ b/support/testing/tests/package/test_socat.py @@ -0,0 +1,56 @@ +import os +import time + +import infra.basetest + + +class TestSoCat(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y + BR2_PACKAGE_NETCAT=y + BR2_PACKAGE_SOCAT=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() + + # Some values, for the test. + msg = "Hello Buildroot!" + out_file = "output.txt" + port1 = 11111 + port2 = 22222 + + # Check the program can execute. + self.assertRunOk("socat -V") + + # We start the receiver netcat on tcp/port2. + cmd = f"nc -n -l -p {port2} > {out_file} 2> /dev/null &" + self.assertRunOk(cmd) + + time.sleep(2 * self.timeout_multiplier) + + # We start socat in background to listen on tcp/port1 and + # forward to tcp/port2. + cmd = f"socat TCP4-LISTEN:{port1} TCP4:127.0.0.1:{port2} &" + self.assertRunOk(cmd) + + time.sleep(2 * self.timeout_multiplier) + + # We write a message on tcp/port1. Socat is expected to + # forward the message to the receiver on tcp/port2, and write + # our message in a file. + cmd = f"echo '{msg}' | nc -n -c 127.0.0.1 {port1}" + self.assertRunOk(cmd) + + # We check the output file contains our message. + cmd = f"cat {out_file}" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + self.assertEqual(out[0], msg) From c796ab743a7d1e34f4e49e408fe30ceeb82126f2 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Tue, 23 Apr 2024 21:17:12 +0200 Subject: [PATCH 5602/5754] package/imagemagick: bump to version 7.1.1-31 For change log, see [1]. License hash file changed, due to the addition of an URL. See [2]. Fixes: [3] Some 32 bit architectures were failing at runtime with the message: FATAL: time limit exceeded 'file.png' @ fatal/cache.c/GetImagePixelCache/1702 The fix is included in 7.1.1-23. [1] https://github.com/ImageMagick/Website/blob/main/ChangeLog.md [2] https://github.com/ImageMagick/ImageMagick/commit/2c87d7da1b1db4573a37bd7933dfbf772ac3eecf [3] https://github.com/ImageMagick/ImageMagick/issues/6891 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit 0c9ea82ea805fe00ca69836b0ca785af2728ec08) Signed-off-by: Peter Korsgaard --- package/imagemagick/imagemagick.hash | 4 ++-- package/imagemagick/imagemagick.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/imagemagick/imagemagick.hash b/package/imagemagick/imagemagick.hash index fd80316ec5..30a12220dd 100644 --- a/package/imagemagick/imagemagick.hash +++ b/package/imagemagick/imagemagick.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 09402e5f17c6575ef9f010bb2e21ae1710f1f3426f115ad4317ee9129c32608e imagemagick-7.1.1-21.tar.gz -sha256 8cceeb67d4e783cb63075c7311fdb990fa0369ee80fbd0f481064cd02386ca2d LICENSE +sha256 c82210ea3fdbd044b656ba3d5b42df1da9a18e78fc0e500169bad70d3b0d9ba3 imagemagick-7.1.1-31.tar.gz +sha256 a556c5292c87c9a6ac795c80669b0c3660f9f729de8c476bf2b10f83ab1b34ec LICENSE diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk index 53cf02abf4..b2d3e755a6 100644 --- a/package/imagemagick/imagemagick.mk +++ b/package/imagemagick/imagemagick.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMAGEMAGICK_VERSION = 7.1.1-21 +IMAGEMAGICK_VERSION = 7.1.1-31 IMAGEMAGICK_SITE = $(call github,ImageMagick,ImageMagick,$(IMAGEMAGICK_VERSION)) IMAGEMAGICK_LICENSE = Apache-2.0 IMAGEMAGICK_LICENSE_FILES = LICENSE From 30cb9d9f902caf02e715df1cbab967dc9e8bea52 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 7 Apr 2024 23:09:22 +0200 Subject: [PATCH 5603/5754] support/config-fragments: replace br-i386-pentium-mmx-musl Replace br-i386-pentium-mmx-musl by bootlin-x86-i686-musl to avoid the following build failure with efivar and musl < 1.2.3 as suggested in https://patchwork.ozlabs.org/project/buildroot/patch/20240303171115.1140763-1-ju.o@free.fr: /home/buildroot/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/i586-buildroot-linux-musl/9.3.0/../../../../i586-buildroot-linux-musl/bin/ld: ./libefisec.so: undefined reference to `qsort_r' Fixes: - http://autobuild.buildroot.org/results/a0ed3970da8a84d884b26c081b49b8d2b7208829 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit a8be4a04ade8e695c5c4d4a825253d69e80693f9) Signed-off-by: Peter Korsgaard --- .../autobuild/bootlin-x86-i686-musl.config | 4 ++++ .../autobuild/br-i386-pentium-mmx-musl.config | 10 ---------- .../config-fragments/autobuild/toolchain-configs.csv | 2 +- 3 files changed, 5 insertions(+), 11 deletions(-) create mode 100644 support/config-fragments/autobuild/bootlin-x86-i686-musl.config delete mode 100644 support/config-fragments/autobuild/br-i386-pentium-mmx-musl.config diff --git a/support/config-fragments/autobuild/bootlin-x86-i686-musl.config b/support/config-fragments/autobuild/bootlin-x86-i686-musl.config new file mode 100644 index 0000000000..2afe096f32 --- /dev/null +++ b/support/config-fragments/autobuild/bootlin-x86-i686-musl.config @@ -0,0 +1,4 @@ +BR2_i386=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_MUSL_STABLE=y diff --git a/support/config-fragments/autobuild/br-i386-pentium-mmx-musl.config b/support/config-fragments/autobuild/br-i386-pentium-mmx-musl.config deleted file mode 100644 index 1b3c45fe9b..0000000000 --- a/support/config-fragments/autobuild/br-i386-pentium-mmx-musl.config +++ /dev/null @@ -1,10 +0,0 @@ -BR2_x86_pentium_mmx=y -BR2_TOOLCHAIN_EXTERNAL=y -BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y -BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-i386-pentium-mmx-musl-2020.11.2.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_9=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_9=y -BR2_TOOLCHAIN_EXTERNAL_CUSTOM_MUSL=y -# BR2_TOOLCHAIN_EXTERNAL_HAS_SSP is not set -BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/support/config-fragments/autobuild/toolchain-configs.csv b/support/config-fragments/autobuild/toolchain-configs.csv index 2c4fa45fe7..c5ae4d1ecb 100644 --- a/support/config-fragments/autobuild/toolchain-configs.csv +++ b/support/config-fragments/autobuild/toolchain-configs.csv @@ -39,6 +39,7 @@ support/config-fragments/autobuild/bootlin-s390x-z13-glibc.config,x86_64 support/config-fragments/autobuild/bootlin-sh4-uclibc.config,x86_64 support/config-fragments/autobuild/bootlin-sparc-uclibc.config,x86_64 support/config-fragments/autobuild/bootlin-sparc64-glibc.config,x86_64 +support/config-fragments/autobuild/bootlin-x86-i686-musl.config,x86_64 support/config-fragments/autobuild/bootlin-x86-64-glibc.config,x86_64 support/config-fragments/autobuild/bootlin-x86-64-uclibc.config,x86_64 support/config-fragments/autobuild/bootlin-xtensa-uclibc.config,x86_64 @@ -50,7 +51,6 @@ support/config-fragments/autobuild/br-arm-internal-full.config,any support/config-fragments/autobuild/br-arm-internal-glibc.config,any support/config-fragments/autobuild/br-arm-internal-musl.config,any support/config-fragments/autobuild/br-i386-pentium4-full.config,x86_64 -support/config-fragments/autobuild/br-i386-pentium-mmx-musl.config,x86_64 support/config-fragments/autobuild/br-microblazeel-full-internal.config,any support/config-fragments/autobuild/br-mips64-n64-full.config,x86_64 support/config-fragments/autobuild/br-mips64r6-el-hf-glibc.config,x86_64 From bf952b0cb7d10361389984027019161d46da105f Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Tue, 21 May 2024 23:38:14 +0200 Subject: [PATCH 5604/5754] support/config-fragments: fix bootlin-x86-i686-musl Commit a8be4a04ad "support/config-fragments: replace br-i386-pentium-mmx-musl" replaced this old toolchain by bootlin-x86-i686-musl. When using test-pkg with all toolchains, bootlin-x86-i686-musl is always failing. The issue can be reproduced with for example: utils/test-pkg -a -p busybox The issue can also be reproduced with a simple config like: cat > .config < [Romain: add the link to the Bootlin toolchain fragment] Signed-off-by: Romain Naour (cherry picked from commit 1263adf7a97b2cbc943b0c947f24401a59716aa6) Signed-off-by: Peter Korsgaard --- support/config-fragments/autobuild/bootlin-x86-i686-musl.config | 1 + 1 file changed, 1 insertion(+) diff --git a/support/config-fragments/autobuild/bootlin-x86-i686-musl.config b/support/config-fragments/autobuild/bootlin-x86-i686-musl.config index 2afe096f32..697e9c625e 100644 --- a/support/config-fragments/autobuild/bootlin-x86-i686-musl.config +++ b/support/config-fragments/autobuild/bootlin-x86-i686-musl.config @@ -1,4 +1,5 @@ BR2_i386=y +BR2_x86_i686=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_MUSL_STABLE=y From 5751191f2d4521125560c0022b385929a867c3fe Mon Sep 17 00:00:00 2001 From: Chen Pei Date: Tue, 9 Apr 2024 19:16:35 +0800 Subject: [PATCH 5605/5754] package/bpftool: enable on riscv bpftool supports RISC-V, including rv64 and rv32, so let's enable the bpftool package on RISC-V. Signed-off-by: Chen Pei Signed-off-by: Thomas Petazzoni (cherry picked from commit a91a245ec04e992c7ac6709c701380fdf5e3655e) Signed-off-by: Peter Korsgaard --- package/bpftool/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/bpftool/Config.in b/package/bpftool/Config.in index ef3a7a8a45..55fd09ef3d 100644 --- a/package/bpftool/Config.in +++ b/package/bpftool/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_BPFTOOL_ARCH_SUPPORTS 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_riscv default y if BR2_sparc || BR2_sparc64 default y if BR2_s390x From 3bababa87b305eb4f802798f580bea775d76f47f Mon Sep 17 00:00:00 2001 From: Ludovic Desroches Date: Tue, 9 Apr 2024 14:22:33 +0200 Subject: [PATCH 5606/5754] package/evemu: add staging installation To make the evdev library available for other packages, install it to the staging directory. Signed-off-by: Ludovic Desroches Signed-off-by: Thomas Petazzoni (cherry picked from commit a9e54f2cdf2717dcd7e87a4fb8d641a1206eeed3) Signed-off-by: Peter Korsgaard --- package/evemu/evemu.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/evemu/evemu.mk b/package/evemu/evemu.mk index b27033afa4..886ceb1142 100644 --- a/package/evemu/evemu.mk +++ b/package/evemu/evemu.mk @@ -9,6 +9,7 @@ EVEMU_SITE = http://www.freedesktop.org/software/evemu EVEMU_SOURCE = evemu-$(EVEMU_VERSION).tar.xz EVEMU_LICENSE = LGPL-3.0 (library), GPL-3.0 (tools) EVEMU_LICENSE_FILES = COPYING +EVEMU_INSTALL_STAGING = YES # asciidoc used to generate manpages, which we don't need, and if it's # present on the build host, it ends getting called with our host-python From 923ab8a7d57ba93adda9b46866705d6a74f41f8c Mon Sep 17 00:00:00 2001 From: Paul Cercueil Date: Tue, 9 Apr 2024 20:12:14 +0200 Subject: [PATCH 5607/5754] package/lightning: bump version to 2.2.3 Release notes: https://lists.gnu.org/archive/html/lightning/2024-02/msg00000.html Signed-off-by: Paul Cercueil Signed-off-by: Thomas Petazzoni (cherry picked from commit c89bec21dbebe5fe689aac5c0674b69634b52317) Signed-off-by: Peter Korsgaard --- .../0001-Fix-build-on-mips64el.patch | 65 ------------------- package/lightning/lightning.hash | 2 +- package/lightning/lightning.mk | 2 +- 3 files changed, 2 insertions(+), 67 deletions(-) delete mode 100644 package/lightning/0001-Fix-build-on-mips64el.patch diff --git a/package/lightning/0001-Fix-build-on-mips64el.patch b/package/lightning/0001-Fix-build-on-mips64el.patch deleted file mode 100644 index b3f087bb9e..0000000000 --- a/package/lightning/0001-Fix-build-on-mips64el.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 90f5c78f47dfb1ae4b953b0e30c7ef72a6438396 Mon Sep 17 00:00:00 2001 -From: Paul Cercueil -Date: Thu, 5 Oct 2023 14:24:13 +0200 -Subject: [PATCH] Fix build on mips64el - -The "cvt_offset" field may be used for anything non-ARM in -jit_fallback.c, so enable this field on anything non-ARM. Worst case -scenario, this field is not used and it only occupies 4 bytes of RAM. - -Besides, when building for mips64el with the N32 ABI, the __WORDSIZE -ends up being 32 and not 64 (which may be a problem in itself), which -caused some more issues as the movi_d_w() macro referenced by -jit_mips.c was not defined anywhere. - -This caused Buildroot's CI to fail when building on mips64el: -http://autobuild.buildroot.net/results/f951d91d2ca4647170a52499a243d45d13d3bced/ - -Upstream: http://git.savannah.gnu.org/cgit/lightning.git/commit/?id=90f5c78f47dfb1ae4b953b0e30c7ef72a6438396 -Signed-off-by: Paul Cercueil ---- - include/lightning/jit_private.h | 5 +---- - lib/lightning.c | 4 ++-- - 2 files changed, 3 insertions(+), 6 deletions(-) - -diff --git a/include/lightning/jit_private.h b/include/lightning/jit_private.h -index 5052a36..9f8caf6 100644 ---- a/include/lightning/jit_private.h -+++ b/include/lightning/jit_private.h -@@ -555,10 +555,7 @@ struct jit_function { - jit_int32_t *regoff; - jit_regset_t regset; - jit_int32_t stack; --#if defined(__i386__) || defined(__x86_64__) || \ -- defined(__powerpc__) || defined(__sparc__) || \ -- defined(__s390__) || defined(__s390x__) || \ -- defined(__hppa__) || defined(__alpha__) -+#if !defined(__arm__) - jit_int32_t cvt_offset; /* allocai'd offset for x87<->xmm or - * fpr<->gpr transfer using the stack */ - #endif -diff --git a/lib/lightning.c b/lib/lightning.c -index d5ea330..39c4fc2 100644 ---- a/lib/lightning.c -+++ b/lib/lightning.c -@@ -4285,7 +4285,7 @@ static void _htoni_ul(jit_state_t*, jit_int32_t, jit_word_t); - #endif - # define movi_f_w(r0, i0) _movi_f_w(_jit, r0, i0) - static void _movi_f_w(jit_state_t*, jit_int32_t, jit_float32_t); --#if __WORDSIZE == 32 -+#if __WORDSIZE == 32 && !(defined(__mips__) && NEW_ABI) - # define movi_d_ww(r0, r1, i0) _movi_d_ww(_jit, r0, r1, i0) - static void _movi_d_ww(jit_state_t*, jit_int32_t, jit_int32_t, jit_float64_t); - #else -@@ -4569,7 +4569,7 @@ _movi_f_w(jit_state_t *_jit, jit_int32_t r0, jit_float32_t i0) - movi(r0, data.i); - } - --#if __WORDSIZE == 32 -+#if __WORDSIZE == 32 && !(defined(__mips__) && NEW_ABI) - static void - _movi_d_ww(jit_state_t *_jit, jit_int32_t r0, jit_int32_t r1, jit_float64_t i0) - { --- -2.40.1 - diff --git a/package/lightning/lightning.hash b/package/lightning/lightning.hash index 6f7c24d19c..76ad5e4cda 100644 --- a/package/lightning/lightning.hash +++ b/package/lightning/lightning.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 0aca8242dead17d62117bcfcb078e6a9ea856cc81742813c9e8394bcce73b3e2 lightning-2.2.2.tar.gz +sha256 c045c7a33a00affbfeb11066fa502c03992e474a62ba95977aad06dbc14c6829 lightning-2.2.3.tar.gz sha256 a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c COPYING.LESSER diff --git a/package/lightning/lightning.mk b/package/lightning/lightning.mk index c23ae9745e..08e388392c 100644 --- a/package/lightning/lightning.mk +++ b/package/lightning/lightning.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIGHTNING_VERSION = 2.2.2 +LIGHTNING_VERSION = 2.2.3 LIGHTNING_SITE = $(BR2_GNU_MIRROR)/lightning LIGHTNING_LICENSE = LGPL-3.0+ LIGHTNING_LICENSE_FILES = COPYING.LESSER From 5dcf2d88497cbdafd7b224ab58616eb8b9d7ab27 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 9 May 2024 18:52:26 +0200 Subject: [PATCH 5608/5754] package/ivi-homescreen: drop bogus comment dependency on NPTL As part of the review process of the ivi-homescreen package, which landed in commit 9d8497e79de3ced144877ba6ee38cc5b7181aaeb, it was deemed that the dependency on BR2_TOOLCHBAIN_HAS_THREAD_NPTL was not needed, as it was implied by glibc. According to the commit log: [yann.morin.1998@free.fr: - propagate BR2_PACKAGE_HOST_FLUTTER_SDK_BIN_ARCH_SUPPORTS to comments - drop NPTL, implied by glibc - reorder dependencies in a more logical way - reorder comments - drop undefined BR2_PACKAGE_IVI_HOMESCREEN_HAS_CLIENT - grammar ("for to change") ] Signed-off-by: Yann E. MORIN However, while the BR2_TOOLCHBAIN_HAS_THREAD_NPTL dependency was removed from the BR2_PACKAGE_IVI_HOMESCREEN option definition, the corresponding dependency in the Config.in comment was not dropped. Let's bring things back in sync. Signed-off-by: Thomas Petazzoni (cherry picked from commit b9b072f83c1f2a55b54405b2dc28e6586b59b74b) Signed-off-by: Peter Korsgaard --- package/ivi-homescreen/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ivi-homescreen/Config.in b/package/ivi-homescreen/Config.in index c24df05b6d..dc2ccb0c97 100644 --- a/package/ivi-homescreen/Config.in +++ b/package/ivi-homescreen/Config.in @@ -250,10 +250,10 @@ comment "OpenGL texture plugin needs an EGL backend" endif # BR2_PACKAGE_IVI_HOMESCREEN -comment "ivi-homescreen needs a glibc toolchain w/ wchar, C++, gcc >= 5, dynamic library, host gcc >= 5, NPTL" +comment "ivi-homescreen needs a glibc toolchain w/ wchar, C++, gcc >= 5, dynamic library, host gcc >= 5" depends on BR2_PACKAGE_HOST_FLUTTER_SDK_BIN_ARCH_SUPPORTS depends on BR2_PACKAGE_FLUTTER_ENGINE_ARCH_SUPPORTS - depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_TOOLCHAIN_HAS_THREADS_NPTL \ + depends on !BR2_TOOLCHAIN_USES_GLIBC \ || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 \ || BR2_STATIC_LIBS || !BR2_USE_WCHAR \ || !BR2_HOST_GCC_AT_LEAST_5 From fe189deeed96779f9fb8c9006a85b50034322365 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Thu, 9 May 2024 21:37:36 +0200 Subject: [PATCH 5609/5754] package/zbar: add the optional imagemagick dependency When ImageMagick is selected, the "zbarimg" program is compiled and installed on target. It allows to decode a QR code from an image file. Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit 84ad5c22d00b1cf7f2c9d9632f5e3a04efe9cddc) Signed-off-by: Peter Korsgaard --- package/zbar/zbar.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/zbar/zbar.mk b/package/zbar/zbar.mk index 0e79004bb3..86f33796a2 100644 --- a/package/zbar/zbar.mk +++ b/package/zbar/zbar.mk @@ -18,7 +18,6 @@ ZBAR_CONF_ENV = \ LIBS=$(TARGET_NLS_LIBS) ZBAR_CONF_OPTS = \ --disable-doc \ - --without-imagemagick \ --without-qt \ --without-qt5 \ --without-gtk \ @@ -32,6 +31,13 @@ else ZBAR_CONF_OPTS += --without-dbus endif +ifeq ($(BR2_PACKAGE_IMAGEMAGICK),y) +ZBAR_DEPENDENCIES += imagemagick +ZBAR_CONF_OPTS += --with-imagemagick +else +ZBAR_CONF_OPTS += --without-imagemagick +endif + ifeq ($(BR2_PACKAGE_PYTHON3),y) ZBAR_DEPENDENCIES += host-python3 python3 ZBAR_CONF_OPTS += --with-python=python3 From 1e70541c8546c215fc3b6f2dd127596cf635c572 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Thu, 9 May 2024 21:37:37 +0200 Subject: [PATCH 5610/5754] support/testing: add zbar runtime test Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit 85f0941532c424df2d7b1cfc153546d02dd3cd12) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + support/testing/tests/package/test_zbar.py | 37 ++++++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 support/testing/tests/package/test_zbar.py diff --git a/DEVELOPERS b/DEVELOPERS index de9585bd3f..88b042921c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1872,6 +1872,7 @@ F: support/testing/tests/package/test_weston/ 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_zbar.py F: support/testing/tests/package/test_zchunk.py F: support/testing/tests/package/test_zstd.py diff --git a/support/testing/tests/package/test_zbar.py b/support/testing/tests/package/test_zbar.py new file mode 100644 index 0000000000..b840df089a --- /dev/null +++ b/support/testing/tests/package/test_zbar.py @@ -0,0 +1,37 @@ +import os + +import infra.basetest + + +class TestZbar(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_IMAGEMAGICK=y + BR2_PACKAGE_LIBQRENCODE=y + BR2_PACKAGE_LIBQRENCODE_TOOLS=y + BR2_PACKAGE_ZBAR=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() + + txt_msg = "Hello Buildroot!" + qr_img = "qr.png" + + # We check the program can execute. + self.assertRunOk("zbarimg --version") + + # We generate a QR code image containing a message. + self.assertRunOk(f"qrencode -o '{qr_img}' '{txt_msg}'") + + # We decode the QR code image and check the extracted message + # is the expected one. + out, ret = self.emulator.run(f"zbarimg -q --raw {qr_img}") + self.assertEqual(ret, 0) + self.assertEqual(out[0], txt_msg) From 89492fe1a8cb27c49c12e85620abe182999bfc51 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 9 May 2024 22:17:20 +0200 Subject: [PATCH 5611/5754] package/hidapi: fixup Config.in comment The Config.in comment was mentioning both "NPTL" and "threads" as dependencies, while mentioning only the former is sufficient. Signed-off-by: Thomas Petazzoni (cherry picked from commit dabd983c0d8f019a9b285bd3a1a843cbd5ed9d4d) Signed-off-by: Peter Korsgaard --- package/hidapi/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/hidapi/Config.in b/package/hidapi/Config.in index 061c7883f7..1d3c86b677 100644 --- a/package/hidapi/Config.in +++ b/package/hidapi/Config.in @@ -15,7 +15,7 @@ config BR2_PACKAGE_HIDAPI http://github.com/libusb/hidapi/ -comment "hidapi needs udev /dev management and a toolchain w/ NPTL, threads, gcc >= 4.9" +comment "hidapi needs udev /dev management and a toolchain w/ NPTL, gcc >= 4.9" depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ !BR2_PACKAGE_HAS_UDEV || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 From 4816c095d834ba352f59a18bb13e2e5755262018 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 9 May 2024 19:23:24 +0200 Subject: [PATCH 5612/5754] package/pkg-generic.mk: really make DL_SUBDIR inheritance work While bumping kodi, we figured out that the kodi-texturepacker and kodi-jsonschemabuilder were both re-downloading the main Kodi tarball, even though they contain: KODI_JSONSCHEMABUILDER_DL_SUBDIR = kodi KODI_TEXTUREPACKER_DL_SUBDIR = kodi Both are host packages, and turns out that changing those variables to HOST_ ones made the download sharing work. Commit efa7712b092950c92f994e2ee30c120a64e5451b ("package/pkg-generic: host variant inherits target download settings") introduced inheritance of host variables from target variables from a number of variables, including DL_SUBDIR. But it missed the fact that earlier in pkg-generic.mk, the following line was defined: $(2)_DL_SUBDIR ?= $$($(2)_RAWNAME) So, when this later code kicked in: ifndef $(2)_DL_SUBDIR ifdef $(3)_DL_SUBDIR $(2)_DL_SUBDIR = $$($(3)_DL_SUBDIR) endif endif In fact it never did anything because $(2)_DL_SUBDIR would never be undefined. This commit fixes this issue by properly adjusting the logic to inherit the value of the target variable when it exists, or defaulting to $$($(2)_RAWNAME) otherwise. Cc: Yann E. MORIN Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN (cherry picked from commit a1c4d6c884c8aa871cc27166f33feecd1002b3e8) Signed-off-by: Peter Korsgaard --- package/pkg-generic.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 577a148c1e..a2749320c3 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -525,7 +525,6 @@ endif $(2)_BASENAME = $$(if $$($(2)_VERSION),$(1)-$$($(2)_VERSION),$(1)) $(2)_BASENAME_RAW = $$(if $$($(2)_VERSION),$$($(2)_RAWNAME)-$$($(2)_VERSION),$$($(2)_RAWNAME)) -$(2)_DL_SUBDIR ?= $$($(2)_RAWNAME) $(2)_DL_DIR = $$(DL_DIR)/$$($(2)_DL_SUBDIR) $(2)_DIR = $$(BUILD_DIR)/$$($(2)_BASENAME) @@ -538,6 +537,8 @@ endif ifndef $(2)_DL_SUBDIR ifdef $(3)_DL_SUBDIR $(2)_DL_SUBDIR = $$($(3)_DL_SUBDIR) + else + $(2)_DL_SUBDIR = $$($(2)_RAWNAME) endif endif From 2fcec25f6a82e3be4d0cfa947daca2174c89d01a Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 4 May 2024 23:40:02 +0200 Subject: [PATCH 5613/5754] package/docker-compose: bump version The current version of docker-compose is un-vendorable, because the dependencies it referenmces (directly or indirectly) are not available: go: github.com/docker/compose/v2/cmd/compose imports github.com/moby/buildkit/util/progress/progressui: github.com/crazy-max/buildkit@v0.7.1-0.20240130133234-d9aa289bd124: invalid version: unknown revision d9aa289bd124 And indeed, that commit does not exist in that repository. The v0.7.1 tag does exist, but there is not commit that matches the short hash d9aa289bd124, or even the whole version string. Sigh... There is no way anyone can vendor the version we currently package, and all they and us can hope for is that we never lose s.b.o ever. Bump the version. That one can be vendored. Well, at least it can _still_ be vendored _now_... Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle (cherry picked from commit 1b189f54918b366a604a50686d5560e510beb531) Signed-off-by: Peter Korsgaard --- 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 ca3d08cf63..d55e35eb16 100644 --- a/package/docker-compose/docker-compose.hash +++ b/package/docker-compose/docker-compose.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 931bfcc34eb43106be07787372bb853d4cd82830a5785f3049c5192ab0e4ac35 docker-compose-2.24.7.tar.gz +sha256 105328838a48dad4a305903c5ae98b928e8a4ea3546e1711690e9eef7e0232be docker-compose-2.26.1.tar.gz sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd LICENSE diff --git a/package/docker-compose/docker-compose.mk b/package/docker-compose/docker-compose.mk index 5417ba2d4f..66a88ac7e7 100644 --- a/package/docker-compose/docker-compose.mk +++ b/package/docker-compose/docker-compose.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_COMPOSE_VERSION = 2.24.7 +DOCKER_COMPOSE_VERSION = 2.26.1 DOCKER_COMPOSE_SITE = $(call github,docker,compose,v$(DOCKER_COMPOSE_VERSION)) DOCKER_COMPOSE_LICENSE = Apache-2.0 DOCKER_COMPOSE_LICENSE_FILES = LICENSE From 6750207e0254509f12ee9494c4b6676384708548 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 4 May 2024 23:40:03 +0200 Subject: [PATCH 5614/5754] package/am33x-cm3: switch upstream The upstream host, arago-project.org, has vanished, bringing down the git repository with it. Switch to another, github-hosted repository, that has the commit we're interested in. Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle (cherry picked from commit b1977d933b4381e5b8b4f7d0a99ecadd17827b2e) Signed-off-by: Peter Korsgaard --- package/am33x-cm3/am33x-cm3.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/am33x-cm3/am33x-cm3.mk b/package/am33x-cm3/am33x-cm3.mk index 629a83238c..d5ace7bb0e 100644 --- a/package/am33x-cm3/am33x-cm3.mk +++ b/package/am33x-cm3/am33x-cm3.mk @@ -6,7 +6,7 @@ # This should correpsond to v05.00.00.02 AM33X_CM3_VERSION = 11107db2f1e9e58ee75d4fe9cc38423c9a6e4365 -AM33X_CM3_SITE = http://arago-project.org/git/projects/am33x-cm3.git +AM33X_CM3_SITE = https://github.com/RobertCNelson/am33x-cm3 AM33X_CM3_SITE_METHOD = git AM33X_CM3_LICENSE = TI Publicly Available Software License AM33X_CM3_LICENSE_FILES = License.txt From da56f2dc4c4281e3dfec55a0619c21c6b80d0484 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 4 May 2024 23:40:05 +0200 Subject: [PATCH 5615/5754] package/luajit: drop useless post-extract hook Since version 2.1, LuaJIT follows a rolling-release scheme, which means that any commit is as good as any other; LuaJIT uses the comitter's UNIX timestamp as its semver patch level. It uses the git-attribute export-subst for the .relver file that contains the %ct placeholder for git-archive to expand it. In c9dcd9e459d6 (package/luajit: bump to version 41fb94defa8f...), we switched to such an upstream version. There was some confusion around the handling of the git-attribute and where/when it is generated, and the first revision of the patch used the git download method, so had to use post-extract hooks to do the replacement, but the second iteration kept retrieving the archive generated by github, which has the replacement already done, but the post-extract hooks were not dropped although now useless... With the current code, it is easy to bump the LuaJit version and forget to update the timestamp stored in the .relver file, which would override the value that was generated on the github side. Since the post-extract hook is useless, drop it. Signed-off-by: Yann E. MORIN Cc: Francois Perrad Cc: Thomas Petazzoni Signed-off-by: Arnout Vandecappelle (cherry picked from commit 1bcb51517ccbe79e5c37f211a20d1d02689298e0) Signed-off-by: Peter Korsgaard --- package/luajit/luajit.mk | 9 --------- 1 file changed, 9 deletions(-) diff --git a/package/luajit/luajit.mk b/package/luajit/luajit.mk index 06c8993391..693e22630b 100644 --- a/package/luajit/luajit.mk +++ b/package/luajit/luajit.mk @@ -33,15 +33,6 @@ 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 aa9dfe9ae7e74e34f4c4909647f11cda0289b79e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 4 Apr 2024 21:47:23 +0200 Subject: [PATCH 5616/5754] package/privoxy: fix build with root Set GROUP_T when installing configuration files as root to avoid the following build failure raised since commit b6816034ebddd522a8fef9daa454c28fa1230dd6: /usr/bin/install: missing destination file operand after '/home/buildroot/instance-0/output-1/target/etc' Fixes: b6816034ebddd522a8fef9daa454c28fa1230dd6 - http://autobuild.buildroot.org/results/eb4ccf248c9c5048e9b71058bb0311b1e0763883 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 981d25e5bcedee0dee8efcfbaa1dedb466a5445f) Signed-off-by: Peter Korsgaard --- ...0002-GNUMakefile.in-fix-root-install.patch | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 package/privoxy/0002-GNUMakefile.in-fix-root-install.patch diff --git a/package/privoxy/0002-GNUMakefile.in-fix-root-install.patch b/package/privoxy/0002-GNUMakefile.in-fix-root-install.patch new file mode 100644 index 0000000000..89347c214e --- /dev/null +++ b/package/privoxy/0002-GNUMakefile.in-fix-root-install.patch @@ -0,0 +1,35 @@ +From 25bd5ae1664f5603c05c72b2c38525602f33da0a Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 31 Mar 2024 19:17:45 +0200 +Subject: [PATCH] GNUMakefile.in: fix root install + +Set GROUP_T when installing configuration files as root to avoid the +following build failure since commit +4b3b267db159dc23314de3062859481b7c397e32: + +/usr/bin/install: missing destination file operand after '/home/buildroot/instance-0/output-1/target/etc' + +Fixes: + - http://autobuild.buildroot.org/results/eb4ccf248c9c5048e9b71058bb0311b1e0763883 + +Signed-off-by: Fabrice Fontaine +Upstream: https://lists.privoxy.org/pipermail/privoxy-devel/2024-March/000760.html +--- + GNUmakefile.in | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/GNUmakefile.in b/GNUmakefile.in +index cf79aae1..db1bab59 100644 +--- a/GNUmakefile.in ++++ b/GNUmakefile.in +@@ -927,6 +927,7 @@ install: CONF_DEST LOG_DEST PID_DEST check_doc GROUP_T + $(ECHO) " and to install the config files as that user and/or group!" ;\ + $(ECHO) " Please read INSTALL, and create a privoxy user and group!" ;\ + $(ECHO) "*******************************************************************" ;\ ++ GROUP_T=$(GROUP) ;\ + fi ;\ + else \ + GROUP_T=$(GROUP) ;\ +-- +2.43.0 + From 3a620c5359e6cfe50fd0ec472c83efc2fae88271 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 8 Apr 2024 22:20:30 +0200 Subject: [PATCH 5617/5754] package/mariadb: really use system fmt Commit 821f9dee8112dc02fe58d60273d0dfdabbc46d1f wrongly used WITH_FMT instead of WITH_LIBFMT resulting in the following build failure: [ 0%] Creating directories for 'libfmt' [ 0%] Performing download step (download, verify and extract) for 'libfmt' make[3]: Leaving directory '/home/buildroot/autobuild/run/instance-0/output-1/build/mariadb-10.11.6' make[3]: Leaving directory '/home/buildroot/autobuild/run/instance-0/output-1/build/mariadb-10.11.6' -- Downloading... dst='/home/buildroot/autobuild/run/instance-0/output-1/build/mariadb-10.11.6/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 Closing connection --- LOG END --- Fixes: 821f9dee8112dc02fe58d60273d0dfdabbc46d1f - http://autobuild.buildroot.org/results/fbe3bc347a83a810ffbbbff93a45994963712bee Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 2cf2491a23e70dd38f037726551ed6df7a9ac340) Signed-off-by: Peter Korsgaard --- package/mariadb/mariadb.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mariadb/mariadb.mk b/package/mariadb/mariadb.mk index 8641437d4d..1dcf6568da 100644 --- a/package/mariadb/mariadb.mk +++ b/package/mariadb/mariadb.mk @@ -26,7 +26,7 @@ MARIADB_DEPENDENCIES = \ libxml2 MARIADB_CONF_OPTS += \ - -DWITH_FMT=system \ + -DWITH_LIBFMT=system \ -DWITH_PCRE=system # use bundled GPL-2.0+ licensed readline as package/readline is GPL-3.0+ From 1be26aad93ba97243d0c3a8e4dae81cefd4eca8a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 27 Apr 2024 10:34:02 +0200 Subject: [PATCH 5618/5754] package/clamav: bump version to 1.0.6 Release notes: https://blog.clamav.net/2024/04/clamav-131-123-106-patch-versions.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit c4f8728e70b8ca2dde109801bb8ecaaff4dfbf51) Signed-off-by: Peter Korsgaard --- 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 cd03a11840..b2b7bfb987 100644 --- a/package/clamav/clamav.hash +++ b/package/clamav/clamav.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 aa67ee9679f747af3c492353d768464c27d614b3fed62eb7f988b6776d4aedbb clamav-1.0.5.tar.gz +sha256 12dcd842b6c46e5a9fdf2f5c16304efafe53310ac4605990465651b0c42227b2 clamav-1.0.6.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 c548897c37..eb3abaa21c 100644 --- a/package/clamav/clamav.mk +++ b/package/clamav/clamav.mk @@ -4,7 +4,7 @@ # ################################################################################ -CLAMAV_VERSION = 1.0.5 +CLAMAV_VERSION = 1.0.6 CLAMAV_SITE = https://www.clamav.net/downloads/production CLAMAV_LICENSE = GPL-2.0 CLAMAV_LICENSE_FILES = \ From 8886594d59fc8bcba40fd90a3d659100aa7ec538 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 27 Apr 2024 10:39:39 +0200 Subject: [PATCH 5619/5754] package/{mesa3d, mesa3d-headers}: bump version to 24.0.6 Release notes: https://lists.freedesktop.org/archives/mesa-announce/2024-April/000754.html https://lists.freedesktop.org/archives/mesa-announce/2024-April/000755.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit e1e4237dc7bd182709b9e28ccb2cc451da157f49) 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 0756296a01..e1f6211e17 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 = 24.0.4 +MESA3D_HEADERS_VERSION = 24.0.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 e2e0be2641..fb3df96555 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/mesa-dev/2024-March/226176.html -sha256 90febd30a098cbcd97ff62ecc3dcf5c93d76f7fa314de944cfce81951ba745f0 mesa-24.0.4.tar.xz -sha512 1d05b07026417fbe9cf18f7b18f2db9fe5fe327555c590283d87f69bbdd51f64135928a1dbe155d750187fc268bbdbb070bc1ae9ffc3e013b8707b391969d515 mesa-24.0.4.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2024-April/000755.html +sha256 8b7a92dbe6468c18f2383700135b5fe9de836cdf0cc8fd7dbae3c7110237d604 mesa-24.0.6.tar.xz +sha512 60fcc77132c3cb0c98e650d97d3324bfd18abe7f8f8a3aa5209f71b2fddd94510f939bbf5272b2241749307184d5badde9da4842be57ce13f5760875885ea6fc mesa-24.0.6.tar.xz # License sha256 a00275a53178e2645fb65be99a785c110513446a5071ff2c698ed260ad917d75 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index c2343488ed..39cbb4c23b 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 = 24.0.4 +MESA3D_VERSION = 24.0.6 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos From d50049e60f6162ac59cbeb3edae4d0ed756bd357 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 24 Mar 2024 18:45:23 +0100 Subject: [PATCH 5620/5754] package/libdrm: fix install of test programs Buildroot commit f95069814bd68cfc10ccf2dbc41efa6f1e127495 disabled the build of test programs unconditionally without considering the option BR2_PACKAGE_LIBDRM_INSTALL_TESTS. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 91848e73ae6f5ad6ca0568f8e7309247379e51f1) Signed-off-by: Peter Korsgaard --- package/libdrm/libdrm.mk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk index a04331c2da..e0c1217b38 100644 --- a/package/libdrm/libdrm.mk +++ b/package/libdrm/libdrm.mk @@ -17,8 +17,7 @@ LIBDRM_DEPENDENCIES = \ LIBDRM_CONF_OPTS = \ -Dcairo-tests=disabled \ - -Dman-pages=disabled \ - -Dtests=false + -Dman-pages=disabled ifeq ($(BR2_PACKAGE_LIBATOMIC_OPS),y) LIBDRM_DEPENDENCIES += libatomic_ops @@ -109,10 +108,12 @@ LIBDRM_CONF_OPTS += -Dvalgrind=disabled endif ifeq ($(BR2_PACKAGE_LIBDRM_INSTALL_TESTS),y) -LIBDRM_CONF_OPTS += -Dinstall-test-programs=true +LIBDRM_CONF_OPTS += -Dtests=true -Dinstall-test-programs=true ifeq ($(BR2_PACKAGE_CUNIT),y) LIBDRM_DEPENDENCIES += cunit endif +else +LIBDRM_CONF_OPTS += -Dtests=false endif $(eval $(meson-package)) From 04b6b4f59c4aa3fd8a9a6c4db1c4b67a9a97a94f Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 24 Mar 2024 19:30:38 +0100 Subject: [PATCH 5621/5754] support/testing: add gnuplot runtime test Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit 92ae6d75c164e2665d6410de2b1d14babfc0eec6) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 + support/testing/tests/package/test_gnuplot.py | 73 +++++++++++++++++++ .../rootfs-overlay/root/gnuplot-test.plot | 4 + 3 files changed, 79 insertions(+) create mode 100644 support/testing/tests/package/test_gnuplot.py create mode 100644 support/testing/tests/package/test_gnuplot/rootfs-overlay/root/gnuplot-test.plot diff --git a/DEVELOPERS b/DEVELOPERS index 88b042921c..823bbad88d 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1786,6 +1786,8 @@ F: support/testing/tests/package/test_ghostscript/ F: support/testing/tests/package/test_glslsandbox_player.py F: support/testing/tests/package/test_glslsandbox_player/ F: support/testing/tests/package/test_gnupg2.py +F: support/testing/tests/package/test_gnuplot.py +F: support/testing/tests/package/test_gnuplot/ F: support/testing/tests/package/test_gnuradio.py F: support/testing/tests/package/test_gnuradio/ F: support/testing/tests/package/test_gzip.py diff --git a/support/testing/tests/package/test_gnuplot.py b/support/testing/tests/package/test_gnuplot.py new file mode 100644 index 0000000000..a225540537 --- /dev/null +++ b/support/testing/tests/package/test_gnuplot.py @@ -0,0 +1,73 @@ +import os + +import infra.basetest + + +class TestGnuplot(infra.basetest.BRTest): + rootfs_overlay = \ + infra.filepath("tests/package/test_gnuplot/rootfs-overlay") + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + f""" + BR2_PACKAGE_GNUPLOT=y + BR2_ROOTFS_OVERLAY="{rootfs_overlay}" + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def gen_gnuplot_cmd(self, gpcmd): + return f"gnuplot -e '{gpcmd}'" + + 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 program can run. + self.assertRunOk("gnuplot --version") + + # When the locale is C, Gnuplot print the warning: + # "line 0: warning: iconv failed to convert degree sign" + # We set the locale to avoid this warning. + self.assertRunOk('export LC_ALL="en_US.UTF-8"') + + # We check Gnuplot can print a string. + string = "Hello Buildroot !" + cmd = self.gen_gnuplot_cmd(f'print "{string}"') + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + self.assertEqual(out[0], string) + + # We check Gnuplot can do a simple arithmetic operation. + op1 = 123 + op2 = 456 + expected_result = op1 * op2 + cmd = self.gen_gnuplot_cmd(f"print {op1} * {op2}") + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + self.assertEqual(int(out[0]), expected_result) + + # We check Gnuplot can return a specific exit code. + exit_code = 123 + cmd = self.gen_gnuplot_cmd(f"exit status {exit_code}") + _, ret = self.emulator.run(cmd) + self.assertEqual(ret, exit_code) + + # We render a simple plot on the terminal. + gpcmd = "set term dumb; set grid; plot [-5:5] x**2;" + cmd = self.gen_gnuplot_cmd(gpcmd) + self.assertRunOk(cmd) + + # We check a Gnuplot script executes correctly. + cmd = "gnuplot /root/gnuplot-test.plot" + self.assertRunOk(cmd) + + # Our Gnuplot script is supposed to have generated a text + # output of the plot. We check this file contains the plot + # title set in the script. + exp_str = "Buildroot Test Plot" + cmd = f"grep -Fo '{exp_str}' /root/gnuplot-test.txt" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + self.assertEqual(out[0], exp_str) diff --git a/support/testing/tests/package/test_gnuplot/rootfs-overlay/root/gnuplot-test.plot b/support/testing/tests/package/test_gnuplot/rootfs-overlay/root/gnuplot-test.plot new file mode 100644 index 0000000000..04046be04b --- /dev/null +++ b/support/testing/tests/package/test_gnuplot/rootfs-overlay/root/gnuplot-test.plot @@ -0,0 +1,4 @@ +set term dumb +set output "gnuplot-test.txt" +set title "Buildroot Test Plot" +plot sin(x) From 1781340fa382466f64e048a3a3f5f468d46062a9 Mon Sep 17 00:00:00 2001 From: Leo Soares Date: Fri, 10 May 2024 13:41:02 +0100 Subject: [PATCH 5622/5754] package/janus-gateway: add staging installation Install janus to staging directory so that external plugins can be built. Signed-off-by: Leo Soares Signed-off-by: Thomas Petazzoni (cherry picked from commit f80b393d4506783bb2d27d3d97730040857ec4e1) Signed-off-by: Peter Korsgaard --- package/janus-gateway/janus-gateway.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/janus-gateway/janus-gateway.mk b/package/janus-gateway/janus-gateway.mk index 786bc211d4..0b4db458f6 100644 --- a/package/janus-gateway/janus-gateway.mk +++ b/package/janus-gateway/janus-gateway.mk @@ -10,6 +10,7 @@ JANUS_GATEWAY_LICENSE = GPL-3.0 with OpenSSL exception JANUS_GATEWAY_LICENSE_FILES = COPYING JANUS_GATEWAY_CPE_ID_VENDOR = meetecho JANUS_GATEWAY_CPE_ID_PRODUCT = janus +JANUS_GATEWAY_INSTALL_STAGING = YES # ding-libs provides the ini_config library JANUS_GATEWAY_DEPENDENCIES = host-pkgconf jansson libnice \ From c243e5549419068e7224a87b35534dcc417fd123 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Mon, 25 Mar 2024 14:41:04 +0200 Subject: [PATCH 5623/5754] package/cog: bump to version 0.18.3 This is a small bugfix release, with fixes for device scaling handling (i.e. HiDPI displays), and with support to toggle WebKit runtime features. Release notes: https://wpewebkit.org/release/cog-0.18.3.html Signed-off-by: Adrian Perez de Castro Signed-off-by: Thomas Petazzoni (cherry picked from commit e695da731ffe3a8b06526840055cb38c71b47fde) 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 387666969a..c0e99e14aa 100644 --- a/package/cog/cog.hash +++ b/package/cog/cog.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/cog-0.18.2.tar.xz.sums -md5 7fbfc2e19304132be0d73f5e5512151c cog-0.18.2.tar.xz -sha1 045294f7fa878db86e4b8a617ee4ac056a71cb75 cog-0.18.2.tar.xz -sha256 3c4237cff6323b8c3eaf52c6f3f6415b898a22c0127c6c396c1eaa6eef46c279 cog-0.18.2.tar.xz +# From https://wpewebkit.org/releases/cog-0.18.3.tar.xz.sums +md5 e457de5b5ac8994ae9971c0a5a22b8a2 cog-0.18.3.tar.xz +sha1 21df2a84c651b45e78d08e45e71631250a0078c3 cog-0.18.3.tar.xz +sha256 cd4ec937175a290ccd7c8ec398e4569aec04084cd94b11b2d83518778ba9d055 cog-0.18.3.tar.xz # Hashes for license files: sha256 e6c42d93c68b292bcccf6d2ec3e13da85df90b718ba27c2c2a01053a9d009252 COPYING diff --git a/package/cog/cog.mk b/package/cog/cog.mk index e96909f779..11c0e3b502 100644 --- a/package/cog/cog.mk +++ b/package/cog/cog.mk @@ -4,7 +4,7 @@ # ################################################################################ -COG_VERSION = 0.18.2 +COG_VERSION = 0.18.3 COG_SITE = https://wpewebkit.org/releases COG_SOURCE = cog-$(COG_VERSION).tar.xz COG_INSTALL_STAGING = YES From de7c48ade7ec6d36b3178dace42e16f3b17cf9d4 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Mon, 25 Mar 2024 16:39:15 +0200 Subject: [PATCH 5624/5754] package/libmanette: bump to version 0.2.7 This is a bugfix release which mainly imroves device detection, specially inside the Flatpak sandbox. Additionally, this version includes the patch for building as a static library, and the patch file can be removed. Release notes: https://gitlab.gnome.org/GNOME/libmanette/-/commit/27554bd118c08141134d4147cc34794057eb36e2 Signed-off-by: Adrian Perez de Castro Signed-off-by: Thomas Petazzoni (cherry picked from commit a4a90ee60332da775ce423e6f425ada65c4154da) Signed-off-by: Peter Korsgaard --- .checkpackageignore | 1 - ...n-hardcode-building-a-shared-library.patch | 34 ------------------- package/libmanette/libmanette.hash | 4 +-- package/libmanette/libmanette.mk | 2 +- 4 files changed, 3 insertions(+), 38 deletions(-) delete mode 100644 package/libmanette/0001-Meson-Un-hardcode-building-a-shared-library.patch diff --git a/.checkpackageignore b/.checkpackageignore index a5d56b3d8e..364701fe1a 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -642,7 +642,6 @@ package/libloki/0001-allow-to-install-to-a-specific-location-using-DESTDI.patch 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/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 diff --git a/package/libmanette/0001-Meson-Un-hardcode-building-a-shared-library.patch b/package/libmanette/0001-Meson-Un-hardcode-building-a-shared-library.patch deleted file mode 100644 index a93a1f7219..0000000000 --- a/package/libmanette/0001-Meson-Un-hardcode-building-a-shared-library.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 003c2e84d95357bbbef72fb395ef85f1650097a3 Mon Sep 17 00:00:00 2001 -From: Adrian Perez de Castro -Date: Fri, 23 Sep 2022 14:35:51 +0300 -Subject: [PATCH] Meson: Un-hardcode building a shared library - -Use library() instead of shared_library() to allow specifying which kind -of library to build with "meson setup --default-library ..." - -This allows more easily incorporating libmanette in an application e.g. -as a Meson subproject which gets built into a program as a static -library. - -Signed-off-by: Adrian Perez de Castro -[Upstream status: https://gitlab.gnome.org/GNOME/libmanette/-/merge_requests/84] ---- - src/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/meson.build b/src/meson.build -index c140cac..b71d090 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -63,7 +63,7 @@ if gudev.found() - libmanette_deps += [ gudev ] - endif - --libmanette_lib = shared_library( -+libmanette_lib = library( - libmanette_module, - libmanette_sources, - c_args: libmanette_c_args, --- -2.37.3 - diff --git a/package/libmanette/libmanette.hash b/package/libmanette/libmanette.hash index 96089f971a..b1da3c19f6 100644 --- a/package/libmanette/libmanette.hash +++ b/package/libmanette/libmanette.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/libmanette/0.2/libmanette-0.2.6.sha256sum -sha256 63653259a821ec7d90d681e52e757e2219d462828c9d74b056a5f53267636bac libmanette-0.2.6.tar.xz +# From https://download.gnome.org/sources/libmanette/0.2/libmanette-0.2.7.sha256sum +sha256 cddd5c02a131072c19c6cde6f2cb2cd57eae7dacb50d14c337efd980baa51a51 libmanette-0.2.7.tar.xz # Locally calculated sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libmanette/libmanette.mk b/package/libmanette/libmanette.mk index 10f2b8a466..42fb479795 100644 --- a/package/libmanette/libmanette.mk +++ b/package/libmanette/libmanette.mk @@ -5,7 +5,7 @@ ################################################################################ LIBMANETTE_VERSION_MAJOR = 0.2 -LIBMANETTE_VERSION = $(LIBMANETTE_VERSION_MAJOR).6 +LIBMANETTE_VERSION = $(LIBMANETTE_VERSION_MAJOR).7 LIBMANETTE_SOURCE = libmanette-$(LIBMANETTE_VERSION).tar.xz LIBMANETTE_SITE = https://download.gnome.org/sources/libmanette/$(LIBMANETTE_VERSION_MAJOR) LIBMANETTE_LICENSE = LGPL-2.1+ From 4e2b6908659772d7dcedd465754ac59338f64d07 Mon Sep 17 00:00:00 2001 From: Maxim Kochetkov Date: Sun, 10 Mar 2024 08:58:06 +0300 Subject: [PATCH 5625/5754] package/postgresql: bump version to 16.2 Release notes: https://www.postgresql.org/docs/release/16.2/ The hash of the license file is updated due to a change in copyright years: -Portions Copyright (c) 1996-2023, PostgreSQL Global Development Group +Portions Copyright (c) 1996-2024, PostgreSQL Global Development Group Signed-off-by: Maxim Kochetkov Signed-off-by: Thomas Petazzoni (cherry picked from commit 360d2da3fad01db3aa737f0efd4faffa53f243a4) Signed-off-by: Peter Korsgaard --- package/postgresql/postgresql.hash | 6 +++--- package/postgresql/postgresql.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/postgresql/postgresql.hash b/package/postgresql/postgresql.hash index cf859e3505..6c3f561f7e 100644 --- a/package/postgresql/postgresql.hash +++ b/package/postgresql/postgresql.hash @@ -1,4 +1,4 @@ -# From https://ftp.postgresql.org/pub/source/v16.1/postgresql-16.1.tar.bz2.sha256 -sha256 ce3c4d85d19b0121fe0d3f8ef1fa601f71989e86f8a66f7dc3ad546dd5564fec postgresql-16.1.tar.bz2 +# From https://ftp.postgresql.org/pub/source/v16.2/postgresql-16.2.tar.bz2.sha256 +sha256 446e88294dbc2c9085ab4b7061a646fa604b4bec03521d5ea671c2e5ad9b2952 postgresql-16.2.tar.bz2 # License file, Locally calculated -sha256 1a7d13c3ab31961b91ba256f77d6e82e0b54bf992253060fe93bdb5466df416a COPYRIGHT +sha256 9bf20ee493926a7e17a74bc7f05089fbc014269667b1540bc35a6b194a40c9de COPYRIGHT diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index 644f93d88a..0448e71892 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -4,7 +4,7 @@ # ################################################################################ -POSTGRESQL_VERSION = 16.1 +POSTGRESQL_VERSION = 16.2 POSTGRESQL_SOURCE = postgresql-$(POSTGRESQL_VERSION).tar.bz2 POSTGRESQL_SITE = https://ftp.postgresql.org/pub/source/v$(POSTGRESQL_VERSION) POSTGRESQL_LICENSE = PostgreSQL From 8364c23d91b557d18cb03cbbc65c7940ca57cbe5 Mon Sep 17 00:00:00 2001 From: Kilian Zinnecker Date: Sun, 10 Mar 2024 11:48:07 +0100 Subject: [PATCH 5626/5754] configs/rock5b: remove futile unsetting of BR2_LINUX_KERNEL_INTREE_DTS_NAME The rock5b_defconfig contained a # BR2_LINUX_KERNEL_INTREE_DTS_NAME is not set line. This caused check-dotconfig.py to throw a warning in the buildroot CI, because the explicit unsetting of the parameter is not taken on in the actual dotconfig, but instead the dotconfig will contain the line 'BR2_LINUX_KERNEL_INTREE_DTS_NAME=""'. This patch removes the parameter from the rock5b_defconfig. The resulting dotconfig from the original rock5b_defconfig and the rock5b_defconfig without the parameter is identical, but the check-dotconfig.py does not throw a warning anymore. Signed-off-by: Kilian Zinnecker Signed-off-by: Thomas Petazzoni (cherry picked from commit 0f0660ad2d0cb5fd6c399b5d74dd7b70bde4c23d) Signed-off-by: Peter Korsgaard --- configs/rock5b_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/rock5b_defconfig b/configs/rock5b_defconfig index 7175aa66bf..1ac42c8dc5 100644 --- a/configs/rock5b_defconfig +++ b/configs/rock5b_defconfig @@ -14,7 +14,6 @@ BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/radxa/kernel.git" BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="52f51a2b5ba178f331af62260d2da86d7472c14b" BR2_LINUX_KERNEL_DEFCONFIG="rockchip_linux" BR2_LINUX_KERNEL_DTS_SUPPORT=y -# BR2_LINUX_KERNEL_INTREE_DTS_NAME is not set BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/radxa/rock5b/rock5b.dts" BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT=y BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/radxa/rock5b/linux.fragment" From e83f6edf43baad06632927498f4ac0136f187229 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 10 Mar 2024 17:31:50 +0100 Subject: [PATCH 5627/5754] package/libuhttpd: disable -Werror Disable -Werror to fix the following build failure raised at least since bump to version 3.9.0 in commit e76d9868c940f2d19968077b97e79c49376aa464 and https://github.com/zhaojh329/libuhttpd/commit/81db1fa371bc80f40c1bfe60010e7d64bdf30b46: /home/autobuild/autobuild/instance-8/output-1/build/libuhttpd-3.14.1/src/file.c: In function '__serve_file': /home/autobuild/autobuild/instance-8/output-1/build/libuhttpd-3.14.1/src/file.c:322:50: error: format '%llu' expects argument of type 'long long unsigned int', but argument 4 has type '__off_t' {aka 'long int'} [-Werror=format=] 322 | conn->send_header(conn, "Content-Range", "bytes */%" PRIu64, st->st_size); | ^~~~~~~~~~~ ~~~~~~~~~~~ | | | __off_t {aka long int} In file included from /home/autobuild/autobuild/instance-8/output-1/build/libuhttpd-3.14.1/src/file.c:36: /home/autobuild/autobuild/instance-8/output-1/per-package/libuhttpd/host/mips64el-buildroot-linux-uclibc/sysroot/usr/include/inttypes.h:91:41: note: format string is defined here 91 | # define PRIu64 __PRI64_PREFIX "u" cc1: all warnings being treated as errors Fixes: e76d9868c940f2d19968077b97e79c49376aa464 - http://autobuild.buildroot.org/results/46349a1409f9cff027b462456078284459e75511 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 5961b219180c180ad816faa18681674d89eccaa9) Signed-off-by: Peter Korsgaard --- ...akeLists.txt-add-BUILD_WERROR-option.patch | 30 +++++++++++++++++++ package/libuhttpd/libuhttpd.mk | 1 + 2 files changed, 31 insertions(+) create mode 100644 package/libuhttpd/0003-CMakeLists.txt-add-BUILD_WERROR-option.patch diff --git a/package/libuhttpd/0003-CMakeLists.txt-add-BUILD_WERROR-option.patch b/package/libuhttpd/0003-CMakeLists.txt-add-BUILD_WERROR-option.patch new file mode 100644 index 0000000000..2e87014e87 --- /dev/null +++ b/package/libuhttpd/0003-CMakeLists.txt-add-BUILD_WERROR-option.patch @@ -0,0 +1,30 @@ +From c0f2260d8b7e435bce765e7ac91d51f1b349b87b Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 10 Mar 2024 13:43:12 +0100 +Subject: [PATCH] CMakeLists.txt: add BUILD_WERROR option + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/zhaojh329/libuhttpd/commit/c0f2260d8b7e435bce765e7ac91d51f1b349b87b +--- + CMakeLists.txt | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6fb9651..6719e5f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -7,7 +7,13 @@ include(CheckLibraryExists) + list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules/") + + add_definitions(-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64) +-add_compile_options(-O -Wall -Werror --std=gnu99) ++add_compile_options(-O -Wall --std=gnu99) ++ ++option(BUILD_WERROR "Build with -Werror" ON) ++ ++if(BUILD_WERROR) ++ add_compile_options(-Werror) ++endif() + + option(BUILD_STATIC "Build static library" OFF) + diff --git a/package/libuhttpd/libuhttpd.mk b/package/libuhttpd/libuhttpd.mk index 0d5306c6dd..78e0f42b22 100644 --- a/package/libuhttpd/libuhttpd.mk +++ b/package/libuhttpd/libuhttpd.mk @@ -10,6 +10,7 @@ LIBUHTTPD_LICENSE = MIT LIBUHTTPD_LICENSE_FILES = LICENSE LIBUHTTPD_INSTALL_STAGING = YES LIBUHTTPD_DEPENDENCIES = libev +LIBUHTTPD_CONF_OPTS = -DBUILD_WERROR=OFF ifeq ($(BR2_PACKAGE_OPENSSL),y) LIBUHTTPD_DEPENDENCIES += openssl From 9862d0c271ae08c26c37b12e8cf69afc38c68136 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 7 Mar 2024 11:40:08 +0100 Subject: [PATCH 5628/5754] package/gcc-bare-metal: add CPE variables cpe:2.3:a:gnu:gcc is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/A30F1DE7-139B-4296-AA87-A516462A1A81 Signed-off-by: Fabrice Fontaine Reviewed-by: Neal Frager Signed-off-by: Thomas Petazzoni (cherry picked from commit fccd228bace3ea1cd12b9e3f3a9f989e7f60edb3) Signed-off-by: Peter Korsgaard --- package/gcc-bare-metal/gcc-bare-metal.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/gcc-bare-metal/gcc-bare-metal.mk b/package/gcc-bare-metal/gcc-bare-metal.mk index f391f094fe..0dfc8d7a5c 100644 --- a/package/gcc-bare-metal/gcc-bare-metal.mk +++ b/package/gcc-bare-metal/gcc-bare-metal.mk @@ -11,6 +11,8 @@ HOST_GCC_BARE_METAL_SOURCE = gcc-$(HOST_GCC_BARE_METAL_VERSION).tar.xz HOST_GCC_BARE_METAL_LICENSE = GPL-2.0, GPL-3.0, LGPL-2.1, LGPL-3.0 HOST_GCC_BARE_METAL_LICENSE_FILES = COPYING COPYING3 COPYING.LIB COPYING3.LIB +HOST_GCC_BARE_METAL_CPE_ID_VENDOR = gnu +HOST_GCC_BARE_METAL_CPE_ID_PRODUCT = gcc HOST_GCC_BARE_METAL_DEPENDENCIES = \ host-binutils-bare-metal \ From 1669a9efc0ac16f9b3c4a1cb816055eda43af3fb Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 24 Mar 2024 22:30:42 +0100 Subject: [PATCH 5629/5754] package/redis-plus-plus: bump to version 1.3.12 https://github.com/sewenew/redis-plus-plus/releases/tag/1.3.11 https://github.com/sewenew/redis-plus-plus/releases/tag/1.3.12 https://github.com/sewenew/redis-plus-plus/compare/1.3.10...1.3.12 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit ee2a9a5e4167dc86511568bd5b136f00d099481f) Signed-off-by: Peter Korsgaard --- package/redis-plus-plus/redis-plus-plus.hash | 2 +- package/redis-plus-plus/redis-plus-plus.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/redis-plus-plus/redis-plus-plus.hash b/package/redis-plus-plus/redis-plus-plus.hash index 1d88365bc0..4cdc176025 100644 --- a/package/redis-plus-plus/redis-plus-plus.hash +++ b/package/redis-plus-plus/redis-plus-plus.hash @@ -1,3 +1,3 @@ # Locally calculated: -sha256 85d9d9ff84c873c4a14bd28bee569a1f311285fad8d4f2fb0e472f65d4bb842a redis-plus-plus-1.3.10.tar.gz +sha256 26c1e45cdbafe1af4d2cf756957b2268baab6f802b53bcdd435864620e2c03c7 redis-plus-plus-1.3.12.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 index a286e2de33..167d8bfa01 100644 --- a/package/redis-plus-plus/redis-plus-plus.mk +++ b/package/redis-plus-plus/redis-plus-plus.mk @@ -4,7 +4,7 @@ # ################################################################################ -REDIS_PLUS_PLUS_VERSION = 1.3.10 +REDIS_PLUS_PLUS_VERSION = 1.3.12 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 From fb1b33c040b787fd5f674d8c62fa40838089a887 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Zwing?= Date: Tue, 26 Mar 2024 18:28:22 +0100 Subject: [PATCH 5630/5754] package/libkrb5: security bump to 1.21.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes the following security issues: - CVE-2023-36054: lib/kadm5/kadm_rpc_xdr.c in MIT Kerberos 5 (aka krb5) before 1.20.2 and 1.21.x before 1.21.1 frees an uninitialized pointer - CVE-2023-39975: kdc/do_tgs_req.c in MIT Kerberos 5 (aka krb5) 1.21 before 1.21.2 has a double free that is reachable if an authenticated user can trigger an authorization-data handling failure Signed-off-by: André Zwing Signed-off-by: Thomas Petazzoni (cherry picked from commit dd1ea28b07e9b50facbee4aee0254631b9b4fe14) [Peter: mark as security bump, add CVE details] Signed-off-by: Peter Korsgaard --- package/libkrb5/libkrb5.hash | 2 +- package/libkrb5/libkrb5.mk | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/libkrb5/libkrb5.hash b/package/libkrb5/libkrb5.hash index 22178d0dec..02c0e3396e 100644 --- a/package/libkrb5/libkrb5.hash +++ b/package/libkrb5/libkrb5.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 69f8aaff85484832df67a4bbacd99b9259bd95aab8c651fbbe65cdc9620ea93b krb5-1.21.tar.gz +sha256 9560941a9d843c0243a71b17a7ac6fe31c7cebb5bce3983db79e52ae7e850491 krb5-1.21.2.tar.gz # Hash for license file: sha256 0d5373486138cb176c063db98274b4c4ab6ef3518c4191360736384b780306c2 NOTICE diff --git a/package/libkrb5/libkrb5.mk b/package/libkrb5/libkrb5.mk index c58763eddd..08bc74eb34 100644 --- a/package/libkrb5/libkrb5.mk +++ b/package/libkrb5/libkrb5.mk @@ -4,8 +4,9 @@ # ################################################################################ -LIBKRB5_VERSION = 1.21 -LIBKRB5_SITE = https://web.mit.edu/kerberos/dist/krb5/$(LIBKRB5_VERSION) +LIBKRB5_VERSION_MAJOR = 1.21 +LIBKRB5_VERSION = $(LIBKRB5_VERSION_MAJOR).2 +LIBKRB5_SITE = https://web.mit.edu/kerberos/dist/krb5/$(LIBKRB5_VERSION_MAJOR) LIBKRB5_SOURCE = krb5-$(LIBKRB5_VERSION).tar.gz LIBKRB5_SUBDIR = src LIBKRB5_LICENSE = MIT, BSD-2-Clause, BSD-3-Clause, BSD-4-Clause, others From 229d846db0f15bd94f7d1c055eb8bcfffbe76a12 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 7 Mar 2024 15:32:27 +0100 Subject: [PATCH 5631/5754] package/rtl8189fs: bump to latest git commit Bump to latest git commit to fix the following powerpc64 build failure raised at least since commit 25956b29e4d63f599b9baf7298f69538ba2f22fa thanks to https://github.com/jwrdegoede/rtl8189ES_linux/commit/c7bf7590bc0d7252005fd0496898ad420a85e1ae: In file included from /home/autobuild/autobuild/instance-7/output-1/build/rtl8189fs-5d523593f41c0b8d723c6aa86b217ee1d0965786/./include/drv_types.h:30, from /home/autobuild/autobuild/instance-7/output-1/build/rtl8189fs-5d523593f41c0b8d723c6aa86b217ee1d0965786/./core/rtw_cmd.c:17: /home/autobuild/autobuild/instance-7/output-1/build/rtl8189fs-5d523593f41c0b8d723c6aa86b217ee1d0965786/./include/wifi.h:459:32: error: conflicting types for 'get_ra'; have 'unsigned char *(unsigned char *)' 459 | __inline static unsigned char *get_ra(unsigned char *pframe) | ^~~~~~ Fixes: 25956b29e4d63f599b9baf7298f69538ba2f22fa - http://autobuild.buildroot.org/results/83153ed38a583ce2712df9b142ac3fc55a8413e3 - http://autobuild.buildroot.org/results/63186c7adb5ecc8b8a16a6ae641ecfb9c03478bd Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 0dd00cbce5d9d2eb4f5232080459ba32416192ef) 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 e3d63ac4b0..2746194f43 100644 --- a/package/rtl8189fs/rtl8189fs.hash +++ b/package/rtl8189fs/rtl8189fs.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 c92e1d800258665835922c1e927708f7a0477a1cbb281dc98ba5d33d5e3271ee rtl8189fs-5d523593f41c0b8d723c6aa86b217ee1d0965786.tar.gz +sha256 b28c15f4631f4151ea6fca96d59aec931766af49ccb7a0d5e1080fc41a323713 rtl8189fs-eb51e021b0e1b6f94a4b49da3f4ee5c5fb20b715.tar.gz diff --git a/package/rtl8189fs/rtl8189fs.mk b/package/rtl8189fs/rtl8189fs.mk index 86a2ac734b..174bb346ca 100644 --- a/package/rtl8189fs/rtl8189fs.mk +++ b/package/rtl8189fs/rtl8189fs.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8189FS_VERSION = 5d523593f41c0b8d723c6aa86b217ee1d0965786 +RTL8189FS_VERSION = eb51e021b0e1b6f94a4b49da3f4ee5c5fb20b715 RTL8189FS_SITE = $(call github,jwrdegoede,rtl8189ES_linux,$(RTL8189FS_VERSION)) RTL8189FS_LICENSE = GPL-2.0 From 38abde13aa16342a3273dbddd29511f7c474b440 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 7 Mar 2024 11:38:48 +0100 Subject: [PATCH 5632/5754] package/binutils-bare-metal: fix CPE ID Commit 11b439ce1bd28506051fff14646f8bbdbbbe58d8 forgot to set HOST_BINUTILS_BARE_METAL_CPE_ID_PRODUCT Signed-off-by: Fabrice Fontaine Reviewed-by: Neal Frager Signed-off-by: Thomas Petazzoni (cherry picked from commit 0daf2fc73d82ccb7c3e4018fd1b863232dc35fe5) Signed-off-by: Peter Korsgaard --- package/binutils-bare-metal/binutils-bare-metal.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/binutils-bare-metal/binutils-bare-metal.mk b/package/binutils-bare-metal/binutils-bare-metal.mk index d55c2d081e..778a5235f4 100644 --- a/package/binutils-bare-metal/binutils-bare-metal.mk +++ b/package/binutils-bare-metal/binutils-bare-metal.mk @@ -11,6 +11,7 @@ HOST_BINUTILS_BARE_METAL_SOURCE = binutils-$(HOST_BINUTILS_BARE_METAL_VERSION).t HOST_BINUTILS_BARE_METAL_LICENSE = GPL-3.0+, libiberty LGPL-2.1+ HOST_BINUTILS_BARE_METAL_LICENSE_FILES = COPYING3 COPYING.LIB HOST_BINUTILS_BARE_METAL_CPE_ID_VENDOR = gnu +HOST_BINUTILS_BARE_METAL_CPE_ID_PRODUCT = binutils HOST_BINUTILS_BARE_METAL_DEPENDENCIES = host-zlib From 976ad4a1c52b7416bdd588e5888066ff66807c40 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 7 Mar 2024 11:16:38 +0100 Subject: [PATCH 5633/5754] package/zxing-cpp: needs threads threads are mandatory since switch to an active fork in commit 456a7398316655ad0b669635f580e4887c24a700: CMake Error at /home/buildroot/autobuild/run/instance-1/output-1/host/share/cmake-3.28/Modules/FindPackageHandleStandardArgs.cmake:230 (message): Could NOT find Threads (missing: Threads_FOUND) Fixes: 456a7398316655ad0b669635f580e4887c24a700 - http://autobuild.buildroot.org/results/b600582d9c5407c7324af70d61fa5c1f96d929f6 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 4c40af98382feda648ff54b8e733eb7307f86164) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-bad/Config.in | 5 +++-- package/zxing-cpp/Config.in | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in index d2c60ec9ce..e85ec16784 100644 --- a/package/gstreamer1/gst1-plugins-bad/Config.in +++ b/package/gstreamer1/gst1-plugins-bad/Config.in @@ -746,11 +746,12 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_ZXING depends on !BR2_STATIC_LIBS # zxing-cpp depends on BR2_USE_WCHAR # zxing-cpp depends on BR2_INSTALL_LIBSTDCPP # zxing-cpp + depends on BR2_TOOLCHAIN_HAS_THREADS # zxing-cpp select BR2_PACKAGE_ZXING_CPP -comment "zxing plugin needs a toolchain w/ C++, wchar, dynamic library" +comment "zxing plugin needs a toolchain w/ C++, wchar, dynamic library, threads" depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || \ - !BR2_INSTALL_LIBSTDCPP + !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS endif diff --git a/package/zxing-cpp/Config.in b/package/zxing-cpp/Config.in index 0d8b79538d..b72a00ec35 100644 --- a/package/zxing-cpp/Config.in +++ b/package/zxing-cpp/Config.in @@ -1,12 +1,13 @@ -comment "zxing-cpp needs a toolchain w/ C++, wchar, dynamic library" +comment "zxing-cpp needs a toolchain w/ C++, wchar, dynamic library, threads" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ - BR2_STATIC_LIBS + BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS config BR2_PACKAGE_ZXING_CPP bool "zxing-cpp" depends on !BR2_STATIC_LIBS depends on BR2_USE_WCHAR depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_STB select BR2_PACKAGE_PYTHON_PYBIND if BR2_PACKAGE_PYTHON3 help From f3248d0b5c0d59eb3543c9b6d54b7bfe30367b22 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 7 Mar 2024 11:25:35 +0100 Subject: [PATCH 5634/5754] package/zxing-cpp: drop opencv and qt dependencies opencv and qt handling can be dropped since switch to an active fork in commit 456a7398316655ad0b669635f580e4887c24a700 as they are only used when examples are enabled resulting in the following warning: CMake Warning: Manually-specified variables were not used by the project: BUILD_DOC BUILD_DOCS BUILD_EXAMPLE BUILD_TEST BUILD_TESTING BUILD_TESTS CMAKE_DISABLE_FIND_PACKAGE_OpenCV CMAKE_DISABLE_FIND_PACKAGE_Qt5 While at it, also drop BUILD_EXAMPLES which is already passed by pkg-cmake.mk Fixes: 456a7398316655ad0b669635f580e4887c24a700 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit fd64c544d31fbfa282306007fb3c151dd864146f) Signed-off-by: Peter Korsgaard --- package/zxing-cpp/zxing-cpp.mk | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/package/zxing-cpp/zxing-cpp.mk b/package/zxing-cpp/zxing-cpp.mk index b0cadf1b1f..86a1ef9680 100644 --- a/package/zxing-cpp/zxing-cpp.mk +++ b/package/zxing-cpp/zxing-cpp.mk @@ -14,23 +14,10 @@ ZXING_CPP_DEPENDENCIES = host-pkgconf stb ZXING_CPP_CONF_OPTS = \ -DBUILD_READERS=ON \ -DBUILD_WRITERS=ON \ - -DBUILD_EXAMPLES=OFF \ -DBUILD_BLACKBOX_TESTS=OFF \ -DBUILD_UNIT_TESTS=OFF \ -DBUILD_DEPENDENCIES=LOCAL -ifeq ($(BR2_PACKAGE_OPENCV3_LIB_HIGHGUI)$(BR2_PACKAGE_OPENCV4_LIB_HIGHGUI),y) -ifeq ($(BR2_PACKAGE_OPENCV3),y) -ZXING_CPP_DEPENDENCIES += opencv3 -endif -ifeq ($(BR2_PACKAGE_OPENCV4),y) -ZXING_CPP_DEPENDENCIES += opencv4 -endif -ZXING_CPP_CONF_OPTS += -DCMAKE_REQUIRE_FIND_PACKAGE_OpenCV=TRUE -else -ZXING_CPP_CONF_OPTS += -DCMAKE_DISABLE_FIND_PACKAGE_OpenCV=TRUE -endif - ifeq ($(BR2_PACKAGE_PYTHON3)$(BR2_PACKAGE_PYTHON_PYBIND),yy) ZXING_CPP_DEPENDENCIES += python3 python-pybind ZXING_CPP_CONF_OPTS += \ @@ -41,17 +28,4 @@ else ZXING_CPP_CONF_OPTS += -DBUILD_PYTHON_MODULE=OFF endif -ifeq ($(BR2_PACKAGE_QT5BASE),y) -ZXING_CPP_DEPENDENCIES += qt5base -ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK)$(BR2_PACKAGE_QT5MULTIMEDIA),yy) -ZXING_CPP_DEPENDENCIES += qt5declarative qt5multimedia -endif -# Only set qt5 as required when all optional qt5 dependencies are present -ifeq ($(BR2_PACKAGE_QT5BASE_GUI)$(BR2_PACKAGE_QT5DECLARATIVE_QUICK)$(BR2_PACKAGE_QT5MULTIMEDIA),yyy) -ZXING_CPP_CONF_OPTS += -DCMAKE_REQUIRE_FIND_PACKAGE_Qt5=TRUE -endif -else -ZXING_CPP_CONF_OPTS += -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=TRUE -endif - $(eval $(cmake-package)) From 188d0e5f6f3685db4c0228e7a91a876a5f887465 Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Fri, 10 May 2024 23:55:09 +0000 Subject: [PATCH 5635/5754] support/testing: add zip test Signed-off-by: Brandon Maier Signed-off-by: Thomas Petazzoni (cherry picked from commit 23ef540288e86c50d24f9a7ab8e1e2e66500e024) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + support/testing/tests/package/test_zip.py | 15 +++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 support/testing/tests/package/test_zip.py diff --git a/DEVELOPERS b/DEVELOPERS index 823bbad88d..e5f5f56881 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -534,6 +534,7 @@ F: package/python-pysensors/ F: package/qoriq-fm-ucode/ F: package/unifdef/ F: package/vmtouch/ +F: support/testing/tests/package/test_zip.py N: Brock Williams F: package/pdmenu/ diff --git a/support/testing/tests/package/test_zip.py b/support/testing/tests/package/test_zip.py new file mode 100644 index 0000000000..eb2e016988 --- /dev/null +++ b/support/testing/tests/package/test_zip.py @@ -0,0 +1,15 @@ +from tests.package.test_compressor_base import TestCompressorBase + + +class TestZip(TestCompressorBase): + __test__ = True + config = TestCompressorBase.config + \ + """ + BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y + BR2_PACKAGE_ZIP=y + BR2_PACKAGE_UNZIP=y + """ + compress_cmd = "/bin/sh -c 'zip $1.zip $1' /bin/sh" + decompress_cmd = "unzip" + check_integrity_cmd = "unzip -t" + compressed_file_ext = ".zip" From 3326cbd2e528170c1d86d3cbe4c7853467dbfa47 Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Fri, 10 May 2024 23:55:10 +0000 Subject: [PATCH 5636/5754] package/zip: fix build with GCC 14 Builds with GCC 14 print the following error > zip.h:726:10: error: conflicting types for 'memset'; have 'char *(char *, int, unsigned int)' This is because with GCC 14, Zip incorrectly detects that the memset functions exist. Which enables the ZMEM flag and declares its own version of memset. This is because the ./unix/configure script attempts to compile a C file using 'memset' but it does not include the . This was allowed in gnu89, but in GCC 14 -Werror=implicit-function-declaration is enabled by default[1]. We forcefully set '-std=gnu89' so that Zip will compile everything against gnu89, which suppresses the warning. [1] https://gcc.gnu.org/gcc-14/porting_to.html#warnings-as-errors Signed-off-by: Brandon Maier Signed-off-by: Thomas Petazzoni (cherry picked from commit 29c6fe13d37ab1a3305005b42441a49afe4d1895) Signed-off-by: Peter Korsgaard --- package/zip/zip.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/zip/zip.mk b/package/zip/zip.mk index 67958a4a66..3aa59e7ba7 100644 --- a/package/zip/zip.mk +++ b/package/zip/zip.mk @@ -31,7 +31,7 @@ ZIP_TARGET_CFLAGS = \ define ZIP_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \ CFLAGS="$(ZIP_TARGET_CFLAGS) $(ZIP_CFLAGS)" \ - AS="$(TARGET_CC) -c" \ + CC="$(TARGET_CC) -std=gnu89" AS="$(TARGET_CC) -c" \ -f unix/Makefile generic endef @@ -43,7 +43,7 @@ endef define HOST_ZIP_BUILD_CMDS $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) \ CFLAGS="$(HOST_CFLAGS) $(ZIP_CFLAGS)" \ - AS="$(HOSTCC) -c" \ + CC="$(HOSTCC) -std=gnu89" AS="$(HOSTCC) -c" \ -f unix/Makefile generic endef From 85ba6c5c09595b335a09869ee052defa1b5e4b85 Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Fri, 10 May 2024 22:07:04 +0000 Subject: [PATCH 5637/5754] package/gcc: add patch to fix gcc 11 build warning When building GCC 11 with GCC 14 the following error occurs > ../../../libiberty/simple-object-mach-o.c:1231:17: error: passing argument 1 of 'set_32' from incompatible pointer type [-Wincompatible-pointer-types] This was fixed upstream in GCC12[1]. It is applied to the GCC 11 release branch[2], but has not been officially released yet. [1] https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=38757aa88735ab2e511bc428e2407a5a5e9fa0be [2] https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=02cd761eb1198df50453b2e39653f48053609ffc Signed-off-by: Brandon Maier Signed-off-by: Thomas Petazzoni (cherry picked from commit 8fa9ad7e4f2212e3ff934695eb36e9dc2cb9c2b8) Signed-off-by: Peter Korsgaard --- ...libiberty-Darwin-Fix-a-build-warning.patch | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 package/gcc/11.4.0/0009-libiberty-Darwin-Fix-a-build-warning.patch diff --git a/package/gcc/11.4.0/0009-libiberty-Darwin-Fix-a-build-warning.patch b/package/gcc/11.4.0/0009-libiberty-Darwin-Fix-a-build-warning.patch new file mode 100644 index 0000000000..3c694a89fa --- /dev/null +++ b/package/gcc/11.4.0/0009-libiberty-Darwin-Fix-a-build-warning.patch @@ -0,0 +1,37 @@ +From d1fc3505cc09d0ee02abbb732eafc91967c3ac07 Mon Sep 17 00:00:00 2001 +From: Iain Sandoe +Date: Mon, 23 Aug 2021 17:34:43 +0100 +Subject: [PATCH] libiberty, Darwin: Fix a build warning. + +r12-3005-g220c410162ebece4f missed a cast for the set_32 call. +Fixed thus. + +Signed-off-by: Iain Sandoe + +libiberty/ChangeLog: + + * simple-object-mach-o.c (simple_object_mach_o_write_segment): + Cast the first argument to set_32 as needed. + +Upstream: https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=38757aa88735ab2e511bc428e2407a5a5e9fa0be +Signed-off-by: Brandon Maier +--- + libiberty/simple-object-mach-o.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libiberty/simple-object-mach-o.c b/libiberty/simple-object-mach-o.c +index 72b69d19c21..a8869e7c639 100644 +--- a/libiberty/simple-object-mach-o.c ++++ b/libiberty/simple-object-mach-o.c +@@ -1228,7 +1228,7 @@ simple_object_mach_o_write_segment (simple_object_write *sobj, int descriptor, + /* Swap the indices, if required. */ + + for (i = 0; i < (nsects_in * 4); ++i) +- set_32 (&index[i], index[i]); ++ set_32 ((unsigned char *) &index[i], index[i]); + + sechdr_offset += sechdrsize; + +-- +2.45.0 + From 355accc33a316d67d9d0139fb42224a50891df97 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Wed, 21 Feb 2024 11:23:04 -0700 Subject: [PATCH 5638/5754] package/swupdate: bump to version 2023.12.1 Signed-off-by: James Hilliard Reviewed-by: Giulio Benetti Signed-off-by: Thomas Petazzoni (cherry picked from commit dfb6b104eabf9cbdb1b8d17cfb609c84f1fad3c6) Signed-off-by: Peter Korsgaard --- package/swupdate/swupdate.hash | 2 +- package/swupdate/swupdate.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/swupdate/swupdate.hash b/package/swupdate/swupdate.hash index c19a82304f..19ef3a2724 100644 --- a/package/swupdate/swupdate.hash +++ b/package/swupdate/swupdate.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 ce24032300e2b6a6faa3d22e49f981fd90f04ac6f5d7e802166824b0cd5ca669 swupdate-2023.12.tar.gz +sha256 89ec8926d66627255fe689ed96ad8d30f5c539315956dacf9890e308095dee3b swupdate-2023.12.1.tar.gz sha256 4cf04ed34ff0ebbf5c71345b56e6af5093fc17206364cca0ebbae92ef3940683 LICENSES/BSD-1-Clause.txt sha256 e27a3e87706b3aa5ff2e50eaafe2e6ed5397fbf2d7679eaf444a6d000518a3a6 LICENSES/BSD-3-Clause.txt sha256 0558101984550fa84d1d13c2af11d116c20079d2be58711e8d99cadce7009192 LICENSES/CC0-1.0.txt diff --git a/package/swupdate/swupdate.mk b/package/swupdate/swupdate.mk index ca8c140886..3b78c160f8 100644 --- a/package/swupdate/swupdate.mk +++ b/package/swupdate/swupdate.mk @@ -4,7 +4,7 @@ # ################################################################################ -SWUPDATE_VERSION = 2023.12 +SWUPDATE_VERSION = 2023.12.1 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 \ From bacb1c67eca1c007a23a134db1830a04482a0855 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fl=C3=A1vio=20Tapaj=C3=B3s?= Date: Fri, 23 Feb 2024 13:57:47 -0300 Subject: [PATCH 5639/5754] configs/asus_tinker-s_rk3288: bump kernel to 6.1.79 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit latest kernel LTS (6.6.x) is facing problems with the sdcard Signed-off-by: Flávio Tapajós Signed-off-by: Thomas Petazzoni (cherry picked from commit 3bf6ec888bc1b2c65576bd678d5c0f5201f18e3b) Signed-off-by: Peter Korsgaard --- configs/asus_tinker-s_rk3288_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/asus_tinker-s_rk3288_defconfig b/configs/asus_tinker-s_rk3288_defconfig index de03336cbb..2ed2c4f712 100644 --- a/configs/asus_tinker-s_rk3288_defconfig +++ b/configs/asus_tinker-s_rk3288_defconfig @@ -23,7 +23,7 @@ BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl-dtb.bin tpl/u-boot-tpl.bin" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.72" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.79" BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="rk3288-tinker-s" From 7d89442eeed37aea8efd93e9806ee87128575e5c Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 12 May 2024 00:17:19 +0200 Subject: [PATCH 5640/5754] docs/website/index.html: refer to Gitlab and lore Our index.html page still points to git.buildroot.net as the Git repository, and to the defunct gmane for the mailing list activity. Fix these by pointing to Gitlab and lore respectively. Signed-off-by: Thomas Petazzoni (cherry picked from commit 3e3bcd633875db0e1f366e86fe8763b5b2d9112e) Signed-off-by: Peter Korsgaard --- docs/website/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/website/index.html b/docs/website/index.html index 300adbb83d..d68436c721 100644 --- a/docs/website/index.html +++ b/docs/website/index.html @@ -133,14 +133,14 @@

                                                              Buildroot is an open source project: many developers contribute to it daily.
                                                              -
                                                              Recent commits
                                                              +
                                                              Recent commits
                                                              -
                                                              Recent discussions
                                                              +
                                                              Recent discussions
                                                              From 21d699511580582d0090f0d848fd85c28abc73ca Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Sat, 11 May 2024 20:13:52 +0200 Subject: [PATCH 5641/5754] package/sscep: fix linking error with musl-libc The patch fixes the following linking failure: /home/buildroot/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/i586-buildroot-linux-musl/9.3.0/../../../../i586-buildroot-linux-musl/bin/ld: /home/buildroot/instance-0/output-1/host/i586-buildroot-linux-musl/sysroot/lib/libc.a(getopt.o): in function `getopt': getopt.c:(.text.getopt+0x0): multiple definition of `getopt'; src/getopt.o:getopt.c:(.text+0x0): first defined here /home/buildroot/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/i586-buildroot-linux-musl/9.3.0/../../../../i586-buildroot-linux-musl/bin/ld: /home/buildroot/instance-0/output-1/host/i586-buildroot-linux-musl/sysroot/lib/libc.a(getopt.o):(.data.optind+0x0): multiple definition of `optind'; src/getopt.o:(.data+0x0): first defined here Fixes: - http://autobuild.buildroot.net/results/d5b1b4e5e9d9c8eca5e75c345db4d1f3f0cd84ed Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni (cherry picked from commit 5a7c40bd1c10d62fc7305db5ac7d1842d7099bb6) Signed-off-by: Peter Korsgaard --- ...-getopt-linking-error-with-musl-libc.patch | 67 +++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 package/sscep/0002-Fix-getopt-linking-error-with-musl-libc.patch diff --git a/package/sscep/0002-Fix-getopt-linking-error-with-musl-libc.patch b/package/sscep/0002-Fix-getopt-linking-error-with-musl-libc.patch new file mode 100644 index 0000000000..ebb9985ef3 --- /dev/null +++ b/package/sscep/0002-Fix-getopt-linking-error-with-musl-libc.patch @@ -0,0 +1,67 @@ +From db7fab775d03438b4cfce6b49fab2d3176ecb1d3 Mon Sep 17 00:00:00 2001 +From: Dario Binacchi +Date: Sat, 11 May 2024 19:38:01 +0200 +Subject: [PATCH] Fix getopt linking error with musl-libc + +The buildroot project, to which the sscep application was added, has +configurations that raise the following linking error: +buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/i586-buildroot-linux-musl/9.3.0/../../../../i586-buildroot-linux-musl/bin/ld: buildroot/output/host/i586-buildroot-linux-musl/sysroot/lib/libc.a(getopt.o): in function `getopt': +getopt.c:(.text.getopt+0x0): multiple definition of `getopt'; src/getopt.o:getopt.c:(.text+0x0): first defined here +buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/i586-buildroot-linux-musl/9.3.0/../../../../i586-buildroot-linux-musl/bin/ld: buildroot/output/host/i586-buildroot-linux-musl/sysroot/lib/libc.a(getopt.o):(.data.optind+0x0): multiple definition of `optind'; src/getopt.o:(.data+0x0): first defined here +collect2: error: ld returned 1 exit status + +The commit 65561b53344b8 ("Fix getopt linking error") actually fixed the +linking error only for uclibc, but not for musl-libc. The patch fixes +the error for both uclibc and musl-libc. + +Link: http://autobuild.buildroot.net/results/d5b1b4e5e9d9c8eca5e75c345db4d1f3f0cd84ed/build-end.log +Signed-off-by: Dario Binacchi +Upstream: https://github.com/certnanny/sscep/pull/181 +--- + configure.ac | 2 +- + src/getopt.c | 12 ++---------- + 2 files changed, 3 insertions(+), 11 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 9f3ee15686a2..7a968d97dcaa 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -34,7 +34,7 @@ AC_TYPE_SIZE_T + # Checks for library functions. + AC_FUNC_MALLOC + AC_FUNC_REALLOC +-AC_CHECK_FUNCS([alarm gethostbyname memset socket strchr strdup strstr]) ++AC_CHECK_FUNCS([alarm gethostbyname getopt memset socket strchr strdup strstr]) + + AC_CONFIG_FILES([Makefile]) + AC_SUBST([LIBTOOL_DEPS]) +diff --git a/src/getopt.c b/src/getopt.c +index 0109406ba4ac..8793052845ed 100644 +--- a/src/getopt.c ++++ b/src/getopt.c +@@ -31,15 +31,7 @@ + #include + #include + +-#define GETOPT_INTERFACE_VERSION 2 +-#if !defined _LIBC && defined __GLIBC__ && __GLIBC__ >= 2 +-# include +-# if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION +-# define ELIDE_CODE +-# endif +-#endif +- +-#ifndef ELIDE_CODE ++#ifndef HAVE_GETOPT + + char* optarg; + int optopt; +@@ -237,4 +229,4 @@ int getopt_long(int argc, char* const argv[], const char* optstring, + return retval; + } + +-#endif /* Not ELIDE_CODE. */ ++#endif /* HAVE_GETOPT */ +-- +2.43.0 + From 38b224d6028aa6a640fb3db3433f54fad649d1c6 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 8 Apr 2024 21:31:39 +0200 Subject: [PATCH 5642/5754] package/dmraid: set -fPIC Add -fPIC to CFLAGS to fix the following build failure raised since commit de6415ad9c35b2013af1f1821bcac12ba3959674: /home/autobuild/autobuild/instance-5/output-1/host/lib/gcc/x86_64-buildroot-linux-gnu/12.3.0/../../../../x86_64-buildroot-linux-gnu/bin/ld: misc/misc.o: warning: relocation against `stdout@@GLIBC_2.2.5' in read-only section `.text' /home/autobuild/autobuild/instance-5/output-1/host/lib/gcc/x86_64-buildroot-linux-gnu/12.3.0/../../../../x86_64-buildroot-linux-gnu/bin/ld: log/log.o: relocation R_X86_64_PC32 against symbol `stdout@@GLIBC_2.2.5' can not be used when making a shared object; recompile with -fPIC Fixes: de6415ad9c35b2013af1f1821bcac12ba3959674 - http://autobuild.buildroot.org/results/0349c6bfd66f5e50429e4a5cc07fb7abf2b07345 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 880066bad68bf881cc0636cd51c177625d4fa837) Signed-off-by: Peter Korsgaard --- package/dmraid/dmraid.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/dmraid/dmraid.mk b/package/dmraid/dmraid.mk index 9a78c2ae07..97c729aa70 100644 --- a/package/dmraid/dmraid.mk +++ b/package/dmraid/dmraid.mk @@ -13,7 +13,7 @@ DMRAID_MAKE = $(MAKE1) DMRAID_INSTALL_STAGING = YES DMRAID_LICENSE = GPL-2.0 DMRAID_LICENSE_FILES = $(DMRAID_SUBDIR)/LICENSE_GPL $(DMRAID_SUBDIR)/LICENSE -DMRAID_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) +DMRAID_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) CFLAGS="$(TARGET_CFLAGS) -fPIC" DMRAID_DEPENDENCIES = lvm2 From 10f0d0a74206b5f8c29415003c38bb231563a97c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20B=C3=B6h?= Date: Thu, 23 Feb 2023 21:17:33 +0100 Subject: [PATCH 5643/5754] package/gr-osmosdr: add missing host-python-six dependency to python support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Osmosdr failed to build docs when python support is enabled. [ 41%] Copying osmosdr docstring templates as pybind headers ... Traceback (most recent call last): File "/home/martb/Schreibtisch/DiscoSAT/satos/output/build/gr-osmosdr-0.2.4/docs/doxygen/update_pydoc.py", line 22, in from doxyxml import DoxyIndex, DoxyClass, DoxyFriend, DoxyFunction, DoxyFile File "/home/martb/Schreibtisch/DiscoSAT/satos/output/build/gr-osmosdr-0.2.4/docs/doxygen/doxyxml/__init__.py", line 69, in from .doxyindex import DoxyIndex, DoxyFunction, DoxyParam, DoxyClass, DoxyFile, DoxyNamespace, DoxyGroup, DoxyFriend, DoxyOther File "/home/martb/Schreibtisch/DiscoSAT/satos/output/build/gr-osmosdr-0.2.4/docs/doxygen/doxyxml/doxyindex.py", line 31, in from .generated import index File "/home/martb/Schreibtisch/DiscoSAT/satos/output/build/gr-osmosdr-0.2.4/docs/doxygen/doxyxml/generated/index.py", line 13, in from . import compound File "/home/martb/Schreibtisch/DiscoSAT/satos/output/build/gr-osmosdr-0.2.4/docs/doxygen/doxyxml/generated/compound.py", line 15, in from . import compoundsuper as supermod File "/home/martb/Schreibtisch/DiscoSAT/satos/output/build/gr-osmosdr-0.2.4/docs/doxygen/doxyxml/generated/compoundsuper.py", line 15, in import six ModuleNotFoundError: No module named 'six' make[2]: *** [python/bindings/CMakeFiles/osmosdr_docstrings.dir/build.make:73: python/bindings/docstring_status] Fehler 1 make[1]: *** [CMakeFiles/Makefile2:332: python/bindings/CMakeFiles/osmosdr_docstrings.dir/all] Fehler 2 Fixes: http://autobuild.buildroot.net/results/b60e339e52fbc7ed7607a94381aaab6ec64b7a99/ Signed-off-by: Martin Böh Signed-off-by: Thomas Petazzoni (cherry picked from commit cfda1f0b87ebfb7686b82f319c531d4d28fdfd67) Signed-off-by: Peter Korsgaard --- package/gr-osmosdr/gr-osmosdr.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gr-osmosdr/gr-osmosdr.mk b/package/gr-osmosdr/gr-osmosdr.mk index 8491c005d8..316ed80887 100644 --- a/package/gr-osmosdr/gr-osmosdr.mk +++ b/package/gr-osmosdr/gr-osmosdr.mk @@ -24,7 +24,7 @@ GR_OSMOSDR_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_GNURADIO_PYTHON),y) GR_OSMOSDR_CONF_OPTS += -DENABLE_PYTHON=ON -GR_OSMOSDR_DEPENDENCIES += python3 +GR_OSMOSDR_DEPENDENCIES += python3 host-python-six else GR_OSMOSDR_CONF_OPTS += -DENABLE_PYTHON=OFF endif From 51dc052d1d488e3eec52d9bfde0270aa8845ca4c Mon Sep 17 00:00:00 2001 From: Stefan Ott Date: Wed, 13 Mar 2024 20:17:36 +0100 Subject: [PATCH 5644/5754] arch/Config.in.x86: enable SSE2 on Pentium M The Pentium M does support SSE2 so it would make sense to enable it. Signed-off-by: Stefan Ott Signed-off-by: Thomas Petazzoni (cherry picked from commit 4c561a7adf95d33acddabcd72e6155c8c05bbbfe) Signed-off-by: Peter Korsgaard --- arch/Config.in.x86 | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 index 49823fe885..93a223b7ae 100644 --- a/arch/Config.in.x86 +++ b/arch/Config.in.x86 @@ -72,6 +72,7 @@ config BR2_x86_pentium_m depends on !BR2_x86_64 select BR2_X86_CPU_HAS_MMX select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_SSE2 config BR2_x86_pentium2 bool "pentium2" depends on !BR2_x86_64 From a27009724737e381414d235b7aba3f43cb1f7dd1 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 12 May 2024 12:05:24 +0200 Subject: [PATCH 5645/5754] toolchain/Config.in: update BR2_TOOLCHAIN_HAS_LIBATOMIC dependencies Update BR2_TOOLCHAIN_HAS_LIBATOMIC dependencies to avoid the following build failure with libopenssl and BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7M_UCLIBC_STABLE: /home/buildroot/autobuild/run/instance-2/output-1/host/opt/ext-toolchain/arm-buildroot-uclinux-uclibcgnueabi/bin/ld.real: ./libcrypto.a(libcrypto-lib-threads_pthread.o): in function `CRYPTO_atomic_or': threads_pthread.c:(.text+0xfa): undefined reference to `__atomic_is_lock_free' libatomic is available since gcc 4.8, when thread support is enabled. However, the gcc logic in libatomic/configure.tgt does not recognize "uclinux" as a valid OS part of the target tuple, and therefore it does not build libatomic. The "uclinux" part of the tuple is used by Buildroot when BR2_BINFMT_FLAT=y [1]. This broken logic has only been fixed for arm since gcc 10.1.0 [2]. Indeed, bootlin armv7m is an uclibc toolchain compiled with atomic support through libatomic. [1] https://git.buildroot.net/buildroot/commit/?id=b3d1fb26dcadd8c570e2c415ce05398ecc810b32 [2] https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=b1e21e5a5d19b436f948710e09157c5b3244f541 Fixes: - http://autobuild.buildroot.org/results/d25e898f9715bf6a21284807361a57735a7a2e1d - http://autobuild.buildroot.org/results/e37ed5ad6ba41d610bffe9c234f699e203ef5069 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 8cb0f6e011d9975f7c4f8b2dc553b086bceef1dc) Signed-off-by: Peter Korsgaard --- toolchain/Config.in | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/toolchain/Config.in b/toolchain/Config.in index 1641dbae06..0e142d66a6 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -879,15 +879,19 @@ config BR2_TOOLCHAIN_HAS_SYNC_8 default y if BR2_TOOLCHAIN_ARM_HAS_SYNC_8 default y if BR2_TOOLCHAIN_X86_HAS_SYNC_8 -# libatomic is available since gcc 4.8, when thread support is -# enabled. Also, libatomic doesn't recognize "uclinux" as a valid OS -# part of the tuple, and is therefore not build on uclinux targets, -# which is why BR2_BINFMT_FLAT configurations are excluded. +# libatomic is available since gcc 4.8, when thread support is enabled. +# However, the gcc logic in libatomic/configure.tgt does not recognize +# "uclinux" as a valid OS part of the target tuple, and therefore it +# does not build libatomic. The "uclinux" part of the tuple is used by +# Buildroot when BR2_BINFMT_FLAT=y. This broken logic has only been +# fixed for arm since gcc 10.1.0. config BR2_TOOLCHAIN_HAS_LIBATOMIC bool - default y if BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 && \ - BR2_TOOLCHAIN_HAS_THREADS && \ - !BR2_BINFMT_FLAT + default y if BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_BINFMT_ELF || \ + (BR2_BINFMT_FLAT && BR2_arm && \ + BR2_TOOLCHAIN_GCC_AT_LEAST_10) # __atomic intrinsics are available: # - with gcc 4.8, either through built-ins or libatomic, on all From 4e04997601e873c69bc038cbb3b8ceefdfd8a9ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= Date: Fri, 1 Mar 2024 10:21:02 +0100 Subject: [PATCH 5646/5754] package/nfs-utils: only install fsidd binary and unit file with enabled nfsd MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit FSID daemon and its systemd unit file both depend on BR2_PACKAGE_NFS_UTILS_RPC_NFSD but they're now always installed. Remove them both if BR2_PACKAGE_NFS_UTILS_RPC_NFSD is disabled. Reviewed-by: Giulio Benetti Signed-off-by: Jan Čermák Signed-off-by: Thomas Petazzoni (cherry picked from commit dc3464c4b6da12c9d8809ada5bf7b26de0f7414c) Signed-off-by: Peter Korsgaard --- package/nfs-utils/nfs-utils.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk index 4f2b41c782..b757e3e51d 100644 --- a/package/nfs-utils/nfs-utils.mk +++ b/package/nfs-utils/nfs-utils.mk @@ -42,7 +42,8 @@ NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPCDEBUG) += usr/sbin/rpcdebug NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPC_LOCKD) += usr/sbin/rpc.lockd NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPC_RQUOTAD) += usr/sbin/rpc.rquotad NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPC_NFSD) += usr/sbin/exportfs \ - usr/sbin/rpc.mountd usr/sbin/rpc.nfsd usr/lib/systemd/system/nfs-server.service + usr/sbin/rpc.mountd usr/sbin/rpc.nfsd usr/lib/systemd/system/nfs-server.service \ + usr/sbin/fsidd usr/lib/systemd/system/fsidd.service ifeq ($(BR2_PACKAGE_NFS_UTILS_NFSV4),y) NFS_UTILS_CONF_OPTS += --enable-nfsv4 --enable-nfsv41 From abfb30a0384093b3df5ecd42607fbd6e9e9e47ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= Date: Fri, 1 Mar 2024 10:49:48 +0100 Subject: [PATCH 5647/5754] package/linux-firmware: add options for missing Intel b/g/n cards MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add firmware files for missing cards from the 802.11bgn product list in the Linux Firmware Wiki [1]. So far only Wireless-N 130 and 1030 were supported, which use the 6000G2B microcode. [1] https://wireless.wiki.kernel.org/en/users/drivers/iwlwifi#supported_devices Signed-off-by: Jan Čermák Signed-off-by: Thomas Petazzoni (cherry picked from commit acce2e3a38e849b2f85b7bd423c54c7ab29ec82f) Signed-off-by: Peter Korsgaard --- package/linux-firmware/Config.in | 36 ++++++++++++++++++++++++ package/linux-firmware/linux-firmware.mk | 30 ++++++++++++++++++++ 2 files changed, 66 insertions(+) diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in index 920c0a2ef1..6fb8953c1c 100644 --- a/package/linux-firmware/Config.in +++ b/package/linux-firmware/Config.in @@ -195,6 +195,42 @@ config BR2_PACKAGE_LINUX_FIRMWARE_CYPRESS_CYW54XXX help Firmware files for the Cypress cyw54xxx FullMAC. +config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_100 + bool "Intel iwlwifi 100" + help + Firmware files for the Intel Wifi 100 devices supported by + the iwlwifi kernel driver. + +config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_105 + bool "Intel iwlwifi 105" + help + Firmware files for the Intel Wifi 105 devices supported by + the iwlwifi kernel driver. + +config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_135 + bool "Intel iwlwifi 135" + help + Firmware files for the Intel Wifi 135 devices supported by + the iwlwifi kernel driver. + +config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_1000 + bool "Intel iwlwifi 1000" + help + Firmware files for the Intel Wifi 1000 devices supported by + the iwlwifi kernel driver. + +config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_2000 + bool "Intel iwlwifi 2000" + help + Firmware files for the Intel Wifi 2000 devices supported by + the iwlwifi kernel driver. + +config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_2030 + bool "Intel iwlwifi 2030" + help + Firmware files for the Intel Wifi 2030 devices supported by + the iwlwifi kernel driver. + config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_22000 bool "Intel iwlwifi 22000" help diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index 60e8861abe..b25c972634 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -486,6 +486,36 @@ LINUX_FIRMWARE_FILES += wil6210.* LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENSE.QualcommAtheros_ath10k endif +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_100),y) +LINUX_FIRMWARE_FILES += iwlwifi-100-*.ucode +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware +endif + +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_105),y) +LINUX_FIRMWARE_FILES += iwlwifi-105-*.ucode +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware +endif + +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_135),y) +LINUX_FIRMWARE_FILES += iwlwifi-135-*.ucode +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware +endif + +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_1000),y) +LINUX_FIRMWARE_FILES += iwlwifi-1000-*.ucode +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware +endif + +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_2000),y) +LINUX_FIRMWARE_FILES += iwlwifi-2000-*.ucode +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware +endif + +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_2030),y) +LINUX_FIRMWARE_FILES += iwlwifi-2030-*.ucode +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware +endif + ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_22000),y) LINUX_FIRMWARE_FILES += iwlwifi-QuZ-*.ucode iwlwifi-Qu-*.ucode LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware From 5f092f70e7260bcc12e3302288b5dcfdf25032c8 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: Thu, 14 Mar 2024 19:11:13 +0300 Subject: [PATCH 5648/5754] package/libmdbx: bump version to 0.12.10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is bugfix release of stable libmdbx branch. The most significant fixes since v0.12.8 (previous version pinned to buildroot): - Fixed an major bug inherited from LMDB (Lightning Memory-Mappe Database) that causes database corruption during use the MDBX_DUPFIXED mode, and that has existed for more than 10 years. - Fixed of a false error MDBX_CORRUPTED (-30796) in the scenario of working in the mode MDBX_DUPFIXED with odd length of multi-values. - Fixed a bug in adjusting the cursors in the case splitting a page by adding a new page on the left. - Troubleshooting an error when opening a database on a read-only file system. - A set of C++ API improvements. The complete ChangeLog: https://gitflic.ru/project/erthink/libmdbx/blob?file=ChangeLog.md Signed-off-by: Леонид Юрьев (Leonid Yuriev) [yann.morin.1998@free.fr: ammend and reflow the commit log] Signed-off-by: Yann E. MORIN (cherry picked from commit aea54eab471c0efe696984859a6dcd2f7487f83c) 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 82cf28d6a9..1dbdef7c69 100644 --- a/package/libmdbx/libmdbx.hash +++ b/package/libmdbx/libmdbx.hash @@ -1,5 +1,5 @@ # Hashes from: https://libmdbx.dqdkfa.ru/release/SHA256SUMS -sha256 c78c56c53708bbfc519bf53ebf520d1f09d30ee6427a4bedf713316696e671d0 libmdbx-amalgamated-0.12.8.tar.xz +sha256 4637e06768a9a8fc7577e6e458e045ad1f9a8baee74996a3c88bc0ad64cbcf67 libmdbx-amalgamated-0.12.10.tar.xz # Locally calculated sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 LICENSE diff --git a/package/libmdbx/libmdbx.mk b/package/libmdbx/libmdbx.mk index 4cc6cbd08e..6e0571ff24 100644 --- a/package/libmdbx/libmdbx.mk +++ b/package/libmdbx/libmdbx.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMDBX_VERSION = 0.12.8 +LIBMDBX_VERSION = 0.12.10 LIBMDBX_SOURCE = libmdbx-amalgamated-$(LIBMDBX_VERSION).tar.xz LIBMDBX_SITE = https://libmdbx.dqdkfa.ru/release LIBMDBX_SUPPORTS_IN_SOURCE_BUILD = NO From 885a2a466780b02b75689e38eab4b8d2b191c8d2 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 12 May 2024 18:31:59 +0200 Subject: [PATCH 5649/5754] package/kodi: remove libatomic from linker flags Kodi added detection for atomic/libatomic with commit https://github.com/xbmc/xbmc/commit/1673f476b802da1da942cef256cae6272fdf9a4b so we can remove our own code to handle the dependency. Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN (cherry picked from commit 31e7ca602686f936a7ca9baa6830f16d9744e429) Signed-off-by: Peter Korsgaard --- package/kodi/kodi.mk | 5 ----- 1 file changed, 5 deletions(-) diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index 085169367d..0db79bbb28 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -205,11 +205,6 @@ else KODI_CONF_OPTS += -D_AVX2_OK=OFF -D_AVX2_TRUE=OFF endif -# mips: uses __atomic_load_8 -ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -KODI_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic -endif - ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_5),) KODI_C_FLAGS += -std=gnu99 endif From e8345d32e05189d101b9d92f8825fbb42e8c71bb Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 12 May 2024 19:51:17 +0200 Subject: [PATCH 5650/5754] package/kodi: explicitly link to libiconv when locales disabled Fixes build error /home/wbx/buildroot/output/host/lib/gcc/aarch64-buildroot-linux-uclibc/12.3.0/../../../../aarch64-buildroot-linux-uclibc/bin/ld: build/utils/utils.a(CharsetConverter.cpp.o): undefined reference to symbol 'libiconv_open' /home/wbx/buildroot/output/host/lib/gcc/aarch64-buildroot-linux-uclibc/12.3.0/../../../../aarch64-buildroot-linux-uclibc/bin/ld: /home/wbx/buildroot/output/host/aarch64-buildroot-linux-uclibc/sysroot/usr/lib64/libiconv.so.2: error adding symbols: DSO missing from command line reported by Waldemar: http://lists.busybox.net/pipermail/buildroot/2024-May/690952.html Reproduced and fixed the build error using this defconfig: BR2_x86_64=y BR2_TOOLCHAIN_BUILDROOT_UCLIBC=y BR2_TOOLCHAIN_BUILDROOT_WCHAR=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_PER_PACKAGE_DIRECTORIES=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 Reported-by: Waldemar Brodkorb Signed-off-by: Bernd Kuhls [yann.morin.1998@free.fr: implement it similarly to KODI_C_FLAGS] Signed-off-by: Yann E. MORIN (cherry picked from commit f147e3b16a41324a9097ff17b002fd3c445e0f4c) Signed-off-by: Peter Korsgaard --- package/kodi/kodi.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index 0db79bbb28..12a53c8e7b 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -67,6 +67,7 @@ KODI_EXTRA_DOWNLOADS += \ KODI_CONF_OPTS += \ -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) $(KODI_C_FLAGS)" \ + -DCMAKE_EXE_LINKER_FLAGS="$(KODI_EXTRA_LIBS)" \ -DENABLE_APP_AUTONAME=OFF \ -DENABLE_CCACHE=OFF \ -DENABLE_DVDCSS=ON \ @@ -127,6 +128,7 @@ KODI_CONF_OPTS += -DCORE_PLATFORM_NAME="$(KODI_CORE_PLATFORM_NAME)" ifeq ($(BR2_ENABLE_LOCALE),) KODI_DEPENDENCIES += libiconv +KODI_EXTRA_LIBS += -liconv endif ifeq ($(BR2_arceb)$(BR2_arcle),y) From eeb0abb2e177f3c98778fe1af96bb613063d1308 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Mon, 13 May 2024 13:22:05 +0200 Subject: [PATCH 5651/5754] package/smcroute: bump to version v2.5.7 Fixes segfault on kernel without IPv6 support. For details, see https://github.com/troglobit/smcroute/releases/tag/2.5.7 Signed-off-by: Joachim Wiberg Signed-off-by: Thomas Petazzoni (cherry picked from commit 86a5cd42db6acc1ee4f312a55b40ab38f8743d72) Signed-off-by: Peter Korsgaard --- package/smcroute/smcroute.hash | 5 ++--- package/smcroute/smcroute.mk | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package/smcroute/smcroute.hash b/package/smcroute/smcroute.hash index b472dfbc04..d51745c076 100644 --- a/package/smcroute/smcroute.hash +++ b/package/smcroute/smcroute.hash @@ -1,5 +1,4 @@ -# Hash from https://github.com/troglobit/smcroute/releases/download/2.5.6/smcroute-2.5.6.tar.gz.sha256 -sha256 0be38f617e322daafaa941c02423239f5c117b940cf0f45bacadb6733c4b3916 smcroute-2.5.6.tar.gz - +# Hash from https://github.com/troglobit/smcroute/releases/ generated by GitHub +sha256 7d2c83e11908fe37844fa9b49ae50924555c4e1bb440fb059a95c94e442ea8a5 smcroute-2.5.7.tar.gz # Locally generated sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/smcroute/smcroute.mk b/package/smcroute/smcroute.mk index 0c4f88ab1b..f7476f1100 100644 --- a/package/smcroute/smcroute.mk +++ b/package/smcroute/smcroute.mk @@ -4,7 +4,7 @@ # ################################################################################ -SMCROUTE_VERSION = 2.5.6 +SMCROUTE_VERSION = 2.5.7 SMCROUTE_SITE = https://github.com/troglobit/smcroute/releases/download/$(SMCROUTE_VERSION) SMCROUTE_LICENSE = GPL-2.0+ SMCROUTE_LICENSE_FILES = COPYING From 6cdbb9ae17c2f8b44e3a65f9ab8c2022b53d753e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 12 May 2024 22:34:52 +0200 Subject: [PATCH 5652/5754] package/duma: set HOST_CFLAGS Set HOST_CFLAGS to avoid the following build failure raised since bump to version 2.5.21 in commit af2cd694e3903131d6e2f00646adfa83a89a23e2: /usr/bin/gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -mlongcalls -mauto-litpools -O2 -g0 -c createconf.c -o createconf.o gcc: error: unrecognized command-line option '-mlongcalls' gcc: error: unrecognized command-line option '-mauto-litpools' Fixes: af2cd694e3903131d6e2f00646adfa83a89a23e2 - http://autobuild.buildroot.org/results/28be2acc6d58754c7431df81d0b63b30e6af8554 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit b8c70f67017ebe08459992ac575ae4989243c232) Signed-off-by: Peter Korsgaard --- package/duma/duma.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/duma/duma.mk b/package/duma/duma.mk index 6bbdf41f4a..80fe8a5d64 100644 --- a/package/duma/duma.mk +++ b/package/duma/duma.mk @@ -20,6 +20,7 @@ define DUMA_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE1) $(TARGET_CONFIGURE_OPTS) \ OS=linux \ DUMA_OPTIONS="$(DUMA_OPTIONS)" \ + HOST_CFLAGS="$(HOST_CFLAGS)" \ CPPFLAGS="$(TARGET_CXXFLAGS) -std=c++11" -C $(@D) endef From 72b0c440e8914357b9a699ad9b9ed34c38f91041 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 13 May 2024 22:47:39 +0200 Subject: [PATCH 5653/5754] package/qemu: fix typo in help text of BR2_PACKAGE_QEMU_TARGET_RISCV32 33-bit was obviously a typo. Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni (cherry picked from commit e23a44bbcba067935708d9949c23fae9c5814cd0) Signed-off-by: Peter Korsgaard --- package/qemu/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/qemu/Config.in b/package/qemu/Config.in index 8d53ced300..91e0de884f 100644 --- a/package/qemu/Config.in +++ b/package/qemu/Config.in @@ -289,7 +289,7 @@ config BR2_PACKAGE_QEMU_TARGET_RISCV32 bool "riscv32" select BR2_PACKAGE_QEMU_FDT if BR2_PACKAGE_QEMU_SYSTEM help - RISC-V 33-bit architecture. + RISC-V 32-bit architecture. config BR2_PACKAGE_QEMU_TARGET_RISCV64 bool "riscv64" From ab0d9104e924847eacb1759a304d545b48ae1bda Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 12 May 2024 20:13:31 +0200 Subject: [PATCH 5654/5754] {linux, linux-headers}: bump 4.19.x / 5.{4, 10, 15}.x / 6.{1, 6, 8}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit a28bc67ce5f37661275c90904db7929c2416dc88) [Peter: drop 6.8.x bump] 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 0a73bb9d67..696eac327e 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.6.27" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.6.30" 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 ff681acbaf..e9ca02101c 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 639e50060e3c8f23ed017cb10cfeacc6ba88ff5583812bb76859b4cc6a128291 linux-6.6.27.tar.xz -sha256 d3d3c8c44f0f0a870a95bd2823f9d91979d1aa6f266da5d8cccd0c4b15e3115b linux-6.1.86.tar.xz +sha256 b66a5b863b0f8669448b74ca83bd641a856f164b29956e539bbcb5fdeeab9cc6 linux-6.6.30.tar.xz +sha256 83a3d72e764fceda2c1fc68a4ea6b91253a28da56a688a2b61776b0d19788e1d linux-6.1.90.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 c85859b86d2e6d1fc91ca1be8b44f24a9b5bb9f86869b04a8665a3a6559126e4 linux-5.15.155.tar.xz -sha256 879ca159c34ea9d3a6775f292cc59c2d3931d57dca00f0bebe2675ea0c82c6a9 linux-5.10.215.tar.xz -sha256 eac7b421a43cd46a3dbebf7c85d075faa7e164d80d215d31fcd35544b6f79ed4 linux-5.4.274.tar.xz +sha256 f9071c83a4fd8b80af026b48cfc1869bfa25883f9148b92b5dc1e1e1e26dd5c6 linux-5.15.158.tar.xz +sha256 e310588c4b23f0959614e60f007afc20e9b1a8f296d682b041fa129f96fbe151 linux-5.10.216.tar.xz +sha256 dad2b068946f0ca0026130d7ab17601d5074d90b381379c4479314d4edf4304c linux-5.4.275.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 a394fa5ffe321ee43dae9cccc724572f49fbb289875d39ea695adf712e51f74a linux-4.19.312.tar.xz +sha256 a8145e2ecf8437b6d06400c3358a595c47a74443b164890cf12a07d8722539c8 linux-4.19.313.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 70e4493a64..17f5d8b999 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -403,12 +403,12 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.19.312" if BR2_KERNEL_HEADERS_4_19 - default "5.4.274" if BR2_KERNEL_HEADERS_5_4 - default "5.10.215" if BR2_KERNEL_HEADERS_5_10 - default "5.15.155" if BR2_KERNEL_HEADERS_5_15 - default "6.1.86" if BR2_KERNEL_HEADERS_6_1 - default "6.6.27" if BR2_KERNEL_HEADERS_6_6 + default "4.19.313" if BR2_KERNEL_HEADERS_4_19 + default "5.4.275" if BR2_KERNEL_HEADERS_5_4 + default "5.10.216" if BR2_KERNEL_HEADERS_5_10 + default "5.15.158" if BR2_KERNEL_HEADERS_5_15 + default "6.1.90" if BR2_KERNEL_HEADERS_6_1 + default "6.6.30" 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 9da3d9a04f8c92d440b873219acc6300d9fe70c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Sun, 18 Feb 2024 02:11:17 +0100 Subject: [PATCH 5655/5754] package/musl: enable on s390x MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add s390x musl supported archs. Upstream musl already supports s390x[1]. Tested with qemu_s390s_defconfig: $ output/host/bin/qemu-system-s390x -M s390-ccw-virtio -cpu max,zpci=on -m 4G -smp 2 -kernel output/bzImage -drive file=output/images/rootfs.ext2,if=virtio,format=raw -append "rootwait root=/dev/vda net.ifnames=0 biosdevname=0" -display none -serial mon:stdio -net nic,model=virtio -net user (...) Welcome to Buildroot buildroot login: root # uname -a Linux buildroot 6.1.44 #2 SMP Sun Feb 18 01:33:42 CET 2024 s390x GNU/Linux # /lib/ld-musl-s390x.so.1 musl libc (s390x) Version 1.2.4 Dynamic Program Loader Usage: /lib/ld-musl-s390x.so.1 [options] [--] pathname [args] [1]: https://git.musl-libc.org/cgit/musl/commit/?id=15094943050eb9a564f409323070e50b40f78816 Signed-off-by: Gaël PORTAY Signed-off-by: Thomas Petazzoni (cherry picked from commit ab990cf58a724a178dbdd55afdb520212f7197c0) Signed-off-by: Peter Korsgaard --- package/musl/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/musl/Config.in b/package/musl/Config.in index 89f41d2ff1..44654eff34 100644 --- a/package/musl/Config.in +++ b/package/musl/Config.in @@ -16,6 +16,7 @@ config BR2_PACKAGE_MUSL_ARCH_SUPPORTS default y if BR2_powerpc64 default y if BR2_powerpc64le default y if BR2_RISCV_64 + default y if BR2_s390x default y if BR2_sh default y if BR2_x86_64 depends on !BR2_POWERPC_CPU_HAS_SPE # not supported, build breaks From 7b3a49aa4394988a526d3a96db771821c88194da Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 14 May 2024 19:20:32 +0200 Subject: [PATCH 5656/5754] package/cjson: security bump to version 1.7.18 Add NULL check to cJSON_SetValuestring() (CVE-2024-31755) https://github.com/DaveGamble/cJSON/releases/tag/v1.7.18 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 0c091c15ea22d0f5b1e2114bc56e16d77d77247c) Signed-off-by: Peter Korsgaard --- package/cjson/cjson.hash | 2 +- package/cjson/cjson.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/cjson/cjson.hash b/package/cjson/cjson.hash index 305dc0d7b8..e07ae0f7bf 100644 --- a/package/cjson/cjson.hash +++ b/package/cjson/cjson.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 c91d1eeb7175c50d49f6ba2a25e69b46bd05cffb798382c19bfb202e467ec51c cjson-1.7.17.tar.gz +sha256 3aa806844a03442c00769b83e99970be70fbef03735ff898f4811dd03b9f5ee5 cjson-1.7.18.tar.gz sha256 a36dda207c36db5818729c54e7ad4e8b0c6fba847491ba64f372c1a2037b6d5c LICENSE diff --git a/package/cjson/cjson.mk b/package/cjson/cjson.mk index 4719a3dc9b..35304ec618 100644 --- a/package/cjson/cjson.mk +++ b/package/cjson/cjson.mk @@ -4,7 +4,7 @@ # ################################################################################ -CJSON_VERSION = 1.7.17 +CJSON_VERSION = 1.7.18 CJSON_SITE = $(call github,DaveGamble,cjson,v$(CJSON_VERSION)) CJSON_INSTALL_STAGING = YES CJSON_LICENSE = MIT From 96ed028f030e757650cdcf410076853f97a31ded Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 14 May 2024 19:24:38 +0200 Subject: [PATCH 5657/5754] package/libedit: set LIBEDIT_CPE_ID_VALID cpe:2.3:a:libedit_project:libedit is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/42ACF08B-DD62-48D3-8568-32DAFD116956 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 300cb3dc16efeb592bddcb8be07310c21c2c0d7a) Signed-off-by: Peter Korsgaard --- package/libedit/libedit.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libedit/libedit.mk b/package/libedit/libedit.mk index 576a163173..d662329172 100644 --- a/package/libedit/libedit.mk +++ b/package/libedit/libedit.mk @@ -10,6 +10,7 @@ LIBEDIT_INSTALL_STAGING = YES LIBEDIT_DEPENDENCIES = ncurses LIBEDIT_LICENSE = BSD-3-Clause LIBEDIT_LICENSE_FILES = COPYING +LIBEDIT_CPE_ID_VALID = YES # We're patching configure.ac LIBEDIT_AUTORECONF = YES From d0bdeb09aceb3caed3e22d21ff4bebde0f505890 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 14 May 2024 23:56:15 +0200 Subject: [PATCH 5658/5754] package/{mesa3d, mesa3d-headers}: bump version to 24.0.7 Release notes: https://lists.freedesktop.org/archives/mesa-announce/2024-May/000758.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 4b18f32e5d9c3537a05405201092d65148b1bdbf) 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 e1f6211e17..e35774a942 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 = 24.0.6 +MESA3D_HEADERS_VERSION = 24.0.7 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 fb3df96555..f2c25464f4 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2024-April/000755.html -sha256 8b7a92dbe6468c18f2383700135b5fe9de836cdf0cc8fd7dbae3c7110237d604 mesa-24.0.6.tar.xz -sha512 60fcc77132c3cb0c98e650d97d3324bfd18abe7f8f8a3aa5209f71b2fddd94510f939bbf5272b2241749307184d5badde9da4842be57ce13f5760875885ea6fc mesa-24.0.6.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2024-May/000758.html +sha256 7454425f1ed4a6f1b5b107e1672b30c88b22ea0efea000ae2c7d96db93f6c26a mesa-24.0.7.tar.xz +sha512 77b0fae80ab0a07e2e528c113eadef0e3004b8df3e6e98fffe6fc2d8ac39f5ce7fa38ebe5c2ae32bfbac993dd7cbe288ace18ebb03cf2fb445fe7114f74dd45c mesa-24.0.7.tar.xz # License sha256 a00275a53178e2645fb65be99a785c110513446a5071ff2c698ed260ad917d75 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 39cbb4c23b..6bccdaed04 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 = 24.0.6 +MESA3D_VERSION = 24.0.7 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos From fdcad34a2a39721b4211f16ebba35f5a1de55352 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 14 May 2024 23:56:36 +0200 Subject: [PATCH 5659/5754] package/squid: security bump version to 6.9 Fixes CVE-2024-25111: https://github.com/squid-cache/squid/security/advisories/GHSA-72c2-c3wm-8qxc Signed-off-by: Bernd Kuhls [Peter: update sha256 hash] Signed-off-by: Peter Korsgaard (cherry picked from commit 58ccc55bff54d4c6c289a2d348f18b1b6dfde62d) 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 4a8ea5d550..e5017ae5cd 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.6.tar.xz.asc -md5 5a41134ee1b7e75f62088acdec92d2ca squid-6.6.tar.xz -sha1 f05e06a9dd3bf7501d2844e43d9ae1bd00e9edcc squid-6.6.tar.xz +# From http://www.squid-cache.org/Versions/v6/squid-6.9.tar.xz.asc +md5 4888e9dc75c0daa0ed526b34c055cb67 squid-6.9.tar.xz +sha1 5e73b30116ce7111589cc2b1c9bfe3c17efa2e75 squid-6.9.tar.xz # Locally calculated -sha256 55bd7f9f4898153161ea1228998acb551bf840832b9e5b90fc8ecd2942420318 squid-6.6.tar.xz +sha256 1ad72d46e1cb556e9561214f0fb181adb87c7c47927ef69bc8acd68a03f61882 squid-6.9.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/squid/squid.mk b/package/squid/squid.mk index 6a2b522336..98325c92fa 100644 --- a/package/squid/squid.mk +++ b/package/squid/squid.mk @@ -4,7 +4,7 @@ # ################################################################################ -SQUID_VERSION = 6.6 +SQUID_VERSION = 6.9 SQUID_SOURCE = squid-$(SQUID_VERSION).tar.xz SQUID_SITE = http://www.squid-cache.org/Versions/v6 SQUID_LICENSE = GPL-2.0+ From 896f3342a6b13c8e0f6fae705e8638eeec3b5cc3 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 14 May 2024 19:39:19 +0200 Subject: [PATCH 5660/5754] package/gnuplot: fix readline dependency --without-readline is interpreted as --with-readline=builtin since bump to version 5.4.0 in commit 263da09323e83bb3d6552b70b739523b66459df8 and https://github.com/gnuplot/gnuplot/commit/b492ea63bd604081ffb9dee3843e295b0b29df85 so add a mandatory dependency to readline or libedit to gnuplot As a side-effect, this will avoid the following build failure with builtin readline raised since bump to version 6.0.0 in commit 5f11ce4aeaba99917778c384b236d267e78a7b29: /home/autobuild/autobuild/instance-14/output-1/host/lib/gcc/arm-buildroot-linux-gnueabi/13.2.0/../../../../arm-buildroot-linux-gnueabi/bin/ld: history.o: in function `read_history': history.c:(.text+0xa8): undefined reference to `gp_read_history' Fixes: 5f11ce4aeaba99917778c384b236d267e78a7b29 - http://autobuild.buildroot.org/results/5e45dd8f9071694110c8481f222b9b07b6a97ef3 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 93864cef0b1ec94c44498a4edd31de92725b28b2) Signed-off-by: Peter Korsgaard --- package/gnuplot/Config.in | 1 + package/gnuplot/gnuplot.mk | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/package/gnuplot/Config.in b/package/gnuplot/Config.in index 603c194fe5..8068a7283b 100644 --- a/package/gnuplot/Config.in +++ b/package/gnuplot/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_GNUPLOT bool "gnuplot" + select BR2_PACKAGE_READLINE if !BR2_PACKAGE_LIBEDIT help A portable command-line driven graphing utility. diff --git a/package/gnuplot/gnuplot.mk b/package/gnuplot/gnuplot.mk index 91e9bfb9bf..53df69e251 100644 --- a/package/gnuplot/gnuplot.mk +++ b/package/gnuplot/gnuplot.mk @@ -41,8 +41,9 @@ endif ifeq ($(BR2_PACKAGE_READLINE),y) GNUPLOT_CONF_OPTS += --with-readline=gnu GNUPLOT_DEPENDENCIES += readline -else -GNUPLOT_CONF_OPTS += --without-readline +else ifeq ($(BR2_PACKAGE_LIBEDIT),y) +GNUPLOT_CONF_OPTS += --with-readline=bsd +GNUPLOT_DEPENDENCIES += libedit endif # Remove Javascript scripts, lua scripts, PostScript files From 491271b4fe4379c8c3d422e645b75efabf1c14b9 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 14 May 2024 19:21:42 +0200 Subject: [PATCH 5661/5754] package/libnpth: fix gnupg2 build with uclibc Fix the following build failure of gnupg2 raised since bump to version 1.7 in commit 3ef4d24192b20bd1eb5e34c9fa2a6aa5bde91f91 and https://git.gnupg.org/cgi-bin/gitweb.cgi?p=npth.git;a=commitdiff;h=02ce6b2d27f91ed6285e4e92d99c21bcc7823c9b: /home/autobuild/autobuild/instance-2/output-1/host/lib/gcc/armeb-buildroot-linux-uclibcgnueabi/13.2.0/../../../../armeb-buildroot-linux-uclibcgnueabi/bin/ld: /home/autobuild/autobuild/instance-2/output-1/host/bin/../armeb-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libnpth.so: undefined reference to `busy_wait_for' Fixes: 3ef4d24192b20bd1eb5e34c9fa2a6aa5bde91f91 - http://autobuild.buildroot.org/results/9a27ffde79598a39b4fd55c716978d32d0beb924 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit ad64ddd4f306eb787ce98263148a91b3386be570) Signed-off-by: Peter Korsgaard --- ..._rwlock_timedrdlock-is-not-supported.patch | 51 +++++++++++++++++++ .../libnpth/0003-Fix-previous-commit.patch | 39 ++++++++++++++ 2 files changed, 90 insertions(+) create mode 100644 package/libnpth/0002-Return-a-run-time-error-if-npth_rwlock_timedrdlock-is-not-supported.patch create mode 100644 package/libnpth/0003-Fix-previous-commit.patch diff --git a/package/libnpth/0002-Return-a-run-time-error-if-npth_rwlock_timedrdlock-is-not-supported.patch b/package/libnpth/0002-Return-a-run-time-error-if-npth_rwlock_timedrdlock-is-not-supported.patch new file mode 100644 index 0000000000..0d9b38e4ce --- /dev/null +++ b/package/libnpth/0002-Return-a-run-time-error-if-npth_rwlock_timedrdlock-is-not-supported.patch @@ -0,0 +1,51 @@ +From 01f03a91c9bd63910995aeef412beb3ca6dc9a67 Mon Sep 17 00:00:00 2001 +From: NIIBE Yutaka +Date: Tue, 7 May 2024 13:45:47 +0900 +Subject: [PATCH] Return a run-time error if npth_rwlock_timedrdlock is not + supported. + +* src/npth.c (npth_rwlock_timedrdlock): Return ENOSYS if not +supported. +(npth_rwlock_timedwrlock): Use HAVE_PTHREAD_RWLOCK_TRYWRLOCK. + +-- + +GnuPG-bug-id: 7109 +Fixed-commit: 363c370bd35dd0bb4e5636b2d4f06ea88c658794 +Signed-off-by: NIIBE Yutaka + +Upstream: https://git.gnupg.org/cgi-bin/gitweb.cgi?p=npth.git;a=commit;h=01f03a91c9bd63910995aeef412beb3ca6dc9a67 +Signed-off-by: Fabrice Fontaine +--- + src/npth.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/npth.c b/src/npth.c +index c0ff8da..f02540c 100644 +--- a/src/npth.c ++++ b/src/npth.c +@@ -488,9 +488,11 @@ npth_rwlock_timedrdlock (npth_rwlock_t *rwlock, const struct timespec *abstime) + ENTER(); + #if HAVE_PTHREAD_RWLOCK_TIMEDRDLOCK + err = pthread_rwlock_timedrdlock (rwlock, abstime); +-#else ++#elif HAVE_PTHREAD_RWLOCK_TRYRDLOCK + err = busy_wait_for ((trylock_func_t) pthread_rwlock_tryrdlock, rwlock, + abstime); ++#else ++ err = ENOSYS; + #endif + LEAVE(); + return err; +@@ -533,7 +535,7 @@ npth_rwlock_timedwrlock (npth_rwlock_t *rwlock, const struct timespec *abstime) + ENTER(); + #if HAVE_PTHREAD_RWLOCK_TIMEDWRLOCK + err = pthread_rwlock_timedwrlock (rwlock, abstime); +-#elif HAVE_PTHREAD_RWLOCK_TRYRDLOCK ++#elif HAVE_PTHREAD_RWLOCK_TRYWRLOCK + err = busy_wait_for ((trylock_func_t) pthread_rwlock_trywrlock, rwlock, + abstime); + #else +-- +2.30.2 + diff --git a/package/libnpth/0003-Fix-previous-commit.patch b/package/libnpth/0003-Fix-previous-commit.patch new file mode 100644 index 0000000000..5f3ce06bf6 --- /dev/null +++ b/package/libnpth/0003-Fix-previous-commit.patch @@ -0,0 +1,39 @@ +From 75c68399ef3bbb5d024f2a60474a7214fa479016 Mon Sep 17 00:00:00 2001 +From: NIIBE Yutaka +Date: Mon, 13 May 2024 11:13:23 +0900 +Subject: [PATCH] Fix previous commit. + +Signed-off-by: NIIBE Yutaka + +Upstream: https://git.gnupg.org/cgi-bin/gitweb.cgi?p=npth.git;a=commit;h=75c68399ef3bbb5d024f2a60474a7214fa479016 +Signed-off-by: Fabrice Fontaine +--- + src/npth.c | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/src/npth.c b/src/npth.c +index f02540c..8dced17 100644 +--- a/src/npth.c ++++ b/src/npth.c +@@ -178,6 +178,18 @@ static int initialized_or_any_threads; + typedef int (*trylock_func_t) (void *); + + #ifndef HAVE_PTHREAD_MUTEX_TIMEDLOCK ++#define REQUIRE_THE_BUSY_WAIT_FOR_IMPLEMENTATION 1 ++#endif ++ ++#if !HAVE_PTHREAD_RWLOCK_TIMEDRDLOCK && HAVE_PTHREAD_RWLOCK_TRYRDLOCK ++#define REQUIRE_THE_BUSY_WAIT_FOR_IMPLEMENTATION 1 ++#endif ++ ++#if !HAVE_PTHREAD_RWLOCK_TIMEDWRLOCK && HAVE_PTHREAD_RWLOCK_TRYWRLOCK ++#define REQUIRE_THE_BUSY_WAIT_FOR_IMPLEMENTATION 1 ++#endif ++ ++#if REQUIRE_THE_BUSY_WAIT_FOR_IMPLEMENTATION + static int + busy_wait_for (trylock_func_t trylock, void *lock, + const struct timespec *abstime) +-- +2.30.2 + From 46871affea6c39b212735fcb1f91312318357e73 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 7 Feb 2024 19:06:19 +0100 Subject: [PATCH 5662/5754] package/ruby: build host-ruby with yaml support webkitgtk/wpewebkit needs a host-ruby with yaml support, otherwise the build fails with errors like: cd /home/peko/source/buildroot/output/build/webkitgtk-2.42.2/Source/WebCore && \ /home/peko/source/buildroot/output/host/bin/ruby \ /home/peko/source/buildroot/output/build/webkitgtk-2.42.2/Source/WebCore/Scripts/GenerateSettings.rb \ --outputDir /home/peko/source/buildroot/output/build/webkitgtk-2.42.2/WebCore/DerivedSources \ --template /home/peko/source/buildroot/output/build/webkitgtk-2.42.2/Source/WebCore/Scripts/SettingsTemplates/InternalSettingsGenerated.cpp.erb \ --template /home/peko/source/buildroot/output/build/webkitgtk-2.42.2/Source/WebCore/Scripts/SettingsTemplates/InternalSettingsGenerated.idl.erb \ --template /home/peko/source/buildroot/output/build/webkitgtk-2.42.2/Source/WebCore/Scripts/SettingsTemplates/InternalSettingsGenerated.h.erb \ --template /home/peko/source/buildroot/output/build/webkitgtk-2.42.2/Source/WebCore/Scripts/SettingsTemplates/Settings.cpp.erb \ --template /home/peko/source/buildroot/output/build/webkitgtk-2.42.2/Source/WebCore/Scripts/SettingsTemplates/Settings.h.erb \ /home/peko/source/buildroot/output/build/webkitgtk-2.42.2/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml \ /home/peko/source/buildroot/output/build/webkitgtk-2.42.2/Source/WebCore/page/Settings.yaml /home/peko/source/buildroot/output/host/lib/ruby/3.3.0/yaml.rb:3: warning: It seems your ruby installation is missing psych (for YAML output). To eliminate this warning, please install libyaml and reinstall your ruby. We do not currently have any Config.in.host options for ruby or libyaml, but given how small/fast libyaml is to build just do it unconditionally. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 95093854e4c6ce69ee54df17fce20417312a3d0a) Signed-off-by: Peter Korsgaard --- package/ruby/ruby.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk index 4b9ce80e67..00fa0e0f65 100644 --- a/package/ruby/ruby.mk +++ b/package/ruby/ruby.mk @@ -20,7 +20,7 @@ RUBY_LICENSE_FILES = LEGAL COPYING BSDL RUBY_CPE_ID_VENDOR = ruby-lang RUBY_DEPENDENCIES = host-pkgconf host-ruby -HOST_RUBY_DEPENDENCIES = host-pkgconf host-openssl +HOST_RUBY_DEPENDENCIES = host-libyaml host-pkgconf host-openssl RUBY_MAKE_ENV = $(TARGET_MAKE_ENV) RUBY_CONF_OPTS = \ --disable-install-doc \ From 862aeb78303c7eb8b82e73ade65b6cf4308d2e58 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 15 May 2024 16:59:02 +0200 Subject: [PATCH 5663/5754] package/libvncserver: correct WITH_THREADS=ON/OFF logic Commit ee59023794f5540e5 (package/libvncserver: bump to version 0.9.12) changes the package from autotools to cmake and accidently inverted the threads logic. The reason this was not noticed is that the build system verifies if threads support works and otherwise disables it even when -DWITH_THREADS=ON is passed, E.G. for a nothread configuration: cmake ... -DWITH_THREADS=ON ... .. -- Performing Test CMAKE_HAVE_LIBC_PTHREAD -- Performing Test CMAKE_HAVE_LIBC_PTHREAD - Failed -- Looking for pthread_create in pthreads -- Looking for pthread_create in pthreads - not found -- Looking for pthread_create in pthread -- Looking for pthread_create in pthread - not found Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 7b3c0b19d4d587f52546ac92386e8a890022bb24) Signed-off-by: Peter Korsgaard --- package/libvncserver/libvncserver.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libvncserver/libvncserver.mk b/package/libvncserver/libvncserver.mk index 3a15a82d08..082f838f12 100644 --- a/package/libvncserver/libvncserver.mk +++ b/package/libvncserver/libvncserver.mk @@ -22,7 +22,7 @@ LIBVNCSERVER_CONF_OPTS += \ -DWITH_SDL=OFF \ -DWITH_TESTS=OFF -ifneq ($(BR2_TOOLCHAIN_HAS_THREADS),y) +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) LIBVNCSERVER_CONF_OPTS += -DWITH_THREADS=ON else LIBVNCSERVER_CONF_OPTS += -DWITH_THREADS=OFF From 141e2aa770849a87194ce65c70ecc01eab525dec Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 17 May 2024 16:14:13 +0200 Subject: [PATCH 5664/5754] package/procps-ng/S02sysctl: pass SYSCTL_ARGS before -p argument for busybox The busybox sysctl applet expects all arguments after -p to be filenames to read: sysctl -p file -h sysctl: -h: No such file or directory VS: sysctl -h -p file sysctl: invalid option -- 'h' BusyBox v1.36.1 (2024-05-17 15:27:21 CEST) multi-call binary. Usage: sysctl [-enq] { -a | -p [FILE]... | [-w] [KEY[=VALUE]]... } Show/set kernel parameters -e Don't warn about unknown keys -n Don't show key names -q Quiet -a Show all values -p Set values from FILEs (default /etc/sysctl.conf) -w Set values This seems to be the intented behaviour: https://git.busybox.net/busybox/tree/procps/sysctl.c#n317 Notice: The procps-ng variant is happy with both: sysctl -p file -h Usage: sysctl [options] [variable[=value] ...] VS: sysctl -h -p file Usage: sysctl [options] [variable[=value] ...] So pass SYSCTL_ARGS before the -p args so custom sysctl arguments can be passed. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 60b02eb6c6863e505289c7f8200c80fe1596fa10) Signed-off-by: Peter Korsgaard --- package/procps-ng/S02sysctl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/procps-ng/S02sysctl b/package/procps-ng/S02sysctl index 85d9ed50d0..c202833ab8 100644 --- a/package/procps-ng/S02sysctl +++ b/package/procps-ng/S02sysctl @@ -43,7 +43,7 @@ run_logger() { break } echo "* Applying $file ..." - /sbin/sysctl -p "$file" $SYSCTL_ARGS || prog_status="FAIL" + /sbin/sysctl $SYSCTL_ARGS -p "$file" || prog_status="FAIL" done 2>&1 >&3 | /usr/bin/logger -t sysctl -p kern.err } 3>&1 | /usr/bin/logger -t sysctl -p kern.info } @@ -60,7 +60,7 @@ run_std() { break } echo "* Applying $file ..." - /sbin/sysctl -p "$file" $SYSCTL_ARGS || prog_status="FAIL" + /sbin/sysctl $SYSCTL_ARGS -p "$file" || prog_status="FAIL" done } } From 4424203ae58e620c38200c3b1b472bedda1fd19b Mon Sep 17 00:00:00 2001 From: Jarkko Sakkinen Date: Fri, 17 May 2024 16:20:36 +0300 Subject: [PATCH 5665/5754] package/quota: Update DEVELOPERS address Signed-off-by: Jarkko Sakkinen Signed-off-by: Yann E. MORIN (cherry picked from commit 51fe7536c0089bac5e3a7091852036a0024be534) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index e5f5f56881..dc546e07b3 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1490,7 +1490,7 @@ F: package/zip/ N: Jared Bents F: package/libvirt/ -N: Jarkko Sakkinen +N: Jarkko Sakkinen F: package/quota/ N: Jason Pruitt From dbe045d0169aa77b7c2eaa159e267df4ec50e25d Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 17 May 2024 19:12:58 +0200 Subject: [PATCH 5666/5754] package/gr-osmosdr: fix python build Fix the following python build failure: In file included from /home/buildroot/instance-0/output-1/host/include/python3.11/Python.h:38, from /home/buildroot/instance-0/output-1/host/arc-buildroot-linux-gnu/sysroot/usr/include/pybind11/detail/common.h:266, from /home/buildroot/instance-0/output-1/host/arc-buildroot-linux-gnu/sysroot/usr/include/pybind11/attr.h:13, from /home/buildroot/instance-0/output-1/host/arc-buildroot-linux-gnu/sysroot/usr/include/pybind11/detail/class.h:12, from /home/buildroot/instance-0/output-1/host/arc-buildroot-linux-gnu/sysroot/usr/include/pybind11/pybind11.h:13, from /home/buildroot/instance-0/output-1/build/gr-osmosdr-0.2.4/python/bindings/device_python.cc:1: /home/buildroot/instance-0/output-1/host/include/python3.11/pyport.h:596:2: error: #error "LONG_BIT definition appears wrong for platform (bad gcc/glibc config?)." 596 | #error "LONG_BIT definition appears wrong for platform (bad gcc/glibc config?)." | ^~~~~ Fixes: - http://autobuild.buildroot.org/results/f009958c37902a224512b336fcb431903bdd0b96 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 8759d81b0017e062d0909bf0ddccefdc052d83b1) Signed-off-by: Peter Korsgaard --- package/gr-osmosdr/gr-osmosdr.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/gr-osmosdr/gr-osmosdr.mk b/package/gr-osmosdr/gr-osmosdr.mk index 316ed80887..0d1e4edb30 100644 --- a/package/gr-osmosdr/gr-osmosdr.mk +++ b/package/gr-osmosdr/gr-osmosdr.mk @@ -23,7 +23,9 @@ GR_OSMOSDR_CONF_OPTS = \ GR_OSMOSDR_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_GNURADIO_PYTHON),y) -GR_OSMOSDR_CONF_OPTS += -DENABLE_PYTHON=ON +GR_OSMOSDR_CONF_OPTS += \ + -DENABLE_PYTHON=ON \ + -DPYTHON_INCLUDE_DIRS=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) GR_OSMOSDR_DEPENDENCIES += python3 host-python-six else GR_OSMOSDR_CONF_OPTS += -DENABLE_PYTHON=OFF From 1809ad9ee478ae7ee5543f51d11452b8a182e7f5 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 19 May 2024 19:29:55 +0200 Subject: [PATCH 5667/5754] package/ruby: security bump to version 3.3.1 This release includes security fixes: - CVE-2024-27282: Arbitrary memory address read vulnerability with Regex search - CVE-2024-27281: RCE vulnerability with .rdoc_options in RDoc - CVE-2024-27280: Buffer overread vulnerability in StringIO https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-3-1-released/ Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit a9207e8ccd0812ed6bff01220a5df680bd1007e5) Signed-off-by: Peter Korsgaard --- package/ruby/ruby.hash | 4 ++-- package/ruby/ruby.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/ruby/ruby.hash b/package/ruby/ruby.hash index c729c59453..4ac6200bca 100644 --- a/package/ruby/ruby.hash +++ b/package/ruby/ruby.hash @@ -1,5 +1,5 @@ -# https://www.ruby-lang.org/en/news/2023/12/25/ruby-3-3-0-released/ -sha512 7959c5753bfa0bfc4d6d74060869aabbe9815c1c97930659da11b917ee0803ddbbd80e869e00c48b8694b4ba48709c3b6493fd045568e36e902616c35ababf01 ruby-3.3.0.tar.xz +# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-3-1-released/ +sha512 c58e9be9b5ab48191fbf7d67e13f0ec42ee71ed338170e0f7b246708e9cfc617ce65098f5ce7ab32d4305e785642d3e44253462104d5b9c4abcb1a4113f48347 ruby-3.3.1.tar.xz # License files, Locally calculated sha256 e849b28d324423e636a3e6bc5d583cdaf4bd046c2b20872c53886b612d01a4a1 LEGAL diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk index 00fa0e0f65..fcc637c5ea 100644 --- a/package/ruby/ruby.mk +++ b/package/ruby/ruby.mk @@ -5,7 +5,7 @@ ################################################################################ RUBY_VERSION_MAJOR = 3.3 -RUBY_VERSION = $(RUBY_VERSION_MAJOR).0 +RUBY_VERSION = $(RUBY_VERSION_MAJOR).1 RUBY_VERSION_EXT = 3.3.0 RUBY_SITE = http://cache.ruby-lang.org/pub/ruby/$(RUBY_VERSION_MAJOR) RUBY_SOURCE = ruby-$(RUBY_VERSION).tar.xz From 5f36e64944f439272261360208c45cadd4b39fd3 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 19 May 2024 12:54:36 +0200 Subject: [PATCH 5668/5754] package/ivi-homescreen: needs gcc >= 8 ivi-homescreen needs C++17 filesystem resulting in the following build failure with gcc < 8 since its addition in commit 9d8497e79de3ced144877ba6ee38cc5b7181aaeb: In file included from /home/buildroot/instance-0/output-1/build/ivi-homescreen-5ab78a19e95c88cc5d6b173ab1260a211e78cf0a/third_party/flutter/shell/platform/common/path_utils.cc:5:0: /home/buildroot/instance-0/output-1/build/ivi-homescreen-5ab78a19e95c88cc5d6b173ab1260a211e78cf0a/third_party/./flutter/shell/platform/common/path_utils.h:8:10: fatal error: filesystem: No such file or directory #include ^~~~~~~~~~~~ Fixes: 9d8497e79de3ced144877ba6ee38cc5b7181aaeb - http://autobuild.buildroot.org/results/a5e88d5a4264a6165be31a99f1c123af53fa382e Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 898cf04e47b5d292afc1ab1e67f59b10b8637b12) Signed-off-by: Peter Korsgaard --- package/ivi-homescreen/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/ivi-homescreen/Config.in b/package/ivi-homescreen/Config.in index dc2ccb0c97..a4f5f6835f 100644 --- a/package/ivi-homescreen/Config.in +++ b/package/ivi-homescreen/Config.in @@ -3,7 +3,7 @@ menuconfig BR2_PACKAGE_IVI_HOMESCREEN depends on BR2_PACKAGE_HOST_FLUTTER_SDK_BIN_ARCH_SUPPORTS depends on BR2_PACKAGE_FLUTTER_ENGINE_ARCH_SUPPORTS depends on BR2_HOST_GCC_AT_LEAST_5 # flutter-engine - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # flutter-engine + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # C++17 filesystem depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # flutter-engine depends on BR2_TOOLCHAIN_USES_GLIBC # flutter-engine depends on BR2_INSTALL_LIBSTDCPP # flutter-engine @@ -250,11 +250,11 @@ comment "OpenGL texture plugin needs an EGL backend" endif # BR2_PACKAGE_IVI_HOMESCREEN -comment "ivi-homescreen needs a glibc toolchain w/ wchar, C++, gcc >= 5, dynamic library, host gcc >= 5" +comment "ivi-homescreen needs a glibc toolchain w/ wchar, C++, gcc >= 8, dynamic library, host gcc >= 5" depends on BR2_PACKAGE_HOST_FLUTTER_SDK_BIN_ARCH_SUPPORTS depends on BR2_PACKAGE_FLUTTER_ENGINE_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_USES_GLIBC \ - || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 \ + || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_8 \ || BR2_STATIC_LIBS || !BR2_USE_WCHAR \ || !BR2_HOST_GCC_AT_LEAST_5 From 8f1371bb313bdb4da41b60710fcc947229435ff9 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 15 May 2024 16:12:46 +0200 Subject: [PATCH 5669/5754] package/python-ml-dtypes: remove python-pybind from C++ dependency comment python-pybind dependency has been removed since the version bump to 0.3.2 [1] [1] 06e1a3620e5268951be089d2b150c1802de7de4c Signed-off-by: Romain Naour (cherry picked from commit 6ea7784c9427e25a3b4f39ab1cc82a9ac1c01966) Signed-off-by: Peter Korsgaard --- package/python-ml-dtypes/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-ml-dtypes/Config.in b/package/python-ml-dtypes/Config.in index 58c218b214..7dce2fea42 100644 --- a/package/python-ml-dtypes/Config.in +++ b/package/python-ml-dtypes/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_PYTHON_ML_DTYPES bool "python-ml-dtypes" depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS - depends on BR2_INSTALL_LIBSTDCPP # python-pybind, 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 depends on BR2_HOST_GCC_AT_LEAST_9 # host-python-numpy From 9592b990d570d4fcbf3473386c7076c891ff09a9 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Tue, 21 May 2024 21:44:41 +0200 Subject: [PATCH 5670/5754] support/testing: improve python-magic-wormhole test reliability The python-magic-wormhole runtime test can randomly fail on slow runners, see [1]. The issue is that the sending command is started first in background _without_ redirecting its output to /dev/null. The receiving command is started after, expecting the message to be printed on the first standard output line. On slower systems, the sending command still print messages while the test controller expect output from the receiving command. The expected string finally appear, but not on the first line. This makes the test fail. This commit fixes the issue by redirecting all outputs (stdout, stderr) of the sending command to /dev/null. To help even more, the sleep time is moved from the emulator to the test controller. The sleep time is also multiplied by the timeout_multiplier. Fixes: [1] [1] https://gitlab.com/buildroot.org/buildroot/-/jobs/6888691508 Signed-off-by: Julien Olivain Signed-off-by: Romain Naour (cherry picked from commit 9a734700d714d799b5d42489071b0f7759552987) Signed-off-by: Peter Korsgaard --- .../tests/package/test_python_magic_wormhole.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/support/testing/tests/package/test_python_magic_wormhole.py b/support/testing/tests/package/test_python_magic_wormhole.py index 5a0f0277b0..180cff2e4a 100644 --- a/support/testing/tests/package/test_python_magic_wormhole.py +++ b/support/testing/tests/package/test_python_magic_wormhole.py @@ -1,4 +1,5 @@ import os +import time from tests.package.test_python import TestPythonPackageBase @@ -46,9 +47,12 @@ def test_run(self): wormhole_cmd = "wormhole --relay-url={} --transit-helper={}".format( relay_url, transit_helper) - cmd = wormhole_cmd + " send --code={} --text=\"{}\" & ".format(code, text) - cmd += "sleep 25" - self.assertRunOk(cmd, timeout=30) + cmd = wormhole_cmd + cmd += f" send --code={code} --text=\"{text}\"" + cmd += " &> /dev/null &" + self.assertRunOk(cmd) + + time.sleep(30 * self.timeout_multiplier) wormhole_env = "_MAGIC_WORMHOLE_TEST_KEY_TIMER=100 " wormhole_env += "_MAGIC_WORMHOLE_TEST_VERIFY_TIMER=100 " From d45f3d03c2aec68e79a7a5e5c8ebcc7355e55cee Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 19 May 2024 12:13:51 +0200 Subject: [PATCH 5671/5754] configs/orangepi_r1_defconfig: drop double _HOST_UBOOT_TOOLS=y Fixes the following warning: orangepi_r1_defconfig:35:warning: override: reassigning to symbol BR2_PACKAGE_HOST_UBOOT_TOOLS While we're at it, move the HOST_UBOOT_TOOLS_* options where savedefconfig would put them. Signed-off-by: Peter Korsgaard Signed-off-by: Romain Naour (cherry picked from commit 0ba568276a3432abc877624ce6fe4980e4b3b4b4) Signed-off-by: Peter Korsgaard --- configs/orangepi_r1_defconfig | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/configs/orangepi_r1_defconfig b/configs/orangepi_r1_defconfig index bad1f9400c..332761bb71 100644 --- a/configs/orangepi_r1_defconfig +++ b/configs/orangepi_r1_defconfig @@ -26,13 +26,12 @@ BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-r1/boot.cmd" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-r1/boot.cmd" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-r1/genimage.cfg" From 48e3dddd2fce66bdbea474ec95f3b68b9d7b5afd Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 19 May 2024 12:13:52 +0200 Subject: [PATCH 5672/5754] configs/orangepi_r1_defconfig: bump U-boot to v2024.01 to fix compatibility with setuptools >= 69 Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6865597717 setuptools.extern.packaging.version.InvalidVersion: Invalid version: 'u-boot-2020.10' make[5]: *** [scripts/dtc/pylibfdt/Makefile:30: scripts/dtc/pylibfdt/_libfdt.so] Error 1 make[4]: *** [scripts/Makefile.build:419: scripts/dtc/pylibfdt] Error 2 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [scripts/Makefile.build:419: scripts/dtc] Error 2 make[2]: *** [Makefile:577: scripts] Error 2 make[1]: *** [package/pkg-generic.mk:283: /builds/buildroot.org/buildroot/output/build/uboot-2020.10/.stamp_built] Error 2 Commit 6b62384e3d2a9e1 (package/python-setuptools: bump to version 69.0.3) bumped setuptools, which now errors out when passed a version with a prefix string. This u-boot- prefix string is dropped since U-Boot 2023.01 with commit c977b1843504 (libfdt: Fix invalid version warning), so bump U-Boot to v2024.01 to fix this issue. Signed-off-by: Peter Korsgaard Signed-off-by: Romain Naour (cherry picked from commit 113eeb55d6701ce01e7401cc322d16604a829513) Signed-off-by: Peter Korsgaard --- configs/orangepi_r1_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/orangepi_r1_defconfig b/configs/orangepi_r1_defconfig index 332761bb71..d7a21894bd 100644 --- a/configs/orangepi_r1_defconfig +++ b/configs/orangepi_r1_defconfig @@ -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="2020.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_r1" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y From 2cd1932935a6cf3e405c83f3a21d663b938d778a Mon Sep 17 00:00:00 2001 From: Maxim Kochetkov Date: Wed, 22 May 2024 09:44:04 +0300 Subject: [PATCH 5673/5754] package/postgresql: security bump version to 16.3 Release notes: https://www.postgresql.org/about/news/postgresql-163-157-1412-1315-and-1219-released-2858/ Fixes CVE-2024-4317. Signed-off-by: Maxim Kochetkov Signed-off-by: Peter Korsgaard (cherry picked from commit 73dd1d6b96665574607c8b05189426ad3eb05a6f) Signed-off-by: Peter Korsgaard --- 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 6c3f561f7e..d917a03ebb 100644 --- a/package/postgresql/postgresql.hash +++ b/package/postgresql/postgresql.hash @@ -1,4 +1,4 @@ -# From https://ftp.postgresql.org/pub/source/v16.2/postgresql-16.2.tar.bz2.sha256 -sha256 446e88294dbc2c9085ab4b7061a646fa604b4bec03521d5ea671c2e5ad9b2952 postgresql-16.2.tar.bz2 +# From https://ftp.postgresql.org/pub/source/v16.2/postgresql-16.3.tar.bz2.sha256 +sha256 331963d5d3dc4caf4216a049fa40b66d6bcb8c730615859411b9518764e60585 postgresql-16.3.tar.bz2 # License file, Locally calculated sha256 9bf20ee493926a7e17a74bc7f05089fbc014269667b1540bc35a6b194a40c9de COPYRIGHT diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index 0448e71892..0a1d98079a 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -4,7 +4,7 @@ # ################################################################################ -POSTGRESQL_VERSION = 16.2 +POSTGRESQL_VERSION = 16.3 POSTGRESQL_SOURCE = postgresql-$(POSTGRESQL_VERSION).tar.bz2 POSTGRESQL_SITE = https://ftp.postgresql.org/pub/source/v$(POSTGRESQL_VERSION) POSTGRESQL_LICENSE = PostgreSQL From 70455e092e41d8d4118e27b382278055fd917092 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 16 May 2024 18:31:44 +0200 Subject: [PATCH 5674/5754] package/putty: security bump to version 0.81 The only change between 0.80 and 0.81 is one security fix: - ECDSA signatures using 521-bit keys (the NIST P521 curve, otherwise known as ecdsa-sha2-nistp521) were generated with biased random numbers. This permits an attacker in possession of a few dozen signatures to RECOVER THE PRIVATE KEY. Any 521-bit ECDSA private key that PuTTY or Pageant has used to sign anything should be considered compromised. This vulnerability has the identifier CVE-2024-31497. Update hash of LICENCE file (update in year with https://git.tartarus.org/?p=simon/putty.git;a=commit;h=f2f28ac0386eebbd45ea605818d31d62d219f589) https://lists.tartarus.org/pipermail/putty-announce/2024/000038.html Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit bd6fa8d13b69ca85cc1a9add538b94cf5e5cdb68) Signed-off-by: Peter Korsgaard --- package/putty/putty.hash | 8 ++++---- package/putty/putty.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/putty/putty.hash b/package/putty/putty.hash index 84569a31e5..30b749c47b 100644 --- a/package/putty/putty.hash +++ b/package/putty/putty.hash @@ -1,7 +1,7 @@ # Hashes from: http://the.earth.li/~sgtatham/putty/0.80/{sha1,sha256,sha512}sums -sha1 9c4a96f63ee3e927472191c935cc89228693c03a putty-0.80.tar.gz -sha256 2013c83a721b1753529e9090f7c3830e8fe4c80a070ccce764539badb3f67081 putty-0.80.tar.gz -sha512 c8a6b6fa54ecd8bcf4ec274fef51343dd9996e6458b250b5555c4dc88ded25e87f97277da482c29858510e65635112d541f559ab683635bd950572d850129f90 putty-0.80.tar.gz +sha1 8c88d871855d3730a0473bb1cb1006654e73b680 putty-0.81.tar.gz +sha256 cb8b00a94f453494e345a3df281d7a3ed26bb0dd7e36264f145206f8857639fe putty-0.81.tar.gz +sha512 d86f2fd0e126b18275d58cf64334b3b27c450899a1c2be2502de9faa2ef58f7fc8efc5d45f25c8395623f1e21917aa02407343bb2fee44c4c00b9f81267d5ecd putty-0.81.tar.gz # Locally calculated -sha256 7ede37f344ee03436c155a375ecb6cdb42a77105baa6e7804bf43260dc4a0c54 LICENCE +sha256 e0410341c5e45f7479c28d79298edbf615589cdfc115b2d69683d4ccd0425ce0 LICENCE diff --git a/package/putty/putty.mk b/package/putty/putty.mk index bff6e78074..617518e647 100644 --- a/package/putty/putty.mk +++ b/package/putty/putty.mk @@ -4,7 +4,7 @@ # ################################################################################ -PUTTY_VERSION = 0.80 +PUTTY_VERSION = 0.81 PUTTY_SITE = http://the.earth.li/~sgtatham/putty/$(PUTTY_VERSION) PUTTY_LICENSE = MIT PUTTY_LICENSE_FILES = LICENCE From ea425bf724e74cbc10af2961e61ad91723f0e740 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 17 May 2024 23:25:34 +0200 Subject: [PATCH 5675/5754] package/minisign: do not strip Set CMAKE_STRIP to an empty value to avoid the following build failure with BR2_BINFMT_FLAT raised since the addition of the package in commit d90ac63d9b3448a239bb9aa8030326699a3fdc3d: /home/buildroot/instance-0/output-1/host/bin/m68k-linux-strip: /home/buildroot/instance-0/output-1/build/minisign-0.11/minisign: file format not recognized Fixes: d90ac63d9b3448a239bb9aa8030326699a3fdc3d - http://autobuild.buildroot.org/results/9cc9fd17c7eb4a741c08f27f69764df4a26295fa Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit d96b3c331cb0e0cf3bec3d3b1496ed9adb426d05) Signed-off-by: Peter Korsgaard --- package/minisign/minisign.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/minisign/minisign.mk b/package/minisign/minisign.mk index 34b3f4046e..7cdce597f7 100644 --- a/package/minisign/minisign.mk +++ b/package/minisign/minisign.mk @@ -10,6 +10,7 @@ MINISIGN_LICENSE = ISC MINISIGN_LICENSE_FILES = LICENSE MINISIGN_DEPENDENCIES = libsodium HOST_MINISIGN_DEPENDENCIES = host-libsodium +MINISIGN_CONF_OPTS = -DCMAKE_STRIP="" ifeq ($(BR2_STATIC_LIBS),y) MINISIGN_CONF_OPTS += -DBUILD_STATIC_EXECUTABLES=1 From 4b4becbd070375ee68c633929486df1eaa54bfe3 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 17 May 2024 23:33:07 +0200 Subject: [PATCH 5676/5754] package/mutt: bump to version 2.2.13 Mutt 2.2.13 was released on March 9, 2024. This is a bug-fix release, fixing a possible dangling pointer reference in the SMTP client. Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 730de6c00e2c75c7ccb972b44b77f97f734c3ae4) 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 8c4aae3c1c..72c7924e9b 100644 --- a/package/mutt/mutt.hash +++ b/package/mutt/mutt.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 043af312f64b8e56f7fd0bf77f84a205d4c498030bd9586457665c47bb18ce38 mutt-2.2.12.tar.gz +sha256 eb23faddc1cc97d867693f3a4a9f30949ad93765ad5b6fdae2797a4001c58efb mutt-2.2.13.tar.gz sha256 732f24b69a6c71cd8e01e4672bb8e12cc1cbb88a50a4665e6ca4fd95000a57ee GPL diff --git a/package/mutt/mutt.mk b/package/mutt/mutt.mk index 2fe7b92b38..9a6be6d4a0 100644 --- a/package/mutt/mutt.mk +++ b/package/mutt/mutt.mk @@ -4,7 +4,7 @@ # ################################################################################ -MUTT_VERSION = 2.2.12 +MUTT_VERSION = 2.2.13 MUTT_SITE = https://bitbucket.org/mutt/mutt/downloads MUTT_LICENSE = GPL-2.0+ MUTT_LICENSE_FILES = GPL From 03e4742cacd81bf9e9ad4d1711078fd4b7381cdd Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 23 May 2024 19:36:40 +0200 Subject: [PATCH 5677/5754] package/x11vnc: drop unrecognized options --without-{jpeg,sdl,zlib} are unrecognized since bump to version 0.9.14 in commit aeea662fb12e69073a233fe1058287212fbbca33 and https://github.com/LibVNC/x11vnc/commit/d287ed9a77c647f35e85e0b10621a6661e911fad because those dependencies were linked to libvncserver, not x11vnc Fixes: aeea662fb12e69073a233fe1058287212fbbca33 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 3ead103f4640072b95923ea9bb15e115f14f4f0d) Signed-off-by: Peter Korsgaard --- package/x11vnc/x11vnc.mk | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/package/x11vnc/x11vnc.mk b/package/x11vnc/x11vnc.mk index aa0f14c456..645ef40643 100644 --- a/package/x11vnc/x11vnc.mk +++ b/package/x11vnc/x11vnc.mk @@ -6,9 +6,6 @@ X11VNC_VERSION = 0.9.16 X11VNC_SITE = $(call github,LibVNC,x11vnc,$(X11VNC_VERSION)) -# sdl support is not used in x11vnc, but host include / library search paths -# leak in if host has sdl-config -X11VNC_CONF_OPTS = --without-sdl X11VNC_DEPENDENCIES = xlib_libXt xlib_libXext xlib_libXtst libvncserver X11VNC_LICENSE = GPL-2.0+ X11VNC_LICENSE_FILES = COPYING @@ -25,12 +22,6 @@ else X11VNC_CONF_OPTS += --without-avahi endif -ifeq ($(BR2_PACKAGE_JPEG),y) -X11VNC_DEPENDENCIES += jpeg -else -X11VNC_CONF_OPTS += --without-jpeg -endif - ifeq ($(BR2_PACKAGE_OPENSSL),y) X11VNC_DEPENDENCIES += openssl else @@ -61,10 +52,4 @@ else X11VNC_CONF_OPTS += --without-xdamage endif -ifeq ($(BR2_PACKAGE_ZLIB),y) -X11VNC_DEPENDENCIES += zlib -else -X11VNC_CONF_OPTS += --without-zlib -endif - $(eval $(autotools-package)) From 019e0d31cd47503ae1912200eba70bf640b755a7 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 22 May 2024 23:57:52 +0200 Subject: [PATCH 5678/5754] configs/orangepi_pc_defconfig: bump U-boot to v2024.01 to fix compatibility with setuptools >= 69 Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6865597706 setuptools.extern.packaging.version.InvalidVersion: Invalid version: 'u-boot-2020.10' make[5]: *** [scripts/dtc/pylibfdt/Makefile:30: scripts/dtc/pylibfdt/_libfdt.so] Error 1 make[4]: *** [scripts/Makefile.build:419: scripts/dtc/pylibfdt] Error 2 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [scripts/Makefile.build:419: scripts/dtc] Error 2 make[2]: *** [Makefile:577: scripts] Error 2 make[1]: *** [package/pkg-generic.mk:283: /builds/buildroot.org/buildroot/output/build/uboot-2020.10/.stamp_built] Error 2 Commit 6b62384e3d2a9e1 (package/python-setuptools: bump to version 69.0.3) bumped setuptools, which now errors out when passed a version with a prefix string. This u-boot- prefix string is dropped since U-Boot 2023.01 with commit c977b1843504 (libfdt: Fix invalid version warning), so bump U-Boot to v2024.01 to fix this issue. Signed-off-by: Peter Korsgaard (cherry picked from commit 2e349be94a87db05d07d37bd44a923581bca43f3) Signed-off-by: Peter Korsgaard --- configs/orangepi_pc_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/orangepi_pc_defconfig b/configs/orangepi_pc_defconfig index fd0f64e0e6..0464de5619 100644 --- a/configs/orangepi_pc_defconfig +++ b/configs/orangepi_pc_defconfig @@ -22,7 +22,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="2020.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_pc" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y From cc7bffeb59ce539977ec150e7abdd654c42f9d88 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 23 May 2024 17:55:57 +0200 Subject: [PATCH 5679/5754] package/lua-cffi: fix or1k build Fix the following or1k build failure raised since bump to version 0.2.2 in commit 079d992b271240fc1776a2855299955043774280: In file included from /home/buildroot/autobuild/run/instance-0/output-1/host/or1k-buildroot-linux-uclibc/sysroot/usr/include/lua.hpp:6, from ../src/lua.hh:23, from ../src/parser.hh:4, from ../src/ffilib.cc:7: ../src/ffilib.cc: In static member function 'static void ffi_module::setup(lua_State*)': ../src/ffilib.cc:1616:28: error: expected ')' before 'FFI_ARCH_NAME' 1616 | lua_pushliteral(L, FFI_ARCH_NAME); | ^~~~~~~~~~~~~ Fixes: 079d992b271240fc1776a2855299955043774280 - http://autobuild.buildroot.org/results/4e14753732c5b6fe8ba9ecc4050ffb35f471c428 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 9b07b4bf6d6091ad13cbfcec77b73994f4682e3c) Signed-off-by: Peter Korsgaard --- .../0001-src-platform.hh-fix-or1k-build.patch | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 package/lua-cffi/0001-src-platform.hh-fix-or1k-build.patch diff --git a/package/lua-cffi/0001-src-platform.hh-fix-or1k-build.patch b/package/lua-cffi/0001-src-platform.hh-fix-or1k-build.patch new file mode 100644 index 0000000000..35d023df44 --- /dev/null +++ b/package/lua-cffi/0001-src-platform.hh-fix-or1k-build.patch @@ -0,0 +1,39 @@ +From 2294e61b057215bf089b1d1c482a5dcbcad6b414 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 23 May 2024 17:50:18 +0200 +Subject: [PATCH] src/platform.hh: fix or1k build + +Fix the following or1k build failure raised since version 0.2.2 and +https://github.com/q66/cffi-lua/commit/27755f61e4c625dff951302bade4ad07e3609ca5: + +In file included from /home/buildroot/autobuild/run/instance-0/output-1/host/or1k-buildroot-linux-uclibc/sysroot/usr/include/lua.hpp:6, + from ../src/lua.hh:23, + from ../src/parser.hh:4, + from ../src/ffilib.cc:7: +../src/ffilib.cc: In static member function 'static void ffi_module::setup(lua_State*)': +../src/ffilib.cc:1616:28: error: expected ')' before 'FFI_ARCH_NAME' + 1616 | lua_pushliteral(L, FFI_ARCH_NAME); + | ^~~~~~~~~~~~~ + +Fixes: 27755f61e4c625dff951302bade4ad07e3609ca5 + - http://autobuild.buildroot.org/results/4e14753732c5b6fe8ba9ecc4050ffb35f471c428 + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/q66/cffi-lua/commit/2294e61b057215bf089b1d1c482a5dcbcad6b414 +--- + src/platform.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/platform.hh b/src/platform.hh +index 84e0a89..dab1e76 100644 +--- a/src/platform.hh ++++ b/src/platform.hh +@@ -192,7 +192,7 @@ + # endif + #elif defined(__OR1K__) + # define FFI_ARCH FFI_ARCH_OR1K +-# define FFO_ARCH_NAME "or1k" ++# define FFI_ARCH_NAME "or1k" + #elif defined(__riscv) || defined(__riscv__) + # if __riscv_xlen == 32 + # define FFI_ARCH FFI_ARCH_RV32 From 14c80da353fa6c623a77321526d92666ded47b8e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 25 May 2024 08:12:44 +0200 Subject: [PATCH 5680/5754] package/cryptodev-linux: fix build with kernel >= 6.7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix the following build failure with kernel >= 6.7: /home/buildroot/autobuild/instance-0/output-1/build/cryptodev-linux-1.13/./cryptlib.c: In function ‘cryptodev_hash_init’: /home/buildroot/autobuild/instance-0/output-1/build/cryptodev-linux-1.13/./cryptlib.c:384:28: error: implicit declaration of function ‘crypto_ahash_alignmask’; did you mean ‘crypto_aead_alignmask’? [-Werror=implicit-function-declaration] 384 | hdata->alignmask = crypto_ahash_alignmask(hdata->async.s); | ^~~~~~~~~~~~~~~~~~~~~~ | crypto_aead_alignmask Fixes: - http://autobuild.buildroot.org/results/466360c7baec2edf42dc6f0ad9a8d757dd471c88 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 15ec07403f3abcd42441cde7186a451de8a458dc) Signed-off-by: Peter Korsgaard --- .../0003-Fix-build-for-Linux-6-7-rc1.patch | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 package/cryptodev-linux/0003-Fix-build-for-Linux-6-7-rc1.patch diff --git a/package/cryptodev-linux/0003-Fix-build-for-Linux-6-7-rc1.patch b/package/cryptodev-linux/0003-Fix-build-for-Linux-6-7-rc1.patch new file mode 100644 index 0000000000..4fdccaf6e0 --- /dev/null +++ b/package/cryptodev-linux/0003-Fix-build-for-Linux-6-7-rc1.patch @@ -0,0 +1,38 @@ +From 5e7121e45ff283d30097da381fd7e97c4bb61364 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Joan=20Bruguera=20Mic=C3=B3?= +Date: Sun, 10 Dec 2023 13:57:55 +0000 +Subject: [PATCH] Fix build for Linux 6.7-rc1 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Since Linux 6.7-rc1, no ahash algorithms set a nonzero alignmask, +and therefore `crypto_ahash_alignmask` has been removed. + +See also: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=0f8660c82b79af595b056f6b9f4f227edeb88574 + https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=c626910f3f1bbce6ad18bc613d895d2a089ed95e + +Signed-off-by: Joan Bruguera Micó + +Upstream: https://github.com/cryptodev-linux/cryptodev-linux/commit/5e7121e45ff283d30097da381fd7e97c4bb61364 +Signed-off-by: Fabrice Fontaine +--- + cryptlib.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/cryptlib.c b/cryptlib.c +index 4d739e5..0e59d4c 100644 +--- a/cryptlib.c ++++ b/cryptlib.c +@@ -381,7 +381,11 @@ int cryptodev_hash_init(struct hash_data *hdata, const char *alg_name, + } + + hdata->digestsize = crypto_ahash_digestsize(hdata->async.s); ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 7, 0)) + hdata->alignmask = crypto_ahash_alignmask(hdata->async.s); ++#else ++ hdata->alignmask = 0; ++#endif + + init_completion(&hdata->async.result.completion); + From 22bd9931a30d6b455a5932bd50f9cce120d35965 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 25 May 2024 08:21:42 +0200 Subject: [PATCH 5681/5754] package/dhcpcd: bump to version 10.0.8 https://github.com/NetworkConfiguration/dhcpcd/releases/tag/v10.0.8 https://github.com/NetworkConfiguration/dhcpcd/releases/tag/v10.0.7 https://github.com/NetworkConfiguration/dhcpcd/releases/tag/v10.0.6 Signed-off-by: Fabrice Fontaine [Peter: drop stray line in .mk] Signed-off-by: Peter Korsgaard (cherry picked from commit c4cae92b7659dca3e4197d2af82a5e5e6fb3667a) Signed-off-by: Peter Korsgaard --- package/dhcpcd/dhcpcd.hash | 4 ++-- package/dhcpcd/dhcpcd.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/dhcpcd/dhcpcd.hash b/package/dhcpcd/dhcpcd.hash index fb4f6064bc..d29f49fd28 100644 --- a/package/dhcpcd/dhcpcd.hash +++ b/package/dhcpcd/dhcpcd.hash @@ -1,4 +1,4 @@ -# sha256 from https://github.com/NetworkConfiguration/dhcpcd/releases/tag/v10.0.4 -sha256 eb1f3cfef3069781ff8c896d7cea922639964afe22db28c069dc3f37f57eb428 dhcpcd-10.0.5.tar.xz +# sha256 from https://github.com/NetworkConfiguration/dhcpcd/releases/tag/v10.0.8 +sha256 d8dddf9f971a8d9ff828f33d8fa9f6d9a892a4a1429d230e9efb2be97dd0e313 dhcpcd-10.0.8.tar.xz # Locally calculated sha256 a7d6da3a202cdd38eaab0bcea4d25f60d002980f3785b3e896d9bf387f093ac8 LICENSE diff --git a/package/dhcpcd/dhcpcd.mk b/package/dhcpcd/dhcpcd.mk index 991c5cca57..48a418d4ad 100644 --- a/package/dhcpcd/dhcpcd.mk +++ b/package/dhcpcd/dhcpcd.mk @@ -4,7 +4,7 @@ # ################################################################################ -DHCPCD_VERSION = 10.0.5 +DHCPCD_VERSION = 10.0.8 DHCPCD_SOURCE = dhcpcd-$(DHCPCD_VERSION).tar.xz DHCPCD_SITE = https://github.com/NetworkConfiguration/dhcpcd/releases/download/v$(DHCPCD_VERSION) DHCPCD_DEPENDENCIES = host-pkgconf From 520c2185b7b28218541ffbdecbf7d5fd5dd50f48 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 25 May 2024 11:04:35 +0200 Subject: [PATCH 5682/5754] configs/orangepi_r1_defconfig: u-boot 2024.01 needs host-openssl Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6918689094 Commit 113eeb55d67 (configs/orangepi_r1_defconfig: bump U-boot to v2024.01 to fix compatibility with setuptools >= 69) bumped U-Boot, but forgot to add a dependency on host-openssl. Fix that. Signed-off-by: Peter Korsgaard (cherry picked from commit 8eae5a07d272db6e15252d0adcb8c5ef85b93780) Signed-off-by: Peter Korsgaard --- configs/orangepi_r1_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/orangepi_r1_defconfig b/configs/orangepi_r1_defconfig index d7a21894bd..5e7dccf49b 100644 --- a/configs/orangepi_r1_defconfig +++ b/configs/orangepi_r1_defconfig @@ -24,6 +24,7 @@ BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_r1" 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_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" BR2_PACKAGE_HOST_DOSFSTOOLS=y From 25c23920ffd49f2a6c752488167e93bf87e89b89 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 25 May 2024 11:04:36 +0200 Subject: [PATCH 5683/5754] configs/orangepi_pc_defconfig: u-boot 2024.01 needs host-openssl Commit 2e349be94a87db05d (configs/orangepi_pc_defconfig: bump U-boot to v2024.01 to fix compatibility with setuptools >= 69) bumped U-Boot, but forgot to add a dependency on host-openssl. Fix that. Signed-off-by: Peter Korsgaard (cherry picked from commit 96e41a849e128b580507f65ca25ffc8233e227d3) Signed-off-by: Peter Korsgaard --- configs/orangepi_pc_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/orangepi_pc_defconfig b/configs/orangepi_pc_defconfig index 0464de5619..e6898bd13d 100644 --- a/configs/orangepi_pc_defconfig +++ b/configs/orangepi_pc_defconfig @@ -27,6 +27,7 @@ BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_pc" 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_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" BR2_PACKAGE_HOST_GENIMAGE=y From 4ae077510c7322b87a42d08456b75b10c30d7c4f Mon Sep 17 00:00:00 2001 From: Thomas Devoogdt Date: Fri, 5 Apr 2024 16:01:53 +0200 Subject: [PATCH 5684/5754] package/weston: fix xcb-util-cursor dependency for xwayland Run-time dependency xcb-cursor found: NO (tried pkgconfig and cmake) ../../br-test-pkg/bootlin-armv7-glibc/build/weston-13.0.0/tests/meson.build:340:2: ERROR: Problem encountered: xcb and xcb-cursor required for running xwayland tests Fixes: - https://bugs.busybox.net/show_bug.cgi?id=15766 Signed-off-by: Thomas Devoogdt Signed-off-by: Peter Korsgaard (cherry picked from commit fb952e1116dc4f02d9d64402d05b55280d5da178) Signed-off-by: Peter Korsgaard --- package/weston/Config.in | 1 + package/weston/weston.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package/weston/Config.in b/package/weston/Config.in index db6a78ee8a..385f712a40 100644 --- a/package/weston/Config.in +++ b/package/weston/Config.in @@ -133,6 +133,7 @@ config BR2_PACKAGE_WESTON_XWAYLAND depends on BR2_TOOLCHAIN_HAS_SYNC_4 # xwayland -> xlib_libxshmfence select BR2_PACKAGE_CAIRO select BR2_PACKAGE_LIBXCB + select BR2_PACKAGE_XCB_UTIL_CURSOR select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXCURSOR select BR2_PACKAGE_XWAYLAND diff --git a/package/weston/weston.mk b/package/weston/weston.mk index b07e798765..b2d54b71b4 100644 --- a/package/weston/weston.mk +++ b/package/weston/weston.mk @@ -108,7 +108,7 @@ WESTON_CONF_OPTS += -Dbackend-default=$(call qstrip,$(BR2_PACKAGE_WESTON_DEFAULT ifeq ($(BR2_PACKAGE_WESTON_XWAYLAND),y) WESTON_CONF_OPTS += -Dxwayland=true -WESTON_DEPENDENCIES += cairo libepoxy libxcb xlib_libX11 xlib_libXcursor xwayland +WESTON_DEPENDENCIES += cairo libepoxy libxcb xcb-util-cursor xlib_libX11 xlib_libXcursor xwayland else WESTON_CONF_OPTS += -Dxwayland=false endif From 135d6d198e284e9b2b8316948819b2699beebed7 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 26 May 2024 23:06:48 +0200 Subject: [PATCH 5685/5754] package/libarchive: security bump to version 3.7.4 Fixes the following security issues: - CVE-2024-26256: libarchive Remote Code Execution Vulnerability https://github.com/advisories/GHSA-2jc9-36w4-pmqw For more details, see the release notes: https://github.com/libarchive/libarchive/releases/tag/v3.7.4 Signed-off-by: Peter Korsgaard (cherry picked from commit c7a16c79198696e4a7e9863b61920f5f104d942c) Signed-off-by: Peter Korsgaard --- 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 ab6813686e..a2c6488731 100644 --- a/package/libarchive/libarchive.hash +++ b/package/libarchive/libarchive.hash @@ -1,4 +1,4 @@ # From https://www.libarchive.de/downloads/sha256sums -sha256 63e7a7174638fc7d6b79b4c8b0ad954e0f4f45abe7239c1ecb200232aa9a43d2 libarchive-3.7.3.tar.xz +sha256 f887755c434a736a609cbd28d87ddbfbe9d6a3bb5b703c22c02f6af80a802735 libarchive-3.7.4.tar.xz # Locally computed: sha256 b2cdf763345de2de34cebf54394df3c61a105c3b71288603c251f2fa638200ba COPYING diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk index 9c35856ff9..1a50b0472d 100644 --- a/package/libarchive/libarchive.mk +++ b/package/libarchive/libarchive.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBARCHIVE_VERSION = 3.7.3 +LIBARCHIVE_VERSION = 3.7.4 LIBARCHIVE_SOURCE = libarchive-$(LIBARCHIVE_VERSION).tar.xz LIBARCHIVE_SITE = https://www.libarchive.de/downloads LIBARCHIVE_INSTALL_STAGING = YES From f5a4cc44ac1b45cdad3d88cce6836d4bbfd0fe93 Mon Sep 17 00:00:00 2001 From: Alexander Mukhin Date: Fri, 24 May 2024 21:18:56 +0300 Subject: [PATCH 5686/5754] package/zfs: bump version to 2.2.4 Signed-off-by: Alexander Mukhin Signed-off-by: Peter Korsgaard (cherry picked from commit 5746b8b37148f553a5b907735e9f3237cb682ed9) Signed-off-by: Peter Korsgaard --- 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 01c86f2bd6..9c8d4cec85 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.2.2/zfs-2.2.2.sha256.asc -sha256 76bc0547d9ba31d4b0142e417aaaf9f969072c3cb3c1a5b10c8738f39ed12fc9 zfs-2.2.2.tar.gz +# From https://github.com/openzfs/zfs/releases/download/zfs-2.2.4/zfs-2.2.4.sha256.asc +sha256 9790905f7683d41759418e1ef3432828c31116654ff040e91356ff1c21c31ec0 zfs-2.2.4.tar.gz # Hash for license files: sha256 1ffb70c33c4f79f04e947facc5c7851f289609256aacb47fc115f700427d9520 LICENSE diff --git a/package/zfs/zfs.mk b/package/zfs/zfs.mk index 59cdd31942..fa6d282f8c 100644 --- a/package/zfs/zfs.mk +++ b/package/zfs/zfs.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZFS_VERSION = 2.2.2 +ZFS_VERSION = 2.2.4 ZFS_SITE = https://github.com/openzfs/zfs/releases/download/zfs-$(ZFS_VERSION) ZFS_SELINUX_MODULES = zfs ZFS_LICENSE = CDDL From 82dec87ecc69923449f21d932947769e887b996f Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Thu, 23 May 2024 22:09:07 +0200 Subject: [PATCH 5687/5754] package/octave: add optional zlib support Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard (cherry picked from commit fa54abf730ea11bfadd432b645a0735a7b4fe852) Signed-off-by: Peter Korsgaard --- package/octave/octave.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/octave/octave.mk b/package/octave/octave.mk index f240a5057c..d3aec697d5 100644 --- a/package/octave/octave.mk +++ b/package/octave/octave.mk @@ -28,4 +28,11 @@ else OCTAVE_CONF_OPTS += --disable-readline endif +ifeq ($(BR2_PACKAGE_ZLIB),y) +OCTAVE_CONF_OPTS += --with-z +OCTAVE_DEPENDENCIES += zlib +else +OCTAVE_CONF_OPTS += --without-z +endif + $(eval $(autotools-package)) From b746f626cbc56b7351c6c5990ffbd7be3ccf71b8 Mon Sep 17 00:00:00 2001 From: Alexander Mukhin Date: Fri, 24 May 2024 15:54:48 +0300 Subject: [PATCH 5688/5754] package/tinyproxy: bump version to 1.11.2 Drop now included patch. Signed-off-by: Alexander Mukhin [Peter: drop patch from .checkpackageignore] Signed-off-by: Peter Korsgaard (cherry picked from commit 9fcdc50175b02adce950e90e8d2ae2b7d1396761) Signed-off-by: Peter Korsgaard --- .checkpackageignore | 1 - ...up-in-error-page-in-invalid-requests.patch | 32 ------------------- package/tinyproxy/tinyproxy.hash | 4 +-- package/tinyproxy/tinyproxy.mk | 5 +-- 4 files changed, 3 insertions(+), 39 deletions(-) delete mode 100644 package/tinyproxy/0001-prevent-junk-from-showing-up-in-error-page-in-invalid-requests.patch diff --git a/.checkpackageignore b/.checkpackageignore index 364701fe1a..536788f5ea 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1262,7 +1262,6 @@ 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/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/tpm2-abrmd/S80tpm2-abrmd Indent Shellcheck Variables package/tpm2-tss/0001-Temporary-fix-for-build-without-C.patch Upstream diff --git a/package/tinyproxy/0001-prevent-junk-from-showing-up-in-error-page-in-invalid-requests.patch b/package/tinyproxy/0001-prevent-junk-from-showing-up-in-error-page-in-invalid-requests.patch deleted file mode 100644 index da9c21a41a..0000000000 --- a/package/tinyproxy/0001-prevent-junk-from-showing-up-in-error-page-in-invalid-requests.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 3764b8551463b900b5b4e3ec0cd9bb9182191cb7 Mon Sep 17 00:00:00 2001 -From: rofl0r -Date: Thu, 8 Sep 2022 15:18:04 +0000 -Subject: [PATCH] prevent junk from showing up in error page in invalid - requests - -fixes #457 - -[Retrieved from: -https://github.com/tinyproxy/tinyproxy/commit/3764b8551463b900b5b4e3ec0cd9bb9182191cb7] -Signed-off-by: Fabrice Fontaine ---- - src/reqs.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/reqs.c b/src/reqs.c -index bce69819..45db118d 100644 ---- a/src/reqs.c -+++ b/src/reqs.c -@@ -343,8 +343,12 @@ static struct request_s *process_request (struct conn_s *connptr, - goto fail; - } - -+ /* zero-terminate the strings so they don't contain junk in error page */ -+ request->method[0] = url[0] = request->protocol[0] = 0; -+ - ret = sscanf (connptr->request_line, "%[^ ] %[^ ] %[^ ]", - request->method, url, request->protocol); -+ - if (ret == 2 && !strcasecmp (request->method, "GET")) { - request->protocol[0] = 0; - diff --git a/package/tinyproxy/tinyproxy.hash b/package/tinyproxy/tinyproxy.hash index 84e98a84ce..8d4bb69537 100644 --- a/package/tinyproxy/tinyproxy.hash +++ b/package/tinyproxy/tinyproxy.hash @@ -1,4 +1,4 @@ -# From https://github.com/tinyproxy/tinyproxy/releases/tag/1.11.1 -sha512 2e3435bbfece3797c11ccce222eef494ed92e00dd82bea2c40a54e454b7e03c8abc8e09b244f2da7192209c39047369439d08974b79eebc996fb3095230d0374 tinyproxy-1.11.1.tar.xz +# From https://github.com/tinyproxy/tinyproxy/releases/tag/1.11.2 +sha512 008e43b770f946965d5a3fbad1881859e30b66a3a4a97cf9982e63d81139da7a8f23937601b72f32276166cd170008cafec9231b616fc840f05cae3c1329be35 tinyproxy-1.11.2.tar.xz # locally computed sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/tinyproxy/tinyproxy.mk b/package/tinyproxy/tinyproxy.mk index e989f70a22..6656a752a6 100644 --- a/package/tinyproxy/tinyproxy.mk +++ b/package/tinyproxy/tinyproxy.mk @@ -4,14 +4,11 @@ # ################################################################################ -TINYPROXY_VERSION = 1.11.1 +TINYPROXY_VERSION = 1.11.2 TINYPROXY_SITE = https://github.com/tinyproxy/tinyproxy/releases/download/$(TINYPROXY_VERSION) TINYPROXY_SOURCE = tinyproxy-$(TINYPROXY_VERSION).tar.xz TINYPROXY_LICENSE = GPL-2.0+ TINYPROXY_LICENSE_FILES = COPYING TINYPROXY_CPE_ID_VALID = YES -# 0001-prevent-junk-from-showing-up-in-error-page-in-invalid-requests.patch -TINYPROXY_IGNORE_CVES += CVE-2022-40468 - $(eval $(autotools-package)) From de27070009d79e03243f1f9cff905b26f4df0dc5 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Wed, 22 May 2024 12:16:04 +0300 Subject: [PATCH 5689/5754] package/libwpe: bump to version 1.16.0 This new stable series brings in support for pointer lock, customization of subprocess launching, and a build fix that allows using EGL implementations that do not ship a pkg-config module. Version 1.16.x is recommended for WPE WebKit 2.44.x, which will be updated in a follow-up patch. Release notes: https://wpewebkit.org/release/libwpe-1.16.0.html Signed-off-by: Adrian Perez de Castro Signed-off-by: Peter Korsgaard (cherry picked from commit 8845a796bb4bc04d0504496e09a4634a93165b1d) Signed-off-by: Peter Korsgaard --- package/libwpe/libwpe.hash | 7 ++++--- package/libwpe/libwpe.mk | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/libwpe/libwpe.hash b/package/libwpe/libwpe.hash index 554b1f2b0e..2a2ee3c2e9 100644 --- a/package/libwpe/libwpe.hash +++ b/package/libwpe/libwpe.hash @@ -1,6 +1,7 @@ -# From https://wpewebkit.org/releases/libwpe-1.14.2.tar.xz.sums -sha1 70a2b894af2b50d7082260158a89524974a480f3 libwpe-1.14.2.tar.xz -sha256 8ae38022c50cb340c96fdbee1217f1e46ab57fbc1c8ba98142565abbedbe22ef libwpe-1.14.2.tar.xz +# From https://wpewebkit.org/releases/libwpe-1.16.0.tar.xz.sums +md5 9779115aaa7e67abe642777394e7bfa2 libwpe-1.16.0.tar.xz +sha1 ea574e09b5d47461a5579a24006488419474d136 libwpe-1.16.0.tar.xz +sha256 c7f3a3c6b3d006790d486dc7cceda2b6d2e329de07f33bc47dfc53f00f334b2a libwpe-1.16.0.tar.xz # Hashes for license files: sha256 35bef295cedbbf179eaee14328002587a0e7dc08ebf3f15ea080a6f2815f0d7b COPYING diff --git a/package/libwpe/libwpe.mk b/package/libwpe/libwpe.mk index 1fbdd5fcc3..de49cedfb4 100644 --- a/package/libwpe/libwpe.mk +++ b/package/libwpe/libwpe.mk @@ -5,7 +5,7 @@ ################################################################################ # The middle number is even for stable releases, odd for development ones. -LIBWPE_VERSION = 1.14.2 +LIBWPE_VERSION = 1.16.0 LIBWPE_SITE = https://wpewebkit.org/releases LIBWPE_SOURCE = libwpe-$(LIBWPE_VERSION).tar.xz LIBWPE_INSTALL_STAGING = YES From ee23cf19e0efdb7e36aedffbc6a35c6ca9061e37 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Wed, 22 May 2024 12:16:05 +0300 Subject: [PATCH 5690/5754] package/wpewebkit: security bump to version 2.44.2 Update to the most recent stable release of WPE WebKit. As this is a change to a newer release series, there are a few changes in the CMake build options. Dependencies mostly remain the same. The main changes are: - The new ENABLE_WEB_CODECS option is set along with ENABLE_VIDEO and ENABLE_WEB_RTC depending on BR2_PACKAGE_WPEWEBKIT_MULTIMEDIA. - The new USE_LIBBACKTRACE option is set accordingly, depending on BR2_PACKAGE_LIBBACKTRACE. - WebAssembly does not work with ENABLE_C_LOOP, so it needs to be disabled alongside it for MIPSr6, ARMv5 and ARMv6; not that building WebAssembly support is enabled by default. - ENABLE_ACCESSIBILITY has been removed, instead the new USE_ATK option can be used to the same effect. - JPEG2000 is no longer supported, the openjpeg dependency is removed. Release notes and announcement: - https://wpewebkit.org/blog/2024-wpewebkit-2.44.html - https://wpewebkit.org/release/wpewebkit-2.44.0.html - https://wpewebkit.org/release/wpewebkit-2.44.1.html - https://wpewebkit.org/release/wpewebkit-2.44.2.html Relevant security advisories: - https://wpewebkit.org/security/WSA-2024-0002.html - https://wpewebkit.org/security/WSA-2024-0003.html Signed-off-by: Adrian Perez de Castro [Peter: use .tar.xz] Signed-off-by: Peter Korsgaard (cherry picked from commit 3d235a0689a7d571a8b67c474644312989275d3e) Signed-off-by: Peter Korsgaard --- ...cpp-fails-to-build-NEON-fast-path-se.patch | 337 ------------------ ...velInterpreter.cpp-339-21-error-t6-w.patch | 39 -- package/wpewebkit/Config.in | 1 - package/wpewebkit/wpewebkit.hash | 7 +- package/wpewebkit/wpewebkit.mk | 30 +- 5 files changed, 26 insertions(+), 388 deletions(-) delete mode 100644 package/wpewebkit/0001-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se.patch delete mode 100644 package/wpewebkit/0002-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch diff --git a/package/wpewebkit/0001-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se.patch b/package/wpewebkit/0001-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se.patch deleted file mode 100644 index 17d4957657..0000000000 --- a/package/wpewebkit/0001-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se.patch +++ /dev/null @@ -1,337 +0,0 @@ -From 5ba2d275457c4fdf1efdcca8351792400bda5679 Mon Sep 17 00:00:00 2001 -From: Adrian Perez de Castro -Date: Thu, 2 Jun 2022 11:19:06 +0300 -Subject: [PATCH] FELightningNEON.cpp fails to build, NEON fast path seems - unused https://bugs.webkit.org/show_bug.cgi?id=241182 - -Reviewed by NOBODY (OOPS!). - -Move the NEON fast path for the SVG lighting filter effects into -FELightingSoftwareApplier, and arrange to actually use them by -forwarding calls to applyPlatformGeneric() into applyPlatformNeon(). - -Some changes were needed to adapt platformApplyNeon() to the current -state of filters after r286140. This was not detected because the code -bitrotted due to it being guarded with CPU(ARM_TRADITIONAL), which does -not get used much these days: CPU(ARM_THUMB2) is more common. It should -be possible to use the NEON fast paths also in Thumb mode, but that is -left for a follow-up fix. - -* Source/WebCore/Sources.txt: -* Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp: -(WebCore::FELightingSoftwareApplier::platformApplyNeonWorker): -(WebCore::FELightingSoftwareApplier::getPowerCoefficients): -(WebCore::FELighting::platformApplyNeonWorker): Deleted. -(WebCore::FELighting::getPowerCoefficients): Deleted. -* Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h: -(WebCore::FELightingSoftwareApplier::applyPlatformNeon): -(WebCore::FELighting::platformApplyNeon): Deleted. -* Source/WebCore/platform/graphics/filters/DistantLightSource.h: -* Source/WebCore/platform/graphics/filters/FELighting.h: -* Source/WebCore/platform/graphics/filters/PointLightSource.h: -* Source/WebCore/platform/graphics/filters/SpotLightSource.h: -* Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h: - -Signed-off-by: Adrian Perez de Castro -Upstream: https://bugs.webkit.org/show_bug.cgi?id=241182 ---- - Source/WebCore/Sources.txt | 1 + - .../cpu/arm/filters/FELightingNEON.cpp | 6 +-- - .../graphics/cpu/arm/filters/FELightingNEON.h | 54 +++++++++---------- - .../graphics/filters/DistantLightSource.h | 4 ++ - .../platform/graphics/filters/FELighting.h | 7 --- - .../graphics/filters/PointLightSource.h | 4 ++ - .../graphics/filters/SpotLightSource.h | 4 ++ - .../software/FELightingSoftwareApplier.h | 16 ++++++ - 8 files changed, 59 insertions(+), 37 deletions(-) - -diff --git a/Source/WebCore/Sources.txt b/Source/WebCore/Sources.txt -index 9ca28a7b2bc0..ed2c7f9f41ee 100644 ---- a/Source/WebCore/Sources.txt -+++ b/Source/WebCore/Sources.txt -@@ -2303,6 +2303,7 @@ platform/graphics/controls/MeterPart.cpp - platform/graphics/controls/ProgressBarPart.cpp - platform/graphics/controls/SliderTrackPart.cpp - platform/graphics/cpu/arm/filters/FEBlendNeonApplier.cpp -+platform/graphics/cpu/arm/filters/FELightingNEON.cpp - platform/graphics/displaylists/DisplayList.cpp - platform/graphics/displaylists/DisplayListDrawingContext.cpp - platform/graphics/displaylists/DisplayListItems.cpp -diff --git a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp -index f6ff8c20a5a8..dced3d55eb4e 100644 ---- a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp -+++ b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp -@@ -35,7 +35,7 @@ namespace WebCore { - // ALPHAX_Q ALPHAY_Q REMAPX_D REMAPY_D - - --static alignas(16) short s_FELightingConstantsForNeon[] = { -+alignas(16) static short s_FELightingConstantsForNeon[] = { - // Alpha coefficients. - -2, 1, 0, -1, 2, 1, 0, -1, - 0, -1, -2, -1, 0, 1, 2, 1, -@@ -49,7 +49,7 @@ short* feLightingConstantsForNeon() - return s_FELightingConstantsForNeon; - } - --void FELighting::platformApplyNeonWorker(FELightingPaintingDataForNeon* parameters) -+void FELightingSoftwareApplier::platformApplyNeonWorker(FELightingPaintingDataForNeon* parameters) - { - neonDrawLighting(parameters); - } -@@ -464,7 +464,7 @@ TOSTRING(neonDrawLighting) ":" NL - "b .lightStrengthCalculated" NL - ); // NOLINT - --int FELighting::getPowerCoefficients(float exponent) -+int FELightingSoftwareApplier::getPowerCoefficients(float exponent) - { - // Calling a powf function from the assembly code would require to save - // and reload a lot of NEON registers. Since the base is in range [0..1] -diff --git a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h -index b17c603d40d3..fd23e31cce29 100644 ---- a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h -+++ b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h -@@ -24,14 +24,15 @@ - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - --#ifndef FELightingNEON_h --#define FELightingNEON_h -+#pragma once - - #if CPU(ARM_NEON) && CPU(ARM_TRADITIONAL) && COMPILER(GCC_COMPATIBLE) - --#include "FELighting.h" -+#include "FELightingSoftwareApplier.h" -+#include "ImageBuffer.h" - #include "PointLightSource.h" - #include "SpotLightSource.h" -+#include - #include - - namespace WebCore { -@@ -93,14 +94,14 @@ extern "C" { - void neonDrawLighting(FELightingPaintingDataForNeon*); - } - --inline void FELighting::platformApplyNeon(const LightingData& data, const LightSource::PaintingData& paintingData) -+inline void FELightingSoftwareApplier::applyPlatformNeon(const FELightingSoftwareApplier::LightingData& data, const LightSource::PaintingData& paintingData) - { -- alignas(16) FELightingFloatArgumentsForNeon floatArguments; -- FELightingPaintingDataForNeon neonData = { -- data.pixels->data(), -+ alignas(16) WebCore::FELightingFloatArgumentsForNeon floatArguments; -+ WebCore::FELightingPaintingDataForNeon neonData = { -+ data.pixels->bytes(), - 1, -- data.widthDecreasedByOne - 1, -- data.heightDecreasedByOne - 1, -+ data.width - 2, -+ data.height - 2, - 0, - 0, - 0, -@@ -111,23 +112,23 @@ inline void FELighting::platformApplyNeon(const LightingData& data, const LightS - // Set light source arguments. - floatArguments.constOne = 1; - -- auto color = m_lightingColor.toColorTypeLossy>().resolved(); -+ auto color = data.lightingColor.toColorTypeLossy>().resolved(); - - floatArguments.colorRed = color.red; - floatArguments.colorGreen = color.green; - floatArguments.colorBlue = color.blue; - floatArguments.padding4 = 0; - -- if (m_lightSource->type() == LS_POINT) { -+ if (data.lightSource->type() == LS_POINT) { - neonData.flags |= FLAG_POINT_LIGHT; -- PointLightSource& pointLightSource = static_cast(m_lightSource.get()); -+ const auto& pointLightSource = *static_cast(data.lightSource); - floatArguments.lightX = pointLightSource.position().x(); - floatArguments.lightY = pointLightSource.position().y(); - floatArguments.lightZ = pointLightSource.position().z(); - floatArguments.padding2 = 0; -- } else if (m_lightSource->type() == LS_SPOT) { -+ } else if (data.lightSource->type() == LS_SPOT) { - neonData.flags |= FLAG_SPOT_LIGHT; -- SpotLightSource& spotLightSource = static_cast(m_lightSource.get()); -+ const auto& spotLightSource = *static_cast(data.lightSource); - floatArguments.lightX = spotLightSource.position().x(); - floatArguments.lightY = spotLightSource.position().y(); - floatArguments.lightZ = spotLightSource.position().z(); -@@ -145,7 +146,7 @@ inline void FELighting::platformApplyNeon(const LightingData& data, const LightS - if (spotLightSource.specularExponent() == 1) - neonData.flags |= FLAG_CONE_EXPONENT_IS_1; - } else { -- ASSERT(m_lightSource->type() == LS_DISTANT); -+ ASSERT(data.lightSource->type() == LS_DISTANT); - floatArguments.lightX = paintingData.initialLightingData.lightVector.x(); - floatArguments.lightY = paintingData.initialLightingData.lightVector.y(); - floatArguments.lightZ = paintingData.initialLightingData.lightVector.z(); -@@ -155,38 +156,39 @@ inline void FELighting::platformApplyNeon(const LightingData& data, const LightS - // Set lighting arguments. - floatArguments.surfaceScale = data.surfaceScale; - floatArguments.minusSurfaceScaleDividedByFour = -data.surfaceScale / 4; -- if (m_lightingType == FELighting::DiffuseLighting) -- floatArguments.diffuseConstant = m_diffuseConstant; -+ if (data.filterType == FilterEffect::Type::FEDiffuseLighting) -+ floatArguments.diffuseConstant = data.diffuseConstant; - else { - neonData.flags |= FLAG_SPECULAR_LIGHT; -- floatArguments.diffuseConstant = m_specularConstant; -- neonData.specularExponent = getPowerCoefficients(m_specularExponent); -- if (m_specularExponent == 1) -+ floatArguments.diffuseConstant = data.specularConstant; -+ neonData.specularExponent = getPowerCoefficients(data.specularExponent); -+ if (data.specularExponent == 1) - neonData.flags |= FLAG_SPECULAR_EXPONENT_IS_1; - } - if (floatArguments.diffuseConstant == 1) - neonData.flags |= FLAG_DIFFUSE_CONST_IS_1; - -- int optimalThreadNumber = ((data.widthDecreasedByOne - 1) * (data.heightDecreasedByOne - 1)) / s_minimalRectDimension; -+ static constexpr int minimalRectDimension = 100 * 100; // Empirical data limit for parallel jobs -+ int optimalThreadNumber = ((data.width - 2) * (data.height - 2)) / minimalRectDimension; - if (optimalThreadNumber > 1) { - // Initialize parallel jobs -- ParallelJobs parallelJobs(&WebCore::FELighting::platformApplyNeonWorker, optimalThreadNumber); -+ ParallelJobs parallelJobs(&FELightingSoftwareApplier::platformApplyNeonWorker, optimalThreadNumber); - - // Fill the parameter array - int job = parallelJobs.numberOfJobs(); - if (job > 1) { - int yStart = 1; -- int yStep = (data.heightDecreasedByOne - 1) / job; -+ int yStep = (data.height - 2) / job; - for (--job; job >= 0; --job) { - FELightingPaintingDataForNeon& params = parallelJobs.parameter(job); - params = neonData; - params.yStart = yStart; -- params.pixels += (yStart - 1) * (data.widthDecreasedByOne + 1) * 4; -+ params.pixels += (yStart - 1) * data.width * 4; - if (job > 0) { - params.absoluteHeight = yStep; - yStart += yStep; - } else -- params.absoluteHeight = data.heightDecreasedByOne - yStart; -+ params.absoluteHeight = (data.height - 1) - yStart; - } - parallelJobs.execute(); - return; -@@ -199,5 +201,3 @@ inline void FELighting::platformApplyNeon(const LightingData& data, const LightS - } // namespace WebCore - - #endif // CPU(ARM_NEON) && COMPILER(GCC_COMPATIBLE) -- --#endif // FELightingNEON_h -diff --git a/Source/WebCore/platform/graphics/filters/DistantLightSource.h b/Source/WebCore/platform/graphics/filters/DistantLightSource.h -index 70f583b36e2c..7d5d27e5ccf8 100644 ---- a/Source/WebCore/platform/graphics/filters/DistantLightSource.h -+++ b/Source/WebCore/platform/graphics/filters/DistantLightSource.h -@@ -26,6 +26,10 @@ - #include - #include - -+namespace WTF { -+class TextStream; -+} // namespace WTF -+ - namespace WebCore { - - class DistantLightSource : public LightSource { -diff --git a/Source/WebCore/platform/graphics/filters/FELighting.h b/Source/WebCore/platform/graphics/filters/FELighting.h -index 179edf6dba24..694d712d56fd 100644 ---- a/Source/WebCore/platform/graphics/filters/FELighting.h -+++ b/Source/WebCore/platform/graphics/filters/FELighting.h -@@ -35,8 +35,6 @@ - - namespace WebCore { - --struct FELightingPaintingDataForNeon; -- - class FELighting : public FilterEffect { - public: - bool operator==(const FELighting&) const; -@@ -68,11 +66,6 @@ protected: - - std::unique_ptr createSoftwareApplier() const override; - --#if CPU(ARM_NEON) && CPU(ARM_TRADITIONAL) && COMPILER(GCC_COMPATIBLE) -- static int getPowerCoefficients(float exponent); -- inline void platformApplyNeon(const LightingData&, const LightSource::PaintingData&); --#endif -- - Color m_lightingColor; - float m_surfaceScale; - float m_diffuseConstant; -diff --git a/Source/WebCore/platform/graphics/filters/PointLightSource.h b/Source/WebCore/platform/graphics/filters/PointLightSource.h -index a8cfdab895a9..34f867bba237 100644 ---- a/Source/WebCore/platform/graphics/filters/PointLightSource.h -+++ b/Source/WebCore/platform/graphics/filters/PointLightSource.h -@@ -26,6 +26,10 @@ - #include "LightSource.h" - #include - -+namespace WTF { -+class TextStream; -+} // namespace WTF -+ - namespace WebCore { - - class PointLightSource : public LightSource { -diff --git a/Source/WebCore/platform/graphics/filters/SpotLightSource.h b/Source/WebCore/platform/graphics/filters/SpotLightSource.h -index 6404467a5b6f..5cac38f22362 100644 ---- a/Source/WebCore/platform/graphics/filters/SpotLightSource.h -+++ b/Source/WebCore/platform/graphics/filters/SpotLightSource.h -@@ -26,6 +26,10 @@ - #include "LightSource.h" - #include - -+namespace WTF { -+class TextStream; -+} // namespace WTF -+ - namespace WebCore { - - class SpotLightSource : public LightSource { -diff --git a/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h b/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h -index c974d92115ff..e2896660cfbd 100644 ---- a/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h -+++ b/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h -@@ -36,6 +36,7 @@ - namespace WebCore { - - class FELighting; -+struct FELightingPaintingDataForNeon; - - class FELightingSoftwareApplier final : public FilterEffectConcreteApplier { - WTF_MAKE_FAST_ALLOCATED; -@@ -132,8 +133,23 @@ private: - - static void applyPlatformGenericPaint(const LightingData&, const LightSource::PaintingData&, int startY, int endY); - static void applyPlatformGenericWorker(ApplyParameters*); -+ -+#if CPU(ARM_NEON) && CPU(ARM_TRADITIONAL) && COMPILER(GCC_COMPATIBLE) -+ static int getPowerCoefficients(float exponent); -+ static void platformApplyNeonWorker(FELightingPaintingDataForNeon*); -+ inline static void applyPlatformNeon(const LightingData&, const LightSource::PaintingData&); -+ -+ inline static void applyPlatformGeneric(const LightingData& data, const LightSource::PaintingData& paintingData) -+ { -+ applyPlatformNeon(data, paintingData); -+ } -+#else - static void applyPlatformGeneric(const LightingData&, const LightSource::PaintingData&); -+#endif -+ - static void applyPlatform(const LightingData&); - }; - - } // namespace WebCore -+ -+#include "FELightingNEON.h" --- -2.43.1 - diff --git a/package/wpewebkit/0002-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch b/package/wpewebkit/0002-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch deleted file mode 100644 index a15d9e647f..0000000000 --- a/package/wpewebkit/0002-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 3d5373575695b293b8559155431d0079a6153aff Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro -Date: Mon, 5 Feb 2024 11:00:49 -0600 -Subject: [PATCH] =?UTF-8?q?[GTK]=20[2.42.5]=20LowLevelInterpreter.cpp:339:?= - =?UTF-8?q?21:=20error:=20=E2=80=98t6=E2=80=99=20was=20not=20declared=20in?= - =?UTF-8?q?=20this=20scope=20https://bugs.webkit.org/show=5Fbug.cgi=3Fid?= - =?UTF-8?q?=3D268739?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Unreviewed build fix. Seems a backport went badly, and we didn't notice -because the code is architecture-specific. - -* Source/JavaScriptCore/llint/LowLevelInterpreter.cpp: -(JSC::CLoop::execute): - -Upstream: https://github.com/WebKit/WebKit/commit/3d5373575695b293b8559155431d0079a6153aff -Signed-off-by: Adrian Perez de Castro ---- - Source/JavaScriptCore/llint/LowLevelInterpreter.cpp | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp -index 5064ead6cd2e..9a2e2653b121 100644 ---- a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp -+++ b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp -@@ -336,8 +336,6 @@ JSValue CLoop::execute(OpcodeID entryOpcodeID, void* executableAddress, VM* vm, - UNUSED_VARIABLE(t2); - UNUSED_VARIABLE(t3); - UNUSED_VARIABLE(t5); -- UNUSED_VARIABLE(t6); -- UNUSED_VARIABLE(t7); - - struct StackPointerScope { - StackPointerScope(CLoopStack& stack) --- -2.43.1 - diff --git a/package/wpewebkit/Config.in b/package/wpewebkit/Config.in index 432aa4c3a3..e4b0320e1d 100644 --- a/package/wpewebkit/Config.in +++ b/package/wpewebkit/Config.in @@ -54,7 +54,6 @@ config BR2_PACKAGE_WPEWEBKIT select BR2_PACKAGE_LIBSOUP3 select BR2_PACKAGE_LIBTASN1 select BR2_PACKAGE_LIBXSLT - select BR2_PACKAGE_OPENJPEG select BR2_PACKAGE_WAYLAND select BR2_PACKAGE_WAYLAND_PROTOCOLS select BR2_PACKAGE_WEBP diff --git a/package/wpewebkit/wpewebkit.hash b/package/wpewebkit/wpewebkit.hash index 71e41bb1dd..790adbb0d4 100644 --- a/package/wpewebkit/wpewebkit.hash +++ b/package/wpewebkit/wpewebkit.hash @@ -1,6 +1,7 @@ -# From https://wpewebkit.org/releases/wpewebkit-2.42.5.tar.xz.sums -sha1 50a18f43452520e9f34f84c04bc0166af655ffff wpewebkit-2.42.5.tar.xz -sha256 4dbab6c5e6dc0c65a3d7dffc1c2390be5f9abd423faf983fe3a55fe081df0532 wpewebkit-2.42.5.tar.xz +# From https://wpewebkit.org/releases/wpewebkit-2.44.2.tar.xz.sums +md5 0e2a6d05b000e79c51c537ab3261b171 wpewebkit-2.44.2.tar.xz +sha1 5bded217fab25aea776e41158fcdbd72d69a612e wpewebkit-2.44.2.tar.xz +sha256 2a3d23cb4fb071ca0db3a09c5a85f27b8bcc6094a2026d3b7407bed4f99218f7 wpewebkit-2.44.2.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 442709848a..ecb3b3e352 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -5,7 +5,7 @@ ################################################################################ # The middle number is even for stable releases, odd for development ones. -WPEWEBKIT_VERSION = 2.42.5 +WPEWEBKIT_VERSION = 2.44.2 WPEWEBKIT_SITE = https://wpewebkit.org/releases WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz WPEWEBKIT_INSTALL_STAGING = YES @@ -17,18 +17,18 @@ 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 libsoup3 libtasn1 \ - libpng libxslt openjpeg wayland-protocols webp wpebackend-fdo + libpng libxslt wayland-protocols webp wpebackend-fdo WPEWEBKIT_CMAKE_BACKEND = ninja WPEWEBKIT_CONF_OPTS = \ -DPORT=WPE \ - -DENABLE_ACCESSIBILITY=OFF \ -DENABLE_API_TESTS=OFF \ -DENABLE_DOCUMENTATION=OFF \ -DENABLE_INTROSPECTION=OFF \ -DENABLE_MINIBROWSER=OFF \ -DENABLE_WEB_RTC=OFF \ + -DUSE_ATK=OFF \ -DUSE_AVIF=OFF ifeq ($(BR2_PACKAGE_WPEWEBKIT_SANDBOX),y) @@ -44,12 +44,14 @@ endif ifeq ($(BR2_PACKAGE_WPEWEBKIT_MULTIMEDIA),y) WPEWEBKIT_CONF_OPTS += \ -DENABLE_VIDEO=ON \ - -DENABLE_WEB_AUDIO=ON + -DENABLE_WEB_AUDIO=ON \ + -DENABLE_WEB_CODECS=ON WPEWEBKIT_DEPENDENCIES += gstreamer1 gst1-libav gst1-plugins-base else WPEWEBKIT_CONF_OPTS += \ -DENABLE_VIDEO=OFF \ - -DENABLE_WEB_AUDIO=OFF + -DENABLE_WEB_AUDIO=OFF \ + -DENABLE_WEB_CODECS=OFF endif ifeq ($(BR2_PACKAGE_WPEWEBKIT_MEDIA_STREAM),y) @@ -78,6 +80,13 @@ else WPEWEBKIT_CONF_OPTS += -DUSE_LCMS=OFF endif +ifeq ($(BR2_PACKAGE_LIBBACKTRACE),y) +WPEWEBKIT_CONF_OPTS += -DUSE_LIBBACKTRACE=ON +WPEWEBKIT_DEPENDENCIES += libbacktrace +else +WPEWEBKIT_CONF_OPTS += -DUSE_LIBBACKTRACE=OFF +endif + ifeq ($(BR2_PACKAGE_WOFF2),y) WPEWEBKIT_CONF_OPTS += -DUSE_WOFF2=ON WPEWEBKIT_DEPENDENCIES += woff2 @@ -110,14 +119,19 @@ endif # have a check for these processors. The same goes for ARMv5 and ARMv6. # Disable JIT forcibly here and use the CLoop interpreter instead. # -# Also, we have to disable the sampling profiler, which does NOT work -# with ENABLE_C_LOOP. +# Also, we have to disable the sampling profiler and WebAssembly, which +# do NOT work with ENABLE_C_LOOP. # # Upstream bugs: https://bugs.webkit.org/show_bug.cgi?id=191258 # https://bugs.webkit.org/show_bug.cgi?id=172765 +# https://bugs.webkit.org/show_bug.cgi?id=265218 # ifeq ($(BR2_ARM_CPU_ARMV5)$(BR2_ARM_CPU_ARMV6)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS_CPU_MIPS64R6),y) -WPEWEBKIT_CONF_OPTS += -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON -DENABLE_SAMPLING_PROFILER=OFF +WPEWEBKIT_CONF_OPTS += \ + -DENABLE_JIT=OFF \ + -DENABLE_C_LOOP=ON \ + -DENABLE_SAMPLING_PROFILER=OFF \ + -DENABLE_WEBASSEMBLY=OFF endif $(eval $(cmake-package)) From ff7ef4994cc13da98b2219dfc5f0d00ff53e9b25 Mon Sep 17 00:00:00 2001 From: Alexander Mukhin Date: Mon, 27 May 2024 18:56:39 +0300 Subject: [PATCH 5691/5754] DEVELOPERS: add Alexander Mukhin for package/zfs Signed-off-by: Alexander Mukhin Signed-off-by: Peter Korsgaard (cherry picked from commit 3beef4b0d41ec862fd89745bc9f496247af7bff7) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index dc546e07b3..0e8b98f0f6 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -114,6 +114,7 @@ F: package/libest/ N: Alexander Mukhin F: package/tinyproxy/ +F: package/zfs/ N: Alexander Sverdlin F: package/mini-snmpd/ From bb8e3f45a6e9f72cd4ada71e609600583e5e1d36 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Tue, 28 May 2024 21:20:08 +0200 Subject: [PATCH 5692/5754] package/ccache: always disable developer mode Ccache CMake build system has some conditions that automatically enables a developer mode (sets CCACHE_DEV_MODE=ON). See [1]. More specifically, if CCACHE_DEV_MODE is unset AND the environment variable "CI" is set, CCACHE_DEV_MODE is set to "ON". This situation can happen when Buildroot builds are executed in Jenkins jobs, for example. Since Buildroot does not set CCACHE_DEV_MODE and Jenkins sets the "CI" environment variable, this ccache developer mode can be enabled in an unexpected way for the Buildroot user. For example, it happened that a Jenkins build breaks, while the build with the same configuration in the user session is working. One of the effects of enabling this ccache developer mode, is to treat compiler warnings as errors, see [3]. This can lead to build error, depending on the ccache version and the host compiler being used. This behavior can be reproduced and observed, with commands: cat > .config <(args#0, args#1)' /buildroot/output/build/host-ccache-4.8.2/src/third_party/fmt/core.h:1706:15: error: possibly dangling reference to a temporary [-Werror=dangling-reference] 1706 | const auto& arg = arg_mapper().map(std::forward(val)); | ^~~ This commit sets CCACHE_DEV_MODE=OFF to make the ccache behavior more deterministic in Buildroot, independently of being used in a CI tool or not. [1] https://github.com/ccache/ccache/blob/v4.9.1/CMakeLists.txt#L56 [2] https://github.com/jenkinsci/jenkins/blob/jenkins-2.459/core/src/main/java/jenkins/model/CoreEnvironmentContributor.java#L43 [3] https://github.com/ccache/ccache/blob/v4.9.1/cmake/StandardWarnings.cmake#L5 Reported-by: Xavier Roumegue Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard (cherry picked from commit 197be7ed872a5cd472f64096f34a7bf132274351) Signed-off-by: Peter Korsgaard --- package/ccache/ccache.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/ccache/ccache.mk b/package/ccache/ccache.mk index 96b1b65c5c..5796079295 100644 --- a/package/ccache/ccache.mk +++ b/package/ccache/ccache.mk @@ -15,6 +15,7 @@ HOST_CCACHE_DEPENDENCIES = host-hiredis host-zstd HOST_CCACHE_CONF_OPTS += \ -UCMAKE_C_COMPILER_LAUNCHER \ -UCMAKE_CXX_COMPILER_LAUNCHER \ + -DCCACHE_DEV_MODE=OFF \ -DZSTD_FROM_INTERNET=OFF \ -DHIREDIS_FROM_INTERNET=OFF \ -DENABLE_TESTING=OFF From 3283e5f595757a7523bd0322958dd2cbe302a8fc Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Tue, 28 May 2024 15:09:10 +0000 Subject: [PATCH 5693/5754] utils/add-custom-hashes: symlink linux-headers to linux Most boards use BR2_KERNEL_HEADERS_AS_KERNEL with their custom kernels. So when creating their custom hash files, the linux-headers.hash is the same as linux.hash. In this case we symlink linux-headers to linux to make maintenance easier. Update the add-custom-hashes tool to explicitly handle this case. Signed-off-by: Brandon Maier [Peter: use cmp -s] Signed-off-by: Peter Korsgaard (cherry picked from commit d506e232e7388e70622a1c1b2a3069367d7b305b) Signed-off-by: Peter Korsgaard --- utils/add-custom-hashes | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/utils/add-custom-hashes b/utils/add-custom-hashes index 20e48d8ef3..017b25b27f 100755 --- a/utils/add-custom-hashes +++ b/utils/add-custom-hashes @@ -97,6 +97,14 @@ for file in $BR_NO_CHECK_HASH_FOR; do done done +# Symlink linux-headers to linux if identical +linux_hash="$BR2_GLOBAL_PATCH_DIR/linux/linux.hash" +linux_headers_hash="$BR2_GLOBAL_PATCH_DIR/linux-headers/linux-headers.hash" +if [ -e "$linux_hash" ] && [ -e "$linux_headers_hash" ] \ + && cmp -s "$linux_hash" "$linux_headers_hash"; then + ln -sf ../linux/linux.hash "$linux_headers_hash" +fi + message Verifying hashes make clean From 2a1f89db053ec8aa90f09e19b3fa40b0a581bb7e Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Wed, 29 May 2024 12:13:47 +0300 Subject: [PATCH 5694/5754] package/cog: bump to version 0.18.4 This is a small bugfix release, with a rendering fix for popup menus and that can use weston-protocols version 14 for building. Release notes: https://wpewebkit.org/release/cog-0.18.4.html Signed-off-by: Adrian Perez de Castro Signed-off-by: Peter Korsgaard (cherry picked from commit 091ad8455da98fb7abc5af22e7a4c36f64c0783e) 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 c0e99e14aa..b59b5f4795 100644 --- a/package/cog/cog.hash +++ b/package/cog/cog.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/cog-0.18.3.tar.xz.sums -md5 e457de5b5ac8994ae9971c0a5a22b8a2 cog-0.18.3.tar.xz -sha1 21df2a84c651b45e78d08e45e71631250a0078c3 cog-0.18.3.tar.xz -sha256 cd4ec937175a290ccd7c8ec398e4569aec04084cd94b11b2d83518778ba9d055 cog-0.18.3.tar.xz +# From https://wpewebkit.org/releases/cog-0.18.4.tar.xz.sums +md5 0566ab6676b499ebcff372fbe39e24fc cog-0.18.4.tar.xz +sha1 2d6f88cfb07eaac1be2bf9954832f19f8a856631 cog-0.18.4.tar.xz +sha256 31d7079db2eeed790899d2f1f824dd6a54bf30d072d196d737be572f105d99b1 cog-0.18.4.tar.xz # Hashes for license files: sha256 e6c42d93c68b292bcccf6d2ec3e13da85df90b718ba27c2c2a01053a9d009252 COPYING diff --git a/package/cog/cog.mk b/package/cog/cog.mk index 11c0e3b502..7f680bb700 100644 --- a/package/cog/cog.mk +++ b/package/cog/cog.mk @@ -4,7 +4,7 @@ # ################################################################################ -COG_VERSION = 0.18.3 +COG_VERSION = 0.18.4 COG_SITE = https://wpewebkit.org/releases COG_SOURCE = cog-$(COG_VERSION).tar.xz COG_INSTALL_STAGING = YES From 626c967c5f3a08a8737f91ce8cee7d1ea5cd95ff Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Wed, 22 May 2024 22:13:26 +0200 Subject: [PATCH 5695/5754] package/octave: add optional bzip2 support Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard (cherry picked from commit c1723c0dfda041efb3da1d4da94909cbc0003e77) Signed-off-by: Peter Korsgaard --- package/octave/octave.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/octave/octave.mk b/package/octave/octave.mk index d3aec697d5..9d6e4719c3 100644 --- a/package/octave/octave.mk +++ b/package/octave/octave.mk @@ -19,6 +19,13 @@ OCTAVE_DEPENDENCIES = \ openblas \ pcre2 +ifeq ($(BR2_PACKAGE_BZIP2),y) +OCTAVE_CONF_OPTS += --with-bz2 +OCTAVE_DEPENDENCIES += bzip2 +else +OCTAVE_CONF_OPTS += --without-bz2 +endif + ifeq ($(BR2_PACKAGE_READLINE),y) OCTAVE_CONF_OPTS += \ --enable-readline \ From 58ec14fe8f5d396bd567e0eb40af2e6255530948 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 28 May 2024 07:22:18 -0600 Subject: [PATCH 5696/5754] utils/genrandconfig: switch to async/await format This requires python 3.5 or newer but is a bit cleaner than the previous coroutine method. This should also fix a python3.12 issue: [Tue, 28 May 2024 13:09:05] INFO: generate the configuration Traceback (most recent call last): File "/home/autobuild/autobuild/instance-0/buildroot/utils/genrandconfig", line 833, in ret = asyncio.run(gen_config(args)) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/usr/lib/python3.12/asyncio/runners.py", line 194, in run return runner.run(main) ^^^^^^^^^^^^^^^^ File "/usr/lib/python3.12/asyncio/runners.py", line 89, in run raise ValueError("a coroutine was expected, got {!r}".format(coro)) ValueError: a coroutine was expected, got [Tue, 28 May 2024 13:09:06] WARN: failed to generate configuration Signed-off-by: James Hilliard Reviewed-by: Vincent Fazio Signed-off-by: Yann E. MORIN (cherry picked from commit 584ebdea6e2edb415b6a3c96bea490a0d2beea78) Signed-off-by: Peter Korsgaard --- utils/genrandconfig | 62 +++++++++++++++++---------------------------- 1 file changed, 23 insertions(+), 39 deletions(-) diff --git a/utils/genrandconfig b/utils/genrandconfig index 5ebec415b5..d00b9cb36f 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -28,11 +28,6 @@ import traceback from distutils.version import StrictVersion import platform -if sys.version_info < (3, 8): - from asyncio import coroutine -else: - from types import coroutine - class SystemInfo: DEFAULT_NEEDED_PROGS = ["make", "git", "gcc", "timeout"] @@ -60,8 +55,7 @@ class SystemInfo: # -- return None - @coroutine - def has(self, prog): + async def has(self, prog): """Checks whether a program is available. Lazily evaluates missing entries. @@ -76,11 +70,11 @@ class SystemInfo: have_it = self.find_prog(prog) # java[c] needs special care if have_it and prog in ('java', 'javac'): - proc = yield from asyncio.create_subprocess_shell( + proc = await asyncio.create_subprocess_shell( "%s -version | grep gcj" % prog, stdout=asyncio.subprocess.DEVNULL, stderr=asyncio.subprocess.DEVNULL) - ret = yield from proc.wait() + ret = await proc.wait() if ret != 1: have_it = False # -- @@ -159,8 +153,7 @@ def get_toolchain_configs(toolchains_csv, buildrootdir): return configs -@coroutine -def is_toolchain_usable(configfile, config): +async def is_toolchain_usable(configfile, config): """Check if the toolchain is actually usable.""" with open(configfile) as configf: @@ -180,9 +173,9 @@ def is_toolchain_usable(configfile, config): 'BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64=y\n' in configlines or \ 'BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_BE=y\n' in configlines or \ 'BR2_TOOLCHAIN_EXTERNAL_LINARO_ARMEB=y\n' in configlines: - proc = yield from asyncio.create_subprocess_exec( + proc = await asyncio.create_subprocess_exec( 'ldd', '--version', stdout=asyncio.subprocess.PIPE) - ldd_version_output, _ = yield from proc.communicate() + ldd_version_output, _ = await proc.communicate() if proc.returncode: return False glibc_version = ldd_version_output.decode().splitlines()[0].split()[-1] @@ -193,8 +186,7 @@ def is_toolchain_usable(configfile, config): return True -@coroutine -def fixup_config(sysinfo, configfile): +async def fixup_config(sysinfo, configfile): """Finalize the configuration and reject any problematic combinations This function returns 'True' when the configuration has been @@ -210,8 +202,7 @@ def fixup_config(sysinfo, configfile): BR2_TOOLCHAIN_EXTERNAL_URL = 'BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/' - has_java = yield from sysinfo.has("java") - if "BR2_NEEDS_HOST_JAVA=y\n" in configlines and not has_java: + if "BR2_NEEDS_HOST_JAVA=y\n" in configlines and not await sysinfo.has("java"): return False # The ctng toolchain is affected by PR58854 if 'BR2_PACKAGE_LTTNG_TOOLS=y\n' in configlines and \ @@ -681,8 +672,7 @@ def fixup_config(sysinfo, configfile): return True -@coroutine -def gen_config(args): +async def gen_config(args): """Generate a new random configuration This function generates the configuration, by choosing a random @@ -740,8 +730,7 @@ def gen_config(args): # Randomly enable BR2_REPRODUCIBLE 10% of times # also enable tar filesystem images for testing - has_diffoscope = yield from sysinfo.has("diffoscope") - if has_diffoscope and randint(0, 10) == 0: + if await sysinfo.has("diffoscope") and randint(0, 10) == 0: configlines.append("BR2_REPRODUCIBLE=y\n") configlines.append("BR2_TARGET_ROOTFS_TAR=y\n") @@ -755,14 +744,13 @@ def gen_config(args): with open(configfile, "w+") as configf: configf.writelines(configlines) - proc = yield from asyncio.create_subprocess_exec( + proc = await asyncio.create_subprocess_exec( "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "olddefconfig") - ret = yield from proc.wait() + ret = await proc.wait() if ret: return ret - toolchain_usable = yield from is_toolchain_usable(configfile, toolchainconfig) - if not toolchain_usable: + if not await is_toolchain_usable(configfile, toolchainconfig): return 2 # Now, generate the random selection of packages, and fixup @@ -776,37 +764,33 @@ def gen_config(args): file=sys.stderr) return 1 bounded_loop -= 1 - make_rand = [ + proc = await asyncio.create_subprocess_exec( "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "KCONFIG_SEED=0x%s" % hexlify(os.urandom(4)).decode("ascii").upper(), "KCONFIG_PROBABILITY=%d" % randint(1, 20), - "randpackageconfig" if args.toolchains_csv else "randconfig" - ] - proc = yield from asyncio.create_subprocess_exec(*make_rand) - ret = yield from proc.wait() + "randpackageconfig" if args.toolchains_csv else "randconfig") + ret = await proc.wait() if ret: return ret - ret = yield from fixup_config(sysinfo, configfile) - if ret: + if await fixup_config(sysinfo, configfile): break - proc = yield from asyncio.create_subprocess_exec( + proc = await asyncio.create_subprocess_exec( "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "olddefconfig") - ret = yield from proc.wait() + ret = await proc.wait() if ret: return ret - proc = yield from asyncio.create_subprocess_exec( + proc = await asyncio.create_subprocess_exec( "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "savedefconfig") - ret = yield from proc.wait() + ret = await proc.wait() if ret: return ret - proc = yield from asyncio.create_subprocess_exec( + proc = await asyncio.create_subprocess_exec( "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "dependencies") - ret = yield from proc.wait() - return ret + return await proc.wait() if __name__ == '__main__': From 6c2a12f96d4c94c69f191e32124250b5deb3e2bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gero=20Schw=C3=A4ricke?= Date: Fri, 31 May 2024 22:31:00 +0200 Subject: [PATCH 5697/5754] {linux, linux-headers}: bump 4.19.x, 5.4.x, 5.10.x, 5.15.x, 6.1.x, 6.6.x, 6.8.x series MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Gero Schwäricke Signed-off-by: Yann E. MORIN (cherry picked from commit a6784999b23cbe156d63177bf283b844d76aa4e6) [Peter: drop 6.8.x bump] 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 696eac327e..47a3292fe8 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.6.30" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.6.32" 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 e9ca02101c..0e1d3c92da 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 b66a5b863b0f8669448b74ca83bd641a856f164b29956e539bbcb5fdeeab9cc6 linux-6.6.30.tar.xz -sha256 83a3d72e764fceda2c1fc68a4ea6b91253a28da56a688a2b61776b0d19788e1d linux-6.1.90.tar.xz +sha256 aaa824eaf07f61911d22b75ff090a403c3dd0bd73e23933e0bba8b5971436ce1 linux-6.6.32.tar.xz +sha256 9019f427bfdc9ced5bc954d760d37ac08c0cdffb45ad28087fc45a73e64336c9 linux-6.1.92.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 f9071c83a4fd8b80af026b48cfc1869bfa25883f9148b92b5dc1e1e1e26dd5c6 linux-5.15.158.tar.xz -sha256 e310588c4b23f0959614e60f007afc20e9b1a8f296d682b041fa129f96fbe151 linux-5.10.216.tar.xz -sha256 dad2b068946f0ca0026130d7ab17601d5074d90b381379c4479314d4edf4304c linux-5.4.275.tar.xz +sha256 f41e718e33b88f269a6b6a7653e5e9824c4ba541f6ffe5bf26ecc37c540a1b05 linux-5.15.160.tar.xz +sha256 9c36b243e8c3ec1d5963366618f336710b84340bf95be2037b26c452392cb2d6 linux-5.10.218.tar.xz +sha256 7e1f5b28588e49ddfd18e7772476e4e8b52bdc9c3e19beafcbb7c103e6c01f51 linux-5.4.277.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 a8145e2ecf8437b6d06400c3358a595c47a74443b164890cf12a07d8722539c8 linux-4.19.313.tar.xz +sha256 6c5e4d3c87feadbfdb9f7d2e46f3f120b00286ba380491c5956708e0b94232c8 linux-4.19.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 17f5d8b999..33f2f00918 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -403,12 +403,12 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.19.313" if BR2_KERNEL_HEADERS_4_19 - default "5.4.275" if BR2_KERNEL_HEADERS_5_4 - default "5.10.216" if BR2_KERNEL_HEADERS_5_10 - default "5.15.158" if BR2_KERNEL_HEADERS_5_15 - default "6.1.90" if BR2_KERNEL_HEADERS_6_1 - default "6.6.30" if BR2_KERNEL_HEADERS_6_6 + default "4.19.315" if BR2_KERNEL_HEADERS_4_19 + default "5.4.277" if BR2_KERNEL_HEADERS_5_4 + default "5.10.218" if BR2_KERNEL_HEADERS_5_10 + default "5.15.160" if BR2_KERNEL_HEADERS_5_15 + default "6.1.92" if BR2_KERNEL_HEADERS_6_1 + default "6.6.32" 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 bb0164a6d27d6513033f41c6418164b887430174 Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Wed, 29 May 2024 20:24:22 +0000 Subject: [PATCH 5698/5754] support/testing: add mtd test Signed-off-by: Brandon Maier [yann.morin.1998@free.fr: - don't set an empty BR2_ENABLE_LOCALE_WHITELIST ] Signed-off-by: Yann E. MORIN (cherry picked from commit 5806419b9150e7d019a2a8fe13f184c6943cc171) Signed-off-by: Peter Korsgaard --- support/testing/tests/package/test_mtd.py | 47 +++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 support/testing/tests/package/test_mtd.py diff --git a/support/testing/tests/package/test_mtd.py b/support/testing/tests/package/test_mtd.py new file mode 100644 index 0000000000..bdb09c39ec --- /dev/null +++ b/support/testing/tests/package/test_mtd.py @@ -0,0 +1,47 @@ +import os + +import infra.basetest + + +class TestMtd(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_MTD=y + # BR2_TARGET_ROOTFS_TAR is not set + BR2_TARGET_ROOTFS_CPIO=y + """ + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv7", + kernel="builtin", + options=["-initrd", cpio_file]) + + self.emulator.login() + + mtd = "/dev/mtd0" + erasesize = 256 * 1024 + test_sectors = 4 + test_size = erasesize * test_sectors + + output, exit_code = self.emulator.run(f"mtd_debug info {mtd}") + output = [x.strip() for x in output if x.strip()] + self.assertEqual(output, [ + "mtd.type = MTD_NORFLASH", + "mtd.flags = MTD_CAP_NORFLASH", + "mtd.size = 134217728 (128M)", + "mtd.erasesize = 262144 (256K)", + "mtd.writesize = 1", + "mtd.oobsize = 0", + "regions = 0", + ]) + + # Test flashcp + self.assertRunOk(f"dd if=/dev/urandom of=random.bin bs={test_size} count=1") + self.assertRunOk(f"flashcp random.bin {mtd}") + self.assertRunOk(f"cmp -s -n {test_size} random.bin {mtd}") + + # Test flash_erase + self.assertRunOk(f"dd if=/dev/zero bs={test_size} count=1 | tr '\\000' '\\377' >nor-erase.bin") + self.assertRunOk(f"flash_erase {mtd} 0 {test_sectors}") + self.assertRunOk(f"cmp -s -n {test_size} nor-erase.bin {mtd}") From 1605614475e0b7bd04228e4b563ef0333b4a643d Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Wed, 29 May 2024 20:24:23 +0000 Subject: [PATCH 5699/5754] package/mtd: switch to https mirror As mentioned in the last release notes, there is an https mirror[1]. Switch to this as ftp is not as widely supported anymore. [1] https://lists.infradead.org/pipermail/linux-mtd/2023-August/100922.html Signed-off-by: Brandon Maier Signed-off-by: Yann E. MORIN (cherry picked from commit 7eb1ea5b6548270eb736054be87a250ea975ff6d) Signed-off-by: Peter Korsgaard --- package/mtd/mtd.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk index 998cc419b3..39b9f2a523 100644 --- a/package/mtd/mtd.mk +++ b/package/mtd/mtd.mk @@ -6,7 +6,7 @@ MTD_VERSION = 2.1.6 MTD_SOURCE = mtd-utils-$(MTD_VERSION).tar.bz2 -MTD_SITE = ftp://ftp.infradead.org/pub/mtd-utils +MTD_SITE = https://infraroot.at/pub/mtd MTD_LICENSE = GPL-2.0 MTD_LICENSE_FILES = COPYING MTD_CPE_ID_VENDOR = mtd-utils_project From 74c55729b0a6fdf52c9421a31351e6c968f1a01a Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Wed, 29 May 2024 20:24:25 +0000 Subject: [PATCH 5700/5754] DEVELOPERS: add myself for package/mtd Signed-off-by: Brandon Maier Signed-off-by: Yann E. MORIN (cherry picked from commit f6ad5198245015425f8720117b6bd4f3df243de5) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 0e8b98f0f6..83f3640dc0 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -531,6 +531,7 @@ F: package/ncdu/ N: Brandon Maier F: board/freescale/ls1046a-frwy/ F: configs/ls1046a-frwy_defconfig +F: package/mtd/ F: package/python-pysensors/ F: package/qoriq-fm-ucode/ F: package/unifdef/ From b89394cb629eb123af24765f1b20adba4a10ade2 Mon Sep 17 00:00:00 2001 From: Fiona Klute Date: Fri, 31 May 2024 20:53:28 +0200 Subject: [PATCH 5701/5754] package/dnsmasq: Fix init script restart command Restarting dnsmasq can cause constant issues: stop works, but start fails because the new instance can't bind the socket. Another restart immediately after works just fine: # /etc/init.d/S80dnsmasq restart Stopping dnsmasq: OK Starting dnsmasq: dnsmasq: failed to create listening socket for 192.168.128.1: Address in use FAIL # /etc/init.d/S80dnsmasq restart Stopping dnsmasq: FAIL Starting dnsmasq: OK Solve this by waiting for process to actually stop before returning from the stop command. Clean up the PID file after to avoid potential issues with the PID being reused after stop. The wait could also be placed inside the restart block, but putting it into the stop block has the advantage that it also avoids similar issues for any other callers. Signed-off-by: Fiona Klute [yann.morin.1998@free.fr: - fix shellcheck - reflow commit log ] Signed-off-by: Yann E. MORIN (cherry picked from commit 507caef3ddf5ab7d933e14303508db057c4b9501) Signed-off-by: Peter Korsgaard --- .checkpackageignore | 1 - package/dnsmasq/S80dnsmasq | 9 +++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.checkpackageignore b/.checkpackageignore index 536788f5ea..b3d2d6d8d5 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -307,7 +307,6 @@ 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 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 175daf9d26..f1e1a68585 100644 --- a/package/dnsmasq/S80dnsmasq +++ b/package/dnsmasq/S80dnsmasq @@ -10,12 +10,21 @@ case "$1" in printf "Starting dnsmasq: " start-stop-daemon -S -p "$PIDFILE" -x "/usr/sbin/$DAEMON" -- \ --pid-file="$PIDFILE" + # shellcheck disable=SC2181 [ $? = 0 ] && echo "OK" || echo "FAIL" ;; stop) printf "Stopping dnsmasq: " start-stop-daemon -K -q -p "$PIDFILE" -x "/usr/sbin/$DAEMON" + # shellcheck disable=SC2181 [ $? = 0 ] && echo "OK" || echo "FAIL" + # wait for dnsmasq process to be gone + while true; do + pid="$( cat "${PIDFILE}" 2>/dev/null || true )" + { [ -n "${pid}" ] && [ -d "/proc/${pid}" ]; } || break + sleep 0.1 + done + rm -f "$PIDFILE" ;; restart|reload) $0 stop From 5d9c54de0c48be3a616db5e3c2f6c7112ff635bf Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 1 Jun 2024 14:39:08 +0200 Subject: [PATCH 5702/5754] package/gcc: update to 13.3.0 See here for changes made to this release: https://gcc.gnu.org/bugzilla/buglist.cgi?bug_status=RESOLVED&resolution=FIXED&target_milestone=13.3 Signed-off-by: Waldemar Brodkorb Signed-off-by: Yann E. MORIN (cherry picked from commit f3b2f0f9859b4bcb422d69437ecb01ee9038d3c1) Signed-off-by: Peter Korsgaard --- .checkpackageignore | 2 +- .../0001-disable-split-stack-for-non-thread-builds.patch | 0 .../0002-RISC-V-fix-build-issue-with-gcc-4.9.x.patch | 0 package/gcc/Config.in.host | 2 +- package/gcc/gcc.hash | 4 ++-- 5 files changed, 4 insertions(+), 4 deletions(-) rename package/gcc/{13.2.0 => 13.3.0}/0001-disable-split-stack-for-non-thread-builds.patch (100%) rename package/gcc/{13.2.0 => 13.3.0}/0002-RISC-V-fix-build-issue-with-gcc-4.9.x.patch (100%) diff --git a/.checkpackageignore b/.checkpackageignore index b3d2d6d8d5..d7681a4db6 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -422,7 +422,7 @@ package/gamin/0003-fix-missing-PTHREAD_MUTEX_RECURSIVE_NP.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/13.2.0/0001-disable-split-stack-for-non-thread-builds.patch Upstream +package/gcc/13.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/13.2.0/0001-disable-split-stack-for-non-thread-builds.patch b/package/gcc/13.3.0/0001-disable-split-stack-for-non-thread-builds.patch similarity index 100% rename from package/gcc/13.2.0/0001-disable-split-stack-for-non-thread-builds.patch rename to package/gcc/13.3.0/0001-disable-split-stack-for-non-thread-builds.patch diff --git a/package/gcc/13.2.0/0002-RISC-V-fix-build-issue-with-gcc-4.9.x.patch b/package/gcc/13.3.0/0002-RISC-V-fix-build-issue-with-gcc-4.9.x.patch similarity index 100% rename from package/gcc/13.2.0/0002-RISC-V-fix-build-issue-with-gcc-4.9.x.patch rename to package/gcc/13.3.0/0002-RISC-V-fix-build-issue-with-gcc-4.9.x.patch diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index d294e8da30..8efea378fb 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -78,7 +78,7 @@ config BR2_GCC_VERSION default "8.4.0" if BR2_GCC_VERSION_POWERPC_SPE default "11.4.0" if BR2_GCC_VERSION_11_X default "12.3.0" if BR2_GCC_VERSION_12_X - default "13.2.0" if BR2_GCC_VERSION_13_X + default "13.3.0" if BR2_GCC_VERSION_13_X default "arc-2023.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 5061a603bc..964fbc97df 100644 --- a/package/gcc/gcc.hash +++ b/package/gcc/gcc.hash @@ -6,8 +6,8 @@ sha512 440c08ca746da450d9a1b35e8fd2305cb27e7e6987cd9d0f7d375f3b1fc9e4b0bd7acb3c 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 https://gcc.gnu.org/pub/gcc/releases/gcc-13.2.0/sha512.sum -sha512 d99e4826a70db04504467e349e9fbaedaa5870766cda7c5cab50cdebedc4be755ebca5b789e1232a34a20be1a0b60097de9280efe47bdb71c73251e30b0862a2 gcc-13.2.0.tar.xz +# From https://gcc.gnu.org/pub/gcc/releases/gcc-13.3.0/sha512.sum +sha512 ed5f2f4c6ed2c796fcf2c93707159e9dbd3ddb1ba063d549804dd68cdabbb6d550985ae1c8465ae9a336cfe29274a6eb0f42e21924360574ebd8e5d5c7c9a801 gcc-13.3.0.tar.xz # Locally calculated (fetched from Github) sha512 4dca20f517a42bb027fec605965b09fb917a535eebf3fe3e811d93476b02b1962df5ad4665f117bd44c2ec8e8015d51a44c00591761fe5f259c201ac5c7d920f gcc-arc-2023.09-release.tar.gz From 5a708e510a0d43a4cb1e62b382403f679cf49ba2 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 8 Jun 2024 19:08:38 +0200 Subject: [PATCH 5703/5754] package/gcc-bare-metal: bump version to match gcc The gcc 13.x. version was bumped to 13.3.0 by commit 5d9c54de0c48b (package/gcc: update to 13.3.0), so update gcc-bare-metal to match. Signed-off-by: Peter Korsgaard --- package/gcc-bare-metal/13.2.0 | 1 - package/gcc-bare-metal/13.3.0 | 1 + package/gcc-bare-metal/gcc-bare-metal.mk | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) delete mode 120000 package/gcc-bare-metal/13.2.0 create mode 120000 package/gcc-bare-metal/13.3.0 diff --git a/package/gcc-bare-metal/13.2.0 b/package/gcc-bare-metal/13.2.0 deleted file mode 120000 index b7a75dc7dd..0000000000 --- a/package/gcc-bare-metal/13.2.0 +++ /dev/null @@ -1 +0,0 @@ -../gcc/13.2.0/ \ No newline at end of file diff --git a/package/gcc-bare-metal/13.3.0 b/package/gcc-bare-metal/13.3.0 new file mode 120000 index 0000000000..b7238b60c1 --- /dev/null +++ b/package/gcc-bare-metal/13.3.0 @@ -0,0 +1 @@ +../gcc/13.3.0/ \ No newline at end of file diff --git a/package/gcc-bare-metal/gcc-bare-metal.mk b/package/gcc-bare-metal/gcc-bare-metal.mk index 0dfc8d7a5c..3554eb88ed 100644 --- a/package/gcc-bare-metal/gcc-bare-metal.mk +++ b/package/gcc-bare-metal/gcc-bare-metal.mk @@ -4,7 +4,7 @@ # ################################################################################ -HOST_GCC_BARE_METAL_VERSION = 13.2.0 +HOST_GCC_BARE_METAL_VERSION = 13.3.0 HOST_GCC_BARE_METAL_SITE = \ https://ftp.gnu.org/gnu/gcc/gcc-$(HOST_GCC_BARE_METAL_VERSION) HOST_GCC_BARE_METAL_SOURCE = gcc-$(HOST_GCC_BARE_METAL_VERSION).tar.xz From 29df0eb414a8f0ac90c5b7199471a974a2a7eb3e Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 2 Jun 2024 16:55:42 +0200 Subject: [PATCH 5704/5754] package/pkg-download: use _DL_SUBDIR as root dir of generated archives Currently, when we generate archives, e.g. for git, svn, cargo or go, we use the package _BASENAME_RAW as the root directory of the generated archive. For example, for package foo at version 1.2.3, that would generate an archive rooted at foo-1.2.3/. This is usually what we want, except in one specific condition: when the package shares its download with another package *and* it is a generated archive. In that case, the root directory will be different for each of the two packages, which is incorrect, but was so far benign: we never had any hash for such generated archives, and they were only generated in two cases: - linux and linux-headers - barebox and barebox-aux As we skip one directory depth when extracting the archives, we did not care what the root directory was; whether it was that of one package or the other was of no consequence. But now that we can have hashes for archives generated from custom versions, this breaks the usual case where the headers used for the toolchains are those of the kernel to build for the target. In this case, we may end up downloading the linux-headers package before we download the linux package, so we'd get the hash for an archive rooted at linux-headers-XXX/, but the one for the linux package the archive would be rooted at linux-XXX/, or we may end up (e.g. with parallel builds) downloading the linux package first and linux-headers next. That would cause conflicts in hashes, as demonstrated by the only defconfig we have in that situation, olimex_stmp157_olinuxino_lime_defconfig. _BASENAME_RAW is a construct that is expanded to include the RAWNAME followed by a dash and the version, if there is a version, or with just the RAWNAME when there is no version. We tweak the download macro to use _DL_SUBDIR followed by the version. This is only used by VCS backends (cvs, git, svn...) and so there will always be a version string, so no need to duplicate the case without a version like is done for _BASENAME_RAW _DL_SUBDIR defaults to _RAWNAME, so this is a noop by default, unless the package declares it shares its download with another one, in which case the generated archive will now be rooted as for the shared package. This was triggered by: https://patchwork.ozlabs.org/project/buildroot/patch/20240602070634.597337-1-francois.perrad@gadz.org/ Reported-by: Peter Korsgaard Signed-off-by: Yann E. MORIN Cc: Francois Perrad Signed-off-by: Peter Korsgaard (cherry picked from commit ebe238f2b595136be92c53aa70c40d3f333cc34e) Signed-off-by: Peter Korsgaard --- package/pkg-download.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-download.mk b/package/pkg-download.mk index 30eeb6b1fc..677d3608f5 100644 --- a/package/pkg-download.mk +++ b/package/pkg-download.mk @@ -115,7 +115,7 @@ define DOWNLOAD -D '$(DL_DIR)' \ -f '$(notdir $(1))' \ $(foreach f,$($(2)_HASH_FILES),-H '$(f)') \ - -n '$($(2)_BASENAME_RAW)' \ + -n '$($(2)_DL_SUBDIR)-$($(2)_VERSION)' \ -N '$($(2)_RAWNAME)' \ -o '$($(2)_DL_DIR)/$(notdir $(1))' \ $(if $(filter YES,$($(2)_SVN_EXTERNALS)),-r) \ From 90b9302e8357f9ef8266f9491b6c7a1f5bb32e01 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 2 Jun 2024 18:21:23 +0200 Subject: [PATCH 5705/5754] package/qt5base: fix download Since qt5base was last bumped in 8ab4a0a348b2 (package/qt5: bump packages to latest kde submodule versions), the hash for the downloaded tarball has changed: $ make qt5base-source [...] ERROR: expected: 935d01f5c34903ad9e979431cec7a8a59332ed3fc539e639f5ba87e8d6989b9d ERROR: got : 3067c4d84ba9927bfe65bf606c17af082199e0a3b22781fbf9bc6c6bc3de26dd We know the hash was good back when 8ab4a0a348b2 was applied, because the tarball has been cached on sources.buildroot.org with the expected hash: $ curl 'https://sources.buildroot.net/qt5base/qtbase-da6e958319e95fe564d3b30c931492dd666bfaff.tar.bz2' 2>/dev/null |sha256sum - 935d01f5c34903ad9e979431cec7a8a59332ed3fc539e639f5ba87e8d6989b9d - But now, the archive generated by the KDE gorge (Gitlab underneath) has another hash (as seen above). This means that the KDE forge (Gitlab) has changed the way it generates archives. So, what's the delta? It turns out that the only changes are about CRLF that were present in the original archive, and are no longer in the new one. It is to be noted that the affected files do not have CRLFS in the repository. It further turns out that the archive was previously generated with .gitattibutes of the main branch ('dev' in Qt repositories), while now they are generated with the .gitattibutes of the commit for which they are generated. Switch to using the git download method for really reproducible archives... Signed-off-by: Yann E. MORIN Cc: Sebastian Weyer Cc: Peter Korsgaard Signed-off-by: Peter Korsgaard (cherry picked from commit 75da04c817b07a9c426cf2e438b0f8883096f4ef) [Peter: adjust for filename/hash used on 2024.02.x] Signed-off-by: Peter Korsgaard --- package/qt5/qt5base/qt5base.hash | 2 +- package/qt5/qt5base/qt5base.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash index ffc474f49e..8f28cdb556 100644 --- a/package/qt5/qt5base/qt5base.hash +++ b/package/qt5/qt5base/qt5base.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 935d01f5c34903ad9e979431cec7a8a59332ed3fc539e639f5ba87e8d6989b9d qtbase-da6e958319e95fe564d3b30c931492dd666bfaff.tar.bz2 +sha256 7fdd81fc6c157c3e65e16b306e90c8dd4363d10b752d7379251dfb7214cb0574 qt5base-da6e958319e95fe564d3b30c931492dd666bfaff-br1.tar.gz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index e173639cca..bbab9b3de1 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -5,8 +5,8 @@ ################################################################################ QT5BASE_VERSION = da6e958319e95fe564d3b30c931492dd666bfaff -QT5BASE_SITE = $(QT5_SITE)/qtbase/-/archive/$(QT5BASE_VERSION) -QT5BASE_SOURCE = qtbase-$(QT5BASE_VERSION).tar.bz2 +QT5BASE_SITE = $(QT5_SITE)/qtbase +QT5BASE_SITE_METHOD = git QT5BASE_CPE_ID_VENDOR = qt QT5BASE_CPE_ID_PRODUCT = qt From 0b880085c9b9e12c53b707c139362ca3f6925553 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 3 Jun 2024 09:17:04 +0200 Subject: [PATCH 5706/5754] package/doom-wad: drop reference to ftp.idsoftware.com The server was decommisioned in 2017 and is unlikely to ever come back, so drop the reference: https://www.doomworld.com/forum/topic/96999-rip-ftpidsoftwarecom/ Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit a1d5e366b5bb42e2655113f02256caeb17983218) Signed-off-by: Peter Korsgaard --- package/doom-wad/doom-wad.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/doom-wad/doom-wad.mk b/package/doom-wad/doom-wad.mk index f348fc2207..5d37a6a6d4 100644 --- a/package/doom-wad/doom-wad.mk +++ b/package/doom-wad/doom-wad.mk @@ -7,7 +7,6 @@ DOOM_WAD_VERSION = 1.9 DOOM_WAD_SOURCE = doom$(subst .,,$(DOOM_WAD_VERSION))s.zip # Official server currently unavailable -# DOOM_WAD_SITE = ftp://ftp.idsoftware.com/idstuff/doom DOOM_WAD_SITE = http://www.jbserver.com/downloads/games/doom/misc/shareware define DOOM_WAD_EXTRACT_CMDS From 87c7e98aa1a7944c0bf897ae086dde10bbbdcec3 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 3 Jun 2024 09:17:05 +0200 Subject: [PATCH 5707/5754] package/ebtables: switch to https:// For consistency, adapt the reference in the hash file too. Signed-off-by: Peter Korsgaard [yann.morin.1998@free.fr: switch to https as suggested by Baruch] Signed-off-by: Yann E. MORIN (cherry picked from commit 1efc1e7b90f2c1a831d31ecbc1f58320f60bb560) Signed-off-by: Peter Korsgaard --- package/ebtables/ebtables.hash | 2 +- package/ebtables/ebtables.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ebtables/ebtables.hash b/package/ebtables/ebtables.hash index 98106b0d60..c09403b63b 100644 --- a/package/ebtables/ebtables.hash +++ b/package/ebtables/ebtables.hash @@ -1,4 +1,4 @@ -# ftp://ftp.netfilter.org/pub/ebtables/ebtables-2.0.11.tar.gz.sha256sum +# https://netfilter.org/pub/ebtables/ebtables-2.0.11.tar.gz.sha256sum sha256 b71f654784a726329f88b412ef7b96b4e5d786ed2bd28193ed7b4c0d677dfd2a ebtables-2.0.11.tar.gz # Locally computed sha256 ebdb8ae564c952792017ec680e2edd30443642216eb9f8a3d8fa166c0cb628c1 COPYING diff --git a/package/ebtables/ebtables.mk b/package/ebtables/ebtables.mk index 2f9dd5ac4b..46c22dde9b 100644 --- a/package/ebtables/ebtables.mk +++ b/package/ebtables/ebtables.mk @@ -5,7 +5,7 @@ ################################################################################ EBTABLES_VERSION = 2.0.11 -EBTABLES_SITE = http://ftp.netfilter.org/pub/ebtables +EBTABLES_SITE = https://netfilter.org/pub/ebtables EBTABLES_LICENSE = GPL-2.0+ EBTABLES_LICENSE_FILES = COPYING EBTABLES_CPE_ID_VENDOR = netfilter From 8089a94c27dc3dd17dfe3d571cf7f7b33a9077f8 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 3 Jun 2024 09:17:06 +0200 Subject: [PATCH 5708/5754] package/file: use https:// _SITE ftp.astrom.com also serves the files over https://, so use that instead. Signed-off-by: Peter Korsgaard [yann.morin.1998@free.fr: use https, not http] Signed-off-by: Yann E. MORIN (cherry picked from commit 02f6617b680a42eeec5ba7b5d478111dbc8ca185) Signed-off-by: Peter Korsgaard --- package/file/file.hash | 2 +- package/file/file.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/file/file.hash b/package/file/file.hash index 08e8497471..7c15569c09 100644 --- a/package/file/file.hash +++ b/package/file/file.hash @@ -1,5 +1,5 @@ # Locally calculated after verifying signature -# ftp://ftp.astron.com/pub/file/file-5.45.tar.gz.asc +# https://astron.com/pub/file/file-5.45.tar.gz.asc # using key BE04995BA8F90ED0C0C176C471112AB16CB33B3A sha256 fc97f51029bb0e2c9f4e3bffefdaf678f0e039ee872b9de5c002a6d09c784d82 file-5.45.tar.gz sha256 0bfa856a9930bddadbef95d1be1cf4e163c0be618e76ea3275caaf255283e274 COPYING diff --git a/package/file/file.mk b/package/file/file.mk index b67fcaead4..27d9181d76 100644 --- a/package/file/file.mk +++ b/package/file/file.mk @@ -5,7 +5,7 @@ ################################################################################ FILE_VERSION = 5.45 -FILE_SITE = ftp://ftp.astron.com/pub/file +FILE_SITE = https://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 FILE_CPE_ID_VALID = YES From 6c2951e863ede8f9dadfbd9fc5ac4e6eec1d17da Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 3 Jun 2024 09:17:07 +0200 Subject: [PATCH 5709/5754] package/freeradius-client: use https:// _SITE The tarballs are also available at https://freeradius.org/ftp/pub/freeradius/, so use that instead. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit e30a0035e1d4f04da877d22afcd9c60a2438ba01) Signed-off-by: Peter Korsgaard --- package/freeradius-client/freeradius-client.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/freeradius-client/freeradius-client.mk b/package/freeradius-client/freeradius-client.mk index 981ed163e0..db874f0f61 100644 --- a/package/freeradius-client/freeradius-client.mk +++ b/package/freeradius-client/freeradius-client.mk @@ -5,7 +5,7 @@ ################################################################################ FREERADIUS_CLIENT_VERSION = 1.1.7 -FREERADIUS_CLIENT_SITE = ftp://ftp.freeradius.org/pub/freeradius +FREERADIUS_CLIENT_SITE = https://freeradius.org/ftp/pub/freeradius FREERADIUS_CLIENT_LICENSE = BSD-2-Clause FREERADIUS_CLIENT_LICENSE_FILES = COPYRIGHT FREERADIUS_CLIENT_INSTALL_STAGING = YES From 13cfe61a57cd9ec4c93be8c8a08f80d047eae0a2 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 3 Jun 2024 09:17:08 +0200 Subject: [PATCH 5710/5754] package/freeradius-server: use https:// _SITE The tarballs are also available at https://freeradius.org/ftp/pub/freeradius/, so use that instead. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit f37a3fb49895c36bc9271693d0e1478d89267f23) Signed-off-by: Peter Korsgaard --- package/freeradius-server/freeradius-server.hash | 2 +- package/freeradius-server/freeradius-server.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/freeradius-server/freeradius-server.hash b/package/freeradius-server/freeradius-server.hash index a267bd6f8c..6ee8f7786c 100644 --- a/package/freeradius-server/freeradius-server.hash +++ b/package/freeradius-server/freeradius-server.hash @@ -1,4 +1,4 @@ # Locally computed, after checking -# ftp://ftp.freeradius.org/pub/freeradius/freeradius-server-3.2.3.tar.bz2.sig +# https://freeradius.org/ftp/pub/freeradius/freeradius-server-3.2.3.tar.bz2.sig sha256 4a16aeffbfa1424e1f317fdf71d17e5523a4fd9564d87c747a60595ef93c5d1f freeradius-server-3.2.3.tar.bz2 sha256 0a0e46014fc2efd5144a30359c0e6e1ea9fa3dd407d3318204150efd7b4caf6a COPYRIGHT diff --git a/package/freeradius-server/freeradius-server.mk b/package/freeradius-server/freeradius-server.mk index 1e8ada6bb9..f325745f27 100644 --- a/package/freeradius-server/freeradius-server.mk +++ b/package/freeradius-server/freeradius-server.mk @@ -7,7 +7,7 @@ FREERADIUS_SERVER_VERSION = 3.2.3 FREERADIUS_SERVER_SOURCE = \ freeradius-server-$(FREERADIUS_SERVER_VERSION).tar.bz2 -FREERADIUS_SERVER_SITE = ftp://ftp.freeradius.org/pub/freeradius +FREERADIUS_SERVER_SITE = https://freeradius.org/ftp/pub/freeradius FREERADIUS_SERVER_LICENSE = GPL-2.0 FREERADIUS_SERVER_LICENSE_FILES = COPYRIGHT FREERADIUS_SERVER_CPE_ID_VENDOR = freeradius From c4d2430ca66a9140fe6815dff4a8210eab1925e3 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 3 Jun 2024 09:17:09 +0200 Subject: [PATCH 5711/5754] package/libmnl: use https for _SITE http redirects to https, so use that instead. Signed-off-by: Peter Korsgaard Reviewed-by: Dario Binacchi Signed-off-by: Yann E. MORIN (cherry picked from commit 88dc6a6e492be30875dcedc8b19802aa0ac3880b) Signed-off-by: Peter Korsgaard --- package/libmnl/libmnl.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libmnl/libmnl.mk b/package/libmnl/libmnl.mk index 08eebbaed9..3bd3a03c89 100644 --- a/package/libmnl/libmnl.mk +++ b/package/libmnl/libmnl.mk @@ -6,7 +6,7 @@ LIBMNL_VERSION = 1.0.5 LIBMNL_SOURCE = libmnl-$(LIBMNL_VERSION).tar.bz2 -LIBMNL_SITE = http://netfilter.org/projects/libmnl/files +LIBMNL_SITE = https://netfilter.org/projects/libmnl/files LIBMNL_INSTALL_STAGING = YES LIBMNL_LICENSE = LGPL-2.1+ LIBMNL_LICENSE_FILES = COPYING From 4021703e86062b3f6a105ce0f49188210c8aaa80 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 3 Jun 2024 09:17:10 +0200 Subject: [PATCH 5712/5754] package/libmnl: use upstream sha256sum ftp.netfilter.org no longer provides ftp, so use the https:// url from _SITE. This provides a .sha256sum but NOT md5/sha1, so update the .hash file to match. Signed-off-by: Peter Korsgaard Reviewed-by: Dario Binacchi Signed-off-by: Yann E. MORIN (cherry picked from commit 5cbcbf5078b51ac15fe58a506a51639685dcd370) Signed-off-by: Peter Korsgaard --- package/libmnl/libmnl.hash | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/package/libmnl/libmnl.hash b/package/libmnl/libmnl.hash index 4b592333cb..e2db46f03b 100644 --- a/package/libmnl/libmnl.hash +++ b/package/libmnl/libmnl.hash @@ -1,7 +1,5 @@ -# From ftp://ftp.netfilter.org/pub/libmnl/libmnl-1.0.5.tar.bz2.{md5sum,sha1sum} -md5 0bbb70573119ec5d49435114583e7a49 libmnl-1.0.5.tar.bz2 -sha1 63c6456b77f7978a7b37e62c1b38346b2ef2d91c libmnl-1.0.5.tar.bz2 +# From https://netfilter.org/projects/libmnl/files/libmnl-1.0.5.tar.bz2.sha256sum +sha256 274b9b919ef3152bfb3da3a13c950dd60d6e2bcd54230ffeca298d03b40d0525 libmnl-1.0.5.tar.bz2 # Locally calculated -sha256 274b9b919ef3152bfb3da3a13c950dd60d6e2bcd54230ffeca298d03b40d0525 libmnl-1.0.5.tar.bz2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING From 8e95fe54dce40b41052afe611caae5fbaba5af37 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 3 Jun 2024 09:17:11 +0200 Subject: [PATCH 5713/5754] package/libnetfilter_acct: use https for _SITE http redirects to https, so use that instead. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit b530de097f905e616e735baa3494a597e176e5b5) Signed-off-by: Peter Korsgaard --- package/libnetfilter_acct/Config.in | 2 +- package/libnetfilter_acct/libnetfilter_acct.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libnetfilter_acct/Config.in b/package/libnetfilter_acct/Config.in index ecfef6dc64..614af27fe1 100644 --- a/package/libnetfilter_acct/Config.in +++ b/package/libnetfilter_acct/Config.in @@ -5,4 +5,4 @@ config BR2_PACKAGE_LIBNETFILTER_ACCT libnetfilter_acct is the userspace library providing interface to extended accounting infrastructure. - http://www.netfilter.org/projects/libnetfilter_acct/ + https://www.netfilter.org/projects/libnetfilter_acct/ diff --git a/package/libnetfilter_acct/libnetfilter_acct.mk b/package/libnetfilter_acct/libnetfilter_acct.mk index e791f6f13f..6763ad27dd 100644 --- a/package/libnetfilter_acct/libnetfilter_acct.mk +++ b/package/libnetfilter_acct/libnetfilter_acct.mk @@ -6,7 +6,7 @@ LIBNETFILTER_ACCT_VERSION = 1.0.3 LIBNETFILTER_ACCT_SOURCE = libnetfilter_acct-$(LIBNETFILTER_ACCT_VERSION).tar.bz2 -LIBNETFILTER_ACCT_SITE = http://www.netfilter.org/projects/libnetfilter_acct/files +LIBNETFILTER_ACCT_SITE = https://www.netfilter.org/projects/libnetfilter_acct/files LIBNETFILTER_ACCT_INSTALL_STAGING = YES LIBNETFILTER_ACCT_DEPENDENCIES = host-pkgconf libmnl LIBNETFILTER_ACCT_LICENSE = LGPL-2.1+ From 3779f0c5225fa6c1ff1ae0eabb8480334d8f8a51 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 3 Jun 2024 09:17:12 +0200 Subject: [PATCH 5714/5754] package/libnetfilter_acct: use https:// reference for .hash file ftp.netfilter.org no longer provides ftp, so use the https:// url from _SITE. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit af4038d0ce70534c31825068dee708c44c088b93) Signed-off-by: Peter Korsgaard --- package/libnetfilter_acct/libnetfilter_acct.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libnetfilter_acct/libnetfilter_acct.hash b/package/libnetfilter_acct/libnetfilter_acct.hash index a72d83fb28..da9e1a3264 100644 --- a/package/libnetfilter_acct/libnetfilter_acct.hash +++ b/package/libnetfilter_acct/libnetfilter_acct.hash @@ -1,4 +1,4 @@ -# From ftp://ftp.netfilter.org/pub/libnetfilter_acct/libnetfilter_acct-1.0.3.tar.bz2.{md5sum,sha1sum} +# From https://www.netfilter.org/projects/libnetfilter_acct/files/libnetfilter_acct-1.0.3.tar.bz2.{md5sum,sha1sum} md5 814b2972b2f5c740ff87510bc109168b libnetfilter_acct-1.0.3.tar.bz2 sha1 4b9073e4aa989b0f000c8da1ab01b22fceed52b2 libnetfilter_acct-1.0.3.tar.bz2 From b7a7f87bc4537547a591217032b9ab5ee5fc1d4f Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 3 Jun 2024 09:17:13 +0200 Subject: [PATCH 5715/5754] package/libnetfilter_log: use https for _SITE http redirects to https, so use that instead. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 9f615dc406e20b0d07394ab1a863826c0928f016) Signed-off-by: Peter Korsgaard --- package/libnetfilter_log/Config.in | 2 +- package/libnetfilter_log/libnetfilter_log.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libnetfilter_log/Config.in b/package/libnetfilter_log/Config.in index b244e8a8e9..66e1b170bc 100644 --- a/package/libnetfilter_log/Config.in +++ b/package/libnetfilter_log/Config.in @@ -6,4 +6,4 @@ config BR2_PACKAGE_LIBNETFILTER_LOG libnetfilter_log is a userspace library providing interface to packets that have been logged by the kernel packet filter. - http://www.netfilter.org/projects/libnetfilter_log/ + https://www.netfilter.org/projects/libnetfilter_log/ diff --git a/package/libnetfilter_log/libnetfilter_log.mk b/package/libnetfilter_log/libnetfilter_log.mk index 01f94aac41..9b01f819bb 100644 --- a/package/libnetfilter_log/libnetfilter_log.mk +++ b/package/libnetfilter_log/libnetfilter_log.mk @@ -6,7 +6,7 @@ LIBNETFILTER_LOG_VERSION = 1.0.2 LIBNETFILTER_LOG_SOURCE = libnetfilter_log-$(LIBNETFILTER_LOG_VERSION).tar.bz2 -LIBNETFILTER_LOG_SITE = http://www.netfilter.org/projects/libnetfilter_log/files +LIBNETFILTER_LOG_SITE = https://www.netfilter.org/projects/libnetfilter_log/files LIBNETFILTER_LOG_INSTALL_STAGING = YES LIBNETFILTER_LOG_DEPENDENCIES = host-pkgconf libmnl libnfnetlink LIBNETFILTER_LOG_LICENSE = GPL-2.0+ From 76528f05b59d0c9cfdcbd490b6925cab08d12d1e Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 3 Jun 2024 09:17:14 +0200 Subject: [PATCH 5716/5754] package/libnetfilter_log: use https:// reference for .hash file ftp.netfilter.org no longer provides ftp, so use the https:// url from _SITE. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 07a44a24248cfee4b44296c2634ef8e218590d37) Signed-off-by: Peter Korsgaard --- package/libnetfilter_log/libnetfilter_log.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libnetfilter_log/libnetfilter_log.hash b/package/libnetfilter_log/libnetfilter_log.hash index 7589284f40..1e3cea0a80 100644 --- a/package/libnetfilter_log/libnetfilter_log.hash +++ b/package/libnetfilter_log/libnetfilter_log.hash @@ -1,4 +1,4 @@ -# From ftp://ftp.netfilter.org/pub/libnetfilter_log/libnetfilter_log-1.0.2.tar.bz2.sha256sum +# From https://www.netfilter.org/projects/libnetfilter_log/files/libnetfilter_log-1.0.2.tar.bz2.sha256sum sha256 e3f408575614d849e4726b45e90c7ebb0e6744b04859555a9ce6ec40744ffeea libnetfilter_log-1.0.2.tar.bz2 # Hash for license file: From 8c03a60b3a78f13fe2aeea815b5653c63f32eb29 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 3 Jun 2024 09:17:15 +0200 Subject: [PATCH 5717/5754] package/lynx: use https:// _SITE MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The ftp server does not allow anonymous login, causing the download to fail: wget --passive-ftp -nd -t 3 -O '/home/peko/source/buildroot/output-qt/build/.lynx2.8.9rel.1.tar.bz2.XlcdCK/output' 'ftp://ftp.invisible-island.net/lynx/tarballs/lynx2.8.9rel.1.tar.bz2' --2024-06-02 22:21:49-- ftp://ftp.invisible-island.net/lynx/tarballs/lynx2.8.9rel.1.tar.bz2 => ‘/home/peko/source/buildroot/output-qt/build/.lynx2.8.9rel.1.tar.bz2.XlcdCK/output’ Resolving ftp.invisible-island.net (ftp.invisible-island.net)... 216.194.253.29 Connecting to ftp.invisible-island.net (ftp.invisible-island.net)|216.194.253.29|:21... connected. Logging in as anonymous ... Login incorrect. Luckily the tarball is also available over https://, so use that instead. Signed-off-by: Peter Korsgaard [yann.morin.1998@free.fr: - use https, not http - drop trailing '/' in _SITE ] Signed-off-by: Yann E. MORIN (cherry picked from commit d946d31325af3ca388d4d3bbff4ad8f786fabb06) Signed-off-by: Peter Korsgaard --- package/lynx/lynx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/lynx/lynx.mk b/package/lynx/lynx.mk index da57eb2601..8317329262 100644 --- a/package/lynx/lynx.mk +++ b/package/lynx/lynx.mk @@ -6,7 +6,7 @@ LYNX_VERSION = 2.8.9rel.1 LYNX_SOURCE = lynx$(LYNX_VERSION).tar.bz2 -LYNX_SITE = ftp://ftp.invisible-island.net/lynx/tarballs +LYNX_SITE = https://invisible-mirror.net/archives/lynx/tarballs LYNX_PATCH = \ https://salsa.debian.org/lynx-team/lynx/-/raw/debian/2.9.0dev.6-3_deb11u1/debian/patches/90_CVE-2021-38165.patch # 90_CVE-2021-38165.patch From a8485982aaf721f0b71cdb3ae85967a746471672 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 3 Jun 2024 09:17:16 +0200 Subject: [PATCH 5718/5754] package/ncftp: use https:// _SITE MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The ftp server does not respond, so change to https:// instead. Here the 3.2.6 version is under older_versions. wget ftp://ftp.ncftp.com/ncftp/ncftp-3.2.6-src.tar.gz --2024-06-03 08:10:44-- ftp://ftp.ncftp.com/ncftp/ncftp-3.2.6-src.tar.gz => ‘ncftp-3.2.6-src.tar.gz’ Resolving ftp.ncftp.com (ftp.ncftp.com)... 209.197.102.38 Connecting to ftp.ncftp.com (ftp.ncftp.com)|209.197.102.38|:21... ^C http redirects to https, so update the help text to match. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 3eb84214a177be4c939f1e158c43924a4a1d0fe8) Signed-off-by: Peter Korsgaard --- package/ncftp/Config.in | 2 +- package/ncftp/ncftp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ncftp/Config.in b/package/ncftp/Config.in index 6a939aa88c..c8870a3dde 100644 --- a/package/ncftp/Config.in +++ b/package/ncftp/Config.in @@ -7,7 +7,7 @@ config BR2_PACKAGE_NCFTP application programs implementing the File Transfer Protocol (FTP). - http://www.ncftp.com/ncftp/ + https://www.ncftp.com/ncftp/ if BR2_PACKAGE_NCFTP diff --git a/package/ncftp/ncftp.mk b/package/ncftp/ncftp.mk index 676a9c5895..d380ebae02 100644 --- a/package/ncftp/ncftp.mk +++ b/package/ncftp/ncftp.mk @@ -8,7 +8,7 @@ NCFTP_VERSION = 3.2.6 # use .gz as upstream .xz tarball has changed after the hash was added for # 2017.02. Can be changed back to .xz when version is bumped NCFTP_SOURCE = ncftp-$(NCFTP_VERSION)-src.tar.gz -NCFTP_SITE = ftp://ftp.ncftp.com/ncftp +NCFTP_SITE = https://www.ncftp.com/public_ftp/ncftp/older_versions NCFTP_TARGET_BINS = ncftp NCFTP_LICENSE = Clarified Artistic License NCFTP_LICENSE_FILES = doc/LICENSE.txt From 61564410c95d58ed7b5f735f4d24dac15c85f056 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 3 Jun 2024 09:17:17 +0200 Subject: [PATCH 5719/5754] package/newlib-bare-metal: use https:// _SITE The tarballs are also available over https, so use that instead. Signed-off-by: Peter Korsgaard Reviewed-by: Neal Frager Signed-off-by: Yann E. MORIN (cherry picked from commit 1f7de59273144a9c6c173ff14e2cc7eb6649a078) Signed-off-by: Peter Korsgaard --- package/newlib-bare-metal/newlib-bare-metal.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/newlib-bare-metal/newlib-bare-metal.mk b/package/newlib-bare-metal/newlib-bare-metal.mk index 9f5d765751..89092eb973 100644 --- a/package/newlib-bare-metal/newlib-bare-metal.mk +++ b/package/newlib-bare-metal/newlib-bare-metal.mk @@ -5,7 +5,7 @@ ################################################################################ NEWLIB_BARE_METAL_VERSION = 4.4.0.20231231 -NEWLIB_BARE_METAL_SITE = ftp://sourceware.org/pub/newlib +NEWLIB_BARE_METAL_SITE = https://sourceware.org/ftp/newlib NEWLIB_BARE_METAL_SOURCE = newlib-$(NEWLIB_BARE_METAL_VERSION).tar.gz NEWLIB_BARE_METAL_DEPENDENCIES = host-gcc-bare-metal NEWLIB_BARE_METAL_ADD_TOOLCHAIN_DEPENDENCY = NO From 38a28aff85ff0fbbd42c212fe90132adff577843 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 3 Jun 2024 09:17:18 +0200 Subject: [PATCH 5720/5754] package/nfacct: use https for _SITE http redirects to https, so use that instead. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 5438d7d8034387c79111c70fecbdee356f704854) Signed-off-by: Peter Korsgaard --- package/nfacct/Config.in | 2 +- package/nfacct/nfacct.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/nfacct/Config.in b/package/nfacct/Config.in index e30d2d997b..02e7a6dbaa 100644 --- a/package/nfacct/Config.in +++ b/package/nfacct/Config.in @@ -5,4 +5,4 @@ config BR2_PACKAGE_NFACCT nfacct is the command line tool to create/retrieve/delete netfilter accounting objects. - http://www.netfilter.org/projects/nfacct/ + https://www.netfilter.org/projects/nfacct/ diff --git a/package/nfacct/nfacct.mk b/package/nfacct/nfacct.mk index d4c7c4ce70..0092cb9c26 100644 --- a/package/nfacct/nfacct.mk +++ b/package/nfacct/nfacct.mk @@ -6,7 +6,7 @@ NFACCT_VERSION = 1.0.2 NFACCT_SOURCE = nfacct-$(NFACCT_VERSION).tar.bz2 -NFACCT_SITE = http://www.netfilter.org/projects/nfacct/files +NFACCT_SITE = https://www.netfilter.org/projects/nfacct/files NFACCT_DEPENDENCIES = host-pkgconf \ libnetfilter_acct NFACCT_LICENSE = GPL-2.0 From f9af06dcffeee322b6dc41f5aced788cc4de8286 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 3 Jun 2024 09:17:19 +0200 Subject: [PATCH 5721/5754] package/nfacct: use https:// reference for .hash file ftp.netfilter.org no longer provides ftp, so use the https:// url from _SITE. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit d58b1dfa6d1f4de11cec35aeea11b1b05da7a184) Signed-off-by: Peter Korsgaard --- package/nfacct/nfacct.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/nfacct/nfacct.hash b/package/nfacct/nfacct.hash index aac5ce0ab8..4038ff86bc 100644 --- a/package/nfacct/nfacct.hash +++ b/package/nfacct/nfacct.hash @@ -1,4 +1,4 @@ -# From ftp://ftp.netfilter.org/pub/nfacct/nfacct-1.0.2.tar.bz2.{md5sum,sha1sum} +# From https://www.netfilter.org/projects/nfacct/files/nfacct-1.0.2.tar.bz2.{md5sum,sha1sum} md5 94faafdaaed85ca9220c5692be8a408e nfacct-1.0.2.tar.bz2 sha1 17d6576778227ea93c62600d9b18ff4932963c6a nfacct-1.0.2.tar.bz2 # Locally computed From 4b0050f7507693a1bc4e183528c42a19b417e3a5 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 3 Jun 2024 09:17:20 +0200 Subject: [PATCH 5722/5754] package/uboot-tools: use https:// _SITE The tarballs are also available over https, so use that instead. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 9a47d734bd67dc9902ce663ec86ff4e9b1539b5b) Signed-off-by: Peter Korsgaard --- package/uboot-tools/uboot-tools.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk index 12e10dea91..e9c7edb218 100644 --- a/package/uboot-tools/uboot-tools.mk +++ b/package/uboot-tools/uboot-tools.mk @@ -6,7 +6,7 @@ UBOOT_TOOLS_VERSION = 2021.07 UBOOT_TOOLS_SOURCE = u-boot-$(UBOOT_TOOLS_VERSION).tar.bz2 -UBOOT_TOOLS_SITE = ftp://ftp.denx.de/pub/u-boot +UBOOT_TOOLS_SITE = https://ftp.denx.de/pub/u-boot UBOOT_TOOLS_LICENSE = GPL-2.0+ UBOOT_TOOLS_LICENSE_FILES = Licenses/gpl-2.0.txt UBOOT_TOOLS_CPE_ID_VENDOR = denx From d88d2ccd3adf638816677b7dd641da70422c8faa Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 3 Jun 2024 09:17:21 +0200 Subject: [PATCH 5723/5754] package/ulogd: use https for _SITE http redirects to https, so use that instead. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 0ec558208ef7d799ec0db9b02fb64029e74754e9) Signed-off-by: Peter Korsgaard --- package/ulogd/Config.in | 2 +- package/ulogd/ulogd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ulogd/Config.in b/package/ulogd/Config.in index e0e199961a..6631076ae7 100644 --- a/package/ulogd/Config.in +++ b/package/ulogd/Config.in @@ -11,7 +11,7 @@ config BR2_PACKAGE_ULOGD ulogd is a userspace logging daemon for netfilter/iptables related logging. - http://www.netfilter.org/projects/ulogd/ + https://www.netfilter.org/projects/ulogd/ comment "ulogd needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS diff --git a/package/ulogd/ulogd.mk b/package/ulogd/ulogd.mk index 2ebf076d9a..8ef8ec5701 100644 --- a/package/ulogd/ulogd.mk +++ b/package/ulogd/ulogd.mk @@ -6,7 +6,7 @@ ULOGD_VERSION = 2.0.8 ULOGD_SOURCE = ulogd-$(ULOGD_VERSION).tar.bz2 -ULOGD_SITE = http://www.netfilter.org/projects/ulogd/files +ULOGD_SITE = https://www.netfilter.org/projects/ulogd/files ULOGD_DEPENDENCIES = host-pkgconf \ libmnl libnetfilter_acct libnetfilter_conntrack libnetfilter_log \ libnfnetlink From 6720ffa694790e66bd181553151f81ffd36ea351 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 3 Jun 2024 09:17:22 +0200 Subject: [PATCH 5724/5754] package/ulogd: use https:// reference for .hash file ftp.netfilter.org no longer provides ftp, so use the https:// url from _SITE. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit d36ce5f3860406325f07ffe4725d27f50dcf56b7) Signed-off-by: Peter Korsgaard --- package/ulogd/ulogd.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/ulogd/ulogd.hash b/package/ulogd/ulogd.hash index 35b518b9ce..8d729aeb8a 100644 --- a/package/ulogd/ulogd.hash +++ b/package/ulogd/ulogd.hash @@ -1,4 +1,4 @@ -# From ftp://ftp.netfilter.org/pub/ulogd/ulogd-2.0.8.tar.bz2.sha256sum +# From https://www.netfilter.org/projects/ulogd/files/ulogd-2.0.8.tar.bz2.sha256sum sha256 4ead6c3970c3f57fa1e89fe2d7cc483ba6fe2bd1b08701521e0b3afd667df291 ulogd-2.0.8.tar.bz2 # Locally calculated From 32fbe9e54c072dfec5b5753e2491e2c3c65f6ee1 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 3 Jun 2024 09:17:23 +0200 Subject: [PATCH 5725/5754] package/zip: download from sourceforge The tarball (with .tar.gz extension but same content) is also available over https from sourceforge, so use that instead. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit e5993e6cd493dd6329bbf54cd7c19c5862a8a1e6) Signed-off-by: Peter Korsgaard --- package/zip/zip.hash | 2 +- package/zip/zip.mk | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/zip/zip.hash b/package/zip/zip.hash index eb4bbf3b03..cbb96beb31 100644 --- a/package/zip/zip.hash +++ b/package/zip/zip.hash @@ -1,3 +1,3 @@ # Locally calculated from download (no sig, hash) -sha256 f0e8bb1f9b7eb0b01285495a2699df3a4b766784c1765a8f1aeedf63c0806369 zip30.tgz +sha256 f0e8bb1f9b7eb0b01285495a2699df3a4b766784c1765a8f1aeedf63c0806369 zip30.tar.gz sha256 8ecd6c1bab449127eb665cef1561e73a8bce52e217375f6f466939e137b1e110 LICENSE diff --git a/package/zip/zip.mk b/package/zip/zip.mk index 3aa59e7ba7..0457ba9414 100644 --- a/package/zip/zip.mk +++ b/package/zip/zip.mk @@ -5,9 +5,9 @@ ################################################################################ ZIP_VERSION = 3.0 -# The version is really 3.0, but the tarball is named zip30.tgz -ZIP_SOURCE = zip$(subst .,,$(ZIP_VERSION)).tgz -ZIP_SITE = ftp://ftp.info-zip.org/pub/infozip/src +# The version is really 3.0, but the tarball is named zip30.tar.gz +ZIP_SOURCE = zip$(subst .,,$(ZIP_VERSION)).tar.gz +ZIP_SITE = https://sourceforge.net/projects/infozip/files/Zip%203.x%20%28latest%29/$(ZIP_VERSION) ZIP_LICENSE = Info-ZIP ZIP_LICENSE_FILES = LICENSE ZIP_CPE_ID_VENDOR = info-zip_project From b4af2990851a6064b3695545d8e9af39da9a9a03 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 3 Jun 2024 09:17:24 +0200 Subject: [PATCH 5726/5754] package/proftpd: download from github The tarball is also available over https from github, so use that instead. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit eca3ea8d3f83a19a1ce9823306e689d2b0b92c5d) Signed-off-by: Peter Korsgaard --- package/proftpd/proftpd.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/proftpd/proftpd.mk b/package/proftpd/proftpd.mk index 0820822e17..445ece779d 100644 --- a/package/proftpd/proftpd.mk +++ b/package/proftpd/proftpd.mk @@ -5,7 +5,7 @@ ################################################################################ PROFTPD_VERSION = 1.3.8b -PROFTPD_SITE = ftp://ftp.proftpd.org/distrib/source +PROFTPD_SITE = https://github.com/proftpd/proftpd/archive/v$(PROFTPD_VERSION) PROFTPD_LICENSE = GPL-2.0+ PROFTPD_LICENSE_FILES = COPYING PROFTPD_CPE_ID_VENDOR = proftpd From a360f66358dc558ea41a2d505dc3b48f400d0703 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 3 Jun 2024 09:28:28 +0200 Subject: [PATCH 5727/5754] Config.in: drop --passive-ftp from default wget options Fedora has recently migrated to wget2, which has dropped ftp support and the --passive-ftp command line option: https://fedoraproject.org/wiki/Changes/Wget2asWget It turns out that the command line option also doesn't do anything for wget1 as it was made the default in wget 1.10: https://git.savannah.gnu.org/cgit/wget.git/tree/NEWS?h=v1.13#n292 wget 1.10 is from 2005, so it is safe to assume that all supported distributions use >= 1.10. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 1a61c1d9b1919120883b689c3767925bd91d3028) Signed-off-by: Peter Korsgaard --- Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Config.in b/Config.in index e4f58f3f66..bfb3f75615 100644 --- a/Config.in +++ b/Config.in @@ -105,7 +105,7 @@ menu "Commands" config BR2_WGET string "Wget command" - default "wget --passive-ftp -nd -t 3" + default "wget -nd -t 3" config BR2_SVN string "Subversion (svn) command" From 4e5b4b26bfe5cf97a538e1cbb9429d906f7e22bb Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Mon, 3 Jun 2024 11:25:13 +0200 Subject: [PATCH 5728/5754] DEVELOPERS: add Yegor Yefremov for package/ncftp Signed-off-by: Yegor Yefremov Signed-off-by: Peter Korsgaard (cherry picked from commit 9703351e3f7c089975369bfa8995041d6565542e) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 83f3640dc0..253e3ff343 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -3279,6 +3279,7 @@ F: package/libuci/ F: package/linux-firmware/ F: package/linux-serial-test/ F: package/modem-manager/ +F: package/ncftp/ F: package/nftables/ F: package/nuttcp/ F: package/parted/ From 2a026ca5011c759dbb2f88c7bea25d8a32019d96 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 2 Jun 2024 00:31:19 +0200 Subject: [PATCH 5729/5754] package/tpm2-tss: create tss user and group for tpm /dev nodes When systemd and tpm2-tss with fapi support are enabled, the fakeroot script fail with: :35: Failed to resolve user 'tss': No such process. When fapi support is enabled, tpm2-tss package install additional configuration files that are expecting tss user and group exist [1]. /etc/sysusers.d/tpm2-tss.conf /etc/tmpfiles.d/tpm2-tss-fapi.conf The build fail in the fakeroot environment while handling tmpfiles installed by tpm2-tss with fapi by host-systemd. tss user and group is currently created by the tpm2-abrmd package but tpm2-tss package also provide a udev rule file tpm-udev.rules [2] that set the ownership of dev nodes /dev/tpmX and /dev/tpmrmX to tss user/group. So tpm2-tss package must define TPM2_TSS_USERS to create tss user and group, not tpm2-abrmd package. So, move TPM2_ABRMD_USERS to TPM2_TSS_USERS. Note: tpm2-abrmd is nowadays deprecated since the in-kernel Resource Manager (available since kernel 4.12) is preferred [3]. [1] https://github.com/tpm2-software/tpm2-tss/blob/4.1.3/INSTALL.md?plain=1#L184 [2] https://github.com/tpm2-software/tpm2-tss/blob/4.1.3/dist/tpm-udev.rules [3] https://github.com/tpm2-software/tpm2-abrmd/blob/3.0.0/README.md?plain=1#L39 Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard (cherry picked from commit 2cdd3d1ccfbf36a921b737749367a70ad29e87a5) Signed-off-by: Peter Korsgaard --- package/tpm2-abrmd/tpm2-abrmd.mk | 4 ---- package/tpm2-tss/tpm2-tss.mk | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/tpm2-abrmd/tpm2-abrmd.mk b/package/tpm2-abrmd/tpm2-abrmd.mk index 8de233008e..0e62cb176a 100644 --- a/package/tpm2-abrmd/tpm2-abrmd.mk +++ b/package/tpm2-abrmd/tpm2-abrmd.mk @@ -29,8 +29,4 @@ define TPM2_ABRMD_INSTALL_INIT_SYSV $(TARGET_DIR)/etc/init.d/S80tpm2-abrmd endef -define TPM2_ABRMD_USERS - tss -1 tss -1 * - - - TPM2 Access Broker & Resource Management daemon -endef - $(eval $(autotools-package)) diff --git a/package/tpm2-tss/tpm2-tss.mk b/package/tpm2-tss/tpm2-tss.mk index 10d605fc65..b76d16e71e 100644 --- a/package/tpm2-tss/tpm2-tss.mk +++ b/package/tpm2-tss/tpm2-tss.mk @@ -42,4 +42,8 @@ else TPM2_TSS_CONF_OPTS += --disable-fapi endif +define TPM2_TSS_USERS + tss -1 tss -1 * - - - tss user for tpm2 +endef + $(eval $(autotools-package)) From d9bb7bb688b6201c6f1678e38c3018ea193d0237 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 2 Jun 2024 00:31:20 +0200 Subject: [PATCH 5730/5754] package/systemd: add optional tpm2 dependency When tpm2-tss package is selected, systemd can enable its TPM2 support [1] used by systemd-boot, systemd-cryptenroll (when cryptsetup package is also enabled) [2] and other tool systemd-pcr{extend,lock,machine}. [1] https://github.com/systemd/systemd/blob/db11bab38ccf1ed257f310d29070843d4c58ea01/meson.build#L1341 [2] https://www.freedesktop.org/software/systemd/man/latest/systemd-cryptenroll.html Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard (cherry picked from commit 0e567a1580eaffcf6e18a68747e7d5701bcb176d) Signed-off-by: Peter Korsgaard --- package/systemd/systemd.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index c6b006d1fb..dd4f3e778d 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -576,6 +576,13 @@ else SYSTEMD_CONF_OPTS += -Dhibernate=false endif +ifeq ($(BR2_PACKAGE_TPM2_TSS),y) +SYSTEMD_DEPENDENCIES += tpm2-tss +SYSTEMD_CONF_OPTS += -Dtpm2=true +else +SYSTEMD_CONF_OPTS += -Dtpm2=false +endif + ifeq ($(BR2_PACKAGE_SYSTEMD_BOOT),y) SYSTEMD_INSTALL_IMAGES = YES SYSTEMD_DEPENDENCIES += gnu-efi host-python-pyelftools From 97d7a8e9c81dab338d7e5faae47471eeda0109d6 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 31 May 2024 19:17:33 -0600 Subject: [PATCH 5731/5754] utils/genrandconfig: drop glibc Linaro toolchain version check It has been well over 10 years since glibc 2.14 was released; the last Debian version that had an earlier glibc was Wheezy, which Freexian stopped to maintain as an ELTS in June 2020, 4 years ago, while the oldest still maintained Ubuntu has glibc 2.21. It is now safe to assume glibc 2.14 on all major, relevant distributions nowadays. The distutils module is no longer bundled with python 3.12 so this eliminates the need to install additional python modules under python 3.12. Signed-off-by: James Hilliard [yann.morin.1998@free.fr: add Debian and Ubuntu references] Signed-off-by: Yann E. MORIN (cherry picked from commit 929a491f4073d600cd95be4cf97d53faa9a6e38e) Signed-off-by: Peter Korsgaard --- utils/genrandconfig | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/utils/genrandconfig b/utils/genrandconfig index d00b9cb36f..f2f1e33361 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -25,8 +25,6 @@ import os from random import randint import sys import traceback -from distutils.version import StrictVersion -import platform class SystemInfo: @@ -166,23 +164,6 @@ async def is_toolchain_usable(configfile, config): print(" Missing: %s" % toolchainline.strip(), file=sys.stderr) return False - # The latest Linaro toolchains on x86-64 hosts requires glibc - # 2.14+ on the host. - if platform.machine() == 'x86_64': - if 'BR2_TOOLCHAIN_EXTERNAL_LINARO_ARM=y\n' in configlines or \ - 'BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64=y\n' in configlines or \ - 'BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_BE=y\n' in configlines or \ - 'BR2_TOOLCHAIN_EXTERNAL_LINARO_ARMEB=y\n' in configlines: - proc = await asyncio.create_subprocess_exec( - 'ldd', '--version', stdout=asyncio.subprocess.PIPE) - ldd_version_output, _ = await proc.communicate() - if proc.returncode: - return False - glibc_version = ldd_version_output.decode().splitlines()[0].split()[-1] - if StrictVersion('2.14') > StrictVersion(glibc_version): - print("WARN: ignoring the Linaro ARM toolchains because too old host glibc", file=sys.stderr) - return False - return True From de9436e29d7ce1f5ce8e7673b52d14d2947649a6 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 2 Jun 2024 14:41:39 -0600 Subject: [PATCH 5732/5754] package/vala: bump to version 0.56.17 Fixes: http://autobuild.buildroot.net/results/f08/f087b879167252690ed198de771292142c6249f8/ Set GI_GIRDIR env variable which is now required for configure to function. Details: https://gitlab.gnome.org/GNOME/vala/-/commit/a9d38070ce86d7994b949f7cb426fbf670a953d8 Signed-off-by: James Hilliard [yann.morin.1998@free.fr: drop spurious reflow of _DEPENDENCIES] Signed-off-by: Yann E. MORIN (cherry picked from commit 3d4896c52909b43e0c3049f8f79f77b5c502e2dd) Signed-off-by: Peter Korsgaard --- package/vala/vala.hash | 4 ++-- package/vala/vala.mk | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/vala/vala.hash b/package/vala/vala.hash index b3716f0854..a16875ac6a 100644 --- a/package/vala/vala.hash +++ b/package/vala/vala.hash @@ -1,4 +1,4 @@ -# From https://download.gnome.org/sources/vala/0.56/vala-0.56.14.sha256sum -sha256 9382c268ca9bdc02aaedc8152a9818bf3935273041f629c56de410e360a3f557 vala-0.56.14.tar.xz +# From https://download.gnome.org/sources/vala/0.56/vala-0.56.17.sha256sum +sha256 26100c4e4ef0049c619275f140d97cf565883d00c7543c82bcce5a426934ed6a vala-0.56.17.tar.xz # Locally computed sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING diff --git a/package/vala/vala.mk b/package/vala/vala.mk index 415d996faa..85f928202a 100644 --- a/package/vala/vala.mk +++ b/package/vala/vala.mk @@ -5,7 +5,7 @@ ################################################################################ VALA_VERSION_MAJOR = 0.56 -VALA_VERSION = $(VALA_VERSION_MAJOR).14 +VALA_VERSION = $(VALA_VERSION_MAJOR).17 VALA_SITE = http://download.gnome.org/sources/vala/$(VALA_VERSION_MAJOR) VALA_SOURCE = vala-$(VALA_VERSION).tar.xz VALA_LICENSE = LGPL-2.1+ @@ -15,7 +15,9 @@ VALA_CPE_ID_VENDOR = gnome HOST_VALA_DEPENDENCIES = host-bison host-flex host-libglib2 # Yes, the autoconf script understands ':' as "xsltproc is not # available". -HOST_VALA_CONF_ENV = ac_cv_path_XSLTPROC=: +HOST_VALA_CONF_ENV = \ + ac_cv_path_XSLTPROC=: \ + GI_GIRDIR="$(STAGING_DIR)/usr/share/gir-1.0" HOST_VALA_CONF_OPTS += --disable-valadoc # We wrap vala, valac and vapigen to point to the proper gir and vapi data dirs From c26388399135f74718077316e1b0748cff9dc822 Mon Sep 17 00:00:00 2001 From: Martin Whitaker Date: Mon, 3 Jun 2024 18:09:35 +0200 Subject: [PATCH 5733/5754] board/freescale/common/imx/imx8-bootloader-prepare.sh: fix FIT external position MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When using imx-mkimage 6.1.36_2.1.0 or later, an additional data structure is inserted in the generated image. The FIT external data position passed to the uboot mkimage program needs to be adjusted accordingly. Fixes: https://bugs.busybox.net/show_bug.cgi?id=15973 Fixes: 72de78902330 ("package/imx-mkimage: bump version to lf-6.1.36-2.1.0") Tested-by: Sébastien Szymanski [Sébastien: Tested on i.MX8MM EVK and i.MX8MP EVK] [Sébastien: - fix subject - add Tested-by tag - fix Fixes tags ] Signed-off-by: Sébastien Szymanski Signed-off-by: Peter Korsgaard (cherry picked from commit baaf7f738a76d363aed753888da0712c7c430976) Signed-off-by: Peter Korsgaard --- board/freescale/common/imx/imx8-bootloader-prepare.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/board/freescale/common/imx/imx8-bootloader-prepare.sh b/board/freescale/common/imx/imx8-bootloader-prepare.sh index a9ee154e9c..b353d506fe 100755 --- a/board/freescale/common/imx/imx8-bootloader-prepare.sh +++ b/board/freescale/common/imx/imx8-bootloader-prepare.sh @@ -8,6 +8,8 @@ main () exit 1 fi + FIT_EXTERNAL_POSITION=0x5000 + if grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M=y$" ${BR2_CONFIG}; then dd if=${BINARIES_DIR}/u-boot-spl.bin of=${BINARIES_DIR}/u-boot-spl-padded.bin bs=4 conv=sync cat ${BINARIES_DIR}/u-boot-spl-padded.bin ${BINARIES_DIR}/ddr_fw.bin > ${BINARIES_DIR}/u-boot-spl-ddr.bin @@ -16,7 +18,7 @@ main () else BL31=${BINARIES_DIR}/bl31.bin BL33=${BINARIES_DIR}/u-boot-nodtb.bin ATF_LOAD_ADDR=0x00910000 ${HOST_DIR}/bin/mkimage_fit_atf.sh ${UBOOT_DTB} > ${BINARIES_DIR}/u-boot.its fi - ${HOST_DIR}/bin/mkimage -E -p 0x3000 -f ${BINARIES_DIR}/u-boot.its ${BINARIES_DIR}/u-boot.itb + ${HOST_DIR}/bin/mkimage -E -p ${FIT_EXTERNAL_POSITION} -f ${BINARIES_DIR}/u-boot.its ${BINARIES_DIR}/u-boot.itb rm -f ${BINARIES_DIR}/u-boot.its ${HOST_DIR}/bin/mkimage_imx8 -fit -signed_hdmi ${BINARIES_DIR}/signed_hdmi_imx8m.bin -loader ${BINARIES_DIR}/u-boot-spl-ddr.bin 0x7E1000 -second_loader ${BINARIES_DIR}/u-boot.itb 0x40200000 0x60000 -out ${BINARIES_DIR}/imx8-boot-sd.bin @@ -28,7 +30,7 @@ main () else BL31=${BINARIES_DIR}/bl31.bin BL33=${BINARIES_DIR}/u-boot-nodtb.bin ATF_LOAD_ADDR=0x00920000 ${HOST_DIR}/bin/mkimage_fit_atf.sh ${UBOOT_DTB} > ${BINARIES_DIR}/u-boot.its fi - ${HOST_DIR}/bin/mkimage -E -p 0x3000 -f ${BINARIES_DIR}/u-boot.its ${BINARIES_DIR}/u-boot.itb + ${HOST_DIR}/bin/mkimage -E -p ${FIT_EXTERNAL_POSITION} -f ${BINARIES_DIR}/u-boot.its ${BINARIES_DIR}/u-boot.itb rm -f ${BINARIES_DIR}/u-boot.its ${HOST_DIR}/bin/mkimage_imx8 -fit -loader ${BINARIES_DIR}/u-boot-spl-ddr.bin 0x7E1000 -second_loader ${BINARIES_DIR}/u-boot.itb 0x40200000 0x60000 -out ${BINARIES_DIR}/imx8-boot-sd.bin @@ -40,7 +42,7 @@ main () else BL31=${BINARIES_DIR}/bl31.bin BL33=${BINARIES_DIR}/u-boot-nodtb.bin ATF_LOAD_ADDR=0x00960000 ${HOST_DIR}/bin/mkimage_fit_atf.sh ${UBOOT_DTB} > ${BINARIES_DIR}/u-boot.its fi - ${HOST_DIR}/bin/mkimage -E -p 0x3000 -f ${BINARIES_DIR}/u-boot.its ${BINARIES_DIR}/u-boot.itb + ${HOST_DIR}/bin/mkimage -E -p ${FIT_EXTERNAL_POSITION} -f ${BINARIES_DIR}/u-boot.its ${BINARIES_DIR}/u-boot.itb rm -f ${BINARIES_DIR}/u-boot.its ${HOST_DIR}/bin/mkimage_imx8 -v v2 -fit -loader ${BINARIES_DIR}/u-boot-spl-ddr.bin 0x912000 -second_loader ${BINARIES_DIR}/u-boot.itb 0x40200000 0x60000 -out ${BINARIES_DIR}/imx8-boot-sd.bin @@ -52,7 +54,7 @@ main () else BL31=${BINARIES_DIR}/bl31.bin BL33=${BINARIES_DIR}/u-boot-nodtb.bin ATF_LOAD_ADDR=0x00970000 ${HOST_DIR}/bin/mkimage_fit_atf.sh ${UBOOT_DTB} > ${BINARIES_DIR}/u-boot.its fi - ${HOST_DIR}/bin/mkimage -E -p 0x3000 -f ${BINARIES_DIR}/u-boot.its ${BINARIES_DIR}/u-boot.itb + ${HOST_DIR}/bin/mkimage -E -p ${FIT_EXTERNAL_POSITION} -f ${BINARIES_DIR}/u-boot.its ${BINARIES_DIR}/u-boot.itb rm -f ${BINARIES_DIR}/u-boot.its ${HOST_DIR}/bin/mkimage_imx8 -v v2 -fit -loader ${BINARIES_DIR}/u-boot-spl-ddr.bin 0x920000 -second_loader ${BINARIES_DIR}/u-boot.itb 0x40200000 0x60000 -out ${BINARIES_DIR}/imx8-boot-sd.bin From 658686c6df381a12fca841adb0d2837dd56eb4aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20M=C3=A9lotte?= Date: Mon, 3 Jun 2024 15:32:42 +0200 Subject: [PATCH 5734/5754] docs/manual: document python-aiohttp needed for pkg-stats MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Raphaël Mélotte Signed-off-by: Peter Korsgaard (cherry picked from commit 095bd205ae22c285bab272ad341948236dac5bcf) Signed-off-by: Peter Korsgaard --- docs/manual/prerequisite.adoc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/manual/prerequisite.adoc b/docs/manual/prerequisite.adoc index 262a5153f5..ab609c12be 100644 --- a/docs/manual/prerequisite.adoc +++ b/docs/manual/prerequisite.adoc @@ -96,3 +96,6 @@ corresponding tool on the host system: * Graph generation tools: ** +graphviz+ to use 'graph-depends' and '-graph-depends' ** +python-matplotlib+ to use 'graph-build' + +* Package statistics tools ('pkg-stats'): +** +python-aiohttp+ From 454728710b7e852e71169d444ffb402435d30e8d Mon Sep 17 00:00:00 2001 From: Fiona Klute Date: Fri, 26 Apr 2024 23:51:44 +0200 Subject: [PATCH 5735/5754] package/kmod: fix build with musl Patch from upstream PR still being discussed: https://github.com/kmod-project/kmod/pull/32 Fixes: #16093 Signed-off-by: Fiona Klute [yann.morin.1998@free.fr: - add upstream tag to the patch - reference #16093 ] Signed-off-by: Yann E. MORIN (cherry picked from commit 05617724ee2b5db9a1a6bb07272915ef3c1fd535) Signed-off-by: Peter Korsgaard --- ...able-implementation-for-basename-API.patch | 134 ++++++++++++++++++ 1 file changed, 134 insertions(+) create mode 100644 package/kmod/0002-Use-portable-implementation-for-basename-API.patch diff --git a/package/kmod/0002-Use-portable-implementation-for-basename-API.patch b/package/kmod/0002-Use-portable-implementation-for-basename-API.patch new file mode 100644 index 0000000000..26f108d66e --- /dev/null +++ b/package/kmod/0002-Use-portable-implementation-for-basename-API.patch @@ -0,0 +1,134 @@ +From 721ed6040c7aa47070faf6378c433089e178bd43 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 9 Dec 2023 17:35:59 -0800 +Subject: [PATCH] Use portable implementation for basename API + +musl has removed the non-prototype declaration of basename from +string.h [1] which now results in build errors with clang-17+ compiler + +Implement GNU basename behavior using strchr which is portable across libcs + +Fixes +../git/tools/kmod.c:71:19: error: call to undeclared function 'basename'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] +71 | "Commands:\n", basename(argv[0])); +| ^ + +[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7 + +Suggested-by: Rich Felker + +Signed-off-by: Khem Raj + +Upstream: https://github.com/kmod-project/kmod/pull/32 +Signed-off-by: Fiona Klute +--- + libkmod/libkmod-config.c | 2 +- + shared/util.c | 4 ++-- + shared/util.h | 7 +++++++ + testsuite/testsuite.c | 2 +- + tools/depmod.c | 2 +- + tools/kmod.c | 4 ++-- + 6 files changed, 14 insertions(+), 7 deletions(-) + +diff --git a/libkmod/libkmod-config.c b/libkmod/libkmod-config.c +index e83621b3..8aa555a4 100644 +--- a/libkmod/libkmod-config.c ++++ b/libkmod/libkmod-config.c +@@ -794,7 +794,7 @@ static int conf_files_insert_sorted(struct kmod_ctx *ctx, + bool is_single = false; + + if (name == NULL) { +- name = basename(path); ++ name = gnu_basename(path); + is_single = true; + } + +diff --git a/shared/util.c b/shared/util.c +index e2bab83a..0e16670e 100644 +--- a/shared/util.c ++++ b/shared/util.c +@@ -172,9 +172,9 @@ char *modname_normalize(const char *modname, char buf[static PATH_MAX], size_t * + + char *path_to_modname(const char *path, char buf[static PATH_MAX], size_t *len) + { +- char *modname; ++ const char *modname; + +- modname = basename(path); ++ modname = gnu_basename(path); + if (modname == NULL || modname[0] == '\0') + return NULL; + +diff --git a/shared/util.h b/shared/util.h +index c4a3916b..073dc5a7 100644 +--- a/shared/util.h ++++ b/shared/util.h +@@ -5,6 +5,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -76,6 +77,12 @@ do { \ + __p->__v = (val); \ + } while(0) + ++static _always_inline_ const char *gnu_basename(const char *s) ++{ ++ const char *p = strrchr(s, '/'); ++ return p ? p+1 : s; ++} ++ + static _always_inline_ unsigned int ALIGN_POWER2(unsigned int u) + { + return 1 << ((sizeof(u) * 8) - __builtin_clz(u - 1)); +diff --git a/testsuite/testsuite.c b/testsuite/testsuite.c +index 318343ac..aafc9873 100644 +--- a/testsuite/testsuite.c ++++ b/testsuite/testsuite.c +@@ -70,7 +70,7 @@ static void help(void) + + printf("Usage:\n" + "\t%s [options] \n" +- "Options:\n", basename(progname)); ++ "Options:\n", gnu_basename(progname)); + + for (itr = options, itr_short = options_short; + itr->name != NULL; itr++, itr_short++) +diff --git a/tools/depmod.c b/tools/depmod.c +index 43fc354a..cfb15b11 100644 +--- a/tools/depmod.c ++++ b/tools/depmod.c +@@ -762,7 +762,7 @@ static int cfg_files_insert_sorted(struct cfg_file ***p_files, size_t *p_n_files + if (name != NULL) + namelen = strlen(name); + else { +- name = basename(dir); ++ name = gnu_basename(dir); + namelen = strlen(name); + dirlen -= namelen + 1; + } +diff --git a/tools/kmod.c b/tools/kmod.c +index 55689c07..df91e5c6 100644 +--- a/tools/kmod.c ++++ b/tools/kmod.c +@@ -68,7 +68,7 @@ static int kmod_help(int argc, char *argv[]) + "Options:\n" + "\t-V, --version show version\n" + "\t-h, --help show this help\n\n" +- "Commands:\n", basename(argv[0])); ++ "Commands:\n", gnu_basename(argv[0])); + + for (i = 0; i < ARRAY_SIZE(kmod_cmds); i++) { + if (kmod_cmds[i]->help != NULL) { +@@ -156,7 +156,7 @@ static int handle_kmod_compat_commands(int argc, char *argv[]) + const char *cmd; + size_t i; + +- cmd = basename(argv[0]); ++ cmd = gnu_basename(argv[0]); + + for (i = 0; i < ARRAY_SIZE(kmod_compat_cmds); i++) { + if (streq(kmod_compat_cmds[i]->name, cmd)) From 01e7df5745be39aae839ccfeb6c34b382c9e8afd Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 8 Jun 2024 20:26:56 +0200 Subject: [PATCH 5736/5754] package/go: security bump to go1.21.11 Fixes the following CVEs: CVE-2024-24789: archive/zip: mishandling of corrupt central directory record CVE-2024-24790: net/netip: unexpected behavior from Is methods for IPv4-mapped IPv6 addresses 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 516f0a70de..1f491a3284 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://go.dev/dl -sha256 900e0afe8900c1ee65a8a8c4f0c5a3ca02dcf85c1d1cb13a652be22c21399394 go1.21.10.src.tar.gz +sha256 42aee9bf2b6956c75a7ad6aa3f0a51b5821ffeac57f5a2e733a2d6eae1e6d9d2 go1.21.11.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index c8089d71b1..e6970f9970 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.21.10 +GO_VERSION = 1.21.11 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz From 73075706e9769e8db238258c8a1b756e179930d3 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Fri, 31 May 2024 21:40:25 +0200 Subject: [PATCH 5737/5754] package/octave: add optional {Graphics, Image}Magick++ support Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN (cherry picked from commit 9f39676bdbd4936669a128c544ade514b3afef6a) Signed-off-by: Peter Korsgaard --- package/octave/octave.mk | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/package/octave/octave.mk b/package/octave/octave.mk index 9d6e4719c3..f3c4294f2d 100644 --- a/package/octave/octave.mk +++ b/package/octave/octave.mk @@ -26,6 +26,16 @@ else OCTAVE_CONF_OPTS += --without-bz2 endif +ifeq ($(BR2_PACKAGE_GRAPHICSMAGICK),y) +OCTAVE_CONF_OPTS += --with-magick=GraphicsMagick++ +OCTAVE_DEPENDENCIES += graphicsmagick +else ifeq ($(BR2_PACKAGE_IMAGEMAGICK),y) +OCTAVE_CONF_OPTS += --with-magick=ImageMagick++ +OCTAVE_DEPENDENCIES += imagemagick +else +OCTAVE_CONF_OPTS += --without-magick +endif + ifeq ($(BR2_PACKAGE_READLINE),y) OCTAVE_CONF_OPTS += \ --enable-readline \ From 1b93db30fa48135d892b8c3bdb381ba1b688b287 Mon Sep 17 00:00:00 2001 From: Roy Kollen Svendsen Date: Wed, 5 Jun 2024 11:06:51 +0200 Subject: [PATCH 5738/5754] package/libffi: fix host build failure MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Host build fails on updated Arch Linux desktop. My current /usr/bin/gcc version is 14.1.1 20240522, where implicit-function-declaration cause build to fail: 2024-06-05T07:03:20 libtool: compile: /home/roy/hymatek/connexi-touchpanel-firmware/mxxf1/output/host/bin/ccache /usr/bin/gcc -DHAVE_CONFIG_H -I. -I.. -I. -I../include -Iinclude -I../src -I/home/roy/hymatek/connexi-touchpanel-firmware/mxxf1/output/host/include -Wall -O2 -I/home/roy/hymatek/connexi-touchpanel-firmware/mxxf1/output/host/include -fexceptions -c ../src/tramp.c -fPIC -DPIC -o src/.libs/tramp.o 2024-06-05T07:03:20 ../src/tramp.c: In function ‘ffi_tramp_get_temp_file’: 2024-06-05T07:03:20 ../src/tramp.c:262:22: error: implicit declaration of function ‘open_temp_exec_file’ [-Wimplicit-function-declaration] 2024-06-05T07:03:20 262 | tramp_globals.fd = open_temp_exec_file (); 2024-06-05T07:03:20 | ^~~~~~~~~~~~~~~~~~~ Patch from master was added to fix build. Signed-off-by: Roy Kollen Svendsen Signed-off-by: Peter Korsgaard --- ...ward-declare-open_temp_exec_file-764.patch | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 package/libffi/0004-Forward-declare-open_temp_exec_file-764.patch diff --git a/package/libffi/0004-Forward-declare-open_temp_exec_file-764.patch b/package/libffi/0004-Forward-declare-open_temp_exec_file-764.patch new file mode 100644 index 0000000000..341a2e4e43 --- /dev/null +++ b/package/libffi/0004-Forward-declare-open_temp_exec_file-764.patch @@ -0,0 +1,49 @@ +From ce077e5565366171aa1b4438749b0922fce887a4 Mon Sep 17 00:00:00 2001 +From: serge-sans-paille +Date: Thu, 2 Feb 2023 14:46:29 +0000 +Subject: [PATCH] Forward declare open_temp_exec_file (#764) + +It's defined in closures.c and used in tramp.c. +Also declare it as an hidden symbol, as it should be. + +Co-authored-by: serge-sans-paille +Upstream: https://github.com/libffi/libffi/pull/764 +Signed-off-by: Roy Kollen Svendsen +--- + include/ffi_common.h | 4 ++++ + src/tramp.c | 4 ++++ + 2 files changed, 8 insertions(+) + +diff --git a/include/ffi_common.h b/include/ffi_common.h +index 2bd31b0..c53a794 100644 +--- a/include/ffi_common.h ++++ b/include/ffi_common.h +@@ -128,6 +128,10 @@ void *ffi_data_to_code_pointer (void *data) FFI_HIDDEN; + static trampoline. */ + int ffi_tramp_is_present (void *closure) FFI_HIDDEN; + ++/* Return a file descriptor of a temporary zero-sized file in a ++ writable and executable filesystem. */ ++int open_temp_exec_file(void) FFI_HIDDEN; ++ + /* Extended cif, used in callback from assembly routine */ + typedef struct + { +diff --git a/src/tramp.c b/src/tramp.c +index 7e005b0..5f19b55 100644 +--- a/src/tramp.c ++++ b/src/tramp.c +@@ -39,6 +39,10 @@ + #ifdef __linux__ + #define _GNU_SOURCE 1 + #endif ++ ++#include ++#include ++ + #include + #include + #include +-- +2.45.1 + From 79369cb16516b0dc4e244d95aa36911e40717ab2 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Thu, 6 Jun 2024 10:32:57 +0200 Subject: [PATCH 5739/5754] package/git: bump version to 2.43.5 Fixes "git lfs" and "git annex" breakage/regressions (for details see [1]). [1] https://lore.kernel.org/git/xmqqr0dheuw5.fsf@gitster.g/ Signed-off-by: Peter Seiderer 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 f24023f2f3..9b8c8eeceb 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 6b7aadda1787f0c1eaa257c1df56bb12e43d12bce55cfe7e5ade00228ee3d886 git-2.43.4.tar.xz +sha256 8b7cc3db84c5c6a2eeb39c63686ff5cde26278e32bb0d2226a8b424488420b98 git-2.43.5.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 15a29d1f6c..01933a96b2 100644 --- a/package/git/git.mk +++ b/package/git/git.mk @@ -4,7 +4,7 @@ # ################################################################################ -GIT_VERSION = 2.43.4 +GIT_VERSION = 2.43.5 GIT_SOURCE = git-$(GIT_VERSION).tar.xz GIT_SITE = $(BR2_KERNEL_MIRROR)/software/scm/git GIT_LICENSE = GPL-2.0, LGPL-2.1+ From ee6694e9704b08dd81b00e78c397224da0dc79f3 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Thu, 6 Jun 2024 10:35:45 +0200 Subject: [PATCH 5740/5754] package/libopenssl: security bump to version 3.2.2 Fixes CVE-2024-4741 (for details see [1]). [1] https://www.openssl.org/news/secadv/20240528.txt Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- 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 841d4b4cfd..0909784e90 100644 --- a/package/libopenssl/libopenssl.hash +++ b/package/libopenssl/libopenssl.hash @@ -1,5 +1,5 @@ -# From https://www.openssl.org/source/openssl-3.2.1.tar.gz.sha256 -sha256 83c7329fe52c850677d75e5d0b0ca245309b97e8ecbcfdc1dfdc4ab9fac35b39 openssl-3.2.1.tar.gz +# From https://www.openssl.org/source/openssl-3.2.2.tar.gz.sha256 +sha256 197149c18d9e9f292c43f0400acaba12e5f52cacfe050f3d199277ea738ec2e7 openssl-3.2.2.tar.gz # License files sha256 7d5450cb2d142651b8afa315b5f238efc805dad827d91ba367d8516bc9d49e7a LICENSE.txt diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index feb5026c02..3043aa1c26 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOPENSSL_VERSION = 3.2.1 +LIBOPENSSL_VERSION = 3.2.2 LIBOPENSSL_SITE = https://www.openssl.org/source LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz LIBOPENSSL_LICENSE = Apache-2.0 From 10dd781eacea515951542424033462e67558e258 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=2E=20Neusch=C3=A4fer?= Date: Wed, 29 May 2024 20:22:57 +0200 Subject: [PATCH 5741/5754] micropython: Add patch to avoid textrel on arm/thumb MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: J. Neuschäfer Signed-off-by: Yann E. MORIN (cherry picked from commit cc08d6f5d1a152279c340f56539a43d932ea0b0d) Signed-off-by: Peter Korsgaard --- ...-non-Thumb2-long-jump-workaround-opt.patch | 130 ++++++++++++++++++ 1 file changed, 130 insertions(+) create mode 100644 package/micropython/0001-py-nlrthumb-Make-non-Thumb2-long-jump-workaround-opt.patch diff --git a/package/micropython/0001-py-nlrthumb-Make-non-Thumb2-long-jump-workaround-opt.patch b/package/micropython/0001-py-nlrthumb-Make-non-Thumb2-long-jump-workaround-opt.patch new file mode 100644 index 0000000000..b05791045e --- /dev/null +++ b/package/micropython/0001-py-nlrthumb-Make-non-Thumb2-long-jump-workaround-opt.patch @@ -0,0 +1,130 @@ +From 7b050b366b7dacfb43779c51702a892d8f1873d0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=2E=20Neusch=C3=A4fer?= +Date: Sun, 2 Apr 2023 19:58:42 +0200 +Subject: [PATCH] py/nlrthumb: Make non-Thumb2 long-jump workaround opt-in. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Although the original motivation given for the workaround[1] is correct, +nlr.o and nlrthumb.o are linked with a small enough distance that the +problem does not occur, and the workaround isn't necessary. The distance +between the b instruction and its target (nlr_push_tail) is just 64 +bytes[2], well within the ±2046 byte range addressable by an +unconditional branch instruction in Thumb mode. + +The workaround induces a relocation in the text section (textrel), which +isn't supported everywhere, notably not on musl-libc[3], where it causes +a crash on start-up. With the workaround removed, micropython works on an +ARMv5T Linux system built with musl-libc. + +This commit changes nlrthumb.c to use a direct jump by default, but +leaves the long jump workaround as an option for those cases where it's +actually needed. + +[1]: commit dd376a239dc4f47b0ee7866810fcda151f3cf6dd + +Author: Damien George +Date: Fri Sep 1 15:25:29 2017 +1000 + + py/nlrthumb: Get working again on standard Thumb arch (ie not Thumb2). + + "b" on Thumb might not be long enough for the jump to nlr_push_tail so + it must be done indirectly. + +[2]: Excerpt from objdump -d micropython: + +000095c4 : + 95c4: b510 push {r4, lr} + 95c6: 0004 movs r4, r0 + 95c8: f02d fd42 bl 37050 + 95cc: 6943 ldr r3, [r0, #20] + 95ce: 6023 str r3, [r4, #0] + 95d0: 6144 str r4, [r0, #20] + 95d2: 2000 movs r0, #0 + 95d4: bd10 pop {r4, pc} + +000095d6 : + 95d6: b510 push {r4, lr} + 95d8: f02d fd3a bl 37050 + 95dc: 6943 ldr r3, [r0, #20] + 95de: 681b ldr r3, [r3, #0] + 95e0: 6143 str r3, [r0, #20] + 95e2: bd10 pop {r4, pc} + +000095e4 : + 95e4: 60c4 str r4, [r0, #12] + 95e6: 6105 str r5, [r0, #16] + 95e8: 6146 str r6, [r0, #20] + 95ea: 6187 str r7, [r0, #24] + 95ec: 4641 mov r1, r8 + 95ee: 61c1 str r1, [r0, #28] + 95f0: 4649 mov r1, r9 + 95f2: 6201 str r1, [r0, #32] + 95f4: 4651 mov r1, sl + 95f6: 6241 str r1, [r0, #36] @ 0x24 + 95f8: 4659 mov r1, fp + 95fa: 6281 str r1, [r0, #40] @ 0x28 + 95fc: 4669 mov r1, sp + 95fe: 62c1 str r1, [r0, #44] @ 0x2c + 9600: 4671 mov r1, lr + 9602: 6081 str r1, [r0, #8] + 9604: e7de b.n 95c4 + +[3]: https://www.openwall.com/lists/musl/2020/09/25/4 + +Signed-off-by: J. Neuschäfer +Upstream: https://github.com/micropython/micropython/commit/7b050b366b7dacfb43779c51702a892d8f1873d0 +--- + py/mpconfig.h | 6 ++++++ + py/nlrthumb.c | 10 +++++++++- + 2 files changed, 15 insertions(+), 1 deletion(-) + +diff --git a/py/mpconfig.h b/py/mpconfig.h +index af2480266..1aa3e0699 100644 +--- a/py/mpconfig.h ++++ b/py/mpconfig.h +@@ -587,6 +587,12 @@ + /*****************************************************************************/ + /* Python internal features */ + ++// Use a special long jump in nlrthumb.c, which may be necessary if nlr.o and ++// nlrthumb.o are linked far apart from each other. ++#ifndef MICROPY_NLR_THUMB_USE_LONG_JUMP ++#define MICROPY_NLR_THUMB_USE_LONG_JUMP (0) ++#endif ++ + // Whether to enable import of external modules + // When disabled, only importing of built-in modules is supported + // When enabled, a port must implement mp_import_stat (among other things) +diff --git a/py/nlrthumb.c b/py/nlrthumb.c +index a22c5df5b..e7b24f242 100644 +--- a/py/nlrthumb.c ++++ b/py/nlrthumb.c +@@ -38,6 +38,14 @@ + + __attribute__((naked)) unsigned int nlr_push(nlr_buf_t *nlr) { + ++ // If you get a linker error here, indicating that a relocation doesn't ++ // fit, try the following (in that order): ++ // ++ // 1. Ensure that nlr.o nlrthumb.o are linked closely together, i.e. ++ // there aren't too many other files between them in the linker list ++ // (PY_CORE_O_BASENAME in py/py.mk) ++ // 2. Set -DMICROPY_NLR_THUMB_USE_LONG_JUMP=1 during the build ++ // + __asm volatile ( + "str r4, [r0, #12] \n" // store r4 into nlr_buf + "str r5, [r0, #16] \n" // store r5 into nlr_buf +@@ -71,7 +79,7 @@ __attribute__((naked)) unsigned int nlr_push(nlr_buf_t *nlr) { + "str lr, [r0, #8] \n" // store lr into nlr_buf + #endif + +- #if !defined(__thumb2__) ++ #if MICROPY_NLR_THUMB_USE_LONG_JUMP + "ldr r1, nlr_push_tail_var \n" + "bx r1 \n" // do the rest in C + ".align 2 \n" +-- +2.43.0 + From a73dd8f787ae8f303fbfb4791a1f77d6c5280692 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 10 Jun 2024 09:37:56 +0200 Subject: [PATCH 5742/5754] Update for 2024.02.3 Signed-off-by: Peter Korsgaard --- CHANGES | 58 ++++++++++++++++++++++++++++++++++++++++ Makefile | 4 +-- support/misc/Vagrantfile | 2 +- 3 files changed, 61 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index e5956a5138..91cc951a26 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,61 @@ +2024.02.3, released June 10th, 2024 + + Important / security related fixes. + + Misc: + - Fixed a number of compilation issues for hosts using GCC + 14.x, including for kconfig. + + Download: + - Drop redundant --passive-ftp from default wget options and + migrate a number of packages using FTP upstreams to HTTP(S) + for compatibility with wget2 which does not have FTP support + + - Ensure downloads are correctly shared for host packages that + try to do so using _DL_SUBDIR and ensure the correct + toplevel directory name is used in generated tarballs when + downloads are shared. + + Arch: Enable SSE2 support for x86 Pentium M variant. + + Defconfigs: Orangepi PC/R1, Raspberrypi zero2w, Sipeed + licheepi nano, Wandboard: Fix compilation issues. PC x86-64 + bios/efi: add wireless regdb to fix kernel warning during + boot, iMX.8 boards: Adjust FIT external data position to match + imx-mkimage changes, fixing boot issues. + + Updated/fixed packages: am33x-cm, apcupsd, + arm-trusted-firmware, binutils-bare-metal, bpftool, catch2, + ccache, cjson, clamav, cog, coreutils, cryptodev-linux, + dhcpcd, dmraid, dnsmasq, docker-cli, docker-compose, + docker-engine, doom-wad, duma, elf2flt, ebtables, elfutils, + evemu, file, fluidsynth, freeradius-client, freeradius-server, + freerdp, fwts, gcc, gcc-bare-metal, git, gnuplot, go, + gr-osmosdr, gst1-plugins-good, hidapi, imagemagick, + intel-gmmlib, ivi-homescreen, janus-gateway, kexec, kmod, + kodi, libarchive, libdrm, libedit, libffi, libglib2, libhtp, + libjwt, libkrb5, libmanette, libmdbx, libmnl, + libnetfilter_acct, libnetfilter_log, libnpth, libopenssl, + libpng, libuhttpd, liburiparser, libutempter, libvncserver, + libwpe, lightning, linux-firmware, linux-pam, lua-cffi, + luajit, lvm2, lynx, mariadb, mesa3d, micropython, minisign, + musl, mutt, ncftp, network-manager, newlib-bare-metal, nfacct, + nfs-utils, octave, openjpeg, openocd, oprofile, + perl-dbd-mysql, php, postgresql, pppd, privoxy, procps-ng, + proftpd, proj, putty, python-ml-dtypes, python-pillow, + python-rds-py, qemu, qt5base, redis-plus-plus, rtl8189fs, + ruby, samba4, shadow, smcroute, speech, squid, sscep, + suricata, swupdate, systemd, ti-sgx-km, tinycbor, tinyproxy, + tor, tpm2-tss, ttyd, uboot-tools, ulogd, vala, weston, + wpewebkit, x11vnc, zbar, zeromq, zfs, zip, zxing-cpp + + Issues resolved (http://bugs.uclibc.org): + + #15766: BR2_PACKAGE_WESTON_XWAYLAND -- 12.0.1 -- fails to build.. + #15973: imx8m bootloader image generation broken since update.. + #16075: Cannot use linux kernel extensions from external tree.. + #16093: kmod and gcc-14 build error + 2024.02.2, released May 7th, 2024 Important / security related fixes. diff --git a/Makefile b/Makefile index 4a62be9ff3..e5053e4221 100644 --- a/Makefile +++ b/Makefile @@ -90,9 +90,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2024.02.2 +export BR2_VERSION := 2024.02.3 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1715067000 +BR2_VERSION_EPOCH = 1718005000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile index ac595f5749..983f2f58b3 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2024.02.2' +RELEASE='2024.02.3' ### Change here for more memory/cores ### VM_MEMORY=2048 From 9cc2053c736a698cd166c7dc23536adb4bd3cac5 Mon Sep 17 00:00:00 2001 From: Romain Gantois Date: Fri, 24 May 2024 12:09:48 +0200 Subject: [PATCH 5743/5754] package/gcnano-binaries: Add STM32MP2 support Add initial support for STM32MP257 GPU drivers. gcnano-binaries will be configured for STM32MP1 platforms on ARM 32-bits and STM32MP2 on ARM 64-bits. Signed-off-by: Romain Gantois Signed-off-by: Kory Maincent --- package/gcnano-binaries/Config.in | 6 +++--- package/gcnano-binaries/gcnano-binaries.hash | 2 +- package/gcnano-binaries/gcnano-binaries.mk | 20 +++++++++++++++----- 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/package/gcnano-binaries/Config.in b/package/gcnano-binaries/Config.in index 89f909f2c3..f01468f09f 100644 --- a/package/gcnano-binaries/Config.in +++ b/package/gcnano-binaries/Config.in @@ -1,15 +1,15 @@ comment "gcnano-binaries needs a Linux kernel to be built" - depends on BR2_arm + depends on BR2_arm || BR2_aarch64 depends on !BR2_LINUX_KERNEL comment "gcnano-binaries needs a glibc toolchain w/ threads, dynamic library" - depends on BR2_arm + depends on BR2_arm || BR2_aarch64 depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_TOOLCHAIN_HAS_THREADS \ || BR2_STATIC_LIBS config BR2_PACKAGE_GCNANO_BINARIES bool "gcnano-binaries" - depends on BR2_arm + depends on BR2_arm || BR2_aarch64 depends on BR2_LINUX_KERNEL depends on BR2_TOOLCHAIN_USES_GLIBC depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm, wayland diff --git a/package/gcnano-binaries/gcnano-binaries.hash b/package/gcnano-binaries/gcnano-binaries.hash index 3192b0d854..d3c64d44a3 100644 --- a/package/gcnano-binaries/gcnano-binaries.hash +++ b/package/gcnano-binaries/gcnano-binaries.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8bb1f6ee633f3c30e16b33ff6913286edf31f77b69105a14d147509beba3ea94 gcnano-binaries-5d02efd5cb4cfa85307633891f3cf87550a8bc1d.tar.gz +sha256 4c7454ac44c9e3ead20a978a5c009e8489fa90ce5cf291be31016a7f497bea26 gcnano-binaries-bbaae49a0e4859ed53f898a250269c8a237261bc.tar.gz sha256 29c78804b097b5cfee0e802bef9f60348a635640eadd8a91b7ce82ddf17fbf5a EULA diff --git a/package/gcnano-binaries/gcnano-binaries.mk b/package/gcnano-binaries/gcnano-binaries.mk index c3aa5d48d2..03912ea585 100644 --- a/package/gcnano-binaries/gcnano-binaries.mk +++ b/package/gcnano-binaries/gcnano-binaries.mk @@ -4,11 +4,20 @@ # ################################################################################ -GCNANO_BINARIES_LIB_VERSION = 6.4.13 +GCNANO_BINARIES_LIB_VERSION = 6.4.15 GCNANO_BINARIES_DRIVER_VERSION = $(GCNANO_BINARIES_LIB_VERSION) -GCNANO_BINARIES_USERLAND_VERSION = $(GCNANO_BINARIES_LIB_VERSION)-20230517 -GCNANO_BINARIES_VERSION = 5d02efd5cb4cfa85307633891f3cf87550a8bc1d + GCNANO_BINARIES_SITE = $(call github,STMicroelectronics,gcnano-binaries,$(GCNANO_BINARIES_VERSION)) +GCNANO_BINARIES_VERSION = bbaae49a0e4859ed53f898a250269c8a237261bc +ifeq ($(BR2_arm),y) +GCNANO_BINARIES_USERLAND_VERSION = stm32mp1-$(GCNANO_BINARIES_LIB_VERSION)-20240206 +GCNANO_BINARIES_ARCH_TYPE = arm +GCNANO_BINARIES_SOC_PLATFORM = st-mp1 +else +GCNANO_BINARIES_USERLAND_VERSION = stm32mp2-$(GCNANO_BINARIES_LIB_VERSION)-20240517 +GCNANO_BINARIES_ARCH_TYPE = arm64 +GCNANO_BINARIES_SOC_PLATFORM = st-mp2 +endif GCNANO_BINARIES_LICENSE = MIT, Vivante End User Software License Terms GCNANO_BINARIES_LICENSE_FILES = EULA @@ -38,8 +47,9 @@ GCNANO_BINARIES_POST_EXTRACT_HOOKS += GCNANO_BINARIES_EXTRACT_HELPER GCNANO_BINARIES_MODULE_SUBDIRS = gcnano-driver-stm32mp GCNANO_BINARIES_MODULE_MAKE_OPTS = \ + ARCH_TYPE=$(GCNANO_BINARIES_ARCH_TYPE) \ KERNEL_DIR=$(LINUX_DIR) \ - SOC_PLATFORM=st-mp1 \ + SOC_PLATFORM=$(GCNANO_BINARIES_SOC_PLATFORM) \ AQROOT=$(@D)/gcnano-driver-stm32mp \ DEBUG=0 @@ -58,7 +68,7 @@ define GCNANO_BINARIES_INSTALL cp -a $(@D)/$(GCNANO_BINARIES_USERLAND_SUBDIR)/release/include/* $(1)/usr/include/ cd $(@D)/$(GCNANO_BINARIES_USERLAND_SUBDIR)/pkgconfig/ ; \ for file in *.pc ; do \ - sed -e "s|#PREFIX#|/usr|" -e "s|#VERSION#|22.0.3|" $$file > $$file.temp ; \ + sed -e "s|#PREFIX#|/usr|" -e "s|#VERSION#|23.0.3|" $$file > $$file.temp ; \ $(INSTALL) -D -m 0644 $$file.temp $(1)/usr/lib/pkgconfig/$$file ; \ done endef From 386427418a3a8e6f3c65becfbd6fd20df70509e0 Mon Sep 17 00:00:00 2001 From: Kory Maincent Date: Mon, 10 Jun 2024 14:37:57 +0200 Subject: [PATCH 5744/5754] package/python-intelhex: Add support for host package Add support for the host package to enable future support for TrustedFirmware-M, which depends on it. Signed-off-by: Kory Maincent --- package/python-intelhex/python-intelhex.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-intelhex/python-intelhex.mk b/package/python-intelhex/python-intelhex.mk index cc8b973f0f..56f758e643 100644 --- a/package/python-intelhex/python-intelhex.mk +++ b/package/python-intelhex/python-intelhex.mk @@ -12,3 +12,4 @@ PYTHON_INTELHEX_LICENSE = BSD-3-Clause PYTHON_INTELHEX_LICENSE_FILES = LICENSE.txt $(eval $(python-package)) +$(eval $(host-python-package)) From ab991f6d707e14e96bf59cf1200f4d0bbb0969a4 Mon Sep 17 00:00:00 2001 From: Kory Maincent Date: Mon, 10 Jun 2024 15:28:03 +0200 Subject: [PATCH 5745/5754] package/python-click: Add support for host package Add support for the host package to enable future support for TrustedFirmware-M, which depends on it. Signed-off-by: Kory Maincent --- package/python-click/python-click.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-click/python-click.mk b/package/python-click/python-click.mk index 0e29ff034e..3223ab39ce 100644 --- a/package/python-click/python-click.mk +++ b/package/python-click/python-click.mk @@ -12,3 +12,4 @@ PYTHON_CLICK_LICENSE_FILES = LICENSE.rst PYTHON_CLICK_SETUP_TYPE = setuptools $(eval $(python-package)) +$(eval $(host-python-package)) From b8c7cc69ab156db30695875ced9df68682712085 Mon Sep 17 00:00:00 2001 From: Kory Maincent Date: Mon, 10 Jun 2024 15:28:43 +0200 Subject: [PATCH 5746/5754] package/python-cbor2: Add support for host package Add support for the host package to enable future support for TrustedFirmware-M, which depends on it. Signed-off-by: Kory Maincent --- package/python-cbor2/python-cbor2.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/python-cbor2/python-cbor2.mk b/package/python-cbor2/python-cbor2.mk index 5040301867..e0e9bfd920 100644 --- a/package/python-cbor2/python-cbor2.mk +++ b/package/python-cbor2/python-cbor2.mk @@ -12,5 +12,8 @@ PYTHON_CBOR2_LICENSE = MIT PYTHON_CBOR2_LICENSE_FILES = LICENSE.txt PYTHON_CBOR2_DEPENDENCIES = host-python-setuptools-scm PYTHON_CBOR2_ENV = CBOR2_BUILD_C_EXTENSION=1 +HOST_PYTHON_CBOR2_SETUP_TYPE = pep517 +HOST_PYTHON_CBOR2_DEPENDENCIES += host-python-setuptools-scm $(eval $(python-package)) +$(eval $(host-python-package)) From c6ef9b4df76d6faf9c445d3a3f20c35f16ed5f98 Mon Sep 17 00:00:00 2001 From: Kory Maincent Date: Mon, 10 Jun 2024 15:30:07 +0200 Subject: [PATCH 5747/5754] boot: Add support for TrustedFirmware-M package Add support for TrustedFirmware-M: https://trustedfirmware-m.readthedocs.io https://git.trustedfirmware.org/TF-M/trusted-firmware-m.git Trusted Firmware-M (TF-M) implements the Secure Processing Environment (SPE) for Armv8-M, Armv8.1-M architectures (e.g. the Cortex-M33, Cortex-M23, Cortex-M55, Cortex-M85 processors) or dual-core platforms. Use subpackages to download the third-party project sources to be able to apply patches located in the TF-M sources. This approach is also necessary because the tfm-tests git host produces non-reproducible tarballs. Signed-off-by: Kory Maincent --- DEVELOPERS | 1 + boot/Config.in | 1 + boot/trusted-firmware-m/Config.in | 102 +++++++++++++++ boot/trusted-firmware-m/tfm-3rdparty.mk | 7 + boot/trusted-firmware-m/tfm-cmsis/Config.in | 10 ++ .../tfm-cmsis/tfm-cmsis.hash | 3 + .../trusted-firmware-m/tfm-cmsis/tfm-cmsis.mk | 23 ++++ boot/trusted-firmware-m/tfm-mbedtls/Config.in | 10 ++ .../tfm-mbedtls/tfm-mbedtls.hash | 3 + .../tfm-mbedtls/tfm-mbedtls.mk | 24 ++++ boot/trusted-firmware-m/tfm-mcuboot/Config.in | 10 ++ .../tfm-mcuboot/tfm-mcuboot.hash | 3 + .../tfm-mcuboot/tfm-mcuboot.mk | 23 ++++ boot/trusted-firmware-m/tfm-qcbor/Config.in | 10 ++ .../tfm-qcbor/tfm-qcbor.hash | 3 + .../trusted-firmware-m/tfm-qcbor/tfm-qcbor.mk | 23 ++++ boot/trusted-firmware-m/tfm-tests/Config.in | 10 ++ .../tfm-tests/tfm-tests.hash | 3 + .../trusted-firmware-m/tfm-tests/tfm-tests.mk | 24 ++++ .../trusted-firmware-m.hash | 3 + boot/trusted-firmware-m/trusted-firmware-m.mk | 120 ++++++++++++++++++ support/testing/tests/boot/test_tfm.py | 12 ++ 22 files changed, 428 insertions(+) create mode 100644 boot/trusted-firmware-m/Config.in create mode 100644 boot/trusted-firmware-m/tfm-3rdparty.mk create mode 100644 boot/trusted-firmware-m/tfm-cmsis/Config.in create mode 100644 boot/trusted-firmware-m/tfm-cmsis/tfm-cmsis.hash create mode 100644 boot/trusted-firmware-m/tfm-cmsis/tfm-cmsis.mk create mode 100644 boot/trusted-firmware-m/tfm-mbedtls/Config.in create mode 100644 boot/trusted-firmware-m/tfm-mbedtls/tfm-mbedtls.hash create mode 100644 boot/trusted-firmware-m/tfm-mbedtls/tfm-mbedtls.mk create mode 100644 boot/trusted-firmware-m/tfm-mcuboot/Config.in create mode 100644 boot/trusted-firmware-m/tfm-mcuboot/tfm-mcuboot.hash create mode 100644 boot/trusted-firmware-m/tfm-mcuboot/tfm-mcuboot.mk create mode 100644 boot/trusted-firmware-m/tfm-qcbor/Config.in create mode 100644 boot/trusted-firmware-m/tfm-qcbor/tfm-qcbor.hash create mode 100644 boot/trusted-firmware-m/tfm-qcbor/tfm-qcbor.mk create mode 100644 boot/trusted-firmware-m/tfm-tests/Config.in create mode 100644 boot/trusted-firmware-m/tfm-tests/tfm-tests.hash create mode 100644 boot/trusted-firmware-m/tfm-tests/tfm-tests.mk create mode 100644 boot/trusted-firmware-m/trusted-firmware-m.hash create mode 100644 boot/trusted-firmware-m/trusted-firmware-m.mk create mode 100644 support/testing/tests/boot/test_tfm.py diff --git a/DEVELOPERS b/DEVELOPERS index 253e3ff343..2e4e3811b9 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1925,6 +1925,7 @@ F: board/octavo/osd32mp1-brk/ F: board/octavo/osd32mp1-red/ F: configs/octavo_osd32mp1_brk_defconfig F: configs/octavo_osd32mp1_red_defconfig +F: boot/trusted-firmware-m/ N: Kris Bahnsen F: package/wilc-firmware/ diff --git a/boot/Config.in b/boot/Config.in index e5fdf7ad43..bf0cfaae86 100644 --- a/boot/Config.in +++ b/boot/Config.in @@ -22,6 +22,7 @@ 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/trusted-firmware-m/Config.in" source "boot/uboot/Config.in" source "boot/vexpress-firmware/Config.in" diff --git a/boot/trusted-firmware-m/Config.in b/boot/trusted-firmware-m/Config.in new file mode 100644 index 0000000000..1571d35360 --- /dev/null +++ b/boot/trusted-firmware-m/Config.in @@ -0,0 +1,102 @@ +config BR2_TARGET_TRUSTED_FIRMWARE_M + bool "TrustedFirmware-M (TF-M)" + select BR2_TARGET_TFM_TESTS + select BR2_TARGET_TFM_MBEDTLS + select BR2_TARGET_TFM_MCUBOOT + select BR2_TARGET_TFM_QCBOR + select BR2_TARGET_TFM_CMSIS + select BR2_HOST_CMAKE_AT_LEAST_3_21 + help + Enable this option if you want to build the TF-M for your + ARMv8 microcontroller. + + https://git.trustedfirmware.org/TF-M/trusted-firmware-m.git + +if BR2_TARGET_TRUSTED_FIRMWARE_M +choice + prompt "TF-M Version" + help + Select the specific TF-M version you want to use + +config BR2_TARGET_TRUSTED_FIRMWARE_M_LATEST_VERSION + bool "TF-Mv2.1.0" + +config BR2_TARGET_TRUSTED_FIRMWARE_M_CUSTOM_VERSION + bool "Custom version" + select BR2_TARGET_TRUSTED_FIRMWARE_M_CUSTOM_3RD_PARTY + help + This option allows to use a specific official versions + +config BR2_TARGET_TRUSTED_FIRMWARE_M_CUSTOM_TARBALL + bool "Custom tarball" + select BR2_TARGET_TRUSTED_FIRMWARE_M_CUSTOM_3RD_PARTY + +config BR2_TARGET_TRUSTED_FIRMWARE_M_CUSTOM_GIT + bool "Custom Git repository" + select BR2_TARGET_TRUSTED_FIRMWARE_M_CUSTOM_3RD_PARTY + +endchoice + +if BR2_TARGET_TRUSTED_FIRMWARE_M_CUSTOM_TARBALL + +config BR2_TARGET_TRUSTED_FIRMWARE_M_CUSTOM_TARBALL_LOCATION + string "URL of custom TF-M tarball" + +endif + +config BR2_TARGET_TRUSTED_FIRMWARE_M_CUSTOM_VERSION_VALUE + string "TF-M version" + depends on BR2_TARGET_TRUSTED_FIRMWARE_M_CUSTOM_VERSION + +config BR2_TARGET_TRUSTED_FIRMWARE_M_VERSION + string + default "0c4c99ba33b3e66deea070e149279278dc7647f4" \ + if BR2_TARGET_TRUSTED_FIRMWARE_M_LATEST_VERSION + default "custom" if BR2_TARGET_TRUSTED_FIRMWARE_M_CUSTOM_TARBALL + default BR2_TARGET_TRUSTED_FIRMWARE_M_CUSTOM_REPO_VERSION \ + if BR2_TARGET_TRUSTED_FIRMWARE_M_CUSTOM_GIT + default BR2_TARGET_TRUSTED_FIRMWARE_M_CUSTOM_VERSION_VALUE \ + if BR2_TARGET_TRUSTED_FIRMWARE_M_CUSTOM_VERSION + +if BR2_TARGET_TRUSTED_FIRMWARE_M_CUSTOM_GIT + +config BR2_TARGET_TRUSTED_FIRMWARE_M_CUSTOM_REPO_URL + string "URL of custom repository" + +config BR2_TARGET_TRUSTED_FIRMWARE_M_CUSTOM_REPO_VERSION + string "Custom repository version" + help + Revision to use in the typical format used by Git + E.G. a sha id, a tag, .. + +endif + +menu "TF-M 3rd party projects" +config BR2_TARGET_TRUSTED_FIRMWARE_M_CUSTOM_3RD_PARTY + bool "Use custom tarball for TF-M 3rd party projects" + +source "boot/trusted-firmware-m/tfm-mbedtls/Config.in" +source "boot/trusted-firmware-m/tfm-mcuboot/Config.in" +source "boot/trusted-firmware-m/tfm-qcbor/Config.in" +source "boot/trusted-firmware-m/tfm-cmsis/Config.in" +source "boot/trusted-firmware-m/tfm-tests/Config.in" + +endmenu + +config BR2_TARGET_TRUSTED_FIRMWARE_M_PLATFORM + string "TF-M platform path" + help + Target plaform path to build for. + +config BR2_TARGET_TRUSTED_FIRMWARE_M_ADDITIONAL_VARIABLES + string "Additional TF-M build variables" + help + Additional parameters for the TF-M build + E.G. '-DTFM_ISOLATION_LEVEL=2 -DTFM_PROFILE=large' + +config BR2_TARGET_TRUSTED_FIRMWARE_M_DEBUG + bool "Build in debug mode" + help + Enable this option to build TF-M with -DCMAKE_BUILD_TYPE=Debug. + +endif diff --git a/boot/trusted-firmware-m/tfm-3rdparty.mk b/boot/trusted-firmware-m/tfm-3rdparty.mk new file mode 100644 index 0000000000..1a7bab4011 --- /dev/null +++ b/boot/trusted-firmware-m/tfm-3rdparty.mk @@ -0,0 +1,7 @@ +################################################################################ +# +# TrustedFirmware-M 3rd parties +# +################################################################################ + +include $(sort $(wildcard boot/trusted-firmware-m/*/*.mk)) diff --git a/boot/trusted-firmware-m/tfm-cmsis/Config.in b/boot/trusted-firmware-m/tfm-cmsis/Config.in new file mode 100644 index 0000000000..3774b2d9bc --- /dev/null +++ b/boot/trusted-firmware-m/tfm-cmsis/Config.in @@ -0,0 +1,10 @@ +config BR2_TARGET_TFM_CMSIS + bool + +if BR2_TARGET_TRUSTED_FIRMWARE_M_CUSTOM_3RD_PARTY + +config BR2_TARGET_TFM_CMSIS_CUSTOM_TARBALL_LOCATION + string "URL of custom cmcis tarball" + default "$(call github,arm-software,cmsis_6)/d0c460c169.tar.gz" + +endif diff --git a/boot/trusted-firmware-m/tfm-cmsis/tfm-cmsis.hash b/boot/trusted-firmware-m/tfm-cmsis/tfm-cmsis.hash new file mode 100644 index 0000000000..4811118a79 --- /dev/null +++ b/boot/trusted-firmware-m/tfm-cmsis/tfm-cmsis.hash @@ -0,0 +1,3 @@ +# sha256 locally computed +sha256 d846342840831f9124157b69b8edcdfcacc5427691f5b3341f714f0235c3cc49 tfm-cmsis-d0c460c1697d210b49a4b90998195831c0cd325c.tar.gz +sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 LICENSE diff --git a/boot/trusted-firmware-m/tfm-cmsis/tfm-cmsis.mk b/boot/trusted-firmware-m/tfm-cmsis/tfm-cmsis.mk new file mode 100644 index 0000000000..eb106ce414 --- /dev/null +++ b/boot/trusted-firmware-m/tfm-cmsis/tfm-cmsis.mk @@ -0,0 +1,23 @@ +################################################################################ +# +# cmcis +# +################################################################################ + +ifeq ($(BR2_TARGET_TRUSTED_FIRMWARE_M_CUSTOM_3RD_PARTY),y) +TFM_CMSIS_VERSION = custom +TFM_CMSIS_TARBALL = $(call qstrip,$(BR2_TARGET_TFM_CMSIS_CUSTOM_TARBALL_LOCATION)) +TFM_CMSIS_SITE = $(patsubst %/,%,$(dir $(TFM_CMSIS_TARBALL))) +TFM_CMSIS_SOURCE = $(notdir $(TFM_CMSIS_TARBALL)) +BR_NO_CHECK_HASH_FOR += $(TFM_CMSIS_SOURCE) +else +TFM_CMSIS_VERSION = d0c460c1697d210b49a4b90998195831c0cd325c +TFM_CMSIS_SITE = $(call github,arm-software,cmsis_6,$(TFM_CMSIS_VERSION)) +TFM_CMSIS_LICENSE = Apache-2.0 +TFM_CMSIS_LICENSE_FILES = LICENSE +endif + +# This components is not built and installed, because it is intended to +# be included as source in TrustedFirmware-M build. + +$(eval $(generic-package)) diff --git a/boot/trusted-firmware-m/tfm-mbedtls/Config.in b/boot/trusted-firmware-m/tfm-mbedtls/Config.in new file mode 100644 index 0000000000..91f18c9bc1 --- /dev/null +++ b/boot/trusted-firmware-m/tfm-mbedtls/Config.in @@ -0,0 +1,10 @@ +config BR2_TARGET_TFM_MBEDTLS + bool + +if BR2_TARGET_TRUSTED_FIRMWARE_M_CUSTOM_3RD_PARTY + +config BR2_TARGET_TFM_MBEDTLS_CUSTOM_TARBALL_LOCATION + string "URL of custom mbedtls tarball" + default "https://github.com/Mbed-TLS/mbedtls/releases/download/v3.6.0/mbedtls-3.6.0.tar.bz2" + +endif diff --git a/boot/trusted-firmware-m/tfm-mbedtls/tfm-mbedtls.hash b/boot/trusted-firmware-m/tfm-mbedtls/tfm-mbedtls.hash new file mode 100644 index 0000000000..e90b632187 --- /dev/null +++ b/boot/trusted-firmware-m/tfm-mbedtls/tfm-mbedtls.hash @@ -0,0 +1,3 @@ +# sha256 locally computed +sha256 3ecf94fcfdaacafb757786a01b7538a61750ebd85c4b024f56ff8ba1490fcd38 mbedtls-3.6.0.tar.bz2 +sha256 9b405ef4c89342f5eae1dd828882f931747f71001cfba7d114801039b52ad09b LICENSE diff --git a/boot/trusted-firmware-m/tfm-mbedtls/tfm-mbedtls.mk b/boot/trusted-firmware-m/tfm-mbedtls/tfm-mbedtls.mk new file mode 100644 index 0000000000..d728a282df --- /dev/null +++ b/boot/trusted-firmware-m/tfm-mbedtls/tfm-mbedtls.mk @@ -0,0 +1,24 @@ +################################################################################ +# +# mbedtls +# +################################################################################ + +ifeq ($(BR2_TARGET_TRUSTED_FIRMWARE_M_CUSTOM_3RD_PARTY),y) +TFM_MBEDTLS_VERSION = custom +TFM_MBEDTLS_TARBALL = $(call qstrip,$(BR2_TARGET_TFM_MBEDTLS_CUSTOM_TARBALL_LOCATION)) +TFM_MBEDTLS_SITE = $(patsubst %/,%,$(dir $(TFM_MBEDTLS_TARBALL))) +TFM_MBEDTLS_SOURCE = $(notdir $(TFM_MBEDTLS_TARBALL)) +BR_NO_CHECK_HASH_FOR += $(TFM_MBEDTLS_SOURCE) +else +TFM_MBEDTLS_VERSION = 3.6.0 +TFM_MBEDTLS_SITE = https://github.com/Mbed-TLS/mbedtls/releases/download/v$(TFM_MBEDTLS_VERSION) +TFM_MBEDTLS_SOURCE = mbedtls-$(TFM_MBEDTLS_VERSION).tar.bz2 +TFM_MBEDTLS_LICENSE = Apache-2.0 or GPL-2.0-or-later +TFM_MBEDTLS_LICENSE_FILES = LICENSE +endif + +# This components is not built and installed, because it is intended to +# be included as source in TrustedFirmware-M build. + +$(eval $(generic-package)) diff --git a/boot/trusted-firmware-m/tfm-mcuboot/Config.in b/boot/trusted-firmware-m/tfm-mcuboot/Config.in new file mode 100644 index 0000000000..be1e83be35 --- /dev/null +++ b/boot/trusted-firmware-m/tfm-mcuboot/Config.in @@ -0,0 +1,10 @@ +config BR2_TARGET_TFM_MCUBOOT + bool + +if BR2_TARGET_TRUSTED_FIRMWARE_M_CUSTOM_3RD_PARTY + +config BR2_TARGET_TFM_MCUBOOT_CUSTOM_TARBALL_LOCATION + string "URL of custom mcuboot tarball" + default "$(call github,mcu-tools,mcuboot)/v2.1.0.tar.gz" + +endif diff --git a/boot/trusted-firmware-m/tfm-mcuboot/tfm-mcuboot.hash b/boot/trusted-firmware-m/tfm-mcuboot/tfm-mcuboot.hash new file mode 100644 index 0000000000..1fbd254b34 --- /dev/null +++ b/boot/trusted-firmware-m/tfm-mcuboot/tfm-mcuboot.hash @@ -0,0 +1,3 @@ +# sha256 locally computed +sha256 bcee8c4b5a51477b27c6c587d11f46388823626aba7bd5082c77864a89dcf1b7 tfm-mcuboot-v2.1.0.tar.gz +sha256 86438164119907debf649e2f9f18a43ad506d75421c9d9675700066b0456205d LICENSE diff --git a/boot/trusted-firmware-m/tfm-mcuboot/tfm-mcuboot.mk b/boot/trusted-firmware-m/tfm-mcuboot/tfm-mcuboot.mk new file mode 100644 index 0000000000..cc2599e55a --- /dev/null +++ b/boot/trusted-firmware-m/tfm-mcuboot/tfm-mcuboot.mk @@ -0,0 +1,23 @@ +################################################################################ +# +# mcuboot +# +################################################################################ + +ifeq ($(BR2_TARGET_TRUSTED_FIRMWARE_M_CUSTOM_3RD_PARTY),y) +TFM_MCUBOOT_VERSION = custom +TFM_MCUBOOT_TARBALL = $(call qstrip,$(BR2_TARGET_TFM_MCUBOOT_CUSTOM_TARBALL_LOCATION)) +TFM_MCUBOOT_SITE = $(patsubst %/,%,$(dir $(TFM_MCUBOOT_TARBALL))) +TFM_MCUBOOT_SOURCE = $(notdir $(TFM_MCUBOOT_TARBALL)) +BR_NO_CHECK_HASH_FOR += $(TFM_MCUBOOT_SOURCE) +else +TFM_MCUBOOT_VERSION = v2.1.0 +TFM_MCUBOOT_SITE = $(call github,mcu-tools,mcuboot,$(TFM_MCUBOOT_VERSION)) +TFM_MCUBOOT_LICENSE = Apache-2.0 +TFM_MCUBOOT_LICENSE_FILES = LICENSE +endif + +# This components is not built and installed, because it is intended to +# be included as source in TrustedFirmware-M build. + +$(eval $(generic-package)) diff --git a/boot/trusted-firmware-m/tfm-qcbor/Config.in b/boot/trusted-firmware-m/tfm-qcbor/Config.in new file mode 100644 index 0000000000..1ec74ce558 --- /dev/null +++ b/boot/trusted-firmware-m/tfm-qcbor/Config.in @@ -0,0 +1,10 @@ +config BR2_TARGET_TFM_QCBOR + bool + +if BR2_TARGET_TRUSTED_FIRMWARE_M_CUSTOM_3RD_PARTY + +config BR2_TARGET_TFM_QCBOR_CUSTOM_TARBALL_LOCATION + string "URL of custom qcbor tarball" + default "$(call github,laurencelundblade,qcbor)/v1.2.tar.gz" + +endif diff --git a/boot/trusted-firmware-m/tfm-qcbor/tfm-qcbor.hash b/boot/trusted-firmware-m/tfm-qcbor/tfm-qcbor.hash new file mode 100644 index 0000000000..2c27cdeb84 --- /dev/null +++ b/boot/trusted-firmware-m/tfm-qcbor/tfm-qcbor.hash @@ -0,0 +1,3 @@ +# sha256 locally computed +sha256 0f706ad90ada600bd1ddbdf8dc6f2f5910e11de355bb4454b9b4123f0e4ff525 tfm-qcbor-v1.2.tar.gz +sha256 fc6db297a2751188d9c2ece6ee468a295f285b9a24f96eab954a1a823c71be3b README.md diff --git a/boot/trusted-firmware-m/tfm-qcbor/tfm-qcbor.mk b/boot/trusted-firmware-m/tfm-qcbor/tfm-qcbor.mk new file mode 100644 index 0000000000..b303b9f5a3 --- /dev/null +++ b/boot/trusted-firmware-m/tfm-qcbor/tfm-qcbor.mk @@ -0,0 +1,23 @@ +################################################################################ +# +# qcbor +# +################################################################################ + +ifeq ($(BR2_TARGET_TRUSTED_FIRMWARE_M_CUSTOM_3RD_PARTY),y) +TFM_QCBOR_VERSION = custom +TFM_QCBOR_TARBALL = $(call qstrip,$(BR2_TARGET_TFM_QCBOR_CUSTOM_TARBALL_LOCATION)) +TFM_QCBOR_SITE = $(patsubst %/,%,$(dir $(TFM_QCBOR_TARBALL))) +TFM_QCBOR_SOURCE = $(notdir $(TFM_QCBOR_TARBALL)) +BR_NO_CHECK_HASH_FOR += $(TFM_QCBOR_SOURCE) +else +TFM_QCBOR_VERSION = v1.2 +TFM_QCBOR_SITE = $(call github,laurencelundblade,qcbor,$(TFM_QCBOR_VERSION)) +TFM_QCBOR_LICENSE = BSD-3-Clause +TFM_QCBOR_LICENSE_FILES = README.md +endif + +# This components is not built and installed, because it is intended to +# be included as source in TrustedFirmware-M build. + +$(eval $(generic-package)) diff --git a/boot/trusted-firmware-m/tfm-tests/Config.in b/boot/trusted-firmware-m/tfm-tests/Config.in new file mode 100644 index 0000000000..758e66b8c4 --- /dev/null +++ b/boot/trusted-firmware-m/tfm-tests/Config.in @@ -0,0 +1,10 @@ +config BR2_TARGET_TFM_TESTS + bool + +if BR2_TARGET_TRUSTED_FIRMWARE_M_CUSTOM_3RD_PARTY + +config BR2_TARGET_TFM_TESTS_CUSTOM_TARBALL_LOCATION + string "URL of custom TF-M-tests tarball" + default "https://git.trustedfirmware.org/TF-M/tf-m-tests.git/+archive/TF-Mv2.1.0.tar.gz" + +endif diff --git a/boot/trusted-firmware-m/tfm-tests/tfm-tests.hash b/boot/trusted-firmware-m/tfm-tests/tfm-tests.hash new file mode 100644 index 0000000000..d48f0cfdfc --- /dev/null +++ b/boot/trusted-firmware-m/tfm-tests/tfm-tests.hash @@ -0,0 +1,3 @@ +# sha256 locally computed +sha256 409dee3cbbceb3f1ea2543cfc9e06a9de23706f5ae798b866d0f12b0c21a7bd5 tfm-tests-TF-Mv2.1.0-br1.tar.gz +sha256 42195e7f4ae4655d000688af4d4b143048352461dff5849d24e5afe6d1d84808 license.rst diff --git a/boot/trusted-firmware-m/tfm-tests/tfm-tests.mk b/boot/trusted-firmware-m/tfm-tests/tfm-tests.mk new file mode 100644 index 0000000000..c11a58da32 --- /dev/null +++ b/boot/trusted-firmware-m/tfm-tests/tfm-tests.mk @@ -0,0 +1,24 @@ +################################################################################ +# +# TF-M tests +# +################################################################################ + +ifeq ($(BR2_TARGET_TRUSTED_FIRMWARE_M_CUSTOM_3RD_PARTY),y) +TFM_TESTS_VERSION = custom +TFM_TESTS_TARBALL = $(call qstrip,$(BR2_TARGET_TFM_TESTS_CUSTOM_TARBALL_LOCATION)) +TFM_TESTS_SITE = $(patsubst %/,%,$(dir $(TFM_TESTS_TARBALL))) +TFM_TESTS_SOURCE = $(notdir $(TFM_TESTS_TARBALL)) +BR_NO_CHECK_HASH_FOR += $(TFM_TESTS_SOURCE) +else +TFM_TESTS_VERSION = TF-Mv2.1.0 +TFM_TESTS_SITE = https://git.trustedfirmware.org/TF-M/trusted-firmware-m.git +TFM_TESTS_SITE_METHOD = git +TFM_TESTS_LICENSE = BSD-3-Clause +TFM_TESTS_LICENSE_FILES = license.rst +endif + +# This components is not built and installed, because it is intended to +# be included as source in TrustedFirmware-M build. + +$(eval $(generic-package)) diff --git a/boot/trusted-firmware-m/trusted-firmware-m.hash b/boot/trusted-firmware-m/trusted-firmware-m.hash new file mode 100644 index 0000000000..571c2e7a25 --- /dev/null +++ b/boot/trusted-firmware-m/trusted-firmware-m.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 5da6aee3e3dffbde61ee061fed8fc0b693ce934a8a707c91b19916e9b1ade638 trusted-firmware-m-0c4c99ba33b3e66deea070e149279278dc7647f4-br1.tar.gz +sha256 c16df600171bfdae60d22a01f046d742f89ba1046e2e5ed135bbf091b21be34f license.rst diff --git a/boot/trusted-firmware-m/trusted-firmware-m.mk b/boot/trusted-firmware-m/trusted-firmware-m.mk new file mode 100644 index 0000000000..0ad8b6afb5 --- /dev/null +++ b/boot/trusted-firmware-m/trusted-firmware-m.mk @@ -0,0 +1,120 @@ +################################################################################ +# +# TrustedFirmware-M +# +################################################################################ + +TRUSTED_FIRMWARE_M_VERSION = $(call qstrip,$(BR2_TARGET_TRUSTED_FIRMWARE_M_VERSION)) + +ifeq ($(BR2_TARGET_TRUSTED_FIRMWARE_M_CUSTOM_TARBALL),y) +# Handle custom FT-M tarballs as specified by the configuration +TRUSTED_FIRMWARE_M_TARBALL = $(call qstrip,$(BR2_TARGET_TRUSTED_FIRMWARE_M_CUSTOM_TARBALL_LOCATION)) +TRUSTED_FIRMWARE_M_SITE = $(patsubst %/,%,$(dir $(TRUSTED_FIRMWARE_M_TARBALL))) +TRUSTED_FIRMWARE_M_SOURCE = $(notdir $(TRUSTED_FIRMWARE_M_TARBALL)) +else ifeq ($(BR2_TARGET_TRUSTED_FIRMWARE_M_CUSTOM_GIT),y) +TRUSTED_FIRMWARE_M_SITE = $(call qstrip,$(BR2_TARGET_TRUSTED_FIRMWARE_M_CUSTOM_REPO_URL)) +TRUSTED_FIRMWARE_M_SITE_METHOD = git +else +# Handle stable official TF-M versions +TRUSTED_FIRMWARE_M_SITE = https://git.trustedfirmware.org/TF-M/trusted-firmware-m.git +TRUSTED_FIRMWARE_M_SITE_METHOD = git +# The licensing of custom or from-git versions is unknown. +# This is valid only for the latest (i.e. known) version. +ifeq ($(BR2_TARGET_TRUSTED_FIRMWARE_M_LATEST_VERSION),y) +TRUSTED_FIRMWARE_M_LICENSE = BSD-3-Clause +TRUSTED_FIRMWARE_M_LICENSE_FILES = license.rst +endif +endif + +ifeq ($(BR2_TARGET_TRUSTED_FIRMWARE_M):$(BR2_TARGET_TRUSTED_FIRMWARE_M_CUSTOM_VERSION)$(BR2_TARGET_TRUSTED_FIRMWARE_M_CUSTOM_TARBALL)$(BR2_TARGET_TRUSTED_FIRMWARE_M_CUSTOM_GIT),y:y) +BR_NO_CHECK_HASH_FOR += $(TRUSTED_FIRMWARE_M_SOURCE) +endif + +TRUSTED_FIRMWARE_M_DEPENDENCIES += \ + $(BR2_CMAKE_HOST_DEPENDENCY) \ + host-arm-gnu-toolchain \ + host-python-cbor2 \ + host-python-click \ + host-python-cryptography \ + host-python-jinja2 \ + host-python-intelhex \ + host-python-pyyaml + +TRUSTED_FIRMWARE_M_PATCH_DEPENDENCIES += \ + tfm-mbedtls \ + tfm-mcuboot \ + tfm-qcbor \ + tfm-cmsis \ + tfm-tests + +define TRUSTED_FIRMWARE_M_PATCH_3RD_PARTIES + if [ -d $(@D)/lib/ext/cmsis ]; then \ + $(APPLY_PATCHES) $(TFM_CMSIS_SRCDIR) $(@D)/lib/ext/cmsis \*.patch; \ + fi + $(APPLY_PATCHES) $(TFM_MBEDTLS_SRCDIR) $(@D)/lib/ext/mbedcrypto \*.patch; \ + $(APPLY_PATCHES) $(TFM_MCUBOOT_SRCDIR) $(@D)/lib/ext/mcuboot \*.patch; \ + $(APPLY_PATCHES) $(TFM_QCBOR_SRCDIR) $(@D)/lib/ext/qcbor \*.patch; \ + $(APPLY_PATCHES) $(TFM_TESTS_SRCDIR) $(@D)/lib/ext/tf-m-tests \*.patch; +endef +TRUSTED_FIRMWARE_M_POST_PATCH_HOOKS += TRUSTED_FIRMWARE_M_PATCH_3RD_PARTIES + +TRUSTED_FIRMWARE_M_CONF_OPTS += \ + -DCMAKE_TOOLCHAIN_FILE="$(HOST_DIR)/share/buildroot/toolchainfile.cmake" \ + -DFETCHCONTENT_FULLY_DISCONNECTED=ON \ + -DMBEDCRYPTO_PATH=$(TFM_MBEDTLS_SRCDIR) \ + -DTFM_TEST_REPO_PATH=$(TFM_TESTS_SRCDIR) \ + -DMCUBOOT_PATH=$(TFM_MCUBOOT_SRCDIR) \ + -DQCBOR_PATH=$(TFM_QCBOR_SRCDIR) \ + -DCMSIS_PATH=$(TFM_CMSIS_SRCDIR) \ + -DTFM_PLATFORM=$(call qstrip,$(BR2_TARGET_TRUSTED_FIRMWARE_M_PLATFORM)) + +ifeq ($(BR2_TARGET_TRUSTED_FIRMWARE_M_DEBUG),y) +TRUSTED_FIRMWARE_M_CONF_OPTS += -DCMAKE_BUILD_TYPE=Debug +endif + +TRUSTED_FIRMWARE_M_CONF_ENV += \ + CROSS_COMPILE=$(HOST_DIR)/bin/arm-none-eabi- + +define TRUSTED_FIRMWARE_M_CONFIGURE_CMDS + rm -f $(@D)/CMakeCache.txt + PATH=$(BR_PATH) \ + $(TRUSTED_FIRMWARE_M_CONF_ENV) $(BR2_CMAKE) -S $(@D) -B $(@D) \ + $(TRUSTED_FIRMWARE_M_CONF_OPTS) \ + $(call qstrip,$(BR2_TARGET_TRUSTED_FIRMWARE_M_ADDITIONAL_VARIABLES)) +endef + +define TRUSTED_FIRMWARE_M_BUILD_CMDS + PATH=$(BR_PATH) \ + $(TRUSTED_FIRMWARE_M_CONF_ENV) $(BR2_CMAKE) \ + --build $(@D) -- install +endef + +define TRUSTED_FIRMWARE_M_INSTALL_TARGET_CMDS + # Install path for old version of TF-M + if [ -d $(@D)/install/outputs ]; then \ + $(INSTALL) -D -m 0755 $(@D)/install/outputs/*.bin $(BINARIES_DIR); \ + $(INSTALL) -D -m 0755 $(@D)/install/outputs/*.elf $(BINARIES_DIR); \ + else \ + $(INSTALL) -D -m 0755 $(@D)/api_ns/bin/*.bin $(BINARIES_DIR); \ + $(INSTALL) -D -m 0755 $(@D)/api_ns/bin/*.elf $(BINARIES_DIR); \ + fi +endef + +# Configuration check +ifeq ($(BR2_TARGET_TRUSTED_FIRMWARE_M)$(BR_BUILDING),yy) + +ifeq ($(BR2_TARGET_TRUSTED_FIRMWARE_M_CUSTOM_TARBALL),y) +ifeq ($(call qstrip,$(BR2_TARGET_TRUSTED_FIRMWARE_M_CUSTOM_TARBALL_LOCATION)),) +$(error No tarball location specified. Please check BR2_TARGET_TRUSTED_FIRMWARE_M_CUSTOM_TARBALL_LOCATION) +endif +endif + +ifeq ($(BR2_TARGET_TRUSTED_FIRMWARE_M_CUSTOM_GIT),y) +ifeq ($(call qstrip,$(BR2_TARGET_TRUSTED_FIRMWARE_M_CUSTOM_REPO_URL)),) +$(error No repository specified. Please check BR2_TARGET_TRUSTED_FIRMWARE_M_CUSTOM_REPO_URL) +endif +endif + +endif + +$(eval $(generic-package)) diff --git a/support/testing/tests/boot/test_tfm.py b/support/testing/tests/boot/test_tfm.py new file mode 100644 index 0000000000..77650aaec1 --- /dev/null +++ b/support/testing/tests/boot/test_tfm.py @@ -0,0 +1,12 @@ +import infra.basetest + + +class TestTFMBuild(infra.basetest.BRTest): + config = \ + """ + BR2_TARGET_TRUSTED_FIRMWARE_M=y + BR2_TARGET_TRUSTED_FIRMWARE_M_PLATFORM="arm/mps2/an521" + """ + + def test_run(self): + pass From 366a23c2aad8121aede824514252ed4995a5c6a7 Mon Sep 17 00:00:00 2001 From: Kory Maincent Date: Thu, 20 Jun 2024 16:15:19 +0200 Subject: [PATCH 5748/5754] package/optee-client: Add support for custom tarball OP-TEE OS supports custom tarballs. If the OP-TEE OS custom tarball version does not match the latest optee-client version supported by Buildroot, optee-client might not build or run properly. This patch adds support for an optee-client custom tarball URL to address this potential issue. Signed-off-by: Kory Maincent --- ...upplicant-fix-build-with-kernel-4.16.patch | 0 package/optee-client/Config.in | 38 +++++++++++++++++++ package/optee-client/optee-client.mk | 24 +++++++++++- 3 files changed, 60 insertions(+), 2 deletions(-) rename package/optee-client/{ => 4.0.0}/0001-tee-supplicant-fix-build-with-kernel-4.16.patch (100%) diff --git a/package/optee-client/0001-tee-supplicant-fix-build-with-kernel-4.16.patch b/package/optee-client/4.0.0/0001-tee-supplicant-fix-build-with-kernel-4.16.patch similarity index 100% rename from package/optee-client/0001-tee-supplicant-fix-build-with-kernel-4.16.patch rename to package/optee-client/4.0.0/0001-tee-supplicant-fix-build-with-kernel-4.16.patch diff --git a/package/optee-client/Config.in b/package/optee-client/Config.in index 4061164cbb..e5decd4d58 100644 --- a/package/optee-client/Config.in +++ b/package/optee-client/Config.in @@ -17,6 +17,44 @@ config BR2_PACKAGE_OPTEE_CLIENT if BR2_PACKAGE_OPTEE_CLIENT +choice + prompt "optee-client version" + default BR2_PACKAGE_OPTEE_CLIENT_LATEST + help + Select the version of optee-client you want to use + +config BR2_PACKAGE_OPTEE_CLIENT_LATEST + bool "4.0.0" + help + Use the latest release tag from the optee-client official Git + repository. + +config BR2_PACKAGE_OPTEE_CLIENT_CUSTOM_TARBALL + bool "Custom tarball" + help + This option allows to specify a URL pointing to an + optee-client source tarball. This URL can use any protocol + recognized by Buildroot, like http://, ftp://, file:// + or scp://. + + When pointing to a local tarball using file://, you may want + to use a make variable like $(TOPDIR) to reference the root of + the Buildroot tree. + +endchoice + +if BR2_PACKAGE_OPTEE_CLIENT_CUSTOM_TARBALL + +config BR2_PACKAGE_OPTEE_CLIENT_CUSTOM_TARBALL_LOCATION + string "URL of custom optee-client tarball" + +endif + +config BR2_PACKAGE_OPTEE_CLIENT_VERSION + string + default "4.0.0" if BR2_PACKAGE_OPTEE_CLIENT_LATEST + default "custom" if BR2_PACKAGE_OPTEE_CLIENT_CUSTOM_TARBALL + config BR2_PACKAGE_OPTEE_CLIENT_TEE_FS_PATH string "Path for normal world OS secure storage" default "/data/tee" diff --git a/package/optee-client/optee-client.mk b/package/optee-client/optee-client.mk index 99c922a171..a91548a43b 100644 --- a/package/optee-client/optee-client.mk +++ b/package/optee-client/optee-client.mk @@ -4,10 +4,24 @@ # ################################################################################ -OPTEE_CLIENT_VERSION = 4.0.0 -OPTEE_CLIENT_SITE = $(call github,OP-TEE,optee_client,$(OPTEE_CLIENT_VERSION)) +OPTEE_CLIENT_VERSION = $(call qstrip,$(BR2_PACKAGE_OPTEE_CLIENT_VERSION)) OPTEE_CLIENT_LICENSE = BSD-2-Clause +ifeq ($(BR2_PACKAGE_OPTEE_CLIENT_LATEST),y) OPTEE_CLIENT_LICENSE_FILES = LICENSE +endif + +ifeq ($(BR2_PACKAGE_OPTEE_CLIENT_CUSTOM_TARBALL),y) +OPTEE_CLIENT_TARBALL = $(call qstrip,$(BR2_PACKAGE_OPTEE_CLIENT_CUSTOM_TARBALL_LOCATION)) +OPTEE_CLIENT_SITE = $(patsubst %/,%,$(dir $(OPTEE_CLIENT_TARBALL))) +OPTEE_CLIENT_SOURCE = $(notdir $(OPTEE_CLIENT_TARBALL)) +else +OPTEE_CLIENT_SITE = $(call github,OP-TEE,optee_client,$(OPTEE_CLIENT_VERSION)) +endif + +ifeq ($(BR2_PACKAGE_OPTEE_CLIENT):$(BR2_PACKAGE_OPTEE_CLIENT_LATEST),y:) +BR_NO_CHECK_HASH_FOR += $(OPTEE_CLIENT_SOURCE) +endif + OPTEE_CLIENT_INSTALL_STAGING = YES OPTEE_CLIENT_CONF_OPTS = \ @@ -38,4 +52,10 @@ define OPTEE_CLIENT_INSTALL_INIT_SYSV $(TARGET_DIR)/etc/init.d/S30tee-supplicant endef +ifeq ($(BR2_PACKAGE_OPTEE_CLIENT_CUSTOM_TARBALL)$(BR_BUILDING),yy) +ifeq ($(call qstrip,$(BR2_PACKAGE_OPTEE_CLIENT_CUSTOM_TARBALL_LOCATION)),) +$(error No tarball location specified. Please check BR2_PACKAGE_OPTEE_CLIENT_CUSTOM_TARBALL_LOCATION) +endif +endif + $(eval $(cmake-package)) From 733b556d0ab34fb33c739e277cb05e5546594631 Mon Sep 17 00:00:00 2001 From: Kory Maincent Date: Thu, 20 Jun 2024 16:21:39 +0200 Subject: [PATCH 5749/5754] package/optee-test: Add support for custom tarball OP-TEE OS supports custom tarballs. If the OP-TEE OS custom tarball version does not match the latest optee-test version supported by Buildroot, optee-test might not build or run properly. This patch adds support for an optee-test custom tarball URL to address this potential issue. Signed-off-by: Kory Maincent --- package/optee-test/Config.in | 41 ++++++++++++++++++++++++++++++++ package/optee-test/optee-test.mk | 23 ++++++++++++++++-- 2 files changed, 62 insertions(+), 2 deletions(-) diff --git a/package/optee-test/Config.in b/package/optee-test/Config.in index 57a7834c75..a93676b783 100644 --- a/package/optee-test/Config.in +++ b/package/optee-test/Config.in @@ -31,3 +31,44 @@ comment "optee-test needs a toolchain w/ threads, C++, dynamic library, headers depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \ BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_3 + +if BR2_PACKAGE_OPTEE_TEST + +choice + prompt "optee-test version" + default BR2_PACKAGE_OPTEE_TEST_LATEST if BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS + help + Select the version of optee-test you want to use + +config BR2_PACKAGE_OPTEE_TEST_LATEST + bool "4.0.0" + help + Use the latest release tag from the optee-test official Git + repository. + +config BR2_PACKAGE_OPTEE_TEST_CUSTOM_TARBALL + bool "Custom tarball" + help + This option allows to specify a URL pointing to an optee-test + source tarball. This URL can use any protocol recognized by + Buildroot, like http://, ftp://, file:// or scp://. + + When pointing to a local tarball using file://, you may want + to use a make variable like $(TOPDIR) to reference the root of + the Buildroot tree. + +endchoice + +if BR2_PACKAGE_OPTEE_TEST_CUSTOM_TARBALL + +config BR2_PACKAGE_OPTEE_TEST_CUSTOM_TARBALL_LOCATION + string "URL of custom optee-test tarball" + +endif + +config BR2_PACKAGE_OPTEE_TEST_VERSION + string + default "4.0.0" if BR2_PACKAGE_OPTEE_TEST_LATEST + default "custom" if BR2_PACKAGE_OPTEE_TEST_CUSTOM_TARBALL + +endif # BR2_PACKAGE_OPTEE_TEST diff --git a/package/optee-test/optee-test.mk b/package/optee-test/optee-test.mk index 44d3015ae1..9bc074b215 100644 --- a/package/optee-test/optee-test.mk +++ b/package/optee-test/optee-test.mk @@ -4,10 +4,23 @@ # ################################################################################ -OPTEE_TEST_VERSION = 4.0.0 -OPTEE_TEST_SITE = $(call github,OP-TEE,optee_test,$(OPTEE_TEST_VERSION)) +OPTEE_TEST_VERSION = $(call qstrip,$(BR2_PACKAGE_OPTEE_TEST_VERSION)) OPTEE_TEST_LICENSE = GPL-2.0, BSD-2-Clause, +ifeq ($(BR2_PACKAGE_OPTEE_TEST_LATEST),y) OPTEE_TEST_LICENSE_FILES = LICENSE.md +endif + +ifeq ($(BR2_PACKAGE_OPTEE_TEST_CUSTOM_TARBALL),y) +OPTEE_TEST_TARBALL = $(call qstrip,$(BR2_PACKAGE_OPTEE_TEST_CUSTOM_TARBALL_LOCATION)) +OPTEE_TEST_SITE = $(patsubst %/,%,$(dir $(OPTEE_TEST_TARBALL))) +OPTEE_TEST_SOURCE = $(notdir $(OPTEE_TEST_TARBALL)) +else +OPTEE_TEST_SITE = $(call github,OP-TEE,optee_test,$(OPTEE_TEST_VERSION)) +endif + +ifeq ($(BR2_PACKAGE_OPTEE_TEST):$(BR2_PACKAGE_OPTEE_TEST_LATEST),y:) +BR_NO_CHECK_HASH_FOR += $(OPTEE_TEST_SOURCE) +endif OPTEE_TEST_DEPENDENCIES = optee-client optee-os @@ -34,4 +47,10 @@ endef OPTEE_TEST_POST_BUILD_HOOKS += OPTEE_TEST_BUILD_TAS OPTEE_TEST_POST_INSTALL_TARGET_HOOKS += OPTEE_TEST_INSTALL_TAS +ifeq ($(BR2_PACKAGE_OPTEE_TEST_CUSTOM_TARBALL)$(BR_BUILDING),yy) +ifeq ($(call qstrip,$(BR2_PACKAGE_OPTEE_TEST_CUSTOM_TARBALL_LOCATION)),) +$(error No tarball location specified. Please check BR2_PACKAGE_OPTEE_TEST_CUSTOM_TARBALL_LOCATION) +endif +endif + $(eval $(cmake-package)) From 8d31ebb7c2d22d679fefc322d46d4aa28e89c7b1 Mon Sep 17 00:00:00 2001 From: Kory Maincent Date: Thu, 20 Jun 2024 16:22:25 +0200 Subject: [PATCH 5750/5754] package/optee-examples: Add support for custom tarball OP-TEE OS supports custom tarballs. If the OP-TEE OS custom tarball version does not match the latest optee-examples version supported by Buildroot, optee-examples might not build or run properly. This patch adds support for an optee-examples custom tarball URL to address this potential issue. Signed-off-by: Kory Maincent --- package/optee-examples/Config.in | 42 ++++++++++++++++++++++++ package/optee-examples/optee-examples.mk | 26 +++++++++++++-- 2 files changed, 66 insertions(+), 2 deletions(-) diff --git a/package/optee-examples/Config.in b/package/optee-examples/Config.in index eb6ee16502..e085a9db1f 100644 --- a/package/optee-examples/Config.in +++ b/package/optee-examples/Config.in @@ -26,3 +26,45 @@ comment "optee-examples needs a toolchain w/ threads, dynamic library, headers > depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_3 + +if BR2_PACKAGE_OPTEE_EXAMPLES + +choice + prompt "optee-examples version" + default BR2_PACKAGE_OPTEE_EXAMPLES_LATEST + help + Select the version of optee-examples you want to use + +config BR2_PACKAGE_OPTEE_EXAMPLES_LATEST + bool "4.0.0" + help + Use the latest release tag from the optee-examples official + Git repository. + +config BR2_PACKAGE_OPTEE_EXAMPLES_CUSTOM_TARBALL + bool "Custom tarball" + help + This option allows to specify a URL pointing to an + optee-examples source tarball. This URL can use any protocol + recognized by Buildroot, like http://, ftp://, file:// or + scp://. + + When pointing to a local tarball using file://, you may want + to use a make variable like $(TOPDIR) to reference the root of + the Buildroot tree. + +endchoice + +if BR2_PACKAGE_OPTEE_EXAMPLES_CUSTOM_TARBALL + +config BR2_PACKAGE_OPTEE_EXAMPLES_CUSTOM_TARBALL_LOCATION + string "URL of custom optee-examples tarball" + +endif + +config BR2_PACKAGE_OPTEE_EXAMPLES_VERSION + string + default "4.0.0" if BR2_PACKAGE_OPTEE_EXAMPLES_LATEST + default "custom" if BR2_PACKAGE_OPTEE_EXAMPLES_CUSTOM_TARBALL + +endif # BR2_PACKAGE_OPTEE_EXAMPLES diff --git a/package/optee-examples/optee-examples.mk b/package/optee-examples/optee-examples.mk index d620f0e36a..2e20dc4dd4 100644 --- a/package/optee-examples/optee-examples.mk +++ b/package/optee-examples/optee-examples.mk @@ -4,10 +4,26 @@ # ################################################################################ -OPTEE_EXAMPLES_VERSION = 4.0.0 -OPTEE_EXAMPLES_SITE = $(call github,linaro-swg,optee_examples,$(OPTEE_EXAMPLES_VERSION)) +OPTEE_EXAMPLES_VERSION = $(call qstrip,$(BR2_PACKAGE_OPTEE_EXAMPLES_VERSION)) OPTEE_EXAMPLES_LICENSE = BSD-2-Clause +ifeq ($(BR2_PACKAGE_OPTEE_EXAMPLES_LATEST),y) OPTEE_EXAMPLES_LICENSE_FILES = LICENSE +endif + +ifeq ($(BR2_PACKAGE_OPTEE_EXAMPLES_CUSTOM_TARBALL),y) +OPTEE_EXAMPLES_TARBALL = $(call qstrip,$(BR2_PACKAGE_OPTEE_EXAMPLES_CUSTOM_TARBALL_LOCATION)) +OPTEE_EXAMPLES_SITE = $(patsubst %/,%,$(dir $(OPTEE_EXAMPLES_TARBALL))) +OPTEE_EXAMPLES_SOURCE = $(notdir $(OPTEE_EXAMPLES_TARBALL)) +else ifeq ($(BR2_PACKAGE_OPTEE_EXAMPLES_CUSTOM_GIT),y) +OPTEE_EXAMPLES_SITE = $(call qstrip,$(BR2_PACKAGE_OPTEE_EXAMPLES_CUSTOM_REPO_URL)) +OPTEE_EXAMPLES_SITE_METHOD = git +else +OPTEE_EXAMPLES_SITE = $(call github,linaro-swg,optee_examples,$(OPTEE_EXAMPLES_VERSION)) +endif + +ifeq ($(BR2_PACKAGE_OPTEE_EXAMPLES):$(BR2_PACKAGE_OPTEE_EXAMPLES_LATEST),y:) +BR_NO_CHECK_HASH_FOR += $(OPTEE_EXAMPLES_SOURCE) +endif OPTEE_EXAMPLES_DEPENDENCIES = optee-client optee-os @@ -28,4 +44,10 @@ endef OPTEE_EXAMPLES_POST_BUILD_HOOKS += OPTEE_EXAMPLES_BUILD_TAS OPTEE_EXAMPLES_POST_INSTALL_TARGET_HOOKS += OPTEE_EXAMPLES_INSTALL_TAS +ifeq ($(BR2_PACKAGE_OPTEE_EXAMPLES_CUSTOM_TARBALL)$(BR_BUILDING),yy) +ifeq ($(call qstrip,$(BR2_PACKAGE_OPTEE_EXAMPLES_CUSTOM_TARBALL_LOCATION)),) +$(error No tarball location specified. Please check BR2_PACKAGE_OPTEE_EXAMPLES_CUSTOM_TARBALL_LOCATION) +endif +endif + $(eval $(cmake-package)) From 3b4a9c6279a838166685fcd2fa935c6766c83d62 Mon Sep 17 00:00:00 2001 From: Kory Maincent Date: Tue, 25 Jun 2024 15:05:25 +0200 Subject: [PATCH 5751/5754] boot/optee-os: Add support to build with host-cmake Some specific versions of OP-TEE need cmake on the host to build the scmi firmware. To allow building such OP-TEE OS versions, this commit adds the option BR2_TARGET_OPTEE_OS_NEEDS_CMAKE which when enabled ensures that host-cmake is built before OP-TEE OS. Signed-off-by: Kory Maincent --- boot/optee-os/Config.in | 6 ++++++ boot/optee-os/optee-os.mk | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in index 75bf00d450..9f834c7faf 100644 --- a/boot/optee-os/Config.in +++ b/boot/optee-os/Config.in @@ -91,6 +91,12 @@ config BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY python-cryptography. Select this option if optee-os needs python-cryptography to be built. +config BR2_TARGET_OPTEE_OS_NEEDS_CMAKE + bool "OP-TEE OS needs cmake" + help + Select this option if your OP-TEE OS platform configuration + requires the cmake build system to be available. + config BR2_TARGET_OPTEE_OS_CORE bool "Build core" default y diff --git a/boot/optee-os/optee-os.mk b/boot/optee-os/optee-os.mk index 33b4e2e1ab..8fa5c824da 100644 --- a/boot/optee-os/optee-os.mk +++ b/boot/optee-os/optee-os.mk @@ -30,6 +30,10 @@ endif OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pyelftools +ifeq ($(BR2_TARGET_OPTEE_OS_NEEDS_CMAKE),y) +OPTEE_OS_DEPENDENCIES += host-cmake +endif + ifeq ($(BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY),y) OPTEE_OS_DEPENDENCIES += host-python-cryptography else From 5cf0f0e32bd89bebe18e377137414777ea5e9fc2 Mon Sep 17 00:00:00 2001 From: Kory Maincent Date: Thu, 27 Jun 2024 16:17:00 +0200 Subject: [PATCH 5752/5754] linux.mk: Add support for vendor directory in BR2_LINUX_KERNEL_CUSTOM_DTS_PATH Linux organizes devicetree files under vendor subdirectories for arm and arm64 architectures, such as arch//boot/dts//. The BR2_LINUX_KERNEL_CUSTOM_DTS_PATH was only copying devicetree files to arch//boot/dts/, which is incompatible with the vendor subdirectory structure. This patch adds support for using a directory in BR2_LINUX_KERNEL_CUSTOM_DTS_PATH that matches the vendor subdirectory name. Signed-off-by: Kory Maincent --- linux/Config.in | 4 +++- linux/linux.mk | 14 +++++++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 47a3292fe8..c6cca7b669 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -417,7 +417,9 @@ config BR2_LINUX_KERNEL_CUSTOM_DTS_PATH Paths to out-of-tree Device Tree Source (.dts) and Device Tree Source Include (.dtsi) files, separated by spaces. These files will be copied to the kernel sources and the .dts files will - be compiled from there. + be compiled from there. You can also use a directory which + name match the vendor name as in + arch//boot/dts// config BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME bool "Keep the directory name of the Device Tree" diff --git a/linux/linux.mk b/linux/linux.mk index 4e12b36c1f..ba7705574c 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -195,7 +195,15 @@ LINUX_DTS_NAME += $(call qstrip,$(BR2_LINUX_KERNEL_INTREE_DTS_NAME)) # and .dtsi files in BR2_LINUX_KERNEL_CUSTOM_DTS_PATH. Both will be # copied to arch//boot/dts, but only the .dts files will # actually be generated as .dtb. -LINUX_DTS_NAME += $(basename $(filter %.dts,$(notdir $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH))))) +# In case we are copying a vendor dts subdirectory as in +# arch//boot/dts// we have to append the wildcard to the +# folder to list the devicetree. +LINUX_KERNEL_CUSTOM_DTS_PATH = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH)) +ifneq ($(wildcard $(LINUX_KERNEL_CUSTOM_DTS_PATH)/.*),) +LINUX_DTS_NAME += $(addprefix $(notdir $(LINUX_KERNEL_CUSTOM_DTS_PATH))/,$(basename $(filter %.dts,$(notdir $(wildcard $(LINUX_KERNEL_CUSTOM_DTS_PATH)/*))))) +else +LINUX_DTS_NAME += $(basename $(filter %.dts,$(notdir $(wildcard $(LINUX_KERNEL_CUSTOM_DTS_PATH))))) +endif LINUX_DTBS = $(addsuffix .dtb,$(LINUX_DTS_NAME)) @@ -502,8 +510,8 @@ endif # http://lists.busybox.net/pipermail/buildroot/2020-May/282727.html define LINUX_BUILD_CMDS $(call KCONFIG_DISABLE_OPT,CONFIG_GCC_PLUGINS) - $(foreach dts,$(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH)), \ - cp -f $(dts) $(LINUX_ARCH_PATH)/boot/dts/ + $(foreach dts,$(LINUX_KERNEL_CUSTOM_DTS_PATH), \ + cp -rf $(dts) $(LINUX_ARCH_PATH)/boot/dts/ ) $(LINUX_MAKE_ENV) $(BR2_MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) all $(LINUX_MAKE_ENV) $(BR2_MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(LINUX_TARGET_NAME) From d8191b82b07a29e7a28d91f7424a55f3ba271b4f Mon Sep 17 00:00:00 2001 From: Bryan Brattlof Date: Fri, 5 Apr 2024 11:41:01 -0500 Subject: [PATCH 5753/5754] package/arm-gnu-toolchain: bump version to 13.2-rel1 The arm-gnu-toolchain is used by TI's K3 generation of devices to compile the first stage bootloader (tiboot3.bin) which will run on the 32bit R5 MCU. The 10.3-2021.10 version of this toolchain is no longer publicized as being downloadable (and it's fairly old) on ARM's website. Let's upgrade to the latest version of the toolchain ARM (13.2-rel1) Signed-off-by: Bryan Brattlof Signed-off-by: Thomas Petazzoni --- package/arm-gnu-toolchain/arm-gnu-toolchain.hash | 4 ++-- package/arm-gnu-toolchain/arm-gnu-toolchain.mk | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/arm-gnu-toolchain/arm-gnu-toolchain.hash b/package/arm-gnu-toolchain/arm-gnu-toolchain.hash index dec23f7ba5..0800fa2168 100644 --- a/package/arm-gnu-toolchain/arm-gnu-toolchain.hash +++ b/package/arm-gnu-toolchain/arm-gnu-toolchain.hash @@ -1,2 +1,2 @@ -# Locally calculated -sha256 97dbb4f019ad1650b732faffcc881689cedc14e2b7ee863d390e0a41ef16c9a3 gcc-arm-none-eabi-10.3-2021.10-x86_64-linux.tar.bz2 +# taken from https://developer.arm.com/-/media/Files/downloads/gnu/13.2.rel1/binrel/arm-gnu-toolchain-13.2.rel1-x86_64-arm-none-eabi.tar.xz.sha256asc +sha256 6cd1bbc1d9ae57312bcd169ae283153a9572bd6a8e4eeae2fedfbc33b115fdbb arm-gnu-toolchain-13.2.rel1-x86_64-arm-none-eabi.tar.xz diff --git a/package/arm-gnu-toolchain/arm-gnu-toolchain.mk b/package/arm-gnu-toolchain/arm-gnu-toolchain.mk index 87e12874ea..03bb4dc5da 100644 --- a/package/arm-gnu-toolchain/arm-gnu-toolchain.mk +++ b/package/arm-gnu-toolchain/arm-gnu-toolchain.mk @@ -4,9 +4,9 @@ # ################################################################################ -ARM_GNU_TOOLCHAIN_VERSION = 10.3-2021.10 -ARM_GNU_TOOLCHAIN_SITE = https://developer.arm.com/-/media/Files/downloads/gnu-rm/$(ARM_GNU_TOOLCHAIN_VERSION) -ARM_GNU_TOOLCHAIN_SOURCE = gcc-arm-none-eabi-$(ARM_GNU_TOOLCHAIN_VERSION)-x86_64-linux.tar.bz2 +ARM_GNU_TOOLCHAIN_VERSION = 13.2.rel1 +ARM_GNU_TOOLCHAIN_SITE = https://developer.arm.com/-/media/Files/downloads/gnu/$(ARM_GNU_TOOLCHAIN_VERSION)/binrel +ARM_GNU_TOOLCHAIN_SOURCE = arm-gnu-toolchain-$(ARM_GNU_TOOLCHAIN_VERSION)-x86_64-arm-none-eabi.tar.xz ARM_GNU_TOOLCHAIN_LICENSE = GPL-3.0+ HOST_ARM_GNU_TOOLCHAIN_INSTALL_DIR = $(HOST_DIR)/opt/gcc-arm-none-eabi From 3c60e426c42efca889ed151d7949df3d2418b952 Mon Sep 17 00:00:00 2001 From: morgic <2972064441@qq.com> Date: Thu, 26 Sep 2024 18:03:21 +0800 Subject: [PATCH 5754/5754] no --- ...upplicant-fix-build-with-kernel-4.16.patch | 56 ------------------- 1 file changed, 56 deletions(-) delete mode 100644 package/optee-client/4.0.0/0001-tee-supplicant-fix-build-with-kernel-4.16.patch diff --git a/package/optee-client/4.0.0/0001-tee-supplicant-fix-build-with-kernel-4.16.patch b/package/optee-client/4.0.0/0001-tee-supplicant-fix-build-with-kernel-4.16.patch deleted file mode 100644 index fa51bd5d5e..0000000000 --- a/package/optee-client/4.0.0/0001-tee-supplicant-fix-build-with-kernel-4.16.patch +++ /dev/null @@ -1,56 +0,0 @@ -From acc5aec37f5f246ebf185d2129e7630eb80bb388 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 5 Jan 2024 09:47:43 +0100 -Subject: [PATCH] tee-supplicant: fix build with kernel < 4.16 - -Commit 3ac968ee7c927271e83ea3a4247839649202ab5e moved linux/tee.h from -libteec/include to libteec/src resulting in the following build failure -with any kernel < 4.16 (i.e before -https://github.com/torvalds/linux/commit/033ddf12bcf5326b93bd604f50a7474a434a35f9): - -/home/buildroot/autobuild/instance-3/output-1/build/optee-client-4.0.0/tee-supplicant/src/tee_supplicant.c: In function 'register_local_shm': -/home/buildroot/autobuild/instance-3/output-1/build/optee-client-4.0.0/tee-supplicant/src/tee_supplicant.c:356:44: error: storage size of 'data' isn't known - 356 | struct tee_ioctl_shm_register_data data; - | ^~~~ - -To fix this build failure, update CMakeLists.txt and Makefile of -tee-supplicant to add libteec/src to the include directories. - -Fixes: 3ac968ee7c92 ("Makefile, cmake: move teec related headers") - -Signed-off-by: Fabrice Fontaine -Upstream: https://github.com/OP-TEE/optee_client/pull/369 ---- - tee-supplicant/CMakeLists.txt | 5 ++++- - tee-supplicant/Makefile | 2 +- - 2 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/tee-supplicant/CMakeLists.txt b/tee-supplicant/CMakeLists.txt -index 31c6dac5..b44e9e95 100644 ---- a/tee-supplicant/CMakeLists.txt -+++ b/tee-supplicant/CMakeLists.txt -@@ -93,7 +93,10 @@ endif() - ################################################################################ - # Public and private header and library dependencies - ################################################################################ --target_include_directories(${PROJECT_NAME} PRIVATE src) -+target_include_directories(${PROJECT_NAME} -+ PRIVATE src -+ PRIVATE ../libteec/src -+) - - target_link_libraries(${PROJECT_NAME} - PRIVATE teec -diff --git a/tee-supplicant/Makefile b/tee-supplicant/Makefile -index 06c4b2e5..c3b32252 100644 ---- a/tee-supplicant/Makefile -+++ b/tee-supplicant/Makefile -@@ -40,7 +40,7 @@ TEES_OBJ_DIR := $(OUT_DIR) - TEES_OBJS := $(patsubst %.c,$(TEES_OBJ_DIR)/%.o, $(TEES_SRCS)) - TEES_INCLUDES := ${CURDIR}/../libteec/include \ - ${CURDIR}/src \ -- ${CURDIR}/../libteec/include \ -+ ${CURDIR}/../libteec/src \ - - TEES_CFLAGS := $(addprefix -I, $(TEES_INCLUDES)) $(CFLAGS) \ - -DDEBUGLEVEL_$(CFG_TEE_SUPP_LOG_LEVEL) \