diff --git a/buildroot-patches/0005-package-rpi-firmware-Allow-to-deploy-multiple-firmwa.patch b/buildroot-patches/0005-package-rpi-firmware-Allow-to-deploy-multiple-firmwa.patch deleted file mode 100644 index a6644b644..000000000 --- a/buildroot-patches/0005-package-rpi-firmware-Allow-to-deploy-multiple-firmwa.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 49e3db2dafa620dcbb11c1ed68f442aa8fd4696f Mon Sep 17 00:00:00 2001 -Message-Id: <49e3db2dafa620dcbb11c1ed68f442aa8fd4696f.1614713774.git.stefan@agner.ch> -In-Reply-To: -References: -From: Stefan Agner -Date: Mon, 8 Feb 2021 14:08:28 +0100 -Subject: [PATCH 5/5] package/rpi-firmware: Allow to deploy multiple firmware - files - -Add a new config option to allow a specific list of firmware files to be -deployed. This is useful if the system needs to decide at runtime which -firmware to use. - -Signed-off-by: Stefan Agner ---- - package/rpi-firmware/Config.in | 10 ++++++++++ - package/rpi-firmware/rpi-firmware.mk | 17 +++++++++++++++-- - 2 files changed, 25 insertions(+), 2 deletions(-) - -diff --git a/package/rpi-firmware/Config.in b/package/rpi-firmware/Config.in -index f5a25c5680..ce31ad46de 100644 ---- a/package/rpi-firmware/Config.in -+++ b/package/rpi-firmware/Config.in -@@ -58,8 +58,18 @@ config BR2_PACKAGE_RPI_FIRMWARE_CD - The cut-down firmware, for emergency situations, with only - features required to boot a Linux kernel. - -+config BR2_PACKAGE_RPI_FIRMWARE_CUSTOM_LIST -+ bool "deploy firmware files from list" -+ help -+ Deploy firmware files as listed. -+ - endchoice - -+config BR2_PACKAGE_RPI_FIRMWARE_LIST -+ string -+ default "start.elf start_x.elf start_cd.elf fixup.dat fixup_x.dat fixup_cd.dat" if BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI -+ default "start4.elf start4x.elf start4cd.elf fixup4.dat fixup4x.dat fixup4cd.dat" if BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4 -+ - config BR2_PACKAGE_RPI_FIRMWARE_BOOT - string - default "" if BR2_PACKAGE_RPI_FIRMWARE_DEFAULT && BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI -diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk -index f3d28ef825..58085a8ca8 100644 ---- a/package/rpi-firmware/rpi-firmware.mk -+++ b/package/rpi-firmware/rpi-firmware.mk -@@ -48,11 +48,24 @@ define RPI_FIRMWARE_INSTALL_BOOTCODE_BIN - endef - endif - -+ifeq ($(BR2_PACKAGE_RPI_FIRMWARE_CUSTOM_LIST),y) -+define RPI_FIRMWARE_INSTALL_FIRMWARE -+ $(foreach firmware,$(call qstrip,$(BR2_PACKAGE_RPI_FIRMWARE_LIST)), \ -+ $(INSTALL) -D -m 0644 $(@D)/boot/$(firmware) $(BINARIES_DIR)/rpi-firmware/$(firmware) -+ ) -+endef -+else -+define RPI_FIRMWARE_INSTALL_FIRMWARE -+ $(INSTALL) -D -m 0644 $(@D)/boot/start$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).elf $(BINARIES_DIR)/rpi-firmware/start.elf -+ $(INSTALL) -D -m 0644 $(@D)/boot/fixup$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).dat $(BINARIES_DIR)/rpi-firmware/fixup.dat -+endef -+endif -+ -+ - define RPI_FIRMWARE_INSTALL_IMAGES_CMDS - $(INSTALL) -D -m 0644 package/rpi-firmware/config.txt $(BINARIES_DIR)/rpi-firmware/config.txt - $(INSTALL) -D -m 0644 package/rpi-firmware/cmdline.txt $(BINARIES_DIR)/rpi-firmware/cmdline.txt -- $(INSTALL) -D -m 0644 $(@D)/boot/start$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).elf $(BINARIES_DIR)/rpi-firmware/start.elf -- $(INSTALL) -D -m 0644 $(@D)/boot/fixup$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).dat $(BINARIES_DIR)/rpi-firmware/fixup.dat -+ $(RPI_FIRMWARE_INSTALL_FIRMWARE) - $(RPI_FIRMWARE_INSTALL_BOOTCODE_BIN) - $(RPI_FIRMWARE_INSTALL_DTB) - $(RPI_FIRMWARE_INSTALL_DTB_OVERLAYS) --- -2.30.1 - diff --git a/buildroot-patches/0006-package-docker-engine-bump-version-to-20.10.6.patch b/buildroot-patches/0006-package-docker-engine-bump-version-to-20.10.6.patch deleted file mode 100644 index 182237d81..000000000 --- a/buildroot-patches/0006-package-docker-engine-bump-version-to-20.10.6.patch +++ /dev/null @@ -1,39 +0,0 @@ -From fd8fc4e0640965e06657782d324eef73f33ed745 Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: <9c98c07abbe9ee675ec588ad7c15f0285e8a0f07.1618500237.git.stefan@agner.ch> -References: <9c98c07abbe9ee675ec588ad7c15f0285e8a0f07.1618500237.git.stefan@agner.ch> -From: Stefan Agner -Date: Thu, 15 Apr 2021 17:21:47 +0200 -Subject: [PATCH 6/9] package/docker-engine: bump version to 20.10.6 - -Signed-off-by: Stefan Agner ---- - 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 7e3ce6a5cf..6c55b9a9b9 100644 ---- a/package/docker-engine/docker-engine.hash -+++ b/package/docker-engine/docker-engine.hash -@@ -1,3 +1,3 @@ - # Locally calculated --sha256 bcf651d75e5c80421e8cd3b0d47f3425e01047cf67aef0eda83b68776905a583 docker-engine-20.10.5.tar.gz -+sha256 fd7f5571b1f64f26b5ca520a3e1fefb33c190f3732b931051c23a76bdba5000e docker-engine-20.10.6.tar.gz - sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE -diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk -index d3f4d81572..c383ef8510 100644 ---- a/package/docker-engine/docker-engine.mk -+++ b/package/docker-engine/docker-engine.mk -@@ -4,7 +4,7 @@ - # - ################################################################################ - --DOCKER_ENGINE_VERSION = 20.10.5 -+DOCKER_ENGINE_VERSION = 20.10.6 - DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION)) - - DOCKER_ENGINE_LICENSE = Apache-2.0 --- -2.31.1 - diff --git a/buildroot-patches/0006-package-linux-firmware-add-RTL87XX-RTL88XX-Bluetooth.patch b/buildroot-patches/0006-package-linux-firmware-add-RTL87XX-RTL88XX-Bluetooth.patch deleted file mode 100644 index 5179394f1..000000000 --- a/buildroot-patches/0006-package-linux-firmware-add-RTL87XX-RTL88XX-Bluetooth.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 51c25488d718cdeb022e60cacc8ddcb6d9a97cc7 Mon Sep 17 00:00:00 2001 -Message-Id: <51c25488d718cdeb022e60cacc8ddcb6d9a97cc7.1616146775.git.stefan@agner.ch> -In-Reply-To: -References: -From: Stefan Agner -Date: Wed, 17 Mar 2021 14:48:43 +0100 -Subject: [PATCH 6/6] package/linux-firmware: add RTL87XX/RTL88XX Bluetooth - firmware - -Add firmware files for Realtek 87XX and 88XX Bluetooth chipsets. Those -are supported by the upstream Realtek Bluetooth driver CONFIG_BT_RTL. - -Signed-off-by: Stefan Agner ---- - package/linux-firmware/Config.in | 10 ++++++++++ - package/linux-firmware/linux-firmware.mk | 21 +++++++++++++++++++++ - 2 files changed, 31 insertions(+) - -diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in -index a41310ff2a..ba3322fa18 100644 ---- a/package/linux-firmware/Config.in -+++ b/package/linux-firmware/Config.in -@@ -79,6 +79,16 @@ config BR2_PACKAGE_LINUX_FIRMWARE_AR3012_USB - help - Firmware files for Atheros bluetooth chipset AR3012 on USB. - -+config BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX_BT -+ bool "Realtek 87xx Bluetooth" -+ help -+ Realtek 8723a/8723b/8723bs/8723d/8723ds/8761a -+ -+config BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX_BT -+ bool "Realtek 88xx Bluetooth" -+ help -+ Realtek 8821a/8821c/8822b/8822cs/8822cu/8852au -+ - config BR2_PACKAGE_LINUX_FIRMWARE_TI_CC2560 - bool "TI CC2560" - help -diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk -index f23da171c6..9c512ab750 100644 ---- a/package/linux-firmware/linux-firmware.mk -+++ b/package/linux-firmware/linux-firmware.mk -@@ -64,6 +64,27 @@ LINUX_FIRMWARE_FILES += qca/rampatch_usb_00000302.bin qca/nvm_usb_00000302.bin - LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENSE.qcom - endif - -+# Realtek 87xx Bluetooth -+ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX_BT),y) -+LINUX_FIRMWARE_FILES += \ -+ rtl_bt/rtl8723a_fw.bin rtl_bt/rtl8723b_fw.bin \ -+ rtl_bt/rtl8723bs_config-OBDA8723.bin \ -+ rtl_bt/rtl8723bs_fw.bin rtl_bt/rtl8723d_config.bin \ -+ rtl_bt/rtl8723d_fw.bin rtl_bt/rtl8761a_fw.bin -+LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.rtlwifi_firmware.txt -+endif -+ -+# Realtek 88xx Bluetooth -+ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX_BT),y) -+LINUX_FIRMWARE_FILES += \ -+ rtl_bt/rtl8812ae_fw.bin rtl_bt/rtl8821a_fw.bin \ -+ 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 -+LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.rtlwifi_firmware.txt -+endif -+ - # rt2501/rt61 - ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT61),y) - LINUX_FIRMWARE_FILES += rt2561.bin rt2561s.bin rt2661.bin --- -2.30.2 - diff --git a/buildroot-patches/0008-package-docker-cli-bump-version-to-20.10.6.patch b/buildroot-patches/0008-package-docker-cli-bump-version-to-20.10.6.patch deleted file mode 100644 index 2aa971ed4..000000000 --- a/buildroot-patches/0008-package-docker-cli-bump-version-to-20.10.6.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 6d3b66a8211a91ca74361a0a3393e9bc529009a1 Mon Sep 17 00:00:00 2001 -Message-Id: <6d3b66a8211a91ca74361a0a3393e9bc529009a1.1618500237.git.stefan@agner.ch> -In-Reply-To: <9c98c07abbe9ee675ec588ad7c15f0285e8a0f07.1618500237.git.stefan@agner.ch> -References: <9c98c07abbe9ee675ec588ad7c15f0285e8a0f07.1618500237.git.stefan@agner.ch> -From: Stefan Agner -Date: Thu, 15 Apr 2021 17:22:40 +0200 -Subject: [PATCH 8/9] package/docker-cli: bump version to 20.10.6 - -Signed-off-by: Stefan Agner ---- - 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 f4787062bb..bb3444c270 100644 ---- a/package/docker-cli/docker-cli.hash -+++ b/package/docker-cli/docker-cli.hash -@@ -1,3 +1,3 @@ - # Locally calculated --sha256 4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342 docker-cli-20.10.5.tar.gz -+sha256 eda53b96ab83a59502df2e5e00ab7ee867243259407ef454be55e695303c1113 docker-cli-20.10.6.tar.gz - sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE -diff --git a/package/docker-cli/docker-cli.mk b/package/docker-cli/docker-cli.mk -index d710bb2fee..8607070e17 100644 ---- a/package/docker-cli/docker-cli.mk -+++ b/package/docker-cli/docker-cli.mk -@@ -4,7 +4,7 @@ - # - ################################################################################ - --DOCKER_CLI_VERSION = 20.10.5 -+DOCKER_CLI_VERSION = 20.10.6 - DOCKER_CLI_SITE = $(call github,docker,cli,v$(DOCKER_CLI_VERSION)) - - DOCKER_CLI_LICENSE = Apache-2.0 --- -2.31.1 - diff --git a/buildroot/CHANGES b/buildroot/CHANGES index 9afcc4ab7..35f8fbec0 100644 --- a/buildroot/CHANGES +++ b/buildroot/CHANGES @@ -1,3 +1,54 @@ +2021.02.2, released May 12th, 2021 + + Important / security related fixes. + + Toolchain: Add logic to mark toolchains affected by binutils + bug 27597 (Nios II). + + support/scripts/cve.py: Use the (significantly) faster yajl2 + ijson backend for older (< 2.5) ijson versions rather than the + slow python default, speeding up pkg-stats by ~2x. + + CMake infrastructure: Use CMAKE_EXE_LINKER_FLAGS rather than + CMAKE_CXX_FLAGS to link with libatomic to fix an compatibility + issue with poppler. + + Infrastructure: Expose CONFIG_DIR to post-build/post-image + scripts, so they can call the Buildroot Makefile in the + correct directory for both in-tree / out-of-tree builds. + + Updated/fixed packages: at91bootstrap, avahi, bash, bind, + bridge-utils, boost, cegui, cifs-utils, clamav, cmake, + coremark-pro, coreutils, cryptsetup, dmalloc, dnsmasq, + docker-cli, docker-engine, domoticz, efl, exim, ffmpeg, flex, + gcc, genext2fs, go, gst1-interpipe, haproxy, hostapd, + i2c-tools, imx-vpu, kexec, kf5-kcoreaddons, kismet, libcamera, + libcurl, libdrm, libfreefare, libfuse3, libgeos, libgpiod, + libnpupnp, libopenssl, libp11, librsync, libtomcrypt, libupnp, + localedef, lvm2, lxc, m4, makedevs, mender, mesa3d, + mesa3d-headers, mkpasswd, mkpimage, modem-manager, monkey, + mpd, ncurses, nettle, network-manager, nginx, numactl, + openjdk, openjdk-bin, openldap, openvpn, php, pipewire, + python-aioconsole, python-asgiref, python-botocore, + python-django, python-dnspython, python-flup, python-httplib2, + python-markdown2, python-mbrstrdecoder, python3, quickjs, + readline, rsyslog, ruby, rust, samba4, sconeserver, snort, + sox, systemd, tar, timescaledb, tio, tor, usb_modeswitch, + wpa_supplicant, xdriver_xf86-video-ati, xen, xlib_libXaw, + xserver_xorg-server + + Issues resolved (http://bugs.uclibc.org): + + #13271: systemd-resolved: /etc/resolv.conf link broken on per-pa.. + #13551: 2021.02.rc2: Unicode not work on qt 5.15.2 + #13651: pkg-golang cannot build when main.go is in the root + #13661: host-python2 build fails on aarch64 + #13721: c-stack.c:55:26: error: missing binary operator before .. + #13731: Readline Patch is missing Author Information + #13741: genext2fs does not allow to set perms of root node + #13751: libopenssl (static): huge drop in performance in newer .. + #13771: package htop has undeclared dependency on host python + 2021.02.1, released April 7, 2021 Important / security related fixes. diff --git a/buildroot/Config.in.legacy b/buildroot/Config.in.legacy index 9deb67b31..530c2ba82 100644 --- a/buildroot/Config.in.legacy +++ b/buildroot/Config.in.legacy @@ -146,6 +146,31 @@ endif comment "Legacy options removed in 2021.02" +config BR2_PACKAGE_SCONESERVER_HTTP_SCONESITE_IMAGE + bool "sconeserver http::sconesite::image removed" + select BR2_LEGACY + help + Sconeserver cannot be built with ImageMagick - it uses the + "transofrm" function which is removed from public API. + +config BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE_EVDEV + bool "KDrive/TinyX evdev input driver removed" + select BR2_LEGACY + help + The evdev input driver in KDrive was removed. + +config BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE_KBD + bool "KDrive/TinyX kbd input driver removed" + select BR2_LEGACY + help + The kbd input driver in KDrive was removed. + +config BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE_MOUSE + bool "KDrive/TinyX mouse input driver removed" + select BR2_LEGACY + help + The mouse input driver in KDrive was removed. + config BR2_PACKAGE_MPD_AUDIOFILE bool "mpd audiofile support removed" select BR2_LEGACY diff --git a/buildroot/DEVELOPERS b/buildroot/DEVELOPERS index 53626566b..52dabb9d1 100644 --- a/buildroot/DEVELOPERS +++ b/buildroot/DEVELOPERS @@ -468,7 +468,7 @@ N: Bogdan Radulescu F: package/iftop/ F: package/ncdu/ -N: Brandon Maier +N: Brandon Maier F: package/vmtouch/ N: Brock Williams @@ -569,7 +569,7 @@ F: package/perl-sys-mmap/ F: package/perl-time-parsedate/ F: package/perl-x10/ -N: Clayton Shotwell +N: Clayton Shotwell F: package/audit/ F: package/checkpolicy/ F: package/cpio/ @@ -671,6 +671,19 @@ F: package/libstrophe/ N: Derrick Lyndon Pallas F: package/ipcalc/ +N: Dick Olsson +F: package/bearssl/ +F: package/execline/ +F: package/mdevd/ +F: package/s6-dns/ +F: package/s6-linux-init/ +F: package/s6-linux-utils/ +F: package/s6-networking/ +F: package/s6-portable-utils/ +F: package/s6-rc/ +F: package/s6/ +F: package/skalibs/ + N: Dimitrios Siganos F: package/wireless-regdb/ @@ -1201,7 +1214,7 @@ F: package/python-sockjs/ F: package/python-terminaltables/ F: package/python-yarl/ -N: James Knight +N: James Knight F: package/atkmm/ F: package/cairomm/ F: package/google-material-design-icons/ @@ -1690,7 +1703,7 @@ F: board/technologic/ts4900/ F: configs/ts4900_defconfig F: package/ts4900-fpga/ -N: Matt Weber +N: Matt Weber F: board/freescale/p* F: board/freescale/t* F: board/qemu/ppc64-e5500/ @@ -2303,7 +2316,7 @@ F: toolchain/ N: Roman Gorbenkov F: package/davfs2/ -N: Ryan Barnett +N: Ryan Barnett F: package/atftp/ F: package/c-periphery/ F: package/miraclecast/ @@ -2340,7 +2353,7 @@ F: support/misc/toolchainfile.cmake.in N: Sam Voss F: package/ripgrep/ -N: Santosh Multhalli +N: Santosh Multhalli F: package/valijson/ N: Sébastien Szymanski diff --git a/buildroot/Makefile b/buildroot/Makefile index 01352eec5..83e90317e 100644 --- a/buildroot/Makefile +++ b/buildroot/Makefile @@ -92,9 +92,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2021.02.1 +export BR2_VERSION := 2021.02.2 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1617790000 +BR2_VERSION_EPOCH = 1620810000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) diff --git a/buildroot/boot/at91bootstrap/at91bootstrap.hash b/buildroot/boot/at91bootstrap/at91bootstrap.hash index b1f963b82..d9f8db889 100644 --- a/buildroot/boot/at91bootstrap/at91bootstrap.hash +++ b/buildroot/boot/at91bootstrap/at91bootstrap.hash @@ -1,2 +1,3 @@ # locally computed sha256 d66192a274247f4baa39fa932eadf903d7add55641d89d30402f967c4f2282a5 AT91Bootstrap1.16.zip +sha256 6a3ac5dfcf19e6bac1b1109d30d72818768a3855e2594b84fe2b012b5fe0e77b include/sdramc.h diff --git a/buildroot/boot/at91bootstrap/at91bootstrap.mk b/buildroot/boot/at91bootstrap/at91bootstrap.mk index c68b56b6e..1a084756f 100644 --- a/buildroot/boot/at91bootstrap/at91bootstrap.mk +++ b/buildroot/boot/at91bootstrap/at91bootstrap.mk @@ -7,6 +7,8 @@ AT91BOOTSTRAP_VERSION = 1.16 AT91BOOTSTRAP_SITE = ftp://www.at91.com/pub/at91bootstrap AT91BOOTSTRAP_SOURCE = AT91Bootstrap$(AT91BOOTSTRAP_VERSION).zip +AT91BOOTSTRAP_LICENSE = BSD-Source-Code +AT91BOOTSTRAP_LICENSE_FILES = include/sdramc.h AT91BOOTSTRAP_BOARD = $(call qstrip,$(BR2_TARGET_AT91BOOTSTRAP_BOARD)) AT91BOOTSTRAP_MEMORY = $(call qstrip,$(BR2_TARGET_AT91BOOTSTRAP_MEMORY)) diff --git a/buildroot/docs/manual/customize-post-image.txt b/buildroot/docs/manual/customize-post-image.txt index 90ea2b932..5308093d0 100644 --- a/buildroot/docs/manual/customize-post-image.txt +++ b/buildroot/docs/manual/customize-post-image.txt @@ -28,7 +28,8 @@ different sets of arguments to each script. Again just like for the post-build scripts, the scripts have access to the environment variables +BR2_CONFIG+, +HOST_DIR+, +STAGING_DIR+, -+TARGET_DIR+, +BUILD_DIR+, +BINARIES_DIR+ and +BASE_DIR+. ++TARGET_DIR+, +BUILD_DIR+, +BINARIES_DIR+, +CONFIG_DIR+ and ++BASE_DIR+. The post-image scripts will be executed as the user that executes Buildroot, which should normally _not_ be the root user. Therefore, any diff --git a/buildroot/docs/manual/customize-rootfs.txt b/buildroot/docs/manual/customize-rootfs.txt index e1dbadda5..e46306fd2 100644 --- a/buildroot/docs/manual/customize-rootfs.txt +++ b/buildroot/docs/manual/customize-rootfs.txt @@ -60,6 +60,9 @@ The post-build scripts are run with the main Buildroot tree as current In addition, you may also use these environment variables: - +BR2_CONFIG+: the path to the Buildroot .config file + - +CONFIG_DIR+: the directory containing the .config file, and + therefore the top-level Buildroot Makefile to use (which is + correct for both in-tree and out-of-tree builds) - +HOST_DIR+, +STAGING_DIR+, +TARGET_DIR+: see xref:generic-package-reference[] - +BUILD_DIR+: the directory where packages are extracted and built diff --git a/buildroot/docs/manual/manual.html b/buildroot/docs/manual/manual.html index fbdef4a27..4ba10a3f8 100644 --- a/buildroot/docs/manual/manual.html +++ b/buildroot/docs/manual/manual.html @@ -1,8 +1,8 @@ -The Buildroot user manual

The Buildroot user manual

Table of Contents

I. Getting started
1. About Buildroot
2. System requirements
2.1. Mandatory packages
2.2. Optional packages
3. Getting Buildroot
4. Buildroot quick start
5. Community resources
II. User guide
6. Buildroot configuration
6.1. Cross-compilation toolchain
6.2. /dev management
6.3. init system
7. Configuration of other components
8. General Buildroot usage
8.1. make tips
8.2. Understanding when a full rebuild is necessary
8.3. Understanding how to rebuild packages
8.4. Offline builds
8.5. Building out-of-tree
8.6. Environment variables
8.7. Dealing efficiently with filesystem images
8.8. Details about packages
8.9. Graphing the dependencies between packages
8.10. Graphing the build duration
8.11. Graphing the filesystem size contribution of packages
8.12. Top-level parallel build
8.13. Integration with Eclipse
8.14. Advanced usage
9. Project-specific customization
9.1. Recommended directory structure
9.2. Keeping customizations outside of Buildroot
9.3. Storing the Buildroot configuration
9.4. Storing the configuration of other components
9.5. Customizing the generated target filesystem
9.6. Adding custom user accounts
9.7. Customization after the images have been created
9.8. Adding project-specific patches
9.9. Adding project-specific packages
9.10. Quick guide to storing your project-specific customizations
10. Using SELinux in Buildroot
10.1. Enabling SELinux support
10.2. SELinux policy tweaking
11. Frequently Asked Questions & Troubleshooting
11.1. The boot hangs after Starting network…
11.2. Why is there no compiler on the target?
11.3. Why are there no development files on the target?
11.4. Why is there no documentation on the target?
11.5. Why are some packages not visible in the Buildroot config menu?
11.6. Why not use the target directory as a chroot directory?
11.7. Why doesn’t Buildroot generate binary packages (.deb, .ipkg…)?
11.8. How to speed-up the build process?
12. Known issues
13. Legal notice and licensing
13.1. Complying with open source licenses
13.2. Complying with the Buildroot license
14. Beyond Buildroot
14.1. Boot the generated images
14.2. Chroot
III. Developer guide
15. How Buildroot works
16. Coding style
16.1. Config.in file
16.2. The .mk file
16.3. The documentation
16.4. Support scripts
17. Adding support for a particular board
18. Adding new packages to Buildroot
18.1. Package directory
18.2. Config files
18.3. The .mk file
18.4. The .hash file
18.5. Infrastructure for packages with specific build systems
18.6. Infrastructure for autotools-based packages
18.7. Infrastructure for CMake-based packages
18.8. Infrastructure for Python packages
18.9. Infrastructure for LuaRocks-based packages
18.10. Infrastructure for Perl/CPAN packages
18.11. Infrastructure for virtual packages
18.12. Infrastructure for packages using kconfig for configuration files
18.13. Infrastructure for rebar-based packages
18.14. Infrastructure for Waf-based packages
18.15. Infrastructure for Meson-based packages
18.16. Integration of Cargo-based packages
18.17. Infrastructure for Go packages
18.18. Infrastructure for QMake-based packages
18.19. Infrastructure for packages building kernel modules
18.20. Infrastructure for asciidoc documents
18.21. Infrastructure specific to the Linux kernel package
18.22. Hooks available in the various build steps
18.23. Gettext integration and interaction with packages
18.24. Tips and tricks
18.25. Conclusion
19. Patching a package
19.1. Providing patches
19.2. How patches are applied
19.3. Format and licensing of the package patches
19.4. Integrating patches found on the Web
20. Download infrastructure
21. Debugging Buildroot
22. Contributing to Buildroot
22.1. Reproducing, analyzing and fixing bugs
22.2. Analyzing and fixing autobuild failures
22.3. Reviewing and testing patches
22.4. Work on items from the TODO list
22.5. Submitting patches
22.6. Reporting issues/bugs or getting help
22.7. Using the run-tests framework
23. DEVELOPERS file and get-developers
24. Release Engineering
24.1. Releases
24.2. Development
IV. Appendix
25. Makedev syntax documentation
26. Makeusers syntax documentation
27. Migrating from older Buildroot versions
27.1. Migrating to 2016.11
27.2. Migrating to 2017.08

List of Examples

18.1. Config script: divine package
18.2. Config script: imagemagick package:

Buildroot 2021.02.1 manual generated on 2021-04-07 -10:22:21 UTC from git revision 6668381363

The Buildroot manual is written by the Buildroot developers. +The Buildroot user manual

The Buildroot user manual

Table of Contents

I. Getting started
1. About Buildroot
2. System requirements
2.1. Mandatory packages
2.2. Optional packages
3. Getting Buildroot
4. Buildroot quick start
5. Community resources
II. User guide
6. Buildroot configuration
6.1. Cross-compilation toolchain
6.2. /dev management
6.3. init system
7. Configuration of other components
8. General Buildroot usage
8.1. make tips
8.2. Understanding when a full rebuild is necessary
8.3. Understanding how to rebuild packages
8.4. Offline builds
8.5. Building out-of-tree
8.6. Environment variables
8.7. Dealing efficiently with filesystem images
8.8. Details about packages
8.9. Graphing the dependencies between packages
8.10. Graphing the build duration
8.11. Graphing the filesystem size contribution of packages
8.12. Top-level parallel build
8.13. Integration with Eclipse
8.14. Advanced usage
9. Project-specific customization
9.1. Recommended directory structure
9.2. Keeping customizations outside of Buildroot
9.3. Storing the Buildroot configuration
9.4. Storing the configuration of other components
9.5. Customizing the generated target filesystem
9.6. Adding custom user accounts
9.7. Customization after the images have been created
9.8. Adding project-specific patches
9.9. Adding project-specific packages
9.10. Quick guide to storing your project-specific customizations
10. Using SELinux in Buildroot
10.1. Enabling SELinux support
10.2. SELinux policy tweaking
11. Frequently Asked Questions & Troubleshooting
11.1. The boot hangs after Starting network…
11.2. Why is there no compiler on the target?
11.3. Why are there no development files on the target?
11.4. Why is there no documentation on the target?
11.5. Why are some packages not visible in the Buildroot config menu?
11.6. Why not use the target directory as a chroot directory?
11.7. Why doesn’t Buildroot generate binary packages (.deb, .ipkg…)?
11.8. How to speed-up the build process?
12. Known issues
13. Legal notice and licensing
13.1. Complying with open source licenses
13.2. Complying with the Buildroot license
14. Beyond Buildroot
14.1. Boot the generated images
14.2. Chroot
III. Developer guide
15. How Buildroot works
16. Coding style
16.1. Config.in file
16.2. The .mk file
16.3. The documentation
16.4. Support scripts
17. Adding support for a particular board
18. Adding new packages to Buildroot
18.1. Package directory
18.2. Config files
18.3. The .mk file
18.4. The .hash file
18.5. Infrastructure for packages with specific build systems
18.6. Infrastructure for autotools-based packages
18.7. Infrastructure for CMake-based packages
18.8. Infrastructure for Python packages
18.9. Infrastructure for LuaRocks-based packages
18.10. Infrastructure for Perl/CPAN packages
18.11. Infrastructure for virtual packages
18.12. Infrastructure for packages using kconfig for configuration files
18.13. Infrastructure for rebar-based packages
18.14. Infrastructure for Waf-based packages
18.15. Infrastructure for Meson-based packages
18.16. Integration of Cargo-based packages
18.17. Infrastructure for Go packages
18.18. Infrastructure for QMake-based packages
18.19. Infrastructure for packages building kernel modules
18.20. Infrastructure for asciidoc documents
18.21. Infrastructure specific to the Linux kernel package
18.22. Hooks available in the various build steps
18.23. Gettext integration and interaction with packages
18.24. Tips and tricks
18.25. Conclusion
19. Patching a package
19.1. Providing patches
19.2. How patches are applied
19.3. Format and licensing of the package patches
19.4. Integrating patches found on the Web
20. Download infrastructure
21. Debugging Buildroot
22. Contributing to Buildroot
22.1. Reproducing, analyzing and fixing bugs
22.2. Analyzing and fixing autobuild failures
22.3. Reviewing and testing patches
22.4. Work on items from the TODO list
22.5. Submitting patches
22.6. Reporting issues/bugs or getting help
22.7. Using the run-tests framework
23. DEVELOPERS file and get-developers
24. Release Engineering
24.1. Releases
24.2. Development
IV. Appendix
25. Makedev syntax documentation
26. Makeusers syntax documentation
27. Migrating from older Buildroot versions
27.1. Migrating to 2016.11
27.2. Migrating to 2017.08

List of Examples

18.1. Config script: divine package
18.2. Config script: imagemagick package:

Buildroot 2021.02.2 manual generated on 2021-05-12 +09:07:43 UTC from git revision 76b4f9e9b6

The Buildroot manual is written by the Buildroot developers. It is licensed under the GNU General Public License, version 2. Refer to the -COPYING +COPYING file in the Buildroot sources for the full text of this license.

Copyright © 2004-2020 The Buildroot developers

logo.png

Part I. Getting started

Chapter 1. About Buildroot

Buildroot is a tool that simplifies and automates the process of building a complete Linux system for an embedded system, using cross-compilation.

In order to achieve this, Buildroot is able to generate a @@ -1709,6 +1709,10 @@ Post-build scripts (BR2_ROOTFS_POST_BUILD_SCRIPT) arguments to each script.

In addition, you may also use these environment variables:

  • BR2_CONFIG: the path to the Buildroot .config file
  • +CONFIG_DIR: the directory containing the .config file, and + therefore the top-level Buildroot Makefile to use (which is + correct for both in-tree and out-of-tree builds) +
  • HOST_DIR, STAGING_DIR, TARGET_DIR: see Section 18.5.2, “generic-package reference”
  • @@ -1809,7 +1813,8 @@ arguments will be passed to the script too. All the scripts will be passed the exact same set of arguments, it is not possible to pass different sets of arguments to each script.

    Again just like for the post-build scripts, the scripts have access to the environment variables BR2_CONFIG, HOST_DIR, STAGING_DIR, -TARGET_DIR, BUILD_DIR, BINARIES_DIR and BASE_DIR.

    The post-image scripts will be executed as the user that executes +TARGET_DIR, BUILD_DIR, BINARIES_DIR, CONFIG_DIR and +BASE_DIR.

    The post-image scripts will be executed as the user that executes Buildroot, which should normally not be the root user. Therefore, any action requiring root permissions in one of these scripts will require special handling (usage of fakeroot or sudo), which is left to the @@ -2962,7 +2967,7 @@ flags. The argument to be given to LIBFOO_CONFIG_SCRIPTS is the file name(s) of the shell script(s) needing fixing. All these names are relative to $(STAGING_DIR)/usr/bin and if needed multiple names can be given.

    In addition, the scripts listed in LIBFOO_CONFIG_SCRIPTS are removed -from $(TARGET_DIR)/usr/bin, since they are not needed on the target.

    Example 18.1. Config script: divine package

    Package divine installs shell script $(STAGING_DIR)/usr/bin/divine-config.

    So its fixup would be:

    DIVINE_CONFIG_SCRIPTS = divine-config

    Example 18.2. Config script: imagemagick package:

    Package imagemagick installs the following scripts: +from $(TARGET_DIR)/usr/bin, since they are not needed on the target.

    Example 18.1. Config script: divine package

    Package divine installs shell script $(STAGING_DIR)/usr/bin/divine-config.

    So its fixup would be:

    DIVINE_CONFIG_SCRIPTS = divine-config

    Example 18.2. Config script: imagemagick package:

    Package imagemagick installs the following scripts: $(STAGING_DIR)/usr/bin/{Magick,Magick++,MagickCore,MagickWand,Wand}-config

    So it’s fixup would be:

    IMAGEMAGICK_CONFIG_SCRIPTS = \
    Magick-config Magick++-config \
    MagickCore-config MagickWand-config Wand-config

    On line 14, we specify the list of dependencies this package relies @@ -5438,7 +5443,7 @@ large number of commits in the series;

  • deep impact of the changes in the rest of the project;
  • -RFC [4]; +RFC [4];
  • whenever you feel it will help presenting your work, your choices, the review process, etc. @@ -5652,7 +5657,7 @@ to trigger all run-test test case jobs: 
 $ git push gitlab HEAD:<name>-runtime-tests
  • to trigger one test case job, a specific branch naming string is used that includes the full test case name. -
 $ git push gitlab HEAD:<name>-<test case name>

[4] RFC: (Request for comments) change proposal

Chapter 23. DEVELOPERS file and get-developers

The main Buildroot directory contains a file named DEVELOPERS that +

 $ git push gitlab HEAD:<name>-<test case name>

[4] RFC: (Request for comments) change proposal

Chapter 23. DEVELOPERS file and get-developers

The main Buildroot directory contains a file named DEVELOPERS that lists the developers involved with various areas of Buildroot. Thanks to this file, the get-developers tool allows to:

  • Calculate the list of developers to whom patches should be sent, by diff --git a/buildroot/docs/manual/manual.pdf b/buildroot/docs/manual/manual.pdf index 3c38a88f5..56028ec41 100644 Binary files a/buildroot/docs/manual/manual.pdf and b/buildroot/docs/manual/manual.pdf differ diff --git a/buildroot/docs/manual/manual.text b/buildroot/docs/manual/manual.text index 32a2f18a8..b96ebc427 100644 --- a/buildroot/docs/manual/manual.text +++ b/buildroot/docs/manual/manual.text @@ -174,13 +174,13 @@ List of Examples --------------------------------------------------------------------- -Buildroot 2021.02.1 manual generated on 2021-04-07 10:22:25 UTC from -git revision 6668381363 +Buildroot 2021.02.2 manual generated on 2021-05-12 09:07:48 UTC from +git revision 76b4f9e9b6 The Buildroot manual is written by the Buildroot developers. It is licensed under the GNU General Public License, version 2. Refer to the COPYING [http://git.buildroot.org/buildroot/tree/COPYING?id= -6668381363364c89d43689322cc5ce4249c8fd9d] file in the Buildroot +76b4f9e9b658d3a4a72266e4aa2e63aa7a3f54f9] file in the Buildroot sources for the full text of this license. Copyright © 2004-2020 The Buildroot developers @@ -2732,6 +2732,9 @@ Post-build scripts (BR2_ROOTFS_POST_BUILD_SCRIPT) In addition, you may also use these environment variables: + BR2_CONFIG: the path to the Buildroot .config file + + CONFIG_DIR: the directory containing the .config file, and + therefore the top-level Buildroot Makefile to use (which is + correct for both in-tree and out-of-tree builds) + HOST_DIR, STAGING_DIR, TARGET_DIR: see Section 18.5.2, “generic-package reference” + BUILD_DIR: the directory where packages are extracted and @@ -2900,7 +2903,7 @@ possible to pass different sets of arguments to each script. Again just like for the post-build scripts, the scripts have access to the environment variables BR2_CONFIG, HOST_DIR, STAGING_DIR, -TARGET_DIR, BUILD_DIR, BINARIES_DIR and BASE_DIR. +TARGET_DIR, BUILD_DIR, BINARIES_DIR, CONFIG_DIR and BASE_DIR. The post-image scripts will be executed as the user that executes Buildroot, which should normally not be the root user. Therefore, any diff --git a/buildroot/linux/Config.in b/buildroot/linux/Config.in index fdfd22889..2eef1f083 100644 --- a/buildroot/linux/Config.in +++ b/buildroot/linux/Config.in @@ -125,7 +125,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "5.10.25" if BR2_LINUX_KERNEL_LATEST_VERSION + default "5.10.35" if BR2_LINUX_KERNEL_LATEST_VERSION default "4.19.182-cip45" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "4.19.165-cip41-rt18" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ diff --git a/buildroot/linux/linux.hash b/buildroot/linux/linux.hash index 0d2db6888..ea0b0bb31 100644 --- a/buildroot/linux/linux.hash +++ b/buildroot/linux/linux.hash @@ -1,11 +1,11 @@ # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 930ae76b9a3b64b98802849aca332d17a706f20595de21e1ae729b55ee461add linux-5.10.25.tar.xz -sha256 1c3cef545f366b56332c11c28d074c9d9148c28059a970ec8710826652237560 linux-5.4.107.tar.xz +sha256 ac37a19d45b77a87e58e3aae8b127a6e7eb85ed7467fc8e58474b387bfd498fd linux-5.10.35.tar.xz +sha256 4e989b5775830092e5c76b5cca65ebff862ad0c87d0b58c3a20d415c3d4ec770 linux-5.4.117.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 d270c529910aefa70f7eeaafe313588b9949cfde33a5553bd4cd1a1249c4e97b linux-4.4.262.tar.xz -sha256 b22e764095362d9e63d76375db838d9372474ba5cbe6132c9a8b07f7533f07ff linux-4.9.262.tar.xz -sha256 7adc041af81424ff8d68affe3005fa9e5babc4e84e0b07e4effdf54225ba9426 linux-4.14.226.tar.xz -sha256 05db750ba01ad557bef50835c253894fad9fb0db2224f0e803b25e2ff7ab2365 linux-4.19.182.tar.xz +sha256 6817ad26e1621bfad48d08b638f66c5933e89c7c8c00d43195b2e0ae260233eb linux-4.4.268.tar.xz +sha256 5b66f6ce0137fb8d81004bcf2f1e3cbe01c38aab74268656c4ba015c1ccd762a linux-4.9.268.tar.xz +sha256 1dc19361f6970bc94cc62be066702483db9cbd3d63f3089a8c90dabfced74369 linux-4.14.232.tar.xz +sha256 6f9c2aee8553129d2bdbab646bbf7e88c2a5c38c0b1450f2e728831681bfc85d linux-4.19.190.tar.xz # Locally computed sha256 9f1de83c5c2bb582a33bd4ee892d45671901cd06af9dc159f0f499f1b5265b20 linux-cip-4.19.182-cip45.tar.gz sha256 0eeba6d6ecc45cf8f16458842b64d22e7064b9de9c31c11d1c395b08a47e3855 linux-cip-4.19.165-cip41-rt18.tar.gz diff --git a/buildroot/package/Makefile.in b/buildroot/package/Makefile.in index 51f5cbce4..f4028bc67 100644 --- a/buildroot/package/Makefile.in +++ b/buildroot/package/Makefile.in @@ -318,6 +318,7 @@ EXTRA_ENV = \ PATH=$(BR_PATH) \ BR2_DL_DIR=$(BR2_DL_DIR) \ BUILD_DIR=$(BUILD_DIR) \ + CONFIG_DIR=$(CONFIG_DIR) \ O=$(CANONICAL_O) ################################################################################ diff --git a/buildroot/package/acl/acl.mk b/buildroot/package/acl/acl.mk index 8dce27415..1591f4c87 100644 --- a/buildroot/package/acl/acl.mk +++ b/buildroot/package/acl/acl.mk @@ -8,6 +8,7 @@ ACL_VERSION = 2.2.53 ACL_SITE = http://download.savannah.gnu.org/releases/acl ACL_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) ACL_LICENSE_FILES = doc/COPYING doc/COPYING.LGPL +ACL_CPE_ID_VENDOR = acl_project ACL_DEPENDENCIES = attr HOST_ACL_DEPENDENCIES = host-attr diff --git a/buildroot/package/automake/automake.mk b/buildroot/package/automake/automake.mk index 89dcaa129..ad8f0f474 100644 --- a/buildroot/package/automake/automake.mk +++ b/buildroot/package/automake/automake.mk @@ -9,6 +9,7 @@ AUTOMAKE_SOURCE = automake-$(AUTOMAKE_VERSION).tar.xz AUTOMAKE_SITE = $(BR2_GNU_MIRROR)/automake AUTOMAKE_LICENSE = GPL-2.0+ AUTOMAKE_LICENSE_FILES = COPYING +AUTOMAKE_CPE_ID_VENDOR = gnu HOST_AUTOMAKE_DEPENDENCIES = host-autoconf diff --git a/buildroot/package/avahi/avahi.mk b/buildroot/package/avahi/avahi.mk index e2b27328c..b71fc189a 100644 --- a/buildroot/package/avahi/avahi.mk +++ b/buildroot/package/avahi/avahi.mk @@ -11,6 +11,10 @@ AVAHI_LICENSE_FILES = LICENSE AVAHI_CPE_ID_VENDOR = avahi AVAHI_INSTALL_STAGING = YES +# CVE-2021-26720 is an issue in avahi-daemon-check-dns.sh, which is +# part of the Debian packaging and not part of upstream avahi +AVAHI_IGNORE_CVES += CVE-2021-26720 + AVAHI_CONF_ENV = \ avahi_cv_sys_cxx_works=yes \ DATADIRNAME=share diff --git a/buildroot/package/bash/bash.mk b/buildroot/package/bash/bash.mk index b4681c108..2e163bb55 100644 --- a/buildroot/package/bash/bash.mk +++ b/buildroot/package/bash/bash.mk @@ -7,11 +7,16 @@ BASH_VERSION = 5.0 BASH_SITE = $(BR2_GNU_MIRROR)/bash BASH_DEPENDENCIES = ncurses readline host-bison -BASH_CONF_OPTS = --with-installed-readline --without-bash-malloc BASH_LICENSE = GPL-3.0+ BASH_LICENSE_FILES = COPYING BASH_CPE_ID_VENDOR = gnu +# We want the bash binary in /bin +BASH_CONF_OPTS = \ + --bindir=/bin \ + --with-installed-readline \ + --without-bash-malloc + BASH_CONF_ENV += \ ac_cv_rl_prefix="$(STAGING_DIR)" \ ac_cv_rl_version="$(READLINE_VERSION)" \ @@ -24,7 +29,6 @@ BASH_CONF_ENV += \ # The static build needs some trickery ifeq ($(BR2_STATIC_LIBS),y) BASH_CONF_OPTS += --enable-static-link -BASH_CONF_ENV += SHOBJ_STATUS=unsupported # bash wants to redefine the getenv() function. To check whether this is # possible, AC_TRY_RUN is used which is not possible in # cross-compilation. @@ -38,11 +42,10 @@ BASH_CONF_ENV += bash_cv_getenv_redef=yes endif endif -define BASH_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ - DESTDIR=$(TARGET_DIR) exec_prefix=/ install +define BASH_REMOVE_UNUSED_FILES rm -f $(TARGET_DIR)/bin/bashbug endef +BASH_POST_INSTALL_TARGET_HOOKS += BASH_REMOVE_UNUSED_FILES # Add /bin/bash to /etc/shells otherwise some login tools like dropbear # can reject the user connection. See man shells. diff --git a/buildroot/package/bind/bind.hash b/buildroot/package/bind/bind.hash index 369d2f5fb..9311d82d6 100644 --- a/buildroot/package/bind/bind.hash +++ b/buildroot/package/bind/bind.hash @@ -1,4 +1,4 @@ -# Verified from https://ftp.isc.org/isc/bind9/9.11.28/bind-9.11.28.tar.gz.asc +# Verified from https://ftp.isc.org/isc/bind9/9.11.31/bind-9.11.31.tar.gz.asc # with key 2455774D42FDFE6B9C383EB8FE1002BC5970811F -sha256 1090cbe6caba37c404d1075887da7e5282ae9a2bc6172d722df15cd480975e74 bind-9.11.28.tar.gz +sha256 f5f24457f42b2e86870d887596e47500e4d40521a098dcb96f3a06f18adfa36a bind-9.11.31.tar.gz sha256 cad49daa42654bc241762cd998630168a2542c8fd6fad3881e2eac1510bb6fcd COPYRIGHT diff --git a/buildroot/package/bind/bind.mk b/buildroot/package/bind/bind.mk index 8e8896f3c..d01a55760 100644 --- a/buildroot/package/bind/bind.mk +++ b/buildroot/package/bind/bind.mk @@ -4,7 +4,7 @@ # ################################################################################ -BIND_VERSION = 9.11.28 +BIND_VERSION = 9.11.31 BIND_SITE = https://ftp.isc.org/isc/bind9/$(BIND_VERSION) # bind does not support parallel builds. BIND_MAKE = $(MAKE1) @@ -13,6 +13,10 @@ BIND_CONFIG_SCRIPTS = bind9-config isc-config.sh BIND_LICENSE = MPL-2.0 BIND_LICENSE_FILES = COPYRIGHT BIND_CPE_ID_VENDOR = isc +# 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 BIND_TARGET_SERVER_SBIN += dnssec-importkey dnssec-keygen dnssec-revoke BIND_TARGET_SERVER_SBIN += dnssec-settime dnssec-verify genrandom diff --git a/buildroot/package/boost/boost.mk b/buildroot/package/boost/boost.mk index b8f90bb83..8d745ecc7 100644 --- a/buildroot/package/boost/boost.mk +++ b/buildroot/package/boost/boost.mk @@ -6,7 +6,7 @@ BOOST_VERSION = 1.75.0 BOOST_SOURCE = boost_$(subst .,_,$(BOOST_VERSION)).tar.bz2 -BOOST_SITE = https://dl.bintray.com/boostorg/release/$(BOOST_VERSION)/source +BOOST_SITE = https://boostorg.jfrog.io/artifactory/main/release/$(BOOST_VERSION)/source BOOST_INSTALL_STAGING = YES BOOST_LICENSE = BSL-1.0 BOOST_LICENSE_FILES = LICENSE_1_0.txt diff --git a/buildroot/package/bridge-utils/0001-fix-build-on-musl.patch b/buildroot/package/bridge-utils/0001-fix-build-on-musl.patch new file mode 100644 index 000000000..1a5d1eb23 --- /dev/null +++ b/buildroot/package/bridge-utils/0001-fix-build-on-musl.patch @@ -0,0 +1,51 @@ +From 1d5a2e0f88e0c53fede03632fa92ffade5e79ac5 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 11 Apr 2021 10:04:59 +0200 +Subject: [PATCH] fix build on musl + +Build on musl is broken since version 1.7.1 and commit +a1f20223cfcf7b9eae8c9e7e7a07e7bf1377f65b: + +libbridge_devif.c: In function 'fpopen': +libbridge_devif.c:33:12: error: 'PATH_MAX' undeclared (first use in this function); did you mean 'AF_MAX'? + 33 | char path[PATH_MAX]; + | ^~~~~~~~ + | AF_MAX + +Fixes: + - http://autobuild.buildroot.org/results/0f080ff6913595ee2732b93206e5001c837c1bcc + +Signed-off-by: Fabrice Fontaine +[Upstream status: sent to Stephen Hemminger ] +--- + libbridge/libbridge_devif.c | 1 + + libbridge/libbridge_init.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/libbridge/libbridge_devif.c b/libbridge/libbridge_devif.c +index 8b7d954..6c679f6 100644 +--- a/libbridge/libbridge_devif.c ++++ b/libbridge/libbridge_devif.c +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff --git a/libbridge/libbridge_init.c b/libbridge/libbridge_init.c +index c914971..83a97cd 100644 +--- a/libbridge/libbridge_init.c ++++ b/libbridge/libbridge_init.c +@@ -20,6 +20,7 @@ + #include + #include + #include ++#include + #include + #include + #include +-- +2.30.2 + diff --git a/buildroot/package/bridge-utils/bridge-utils.hash b/buildroot/package/bridge-utils/bridge-utils.hash index ccf71704b..60cdd1cec 100644 --- a/buildroot/package/bridge-utils/bridge-utils.hash +++ b/buildroot/package/bridge-utils/bridge-utils.hash @@ -1,3 +1,5 @@ +# From https://mirrors.edge.kernel.org/pub/linux/utils/net/bridge-utils/sha256sums.asc +sha256 a61d8be4f1a1405c60c8ef38d544f0c18c05b33b9b07e5b4b31033536165e60e bridge-utils-1.7.1.tar.xz + # locally computed -sha256 4b9b12f31d147320dea931f1041b8a69d84741ddb92cf35ea1f896b67da98b7c bridge-utils-1.7.tar.gz sha256 995a31f60a9ddb4c609214cc7d17ca94cc3cbc7f37e1e64dba81e7f8ea9d4f91 COPYING diff --git a/buildroot/package/bridge-utils/bridge-utils.mk b/buildroot/package/bridge-utils/bridge-utils.mk index 2de5517fc..e8e9a3ca3 100644 --- a/buildroot/package/bridge-utils/bridge-utils.mk +++ b/buildroot/package/bridge-utils/bridge-utils.mk @@ -4,9 +4,9 @@ # ################################################################################ -BRIDGE_UTILS_VERSION = 1.7 -BRIDGE_UTILS_SITE = \ - https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/bridge-utils.git/snapshot +BRIDGE_UTILS_VERSION = 1.7.1 +BRIDGE_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/net/bridge-utils +BRIDGE_UTILS_SOURCE = bridge-utils-$(BRIDGE_UTILS_VERSION).tar.xz BRIDGE_UTILS_AUTORECONF = YES BRIDGE_UTILS_LICENSE = GPL-2.0+ BRIDGE_UTILS_LICENSE_FILES = COPYING diff --git a/buildroot/package/c-periphery/c-periphery.mk b/buildroot/package/c-periphery/c-periphery.mk index dcc82f19c..722679f9f 100644 --- a/buildroot/package/c-periphery/c-periphery.mk +++ b/buildroot/package/c-periphery/c-periphery.mk @@ -9,5 +9,6 @@ C_PERIPHERY_SITE = $(call github,vsergeev,c-periphery,v$(C_PERIPHERY_VERSION)) C_PERIPHERY_INSTALL_STAGING = YES C_PERIPHERY_LICENSE = MIT C_PERIPHERY_LICENSE_FILES = LICENSE +C_PERIPHERY_CPE_ID_VENDOR = c-periphery_project $(eval $(cmake-package)) diff --git a/buildroot/package/cegui/cegui.mk b/buildroot/package/cegui/cegui.mk index d578c9913..23a5859bc 100644 --- a/buildroot/package/cegui/cegui.mk +++ b/buildroot/package/cegui/cegui.mk @@ -72,6 +72,13 @@ else CEGUI_CONF_OPTS += -DCEGUI_HAS_FREETYPE=OFF endif +ifeq ($(BR2_PACKAGE_LIBFRIBIDI),y) +CEGUI_DEPENDENCIES += libfribidi +CEGUI_CONF_OPTS += -DCEGUI_USE_FRIBIDI=ON +else +CEGUI_CONF_OPTS += -DCEGUI_USE_FRIBIDI=OFF +endif + ifeq ($(BR2_PACKAGE_LIBXML2),y) CEGUI_DEPENDENCIES += libxml2 CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_LIBXML2=ON diff --git a/buildroot/package/cgroupfs-mount/cgroupfs-mount.mk b/buildroot/package/cgroupfs-mount/cgroupfs-mount.mk index 9a7679995..acf744205 100644 --- a/buildroot/package/cgroupfs-mount/cgroupfs-mount.mk +++ b/buildroot/package/cgroupfs-mount/cgroupfs-mount.mk @@ -8,6 +8,7 @@ CGROUPFS_MOUNT_VERSION = 1.4 CGROUPFS_MOUNT_SITE = $(call github,tianon,cgroupfs-mount,$(CGROUPFS_MOUNT_VERSION)) CGROUPFS_MOUNT_LICENSE = GPL-3.0+ CGROUPFS_MOUNT_LICENSE_FILES = debian/copyright +CGROUPFS_MOUNT_CPE_ID_VENDOR = cgroupfs-mount_project define CGROUPFS_MOUNT_INSTALL_TARGET_CMDS $(INSTALL) -D -m 0755 $(@D)/cgroupfs-mount $(TARGET_DIR)/usr/bin/cgroupfs-mount diff --git a/buildroot/package/cifs-utils/0001-Use-DESTDIR-when-installing-mount.smb3-and-optionall.patch b/buildroot/package/cifs-utils/0001-Use-DESTDIR-when-installing-mount.smb3-and-optionall.patch deleted file mode 100644 index e36ec5b5d..000000000 --- a/buildroot/package/cifs-utils/0001-Use-DESTDIR-when-installing-mount.smb3-and-optionall.patch +++ /dev/null @@ -1,41 +0,0 @@ -From dbb4452787cb966cc74b2015689961875fd5d668 Mon Sep 17 00:00:00 2001 -From: Ryan Barnett -Date: Mon, 27 Apr 2020 22:03:25 -0500 -Subject: [PATCH] Use DESTDIR when installing mount.smb3 and optionally install - man page - -Properly create mount.smb3 symlink by using DESTDIR. Also use -CONFIG_MAN to optionally install manpage for mount.smb3. - -Signed-off-by: Ryan Barnett ---- -Upstream: https://marc.info/?l=linux-cifs&m=158804444725745&w=2 ---- - Makefile.am | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index fe9cd34..e0587f1 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -119,11 +119,13 @@ endif - SUBDIRS = contrib - - install-exec-hook: -- (cd $(ROOTSBINDIR) && ln -sf mount.cifs mount.smb3) -+ (cd $(DESTDIR)$(ROOTSBINDIR) && ln -sf mount.cifs mount.smb3) - -+if CONFIG_MAN - install-data-hook: -- (cd $(man8dir) && ln -sf mount.cifs.8 mount.smb3.8) -+ (cd $(DESTDIR)$(man8dir) && ln -sf mount.cifs.8 mount.smb3.8) -+endif - - uninstall-hook: -- (cd $(ROOTSBINDIR) && rm -f $(ROOTSBINDIR)/mount.smb3) -- (cd $(man8dir) && rm -f $(man8dir)/mount.smb3.8) -+ rm -f $(DESTDIR)$(ROOTSBINDIR)/mount.smb3 -+ rm -f $(DESTDIR)$(man8dir)/mount.smb3.8 --- -2.17.1 - diff --git a/buildroot/package/cifs-utils/Config.in b/buildroot/package/cifs-utils/Config.in index b433850a1..f15d1e3dc 100644 --- a/buildroot/package/cifs-utils/Config.in +++ b/buildroot/package/cifs-utils/Config.in @@ -13,3 +13,21 @@ config BR2_PACKAGE_CIFS_UTILS split them off into their own package. http://wiki.samba.org/index.php/LinuxCIFS_utils + +if BR2_PACKAGE_CIFS_UTILS + +config BR2_PACKAGE_CIFS_UTILS_SMBTOOLS + bool "smbtools" + depends on BR2_USE_WCHAR # python3 + depends on BR2_TOOLCHAIN_HAS_THREADS # python3 + depends on !BR2_STATIC_LIBS # python3 + select BR2_PACKAGE_PYTHON3 if !BR2_PACKAGE_PYTHON # runtime + help + Install the smb tools smbinfo and smb2-quota (python + implementations). + +comment "smbtools needs a toolchain w/ wchar, threads, dynamic library" + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + BR2_STATIC_LIBS + +endif diff --git a/buildroot/package/cifs-utils/cifs-utils.hash b/buildroot/package/cifs-utils/cifs-utils.hash index ca97eb8e5..566a5c4bf 100644 --- a/buildroot/package/cifs-utils/cifs-utils.hash +++ b/buildroot/package/cifs-utils/cifs-utils.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 b859239a3f204f8220d3e54ed43bf8109e1ef202042dd87ba87492f8878728d9 cifs-utils-6.11.tar.bz2 +sha256 43d8786c8613caccfa84913081c1d62bc2409575854cf895b05b48af0863d056 cifs-utils-6.13.tar.bz2 # Hash for license file: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/cifs-utils/cifs-utils.mk b/buildroot/package/cifs-utils/cifs-utils.mk index 63b454413..b29557cbe 100644 --- a/buildroot/package/cifs-utils/cifs-utils.mk +++ b/buildroot/package/cifs-utils/cifs-utils.mk @@ -4,13 +4,13 @@ # ################################################################################ -CIFS_UTILS_VERSION = 6.11 +CIFS_UTILS_VERSION = 6.13 CIFS_UTILS_SOURCE = cifs-utils-$(CIFS_UTILS_VERSION).tar.bz2 CIFS_UTILS_SITE = http://ftp.samba.org/pub/linux-cifs/cifs-utils CIFS_UTILS_LICENSE = GPL-3.0+ CIFS_UTILS_LICENSE_FILES = COPYING CIFS_UTILS_CPE_ID_VENDOR = samba -# Missing install-sh in release tarball and patching Makefile.am +# Missing install-sh in release tarball CIFS_UTILS_AUTORECONF = YES CIFS_UTILS_DEPENDENCIES = host-pkgconf @@ -31,4 +31,12 @@ endef CIFS_UTILS_POST_PATCH_HOOKS += CIFS_UTILS_NO_WERROR +ifeq ($(BR2_PACKAGE_CIFS_UTILS_SMBTOOLS),) +define CIFS_UTILS_REMOVE_SMBTOOLS + rm -f $(TARGET_DIR)/usr/bin/smbinfo + rm -f $(TARGET_DIR)/usr/bin/smb2-quota +endef +CIFS_UTILS_POST_INSTALL_TARGET_HOOKS += CIFS_UTILS_REMOVE_SMBTOOLS +endif + $(eval $(autotools-package)) diff --git a/buildroot/package/clamav/clamav.hash b/buildroot/package/clamav/clamav.hash index 1b2325870..679240985 100644 --- a/buildroot/package/clamav/clamav.hash +++ b/buildroot/package/clamav/clamav.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 7308c47b89b268af3b9f36140528927a49ff3e633a9c9c0aac2712d81056e257 clamav-0.103.1.tar.gz +sha256 d4b5d0ac666262e423a326fb54778caa7c69624d6c3f9542895feb8478271bd2 clamav-0.103.2.tar.gz sha256 0c4fd2fa9733fc9122503797648710851e4ee6d9e4969dd33fcbd8c63cd2f584 COPYING sha256 d72a145c90918184a05ef65a04c9e6f7466faa59bc1b82c8f6a8ddc7ddcb9bed COPYING.bzip2 sha256 dfb818a0d41411c6fb1c193c68b73018ceadd1994bda41ad541cbff292894bc6 COPYING.file diff --git a/buildroot/package/clamav/clamav.mk b/buildroot/package/clamav/clamav.mk index 4cd13fb82..6ab473ab8 100644 --- a/buildroot/package/clamav/clamav.mk +++ b/buildroot/package/clamav/clamav.mk @@ -4,7 +4,7 @@ # ################################################################################ -CLAMAV_VERSION = 0.103.1 +CLAMAV_VERSION = 0.103.2 CLAMAV_SITE = https://www.clamav.net/downloads/production CLAMAV_LICENSE = GPL-2.0 CLAMAV_LICENSE_FILES = COPYING COPYING.bzip2 COPYING.file COPYING.getopt \ diff --git a/buildroot/package/cmake/cmake.mk b/buildroot/package/cmake/cmake.mk index 1f3073602..90fe868fa 100644 --- a/buildroot/package/cmake/cmake.mk +++ b/buildroot/package/cmake/cmake.mk @@ -9,6 +9,9 @@ CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).5 CMAKE_SITE = https://cmake.org/files/v$(CMAKE_VERSION_MAJOR) CMAKE_LICENSE = BSD-3-Clause CMAKE_LICENSE_FILES = Copyright.txt +CMAKE_CPE_ID_VENDOR = cmake_project +# Tool download MITM attack warning if using npm package to install cmake +CMAKE_IGNORE_CVES = CVE-2016-10642 # CMake is a particular package: # * CMake can be built using the generic infrastructure or the cmake one. diff --git a/buildroot/package/coremark-pro/coremark-pro.mk b/buildroot/package/coremark-pro/coremark-pro.mk index 515b8eafb..e797f6684 100644 --- a/buildroot/package/coremark-pro/coremark-pro.mk +++ b/buildroot/package/coremark-pro/coremark-pro.mk @@ -40,7 +40,7 @@ COREMARK_PRO_MAKE_OPTS += \ EXE= define COREMARK_PRO_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" LD="$(TARGET_CC)" -C $(@D) \ + $(TARGET_MAKE_ENV) $(MAKE1) CC="$(TARGET_CC)" LD="$(TARGET_CC)" -C $(@D) \ $(COREMARK_PRO_MAKE_OPTS) build endef diff --git a/buildroot/package/coreutils/coreutils.mk b/buildroot/package/coreutils/coreutils.mk index 0e75cdfcd..65234a113 100644 --- a/buildroot/package/coreutils/coreutils.mk +++ b/buildroot/package/coreutils/coreutils.mk @@ -10,6 +10,10 @@ COREUTILS_SOURCE = coreutils-$(COREUTILS_VERSION).tar.xz COREUTILS_LICENSE = GPL-3.0+ COREUTILS_LICENSE_FILES = COPYING COREUTILS_CPE_ID_VENDOR = gnu +# Only when including SUSE coreutils-i18n.patch +COREUTILS_IGNORE_CVES = CVE-2013-0221 +COREUTILS_IGNORE_CVES += CVE-2013-0222 +COREUTILS_IGNORE_CVES += CVE-2013-0223 # We're patching m4/pthread-cond.m4 COREUTILS_AUTORECONF = YES diff --git a/buildroot/package/cryptsetup/cryptsetup.mk b/buildroot/package/cryptsetup/cryptsetup.mk index 719885b59..cd5883d0b 100644 --- a/buildroot/package/cryptsetup/cryptsetup.mk +++ b/buildroot/package/cryptsetup/cryptsetup.mk @@ -43,7 +43,8 @@ HOST_CRYPTSETUP_DEPENDENCIES = \ HOST_CRYPTSETUP_CONF_OPTS = --with-crypto_backend=openssl \ --disable-kernel_crypto \ - --enable-blkid + --enable-blkid \ + --with-tmpfilesdir=no $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/buildroot/package/cutelyst/cutelyst.mk b/buildroot/package/cutelyst/cutelyst.mk index 952092245..5313b003a 100644 --- a/buildroot/package/cutelyst/cutelyst.mk +++ b/buildroot/package/cutelyst/cutelyst.mk @@ -18,7 +18,7 @@ CUTELYST_CONF_OPTS += \ # Qt 5.8 needs atomics, which on various architectures are in -latomic ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -CUTELYST_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -latomic" +CUTELYST_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic endif ifeq ($(BR2_PACKAGE_LIBPWQUALITY),y) diff --git a/buildroot/package/dmalloc/0001-add-fpic.patch b/buildroot/package/dmalloc/0001-add-fpic.patch deleted file mode 100644 index 230a9e15f..000000000 --- a/buildroot/package/dmalloc/0001-add-fpic.patch +++ /dev/null @@ -1,58 +0,0 @@ -Without -fPIC, dmalloc does not build with: - -/home/test/mips-4.4/bin/mips-linux-gnu-ld --sysroot=/home/test/outputs/test-35/staging -shared --whole-archive -soname libdmallocxx.so -o libdmallocxx.so.t libdmallocxx.a -/home/test/mips-4.4/bin/mips-linux-gnu-ld: libdmalloc.a(arg_check.o): relocation R_MIPS_HI16 against `_dmalloc_flags' can not be used when making a shared object; recompile with -fPIC -libdmalloc.a(arg_check.o): could not read symbols: Bad value - -This patch, taken from -http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-libs/dmalloc/files/dmalloc-5.2.4-fpic.patch?hideattic=0&view=markup, -fixes the problem by passing the -fPIC flag. It isn't passed through -the ./configure environment in order to not clutter the configuration -cache with incorrect values. - -Signed-off-by: Thomas Petazzoni ---- - Makefile.in | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - ---- a/Makefile.in -+++ b/Makefile.in -@@ -318,17 +318,17 @@ - # special _th versions of objects with the LOCK_THREADS variable defined to 1 - chunk_th.o : $(srcdir)/chunk.c - rm -f $@ -- $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) $(INCS) -DLOCK_THREADS=1 \ -+ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -DLOCK_THREADS=1 \ - -c $(srcdir)/chunk.c -o ./$@ - - error_th.o : $(srcdir)/error.c - rm -f $@ -- $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) $(INCS) -DLOCK_THREADS=1 \ -+ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -DLOCK_THREADS=1 \ - -c $(srcdir)/error.c -o ./$@ - - malloc_th.o : $(srcdir)/malloc.c - rm -f $@ -- $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) $(INCS) -DLOCK_THREADS=1 \ -+ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -DLOCK_THREADS=1 \ - -c $(srcdir)/malloc.c -o ./$@ - - tests : $(TEST) $(TEST_FC) -@@ -360,7 +360,7 @@ - - .c.o : - rm -f $@ -- $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ -+ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ - - # - # .cc.o auto-target doesn't work on some systems. -@@ -368,7 +368,7 @@ - # - dmallocc.o : $(srcdir)/dmallocc.cc - rm -f $@ -- $(CXX) $(CFLAGS) $(CPPFLAGS) $(DEFS) $(INCS) -c $(srcdir)/dmallocc.cc \ -+ $(CXX) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $(srcdir)/dmallocc.cc \ - -o ./$@ - - # diff --git a/buildroot/package/dmalloc/0002-mips.patch b/buildroot/package/dmalloc/0001-mips.patch similarity index 100% rename from buildroot/package/dmalloc/0002-mips.patch rename to buildroot/package/dmalloc/0001-mips.patch diff --git a/buildroot/package/dmalloc/0003-fix-parallel-build.patch b/buildroot/package/dmalloc/0002-fix-parallel-build.patch similarity index 100% rename from buildroot/package/dmalloc/0003-fix-parallel-build.patch rename to buildroot/package/dmalloc/0002-fix-parallel-build.patch diff --git a/buildroot/package/dmalloc/0004-fix-shlibs.patch b/buildroot/package/dmalloc/0003-fix-shlibs.patch similarity index 100% rename from buildroot/package/dmalloc/0004-fix-shlibs.patch rename to buildroot/package/dmalloc/0003-fix-shlibs.patch diff --git a/buildroot/package/dmalloc/0005-fix-strdup.patch b/buildroot/package/dmalloc/0004-fix-strdup.patch similarity index 100% rename from buildroot/package/dmalloc/0005-fix-strdup.patch rename to buildroot/package/dmalloc/0004-fix-strdup.patch diff --git a/buildroot/package/dmalloc/0006-fix-strndup.patch b/buildroot/package/dmalloc/0005-fix-strndup.patch similarity index 100% rename from buildroot/package/dmalloc/0006-fix-strndup.patch rename to buildroot/package/dmalloc/0005-fix-strndup.patch diff --git a/buildroot/package/dmalloc/dmalloc.mk b/buildroot/package/dmalloc/dmalloc.mk index 38b2c0202..638fe0fcd 100644 --- a/buildroot/package/dmalloc/dmalloc.mk +++ b/buildroot/package/dmalloc/dmalloc.mk @@ -16,6 +16,10 @@ DMALLOC_INSTALL_STAGING = YES DMALLOC_CONF_OPTS = --enable-shlib DMALLOC_CFLAGS = $(TARGET_CFLAGS) +ifeq ($(BR2_STATIC_LIBS),) +DMALLOC_CFLAGS += -fPIC +endif + ifeq ($(BR2_INSTALL_LIBSTDCPP),y) DMALLOC_CONF_OPTS += --enable-cxx else diff --git a/buildroot/package/dnsmasq/dnsmasq.hash b/buildroot/package/dnsmasq/dnsmasq.hash index d141fb0c8..2a7cda4a0 100644 --- a/buildroot/package/dnsmasq/dnsmasq.hash +++ b/buildroot/package/dnsmasq/dnsmasq.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.83.tar.xz.asc -sha256 603195c64b73137609b07e1024ae0b37f652b2f5fe467dce66985b3d1850050c dnsmasq-2.84.tar.xz +# https://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.85.tar.xz.asc +sha256 ad98d3803df687e5b938080f3d25c628fe41c878752d03fbc6199787fee312fa dnsmasq-2.85.tar.xz # Locally calculated sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING-v3 diff --git a/buildroot/package/dnsmasq/dnsmasq.mk b/buildroot/package/dnsmasq/dnsmasq.mk index 76b48f952..200675759 100644 --- a/buildroot/package/dnsmasq/dnsmasq.mk +++ b/buildroot/package/dnsmasq/dnsmasq.mk @@ -4,7 +4,7 @@ # ################################################################################ -DNSMASQ_VERSION = 2.84 +DNSMASQ_VERSION = 2.85 DNSMASQ_SOURCE = dnsmasq-$(DNSMASQ_VERSION).tar.xz DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq DNSMASQ_MAKE_ENV = $(TARGET_MAKE_ENV) CC="$(TARGET_CC)" diff --git a/buildroot/package/docker-cli/docker-cli.mk b/buildroot/package/docker-cli/docker-cli.mk index 8607070e1..9c3690e4c 100644 --- a/buildroot/package/docker-cli/docker-cli.mk +++ b/buildroot/package/docker-cli/docker-cli.mk @@ -12,6 +12,9 @@ DOCKER_CLI_LICENSE_FILES = LICENSE DOCKER_CLI_DEPENDENCIES = host-pkgconf +DOCKER_CLI_CPE_ID_VENDOR = docker +DOCKER_CLI_CPE_ID_PRODUCT = docker + DOCKER_CLI_TAGS = autogen DOCKER_CLI_BUILD_TARGETS = cmd/docker DOCKER_CLI_GOMOD = github.com/docker/cli diff --git a/buildroot/package/docker-engine/docker-engine.mk b/buildroot/package/docker-engine/docker-engine.mk index c383ef851..10ecbf603 100644 --- a/buildroot/package/docker-engine/docker-engine.mk +++ b/buildroot/package/docker-engine/docker-engine.mk @@ -13,6 +13,9 @@ DOCKER_ENGINE_LICENSE_FILES = LICENSE DOCKER_ENGINE_DEPENDENCIES = host-pkgconf DOCKER_ENGINE_GOMOD = github.com/docker/docker +DOCKER_ENGINE_CPE_ID_VENDOR = docker +DOCKER_ENGINE_CPE_ID_PRODUCT = docker + DOCKER_ENGINE_LDFLAGS = \ -X $(DOCKER_ENGINE_GOMOD)/dockerversion.BuildTime="" \ -X $(DOCKER_ENGINE_GOMOD)/dockerversion.GitCommit="buildroot" \ diff --git a/buildroot/package/domoticz/0002-Avoid-deprecated-bind-placeholders-in-global-namespace.patch b/buildroot/package/domoticz/0001-Avoid-deprecated-bind-placeholders-in-global-namespace.patch similarity index 100% rename from buildroot/package/domoticz/0002-Avoid-deprecated-bind-placeholders-in-global-namespace.patch rename to buildroot/package/domoticz/0001-Avoid-deprecated-bind-placeholders-in-global-namespace.patch diff --git a/buildroot/package/domoticz/0001-Revert-Updating-CMake-configuration-file-to-use-vers.patch b/buildroot/package/domoticz/0001-Revert-Updating-CMake-configuration-file-to-use-vers.patch deleted file mode 100644 index 5393b0caf..000000000 --- a/buildroot/package/domoticz/0001-Revert-Updating-CMake-configuration-file-to-use-vers.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 2cd95289939b4a7c2576176c7f6268028aa093b2 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 24 May 2019 21:50:16 +0200 -Subject: [PATCH] Revert "Updating CMake configuration file to use - version 3.14 as minimum and added boost dependency targets" - -This reverts commit 4e4ee999c4b323514c0ba81ab1ff3afb10d2f1cd to avoid -bumping host-cmake requirement version from 3.8 to 3.14 in buildroot. - -[Fabrice: Updated for 2020.1] -Signed-off-by: Fabrice Fontaine ---- - CMakeLists.txt | 8 +++----- - 1 file changed, 3 insertions(+), 5 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c5b7832ff..a21f5b87b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,5 +1,5 @@ --#set to minimum version that supports clean build --cmake_minimum_required(VERSION 3.14.0) -+#set to minimum version that supports clean build on cygwin -+cmake_minimum_required(VERSION 2.8.4) - - project(domoticz) - -@@ -583,6 +583,7 @@ set(Boost_USE_STATIC_LIBS ${USE_STATIC_BOOST}) - set(Boost_USE_MULTITHREADED ON) - unset(Boost_INCLUDE_DIR CACHE) - unset(Boost_LIBRARY_DIRS CACHE) -+find_package(Boost REQUIRED COMPONENTS thread system) - - if(USE_STATIC_BOOST) - message(STATUS "Linking against boost static libraries") -@@ -590,16 +591,6 @@ else(USE_STATIC_BOOST) - message(STATUS "Linking against boost dynamic libraries") - endif(USE_STATIC_BOOST) - --find_package(Boost REQUIRED COMPONENTS thread system) --if(Boost_FOUND) -- MESSAGE(STATUS "BOOST libraries found at: ${Boost_LIBRARY_DIRS}") -- MESSAGE(STATUS "Boost includes found at: ${Boost_INCLUDE_DIR}") --else(Boost_FOUND) -- MESSAGE(FATAL_ERROR "Boost thread/system library not found on your system, try to get this installed.") --endif(Boost_FOUND) -- --target_link_libraries(domoticz Boost::thread Boost::system) -- - # compare found vs required libBoost version - if(Boost_VERSION VERSION_LESS DOMO_MIN_LIBBOOST_VERSION) - message(FATAL_ERROR "Found libBoost version ${Boost_VERSION}, ${DOMO_MIN_LIBBOOST_VERSION} or newer required") --- -2.20.1 - diff --git a/buildroot/package/domoticz/0003-Build-failure-with-python-3-9.patch b/buildroot/package/domoticz/0002-Build-failure-with-python-3-9.patch similarity index 100% rename from buildroot/package/domoticz/0003-Build-failure-with-python-3-9.patch rename to buildroot/package/domoticz/0002-Build-failure-with-python-3-9.patch diff --git a/buildroot/package/domoticz/0004-Load-python-3-9-shared-libs.patch b/buildroot/package/domoticz/0003-Load-python-3-9-shared-libs.patch similarity index 100% rename from buildroot/package/domoticz/0004-Load-python-3-9-shared-libs.patch rename to buildroot/package/domoticz/0003-Load-python-3-9-shared-libs.patch diff --git a/buildroot/package/domoticz/Config.in b/buildroot/package/domoticz/Config.in index 88de23264..547ef9f05 100644 --- a/buildroot/package/domoticz/Config.in +++ b/buildroot/package/domoticz/Config.in @@ -11,6 +11,7 @@ config BR2_PACKAGE_DOMOTICZ depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-thread depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # exception_ptr select BR2_PACKAGE_BOOST + select BR2_PACKAGE_BOOST_ATOMIC select BR2_PACKAGE_BOOST_DATE_TIME select BR2_PACKAGE_BOOST_SYSTEM select BR2_PACKAGE_BOOST_THREAD diff --git a/buildroot/package/efl/efl.hash b/buildroot/package/efl/efl.hash index 11e69633b..69008cde2 100644 --- a/buildroot/package/efl/efl.hash +++ b/buildroot/package/efl/efl.hash @@ -1,5 +1,5 @@ -# From https://download.enlightenment.org/rel/libs/efl/efl-1.25.0.tar.xz.sha256sum -sha256 53941f910daf5d1b5162bfdb0dc66f1a04e55a0f2dd7760da0ad63713370956e efl-1.25.0.tar.xz +# From https://download.enlightenment.org/rel/libs/efl/efl-1.25.1.tar.xz.sha256sum +sha256 351ca0211ca000234527a503585f039f985607ec9439e34b49d8b8bbf35a7e6b efl-1.25.1.tar.xz sha256 d666b6b2df9f5b791f85c299c65516cb55528b02a807603de246f65f4918ae22 COMPLIANCE sha256 5bceb52d65debe420bc520f2992807740dc928b7fdc3c2e9a74b5889177ddf4c COPYING diff --git a/buildroot/package/efl/efl.mk b/buildroot/package/efl/efl.mk index d77cb3092..cdb05aa55 100644 --- a/buildroot/package/efl/efl.mk +++ b/buildroot/package/efl/efl.mk @@ -4,7 +4,7 @@ # ################################################################################ -EFL_VERSION = 1.25.0 +EFL_VERSION = 1.25.1 EFL_SOURCE = efl-$(EFL_VERSION).tar.xz EFL_SITE = http://download.enlightenment.org/rel/libs/efl EFL_LICENSE = BSD-2-Clause, LGPL-2.1+, GPL-2.0+, FTL, MIT diff --git a/buildroot/package/exim/exim.hash b/buildroot/package/exim/exim.hash index 265a95c6f..201f09ebd 100644 --- a/buildroot/package/exim/exim.hash +++ b/buildroot/package/exim/exim.hash @@ -1,6 +1,6 @@ # From https://ftp.exim.org/pub/exim/exim4/00-sha256sums.txt -sha256 f77ee8faf04f5db793243c3ae81c1f4e452cd6ad7dd515a80edf755c4b144bdb exim-4.94.tar.xz +sha256 051861fc89f06205162f12129fb7ebfe473383bb6194bf8642952bfd50329274 exim-4.94.2.tar.xz # From https://ftp.exim.org/pub/exim/exim4/00-sha512sums.txt -sha512 3bf95ade30902327403e7308089a3e423761da5b0745397dace7c7fd15ba3838d93e0ee418f1fed57606f79e57b793c7c7407e5c0d526146f0036126d5d95316 exim-4.94.tar.xz +sha512 5334c236221ed4e03dbc33e6a79d939b06037fa2f4b71971607a360b67af5c85a89681ee13a5eeaf0184382c55a160cf2e89ed7afb2949f025a54f1e88f9e3fc exim-4.94.2.tar.xz # Locally calculated sha256 49240db527b7e55b312a46fc59794fde5dd006422e422257f4f057bfd27b3c8f LICENCE diff --git a/buildroot/package/exim/exim.mk b/buildroot/package/exim/exim.mk index 53185c4bb..dd3920846 100644 --- a/buildroot/package/exim/exim.mk +++ b/buildroot/package/exim/exim.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXIM_VERSION = 4.94 +EXIM_VERSION = 4.94.2 EXIM_SOURCE = exim-$(EXIM_VERSION).tar.xz EXIM_SITE = https://ftp.exim.org/pub/exim/exim4 EXIM_LICENSE = GPL-2.0+ diff --git a/buildroot/package/ffmpeg/0004-avformat-mpegts-make-sure-mpegts-read-header-always.patch b/buildroot/package/ffmpeg/0004-avformat-mpegts-make-sure-mpegts-read-header-always.patch deleted file mode 100644 index 75a39d16f..000000000 --- a/buildroot/package/ffmpeg/0004-avformat-mpegts-make-sure-mpegts-read-header-always.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 3136f41e6db8189994a8e4f72eacc92b669776d1 Mon Sep 17 00:00:00 2001 -From: Marton Balint -Date: Sun, 15 Nov 2020 00:39:41 +0100 -Subject: [PATCH] avformat/mpegts: make sure mpegts_read_header always stops at - the first pmt - -mpegts_read_header stops parsing the file at the first PMT. However the check -that ensured this was wrong because streams can also be added before the first -PMT is received (e.g. EIT). - -So let's make sure we are in the header reading phase by checking if ts->pkt is -unset instead of checking if the number of streams found so far is 0. - -Downloaded from Kodi ffmpeg repo: -https://github.com/xbmc/FFmpeg/commit/3136f41e6db8189994a8e4f72eacc92b669776d1 - -Patch was committed upstream: -http://git.videolan.org/?p=ffmpeg.git;a=patch;h=ca55240b8c1fd4cfdb61f88fd2cb378d475d910a - -Signed-off-by: Marton Balint -Signed-off-by: Bernd Kuhls ---- - libavformat/mpegts.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c -index c6fd3e1cef63..1da81a0fe62a 100644 ---- a/libavformat/mpegts.c -+++ b/libavformat/mpegts.c -@@ -2352,7 +2352,7 @@ static void pmt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len - goto out; - - // stop parsing after pmt, we found header -- if (!ts->stream->nb_streams) -+ if (!ts->pkt) - ts->stop_parse = 2; - - set_pmt_found(ts, h->id); diff --git a/buildroot/package/ffmpeg/ffmpeg.hash b/buildroot/package/ffmpeg/ffmpeg.hash index 959a562b8..81dc0d3e6 100644 --- a/buildroot/package/ffmpeg/ffmpeg.hash +++ b/buildroot/package/ffmpeg/ffmpeg.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 ad009240d46e307b4e03a213a0f49c11b650e445b1f8be0dda2a9212b34d2ffb ffmpeg-4.3.1.tar.xz +sha256 46e4e64f1dd0233cbc0934b9f1c0da676008cad34725113fb7f802cfa84ccddb ffmpeg-4.3.2.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPLv2 sha256 b634ab5640e258563c536e658cad87080553df6f34f62269a21d554844e58bfe COPYING.LGPLv2.1 sha256 cb48bf09a11f5fb576cddb0431c8f5ed0a60157a9ec942adffc13907cbe083f2 LICENSE.md diff --git a/buildroot/package/ffmpeg/ffmpeg.mk b/buildroot/package/ffmpeg/ffmpeg.mk index 6d28bfbed..9b79dff48 100644 --- a/buildroot/package/ffmpeg/ffmpeg.mk +++ b/buildroot/package/ffmpeg/ffmpeg.mk @@ -4,7 +4,7 @@ # ################################################################################ -FFMPEG_VERSION = 4.3.1 +FFMPEG_VERSION = 4.3.2 FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.xz FFMPEG_SITE = http://ffmpeg.org/releases FFMPEG_INSTALL_STAGING = YES diff --git a/buildroot/package/flex/flex.mk b/buildroot/package/flex/flex.mk index 2d0096966..85da5ddae 100644 --- a/buildroot/package/flex/flex.mk +++ b/buildroot/package/flex/flex.mk @@ -10,6 +10,9 @@ FLEX_INSTALL_STAGING = YES FLEX_LICENSE = FLEX FLEX_LICENSE_FILES = COPYING FLEX_CPE_ID_VENDOR = flex_project +# bug does not cause stack overflows in the generated code and has been +# noted upstream as a bug in the code generator +FLEX_IGNORE_CVES = CVE-2019-6293 FLEX_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) host-m4 HOST_FLEX_DEPENDENCIES = host-m4 diff --git a/buildroot/package/fmt/fmt.mk b/buildroot/package/fmt/fmt.mk index 000bacfd7..332957982 100644 --- a/buildroot/package/fmt/fmt.mk +++ b/buildroot/package/fmt/fmt.mk @@ -9,6 +9,7 @@ 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_CPE_ID_VENDOR = fmt FMT_INSTALL_STAGING = YES FMT_CONF_OPTS = \ diff --git a/buildroot/package/freescale-imx/imx-vpu/imx-vpu.hash b/buildroot/package/freescale-imx/imx-vpu/imx-vpu.hash index 6ab67510b..e3a53e3fb 100644 --- a/buildroot/package/freescale-imx/imx-vpu/imx-vpu.hash +++ b/buildroot/package/freescale-imx/imx-vpu/imx-vpu.hash @@ -1,4 +1,4 @@ # Locally computed sha256 87cb799a57df654db29403cb74a75ca5185a1517022d3a4a16b8d69056c36127 imx-vpu-5.4.39.3.bin -sha256 69cbb76b3f10ac5a8c36f34df7bbdf50825815560c00a946fff2922365ef01a2 COPYING -sha256 a39da2e94bd8b99eaac4325633854620ea3a55145259c3a7748c610a80714cfc EULA +sha256 2ceab29de5ea533b86f570bcc4e9ddbfb5fe85a1da4978a8613ff3fd9bed781d COPYING +sha256 7ffad92e72e5f6b23027e7cf93a770a4acef00a92dcf79f22701ed401c5478c0 EULA diff --git a/buildroot/package/gcc/10.2.0/0001-arc-Refurbish-adc-sbc-patterns.patch b/buildroot/package/gcc/10.2.0/0001-arc-Refurbish-adc-sbc-patterns.patch deleted file mode 100644 index ed7b000ed..000000000 --- a/buildroot/package/gcc/10.2.0/0001-arc-Refurbish-adc-sbc-patterns.patch +++ /dev/null @@ -1,242 +0,0 @@ -From 09944fba5bfb8e5543ce043c70d08222cf2f97ff 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 -Signed-off-by: Veronika Kremneva ---- - 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 fcb83c4e23e..2daf83dd009 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 d4d9f59a3ea..6c09c86884f 100644 ---- a/gcc/config/arc/arc.md -+++ b/gcc/config/arc/arc.md -@@ -2857,43 +2857,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 -@@ -3025,7 +3007,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; - ") - -@@ -3040,44 +3022,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) --- -2.16.2 - diff --git a/buildroot/package/gcc/10.2.0/0002-Revert-re-PR-target-92095-internal-error-with-O1-mcp.patch b/buildroot/package/gcc/10.3.0/0001-Revert-re-PR-target-92095-internal-error-with-O1-mcp.patch similarity index 93% rename from buildroot/package/gcc/10.2.0/0002-Revert-re-PR-target-92095-internal-error-with-O1-mcp.patch rename to buildroot/package/gcc/10.3.0/0001-Revert-re-PR-target-92095-internal-error-with-O1-mcp.patch index 6f11713c6..af0d2d7d0 100644 --- a/buildroot/package/gcc/10.2.0/0002-Revert-re-PR-target-92095-internal-error-with-O1-mcp.patch +++ b/buildroot/package/gcc/10.3.0/0001-Revert-re-PR-target-92095-internal-error-with-O1-mcp.patch @@ -1,4 +1,4 @@ -From 472472ee0aaccb6389747d6281c34c558bcca7d8 Mon Sep 17 00:00:00 2001 +From 0824d6819857f306583592bce96315893f91bd84 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 20 Jan 2021 23:26:29 +0100 Subject: [PATCH] Revert "re PR target/92095 (internal error with -O1 @@ -16,6 +16,9 @@ the commit that introcuce the regression. Reverting this patch allowed to produce a working rootfs. +Reported to gcc: +https://gcc.gnu.org/bugzilla/show_bug.cgi?id=98784 + Signed-off-by: Romain Naour Cc: Eric Botcazou --- @@ -30,7 +33,7 @@ Cc: Eric Botcazou delete mode 100644 gcc/testsuite/gcc.c-torture/compile/20191108-1.c diff --git a/gcc/config/sparc/sparc-protos.h b/gcc/config/sparc/sparc-protos.h -index f525cd7a422..0d9f47af644 100644 +index 5f9999a669c..37452b06415 100644 --- a/gcc/config/sparc/sparc-protos.h +++ b/gcc/config/sparc/sparc-protos.h @@ -69,7 +69,6 @@ extern void sparc_split_reg_mem (rtx, rtx, machine_mode); @@ -42,10 +45,10 @@ index f525cd7a422..0d9f47af644 100644 extern const char *output_cbranch (rtx, rtx, int, int, int, rtx_insn *); extern const char *output_return (rtx_insn *); diff --git a/gcc/config/sparc/sparc.c b/gcc/config/sparc/sparc.c -index aefced85fe1..3ff6f9200f6 100644 +index d0843102148..14d112d8ca8 100644 --- a/gcc/config/sparc/sparc.c +++ b/gcc/config/sparc/sparc.c -@@ -4192,6 +4192,13 @@ eligible_for_sibcall_delay (rtx_insn *trial) +@@ -4157,6 +4157,13 @@ eligible_for_sibcall_delay (rtx_insn *trial) static bool sparc_cannot_force_const_mem (machine_mode mode, rtx x) { @@ -59,7 +62,7 @@ index aefced85fe1..3ff6f9200f6 100644 switch (GET_CODE (x)) { case CONST_INT: -@@ -4227,11 +4234,9 @@ sparc_cannot_force_const_mem (machine_mode mode, rtx x) +@@ -4192,11 +4199,9 @@ sparc_cannot_force_const_mem (machine_mode mode, rtx x) } /* Global Offset Table support. */ @@ -73,7 +76,7 @@ index aefced85fe1..3ff6f9200f6 100644 /* Return the SYMBOL_REF for the Global Offset Table. */ -@@ -4244,6 +4249,27 @@ sparc_got (void) +@@ -4209,6 +4214,27 @@ sparc_got (void) return got_symbol_rtx; } @@ -101,7 +104,7 @@ index aefced85fe1..3ff6f9200f6 100644 /* Wrapper around the load_pcrel_sym{si,di} patterns. */ static rtx -@@ -4263,78 +4289,30 @@ gen_load_pcrel_sym (rtx op0, rtx op1, rtx op2) +@@ -4228,78 +4254,30 @@ gen_load_pcrel_sym (rtx op0, rtx op1, rtx op2) return insn; } @@ -186,7 +189,7 @@ index aefced85fe1..3ff6f9200f6 100644 } /* Ensure that we are not using patterns that are not OK with PIC. */ -@@ -5499,7 +5477,7 @@ save_local_or_in_reg_p (unsigned int regno, int leaf_function) +@@ -5464,7 +5442,7 @@ save_local_or_in_reg_p (unsigned int regno, int leaf_function) return true; /* GOT register (%l7) if needed. */ @@ -195,7 +198,7 @@ index aefced85fe1..3ff6f9200f6 100644 return true; /* If the function accesses prior frames, the frame pointer and the return -@@ -12542,9 +12520,10 @@ static void +@@ -12507,9 +12485,10 @@ static void sparc_file_end (void) { /* If we need to emit the special GOT helper function, do so now. */ @@ -207,7 +210,7 @@ index aefced85fe1..3ff6f9200f6 100644 #ifdef DWARF2_UNWIND_INFO bool do_cfi; #endif -@@ -12581,22 +12560,17 @@ sparc_file_end (void) +@@ -12546,22 +12525,17 @@ sparc_file_end (void) #ifdef DWARF2_UNWIND_INFO do_cfi = dwarf2out_do_cfi_asm (); if (do_cfi) @@ -236,7 +239,7 @@ index aefced85fe1..3ff6f9200f6 100644 #endif } -@@ -13091,10 +13065,7 @@ sparc_init_pic_reg (void) +@@ -13056,10 +13030,7 @@ sparc_init_pic_reg (void) edge entry_edge; rtx_insn *seq; @@ -249,10 +252,10 @@ index aefced85fe1..3ff6f9200f6 100644 start_sequence (); diff --git a/gcc/config/sparc/sparc.md b/gcc/config/sparc/sparc.md -index 231c0d84778..899804b80ae 100644 +index 6e9ccb4ecfd..8fb0fa11aed 100644 --- a/gcc/config/sparc/sparc.md +++ b/gcc/config/sparc/sparc.md -@@ -1604,7 +1604,10 @@ +@@ -1601,7 +1601,10 @@ (clobber (reg:P O7_REG))] "REGNO (operands[0]) == INTVAL (operands[3])" { @@ -321,5 +324,5 @@ index f00283f6e7b..67d4ac38095 100644 #include #include -- -2.25.4 +2.30.2 diff --git a/buildroot/package/gcc/Config.in.host b/buildroot/package/gcc/Config.in.host index 2ed159314..5b056a934 100644 --- a/buildroot/package/gcc/Config.in.host +++ b/buildroot/package/gcc/Config.in.host @@ -74,7 +74,7 @@ config BR2_GCC_VERSION string default "8.4.0" if BR2_GCC_VERSION_8_X default "9.3.0" if BR2_GCC_VERSION_9_X - default "10.2.0" if BR2_GCC_VERSION_10_X + default "10.3.0" if BR2_GCC_VERSION_10_X default "arc-2020.09-release" if BR2_GCC_VERSION_ARC default "48152afb96c59733d5bc79e3399bb7b3d4b44266" if BR2_GCC_VERSION_CSKY diff --git a/buildroot/package/gcc/gcc.hash b/buildroot/package/gcc/gcc.hash index 2208095a2..566ae09fc 100644 --- a/buildroot/package/gcc/gcc.hash +++ b/buildroot/package/gcc/gcc.hash @@ -2,8 +2,8 @@ sha512 6de904f552a02de33b11ef52312bb664396efd7e1ce3bbe37bfad5ef617f133095b3767b4804bc7fe78df335cb53bc83f1ac055baed40979ce4c2c3e46b70280 gcc-8.4.0.tar.xz # From ftp://gcc.gnu.org/pub/gcc/releases/gcc-9.3.0/sha512.sum sha512 4b9e3639eef6e623747a22c37a904b4750c93b6da77cf3958d5047e9b5ebddb7eebe091cc16ca0a227c0ecbd2bf3b984b221130f269a97ee4cc18f9cf6c444de gcc-9.3.0.tar.xz -# From ftp://gcc.gnu.org/pub/gcc/releases/gcc-10.2.0/sha512.sum -sha512 42ae38928bd2e8183af445da34220964eb690b675b1892bbeb7cd5bb62be499011ec9a93397dba5e2fb681afadfc6f2767d03b9035b44ba9be807187ae6dc65e gcc-10.2.0.tar.xz +# From ftp://gcc.gnu.org/pub/gcc/releases/gcc-10.3.0/sha512.sum +sha512 2b2dd7453d48a398c29eaebd1422b70341001b8c90a62aee51e83344e7fdd8a8e45f82a4a9165bd7edc76dada912c932f4b6632c5636760fec4c5d7e402b3f86 gcc-10.3.0.tar.xz # Locally calculated (fetched from Github) sha512 b0853e2b1c5998044392023fa653e399e74118c46e616504ac59e1a2cf27620f94434767ce06b6cf4ca3dfb57f81d6eda92752befaf095ea5e564a9181b4659c gcc-arc-2020.09-release.tar.gz diff --git a/buildroot/package/genext2fs/0002-allow-changing-ownership-and-permission-of-the-root-.patch b/buildroot/package/genext2fs/0002-allow-changing-ownership-and-permission-of-the-root-.patch new file mode 100644 index 000000000..f0ac24257 --- /dev/null +++ b/buildroot/package/genext2fs/0002-allow-changing-ownership-and-permission-of-the-root-.patch @@ -0,0 +1,36 @@ +From 8e4b9ae6f051454953a80b8e64443bcea6c9cc46 Mon Sep 17 00:00:00 2001 +From: Johannes 'josch' Schauer +Date: Mon, 23 Mar 2020 11:59:25 +0100 +Subject: [PATCH] allow changing ownership and permission of the root node + +Signed-off-by: Peter Korsgaard +--- + genext2fs.c | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/genext2fs.c b/genext2fs.c +index db936e4..af6f519 100644 +--- a/genext2fs.c ++++ b/genext2fs.c +@@ -2193,6 +2193,18 @@ add2fs_from_file(filesystem *fs, uint32 this_nod, FILE * fh, uint32 fs_timestamp + continue; + } + mode &= FM_IMASK; ++ if (fs && strcmp(path, "/") == 0) { ++ // if the entry modifies the root node, don't call ++ // basename and dirname but chmod the root node ++ // directly ++ if (type != 'd') { ++ error_msg("device table line %d skipped: root node must be directory", lineno); ++ continue; ++ } ++ mode |= FM_IFDIR; ++ chmod_fs(fs, this_nod, mode, uid, gid); ++ continue; ++ } + path2 = strdup(path); + name = basename(path); + dir = dirname(path2); +-- +2.20.1 + diff --git a/buildroot/package/gerbera/gerbera.mk b/buildroot/package/gerbera/gerbera.mk index 6e3637779..abb4f3526 100644 --- a/buildroot/package/gerbera/gerbera.mk +++ b/buildroot/package/gerbera/gerbera.mk @@ -22,7 +22,7 @@ GERBERA_CONF_OPTS = \ # Uses __atomic_fetch_add_4 ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -GERBERA_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -latomic" +GERBERA_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic endif ifeq ($(BR2_PACKAGE_EXIV2),y) diff --git a/buildroot/package/go/go.hash b/buildroot/package/go/go.hash index 871ac026e..500ae02cc 100644 --- a/buildroot/package/go/go.hash +++ b/buildroot/package/go/go.hash @@ -1,3 +1,3 @@ # From https://golang.org/dl/ -sha256 f25b2441d4c76cf63cde94d59bab237cc33e8a2a139040d904c8630f46d061e5 go1.15.11.src.tar.gz +sha256 1c6911937df4a277fa74e7b7efc3d08594498c4c4adc0b6c4ae3566137528091 go1.15.12.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/buildroot/package/go/go.mk b/buildroot/package/go/go.mk index d3462e308..639fc401b 100644 --- a/buildroot/package/go/go.mk +++ b/buildroot/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.15.11 +GO_VERSION = 1.15.12 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz diff --git a/buildroot/package/gperf/gperf.mk b/buildroot/package/gperf/gperf.mk index 4b928a0eb..c2f042c46 100644 --- a/buildroot/package/gperf/gperf.mk +++ b/buildroot/package/gperf/gperf.mk @@ -8,6 +8,8 @@ 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)) diff --git a/buildroot/package/gstreamer1/gst1-interpipe/gst1-interpipe.hash b/buildroot/package/gstreamer1/gst1-interpipe/gst1-interpipe.hash index 32a24dc2a..124a2e407 100644 --- a/buildroot/package/gstreamer1/gst1-interpipe/gst1-interpipe.hash +++ b/buildroot/package/gstreamer1/gst1-interpipe/gst1-interpipe.hash @@ -1,5 +1,5 @@ # locally computed hash -sha256 48ad146a57f3543b8c32985b042558bf1fe67abeac9532105ebde0b441564cba gst1-interpipe-v1.1.3-br1.tar.gz +sha256 2fd86aebfe03849a19e9d02db3a8f97bf6f77de835d36ae84282d6f734df323c gst1-interpipe-1.1.4-br1.tar.gz # Hashes for license files: sha256 16d7caa6cabbfd0ca47e064a7b48cb446d013e84ca88c854d6470851752136d5 COPYING diff --git a/buildroot/package/gstreamer1/gst1-interpipe/gst1-interpipe.mk b/buildroot/package/gstreamer1/gst1-interpipe/gst1-interpipe.mk index cc4bc6e94..eb1e6dd53 100644 --- a/buildroot/package/gstreamer1/gst1-interpipe/gst1-interpipe.mk +++ b/buildroot/package/gstreamer1/gst1-interpipe/gst1-interpipe.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_INTERPIPE_VERSION = v1.1.3 +GST1_INTERPIPE_VERSION = 1.1.4 GST1_INTERPIPE_SITE = https://github.com/RidgeRun/gst-interpipe GST1_INTERPIPE_SITE_METHOD = git # fetch gst-interpipe/common sub module diff --git a/buildroot/package/haproxy/haproxy.hash b/buildroot/package/haproxy/haproxy.hash index bea7c4bb2..66a6f40bd 100644 --- a/buildroot/package/haproxy/haproxy.hash +++ b/buildroot/package/haproxy/haproxy.hash @@ -1,5 +1,5 @@ -# From: http://www.haproxy.org/download/2.2/src/haproxy-2.2.13.tar.gz.sha256 -sha256 9e3e51441c70bedfb494fc9d4b4d3389a71be9a3c915ba3d6f7e8fd9a57ce160 haproxy-2.2.13.tar.gz +# From: http://www.haproxy.org/download/2.2/src/haproxy-2.2.14.tar.gz.sha256 +sha256 6a9b702f04b07786f3e5878de8172a727acfdfdbc1cefe1c7a438df372f2fb61 haproxy-2.2.14.tar.gz # Locally computed: sha256 0717ca51fceaa25ac9e5ccc62e0c727dcf27796057201fb5fded56a25ff6ca28 LICENSE sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a doc/lgpl.txt diff --git a/buildroot/package/haproxy/haproxy.mk b/buildroot/package/haproxy/haproxy.mk index 8502ab8a1..6254819a9 100644 --- a/buildroot/package/haproxy/haproxy.mk +++ b/buildroot/package/haproxy/haproxy.mk @@ -5,7 +5,7 @@ ################################################################################ HAPROXY_VERSION_MAJOR = 2.2 -HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).13 +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 diff --git a/buildroot/package/hostapd/0002-ASN.1-Validate-DigestAlgorithmIdentifier-parameters.patch b/buildroot/package/hostapd/0002-ASN.1-Validate-DigestAlgorithmIdentifier-parameters.patch new file mode 100644 index 000000000..5dcfed940 --- /dev/null +++ b/buildroot/package/hostapd/0002-ASN.1-Validate-DigestAlgorithmIdentifier-parameters.patch @@ -0,0 +1,116 @@ +From a0541334a6394f8237a4393b7372693cd7e96f15 Mon Sep 17 00:00:00 2001 +From: Jouni Malinen +Date: Sat, 13 Mar 2021 18:19:31 +0200 +Subject: [PATCH] ASN.1: Validate DigestAlgorithmIdentifier parameters + +The supported hash algorithms do not use AlgorithmIdentifier parameters. +However, there are implementations that include NULL parameters in +addition to ones that omit the parameters. Previous implementation did +not check the parameters value at all which supported both these cases, +but did not reject any other unexpected information. + +Use strict validation of digest algorithm parameters and reject any +unexpected value when validating a signature. This is needed to prevent +potential forging attacks. + +Signed-off-by: Jouni Malinen +Signed-off-by: Peter Korsgaard +--- + src/tls/pkcs1.c | 21 +++++++++++++++++++++ + src/tls/x509v3.c | 20 ++++++++++++++++++++ + 2 files changed, 41 insertions(+) + +diff --git a/src/tls/pkcs1.c b/src/tls/pkcs1.c +index bbdb0d72d..5761dfed0 100644 +--- a/src/tls/pkcs1.c ++++ b/src/tls/pkcs1.c +@@ -244,6 +244,8 @@ int pkcs1_v15_sig_ver(struct crypto_public_key *pk, + os_free(decrypted); + return -1; + } ++ wpa_hexdump(MSG_MSGDUMP, "PKCS #1: DigestInfo", ++ hdr.payload, hdr.length); + + pos = hdr.payload; + end = pos + hdr.length; +@@ -265,6 +267,8 @@ int pkcs1_v15_sig_ver(struct crypto_public_key *pk, + os_free(decrypted); + return -1; + } ++ wpa_hexdump(MSG_MSGDUMP, "PKCS #1: DigestAlgorithmIdentifier", ++ hdr.payload, hdr.length); + da_end = hdr.payload + hdr.length; + + if (asn1_get_oid(hdr.payload, hdr.length, &oid, &next)) { +@@ -273,6 +277,23 @@ int pkcs1_v15_sig_ver(struct crypto_public_key *pk, + os_free(decrypted); + return -1; + } ++ wpa_hexdump(MSG_MSGDUMP, "PKCS #1: Digest algorithm parameters", ++ next, da_end - next); ++ ++ /* ++ * RFC 5754: The correct encoding for the SHA2 algorithms would be to ++ * omit the parameters, but there are implementation that encode these ++ * as a NULL element. Allow these two cases and reject anything else. ++ */ ++ if (da_end > next && ++ (asn1_get_next(next, da_end - next, &hdr) < 0 || ++ !asn1_is_null(&hdr) || ++ hdr.payload + hdr.length != da_end)) { ++ wpa_printf(MSG_DEBUG, ++ "PKCS #1: Unexpected digest algorithm parameters"); ++ os_free(decrypted); ++ return -1; ++ } + + if (!asn1_oid_equal(&oid, hash_alg)) { + char txt[100], txt2[100]; +diff --git a/src/tls/x509v3.c b/src/tls/x509v3.c +index a8944dd2f..df337ec4d 100644 +--- a/src/tls/x509v3.c ++++ b/src/tls/x509v3.c +@@ -1964,6 +1964,7 @@ int x509_check_signature(struct x509_certificate *issuer, + os_free(data); + return -1; + } ++ wpa_hexdump(MSG_MSGDUMP, "X509: DigestInfo", hdr.payload, hdr.length); + + pos = hdr.payload; + end = pos + hdr.length; +@@ -1985,6 +1986,8 @@ int x509_check_signature(struct x509_certificate *issuer, + os_free(data); + return -1; + } ++ wpa_hexdump(MSG_MSGDUMP, "X509: DigestAlgorithmIdentifier", ++ hdr.payload, hdr.length); + da_end = hdr.payload + hdr.length; + + if (asn1_get_oid(hdr.payload, hdr.length, &oid, &next)) { +@@ -1992,6 +1995,23 @@ int x509_check_signature(struct x509_certificate *issuer, + os_free(data); + return -1; + } ++ wpa_hexdump(MSG_MSGDUMP, "X509: Digest algorithm parameters", ++ next, da_end - next); ++ ++ /* ++ * RFC 5754: The correct encoding for the SHA2 algorithms would be to ++ * omit the parameters, but there are implementation that encode these ++ * as a NULL element. Allow these two cases and reject anything else. ++ */ ++ if (da_end > next && ++ (asn1_get_next(next, da_end - next, &hdr) < 0 || ++ !asn1_is_null(&hdr) || ++ hdr.payload + hdr.length != da_end)) { ++ wpa_printf(MSG_DEBUG, ++ "X509: Unexpected digest algorithm parameters"); ++ os_free(data); ++ return -1; ++ } + + if (x509_sha1_oid(&oid)) { + if (signature->oid.oid[6] != 5 /* sha-1WithRSAEncryption */) { +-- +2.20.1 + diff --git a/buildroot/package/hostapd/hostapd.mk b/buildroot/package/hostapd/hostapd.mk index efeefd8b3..8eff92eb1 100644 --- a/buildroot/package/hostapd/hostapd.mk +++ b/buildroot/package/hostapd/hostapd.mk @@ -23,6 +23,9 @@ HOSTAPD_IGNORE_CVES += CVE-2019-16275 # 0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch HOSTAPD_IGNORE_CVES += CVE-2020-12695 +# 0002-ASN.1-Validate-DigestAlgorithmIdentifier-parameters.patch +HOSTAPD_IGNORE_CVES += CVE-2021-30004 + HOSTAPD_CPE_ID_VENDOR = w1.fi HOSTAPD_CONFIG_SET = diff --git a/buildroot/package/i2c-tools/0001-Revert-tools-i2ctransfer-add-check-for-returned-leng.patch b/buildroot/package/i2c-tools/0001-Revert-tools-i2ctransfer-add-check-for-returned-leng.patch new file mode 100644 index 000000000..7173efe21 --- /dev/null +++ b/buildroot/package/i2c-tools/0001-Revert-tools-i2ctransfer-add-check-for-returned-leng.patch @@ -0,0 +1,41 @@ +From 06a1909ae1e8ae1edc70dc48dd22a32ba5eceecb Mon Sep 17 00:00:00 2001 +From: Wolfram Sang +Date: Tue, 9 Feb 2021 12:05:56 +0100 +Subject: [PATCH] Revert "tools: i2ctransfer: add check for returned length + from driver" + +This reverts commit 34806fc4e7090b34e32fa1110d546ab5ce01a6a0. It was +developed against an experimental kernel. The regular kernel does not +update the new message length to userspace, so the check is always false +positive. We can't change the kernel behaviour because it would break +the ABI. So revert this commit. + +Signed-off-by: Wolfram Sang +Signed-off-by: Wolfram Sang +[Peter: drop CHANGES update] +Signed-off-by: Peter Korsgaard +--- + tools/i2ctransfer.c | 7 +------ + 1 file changed, 1 insertions(+), 6 deletions(-) + +diff --git a/tools/i2ctransfer.c b/tools/i2ctransfer.c +index f2a4df8..b0e8d43 100644 +--- a/tools/i2ctransfer.c ++++ b/tools/i2ctransfer.c +@@ -88,12 +88,7 @@ static void print_msgs(struct i2c_msg *msgs, __u32 nmsgs, unsigned flags) + int recv_len = msgs[i].flags & I2C_M_RECV_LEN; + int print_buf = (read && (flags & PRINT_READ_BUF)) || + (!read && (flags & PRINT_WRITE_BUF)); +- __u16 len = msgs[i].len; +- +- if (recv_len && print_buf && len != msgs[i].buf[0] + 1) { +- fprintf(stderr, "Correcting wrong msg length after recv_len! Please fix the I2C driver and/or report.\n"); +- len = msgs[i].buf[0] + 1; +- } ++ __u16 len = recv_len ? msgs[i].buf[0] + 1 : msgs[i].len; + + if (flags & PRINT_HEADER) { + fprintf(output, "msg %u: addr 0x%02x, %s, len ", +-- +2.20.1 + diff --git a/buildroot/package/iproute2/iproute2.mk b/buildroot/package/iproute2/iproute2.mk index 1b71f5c06..3460c5c3b 100644 --- a/buildroot/package/iproute2/iproute2.mk +++ b/buildroot/package/iproute2/iproute2.mk @@ -11,6 +11,7 @@ IPROUTE2_DEPENDENCIES = host-bison host-flex host-pkgconf \ $(if $(BR2_PACKAGE_LIBMNL),libmnl) IPROUTE2_LICENSE = GPL-2.0+ IPROUTE2_LICENSE_FILES = COPYING +IPROUTE2_CPE_ID_VENDOR = iproute2_project ifeq ($(BR2_PACKAGE_ELFUTILS),y) IPROUTE2_DEPENDENCIES += elfutils diff --git a/buildroot/package/iputils/iputils.mk b/buildroot/package/iputils/iputils.mk index 1ee64dabe..715779a63 100644 --- a/buildroot/package/iputils/iputils.mk +++ b/buildroot/package/iputils/iputils.mk @@ -15,6 +15,7 @@ IPUTILS_VERSION = 20210202 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 +IPUTILS_CPE_ID_VENDOR = iputils_project IPUTILS_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) # Selectively build binaries diff --git a/buildroot/package/json-for-modern-cpp/json-for-modern-cpp.mk b/buildroot/package/json-for-modern-cpp/json-for-modern-cpp.mk index 6e21723fd..ffc419e6d 100644 --- a/buildroot/package/json-for-modern-cpp/json-for-modern-cpp.mk +++ b/buildroot/package/json-for-modern-cpp/json-for-modern-cpp.mk @@ -9,6 +9,8 @@ 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 JSON_FOR_MODERN_CPP_LICENSE_FILES = LICENSE.MIT +JSON_FOR_MODERN_CPP_CPE_ID_VENDOR = json-for-modern-cpp_project + JSON_FOR_MODERN_CPP_INSTALL_STAGING = YES # header only library JSON_FOR_MODERN_CPP_INSTALL_TARGET = NO diff --git a/buildroot/package/kexec/0003-kexec-tools-fix-build-on-pre-4.4-kernels.patch b/buildroot/package/kexec/0003-kexec-tools-fix-build-on-pre-4.4-kernels.patch new file mode 100644 index 000000000..fcac604df --- /dev/null +++ b/buildroot/package/kexec/0003-kexec-tools-fix-build-on-pre-4.4-kernels.patch @@ -0,0 +1,34 @@ +From cbbe4c47cb2acae04083c510dbe0efc5f48f5bb6 Mon Sep 17 00:00:00 2001 +From: Federico Pellegrin +Date: Wed, 3 Feb 2021 11:00:17 +0100 +Subject: [PATCH] kexec-tools: fix build on pre 4.4 kernels + +kexec build will fail on older kernels (pre 4.4) as the define +VIDEO_CAPABILITY_64BIT_BASE was not present at that time. + +This patch adds it, as per linux/include/uapi/linux/screen_info.h, +if not present. + +Signed-off-by: Federico Pellegrin +--- + kexec/arch/i386/x86-linux-setup.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/kexec/arch/i386/x86-linux-setup.c b/kexec/arch/i386/x86-linux-setup.c +index 76e1185..ab54a4a 100644 +--- a/kexec/arch/i386/x86-linux-setup.c ++++ b/kexec/arch/i386/x86-linux-setup.c +@@ -37,6 +37,10 @@ + #include "x86-linux-setup.h" + #include "../../kexec/kexec-syscall.h" + ++#ifndef VIDEO_CAPABILITY_64BIT_BASE ++#define VIDEO_CAPABILITY_64BIT_BASE (1 << 1) /* Frame buffer base is 64-bit */ ++#endif ++ + void init_linux_parameters(struct x86_linux_param_header *real_mode) + { + /* Fill in the values that are usually provided by the kernel. */ +-- +2.26.2 + diff --git a/buildroot/package/kf5/kf5-kcoreaddons/Config.in b/buildroot/package/kf5/kf5-kcoreaddons/Config.in index 88fda03ee..02bd38e39 100644 --- a/buildroot/package/kf5/kf5-kcoreaddons/Config.in +++ b/buildroot/package/kf5/kf5-kcoreaddons/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_KF5_KCOREADDONS bool "kf5-kcoreaddons" + depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 select BR2_PACKAGE_KF5_EXTRA_CMAKE_MODULES select BR2_PACKAGE_QT5TOOLS select BR2_PACKAGE_QT5TOOLS_LINGUIST_TOOLS diff --git a/buildroot/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.mk b/buildroot/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.mk index 2a782b35e..81617492c 100644 --- a/buildroot/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.mk +++ b/buildroot/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.mk @@ -15,7 +15,7 @@ KF5_MODEMMANAGER_QT_INSTALL_STAGING = YES # Uses __atomic_fetch_add_4 ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -KF5_MODEMMANAGER_QT_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -latomic" +KF5_MODEMMANAGER_QT_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic endif $(eval $(cmake-package)) diff --git a/buildroot/package/kismet/kismet.mk b/buildroot/package/kismet/kismet.mk index 5445db0b1..3a171af7b 100644 --- a/buildroot/package/kismet/kismet.mk +++ b/buildroot/package/kismet/kismet.mk @@ -18,6 +18,9 @@ KISMET_DEPENDENCIES = \ KISMET_LICENSE = GPL-2.0+ KISMET_LICENSE_FILES = LICENSE KISMET_SELINUX_MODULES = kismet +# Needed because tarball configure has not been rebuilt after +# https://github.com/kismetwireless/kismet/commit/e70968bcbca86dd448d619c40cdeaae8b7dcee98 +KISMET_AUTORECONF = YES KISMET_CONF_OPTS = --disable-debuglibs diff --git a/buildroot/package/kodi/kodi.mk b/buildroot/package/kodi/kodi.mk index 058e75a98..e9110cba9 100644 --- a/buildroot/package/kodi/kodi.mk +++ b/buildroot/package/kodi/kodi.mk @@ -67,7 +67,6 @@ KODI_DEPENDENCIES += host-automake host-autoconf host-libtool KODI_CONF_OPTS += \ -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) $(KODI_C_FLAGS)" \ - -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) $(KODI_CXX_FLAGS)" \ -DENABLE_APP_AUTONAME=OFF \ -DENABLE_CCACHE=OFF \ -DENABLE_DVDCSS=ON \ @@ -165,7 +164,7 @@ endif # mips: uses __atomic_load_8 ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -KODI_CXX_FLAGS += -latomic +KODI_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic endif ifeq ($(BR2_PACKAGE_KODI_PLATFORM_RBPI),y) diff --git a/buildroot/package/libcamera/Config.in b/buildroot/package/libcamera/Config.in index b9c243084..92c17df84 100644 --- a/buildroot/package/libcamera/Config.in +++ b/buildroot/package/libcamera/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_LIBCAMERA_ARCH_SUPPORTS default y # Invalid packing size of ControlValue struct on m68k depends on !BR2_m68k + depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 menuconfig BR2_PACKAGE_LIBCAMERA bool "libcamera" diff --git a/buildroot/package/libcap/libcap.mk b/buildroot/package/libcap/libcap.mk index d3a069e82..79a130b45 100644 --- a/buildroot/package/libcap/libcap.mk +++ b/buildroot/package/libcap/libcap.mk @@ -9,6 +9,7 @@ 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 LIBCAP_LICENSE_FILES = License +LIBCAP_CPE_ID_VENDOR = libcap_project LIBCAP_DEPENDENCIES = host-libcap host-gperf LIBCAP_INSTALL_STAGING = YES diff --git a/buildroot/package/libcgroup/libcgroup.mk b/buildroot/package/libcgroup/libcgroup.mk index a26d5f2dd..e2a936eef 100644 --- a/buildroot/package/libcgroup/libcgroup.mk +++ b/buildroot/package/libcgroup/libcgroup.mk @@ -9,6 +9,7 @@ LIBCGROUP_SOURCE = libcgroup-$(LIBCGROUP_VERSION).tar.bz2 LIBCGROUP_SITE = http://downloads.sourceforge.net/project/libcg/libcgroup/v$(LIBCGROUP_VERSION) LIBCGROUP_LICENSE = LGPL-2.1 LIBCGROUP_LICENSE_FILES = COPYING +LIBCGROUP_CPE_ID_VENDOR = libcgroup_project LIBCGROUP_DEPENDENCIES = host-bison host-flex LIBCGROUP_INSTALL_STAGING = YES diff --git a/buildroot/package/libcurl/libcurl.hash b/buildroot/package/libcurl/libcurl.hash index 1906834e7..9ee98f1e1 100644 --- a/buildroot/package/libcurl/libcurl.hash +++ b/buildroot/package/libcurl/libcurl.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://curl.haxx.se/download/curl-7.76.0.tar.xz.asc +# https://curl.haxx.se/download/curl-7.76.1.tar.xz.asc # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 -sha256 6302e2d75c59cdc6b35ce3fbe716481dd4301841bbb5fd71854653652a014fc8 curl-7.76.0.tar.xz +sha256 64bb5288c39f0840c07d077e30d9052e1cbb9fa6c2dc52523824cc859e679145 curl-7.76.1.tar.xz sha256 6fd1a1c008b5ef4c4741dd188c3f8af6944c14c25afa881eb064f98fb98358e7 COPYING diff --git a/buildroot/package/libcurl/libcurl.mk b/buildroot/package/libcurl/libcurl.mk index b02a92635..f2cfd7289 100644 --- a/buildroot/package/libcurl/libcurl.mk +++ b/buildroot/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 7.76.0 +LIBCURL_VERSION = 7.76.1 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.haxx.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ diff --git a/buildroot/package/libdaemon/libdaemon.mk b/buildroot/package/libdaemon/libdaemon.mk index a8f75108b..cdf0819e6 100644 --- a/buildroot/package/libdaemon/libdaemon.mk +++ b/buildroot/package/libdaemon/libdaemon.mk @@ -8,6 +8,8 @@ LIBDAEMON_VERSION = 0.14 LIBDAEMON_SITE = http://0pointer.de/lennart/projects/libdaemon LIBDAEMON_LICENSE = LGPL-2.1+ LIBDAEMON_LICENSE_FILES = LICENSE +LIBDAEMON_CPE_ID_VENDOR = libdaemon_project + LIBDAEMON_INSTALL_STAGING = YES LIBDAEMON_CONF_ENV = ac_cv_func_setpgrp_void=no LIBDAEMON_CONF_OPTS = --disable-lynx diff --git a/buildroot/package/libdrm/libdrm.mk b/buildroot/package/libdrm/libdrm.mk index 25f848478..8ccbd832d 100644 --- a/buildroot/package/libdrm/libdrm.mk +++ b/buildroot/package/libdrm/libdrm.mk @@ -17,7 +17,7 @@ LIBDRM_DEPENDENCIES = \ LIBDRM_CONF_OPTS = \ -Dcairo-tests=false \ - -Dmanpages=false + -Dman-pages=false ifeq ($(BR2_PACKAGE_LIBATOMIC_OPS),y) LIBDRM_DEPENDENCIES += libatomic_ops diff --git a/buildroot/package/libfreefare/Config.in b/buildroot/package/libfreefare/Config.in index 2bb0c93dd..b330b2256 100644 --- a/buildroot/package/libfreefare/Config.in +++ b/buildroot/package/libfreefare/Config.in @@ -1,12 +1,8 @@ config BR2_PACKAGE_LIBFREEFARE bool "libfreefare" - depends on BR2_TOOLCHAIN_HAS_THREADS # libusb select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_LIBNFC help Library for high level manipulation of MIFARE cards. http://nfc-tools.org/index.php?title=Libfreefare - -comment "libfreefare needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/buildroot/package/libfuse3/libfuse3.hash b/buildroot/package/libfuse3/libfuse3.hash index 9b2f8cc14..49c71f402 100644 --- a/buildroot/package/libfuse3/libfuse3.hash +++ b/buildroot/package/libfuse3/libfuse3.hash @@ -1,3 +1,3 @@ # Locally calculated sha256 checksums -sha256 a16f93cc083264afd0d2958a0dc88f24c6c5d40a9f3842c645b1909e13edb75f libfuse3-3.10.2.tar.gz +sha256 c32527782cef620df58b162aa29901d1fb13253b029375d5860a2253a810344e libfuse3-3.10.3.tar.gz sha256 b8832d9caaa075bbbd2aef24efa09f8b7ab66a832812d88c602da0c7b4397fad LICENSE diff --git a/buildroot/package/libfuse3/libfuse3.mk b/buildroot/package/libfuse3/libfuse3.mk index f805eda50..d61e31339 100644 --- a/buildroot/package/libfuse3/libfuse3.mk +++ b/buildroot/package/libfuse3/libfuse3.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBFUSE3_VERSION = 3.10.2 +LIBFUSE3_VERSION = 3.10.3 LIBFUSE3_SITE = $(call github,libfuse,libfuse,fuse-$(LIBFUSE3_VERSION)) LIBFUSE3_LICENSE = LGPL-2.1 LIBFUSE3_LICENSE_FILES = LICENSE diff --git a/buildroot/package/libgeos/Config.in b/buildroot/package/libgeos/Config.in index bbcafe774..ebe40bd1f 100644 --- a/buildroot/package/libgeos/Config.in +++ b/buildroot/package/libgeos/Config.in @@ -2,8 +2,8 @@ config BR2_PACKAGE_LIBGEOS bool "libgeos" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR - depends on !BR2_nios2 depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_21464 + depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 help GEOS (Geometry Engine - Open Source) is a C++ port of the JTS Topology Suite (JTS). It aims to contain the complete @@ -13,6 +13,7 @@ config BR2_PACKAGE_LIBGEOS https://trac.osgeo.org/geos -comment "libgeos needs a toolchain w/ C++, wchar" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR - depends on !BR2_nios2 || !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_21464 +comment "libgeos needs a toolchain w/ C++, wchar, not binutils bug 21464, 27597" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_21464 || \ + !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 diff --git a/buildroot/package/libgpiod/libgpiod.hash b/buildroot/package/libgpiod/libgpiod.hash index 7b691aaf5..f0803cab3 100644 --- a/buildroot/package/libgpiod/libgpiod.hash +++ b/buildroot/package/libgpiod/libgpiod.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/software/libs/libgpiod/sha256sums.asc -sha256 c601e71846f5ab140c83bc757fdd62a4fda24a9cee39cc5e99c96ec2bf1b06a9 libgpiod-1.6.2.tar.xz +sha256 841be9d788f00bab08ef22c4be5c39866f0e46cb100a3ae49ed816ac9c5dddc7 libgpiod-1.6.3.tar.xz # Hash for license file sha256 ce64d5f7b49ea6d80fdb6d4cdee6839d1a94274f7493dc797c3b55b65ec8e9ed COPYING diff --git a/buildroot/package/libgpiod/libgpiod.mk b/buildroot/package/libgpiod/libgpiod.mk index 201b697c7..35d003fa3 100644 --- a/buildroot/package/libgpiod/libgpiod.mk +++ b/buildroot/package/libgpiod/libgpiod.mk @@ -6,7 +6,7 @@ # Be careful when bumping versions. # Dependency on kernel header versions may change. -LIBGPIOD_VERSION = 1.6.2 +LIBGPIOD_VERSION = 1.6.3 LIBGPIOD_SOURCE = libgpiod-$(LIBGPIOD_VERSION).tar.xz LIBGPIOD_SITE = https://www.kernel.org/pub/software/libs/libgpiod LIBGPIOD_LICENSE = LGPL-2.1+ diff --git a/buildroot/package/libnl/libnl.mk b/buildroot/package/libnl/libnl.mk index 795dfc231..fc9398b29 100644 --- a/buildroot/package/libnl/libnl.mk +++ b/buildroot/package/libnl/libnl.mk @@ -8,6 +8,8 @@ LIBNL_VERSION = 3.5.0 LIBNL_SITE = https://github.com/thom311/libnl/releases/download/libnl$(subst .,_,$(LIBNL_VERSION)) LIBNL_LICENSE = LGPL-2.1+ LIBNL_LICENSE_FILES = COPYING +LIBNL_CPE_ID_VENDOR = libnl_project + LIBNL_INSTALL_STAGING = YES LIBNL_DEPENDENCIES = host-bison host-flex host-pkgconf diff --git a/buildroot/package/libnpupnp/libnpupnp.hash b/buildroot/package/libnpupnp/libnpupnp.hash index ce39db4d8..8451812eb 100644 --- a/buildroot/package/libnpupnp/libnpupnp.hash +++ b/buildroot/package/libnpupnp/libnpupnp.hash @@ -1,5 +1,5 @@ -# Hash from: http://www.lesbonscomptes.com/upmpdcli/downloads/libnpupnp-4.0.14.tar.gz.sha256 -sha256 ea5f5bf388bf8c028a25630c58e9a42762fddd357e7e2581b192856e01aad044 libnpupnp-4.0.14.tar.gz +# Hash from: http://www.lesbonscomptes.com/upmpdcli/downloads/libnpupnp-4.1.4.tar.gz.sha256 +sha256 03506f02546e3b3d31b389e046c4691f020b82d315426ce79f1e2b1eb7958656 libnpupnp-4.1.4.tar.gz # Hash for license file: sha256 c8b99423cad48bb44e2cf52a496361404290865eac259a82da6d1e4331ececb3 COPYING diff --git a/buildroot/package/libnpupnp/libnpupnp.mk b/buildroot/package/libnpupnp/libnpupnp.mk index efffd7f8a..6c6fa2f14 100644 --- a/buildroot/package/libnpupnp/libnpupnp.mk +++ b/buildroot/package/libnpupnp/libnpupnp.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNPUPNP_VERSION = 4.0.14 +LIBNPUPNP_VERSION = 4.1.4 LIBNPUPNP_SITE = http://www.lesbonscomptes.com/upmpdcli/downloads LIBNPUPNP_LICENSE = BSD-3-Clause LIBNPUPNP_LICENSE_FILES = COPYING diff --git a/buildroot/package/libopenssl/Config.in b/buildroot/package/libopenssl/Config.in index 8909e36b9..723fd282a 100644 --- a/buildroot/package/libopenssl/Config.in +++ b/buildroot/package/libopenssl/Config.in @@ -14,10 +14,6 @@ config BR2_PACKAGE_LIBOPENSSL_TARGET_ARCH_LINUX_PPC config BR2_PACKAGE_LIBOPENSSL_TARGET_ARCH string - # Use "gcc" minimalistic target to disable DSO - # no-asm is needed with generic architectures such as gcc, see - # https://github.com/openssl/openssl/issues/9839 - default "gcc no-asm" if BR2_STATIC_LIBS # Doesn't work for thumb-only (Cortex-M?) default "linux-armv4" if BR2_ARM_CPU_HAS_ARM default "linux-aarch64" if BR2_aarch64 diff --git a/buildroot/package/libopenssl/libopenssl.mk b/buildroot/package/libopenssl/libopenssl.mk index a10b64c8f..487fe554c 100644 --- a/buildroot/package/libopenssl/libopenssl.mk +++ b/buildroot/package/libopenssl/libopenssl.mk @@ -25,10 +25,6 @@ LIBOPENSSL_CFLAGS += -mxgot LIBOPENSSL_CFLAGS += -DOPENSSL_SMALL_FOOTPRINT endif -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) -LIBOPENSSL_CFLAGS += -DOPENSSL_THREADS -endif - ifeq ($(BR2_USE_MMU),) LIBOPENSSL_CFLAGS += -DHAVE_FORK=0 -DOPENSSL_NO_MADVISE endif @@ -79,7 +75,7 @@ define LIBOPENSSL_CONFIGURE_CMDS --prefix=/usr \ --openssldir=/etc/ssl \ $(if $(BR2_TOOLCHAIN_HAS_LIBATOMIC),-latomic) \ - $(if $(BR2_TOOLCHAIN_HAS_THREADS),-lpthread threads, no-threads) \ + $(if $(BR2_TOOLCHAIN_HAS_THREADS),threads,no-threads) \ $(if $(BR2_STATIC_LIBS),no-shared,shared) \ $(if $(BR2_PACKAGE_HAS_CRYPTODEV),enable-devcryptoeng) \ no-rc5 \ @@ -89,12 +85,21 @@ define LIBOPENSSL_CONFIGURE_CMDS no-fuzz-libfuzzer \ no-fuzz-afl \ $(if $(BR2_STATIC_LIBS),zlib,zlib-dynamic) \ + $(if $(BR2_STATIC_LIBS),no-dso) \ ) $(SED) "s#-march=[-a-z0-9] ##" -e "s#-mcpu=[-a-z0-9] ##g" $(@D)/Makefile $(SED) "s#-O[0-9sg]#$(LIBOPENSSL_CFLAGS)#" $(@D)/Makefile $(SED) "s# build_tests##" $(@D)/Makefile endef +# libdl is not available in a static build, and this is not implied by no-dso +ifeq ($(BR2_STATIC_LIBS),y) +define LIBOPENSSL_FIXUP_STATIC_MAKEFILE + $(SED) 's#-ldl##g' $(@D)/Makefile +endef +LIBOPENSSL_POST_CONFIGURE_HOOKS += LIBOPENSSL_FIXUP_STATIC_MAKEFILE +endif + define HOST_LIBOPENSSL_BUILD_CMDS $(HOST_MAKE_ENV) $(MAKE) -C $(@D) endef @@ -117,6 +122,16 @@ define LIBOPENSSL_INSTALL_TARGET_CMDS rm -f $(TARGET_DIR)/usr/bin/c_rehash endef +# libdl has no business in a static build +ifeq ($(BR2_STATIC_LIBS),y) +define LIBOPENSSL_FIXUP_STATIC_PKGCONFIG + $(SED) 's#-ldl##' $(STAGING_DIR)/usr/lib/pkgconfig/libcrypto.pc + $(SED) 's#-ldl##' $(STAGING_DIR)/usr/lib/pkgconfig/libssl.pc + $(SED) 's#-ldl##' $(STAGING_DIR)/usr/lib/pkgconfig/openssl.pc +endef +LIBOPENSSL_POST_INSTALL_STAGING_HOOKS += LIBOPENSSL_FIXUP_STATIC_PKGCONFIG +endif + ifeq ($(BR2_PACKAGE_PERL),) define LIBOPENSSL_REMOVE_PERL_SCRIPTS $(RM) -f $(TARGET_DIR)/etc/ssl/misc/{CA.pl,tsget} diff --git a/buildroot/package/libp11/libp11.hash b/buildroot/package/libp11/libp11.hash index bba5c770a..52d73d420 100644 --- a/buildroot/package/libp11/libp11.hash +++ b/buildroot/package/libp11/libp11.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 639ea43c3341e267214b712e1e5e12397fd2d350899e673dd1220f3c6b8e3db4 libp11-0.4.10.tar.gz -sha256 d80c9d084ebfb50ea1ed91bfbc2410d6ce542097a32c43b00781b83adcb8c77f COPYING +sha256 57d47a12a76fd92664ae30032cf969284ebac1dfc25bf824999d74b016d51366 libp11-0.4.11.tar.gz +sha256 d80c9d084ebfb50ea1ed91bfbc2410d6ce542097a32c43b00781b83adcb8c77f COPYING diff --git a/buildroot/package/libp11/libp11.mk b/buildroot/package/libp11/libp11.mk index 90c582571..45a718ee9 100644 --- a/buildroot/package/libp11/libp11.mk +++ b/buildroot/package/libp11/libp11.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBP11_VERSION = 0.4.10 +LIBP11_VERSION = 0.4.11 LIBP11_SITE = https://github.com/OpenSC/libp11/releases/download/libp11-$(LIBP11_VERSION) LIBP11_DEPENDENCIES = openssl host-pkgconf LIBP11_INSTALL_STAGING = YES diff --git a/buildroot/package/libqmi/libqmi.mk b/buildroot/package/libqmi/libqmi.mk index 5bd2aa1ed..a49b8615d 100644 --- a/buildroot/package/libqmi/libqmi.mk +++ b/buildroot/package/libqmi/libqmi.mk @@ -9,6 +9,7 @@ LIBQMI_SITE = http://www.freedesktop.org/software/libqmi LIBQMI_SOURCE = libqmi-$(LIBQMI_VERSION).tar.xz LIBQMI_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (programs) LIBQMI_LICENSE_FILES = COPYING COPYING.LIB +LIBQMI_CPE_ID_VENDOR = libqmi_project LIBQMI_INSTALL_STAGING = YES LIBQMI_DEPENDENCIES = libglib2 diff --git a/buildroot/package/librsync/librsync.hash b/buildroot/package/librsync/librsync.hash index 1b2130b1a..c8ca61e51 100644 --- a/buildroot/package/librsync/librsync.hash +++ b/buildroot/package/librsync/librsync.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 dbd7eb643665691bdf4009174461463737b19b4814b789baad62914cabfe4569 librsync-2.3.1.tar.gz +sha256 ef8ce23df38d5076d25510baa2cabedffbe0af460d887d86c2413a1c2b0c676f librsync-2.3.2.tar.gz sha256 5bbcbb737e60fe9deba08ecbd00920cfcc3403ba2e534c64fdeea49d6bb87509 COPYING diff --git a/buildroot/package/librsync/librsync.mk b/buildroot/package/librsync/librsync.mk index bb36cb657..97f5c607b 100644 --- a/buildroot/package/librsync/librsync.mk +++ b/buildroot/package/librsync/librsync.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBRSYNC_VERSION = 2.3.1 -LIBRSYNC_SITE = $(call github,librsync,librsync,v$(LIBRSYNC_VERSION)) +LIBRSYNC_VERSION = 2.3.2 +LIBRSYNC_SITE = https://github.com/librsync/librsync/releases/download/v$(LIBRSYNC_VERSION) LIBRSYNC_LICENSE = LGPL-2.1+ LIBRSYNC_LICENSE_FILES = COPYING LIBRSYNC_CPE_ID_VENDOR = librsync_project diff --git a/buildroot/package/libtomcrypt/Config.in b/buildroot/package/libtomcrypt/Config.in index a7c5f5001..2459cd21e 100644 --- a/buildroot/package/libtomcrypt/Config.in +++ b/buildroot/package/libtomcrypt/Config.in @@ -8,4 +8,4 @@ config BR2_PACKAGE_LIBTOMCRYPT functions, chaining modes, pseudo-random number generators, public key cryptography and a plethora of other routines. - http://www.libtom.net + https://www.libtom.net diff --git a/buildroot/package/libtomcrypt/libtomcrypt.mk b/buildroot/package/libtomcrypt/libtomcrypt.mk index fccd4b051..35886057d 100644 --- a/buildroot/package/libtomcrypt/libtomcrypt.mk +++ b/buildroot/package/libtomcrypt/libtomcrypt.mk @@ -19,6 +19,10 @@ LIBTOMCRYPT_IGNORE_CVES += CVE-2019-17362 LIBTOMCRYPT_CFLAGS = -I./src/headers $(TARGET_CFLAGS) -DLTC_SOURCE -DLTM_DESC +ifeq ($(BR2_STATIC_LIBS),) +LIBTOMCRYPT_CFLAGS += -fPIC +endif + define LIBTOMCRYPT_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) CFLAGS="$(LIBTOMCRYPT_CFLAGS)" endef diff --git a/buildroot/package/libtool/libtool.mk b/buildroot/package/libtool/libtool.mk index 10af8cf71..6342e70a3 100644 --- a/buildroot/package/libtool/libtool.mk +++ b/buildroot/package/libtool/libtool.mk @@ -7,6 +7,7 @@ LIBTOOL_VERSION = 2.4.6 LIBTOOL_SOURCE = libtool-$(LIBTOOL_VERSION).tar.xz LIBTOOL_SITE = $(BR2_GNU_MIRROR)/libtool +LIBTOOL_CPE_ID_VENDOR = gnu # For the target variant, we only want to build/install libltdl LIBTOOL_SUBDIR = libltdl diff --git a/buildroot/package/libupnp/libupnp.hash b/buildroot/package/libupnp/libupnp.hash index 8923d46f5..e4858fdc8 100644 --- a/buildroot/package/libupnp/libupnp.hash +++ b/buildroot/package/libupnp/libupnp.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 227ffa407be6b91d4e42abee1dd27e4b8d7e5ba8d3d45394cca4e1eadc65149a libupnp-1.14.5.tar.bz2 +sha256 3168f676352e2a6e45afd6ea063721ed674c99f555394903fbd23f7f54f0a503 libupnp-1.14.6.tar.bz2 sha256 c8b99423cad48bb44e2cf52a496361404290865eac259a82da6d1e4331ececb3 COPYING diff --git a/buildroot/package/libupnp/libupnp.mk b/buildroot/package/libupnp/libupnp.mk index f79d169dc..e8ece4654 100644 --- a/buildroot/package/libupnp/libupnp.mk +++ b/buildroot/package/libupnp/libupnp.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUPNP_VERSION = 1.14.5 +LIBUPNP_VERSION = 1.14.6 LIBUPNP_SOURCE = libupnp-$(LIBUPNP_VERSION).tar.bz2 LIBUPNP_SITE = \ http://downloads.sourceforge.net/project/pupnp/release-$(LIBUPNP_VERSION) diff --git a/buildroot/package/linux-headers/Config.in.host b/buildroot/package/linux-headers/Config.in.host index caf8af67a..dd521b4cb 100644 --- a/buildroot/package/linux-headers/Config.in.host +++ b/buildroot/package/linux-headers/Config.in.host @@ -346,12 +346,12 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.4.262" if BR2_KERNEL_HEADERS_4_4 - default "4.9.262" if BR2_KERNEL_HEADERS_4_9 - default "4.14.226" if BR2_KERNEL_HEADERS_4_14 - default "4.19.182" if BR2_KERNEL_HEADERS_4_19 - default "5.4.107" if BR2_KERNEL_HEADERS_5_4 - default "5.10.25" if BR2_KERNEL_HEADERS_5_10 + default "4.4.268" if BR2_KERNEL_HEADERS_4_4 + default "4.9.268" if BR2_KERNEL_HEADERS_4_9 + default "4.14.232" if BR2_KERNEL_HEADERS_4_14 + default "4.19.190" if BR2_KERNEL_HEADERS_4_19 + default "5.4.117" if BR2_KERNEL_HEADERS_5_4 + default "5.10.35" if BR2_KERNEL_HEADERS_5_10 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/buildroot/package/localedef/2.32-23-g050022910be1d1f5c11cd5168f1685ad4f9580d2/0001-HACK-only-build-and-install-localedef.patch b/buildroot/package/localedef/2.32-37-g760e1d287825fa91d4d5a0cc921340c740d803e2/0001-HACK-only-build-and-install-localedef.patch similarity index 100% rename from buildroot/package/localedef/2.32-23-g050022910be1d1f5c11cd5168f1685ad4f9580d2/0001-HACK-only-build-and-install-localedef.patch rename to buildroot/package/localedef/2.32-37-g760e1d287825fa91d4d5a0cc921340c740d803e2/0001-HACK-only-build-and-install-localedef.patch diff --git a/buildroot/package/localedef/2.32-23-g050022910be1d1f5c11cd5168f1685ad4f9580d2/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch b/buildroot/package/localedef/2.32-37-g760e1d287825fa91d4d5a0cc921340c740d803e2/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch similarity index 100% rename from buildroot/package/localedef/2.32-23-g050022910be1d1f5c11cd5168f1685ad4f9580d2/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch rename to buildroot/package/localedef/2.32-37-g760e1d287825fa91d4d5a0cc921340c740d803e2/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch diff --git a/buildroot/package/localedef/2.32-23-g050022910be1d1f5c11cd5168f1685ad4f9580d2/localedef.hash b/buildroot/package/localedef/2.32-37-g760e1d287825fa91d4d5a0cc921340c740d803e2/localedef.hash similarity index 72% rename from buildroot/package/localedef/2.32-23-g050022910be1d1f5c11cd5168f1685ad4f9580d2/localedef.hash rename to buildroot/package/localedef/2.32-37-g760e1d287825fa91d4d5a0cc921340c740d803e2/localedef.hash index 45ecc2895..b1d5243fc 100644 --- a/buildroot/package/localedef/2.32-23-g050022910be1d1f5c11cd5168f1685ad4f9580d2/localedef.hash +++ b/buildroot/package/localedef/2.32-37-g760e1d287825fa91d4d5a0cc921340c740d803e2/localedef.hash @@ -1,5 +1,5 @@ # Locally calculated (fetched from Github) -sha256 04946bb7cbaf4062bf5e727e0d6784e105b07611587d71f00d25ea896753c26d glibc-2.32-23-g050022910be1d1f5c11cd5168f1685ad4f9580d2.tar.gz +sha256 f4710e9a435a7b83e1d23dd75434f0d36b898eba9b4249c946c32b467d852fd4 glibc-2.32-37-g760e1d287825fa91d4d5a0cc921340c740d803e2.tar.gz # Hashes for license files sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/localedef/localedef.mk b/buildroot/package/localedef/localedef.mk index d75702d84..57ab5a345 100644 --- a/buildroot/package/localedef/localedef.mk +++ b/buildroot/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.32-23-g050022910be1d1f5c11cd5168f1685ad4f9580d2 +LOCALEDEF_VERSION = 2.32-37-g760e1d287825fa91d4d5a0cc921340c740d803e2 LOCALEDEF_SOURCE = glibc-$(LOCALEDEF_VERSION).tar.gz LOCALEDEF_SITE = $(call github,bminor,glibc,$(LOCALEDEF_VERSION)) HOST_LOCALEDEF_DL_SUBDIR = glibc diff --git a/buildroot/package/lvm2/lvm2.hash b/buildroot/package/lvm2/lvm2.hash index 3d560c4be..9a581527e 100644 --- a/buildroot/package/lvm2/lvm2.hash +++ b/buildroot/package/lvm2/lvm2.hash @@ -1,4 +1,4 @@ -# From ftp://sources.redhat.com/pub/lvm2/sha512.sum +# From http://sources.redhat.com/pub/lvm2/sha512.sum sha512 f421505551aec2a09bc862f2fcc1ee825bc4d94c53a01d13265631e99308d60fbca40112be5bc7824cce3ef223c0775d2f6c345f6a3f227229a0566c903841bf LVM2.2.02.185.tgz # Locally computed sha256 checksums sha256 e76fbcd2fb97cf202da330301327754d2db5c58b5b4bebd3a8a749393e7603d1 COPYING diff --git a/buildroot/package/lvm2/lvm2.mk b/buildroot/package/lvm2/lvm2.mk index 76f800a15..653e72c72 100644 --- a/buildroot/package/lvm2/lvm2.mk +++ b/buildroot/package/lvm2/lvm2.mk @@ -6,7 +6,7 @@ LVM2_VERSION = 2.02.185 LVM2_SOURCE = LVM2.$(LVM2_VERSION).tgz -LVM2_SITE = ftp://sources.redhat.com/pub/lvm2 +LVM2_SITE = http://sources.redhat.com/pub/lvm2 LVM2_INSTALL_STAGING = YES LVM2_LICENSE = GPL-2.0, LGPL-2.1 LVM2_LICENSE_FILES = COPYING COPYING.LIB diff --git a/buildroot/package/lxc/lxc.hash b/buildroot/package/lxc/lxc.hash index 4cecf6b0f..85cdecceb 100644 --- a/buildroot/package/lxc/lxc.hash +++ b/buildroot/package/lxc/lxc.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 af2cd616d5ab689e5d2305361c6571b5e632afd7eaab1754cca1670446a2e6a4 lxc-4.0.5.tar.gz +sha256 9165dabc0bb6ef7f2fda2009aee90b20fbefe77ed8008347e9f06048eba1e463 lxc-4.0.6.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 diff --git a/buildroot/package/lxc/lxc.mk b/buildroot/package/lxc/lxc.mk index 576036e24..24a1f3c58 100644 --- a/buildroot/package/lxc/lxc.mk +++ b/buildroot/package/lxc/lxc.mk @@ -4,7 +4,7 @@ # ################################################################################ -LXC_VERSION = 4.0.5 +LXC_VERSION = 4.0.6 LXC_SITE = https://linuxcontainers.org/downloads/lxc LXC_LICENSE = GPL-2.0 (some tools), LGPL-2.1+ LXC_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 diff --git a/buildroot/package/m4/0003-c-stack-stop-using-SIGSTKSZ.patch b/buildroot/package/m4/0003-c-stack-stop-using-SIGSTKSZ.patch new file mode 100644 index 000000000..f262fc818 --- /dev/null +++ b/buildroot/package/m4/0003-c-stack-stop-using-SIGSTKSZ.patch @@ -0,0 +1,106 @@ +c-stack: stop using SIGSTKSZ + +It’s been proposed to stop making SIGSTKSZ an integer constant: +https://sourceware.org/pipermail/libc-alpha/2020-September/118028.html +Also, using SIGSTKSZ in #if did not conform to current POSIX. +Also, avoiding SIGSTKSZ makes the code simpler and easier to grok. +* lib/c-stack.c (SIGSTKSZ): Remove. +(alternate_signal_stack): Now a 64 KiB array, for simplicity. +All uses changed. + +[Retrieved (and backported) from: +https://git.savannah.gnu.org/cgit/gnulib.git/patch/?id=f9e2b20a12a230efa30f1d479563ae07d276a94b] +Signed-off-by: Fabrice Fontaine + +diff -Nura m4-1.4.18.orig/lib/c-stack.c m4-1.4.18/lib/c-stack.c +--- m4-1.4.18.orig/lib/c-stack.c 2021-04-11 19:12:14.086494029 +0200 ++++ m4-1.4.18/lib/c-stack.c 2021-04-11 19:48:46.316862760 +0200 +@@ -50,15 +50,16 @@ + #if ! HAVE_STACK_T && ! defined stack_t + typedef struct sigaltstack stack_t; + #endif +-#ifndef SIGSTKSZ +-# define SIGSTKSZ 16384 +-#elif HAVE_LIBSIGSEGV && SIGSTKSZ < 16384 +-/* libsigsegv 2.6 through 2.8 have a bug where some architectures use +- more than the Linux default of an 8k alternate stack when deciding +- if a fault was caused by stack overflow. */ +-# undef SIGSTKSZ +-# define SIGSTKSZ 16384 +-#endif ++ ++/* Storage for the alternate signal stack. ++ 64 KiB is not too large for Gnulib-using apps, and is large enough ++ for all known platforms. Smaller sizes may run into trouble. ++ For example, libsigsegv 2.6 through 2.8 have a bug where some ++ architectures use more than the Linux default of an 8 KiB alternate ++ stack when deciding if a fault was caused by stack overflow. */ ++static max_align_t alternate_signal_stack[(64 * 1024 ++ + sizeof (max_align_t) - 1) ++ / sizeof (max_align_t)]; + + #include + #include +@@ -128,19 +129,6 @@ + #if (HAVE_SIGALTSTACK && HAVE_DECL_SIGALTSTACK \ + && HAVE_STACK_OVERFLOW_HANDLING) || HAVE_LIBSIGSEGV + +-/* Storage for the alternate signal stack. */ +-static union +-{ +- char buffer[SIGSTKSZ]; +- +- /* These other members are for proper alignment. There's no +- standard way to guarantee stack alignment, but this seems enough +- in practice. */ +- long double ld; +- long l; +- void *p; +-} alternate_signal_stack; +- + static void + null_action (int signo __attribute__ ((unused))) + { +@@ -205,8 +193,8 @@ + + /* Always install the overflow handler. */ + if (stackoverflow_install_handler (overflow_handler, +- alternate_signal_stack.buffer, +- sizeof alternate_signal_stack.buffer)) ++ alternate_signal_stack, ++ sizeof alternate_signal_stack)) + { + errno = ENOTSUP; + return -1; +@@ -279,14 +267,14 @@ + stack_t st; + struct sigaction act; + st.ss_flags = 0; ++ st.ss_sp = alternate_signal_stack; ++ st.ss_size = sizeof alternate_signal_stack; + # if SIGALTSTACK_SS_REVERSED + /* Irix mistakenly treats ss_sp as the upper bound, rather than + lower bound, of the alternate stack. */ +- st.ss_sp = alternate_signal_stack.buffer + SIGSTKSZ - sizeof (void *); +- st.ss_size = sizeof alternate_signal_stack.buffer - sizeof (void *); +-# else +- st.ss_sp = alternate_signal_stack.buffer; +- st.ss_size = sizeof alternate_signal_stack.buffer; ++ st.ss_size -= sizeof (void *); ++ char *ss_sp = st.ss_sp; ++ st.ss_sp = ss_sp + st.ss_size; + # endif + r = sigaltstack (&st, NULL); + if (r != 0) +diff -Nura m4-1.4.18.orig/lib/c-stack.h m4-1.4.18/lib/c-stack.h +--- m4-1.4.18.orig/lib/c-stack.h 2021-04-11 19:12:14.098494042 +0200 ++++ m4-1.4.18/lib/c-stack.h 2021-04-11 19:17:42.138848378 +0200 +@@ -34,7 +34,7 @@ + A null ACTION acts like an action that does nothing. + + ACTION must be async-signal-safe. ACTION together with its callees +- must not require more than SIGSTKSZ bytes of stack space. Also, ++ must not require more than 64 KiB bytes of stack space. Also, + ACTION should not call longjmp, because this implementation does + not guarantee that it is safe to return to the original stack. + diff --git a/buildroot/package/make/make.mk b/buildroot/package/make/make.mk index 10082353a..f289c5c3d 100644 --- a/buildroot/package/make/make.mk +++ b/buildroot/package/make/make.mk @@ -10,6 +10,8 @@ MAKE_SITE = $(BR2_GNU_MIRROR)/make MAKE_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) host-pkgconf MAKE_LICENSE = GPL-3.0+ MAKE_LICENSE_FILES = COPYING +MAKE_CPE_ID_VENDOR = gnu + # Patching configure.ac MAKE_AUTORECONF = YES diff --git a/buildroot/package/makedevs/makedevs.mk b/buildroot/package/makedevs/makedevs.mk index 36837a191..9b0f44610 100644 --- a/buildroot/package/makedevs/makedevs.mk +++ b/buildroot/package/makedevs/makedevs.mk @@ -15,8 +15,12 @@ HOST_MAKEDEVS_CFLAGS += -DEXTENDED_ATTRIBUTES HOST_MAKEDEVS_LDFLAGS += -lcap endif +define HOST_MAKEDEVS_EXTRACT_CMDS + cp $(HOST_MAKEDEVS_PKGDIR)/makedevs.c $(@D) +endef + define HOST_MAKEDEVS_BUILD_CMDS - $(HOSTCC) $(HOST_MAKEDEVS_CFLAGS) package/makedevs/makedevs.c \ + $(HOSTCC) $(HOST_MAKEDEVS_CFLAGS) $(@D)/makedevs.c \ -o $(@D)/makedevs $(HOST_MAKEDEVS_LDFLAGS) endef diff --git a/buildroot/package/mender/mender.mk b/buildroot/package/mender/mender.mk index b79f196a6..0224e84a4 100644 --- a/buildroot/package/mender/mender.mk +++ b/buildroot/package/mender/mender.mk @@ -76,14 +76,6 @@ endef MENDER_POST_INSTALL_TARGET_HOOKS += MENDER_INSTALL_CONFIG_FILES -ifeq ($(BR2_PACKAGE_DBUS),y) -define MENDER_INSTALL_DBUS_AUTHENTICATION_MANAGER_CONF - $(INSTALL) -D -m 0755 $(@D)/support/dbus/io.mender.AuthenticationManager.conf \ - $(TARGET_DIR)/etc/dbus-1/system.d/io.mender.AuthenticationManager.conf -endef -MENDER_POST_INSTALL_TARGET_HOOKS += MENDER_INSTALL_DBUS_AUTHENTICATION_MANAGER_CONF -endif - define MENDER_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 $(MENDER_PKGDIR)/mender-client.service \ $(TARGET_DIR)/usr/lib/systemd/system/mender-client.service diff --git a/buildroot/package/mesa3d-headers/mesa3d-headers.mk b/buildroot/package/mesa3d-headers/mesa3d-headers.mk index 6e2f0b5a7..5deea5f97 100644 --- a/buildroot/package/mesa3d-headers/mesa3d-headers.mk +++ b/buildroot/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 = 20.3.4 +MESA3D_HEADERS_VERSION = 20.3.5 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://mesa.freedesktop.org/archive MESA3D_HEADERS_DL_SUBDIR = mesa3d diff --git a/buildroot/package/mesa3d/mesa3d.hash b/buildroot/package/mesa3d/mesa3d.hash index e7b375440..3d357582f 100644 --- a/buildroot/package/mesa3d/mesa3d.hash +++ b/buildroot/package/mesa3d/mesa3d.hash @@ -1,6 +1,6 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2021-January/000618.html -sha256 dc21a987ec1ff45b278fe4b1419b1719f1968debbb80221480e44180849b4084 mesa-20.3.4.tar.xz -sha512 81c4d032213b4aef842f1594e0e89bc0045f7ca7ce5f267b62a0f8236eb12ab09c1f780d8b3776b3072f37cd0bd8829f8a1330a749ccf462471b262ef8097477 mesa-20.3.4.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2021-March/000623.html +sha256 909a72df63dfa3c0844ccf44a26ac028d148297ed333ab51560893923d7691ce mesa-20.3.5.tar.xz +sha512 481e710ed80d8f215a8d541cfe51b960862c2403c2b9e7e6932c8236b8decb5d478871d6c73559d6d795ada143803764f3a93b2329588c80f62e2e5ec98c78a9 mesa-20.3.5.tar.xz # License sha256 1361129baa4519b6ed27a1bf4aeee33a58b060bf7bb9b6ea415ecede04e35e46 docs/license.rst diff --git a/buildroot/package/mesa3d/mesa3d.mk b/buildroot/package/mesa3d/mesa3d.mk index 5105727e8..c9a7214aa 100644 --- a/buildroot/package/mesa3d/mesa3d.mk +++ b/buildroot/package/mesa3d/mesa3d.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 20.3.4 +MESA3D_VERSION = 20.3.5 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://mesa.freedesktop.org/archive MESA3D_LICENSE = MIT, SGI, Khronos diff --git a/buildroot/package/mkpasswd/mkpasswd.mk b/buildroot/package/mkpasswd/mkpasswd.mk index b01339057..c1117ef65 100644 --- a/buildroot/package/mkpasswd/mkpasswd.mk +++ b/buildroot/package/mkpasswd/mkpasswd.mk @@ -9,9 +9,13 @@ # at revision 5a0f08500fa51608b6d3b73ee338be38c692eadb HOST_MKPASSWD_LICENSE = GPL-2.0+ +define HOST_MKPASSWD_EXTRACT_CMDS + cp $(HOST_MKPASSWD_PKGDIR)/*.c $(HOST_MKPASSWD_PKGDIR)/*.h $(@D) +endef + define HOST_MKPASSWD_BUILD_CMDS $(HOSTCC) $(HOST_CFLAGS) $(HOST_LDFLAGS) \ - package/mkpasswd/mkpasswd.c package/mkpasswd/utils.c \ + $(@D)/mkpasswd.c $(@D)/utils.c \ -o $(@D)/mkpasswd -lcrypt endef diff --git a/buildroot/package/mkpimage/mkpimage.mk b/buildroot/package/mkpimage/mkpimage.mk index 8e08013f9..71500f00f 100644 --- a/buildroot/package/mkpimage/mkpimage.mk +++ b/buildroot/package/mkpimage/mkpimage.mk @@ -9,9 +9,13 @@ HOST_MKPIMAGE_LICENSE = GPL-2.0 # source included in the package # came from barebox's repository: # https://git.pengutronix.de/cgit/barebox/tree/scripts/socfpga_mkimage.c?id=55d29525146dcd280987dfd565bfd34f08858fb3 +define HOST_MKPIMAGE_EXTRACT_CMDS + cp $(HOST_MKPIMAGE_PKGDIR)/mkpimage.c $(@D) +endef + define HOST_MKPIMAGE_BUILD_CMDS $(HOSTCC) $(HOST_CFLAGS) $(HOST_LDFLAGS) \ - package/mkpimage/mkpimage.c -o $(@D)/mkpimage + $(@D)/mkpimage.c -o $(@D)/mkpimage endef define HOST_MKPIMAGE_INSTALL_CMDS diff --git a/buildroot/package/modem-manager/modem-manager.mk b/buildroot/package/modem-manager/modem-manager.mk index 47d4eed82..2486e4eaf 100644 --- a/buildroot/package/modem-manager/modem-manager.mk +++ b/buildroot/package/modem-manager/modem-manager.mk @@ -34,6 +34,13 @@ else MODEM_MANAGER_CONF_OPTS += --without-mbim endif +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +MODEM_MANAGER_DEPENDENCIES += gobject-introspection +MODEM_MANAGER_CONF_OPTS += --enable-introspection +else +MODEM_MANAGER_CONF_OPTS += --disable-introspection +endif + define MODEM_MANAGER_INSTALL_INIT_SYSV $(INSTALL) -m 0755 -D package/modem-manager/S44modem-manager \ $(TARGET_DIR)/etc/init.d/S44modem-manager diff --git a/buildroot/package/monkey/monkey.hash b/buildroot/package/monkey/monkey.hash index 83fc0def6..27ff80644 100644 --- a/buildroot/package/monkey/monkey.hash +++ b/buildroot/package/monkey/monkey.hash @@ -1,4 +1,3 @@ -# md5 from http://monkey-project.com/releases/1.6/monkey-1.6.9.tar.gz.md5, sha256 locally computed: -md5 c401734985a936ee07dbff5eca7d176a monkey-1.6.9.tar.gz -sha256 f1122e89cda627123286542b0a18fcaa131cbe9d4f5dd897d9455157289148fb monkey-1.6.9.tar.gz -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE +# Locally computed: +sha256 c988d9f4f577a789aa244e5a0f99ebfd46ebddc328656f319acf64edc9fd5199 monkey-f54856ce250c4e25735434dc75717a4b7fbfc45b.tar.gz +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE diff --git a/buildroot/package/monkey/monkey.mk b/buildroot/package/monkey/monkey.mk index 526471312..2cb1a5f29 100644 --- a/buildroot/package/monkey/monkey.mk +++ b/buildroot/package/monkey/monkey.mk @@ -4,31 +4,29 @@ # ################################################################################ -MONKEY_VERSION_MAJOR = 1.6 -MONKEY_VERSION = $(MONKEY_VERSION_MAJOR).9 -MONKEY_SITE = http://monkey-project.com/releases/$(MONKEY_VERSION_MAJOR) +MONKEY_VERSION = f54856ce250c4e25735434dc75717a4b7fbfc45b +MONKEY_SITE = $(call github,monkey,monkey,$(MONKEY_VERSION)) MONKEY_LICENSE = Apache-2.0 MONKEY_LICENSE_FILES = LICENSE MONKEY_CONF_OPTS = \ - -DINSTALL_SYSCONFDIR=/etc/monkey \ - -DINSTALL_WEBROOTDIR=/var/www \ - -DWITH_SYSTEM_MALLOC=1 + -DMK_PATH_WWW=/var/www \ + -DWITHOUT_HEADERS=ON ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) -MONKEY_CONF_OPTS += -DWITH_UCLIB=1 -DWITH_BACKTRACE=0 +MONKEY_CONF_OPTS += -DMK_UCLIB=ON -DMK_BACKTRACE=OFF endif ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y) -MONKEY_CONF_OPTS += -DWITH_MUSL=1 -DWITH_BACKTRACE=0 +MONKEY_CONF_OPTS += -DMK_MUSL=ON -DMK_BACKTRACE=OFF endif ifeq ($(BR2_ENABLE_DEBUG),y) -MONKEY_CONF_OPTS += -DWITH_DEBUG=1 +MONKEY_CONF_OPTS += -DMK_DEBUG=ON endif ifeq ($(BR2_PACKAGE_MONKEY_SSL),y) -MONKEY_CONF_OPTS += -DWITH_PLUGINS=tls -DWITH_MBEDTLS_SHARED=1 +MONKEY_CONF_OPTS += -DMK_PLUGIN_TLS=ON -DMK_MBEDTLS_SHARED=ON MONKEY_DEPENDENCIES += mbedtls endif diff --git a/buildroot/package/mpd/mpd.hash b/buildroot/package/mpd/mpd.hash index 866c61d15..4c3b49823 100644 --- a/buildroot/package/mpd/mpd.hash +++ b/buildroot/package/mpd/mpd.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 338012037b5e67730529187c555a54cc567a85b15a7e8ddb3a807b1971566ccf mpd-0.22.3.tar.xz +sha256 2be149a4895c3cb613477f8cf1193593e3d8a1d38a75ffa7d32da8c8316a4d5e mpd-0.22.6.tar.xz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/buildroot/package/mpd/mpd.mk b/buildroot/package/mpd/mpd.mk index 5dfb5b42a..06dc7e15d 100644 --- a/buildroot/package/mpd/mpd.mk +++ b/buildroot/package/mpd/mpd.mk @@ -5,7 +5,7 @@ ################################################################################ MPD_VERSION_MAJOR = 0.22 -MPD_VERSION = $(MPD_VERSION_MAJOR).3 +MPD_VERSION = $(MPD_VERSION_MAJOR).6 MPD_SOURCE = mpd-$(MPD_VERSION).tar.xz MPD_SITE = http://www.musicpd.org/download/mpd/$(MPD_VERSION_MAJOR) MPD_DEPENDENCIES = host-pkgconf boost diff --git a/buildroot/package/ncurses/ncurses.mk b/buildroot/package/ncurses/ncurses.mk index 97e3e2c32..5d9c6bb0d 100644 --- a/buildroot/package/ncurses/ncurses.mk +++ b/buildroot/package/ncurses/ncurses.mk @@ -11,6 +11,12 @@ 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)/, \ diff --git a/buildroot/package/nettle/0001-disable-testsuite-examples.patch b/buildroot/package/nettle/0001-disable-testsuite-examples.patch index 82d97d5d2..aa37bcf8f 100644 --- a/buildroot/package/nettle/0001-disable-testsuite-examples.patch +++ b/buildroot/package/nettle/0001-disable-testsuite-examples.patch @@ -9,9 +9,9 @@ Signed-off-by: "Yann E. MORIN" diff -durN nettle-2.7.1.orig/Makefile.in nettle-2.7.1/Makefile.in --- nettle-2.7.1.orig/Makefile.in 2013-05-28 16:21:54.000000000 +0200 +++ nettle-2.7.1/Makefile.in 2014-12-12 19:57:12.499805574 +0100 -@@ -16,7 +16,7 @@ +@@ -19,7 +19,7 @@ - OPT_ASM_SOURCES = @OPT_ASM_SOURCES@ + FAT_TEST_LIST = @FAT_TEST_LIST@ -SUBDIRS = tools testsuite examples +SUBDIRS = tools diff --git a/buildroot/package/nettle/Config.in b/buildroot/package/nettle/Config.in index 489097012..cf4803c7b 100644 --- a/buildroot/package/nettle/Config.in +++ b/buildroot/package/nettle/Config.in @@ -7,4 +7,4 @@ config BR2_PACKAGE_NETTLE object-oriented languages, in applications like LSH or GNUPG, or even in kernel space - http://www.lysator.liu.se/~nisse/nettle/ + https://www.lysator.liu.se/~nisse/nettle/ diff --git a/buildroot/package/nettle/nettle.hash b/buildroot/package/nettle/nettle.hash index 1bbc1c6d2..09652dcc8 100644 --- a/buildroot/package/nettle/nettle.hash +++ b/buildroot/package/nettle/nettle.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://ftp.gnu.org/gnu/nettle/nettle-3.6.tar.gz.sig -sha256 d24c0d0f2abffbc8f4f34dcf114b0f131ec3774895f3555922fe2f40f3d5e3f1 nettle-3.6.tar.gz +# https://ftp.gnu.org/gnu/nettle/nettle-3.7.2.tar.gz.sig +sha256 8d2a604ef1cde4cd5fb77e422531ea25ad064679ff0adf956e78b3352e0ef162 nettle-3.7.2.tar.gz # Locally calculated sha256 a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c COPYING.LESSERv3 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYINGv2 diff --git a/buildroot/package/nettle/nettle.mk b/buildroot/package/nettle/nettle.mk index fef68375d..bf833eb27 100644 --- a/buildroot/package/nettle/nettle.mk +++ b/buildroot/package/nettle/nettle.mk @@ -4,7 +4,7 @@ # ################################################################################ -NETTLE_VERSION = 3.6 +NETTLE_VERSION = 3.7.2 NETTLE_SITE = http://www.lysator.liu.se/~nisse/archive NETTLE_DEPENDENCIES = gmp NETTLE_INSTALL_STAGING = YES diff --git a/buildroot/package/network-manager/network-manager.hash b/buildroot/package/network-manager/network-manager.hash index 93a9b5017..aef06dde2 100644 --- a/buildroot/package/network-manager/network-manager.hash +++ b/buildroot/package/network-manager/network-manager.hash @@ -1,6 +1,6 @@ -# From https://download.gnome.org/sources/NetworkManager/1.20/NetworkManager-1.22.10.sha256sum -sha256 2b29ccc1531ba7ebba95a97f40c22b963838e8b6833745efe8e6fb71fd8fca77 NetworkManager-1.22.10.tar.xz +# From https://download.gnome.org/sources/NetworkManager/1.22/NetworkManager-1.22.16.sha256sum +sha256 377aa053752eaa304b72c9906f9efcd9fbd5f7f6cb4cd4ad72425a68982cffc6 NetworkManager-1.22.16.tar.xz # Locally computed -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL -sha256 f0543c137bc0eece552d42642d1bab31707ca3b3663d9c7a81ac3b270a4780e7 CONTRIBUTING +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL +sha256 f0543c137bc0eece552d42642d1bab31707ca3b3663d9c7a81ac3b270a4780e7 CONTRIBUTING diff --git a/buildroot/package/network-manager/network-manager.mk b/buildroot/package/network-manager/network-manager.mk index 79ae42e98..c8351d873 100644 --- a/buildroot/package/network-manager/network-manager.mk +++ b/buildroot/package/network-manager/network-manager.mk @@ -5,7 +5,7 @@ ################################################################################ NETWORK_MANAGER_VERSION_MAJOR = 1.22 -NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).10 +NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).16 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 diff --git a/buildroot/package/nginx/0009-auto-os-linux-fix-build-with-libxcrypt.patch b/buildroot/package/nginx/0009-auto-os-linux-fix-build-with-libxcrypt.patch new file mode 100644 index 000000000..7e430ffc3 --- /dev/null +++ b/buildroot/package/nginx/0009-auto-os-linux-fix-build-with-libxcrypt.patch @@ -0,0 +1,38 @@ +From 79f1fe5251afc4e22a138b0c8f44fc9c94093b8b Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 2 Apr 2021 09:18:26 +0200 +Subject: [PATCH] auto/os/linux: fix build with libxcrypt + +If crypt_r is found in libcrypt, add -lcrypt to CORE_LIBS to avoid the +following build failure with libxcrypt: + +objs/ngx_modules.o \ +-lpcre -L/home/giuliobenetti/autobuild/run/instance-3/output-1/host/bin/../xtensa-buildroot-linux-uclibc/sysroot/usr/lib -lssl -lcrypto -L/home/giuliobenetti/autobuild/run/instance-3/output-1/host/bin/../xtensa-buildroot-linux-uclibc/sysroot/usr/lib -lxslt -lxml2 -lGeoIP \ +-Wl,-E +/home/giuliobenetti/autobuild/run/instance-3/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/9.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: objs/src/os/unix/ngx_user.o:/home/giuliobenetti/autobuild/run/instance-3/output-1/build/nginx-1.18.0/src/os/unix/ngx_user.c:18: undefined reference to `crypt_r' + +Fixes: + - http://autobuild.buildroot.org/results/79a51b0d348e756517b5c9ce815a67f5c657e7e6 + +Signed-off-by: Fabrice Fontaine +--- + auto/os/linux | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/auto/os/linux b/auto/os/linux +index 5e280eca..04682812 100644 +--- a/auto/os/linux ++++ b/auto/os/linux +@@ -203,6 +203,9 @@ ngx_feature_test="struct crypt_data cd; + crypt_r(\"key\", \"salt\", &cd);" + . auto/feature + ++if [ $ngx_found = yes ]; then ++ CORE_LIBS="$CORE_LIBS $ngx_feature_libs" ++fi + + ngx_include="sys/vfs.h"; . auto/include + +-- +2.30.2 + diff --git a/buildroot/package/nginx/nginx.mk b/buildroot/package/nginx/nginx.mk index 9c3254683..8a371a2cc 100644 --- a/buildroot/package/nginx/nginx.mk +++ b/buildroot/package/nginx/nginx.mk @@ -9,7 +9,9 @@ NGINX_SITE = http://nginx.org/download NGINX_LICENSE = BSD-2-Clause NGINX_LICENSE_FILES = LICENSE NGINX_CPE_ID_VENDOR = nginx -NGINX_DEPENDENCIES = host-pkgconf +NGINX_DEPENDENCIES = \ + host-pkgconf \ + $(if $(BR2_PACKAGE_LIBXCRYPT),libxcrypt) NGINX_CONF_OPTS = \ --crossbuild=Linux::$(BR2_ARCH) \ diff --git a/buildroot/package/numactl/0001-Do-not-stringify-SYMVER-symbols.patch b/buildroot/package/numactl/0001-Do-not-stringify-SYMVER-symbols.patch new file mode 100644 index 000000000..c6981aaf7 --- /dev/null +++ b/buildroot/package/numactl/0001-Do-not-stringify-SYMVER-symbols.patch @@ -0,0 +1,25 @@ +From f96c96af7fbf2779b15f66f03b10315a24fb4f5a Mon Sep 17 00:00:00 2001 +From: Scott McMillan +Date: Fri, 9 Oct 2020 08:56:52 -0500 +Subject: [PATCH] Do not stringify SYMVER symbols + +Upstream: f96c96af7fbf2779b15f66f03b10315a24fb4f5a +Signed-off-by: Thomas Petazzoni +--- + util.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/util.h b/util.h +index 99ada33..f2a20ac 100644 +--- a/util.h ++++ b/util.h +@@ -22,5 +22,5 @@ extern char *policy_name(int policy); + #if HAVE_ATTRIBUTE_SYMVER + #define SYMVER(a,b) __attribute__ ((symver (b))) + #else +-#define SYMVER(a,b) __asm__ (".symver " #a "," #b); ++#define SYMVER(a,b) __asm__ (".symver " a "," b); + #endif +-- +2.30.2 + diff --git a/buildroot/package/numactl/Config.in b/buildroot/package/numactl/Config.in index cd47f2f9a..23cf7facb 100644 --- a/buildroot/package/numactl/Config.in +++ b/buildroot/package/numactl/Config.in @@ -1,15 +1,6 @@ -config BR2_PACKAGE_NUMACTL_ARCH_SUPPORTS - bool - # numactl uses some system calls that are not available on all - # architectures. - default y if BR2_aarch64 - default y if BR2_i386 || BR2_x86_64 - default y if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el - default y if BR2_powerpc - config BR2_PACKAGE_NUMACTL bool "numactl" - depends on BR2_PACKAGE_NUMACTL_ARCH_SUPPORTS + depends on BR2_USE_MMU # madvise() help numactl allows you to run your application on specific cpus and memory nodes. It does this by supplying a NUMA memory diff --git a/buildroot/package/numactl/numactl.mk b/buildroot/package/numactl/numactl.mk index cf9c75969..3364f6c5c 100644 --- a/buildroot/package/numactl/numactl.mk +++ b/buildroot/package/numactl/numactl.mk @@ -12,4 +12,8 @@ NUMACTL_INSTALL_STAGING = YES NUMACTL_AUTORECONF = YES NUMACTL_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -fPIC" +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +NUMACTL_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -latomic" +endif + $(eval $(autotools-package)) diff --git a/buildroot/package/openjdk-bin/openjdk-bin.hash b/buildroot/package/openjdk-bin/openjdk-bin.hash index 482804802..a08aa16d4 100644 --- a/buildroot/package/openjdk-bin/openjdk-bin.hash +++ b/buildroot/package/openjdk-bin/openjdk-bin.hash @@ -2,7 +2,7 @@ sha256 7d5ee7e06909b8a99c0d029f512f67b092597aa5b0e78c109bd59405bbfa74fe OpenJDK14U-jdk_x64_linux_hotspot_14.0.2_12.tar.gz # From https://github.com/AdoptOpenJDK/openjdk11-binaries/releases -sha256 6e4cead158037cb7747ca47416474d4f408c9126be5b96f9befd532e0a762b47 OpenJDK11U-jdk_x64_linux_hotspot_11.0.8_10.tar.gz +sha256 e99b98f851541202ab64401594901e583b764e368814320eba442095251e78cb OpenJDK11U-jdk_x64_linux_hotspot_11.0.11_9.tar.gz # Locally calculated sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 legal/java.prefs/LICENSE diff --git a/buildroot/package/openjdk-bin/openjdk-bin.mk b/buildroot/package/openjdk-bin/openjdk-bin.mk index dd5b87fd9..61e7ecac4 100644 --- a/buildroot/package/openjdk-bin/openjdk-bin.mk +++ b/buildroot/package/openjdk-bin/openjdk-bin.mk @@ -11,8 +11,8 @@ HOST_OPENJDK_BIN_VERSION = $(HOST_OPENJDK_BIN_VERSION_MAJOR)_$(HOST_OPENJDK_BIN_ HOST_OPENJDK_BIN_SOURCE = OpenJDK14U-jdk_x64_linux_hotspot_$(HOST_OPENJDK_BIN_VERSION).tar.gz HOST_OPENJDK_BIN_SITE = https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-$(HOST_OPENJDK_BIN_VERSION_MAJOR)%2B$(HOST_OPENJDK_BIN_VERSION_MINOR) else -HOST_OPENJDK_BIN_VERSION_MAJOR = 11.0.8 -HOST_OPENJDK_BIN_VERSION_MINOR = 10 +HOST_OPENJDK_BIN_VERSION_MAJOR = 11.0.11 +HOST_OPENJDK_BIN_VERSION_MINOR = 9 HOST_OPENJDK_BIN_VERSION = $(HOST_OPENJDK_BIN_VERSION_MAJOR)_$(HOST_OPENJDK_BIN_VERSION_MINOR) HOST_OPENJDK_BIN_SOURCE = OpenJDK11U-jdk_x64_linux_hotspot_$(HOST_OPENJDK_BIN_VERSION).tar.gz HOST_OPENJDK_BIN_SITE = https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-$(HOST_OPENJDK_BIN_VERSION_MAJOR)%2B$(HOST_OPENJDK_BIN_VERSION_MINOR) diff --git a/buildroot/package/openjdk/11.0.8+10/0001-fix-gcc-10-support.patch b/buildroot/package/openjdk/11.0.8+10/0001-fix-gcc-10-support.patch deleted file mode 100644 index 9941d0151..000000000 --- a/buildroot/package/openjdk/11.0.8+10/0001-fix-gcc-10-support.patch +++ /dev/null @@ -1,119 +0,0 @@ -From 58911e9de888aece29f491995a8b8a31f7d6b424 Mon Sep 17 00:00:00 2001 -From: Patrick Zhang -Date: Wed, 05 Feb 2020 17:14:15 -0700 -Subject: [PATCH] fix gcc 10 support - -This patch fixes the "multiple definition" link errors with GCC10 due to -GCC10 setting -fno-common by default. - -This is a combination of the following upstream commits: - - https://hg.openjdk.java.net/jdk/jdk/rev/8e6fa89397ca - - https://hg.openjdk.java.net/jdk/jdk/rev/6925fca95959 - - https://hg.openjdk.java.net/jdk/jdk/rev/9e54ea7d9cd9 - -Signed-off-by: Patrick Zhang -Signed-off-by: Adam Duskett ---- - src/java.base/unix/native/libjava/childproc.c | 1 + - src/java.base/unix/native/libjava/childproc.h | 2 +- - .../share/native/libj2gss/NativeFunc.c | 3 +++ - .../share/native/libj2gss/NativeFunc.h | 2 +- - src/jdk.sctp/unix/native/libsctp/Sctp.h | 12 ++++++------ - src/jdk.sctp/unix/native/libsctp/SctpNet.c | 7 +++++++ - 6 files changed, 19 insertions(+), 8 deletions(-) - -diff --git a/src/java.base/unix/native/libjava/childproc.c b/src/java.base/unix/native/libjava/childproc.c -index 811aaeac5..16480bfbf 100644 ---- a/src/java.base/unix/native/libjava/childproc.c -+++ b/src/java.base/unix/native/libjava/childproc.c -@@ -33,6 +33,7 @@ - - #include "childproc.h" - -+const char * const *parentPathv; - - ssize_t - restartableWrite(int fd, const void *buf, size_t count) -diff --git a/src/java.base/unix/native/libjava/childproc.h b/src/java.base/unix/native/libjava/childproc.h -index 091150930..d57e44b6e 100644 ---- a/src/java.base/unix/native/libjava/childproc.h -+++ b/src/java.base/unix/native/libjava/childproc.h -@@ -118,7 +118,7 @@ typedef struct _SpawnInfo { - * The cached and split version of the JDK's effective PATH. - * (We don't support putenv("PATH=...") in native code) - */ --const char * const *parentPathv; -+extern const char * const *parentPathv; - - ssize_t restartableWrite(int fd, const void *buf, size_t count); - int restartableDup2(int fd_from, int fd_to); -diff --git a/src/java.security.jgss/share/native/libj2gss/NativeFunc.c b/src/java.security.jgss/share/native/libj2gss/NativeFunc.c -index da7bc0445..5941f7b5a 100644 ---- a/src/java.security.jgss/share/native/libj2gss/NativeFunc.c -+++ b/src/java.security.jgss/share/native/libj2gss/NativeFunc.c -@@ -27,6 +27,9 @@ - #include - #include "NativeFunc.h" - -+/* global GSS function table */ -+GSS_FUNCTION_TABLE_PTR ftab; -+ - /* standard GSS method names (ordering is from mapfile) */ - static const char RELEASE_NAME[] = "gss_release_name"; - static const char IMPORT_NAME[] = "gss_import_name"; -diff --git a/src/java.security.jgss/share/native/libj2gss/NativeFunc.h b/src/java.security.jgss/share/native/libj2gss/NativeFunc.h -index 82914387c..e4a4981a3 100644 ---- a/src/java.security.jgss/share/native/libj2gss/NativeFunc.h -+++ b/src/java.security.jgss/share/native/libj2gss/NativeFunc.h -@@ -277,6 +277,6 @@ typedef struct GSS_FUNCTION_TABLE { - typedef GSS_FUNCTION_TABLE *GSS_FUNCTION_TABLE_PTR; - - /* global GSS function table */ --GSS_FUNCTION_TABLE_PTR ftab; -+extern GSS_FUNCTION_TABLE_PTR ftab; - - #endif -diff --git a/src/jdk.sctp/unix/native/libsctp/Sctp.h b/src/jdk.sctp/unix/native/libsctp/Sctp.h -index cc1367f78..46b07db0a 100644 ---- a/src/jdk.sctp/unix/native/libsctp/Sctp.h -+++ b/src/jdk.sctp/unix/native/libsctp/Sctp.h -@@ -322,12 +322,12 @@ typedef int sctp_peeloff_func(int sock, sctp_assoc_t id); - - #endif /* __linux__ */ - --sctp_getladdrs_func* nio_sctp_getladdrs; --sctp_freeladdrs_func* nio_sctp_freeladdrs; --sctp_getpaddrs_func* nio_sctp_getpaddrs; --sctp_freepaddrs_func* nio_sctp_freepaddrs; --sctp_bindx_func* nio_sctp_bindx; --sctp_peeloff_func* nio_sctp_peeloff; -+extern sctp_getladdrs_func* nio_sctp_getladdrs; -+extern sctp_freeladdrs_func* nio_sctp_freeladdrs; -+extern sctp_getpaddrs_func* nio_sctp_getpaddrs; -+extern sctp_freepaddrs_func* nio_sctp_freepaddrs; -+extern sctp_bindx_func* nio_sctp_bindx; -+extern sctp_peeloff_func* nio_sctp_peeloff; - - jboolean loadSocketExtensionFuncs(JNIEnv* env); - -diff --git a/src/jdk.sctp/unix/native/libsctp/SctpNet.c b/src/jdk.sctp/unix/native/libsctp/SctpNet.c -index d40c15aa3..ab9b6e093 100644 ---- a/src/jdk.sctp/unix/native/libsctp/SctpNet.c -+++ b/src/jdk.sctp/unix/native/libsctp/SctpNet.c -@@ -43,6 +43,13 @@ static jmethodID isaCtrID = 0; - static const char* nativeSctpLib = "libsctp.so.1"; - static jboolean funcsLoaded = JNI_FALSE; - -+sctp_getladdrs_func* nio_sctp_getladdrs; -+sctp_freeladdrs_func* nio_sctp_freeladdrs; -+sctp_getpaddrs_func* nio_sctp_getpaddrs; -+sctp_freepaddrs_func* nio_sctp_freepaddrs; -+sctp_bindx_func* nio_sctp_bindx; -+sctp_peeloff_func* nio_sctp_peeloff; -+ - JNIEXPORT jint JNICALL DEF_JNI_OnLoad - (JavaVM *vm, void *reserved) { - return JNI_VERSION_1_2; --- -2.26.2 - diff --git a/buildroot/package/openjdk/openjdk.hash b/buildroot/package/openjdk/openjdk.hash index 6acfa2243..05a0c12c4 100644 --- a/buildroot/package/openjdk/openjdk.hash +++ b/buildroot/package/openjdk/openjdk.hash @@ -1,4 +1,4 @@ # Locally computed sha256 dfb3607f1b675458f29a185a40f1dbbf896439cf33b3aa0f3d89df297e604935 jdk-14.0.2+12.tar.gz -sha256 7fc124b5e20428cd5df42d78b001abc663558b0881e66a5def0892b98265b6e9 jdk-11.0.8+10.tar.gz +sha256 c8b9d92028f6e46d94bde65ebce3b593fdcc0d1ca1fa00482f38815ed37c92a1 jdk-11.0.11+9.tar.gz sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 LICENSE diff --git a/buildroot/package/openjdk/openjdk.mk b/buildroot/package/openjdk/openjdk.mk index 80e1fc1aa..6ed5085fd 100644 --- a/buildroot/package/openjdk/openjdk.mk +++ b/buildroot/package/openjdk/openjdk.mk @@ -11,8 +11,8 @@ OPENJDK_VERSION = $(OPENJDK_VERSION_MAJOR)+$(OPENJDK_VERSION_MINOR) OPENJDK_SOURCE = jdk-$(OPENJDK_VERSION).tar.gz OPENJDK_SITE = https://hg.openjdk.java.net/jdk-updates/jdk14u/archive else -OPENJDK_VERSION_MAJOR = 11.0.8 -OPENJDK_VERSION_MINOR = 10 +OPENJDK_VERSION_MAJOR = 11.0.11 +OPENJDK_VERSION_MINOR = 9 OPENJDK_VERSION = $(OPENJDK_VERSION_MAJOR)+$(OPENJDK_VERSION_MINOR) OPENJDK_SOURCE = jdk-$(OPENJDK_VERSION).tar.gz OPENJDK_SITE = https://hg.openjdk.java.net/jdk-updates/jdk11u/archive diff --git a/buildroot/package/openldap/0005-ITS-9454-fix-issuerAndThisUpdateCheck.patch b/buildroot/package/openldap/0005-ITS-9454-fix-issuerAndThisUpdateCheck.patch deleted file mode 100644 index a611b9ff5..000000000 --- a/buildroot/package/openldap/0005-ITS-9454-fix-issuerAndThisUpdateCheck.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 9badb73425a67768c09bcaed1a9c26c684af6c30 Mon Sep 17 00:00:00 2001 -From: Howard Chu -Date: Sat, 6 Feb 2021 20:52:06 +0000 -Subject: [PATCH] ITS#9454 fix issuerAndThisUpdateCheck - -Signed-off-by: Peter Korsgaard ---- - servers/slapd/schema_init.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c -index 31be1154e..8b1e25539 100644 ---- a/servers/slapd/schema_init.c -+++ b/servers/slapd/schema_init.c -@@ -3900,6 +3900,8 @@ issuerAndThisUpdateCheck( - break; - } - } -+ if ( tu->bv_len < STRLENOF("YYYYmmddHHmmssZ") ) return LDAP_INVALID_SYNTAX; -+ - x.bv_val += tu->bv_len + 1; - x.bv_len -= tu->bv_len + 1; - --- -2.20.1 - diff --git a/buildroot/package/openldap/openldap.hash b/buildroot/package/openldap/openldap.hash index f2ffdf53b..8ce50d613 100644 --- a/buildroot/package/openldap/openldap.hash +++ b/buildroot/package/openldap/openldap.hash @@ -1,7 +1,7 @@ -# From https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.57.md5 -md5 e3349456c3a66e5e6155be7ddc3f042c openldap-2.4.57.tgz -# From https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.57.sha1 -sha1 1cffa70a3ea8545948041fd113f8f53bc24d6d87 openldap-2.4.57.tgz +# From https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.58.md5 +md5 c203d735ba69976e5b28dc39006f29b5 openldap-2.4.58.tgz +# From https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.58.sha1 +sha1 875416827be3ad63f20004510a354db0aaceb2ed openldap-2.4.58.tgz # Locally computed -sha256 c7ba47e1e6ecb5b436f3d43281df57abeffa99262141aec822628bc220f6b45a openldap-2.4.57.tgz +sha256 57b59254be15d0bf6a9ab3d514c1c05777b02123291533134a87c94468f8f47b openldap-2.4.58.tgz sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 LICENSE diff --git a/buildroot/package/openldap/openldap.mk b/buildroot/package/openldap/openldap.mk index ec11e4fa7..3b35b4daa 100644 --- a/buildroot/package/openldap/openldap.mk +++ b/buildroot/package/openldap/openldap.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENLDAP_VERSION = 2.4.57 +OPENLDAP_VERSION = 2.4.58 OPENLDAP_SOURCE = openldap-$(OPENLDAP_VERSION).tgz OPENLDAP_SITE = https://www.openldap.org/software/download/OpenLDAP/openldap-release OPENLDAP_LICENSE = OpenLDAP Public License @@ -13,9 +13,6 @@ OPENLDAP_CPE_ID_VENDOR = openldap OPENLDAP_INSTALL_STAGING = YES OPENLDAP_DEPENDENCIES = host-pkgconf -# 0005-ITS-9454-fix-issuerAndThisUpdateCheck.patch -OPENLDAP_IGNORE_CVES += CVE-2021-27212 - ifeq ($(BR2_PACKAGE_OPENSSL),y) OPENLDAP_TLS = openssl OPENLDAP_DEPENDENCIES += openssl diff --git a/buildroot/package/openresolv/openresolv.mk b/buildroot/package/openresolv/openresolv.mk index 44e072042..55ec7fd8f 100644 --- a/buildroot/package/openresolv/openresolv.mk +++ b/buildroot/package/openresolv/openresolv.mk @@ -8,6 +8,7 @@ OPENRESOLV_VERSION = 3.10.0 OPENRESOLV_SITE = $(call github,rsmarples,openresolv,openresolv-$(OPENRESOLV_VERSION)) OPENRESOLV_LICENSE = BSD-2-Clause OPENRESOLV_LICENSE_FILES = LICENSE +OPENRESOLV_CPE_ID_VENDOR = openresolv_project define OPENRESOLV_CONFIGURE_CMDS cd $(@D) && $(TARGET_CONFIGURE_OPTS) ./configure --sysconfdir=/etc diff --git a/buildroot/package/openvpn/openvpn.hash b/buildroot/package/openvpn/openvpn.hash index d008b3496..36f90ff11 100644 --- a/buildroot/package/openvpn/openvpn.hash +++ b/buildroot/package/openvpn/openvpn.hash @@ -1,3 +1,3 @@ # Locally calculated after checking signature -sha256 40930489c837c05f6153f38e1ebaec244431ef1a034e4846ff732d71d59ff194 openvpn-2.5.1.tar.xz +sha256 b12743836901f365efaf82ab2493967e1b21c21eb43ce9a8da1002a17c9c1dc8 openvpn-2.5.2.tar.xz sha256 1fcb78d7e478bb8a9408010bdc91b36e213b1facfad093df3f7ce7e28af19043 COPYRIGHT.GPL diff --git a/buildroot/package/openvpn/openvpn.mk b/buildroot/package/openvpn/openvpn.mk index e4066a405..9b3802fd8 100644 --- a/buildroot/package/openvpn/openvpn.mk +++ b/buildroot/package/openvpn/openvpn.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENVPN_VERSION = 2.5.1 +OPENVPN_VERSION = 2.5.2 OPENVPN_SOURCE = openvpn-$(OPENVPN_VERSION).tar.xz OPENVPN_SITE = http://swupdate.openvpn.net/community/releases OPENVPN_DEPENDENCIES = host-pkgconf diff --git a/buildroot/package/parted/parted.mk b/buildroot/package/parted/parted.mk index c3ab3ceb4..66940fc51 100644 --- a/buildroot/package/parted/parted.mk +++ b/buildroot/package/parted/parted.mk @@ -11,6 +11,7 @@ PARTED_DEPENDENCIES = host-pkgconf util-linux PARTED_INSTALL_STAGING = YES PARTED_LICENSE = GPL-3.0+ PARTED_LICENSE_FILES = COPYING +PARTED_CPE_ID_VENDOR = parted_project ifeq ($(BR2_PACKAGE_READLINE),y) PARTED_DEPENDENCIES += readline diff --git a/buildroot/package/php/php.hash b/buildroot/package/php/php.hash index 14576cf50..3fb0d09d3 100644 --- a/buildroot/package/php/php.hash +++ b/buildroot/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 1c16cefaf88ded4c92eed6a8a41eb682bb2ef42429deb55f1c4ba159053fb98b php-7.4.16.tar.xz +sha256 6c17172c4a411ccb694d9752de899bb63c72a0a3ebe5089116bc13658a1467b2 php-7.4.19.tar.xz # License file sha256 a188db807d711536f71e27b7d36879d63480f7994dc18adc08e624b3c5430fff LICENSE diff --git a/buildroot/package/php/php.mk b/buildroot/package/php/php.mk index 4987f6f3b..73553e039 100644 --- a/buildroot/package/php/php.mk +++ b/buildroot/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 7.4.16 +PHP_VERSION = 7.4.19 PHP_SITE = http://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES diff --git a/buildroot/package/pipewire/Config.in b/buildroot/package/pipewire/Config.in index 57e70d65f..9c6b6eb88 100644 --- a/buildroot/package/pipewire/Config.in +++ b/buildroot/package/pipewire/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_PIPEWIRE bool "pipewire" depends on BR2_PACKAGE_HAS_UDEV # libudev depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 depends on BR2_USE_MMU # dbus select BR2_PACKAGE_ALSA_LIB select BR2_PACKAGE_DBUS @@ -30,6 +31,8 @@ comment "pipewire gstreamer support needs a toolchain w/ wchar, threads" endif -comment "pipewire needs udev and a toolchain w/ threads" +comment "pipewire needs udev and a toolchain w/ threads, headers >= 3.18" depends on BR2_USE_MMU - depends on !BR2_PACKAGE_HAS_UDEV || !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_PACKAGE_HAS_UDEV || \ + !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 diff --git a/buildroot/package/pkgconf/pkgconf.mk b/buildroot/package/pkgconf/pkgconf.mk index 3d51258d6..5d65f69c1 100644 --- a/buildroot/package/pkgconf/pkgconf.mk +++ b/buildroot/package/pkgconf/pkgconf.mk @@ -9,6 +9,7 @@ PKGCONF_SITE = https://distfiles.dereferenced.org/pkgconf PKGCONF_SOURCE = pkgconf-$(PKGCONF_VERSION).tar.xz PKGCONF_LICENSE = pkgconf license PKGCONF_LICENSE_FILES = COPYING +PKGCONF_CPE_ID_VENDOR = pkgconf PKG_CONFIG_HOST_BINARY = $(HOST_DIR)/bin/pkg-config diff --git a/buildroot/package/poppler/poppler.mk b/buildroot/package/poppler/poppler.mk index 44ad04bf7..a5a97d974 100644 --- a/buildroot/package/poppler/poppler.mk +++ b/buildroot/package/poppler/poppler.mk @@ -21,7 +21,7 @@ POPPLER_CONF_OPTS = \ -DENABLE_GTK_DOC=OFF ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -POPPLER_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -latomic" +POPPLER_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic endif ifeq ($(BR2_PACKAGE_BOOST),y) diff --git a/buildroot/package/popt/popt.mk b/buildroot/package/popt/popt.mk index 5c4863ce4..f00bf115e 100644 --- a/buildroot/package/popt/popt.mk +++ b/buildroot/package/popt/popt.mk @@ -9,6 +9,8 @@ POPT_SITE = http://ftp.rpm.org/popt/releases/popt-1.x POPT_INSTALL_STAGING = YES POPT_LICENSE = MIT POPT_LICENSE_FILES = COPYING +POPT_CPE_ID_VENDOR = popt_project + POPT_GETTEXTIZE = YES POPT_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) # We're patching configure.ac diff --git a/buildroot/package/pugixml/pugixml.mk b/buildroot/package/pugixml/pugixml.mk index 5d7fc6301..ddda5a3cc 100644 --- a/buildroot/package/pugixml/pugixml.mk +++ b/buildroot/package/pugixml/pugixml.mk @@ -8,6 +8,8 @@ PUGIXML_VERSION = 1.11.4 PUGIXML_SITE = http://github.com/zeux/pugixml/releases/download/v$(PUGIXML_VERSION) PUGIXML_LICENSE = MIT PUGIXML_LICENSE_FILES = LICENSE.md +PUGIXML_CPE_ID_VENDOR = pugixml_project + PUGIXML_INSTALL_STAGING = YES # Pugixml will automatically enable 'long long' support on C++11 compilers, diff --git a/buildroot/package/python-aioconsole/python-aioconsole.hash b/buildroot/package/python-aioconsole/python-aioconsole.hash index 0aa9a7882..dea2216fc 100644 --- a/buildroot/package/python-aioconsole/python-aioconsole.hash +++ b/buildroot/package/python-aioconsole/python-aioconsole.hash @@ -1,3 +1,3 @@ # md5, sha256 from https://pypi.org/pypi/aioconsole/json -md5 a8b0640a1e2a3869baf4efcbb1182fbe aioconsole-0.3.0.tar.gz -sha256 b84724e6b93d1306a909974864df377236cf4bab8e0594096fed7936207205c5 aioconsole-0.3.0.tar.gz +md5 66d4b05e3bc75267daf0f773d839f62b aioconsole-0.3.1.tar.gz +sha256 7c038bb40b7690bf5be6b17154830b7bff25e7be1c02d8420a346c3efbd5d8e5 aioconsole-0.3.1.tar.gz diff --git a/buildroot/package/python-aioconsole/python-aioconsole.mk b/buildroot/package/python-aioconsole/python-aioconsole.mk index 5c26d863c..b32d2bea0 100644 --- a/buildroot/package/python-aioconsole/python-aioconsole.mk +++ b/buildroot/package/python-aioconsole/python-aioconsole.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOCONSOLE_VERSION = 0.3.0 +PYTHON_AIOCONSOLE_VERSION = 0.3.1 PYTHON_AIOCONSOLE_SOURCE = aioconsole-$(PYTHON_AIOCONSOLE_VERSION).tar.gz -PYTHON_AIOCONSOLE_SITE = https://files.pythonhosted.org/packages/d1/bc/2e52bd41293e63d95fcb6c5de406d43ccbb91255a48feaa22c1b8e2e4a40 +PYTHON_AIOCONSOLE_SITE = https://files.pythonhosted.org/packages/5a/12/fce04ddc0a8ebd6482e5ec293d8bda47c9e05c82826b061f7b73523b8601 PYTHON_AIOCONSOLE_SETUP_TYPE = setuptools PYTHON_AIOCONSOLE_LICENSE = GPL-3.0 diff --git a/buildroot/package/python-asgiref/python-asgiref.hash b/buildroot/package/python-asgiref/python-asgiref.hash index 782a13fe5..c349ad5a4 100644 --- a/buildroot/package/python-asgiref/python-asgiref.hash +++ b/buildroot/package/python-asgiref/python-asgiref.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/asgiref/json -md5 39218c10eee0bf66a3d893491d835e86 asgiref-3.2.3.tar.gz -sha256 7e06d934a7718bf3975acbf87780ba678957b87c7adc056f13b6215d610695a0 asgiref-3.2.3.tar.gz +md5 5afe03ecc39ae94950ff95e80166d945 asgiref-3.3.4.tar.gz +sha256 d1216dfbdfb63826470995d31caed36225dcaf34f182e0fa257a4dd9e86f1b78 asgiref-3.3.4.tar.gz # Locally computed sha256 checksums sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/buildroot/package/python-asgiref/python-asgiref.mk b/buildroot/package/python-asgiref/python-asgiref.mk index b29903509..0353f5d5a 100644 --- a/buildroot/package/python-asgiref/python-asgiref.mk +++ b/buildroot/package/python-asgiref/python-asgiref.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ASGIREF_VERSION = 3.2.3 +PYTHON_ASGIREF_VERSION = 3.3.4 PYTHON_ASGIREF_SOURCE = asgiref-$(PYTHON_ASGIREF_VERSION).tar.gz -PYTHON_ASGIREF_SITE = https://files.pythonhosted.org/packages/80/c4/83a01607f2d10024c172097126264c8e00c6a4827b35d631ece9625e6ba2 +PYTHON_ASGIREF_SITE = https://files.pythonhosted.org/packages/d8/3f/ef696a6d8254f182b1a089aeffb638d2eb83055e603146d3a40605c5b7da PYTHON_ASGIREF_SETUP_TYPE = setuptools PYTHON_ASGIREF_LICENSE = BSD-3-Clause PYTHON_ASGIREF_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-botocore/Config.in b/buildroot/package/python-botocore/Config.in index a552900b6..f34d774f9 100644 --- a/buildroot/package/python-botocore/Config.in +++ b/buildroot/package/python-botocore/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_BOTOCORE bool "python-botocore" select BR2_PACKAGE_PYTHON_JMESPATH # runtime - select BR2_PACKAGE_PYTHON_DOCUTILS # runtime select BR2_PACKAGE_PYTHON_DATEUTIL # runtime select BR2_PACKAGE_PYTHON_URLLIB3 # runtime help diff --git a/buildroot/package/python-django/python-django.hash b/buildroot/package/python-django/python-django.hash index 1cc4b5ecc..1c7d7b884 100644 --- a/buildroot/package/python-django/python-django.hash +++ b/buildroot/package/python-django/python-django.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/django/json -md5 f444fdd6ff8edec132991cbc343368d4 Django-3.0.14.tar.gz -sha256 d58d8394036db75a81896037d757357e79406e8f68816c3e8a28721c1d9d4c11 Django-3.0.14.tar.gz +md5 43784c090a8805605e3d0b768cd21cb2 Django-3.2.2.tar.gz +sha256 0a1d195ad65c52bf275b8277b3d49680bd1137a5f55039a806f25f6b9752ce3d Django-3.2.2.tar.gz # Locally computed sha256 checksums sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/buildroot/package/python-django/python-django.mk b/buildroot/package/python-django/python-django.mk index cb8f5492d..0e36a530a 100644 --- a/buildroot/package/python-django/python-django.mk +++ b/buildroot/package/python-django/python-django.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_DJANGO_VERSION = 3.0.14 +PYTHON_DJANGO_VERSION = 3.2.2 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/76/0e/5d847a77b7b42cacd01405b45e4e370124c1d8a15970865df5ab0f09f83a +PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/da/24/e2e6e534464f8e0bd010401f06d2cfc773141776d2952d6418d01c97f12c PYTHON_DJANGO_LICENSE = BSD-3-Clause PYTHON_DJANGO_LICENSE_FILES = LICENSE PYTHON_DJANGO_CPE_ID_VENDOR = djangoproject diff --git a/buildroot/package/python-dnspython/python-dnspython.mk b/buildroot/package/python-dnspython/python-dnspython.mk index 18d98efd7..ed1168729 100644 --- a/buildroot/package/python-dnspython/python-dnspython.mk +++ b/buildroot/package/python-dnspython/python-dnspython.mk @@ -17,4 +17,11 @@ define PYTHON_DNSPYTHON_EXTRACT_CMDS $(RM) -r $(@D)/dnspython-$(PYTHON_DNSPYTHON_VERSION) endef +define HOST_PYTHON_DNSPYTHON_EXTRACT_CMDS + $(UNZIP) -d $(@D) $(HOST_PYTHON_DNSPYTHON_DL_DIR)/$(HOST_PYTHON_DNSPYTHON_SOURCE) + mv $(@D)/dnspython-$(HOST_PYTHON_DNSPYTHON_VERSION)/* $(@D) + $(RM) -r $(@D)/dnspython-$(HOST_PYTHON_DNSPYTHON_VERSION) +endef + $(eval $(python-package)) +$(eval $(host-python-package)) diff --git a/buildroot/package/python-flup/Config.in b/buildroot/package/python-flup/Config.in index 2c2132351..f40f25016 100644 --- a/buildroot/package/python-flup/Config.in +++ b/buildroot/package/python-flup/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_PYTHON_FLUP bool "python-flup" - depends on BR2_PACKAGE_PYTHON + depends on BR2_PACKAGE_PYTHON3 help flup provides of a collection of WSGI modules for Python. It allows a webserver to use scgi-mod and fastcgi-mod diff --git a/buildroot/package/python-httplib2/Config.in b/buildroot/package/python-httplib2/Config.in index e42f5132b..39671f238 100644 --- a/buildroot/package/python-httplib2/Config.in +++ b/buildroot/package/python-httplib2/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_PYTHON_HTTPLIB2 select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON_PYPARSING # runtime help httplib2 is a comprehensive HTTP client library, httplib2.py supports many features left out of other HTTP libraries. diff --git a/buildroot/package/python-httplib2/python-httplib2.hash b/buildroot/package/python-httplib2/python-httplib2.hash index c272d8517..2c5914c5f 100644 --- a/buildroot/package/python-httplib2/python-httplib2.hash +++ b/buildroot/package/python-httplib2/python-httplib2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/httplib2/json -md5 4c05b09eb6f6c20a31ca488c7a87dda9 httplib2-0.17.2.tar.gz -sha256 eb7a6b137ae31e61c5f429083c5bebb71fe5fd1958e7f3d5c39b21b11cd4b290 httplib2-0.17.2.tar.gz -# Locally computer sha256 checksums -sha256 4205f0d88e04380ba13b9c60e2f85771196b66ee84bf48971d30d82a78e84c3f PKG-INFO +md5 de7f5e3a4adb3105889867327bdd39dc httplib2-0.19.1.tar.gz +sha256 0b12617eeca7433d4c396a100eaecfa4b08ee99aa881e6df6e257a7aad5d533d httplib2-0.19.1.tar.gz +# Locally computed sha256 checksums +sha256 589eec38f72df2be203711d3b8cbece9b908c5e7ff00bc3cab7f63bae9e366b4 LICENSE diff --git a/buildroot/package/python-httplib2/python-httplib2.mk b/buildroot/package/python-httplib2/python-httplib2.mk index fbdb6d83c..a259c33c7 100644 --- a/buildroot/package/python-httplib2/python-httplib2.mk +++ b/buildroot/package/python-httplib2/python-httplib2.mk @@ -4,11 +4,13 @@ # ################################################################################ -PYTHON_HTTPLIB2_VERSION = 0.17.2 +PYTHON_HTTPLIB2_VERSION = 0.19.1 PYTHON_HTTPLIB2_SOURCE = httplib2-$(PYTHON_HTTPLIB2_VERSION).tar.gz -PYTHON_HTTPLIB2_SITE = https://files.pythonhosted.org/packages/1b/f0/a35a448afea308aeb6a1430dbcfb46f4cef11360cbc18f22af6e567bb847 +PYTHON_HTTPLIB2_SITE = https://files.pythonhosted.org/packages/ed/cd/533a1e9e04671bcee5d2854b4f651a3fab9586d698de769d93b05ee2bff1 PYTHON_HTTPLIB2_SETUP_TYPE = setuptools PYTHON_HTTPLIB2_LICENSE = MIT -PYTHON_HTTPLIB2_LICENSE_FILES = PKG-INFO +PYTHON_HTTPLIB2_LICENSE_FILES = LICENSE +PYTHON_HTTPLIB2_CPE_ID_VENDOR = httplib2_project +PYTHON_HTTPLIB2_CPE_ID_PRODUCT = httplib2 $(eval $(python-package)) diff --git a/buildroot/package/python-markdown2/python-markdown2.mk b/buildroot/package/python-markdown2/python-markdown2.mk index c7858a396..3ffa35796 100644 --- a/buildroot/package/python-markdown2/python-markdown2.mk +++ b/buildroot/package/python-markdown2/python-markdown2.mk @@ -10,5 +10,6 @@ PYTHON_MARKDOWN2_SITE = https://files.pythonhosted.org/packages/14/69/c542025f80 PYTHON_MARKDOWN2_SETUP_TYPE = setuptools PYTHON_MARKDOWN2_LICENSE = MIT PYTHON_MARKDOWN2_LICENSE_FILES = LICENSE.txt +PYTHON_MARKDOWN2_CPE_ID_VENDOR = python-markdown2_project $(eval $(python-package)) diff --git a/buildroot/package/python-mbstrdecoder/Config.in b/buildroot/package/python-mbstrdecoder/Config.in index 8982814ce..5ba3a19cc 100644 --- a/buildroot/package/python-mbstrdecoder/Config.in +++ b/buildroot/package/python-mbstrdecoder/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_MBSTRDECODER bool "python-mbstrdecoder" depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON_CHARDET # runtime help multi-byte character string decoder. diff --git a/buildroot/package/python-mbstrdecoder/python-mbstrdecoder.hash b/buildroot/package/python-mbstrdecoder/python-mbstrdecoder.hash index f8103b0ad..296930f60 100644 --- a/buildroot/package/python-mbstrdecoder/python-mbstrdecoder.hash +++ b/buildroot/package/python-mbstrdecoder/python-mbstrdecoder.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/mbstrdecoder/json -md5 3ab822b853bfd2f08e35ba85c1ac2e2e mbstrdecoder-1.0.0.tar.gz -sha256 9df7778c0c051c98f6b5a848909202e5cd423c9692665b20d1a9bd0f771b8235 mbstrdecoder-1.0.0.tar.gz +md5 aa377cfa117318583dffa1fd96123bdf mbstrdecoder-1.0.1.tar.gz +sha256 f895e1fb97496855ab5e43de99588787169c01f782c71625142d1a62729e9f9d mbstrdecoder-1.0.1.tar.gz # Locally computed sha256 checksums sha256 7588265082eed5e9f4afd5090c57e610b740ec547b16aaaab739ba07c5eefb15 LICENSE diff --git a/buildroot/package/python-mbstrdecoder/python-mbstrdecoder.mk b/buildroot/package/python-mbstrdecoder/python-mbstrdecoder.mk index 4a768ef69..6474324b7 100644 --- a/buildroot/package/python-mbstrdecoder/python-mbstrdecoder.mk +++ b/buildroot/package/python-mbstrdecoder/python-mbstrdecoder.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MBSTRDECODER_VERSION = 1.0.0 +PYTHON_MBSTRDECODER_VERSION = 1.0.1 PYTHON_MBSTRDECODER_SOURCE = mbstrdecoder-$(PYTHON_MBSTRDECODER_VERSION).tar.gz -PYTHON_MBSTRDECODER_SITE = https://files.pythonhosted.org/packages/5e/05/7dd1704e3e1522757708f59e727b540a6e5032ba6bb20e73851da7111b11 +PYTHON_MBSTRDECODER_SITE = https://files.pythonhosted.org/packages/b7/3b/2524dd4771dfca572269036fb08356715cb78a1c1c2a4dae3a810a86b777 PYTHON_MBSTRDECODER_SETUP_TYPE = setuptools PYTHON_MBSTRDECODER_LICENSE = MIT PYTHON_MBSTRDECODER_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python3-decorator/python3-decorator.mk b/buildroot/package/python3-decorator/python3-decorator.mk index c14f10fbf..ed6d86fe3 100644 --- a/buildroot/package/python3-decorator/python3-decorator.mk +++ b/buildroot/package/python3-decorator/python3-decorator.mk @@ -10,6 +10,8 @@ PYTHON3_DECORATOR_SITE = https://files.pythonhosted.org/packages/dc/c3/9d378af09 PYTHON3_DECORATOR_SOURCE = decorator-$(PYTHON3_DECORATOR_VERSION).tar.gz PYTHON3_DECORATOR_LICENSE = BSD-2-Clause PYTHON3_DECORATOR_LICENSE_FILES = LICENSE.txt +PYTHON3_DECORATOR_CPE_ID_VENDOR = python +PYTHON3_DECORATOR_CPE_ID_PRODUCT = decorator PYTHON3_DECORATOR_SETUP_TYPE = setuptools HOST_PYTHON3_DECORATOR_NEEDS_HOST_PYTHON = python3 diff --git a/buildroot/package/python3-setuptools/python3-setuptools.mk b/buildroot/package/python3-setuptools/python3-setuptools.mk index 3f4f1100f..34d599312 100644 --- a/buildroot/package/python3-setuptools/python3-setuptools.mk +++ b/buildroot/package/python3-setuptools/python3-setuptools.mk @@ -11,6 +11,8 @@ PYTHON3_SETUPTOOLS_SOURCE = setuptools-$(PYTHON3_SETUPTOOLS_VERSION).zip PYTHON3_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/b0/f3/44da7482ac6da3f36f68e253cb04de37365b3dba9036a3c70773b778b485 PYTHON3_SETUPTOOLS_LICENSE = MIT PYTHON3_SETUPTOOLS_LICENSE_FILES = LICENSE +PYTHON3_SETUPTOOLS_CPE_ID_VENDOR = python +PYTHON3_SETUPTOOLS_CPE_ID_PRODUCT = setuptools PYTHON3_SETUPTOOLS_SETUP_TYPE = setuptools HOST_PYTHON3_SETUPTOOLS_DL_SUBDIR = python-setuptools HOST_PYTHON3_SETUPTOOLS_NEEDS_HOST_PYTHON = python3 diff --git a/buildroot/package/python3/python3.hash b/buildroot/package/python3/python3.hash index 2a0ba6ab4..78571b5e0 100644 --- a/buildroot/package/python3/python3.hash +++ b/buildroot/package/python3/python3.hash @@ -1,5 +1,5 @@ -# From https://www.python.org/downloads/release/python-394/ -md5 2a3dba5fc75b695c45cf1806156e1a97 Python-3.9.4.tar.xz +# From https://www.python.org/downloads/release/python-395/ +md5 71f7ada6bec9cdbf4538adc326120cfd Python-3.9.5.tar.xz # Locally computed -sha256 4b0e6644a76f8df864ae24ac500a51bbf68bd098f6a173e27d3b61cdca9aa134 Python-3.9.4.tar.xz +sha256 0c5a140665436ec3dbfbb79e2dfb6d192655f26ef4a29aeffcb6d1820d716d83 Python-3.9.5.tar.xz sha256 599826df92bfdcd2702eac691072498bb096c55af04ee984cf90f70ed77b5a70 LICENSE diff --git a/buildroot/package/python3/python3.mk b/buildroot/package/python3/python3.mk index 345c6a869..b492e0915 100644 --- a/buildroot/package/python3/python3.mk +++ b/buildroot/package/python3/python3.mk @@ -5,7 +5,7 @@ ################################################################################ PYTHON3_VERSION_MAJOR = 3.9 -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 diff --git a/buildroot/package/quickjs/Config.in b/buildroot/package/quickjs/Config.in index 5c3b068c3..dc466241b 100644 --- a/buildroot/package/quickjs/Config.in +++ b/buildroot/package/quickjs/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_QUICKJS bool "quickjs" + 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. depends on !BR2_TOOLCHAIN_USES_UCLIBC @@ -14,6 +15,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_nios2 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 diff --git a/buildroot/package/readline/0000-curses-link.patch b/buildroot/package/readline/0001-curses-link.patch similarity index 85% rename from buildroot/package/readline/0000-curses-link.patch rename to buildroot/package/readline/0001-curses-link.patch index 56b477022..6afc5ba07 100644 --- a/buildroot/package/readline/0000-curses-link.patch +++ b/buildroot/package/readline/0001-curses-link.patch @@ -3,6 +3,8 @@ link readline directly to ncurses since it needs symbols from it upstream readline does this on purpose (no direct linking), but it doesn't make much sense in a Linux world +Signed-off-by: Gustavo Zacarias + --- a/support/shobj-conf +++ b/support/shobj-conf @@ -42,7 +42,7 @@ diff --git a/buildroot/package/rng-tools/rng-tools.mk b/buildroot/package/rng-tools/rng-tools.mk index ae20d9636..dbb7353b8 100644 --- a/buildroot/package/rng-tools/rng-tools.mk +++ b/buildroot/package/rng-tools/rng-tools.mk @@ -8,6 +8,8 @@ RNG_TOOLS_VERSION = 6.11 RNG_TOOLS_SITE = $(call github,nhorman,$(RNG_TOOLS_NAME),V$(RNG_TOOLS_VERSION)) RNG_TOOLS_LICENSE = GPL-2.0 RNG_TOOLS_LICENSE_FILES = COPYING +RNG_TOOLS_CPE_ID_VENDOR = rng-tools_project + RNG_TOOLS_DEPENDENCIES = libsysfs host-pkgconf openssl # From git RNG_TOOLS_AUTORECONF = YES diff --git a/buildroot/package/rp-pppoe/rp-pppoe.mk b/buildroot/package/rp-pppoe/rp-pppoe.mk index 2f0073b6c..ce85da11e 100644 --- a/buildroot/package/rp-pppoe/rp-pppoe.mk +++ b/buildroot/package/rp-pppoe/rp-pppoe.mk @@ -8,6 +8,8 @@ RP_PPPOE_VERSION = 3.14 RP_PPPOE_SITE = https://dianne.skoll.ca/projects/rp-pppoe/download RP_PPPOE_LICENSE = GPL-2.0 RP_PPPOE_LICENSE_FILES = doc/LICENSE +RP_PPPOE_CPE_ID_VENDOR = rp-pppoe_project + RP_PPPOE_DEPENDENCIES = pppd RP_PPPOE_SUBDIR = src RP_PPPOE_TARGET_FILES = pppoe pppoe-server pppoe-relay pppoe-sniff diff --git a/buildroot/package/rsyslog/rsyslog.mk b/buildroot/package/rsyslog/rsyslog.mk index d20a13dbd..36766e8b7 100644 --- a/buildroot/package/rsyslog/rsyslog.mk +++ b/buildroot/package/rsyslog/rsyslog.mk @@ -9,6 +9,10 @@ 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 RSYSLOG_CPE_ID_VENDOR = rsyslog +# rsyslog uses weak permissions for generating log files. +# Ignoring this CVE as Buildroot normally doesn't have local users and a build +# could customize the rsyslog.conf to be more restrictive ($FileCreateMode 0640) +RSYSLOG_IGNORE_CVES += CVE-2015-3243 RSYSLOG_DEPENDENCIES = zlib libestr liblogging libfastjson host-pkgconf RSYSLOG_CONF_ENV = ac_cv_prog_cc_c99='-std=c99' RSYSLOG_PLUGINS = imdiag imfile impstats imptcp \ @@ -89,6 +93,11 @@ RSYSLOG_CONF_OPTS += \ --disable-omjournal endif +define RSYSLOG_INSTALL_INIT_SYSTEMD + $(INSTALL) -m 0755 -D package/rsyslog/rsyslog.service \ + $(TARGET_DIR)/usr/lib/systemd/system/rsyslog.service +endef + define RSYSLOG_INSTALL_INIT_SYSV $(INSTALL) -m 0755 -D package/rsyslog/S01rsyslogd \ $(TARGET_DIR)/etc/init.d/S01rsyslogd diff --git a/buildroot/package/rsyslog/rsyslog.service b/buildroot/package/rsyslog/rsyslog.service new file mode 100644 index 000000000..40c7c2202 --- /dev/null +++ b/buildroot/package/rsyslog/rsyslog.service @@ -0,0 +1,19 @@ +[Unit] +Description=System Logging Service +Requires=syslog.socket +Documentation=man:rsyslogd(8) +Documentation=https://www.rsyslog.com/doc/ + +[Service] +Type=notify +ExecStart=/usr/sbin/rsyslogd -n -iNONE +StandardOutput=null +Restart=on-failure + +# Increase the default a bit in order to allow many simultaneous +# files to be monitored, we might need a lot of fds. +LimitNOFILE=16384 + +[Install] +WantedBy=multi-user.target +Alias=syslog.service diff --git a/buildroot/package/rt-tests/Config.in b/buildroot/package/rt-tests/Config.in index cc9b14dcc..477fa288d 100644 --- a/buildroot/package/rt-tests/Config.in +++ b/buildroot/package/rt-tests/Config.in @@ -2,10 +2,9 @@ config BR2_PACKAGE_RT_TESTS bool "rt-tests" depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14 # deadline scheduler syscall - depends on BR2_USE_MMU # fork() + depends on BR2_USE_MMU # fork(), numactl depends on !BR2_STATIC_LIBS # dlopen depends on !BR2_TOOLCHAIN_USES_MUSL # cyclictest - depends on BR2_PACKAGE_NUMACTL_ARCH_SUPPORTS select BR2_PACKAGE_NUMACTL help Set of utilities for testing the real-time behaviour of a @@ -34,4 +33,3 @@ comment "rt-tests needs a uClibc or glibc toolchain w/ NPTL, headers >= 3.14, dy depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS \ || BR2_TOOLCHAIN_USES_MUSL || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14 depends on BR2_USE_MMU - depends on BR2_PACKAGE_NUMACTL_ARCH_SUPPORTS diff --git a/buildroot/package/ruby/ruby.hash b/buildroot/package/ruby/ruby.hash index 80ffb00c0..58a3b54d7 100644 --- a/buildroot/package/ruby/ruby.hash +++ b/buildroot/package/ruby/ruby.hash @@ -1,5 +1,5 @@ -# https://www.ruby-lang.org/en/news/2020/10/02/ruby-2-7-2-released/ -sha256 1b95ab193cc8f5b5e59d2686cb3d5dcf1ddf2a86cb6950e0b4bdaae5040ec0d6 ruby-2.7.2.tar.xz +# https://www.ruby-lang.org/en/news/2021/04/05/ruby-2-7-3-released/ +sha256 5e91d1650857d43cd6852e05ac54683351e9c301811ee0bef43a67c4605e7db1 ruby-2.7.3.tar.xz # License files, Locally calculated sha256 b09ca195d2de08f0aacfa8793d0af62d7681c304b3ef714b75813721823295a6 LEGAL sha256 967586d538a28955ec2541910cf63c5ac345fcdea94bfb1f1705a1f6eb36bcbb COPYING diff --git a/buildroot/package/ruby/ruby.mk b/buildroot/package/ruby/ruby.mk index 4ab6ea78c..aee173cb6 100644 --- a/buildroot/package/ruby/ruby.mk +++ b/buildroot/package/ruby/ruby.mk @@ -5,7 +5,7 @@ ################################################################################ RUBY_VERSION_MAJOR = 2.7 -RUBY_VERSION = $(RUBY_VERSION_MAJOR).2 +RUBY_VERSION = $(RUBY_VERSION_MAJOR).3 RUBY_VERSION_EXT = 2.7.0 RUBY_SITE = http://cache.ruby-lang.org/pub/ruby/$(RUBY_VERSION_MAJOR) RUBY_SOURCE = ruby-$(RUBY_VERSION).tar.xz diff --git a/buildroot/package/rust-bin/rust-bin.hash b/buildroot/package/rust-bin/rust-bin.hash index 46c023e62..0800dcca9 100644 --- a/buildroot/package/rust-bin/rust-bin.hash +++ b/buildroot/package/rust-bin/rust-bin.hash @@ -1,51 +1,51 @@ -# From https://static.rust-lang.org/dist/rust-1.48.0-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.48.0-i686-unknown-linux-gnu.tar.xz.asc -sha256 ddbfb5af1cd2cb6ae79d6f3f95cf29c0057e6387eada8b3975e7d7658e315aae rust-1.48.0-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.48.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.48.0-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 58270d8e10f72e1712ba08db6b8f8ffca64a63d1a7b220688b59fb05655b3843 rust-1.48.0-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.48.0-aarch64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.48.0-aarch64-unknown-linux-gnu.tar.xz.asc -sha256 3a50eeb64a63a09f79bee49e01f72410d455b9ae1c7f07ebdb6dc0d40e9aa0bc rust-std-1.48.0-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.48.0-arm-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.48.0-arm-unknown-linux-gnueabi.tar.xz.asc -sha256 f512696b54142abda3d68b2ba213ae115d5e898952a50a1fa3d1fe6b4ef71d3c rust-std-1.48.0-arm-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.48.0-arm-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.48.0-arm-unknown-linux-gnueabihf.tar.xz.asc -sha256 5bc6c5dfcc9c345c3f7af519df8ac77c2b0938ea32aa7949f589bec2c7cd3a22 rust-std-1.48.0-arm-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.48.0-armv7-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.48.0-armv7-unknown-linux-gnueabihf.tar.xz.asc -sha256 da71ec82973eb6fdf67de25b5a39d9cb4b943ec2c43de570f4785a3a79036430 rust-std-1.48.0-armv7-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.48.0-i586-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.48.0-i586-unknown-linux-gnu.tar.xz.asc -sha256 d700751756d9b6e7881dd3a5f67bec1b998b3e278a113f4de2125f4281deaf5c rust-std-1.48.0-i586-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.48.0-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.48.0-i686-unknown-linux-gnu.tar.xz.asc -sha256 d4ea5ca6f9c8f9092b50c879f1d9a2620486f08020fa4cac227743a19f6e8cdf rust-std-1.48.0-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.48.0-mips-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.48.0-mips-unknown-linux-gnu.tar.xz.asc -sha256 5c4d49cbd16ac89e39c3cbfae127961289af3419435f2b90e1732a97d9326b35 rust-std-1.48.0-mips-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.48.0-mips64-unknown-linux-gnuabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.48.0-mips64-unknown-linux-gnuabi64.tar.xz.asc -sha256 3fd7194abb8f51c3caf09c222c12700cddef73449d38953c6b1adb04a89dcc31 rust-std-1.48.0-mips64-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.48.0-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.48.0-mips64el-unknown-linux-gnuabi64.tar.xz.asc -sha256 9200f952416488bc68857989bc10239e59b44a6c55153cb063fa03f28f5016f8 rust-std-1.48.0-mips64el-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.48.0-mipsel-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.48.0-mipsel-unknown-linux-gnu.tar.xz.asc -sha256 792008f6c9ea68db39e59312fc372bf649980cf676c01a71da7db399de49966c rust-std-1.48.0-mipsel-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.48.0-powerpc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.48.0-powerpc-unknown-linux-gnu.tar.xz.asc -sha256 58d0da369bfd71a17d27807ef7c052556a771cf209bee068d44504f554bf2a8c rust-std-1.48.0-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.48.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.48.0-powerpc64-unknown-linux-gnu.tar.xz.asc -sha256 10346635487b14aa4b82baeae02ee5a4bffe930090c6c551083262e9811755f0 rust-std-1.48.0-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.48.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.48.0-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 e42b64c5710d3982f22ed744ea21ef2f0196df908c6a673b6df550904583b1c3 rust-std-1.48.0-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.48.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.48.0-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 1c00a6a0dabbf6290728b09f9307d9fa6cc985487f727075c68acd4a600ef3f8 rust-std-1.48.0-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.52.0-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.52.0-i686-unknown-linux-gnu.tar.xz.asc +sha256 b0f504d3dcd744988a1a69716bbf6e2dac872c55e546748ceab8ff1d4fd2da5c rust-1.52.0-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.52.0-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.52.0-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 d440cb932bbaaf43b600bd47b2dd4a05bc669a74d88addeeb943d694638d8e6e rust-1.52.0-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.52.0-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.52.0-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 3720d98988302bc1f676cef2ea3b2a641404cbbe2d47d0f28f8954658586aa12 rust-std-1.52.0-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.52.0-arm-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.52.0-arm-unknown-linux-gnueabi.tar.xz.asc +sha256 593ec073c273028f60cf49d6084ee1809e075682f3e65f9cc86067f84f71d5f7 rust-std-1.52.0-arm-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.52.0-arm-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.52.0-arm-unknown-linux-gnueabihf.tar.xz.asc +sha256 c251bf48962ff8f96e3572cecee12b1b3286477e66cb9c42c1fbe0118d6bdaf5 rust-std-1.52.0-arm-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.52.0-armv7-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.52.0-armv7-unknown-linux-gnueabihf.tar.xz.asc +sha256 c28c6870b9717c6c2e2015a6a5581ccb130f9d393db8166da4513680fe03d4ea rust-std-1.52.0-armv7-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.52.0-i586-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.52.0-i586-unknown-linux-gnu.tar.xz.asc +sha256 f4d094e1cd73372f1565473b072e22278afeb2b728a178e6e9f1c813a9b76c23 rust-std-1.52.0-i586-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.52.0-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.52.0-i686-unknown-linux-gnu.tar.xz.asc +sha256 54749b579a8426dd46afe67feb3c206b0b129e59873a443dcd93ed51232a37d6 rust-std-1.52.0-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.52.0-mips-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.52.0-mips-unknown-linux-gnu.tar.xz.asc +sha256 51492598343e5490c620fd04a16c3f41e2fe9f52232dc67fc1bc937233a2e85d rust-std-1.52.0-mips-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.52.0-mips64-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.52.0-mips64-unknown-linux-gnuabi64.tar.xz.asc +sha256 8db8fac92466389629055d590ca06b7ef1c82621f05cba709413f2ce2c3c5407 rust-std-1.52.0-mips64-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.52.0-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.52.0-mips64el-unknown-linux-gnuabi64.tar.xz.asc +sha256 824391b79c9b28be7a18feab1adb0eed1a9459667e93572fc8b343985ca965ba rust-std-1.52.0-mips64el-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.52.0-mipsel-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.52.0-mipsel-unknown-linux-gnu.tar.xz.asc +sha256 a6de773dfcdc8cac832ac6c356e2c0ecfd94fd7f7242aac82f8922f5bd1639e9 rust-std-1.52.0-mipsel-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.52.0-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.52.0-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 2ad7e17bcb8f632eb4206294ab977bbe1b7562009a3ca84a8d753ff454b1ee07 rust-std-1.52.0-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.52.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.52.0-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 a792384afe034322b4b430049f57ed5e5fe9efbcf74c13c3edaf04062392727a rust-std-1.52.0-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.52.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.52.0-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 af5256a5f1cb189415b0d6b3e349312bbe8a78331a817c8da79ccfe9a07c0aed rust-std-1.52.0-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.52.0-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.52.0-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 dcdc0083facd6484527494ee5b8f72e040a095ab346bb658ce176be573d5c9b4 rust-std-1.52.0-x86_64-unknown-linux-gnu.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/buildroot/package/rust-bin/rust-bin.mk b/buildroot/package/rust-bin/rust-bin.mk index 28901e0cf..71cd8361b 100644 --- a/buildroot/package/rust-bin/rust-bin.mk +++ b/buildroot/package/rust-bin/rust-bin.mk @@ -4,7 +4,7 @@ # ################################################################################ -RUST_BIN_VERSION = 1.48.0 +RUST_BIN_VERSION = 1.52.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/buildroot/package/rust/rust.hash b/buildroot/package/rust/rust.hash index 1c993b933..faf2db5cb 100644 --- a/buildroot/package/rust/rust.hash +++ b/buildroot/package/rust/rust.hash @@ -1,6 +1,6 @@ -# From https://static.rust-lang.org/dist/rustc-1.48.0-src.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rustc-1.48.0-src.tar.xz.asc -sha256 ff0a242392a1865d7b2d08eb5ca6c1b3fd0820741d4c13a51a4b2d5d2bb53908 rustc-1.48.0-src.tar.xz +# From https://static.rust-lang.org/dist/rustc-1.52.0-src.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rustc-1.52.0-src.tar.xz.asc +sha256 2393e923087f3f8f98190eb0743f1b4a8956a35274ae5d3c0fae6e43238c6af8 rustc-1.52.0-src.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/buildroot/package/rust/rust.mk b/buildroot/package/rust/rust.mk index a38a3d64f..66a0c0c8c 100644 --- a/buildroot/package/rust/rust.mk +++ b/buildroot/package/rust/rust.mk @@ -4,7 +4,7 @@ # ################################################################################ -RUST_VERSION = 1.48.0 +RUST_VERSION = 1.52.0 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/buildroot/package/samba4/Config.in b/buildroot/package/samba4/Config.in index 552afe90c..e114a7e13 100644 --- a/buildroot/package/samba4/Config.in +++ b/buildroot/package/samba4/Config.in @@ -32,6 +32,8 @@ config BR2_PACKAGE_SAMBA4_AD_DC bool "AD DC" depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_JANSSON + select BR2_PACKAGE_PYTHON_DNSPYTHON + select BR2_PACKAGE_PYTHON_MARKDOWN select BR2_PACKAGE_SAMBA4_ADS help Enable Active Directory Domain Controller functionality. diff --git a/buildroot/package/samba4/samba4.hash b/buildroot/package/samba4/samba4.hash index 4d808c5fe..905ec14ce 100644 --- a/buildroot/package/samba4/samba4.hash +++ b/buildroot/package/samba4/samba4.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://download.samba.org/pub/samba/stable/samba-4.14.2.tar.asc -sha256 95651da478743f7cb407aec81287536c096e3e18bb4981dbe47ca70bf6181f96 samba-4.14.2.tar.gz +# https://download.samba.org/pub/samba/stable/samba-4.14.4.tar.asc +sha256 89af092a0b00f5354ed287f0aa37b8c2cf9ba2ce67ea6464192e2c18528f89b9 samba-4.14.4.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/buildroot/package/samba4/samba4.mk b/buildroot/package/samba4/samba4.mk index 99c8af9ab..409e2c7a1 100644 --- a/buildroot/package/samba4/samba4.mk +++ b/buildroot/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.14.2 +SAMBA4_VERSION = 4.14.4 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES @@ -149,7 +149,15 @@ define SAMBA4_INSTALL_TARGET_CMDS endef ifeq ($(BR2_PACKAGE_SAMBA4_AD_DC),y) -SAMBA4_DEPENDENCIES += jansson +# host-python-dnspython and host-python-markdown are not strictly +# needed on the host, but on the target. however, samba's configure +# tests for their availability on the host. +SAMBA4_DEPENDENCIES += \ + jansson \ + host-python-dnspython \ + host-python-markdown \ + python-dnspython \ + python-markdown else SAMBA4_CONF_OPTS += --without-ad-dc --without-json endif diff --git a/buildroot/package/sconeserver/Config.in b/buildroot/package/sconeserver/Config.in index 429ac81fe..d46ba85fb 100644 --- a/buildroot/package/sconeserver/Config.in +++ b/buildroot/package/sconeserver/Config.in @@ -26,14 +26,6 @@ config BR2_PACKAGE_SCONESERVER_HTTP_SCONESITE help http::sconesite module for Sconeserver -config BR2_PACKAGE_SCONESERVER_HTTP_SCONESITE_IMAGE - bool "http::sconesite::image" - depends on BR2_PACKAGE_SCONESERVER_HTTP_SCONESITE - depends on BR2_USE_MMU # imagemagick - select BR2_PACKAGE_IMAGEMAGICK - help - http::sconesite::image module for Sconeserver - config BR2_PACKAGE_SCONESERVER_MYSQL bool "mysql" depends on BR2_USE_MMU # mysql diff --git a/buildroot/package/sconeserver/sconeserver.mk b/buildroot/package/sconeserver/sconeserver.mk index 62cc128d7..17407c29f 100644 --- a/buildroot/package/sconeserver/sconeserver.mk +++ b/buildroot/package/sconeserver/sconeserver.mk @@ -14,10 +14,16 @@ SCONESERVER_DEPENDENCIES = \ host-pkgconf \ $(if $(BR2_PACKAGE_PCRE),pcre) \ zlib +# disable image as it fails to build with ImageMagick # disable markdown module because its git submodule cmark # https://github.com/sconemad/sconeserver/tree/master/markdown # has no cross-compile support provided by the sconeserver build system -SCONESERVER_CONF_OPTS += --with-ip --with-local --with-ip6 --without-markdown +SCONESERVER_CONF_OPTS += \ + --with-ip \ + --with-local \ + --with-ip6 \ + --without-image \ + --without-markdown # Sconeserver configure script fails to find the libxml2 headers. ifeq ($(BR2_PACKAGE_LIBXML2),y) @@ -45,13 +51,6 @@ else SCONESERVER_CONF_OPTS += --without-sconesite endif -ifeq ($(BR2_PACKAGE_SCONESERVER_HTTP_SCONESITE_IMAGE),y) -SCONESERVER_DEPENDENCIES += imagemagick -SCONESERVER_CONF_OPTS += --with-image -else -SCONESERVER_CONF_OPTS += --without-image -endif - ifeq ($(BR2_PACKAGE_SCONESERVER_MYSQL),y) SCONESERVER_DEPENDENCIES += mysql SCONESERVER_CONF_OPTS += \ diff --git a/buildroot/package/snort/snort.hash b/buildroot/package/snort/snort.hash index 1103152ea..115a8398d 100644 --- a/buildroot/package/snort/snort.hash +++ b/buildroot/package/snort/snort.hash @@ -1,8 +1,8 @@ # From https://www.snort.org/downloads/snort/md5s -md5 3fe89f22def4e9ffda01f07f816e666d snort-2.9.17.tar.gz +md5 006d6b0d71c6c7bd23eac74670f5b4e6 snort-2.9.17.1.tar.gz # Locally computed: -sha256 c3b234c3922a09b0368b847ddb8d1fa371b741f032f42aa9ab53d67b428dc648 snort-2.9.17.tar.gz +sha256 303d3d5dc5affecfeaad3a331d3163f901d48d960fdd6598cb55c6d1591eed82 snort-2.9.17.1.tar.gz # Hash for license files: sha256 f98260a6d3e5ef4ede8a2a6b698e5ac91d64c09243f7171e1c5b17b920a835c7 LICENSE diff --git a/buildroot/package/snort/snort.mk b/buildroot/package/snort/snort.mk index 412c69f83..3df294117 100644 --- a/buildroot/package/snort/snort.mk +++ b/buildroot/package/snort/snort.mk @@ -4,7 +4,7 @@ # ################################################################################ -SNORT_VERSION = 2.9.17 +SNORT_VERSION = 2.9.17.1 SNORT_SITE = https://www.snort.org/downloads/snort SNORT_LICENSE = GPL-2.0 SNORT_LICENSE_FILES = LICENSE COPYING diff --git a/buildroot/package/sox/0004-configure.ac-fix-static-linking-with-magic.patch b/buildroot/package/sox/0004-configure.ac-fix-static-linking-with-magic.patch index 2fbb8ff8a..7d2e390df 100644 --- a/buildroot/package/sox/0004-configure.ac-fix-static-linking-with-magic.patch +++ b/buildroot/package/sox/0004-configure.ac-fix-static-linking-with-magic.patch @@ -1,11 +1,12 @@ -From d591a38d934b2a6750f16c7bd46a9ad12233301c Mon Sep 17 00:00:00 2001 +From 4630e574e6c0269b94fd910e7c72b8ad1ee62ce7 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 3 Mar 2021 16:48:57 +0100 Subject: [PATCH] configure.ac: fix static linking with magic -Put back -lz (i.e. ZLIB_LIBS) when searching for magic which was -wrongly removed by commit 6ff0e9322f9891f5a6ac6c9b3bceffbfca16bec3. This -will fix the following static build failure: +Use SOX_FMT_PKG to retrieve magic dependencies (e.g. bzip2 or zlib) +indeed -lz (i.e. ZLIB_LIBS) was wrongly removed by commit +6ff0e9322f9891f5a6ac6c9b3bceffbfca16bec3. This will fix the following +static build failure: configure:11677: checking for magic_open in -lmagic configure:11702: /srv/storage/autobuild/run/instance-0/output-1/host/bin/arm-linux-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -static -Wall -Wmissing-prototypes -Wstrict-prototypes -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -static -Wl,--as-needed conftest.c -lmagic >&5 @@ -30,19 +31,18 @@ Signed-off-by: Fabrice Fontaine 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 896714f5..ca7bccaa 100644 +index 896714f5..8ae3202c 100644 --- a/configure.ac +++ b/configure.ac -@@ -80,8 +80,8 @@ SOX_REPORT([other], [LADSPA effect plugins], [$HAVE_LADSPA]) +@@ -80,7 +80,7 @@ SOX_REPORT([other], [LADSPA effect plugins], [$HAVE_LADSPA]) dnl Various libraries -SOX_WITH_LIB([magic], [magic.h], [magic], [magic_open]) ++SOX_FMT_PKG([magic], [libmagic]) SOX_CHECK_LIB([ZLIB], [zlib.h], [z], [uncompress]) -+SOX_WITH_LIB([magic], [magic.h], [magic], [magic_open], [], [], [], [$ZLIB_LIBS]) SOX_WITH_LIB([png], [png.h], [png], [png_set_rows], [], [], [], [$ZLIB_LIBS]) SOX_WITH_LIB([id3tag], [id3tag.h], [id3tag], [id3_file_open], [], [], [], [$ZLIB_LIBS]) - SOX_WITH_LIB([libgsm], [gsm/gsm.h gsm.h], [gsm], [gsm_create]) -- -2.30.0 +2.30.1 diff --git a/buildroot/package/sox/sox.mk b/buildroot/package/sox/sox.mk index 99ba20ac9..dcc1a670b 100644 --- a/buildroot/package/sox/sox.mk +++ b/buildroot/package/sox/sox.mk @@ -34,9 +34,9 @@ endif ifeq ($(BR2_PACKAGE_FILE),y) SOX_DEPENDENCIES += file -SOX_CONF_OPTS += --with-magic +SOX_CONF_OPTS += --enable-magic else -SOX_CONF_OPTS += --without-magic +SOX_CONF_OPTS += --disable-magic endif ifeq ($(BR2_PACKAGE_FLAC),y) diff --git a/buildroot/package/sysdig/sysdig.mk b/buildroot/package/sysdig/sysdig.mk index bcbb5ce01..08d93750a 100644 --- a/buildroot/package/sysdig/sysdig.mk +++ b/buildroot/package/sysdig/sysdig.mk @@ -8,6 +8,7 @@ SYSDIG_VERSION = 0.23.1 SYSDIG_SITE = $(call github,draios,sysdig,$(SYSDIG_VERSION)) SYSDIG_LICENSE = GPL-2.0 SYSDIG_LICENSE_FILES = COPYING +SYSDIG_CPE_ID_VENDOR = sysdig SYSDIG_CONF_OPTS = -DENABLE_DKMS=OFF -DUSE_BUNDLED_DEPS=OFF SYSDIG_SUPPORTS_IN_SOURCE_BUILD = NO diff --git a/buildroot/package/sysklogd/sysklogd.hash b/buildroot/package/sysklogd/sysklogd.hash index 0ef5e1711..6d3ba8f96 100644 --- a/buildroot/package/sysklogd/sysklogd.hash +++ b/buildroot/package/sysklogd/sysklogd.hash @@ -1,3 +1,6 @@ +# Upstream .md5 and .sha256 from GitHub +md5 2c6749c49f52b8c5dad18e9a9315e7dd sysklogd-2.2.3.tar.gz +sha256 e7ea09c15511a63c430e84f65ce3bf55a0386ee419ab52e9341c4a9fabae59ad sysklogd-2.2.3.tar.gz + # Locally calculated -sha256 2752a693a2486f7e532b6b028296c8ac0a97def8a4848f1e915f3e583fd0b4b6 sysklogd-2.2.2.tar.gz sha256 7a71d7603a7c4456df441463e54da35acf151c1be0879246de63544f1f34f477 LICENSE diff --git a/buildroot/package/sysklogd/sysklogd.mk b/buildroot/package/sysklogd/sysklogd.mk index 011097406..7c5de9574 100644 --- a/buildroot/package/sysklogd/sysklogd.mk +++ b/buildroot/package/sysklogd/sysklogd.mk @@ -4,7 +4,7 @@ # ################################################################################ -SYSKLOGD_VERSION = 2.2.2 +SYSKLOGD_VERSION = 2.2.3 SYSKLOGD_SITE = https://github.com/troglobit/sysklogd/releases/download/v$(SYSKLOGD_VERSION) SYSKLOGD_LICENSE = BSD-3-Clause SYSKLOGD_LICENSE_FILES = LICENSE diff --git a/buildroot/package/sysstat/sysstat.mk b/buildroot/package/sysstat/sysstat.mk index 7d254d664..8ec496681 100644 --- a/buildroot/package/sysstat/sysstat.mk +++ b/buildroot/package/sysstat/sysstat.mk @@ -11,6 +11,7 @@ SYSSTAT_CONF_OPTS = --disable-file-attr SYSSTAT_DEPENDENCIES = host-gettext $(TARGET_NLS_DEPENDENCIES) SYSSTAT_LICENSE = GPL-2.0+ SYSSTAT_LICENSE_FILES = COPYING +SYSSTAT_CPE_ID_VENDOR = sysstat_project ifeq ($(BR2_PACKAGE_LM_SENSORS),y) SYSSTAT_DEPENDENCIES += lm-sensors diff --git a/buildroot/package/systemd/Config.in b/buildroot/package/systemd/Config.in index fbe1a4081..d65830821 100644 --- a/buildroot/package/systemd/Config.in +++ b/buildroot/package/systemd/Config.in @@ -233,7 +233,7 @@ comment "homed support needs a toolchain w/ threads, dynamic library, kernel hea depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_TOOLCHAIN_HAS_THREADS || \ - BR2_STATIC_LIBS || BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 + BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 config BR2_PACKAGE_SYSTEMD_HOSTNAMED bool "enable hostname daemon" diff --git a/buildroot/package/systemd/systemd.mk b/buildroot/package/systemd/systemd.mk index 41332f207..74c561e67 100644 --- a/buildroot/package/systemd/systemd.mk +++ b/buildroot/package/systemd/systemd.mk @@ -523,8 +523,7 @@ endef SYSTEMD_POST_INSTALL_TARGET_HOOKS += \ SYSTEMD_INSTALL_INIT_HOOK \ - SYSTEMD_INSTALL_MACHINEID_HOOK \ - SYSTEMD_INSTALL_RESOLVCONF_HOOK + SYSTEMD_INSTALL_MACHINEID_HOOK define SYSTEMD_INSTALL_IMAGES_CMDS $(SYSTEMD_INSTALL_BOOT_FILES) @@ -556,7 +555,9 @@ define SYSTEMD_INSTALL_NSSCONFIG_HOOK $(TARGET_DIR)/etc/nsswitch.conf endef -SYSTEMD_TARGET_FINALIZE_HOOKS += SYSTEMD_INSTALL_NSSCONFIG_HOOK +SYSTEMD_TARGET_FINALIZE_HOOKS += \ + SYSTEMD_INSTALL_NSSCONFIG_HOOK \ + SYSTEMD_INSTALL_RESOLVCONF_HOOK ifneq ($(call qstrip,$(BR2_TARGET_GENERIC_GETTY_PORT)),) # systemd provides multiple units to autospawn getty as neede diff --git a/buildroot/package/sysvinit/sysvinit.mk b/buildroot/package/sysvinit/sysvinit.mk index c7ddf67c2..7deec9697 100644 --- a/buildroot/package/sysvinit/sysvinit.mk +++ b/buildroot/package/sysvinit/sysvinit.mk @@ -9,6 +9,7 @@ SYSVINIT_SOURCE = sysvinit-$(SYSVINIT_VERSION).tar.xz SYSVINIT_SITE = http://download.savannah.nongnu.org/releases/sysvinit SYSVINIT_LICENSE = GPL-2.0+ SYSVINIT_LICENSE_FILES = COPYING +SYSVINIT_CPE_ID_VENDOR = sysvinit_project SYSVINIT_MAKE_OPTS = SYSROOT=$(STAGING_DIR) diff --git a/buildroot/package/tar/0001-Fix-memory-leak-in-read_header.patch b/buildroot/package/tar/0001-Fix-memory-leak-in-read_header.patch new file mode 100644 index 000000000..874b27df3 --- /dev/null +++ b/buildroot/package/tar/0001-Fix-memory-leak-in-read_header.patch @@ -0,0 +1,129 @@ +From d9d4435692150fa8ff68e1b1a473d187cc3fd777 Mon Sep 17 00:00:00 2001 +From: Sergey Poznyakoff +Date: Sun, 17 Jan 2021 20:41:11 +0200 +Subject: [PATCH] Fix memory leak in read_header + +Bug reported in https://savannah.gnu.org/bugs/?59897 + +* src/list.c (read_header): Don't return directly from the loop. +Instead set the status and break. Return the status. Free +next_long_name and next_long_link before returning. + +Signed-off-by: Peter Korsgaard +--- + src/list.c | 40 ++++++++++++++++++++++++++++------------ + 1 file changed, 28 insertions(+), 12 deletions(-) + +diff --git a/src/list.c b/src/list.c +index e40a5c8..d7ef441 100644 +--- a/src/list.c ++++ b/src/list.c +@@ -408,26 +408,27 @@ read_header (union block **return_block, struct tar_stat_info *info, + enum read_header_mode mode) + { + union block *header; +- union block *header_copy; + char *bp; + union block *data_block; + size_t size, written; +- union block *next_long_name = 0; +- union block *next_long_link = 0; ++ union block *next_long_name = NULL; ++ union block *next_long_link = NULL; + size_t next_long_name_blocks = 0; + size_t next_long_link_blocks = 0; +- ++ enum read_header status = HEADER_SUCCESS; ++ + while (1) + { +- enum read_header status; +- + header = find_next_block (); + *return_block = header; + if (!header) +- return HEADER_END_OF_FILE; ++ { ++ status = HEADER_END_OF_FILE; ++ break; ++ } + + if ((status = tar_checksum (header, false)) != HEADER_SUCCESS) +- return status; ++ break; + + /* Good block. Decode file size and return. */ + +@@ -437,7 +438,10 @@ read_header (union block **return_block, struct tar_stat_info *info, + { + info->stat.st_size = OFF_FROM_HEADER (header->header.size); + if (info->stat.st_size < 0) +- return HEADER_FAILURE; ++ { ++ status = HEADER_FAILURE; ++ break; ++ } + } + + if (header->header.typeflag == GNUTYPE_LONGNAME +@@ -447,10 +451,14 @@ read_header (union block **return_block, struct tar_stat_info *info, + || header->header.typeflag == SOLARIS_XHDTYPE) + { + if (mode == read_header_x_raw) +- return HEADER_SUCCESS_EXTENDED; ++ { ++ status = HEADER_SUCCESS_EXTENDED; ++ break; ++ } + else if (header->header.typeflag == GNUTYPE_LONGNAME + || header->header.typeflag == GNUTYPE_LONGLINK) + { ++ union block *header_copy; + size_t name_size = info->stat.st_size; + size_t n = name_size % BLOCKSIZE; + size = name_size + BLOCKSIZE; +@@ -517,7 +525,10 @@ read_header (union block **return_block, struct tar_stat_info *info, + xheader_decode_global (&xhdr); + xheader_destroy (&xhdr); + if (mode == read_header_x_global) +- return HEADER_SUCCESS_EXTENDED; ++ { ++ status = HEADER_SUCCESS_EXTENDED; ++ break; ++ } + } + + /* Loop! */ +@@ -536,6 +547,7 @@ read_header (union block **return_block, struct tar_stat_info *info, + name = next_long_name->buffer + BLOCKSIZE; + recent_long_name = next_long_name; + recent_long_name_blocks = next_long_name_blocks; ++ next_long_name = NULL; + } + else + { +@@ -567,6 +579,7 @@ read_header (union block **return_block, struct tar_stat_info *info, + name = next_long_link->buffer + BLOCKSIZE; + recent_long_link = next_long_link; + recent_long_link_blocks = next_long_link_blocks; ++ next_long_link = NULL; + } + else + { +@@ -578,9 +591,12 @@ read_header (union block **return_block, struct tar_stat_info *info, + } + assign_string (&info->link_name, name); + +- return HEADER_SUCCESS; ++ break; + } + } ++ free (next_long_name); ++ free (next_long_link); ++ return status; + } + + #define ISOCTAL(c) ((c)>='0'&&(c)<='7') +-- +2.20.1 + diff --git a/buildroot/package/tar/tar.mk b/buildroot/package/tar/tar.mk index 2da731f80..c512d13ef 100644 --- a/buildroot/package/tar/tar.mk +++ b/buildroot/package/tar/tar.mk @@ -13,6 +13,11 @@ 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 + +# 0001-Fix-memory-leak-in-read_header.patch +TAR_IGNORE_CVES += CVE-2021-20193 ifeq ($(BR2_PACKAGE_ACL),y) TAR_DEPENDENCIES += acl diff --git a/buildroot/package/timescaledb/timescaledb.hash b/buildroot/package/timescaledb/timescaledb.hash index f275c3d4b..dfde3b51e 100644 --- a/buildroot/package/timescaledb/timescaledb.hash +++ b/buildroot/package/timescaledb/timescaledb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 96e51d5240547f0223c34b91263f6fffca46927710764bf450aa61e9756189bd timescaledb-2.0.1.tar.gz +sha256 afb11b632455cfa593f60946125c8ed6ac0db4713c203d6582e662266f9e1045 timescaledb-2.0.2.tar.gz sha256 0378e0948feefd85f579319c74d6e2b671194037f550c7176ef26649d94c895b LICENSE diff --git a/buildroot/package/timescaledb/timescaledb.mk b/buildroot/package/timescaledb/timescaledb.mk index 0d5dc12d9..08680f890 100644 --- a/buildroot/package/timescaledb/timescaledb.mk +++ b/buildroot/package/timescaledb/timescaledb.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIMESCALEDB_VERSION = 2.0.1 +TIMESCALEDB_VERSION = 2.0.2 TIMESCALEDB_SITE = $(call github,timescale,timescaledb,$(TIMESCALEDB_VERSION)) TIMESCALEDB_LICENSE = Apache-2.0 TIMESCALEDB_LICENSE_FILES = LICENSE diff --git a/buildroot/package/tio/Config.in b/buildroot/package/tio/Config.in index 6c748c5d1..d5d619100 100644 --- a/buildroot/package/tio/Config.in +++ b/buildroot/package/tio/Config.in @@ -1,8 +1,15 @@ config BR2_PACKAGE_TIO bool "tio" + depends on !BR2_sparc64 && !BR2_sparc help "tio" is a simple TTY terminal application which features a straightforward commandline interface to easily connect to TTY devices for basic input/output. https://tio.github.io/ + +# tio is disabled for sparc and sparc64 architectures because it fails +# to build with a redefinition of 'struct termio' error, with no proper +# fix or workaround for now +comment "tio is disabled for sparc and sparc64 architectures" + depends on BR2_sparc64 || BR2_sparc diff --git a/buildroot/package/tor/tor.hash b/buildroot/package/tor/tor.hash index e46335f79..dd20bbc92 100644 --- a/buildroot/package/tor/tor.hash +++ b/buildroot/package/tor/tor.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 447fcaaa133e2ef22427e98098a60a9c495edf9ff3e0dd13f484b9ad0185f074 tor-0.4.5.7.tar.gz +sha256 57ded091e8bcdcebb0013fe7ef4a4439827cb169358c7874fd05fa00d813e227 tor-0.4.5.8.tar.gz sha256 47b54ed17e8fdcab3c44729a1789a09b208f9a63a845a7e50def9df729eebad0 LICENSE diff --git a/buildroot/package/tor/tor.mk b/buildroot/package/tor/tor.mk index 56779f163..4a16967d4 100644 --- a/buildroot/package/tor/tor.mk +++ b/buildroot/package/tor/tor.mk @@ -4,7 +4,7 @@ # ################################################################################ -TOR_VERSION = 0.4.5.7 +TOR_VERSION = 0.4.5.8 TOR_SITE = https://dist.torproject.org TOR_LICENSE = BSD-3-Clause TOR_LICENSE_FILES = LICENSE @@ -73,9 +73,4 @@ endef TOR_POST_INSTALL_TARGET_HOOKS += TOR_INSTALL_CONF -define TOR_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 $(@D)/contrib/dist/tor.service \ - $(TARGET_DIR)/usr/lib/systemd/system/tor.service -endef - $(eval $(autotools-package)) diff --git a/buildroot/package/usb_modeswitch/usb_modeswitch.hash b/buildroot/package/usb_modeswitch/usb_modeswitch.hash index 4cbd5dbea..765a2438c 100644 --- a/buildroot/package/usb_modeswitch/usb_modeswitch.hash +++ b/buildroot/package/usb_modeswitch/usb_modeswitch.hash @@ -1,5 +1,5 @@ -# From http://www.draisberghof.de/usb_modeswitch/ -md5 be73dcc84025794081a1d4d4e5a75e4c usb-modeswitch-2.6.0.tar.bz2 +# From https://www.draisberghof.de/usb_modeswitch/usb-modeswitch-versions.xml +md5 69d00d6ed7097b97d972a159d14cfba1 usb-modeswitch-2.6.1.tar.bz2 # Locally calculated -sha256 c215236e6bada6e659fc195a31d611ea298a4bdb4d57a0d68c553b56585f8ba3 usb-modeswitch-2.6.0.tar.bz2 -sha256 6195429209313925c0eba6c0da4ee7a6cb4277b99e35c886913f80f91ec20b94 COPYING +sha256 5195d9e136e52f658f19e9f93e4f982b1b67bffac197d0a455cd8c2cd245fa34 usb-modeswitch-2.6.1.tar.bz2 +sha256 6195429209313925c0eba6c0da4ee7a6cb4277b99e35c886913f80f91ec20b94 COPYING diff --git a/buildroot/package/usb_modeswitch/usb_modeswitch.mk b/buildroot/package/usb_modeswitch/usb_modeswitch.mk index 064e1960b..f2ee004b4 100644 --- a/buildroot/package/usb_modeswitch/usb_modeswitch.mk +++ b/buildroot/package/usb_modeswitch/usb_modeswitch.mk @@ -4,7 +4,7 @@ # ################################################################################ -USB_MODESWITCH_VERSION = 2.6.0 +USB_MODESWITCH_VERSION = 2.6.1 USB_MODESWITCH_SOURCE = usb-modeswitch-$(USB_MODESWITCH_VERSION).tar.bz2 USB_MODESWITCH_SITE = http://www.draisberghof.de/usb_modeswitch USB_MODESWITCH_DEPENDENCIES = libusb diff --git a/buildroot/package/wampcc/wampcc.mk b/buildroot/package/wampcc/wampcc.mk index 5e7ee0365..11bb1f90b 100644 --- a/buildroot/package/wampcc/wampcc.mk +++ b/buildroot/package/wampcc/wampcc.mk @@ -13,7 +13,7 @@ WAMPCC_LICENSE_FILES = LICENSE # Uses __atomic_fetch_add_8 ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -WAMPCC_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -latomic" +WAMPCC_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic endif $(eval $(cmake-package)) diff --git a/buildroot/package/wpa_supplicant/0002-ASN.1-Validate-DigestAlgorithmIdentifier-parameters.patch b/buildroot/package/wpa_supplicant/0002-ASN.1-Validate-DigestAlgorithmIdentifier-parameters.patch new file mode 100644 index 000000000..5dcfed940 --- /dev/null +++ b/buildroot/package/wpa_supplicant/0002-ASN.1-Validate-DigestAlgorithmIdentifier-parameters.patch @@ -0,0 +1,116 @@ +From a0541334a6394f8237a4393b7372693cd7e96f15 Mon Sep 17 00:00:00 2001 +From: Jouni Malinen +Date: Sat, 13 Mar 2021 18:19:31 +0200 +Subject: [PATCH] ASN.1: Validate DigestAlgorithmIdentifier parameters + +The supported hash algorithms do not use AlgorithmIdentifier parameters. +However, there are implementations that include NULL parameters in +addition to ones that omit the parameters. Previous implementation did +not check the parameters value at all which supported both these cases, +but did not reject any other unexpected information. + +Use strict validation of digest algorithm parameters and reject any +unexpected value when validating a signature. This is needed to prevent +potential forging attacks. + +Signed-off-by: Jouni Malinen +Signed-off-by: Peter Korsgaard +--- + src/tls/pkcs1.c | 21 +++++++++++++++++++++ + src/tls/x509v3.c | 20 ++++++++++++++++++++ + 2 files changed, 41 insertions(+) + +diff --git a/src/tls/pkcs1.c b/src/tls/pkcs1.c +index bbdb0d72d..5761dfed0 100644 +--- a/src/tls/pkcs1.c ++++ b/src/tls/pkcs1.c +@@ -244,6 +244,8 @@ int pkcs1_v15_sig_ver(struct crypto_public_key *pk, + os_free(decrypted); + return -1; + } ++ wpa_hexdump(MSG_MSGDUMP, "PKCS #1: DigestInfo", ++ hdr.payload, hdr.length); + + pos = hdr.payload; + end = pos + hdr.length; +@@ -265,6 +267,8 @@ int pkcs1_v15_sig_ver(struct crypto_public_key *pk, + os_free(decrypted); + return -1; + } ++ wpa_hexdump(MSG_MSGDUMP, "PKCS #1: DigestAlgorithmIdentifier", ++ hdr.payload, hdr.length); + da_end = hdr.payload + hdr.length; + + if (asn1_get_oid(hdr.payload, hdr.length, &oid, &next)) { +@@ -273,6 +277,23 @@ int pkcs1_v15_sig_ver(struct crypto_public_key *pk, + os_free(decrypted); + return -1; + } ++ wpa_hexdump(MSG_MSGDUMP, "PKCS #1: Digest algorithm parameters", ++ next, da_end - next); ++ ++ /* ++ * RFC 5754: The correct encoding for the SHA2 algorithms would be to ++ * omit the parameters, but there are implementation that encode these ++ * as a NULL element. Allow these two cases and reject anything else. ++ */ ++ if (da_end > next && ++ (asn1_get_next(next, da_end - next, &hdr) < 0 || ++ !asn1_is_null(&hdr) || ++ hdr.payload + hdr.length != da_end)) { ++ wpa_printf(MSG_DEBUG, ++ "PKCS #1: Unexpected digest algorithm parameters"); ++ os_free(decrypted); ++ return -1; ++ } + + if (!asn1_oid_equal(&oid, hash_alg)) { + char txt[100], txt2[100]; +diff --git a/src/tls/x509v3.c b/src/tls/x509v3.c +index a8944dd2f..df337ec4d 100644 +--- a/src/tls/x509v3.c ++++ b/src/tls/x509v3.c +@@ -1964,6 +1964,7 @@ int x509_check_signature(struct x509_certificate *issuer, + os_free(data); + return -1; + } ++ wpa_hexdump(MSG_MSGDUMP, "X509: DigestInfo", hdr.payload, hdr.length); + + pos = hdr.payload; + end = pos + hdr.length; +@@ -1985,6 +1986,8 @@ int x509_check_signature(struct x509_certificate *issuer, + os_free(data); + return -1; + } ++ wpa_hexdump(MSG_MSGDUMP, "X509: DigestAlgorithmIdentifier", ++ hdr.payload, hdr.length); + da_end = hdr.payload + hdr.length; + + if (asn1_get_oid(hdr.payload, hdr.length, &oid, &next)) { +@@ -1992,6 +1995,23 @@ int x509_check_signature(struct x509_certificate *issuer, + os_free(data); + return -1; + } ++ wpa_hexdump(MSG_MSGDUMP, "X509: Digest algorithm parameters", ++ next, da_end - next); ++ ++ /* ++ * RFC 5754: The correct encoding for the SHA2 algorithms would be to ++ * omit the parameters, but there are implementation that encode these ++ * as a NULL element. Allow these two cases and reject anything else. ++ */ ++ if (da_end > next && ++ (asn1_get_next(next, da_end - next, &hdr) < 0 || ++ !asn1_is_null(&hdr) || ++ hdr.payload + hdr.length != da_end)) { ++ wpa_printf(MSG_DEBUG, ++ "X509: Unexpected digest algorithm parameters"); ++ os_free(data); ++ return -1; ++ } + + if (x509_sha1_oid(&oid)) { + if (signature->oid.oid[6] != 5 /* sha-1WithRSAEncryption */) { +-- +2.20.1 + diff --git a/buildroot/package/wpa_supplicant/wpa_supplicant.mk b/buildroot/package/wpa_supplicant/wpa_supplicant.mk index 46def443e..c24bd0c94 100644 --- a/buildroot/package/wpa_supplicant/wpa_supplicant.mk +++ b/buildroot/package/wpa_supplicant/wpa_supplicant.mk @@ -26,6 +26,9 @@ WPA_SUPPLICANT_IGNORE_CVES += CVE-2019-16275 # 0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch WPA_SUPPLICANT_IGNORE_CVES += CVE-2021-27803 +# 0002-ASN.1-Validate-DigestAlgorithmIdentifier-parameters.patch +WPA_SUPPLICANT_IGNORE_CVES += CVE-2021-30004 + # install the wpa_client library WPA_SUPPLICANT_INSTALL_STAGING = YES diff --git a/buildroot/package/x11r7/xdriver_xf86-video-ati/Config.in b/buildroot/package/x11r7/xdriver_xf86-video-ati/Config.in index fdf1ebd18..1246014dc 100644 --- a/buildroot/package/x11r7/xdriver_xf86-video-ati/Config.in +++ b/buildroot/package/x11r7/xdriver_xf86-video-ati/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_ATI bool "xf86-video-ati" + depends on BR2_i386 || BR2_x86_64 # DRI radeon r100 driver depends on BR2_PACKAGE_MESA3D select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_LIBDRM_RADEON @@ -10,4 +11,5 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_ATI ATI video driver comment "xf86-video-ati needs mesa3d" + depends on BR2_i386 || BR2_x86_64 depends on !BR2_PACKAGE_MESA3D diff --git a/buildroot/package/x11r7/xlib_libXaw/xlib_libXaw.hash b/buildroot/package/x11r7/xlib_libXaw/xlib_libXaw.hash index 159e007bc..f289e6615 100644 --- a/buildroot/package/x11r7/xlib_libXaw/xlib_libXaw.hash +++ b/buildroot/package/x11r7/xlib_libXaw/xlib_libXaw.hash @@ -1,4 +1,6 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002591.html -sha256 8ef8067312571292ccc2bbe94c41109dcf022ea5a4ec71656a83d8cce9edb0cd libXaw-1.0.13.tar.bz2 +# 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 + # Locally calculated -sha256 9f5adb26952f93b3e4650285b94ec6c61a27aab5a21088bfb6694001be1b360d COPYING +sha256 9f5adb26952f93b3e4650285b94ec6c61a27aab5a21088bfb6694001be1b360d COPYING diff --git a/buildroot/package/x11r7/xlib_libXaw/xlib_libXaw.mk b/buildroot/package/x11r7/xlib_libXaw/xlib_libXaw.mk index 17d51a957..6b615a8de 100644 --- a/buildroot/package/x11r7/xlib_libXaw/xlib_libXaw.mk +++ b/buildroot/package/x11r7/xlib_libXaw/xlib_libXaw.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBXAW_VERSION = 1.0.13 +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_LICENSE = MIT diff --git a/buildroot/package/x11r7/xserver_xorg-server/Config.in b/buildroot/package/x11r7/xserver_xorg-server/Config.in index 3bf5af89b..fcd3d0ae0 100644 --- a/buildroot/package/x11r7/xserver_xorg-server/Config.in +++ b/buildroot/package/x11r7/xserver_xorg-server/Config.in @@ -74,36 +74,6 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE endchoice -if BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE - -config BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE_EVDEV - bool "Enable KDrive/TinyX evdev input driver" - help - Enable evdev input driver in KDrive. This allows KDrive to - use input devices that are integrated in the Linux input - subsystem, i.e have a /dev/input/eventX device file. This is - most likely the input driver you want to use. - - This driver can then be enabled by running the X server - using: - - Xfbdev -keybd evdev,,device=/dev/input/eventX - -mouse evdev,,device=/dev/input/eventY - -config BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE_KBD - bool "Enable KDrive/TinyX kbd input driver" - help - Enable kbd input driver in KDrive. It uses the console - keyboard as input device. - -config BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE_MOUSE - bool "Enable KDrive/TinyX mouse input driver" - help - Enable mouse input driver in KDrive. It supports PS/2 mice - and serial port mice. - -endif - comment "Optional Servers" config BR2_PACKAGE_XSERVER_XORG_SERVER_XVFB diff --git a/buildroot/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash b/buildroot/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash index d6b3c92e0..9876255c8 100644 --- a/buildroot/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash +++ b/buildroot/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash @@ -1,6 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2020-December/003067.html -sha256 977420c082450dc808de301ef56af4856d653eea71519a973c3490a780cb7c99 xorg-server-1.20.10.tar.bz2 -sha512 a07bee380bb72f2117fe6f831a6e4aded19bea1f2b36e42a019a30348e98d6fe65c0617cf819be9c6b405502f88cafb829df30aab32393774b71f1418a4cefae xorg-server-1.20.10.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2021-April/003081.html +sha256 914c796e3ffabe1af48071d40ccc85e92117c97a9082ed1df29e4d64e3c34c49 xorg-server-1.20.11.tar.bz2 +sha512 1017015b9fd5d53788abe3641d877e6df8609841fa5c1847c0a5e133ddcc1b758a5d695304ebd36828099ec201a85b6b70b46f5ea4f81c5bd3a16fa6e175e3c2 xorg-server-1.20.11.tar.bz2 # Locally calculated sha256 4cc0447a22635c7b2f1a93fec4aa94f1970fadeb72a063de006b51cf4963a06f COPYING diff --git a/buildroot/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/buildroot/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index fa8ae13b8..ae17dd535 100644 --- a/buildroot/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/buildroot/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -4,7 +4,7 @@ # ################################################################################ -XSERVER_XORG_SERVER_VERSION = 1.20.10 +XSERVER_XORG_SERVER_VERSION = 1.20.11 XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.bz2 XSERVER_XORG_SERVER_SITE = https://xorg.freedesktop.org/archive/individual/xserver XSERVER_XORG_SERVER_LICENSE = MIT @@ -90,35 +90,11 @@ endif ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE),y) XSERVER_XORG_SERVER_CONF_OPTS += \ --enable-kdrive \ - --enable-xfbdev \ --disable-glx \ - --disable-dri \ - --disable-xsdl -define XSERVER_CREATE_X_SYMLINK - ln -f -s Xfbdev $(TARGET_DIR)/usr/bin/X -endef -XSERVER_XORG_SERVER_POST_INSTALL_TARGET_HOOKS += XSERVER_CREATE_X_SYMLINK - -ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE_EVDEV),y) -XSERVER_XORG_SERVER_CONF_OPTS += --enable-kdrive-evdev -else -XSERVER_XORG_SERVER_CONF_OPTS += --disable-kdrive-evdev -endif - -ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE_KBD),y) -XSERVER_XORG_SERVER_CONF_OPTS += --enable-kdrive-kbd -else -XSERVER_XORG_SERVER_CONF_OPTS += --disable-kdrive-kbd -endif - -ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE_MOUSE),y) -XSERVER_XORG_SERVER_CONF_OPTS += --enable-kdrive-mouse -else -XSERVER_XORG_SERVER_CONF_OPTS += --disable-kdrive-mouse -endif + --disable-dri else # modular -XSERVER_XORG_SERVER_CONF_OPTS += --disable-kdrive --disable-xfbdev +XSERVER_XORG_SERVER_CONF_OPTS += --disable-kdrive endif ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) @@ -129,11 +105,6 @@ XSERVER_XORG_SERVER_CONF_OPTS += --disable-dri --disable-glx endif # Optional packages -ifeq ($(BR2_PACKAGE_TSLIB),y) -XSERVER_XORG_SERVER_DEPENDENCIES += tslib -XSERVER_XORG_SERVER_CONF_OPTS += --enable-tslib LDFLAGS="-lts" -endif - ifeq ($(BR2_PACKAGE_HAS_UDEV),y) XSERVER_XORG_SERVER_DEPENDENCIES += udev XSERVER_XORG_SERVER_CONF_OPTS += --enable-config-udev diff --git a/buildroot/package/xen/xen.hash b/buildroot/package/xen/xen.hash index 689341431..fd0310c92 100644 --- a/buildroot/package/xen/xen.hash +++ b/buildroot/package/xen/xen.hash @@ -1,9 +1,3 @@ # Locally computed -sha256 cf0d7316ad674491f49b7ef0518cb1d906a2e3bfad639deef0ef2343b119ac0c xen-4.14.1.tar.gz +sha256 e35099a963070e3c9f425d1e36cbb1c40b7874ef449bfafd6688343783cb25ad xen-4.14.2.tar.gz sha256 ecca9538e9d3f7e3c2bff827502f4495e2ef9e22c451298696ea08886b176c2c COPYING -# https://xenbits.xenproject.org/xsa/advisory-360.html -sha256 809515011efb781a2a8742e9acfd76412d3920c2d4142bb187588cd36f77383e xsa360-4.14.patch -# https://xenbits.xenproject.org/xsa/advisory-364.html -sha256 dc313c70bb07b4096bbc4612cbbc180589923277411dede2fda37f04ecc846d6 xsa364.patch -# https://xenbits.xenproject.org/xsa/advisory-368.html -sha256 55bbe59c75b69f493e364dfcf6cdbc7db4acd32dbf0b4d2466815b7c1f1823ce xsa368-4.14.patch diff --git a/buildroot/package/xen/xen.mk b/buildroot/package/xen/xen.mk index 533882e05..b84214ed1 100644 --- a/buildroot/package/xen/xen.mk +++ b/buildroot/package/xen/xen.mk @@ -4,26 +4,13 @@ # ################################################################################ -XEN_VERSION = 4.14.1 +XEN_VERSION = 4.14.2 XEN_SITE = https://downloads.xenproject.org/release/xen/$(XEN_VERSION) XEN_LICENSE = GPL-2.0 XEN_LICENSE_FILES = COPYING XEN_CPE_ID_VENDOR = xen XEN_CPE_ID_PREFIX = cpe:2.3:o XEN_DEPENDENCIES = host-acpica host-python3 -XEN_PATCH = \ - https://xenbits.xenproject.org/xsa/xsa360-4.14.patch \ - https://xenbits.xenproject.org/xsa/xsa364.patch \ - https://xenbits.xenproject.org/xsa/xsa368-4.14.patch - -# xsa360-4.14.patch -XEN_IGNORE_CVES += CVE-2021-3308 - -# xsa364.patch -XEN_IGNORE_CVES += CVE-2021-26933 - -# xsa368-4.14.patch -XEN_IGNORE_CVES += CVE-2021-28687 # Calculate XEN_ARCH ifeq ($(ARCH),aarch64) diff --git a/buildroot/support/misc/Vagrantfile b/buildroot/support/misc/Vagrantfile index 5dd75ad8d..3c1f55033 100644 --- a/buildroot/support/misc/Vagrantfile +++ b/buildroot/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2021.02.1' +RELEASE='2021.02.2' ### Change here for more memory/cores ### VM_MEMORY=2048 diff --git a/buildroot/support/scripts/cve.py b/buildroot/support/scripts/cve.py index 6e97ea193..13c29fabe 100755 --- a/buildroot/support/scripts/cve.py +++ b/buildroot/support/scripts/cve.py @@ -28,6 +28,12 @@ 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) @@ -223,6 +229,11 @@ class CVE: # if we don't have a cpeid, build one based on name and version if not cpeid: cpeid = "cpe:2.3:*:*:%s:%s:*:*:*:*:*:*:*" % (name, version) + # if we have a cpeid, use its version instead of the package + # version, as they might be different due to + # _CPE_ID_VERSION + else: + pkg_version = distutils.version.LooseVersion(cpe_version(cpeid)) for cpe in self.each_cpe(): if not cpe_matches(cpe['id'], cpeid): diff --git a/buildroot/support/testing/tests/package/test_openjdk.py b/buildroot/support/testing/tests/package/test_openjdk.py index 3a1d1a9b0..26b7f9ee9 100644 --- a/buildroot/support/testing/tests/package/test_openjdk.py +++ b/buildroot/support/testing/tests/package/test_openjdk.py @@ -12,7 +12,7 @@ class TestOpenJdk(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="5.10.34" 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/buildroot/toolchain/Config.in b/buildroot/toolchain/Config.in index a662b80e4..5c4af50b8 100644 --- a/buildroot/toolchain/Config.in +++ b/buildroot/toolchain/Config.in @@ -77,6 +77,12 @@ config BR2_TOOLCHAIN_HAS_BINUTILS_BUG_21464 bool default y if BR2_or1k +# https://sourceware.org/bugzilla/show_bug.cgi?id=27597 +# Affect toolchains built with binutils 2.36.1, still not fixed. +config BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 + bool + default y if BR2_nios2 + # Atomic types can be: # - never lock-free # - sometimes lock-free