Update buildroot to 2021.02.2 (#1370)

2025-07-28 07:26:28 +00:00 · 2021-05-19 22:20:50 +02:00 · 2021-05-19 22:20:50 +02:00 · c1c6a6ce21
commit c1c6a6ce21
parent 111018b911
247 changed files with 1386 additions and 1257 deletions
--- 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
@ -1,76 +0,0 @@
-From 49e3db2dafa620dcbb11c1ed68f442aa8fd4696f Mon Sep 17 00:00:00 2001
-Message-Id: <49e3db2dafa620dcbb11c1ed68f442aa8fd4696f.1614713774.git.stefan@agner.ch>
-In-Reply-To: <f8074c7dbf7966fd15edd897130825684abe05e9.1614713774.git.stefan@agner.ch>
-References: <f8074c7dbf7966fd15edd897130825684abe05e9.1614713774.git.stefan@agner.ch>
-From: Stefan Agner <stefan@agner.ch>
-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 <stefan@agner.ch>
---
- 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
-
--- 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
@ -1,39 +0,0 @@
-From fd8fc4e0640965e06657782d324eef73f33ed745 Mon Sep 17 00:00:00 2001
-Message-Id: <fd8fc4e0640965e06657782d324eef73f33ed745.1618500237.git.stefan@agner.ch>
-In-Reply-To: <9c98c07abbe9ee675ec588ad7c15f0285e8a0f07.1618500237.git.stefan@agner.ch>
-References: <9c98c07abbe9ee675ec588ad7c15f0285e8a0f07.1618500237.git.stefan@agner.ch>
-From: Stefan Agner <stefan@agner.ch>
-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 <stefan@agner.ch>
---
- 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
-
--- a/buildroot-patches/0006-package-linux-firmware-add-RTL87XX-RTL88XX-Bluetooth.patch
+++ b/buildroot-patches/0006-package-linux-firmware-add-RTL87XX-RTL88XX-Bluetooth.patch
@ -1,74 +0,0 @@
-From 51c25488d718cdeb022e60cacc8ddcb6d9a97cc7 Mon Sep 17 00:00:00 2001
-Message-Id: <51c25488d718cdeb022e60cacc8ddcb6d9a97cc7.1616146775.git.stefan@agner.ch>
-In-Reply-To: <f8074c7dbf7966fd15edd897130825684abe05e9.1616146775.git.stefan@agner.ch>
-References: <f8074c7dbf7966fd15edd897130825684abe05e9.1616146775.git.stefan@agner.ch>
-From: Stefan Agner <stefan@agner.ch>
-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 <stefan@agner.ch>
---
- 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
-
--- 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
@ -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 <stefan@agner.ch>
-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 <stefan@agner.ch>
---
- 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
-
--- 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.
--- 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
--- a/buildroot/DEVELOPERS
+++ b/buildroot/DEVELOPERS
@ -468,7 +468,7 @@ N:	Bogdan Radulescu <bogdan@nimblex.net>
 F:	package/iftop/
 F:	package/ncdu/

-N:	Brandon Maier <brandon.maier@rockwellcollins.com>
+N:	Brandon Maier <brandon.maier@collins.com>
 F:	package/vmtouch/

 N:	Brock Williams <brock@cottonwoodcomputer.com>
@ -569,7 +569,7 @@ F:	package/perl-sys-mmap/
 F:	package/perl-time-parsedate/
 F:	package/perl-x10/

-N:	Clayton Shotwell <clayton.shotwell@rockwellcollins.com>
+N:	Clayton Shotwell <clayton.shotwell@collins.com>
 F:	package/audit/
 F:	package/checkpolicy/
 F:	package/cpio/
@ -671,6 +671,19 @@ F:	package/libstrophe/
 N:	Derrick Lyndon Pallas <derrick@meter.com>
 F:	package/ipcalc/

+N:	Dick Olsson <hi@senzilla.io>
+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 <dimitris@siganos.org>
 F:	package/wireless-regdb/

@ -1201,7 +1214,7 @@ F:	package/python-sockjs/
 F:	package/python-terminaltables/
 F:	package/python-yarl/

-N:	James Knight <james.knight@rockwellcollins.com>
+N:	James Knight <james.knight@collins.com>
 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 <matthew.weber@rockwellcollins.com>
+N:	Matt Weber <matthew.weber@collins.com>
 F:	board/freescale/p*
 F:	board/freescale/t*
 F:	board/qemu/ppc64-e5500/
@ -2303,7 +2316,7 @@ F:	toolchain/
 N:	Roman Gorbenkov <roman.gorbenkov@ens2m.org>
 F:	package/davfs2/

-N:	Ryan Barnett <ryan.barnett@rockwellcollins.com>
+N:	Ryan Barnett <ryan.barnett@collins.com>
 F:	package/atftp/
 F:	package/c-periphery/
 F:	package/miraclecast/
@ -2340,7 +2353,7 @@ F:	support/misc/toolchainfile.cmake.in
 N:	Sam Voss <sam.voss@gmail.com>
 F:	package/ripgrep/

-N:	Santosh Multhalli <santosh.multhalli@rockwellcollins.com>
+N:	Santosh Multhalli <santosh.multhalli@collins.com>
 F:	package/valijson/

 N:	Sébastien Szymanski <sebastien.szymanski@armadeus.com>
--- 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)
--- 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
--- 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))
--- 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
--- 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
--- a/buildroot/docs/manual/manual.html
+++ b/buildroot/docs/manual/manual.html
--- a/buildroot/docs/manual/manual.pdf
+++ b/buildroot/docs/manual/manual.pdf
--- 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
--- 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 \
--- 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
--- 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)

 ################################################################################
--- 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
--- 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

--- 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
--- 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.
--- 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
--- 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
--- 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
--- a/buildroot/package/bridge-utils/0001-fix-build-on-musl.patch
+++ 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 <fontaine.fabrice@gmail.com>
+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 <fontaine.fabrice@gmail.com>
+[Upstream status: sent to Stephen Hemminger <sthemmin@microsoft.com>]
+---
+ 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 <stdlib.h>
+ #include <unistd.h>
+ #include <errno.h>
+#include <limits.h>
+ #include <string.h>
+ #include <dirent.h>
+ #include <fcntl.h>
+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 <stdlib.h>
+ #include <unistd.h>
+ #include <errno.h>
+#include <limits.h>
+ #include <string.h>
+ #include <dirent.h>
+ #include <sys/types.h>
+-- 
+2.30.2
+
--- 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
--- 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
--- 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))
--- 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
--- 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
--- 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
@ -1,41 +0,0 @@
-From dbb4452787cb966cc74b2015689961875fd5d668 Mon Sep 17 00:00:00 2001
-From: Ryan Barnett <ryanbarnett3@gmail.com>
-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 <ryanbarnett3@gmail.com>
---
-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
-
--- 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
--- 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
--- 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))
--- 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
--- 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 \
--- 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.
--- 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

--- 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

--- 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))
--- 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)
--- a/buildroot/package/dmalloc/0001-add-fpic.patch
+++ b/buildroot/package/dmalloc/0001-add-fpic.patch
@ -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 <thomas.petazzoni@free-electrons.com>
---
- 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 ./$@
- 
- #
--- a/buildroot/package/dmalloc/0001-mips.patch
+++ b/buildroot/package/dmalloc/0001-mips.patch
--- a/buildroot/package/dmalloc/0002-fix-parallel-build.patch
+++ b/buildroot/package/dmalloc/0002-fix-parallel-build.patch
--- a/buildroot/package/dmalloc/0003-fix-shlibs.patch
+++ b/buildroot/package/dmalloc/0003-fix-shlibs.patch
--- a/buildroot/package/dmalloc/0004-fix-strdup.patch
+++ b/buildroot/package/dmalloc/0004-fix-strdup.patch
--- a/buildroot/package/dmalloc/0005-fix-strndup.patch
+++ b/buildroot/package/dmalloc/0005-fix-strndup.patch
--- 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
--- 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
--- 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)"
--- 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
--- 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" \
--- a/buildroot/package/domoticz/0001-Avoid-deprecated-bind-placeholders-in-global-namespace.patch
+++ b/buildroot/package/domoticz/0001-Avoid-deprecated-bind-placeholders-in-global-namespace.patch
--- 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
@ -1,55 +0,0 @@
-From 2cd95289939b4a7c2576176c7f6268028aa093b2 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-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 <fontaine.fabrice@gmail.com>
---
- 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
-
--- a/buildroot/package/domoticz/0002-Build-failure-with-python-3-9.patch
+++ b/buildroot/package/domoticz/0002-Build-failure-with-python-3-9.patch
--- a/buildroot/package/domoticz/0003-Load-python-3-9-shared-libs.patch
+++ b/buildroot/package/domoticz/0003-Load-python-3-9-shared-libs.patch
--- 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
--- 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
--- 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
--- 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
--- 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+
--- 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
@ -1,38 +0,0 @@
-From 3136f41e6db8189994a8e4f72eacc92b669776d1 Mon Sep 17 00:00:00 2001
-From: Marton Balint <cus@passwd.hu>
-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 <cus@passwd.hu>
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
- 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);
--- 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
--- 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
--- 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

--- 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 = \
--- 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
--- 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
@ -1,242 +0,0 @@
-From 09944fba5bfb8e5543ce043c70d08222cf2f97ff Mon Sep 17 00:00:00 2001
-From: Claudiu Zissulescu <claziss@synopsys.com>
-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  <claziss@synopsys.com>
-
-	* 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 <claziss@synopsys.com>
-Signed-off-by: Veronika Kremneva <kremneva@synopsys.com>
---
- 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 <rtx_sequence *> (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
-
--- a/buildroot/package/gcc/10.3.0/0001-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 <romain.naour@gmail.com>
 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 <romain.naour@gmail.com>
 Cc: Eric Botcazou <ebotcazou@gcc.gnu.org>
 ---
@ -30,7 +33,7 @@ Cc: Eric Botcazou <ebotcazou@gcc.gnu.org>
 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 <stdbool.h>
 #include <stdint.h>
 -- 
-2.25.4
+2.30.2

--- 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

--- 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
--- 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
@ -0,0 +1,36 @@
+From 8e4b9ae6f051454953a80b8e64443bcea6c9cc46 Mon Sep 17 00:00:00 2001
+From: Johannes 'josch' Schauer <josch@mister-muffin.de>
+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 <peter@korsgaard.com>
+---
+ 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
+
--- 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)
--- 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
--- 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

--- 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))
--- 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
--- 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
--- 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
--- 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
--- a/buildroot/package/hostapd/0002-ASN.1-Validate-DigestAlgorithmIdentifier-parameters.patch
+++ 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 <j@w1.fi>
+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 <j@w1.fi>
+Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
+---
+ 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
+
--- 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 =

--- 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
@ -0,0 +1,41 @@
+From 06a1909ae1e8ae1edc70dc48dd22a32ba5eceecb Mon Sep 17 00:00:00 2001
+From: Wolfram Sang <wsa+renesas@sang-engineering.com>
+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 <wsa+renesas@sang-engineering.com>
+Signed-off-by: Wolfram Sang <wsa@kernel.org>
+[Peter: drop CHANGES update]
+Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
+---
+ 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
+
--- 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
--- 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
--- 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
--- 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
@ -0,0 +1,34 @@
+From cbbe4c47cb2acae04083c510dbe0efc5f48f5bb6 Mon Sep 17 00:00:00 2001
+From: Federico Pellegrin <fede@evolware.org>
+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 <fede@evolware.org>
+---
+ 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
+
--- 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
--- 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))
--- 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

--- 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)
--- 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"
--- 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
--- 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

--- 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
--- 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 \
--- 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
--- 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
--- 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
--- a/Show More
+++ b/Show More