package/mksh: update to 59c

Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

.gitignore

@@ -1,7 +1,5 @@
 /output
 /dl
-/godot-toolchains
-/windows-build
 /.auto.deps
 /.config.cmd
 /.config.old

CHANGES

@@ -1,102 +1,3 @@
-2020.11.2, released January 31st, 2021
-
-	Important / security related fixes.
-
-	Download: Ensure git submodules are correctly fetched if
-	enabled for a package with <pkg>_GIT_SUBMODULES = YES and the
-	host variant is downloaded first.
-
-	Toolchain: Mark CodeSourcery Aarch64 2014.11 toolchain as not
-	having libatomic. Bootlin PowerPC-440 FP toolchain updated for
-	SecurePLT fix.
-
-	pkg-stats: Fix python 3.8+ deprecation warning.
-
-	meson: Ensure ccache is not detected and used, as it may
-	conflict with the ccache handling in Buildroot.
-
-	Updated/fixed packages: barebox, boost, brltty, dbus,
-	docker-containerd, dovecot, dovecot-pigeonhole,
-	environment-setup, firmware-imx, gcc, gerbera, glibc,
-	gmrender-resurrect, igd2-for-linux, kodi-pvr-zattoo, libclc,
-	libfuse3, libllcp, libodb-mysql, libtorrent-rasterbar,
-	libupnp, lpc32xxcdl, luarocks, mpd, multipath-tools, mutt,
-	nfs-utils, nodejs, openjpeg, openldap, opentracing-cpp,
-	openvpn, p11-kit, paho-mqtt-c, php, poppler, postgresql,
-	python3, redis, resiprocate, rpm, runc, socat, sslh, sudo,
-	sunxi-mali-mainline-driver, syslog-ng, systemd, tini,
-	tpm2-tss, trace-cmd, tzdata, uboot-tools, uhd, ushare,
-	util-linux, vlc, wavpack, wireguard-linux-compat, wolfssl,
-	xapp_xload, xorriso, zic
-
-	Removed packages: libupnp18
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#13471: package/mpd/mpd.conf make use of path not created
-
-2020.11.1, released December 27th, 2020
-
-	Important / security related fixes.
-
-	Infrastructure:
-	- cmake: fix host ccache handling for CMake 3.19
-	- meson: Forcibly disable binary stripping for
-	  target builds, enable for host builds
-	- golang: Fix HOST / TARGET directories for per-package builds
-
-	Defconfigs: Beaglebone Qt5: Fix ti-sgx related issues
-
-	Updated/fixed packages: apitrace, arm-trusted-firmware,
-	ca-certificates, cryptopp, dhcpcd, dtv-scan-tables,
-	flare-engine, ghostscript, go, haproxy, imagemagick,
-	imx-gpu-viv, jasper, kismet, libcurl, libglib2, libhtp,
-	libopenssl, libressl, libuv, libuvw, lua, mbedtls, mongodb,
-	mutt, ncurses, netsnmp, nodejs, opencv3, openldap, opkg-utils,
-	paho-mqtt-c, python-crc16, python-lxml, python-pyparsing,
-	python-pyqt5, qt5base, rauc, shadowsocks-libev, sqlcipher,
-	suricata, ti-sgx-demos, tinycbor, uclibc-ng-test, unbound,
-	webkitgtk, wpewebkit, wireshark, x11vnc, xen,
-	xserver_xorg-server
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#13316: beaglebone_qt5_defconfig: PowerVR fails to start
-	#13416: dhcpcd start warning message: no such user dhcpcd
-
-2020.11, released December 2nd, 2020
-
-	Various fixes.
-
-	Updated/fixed packages: bustle, docker-containerd, gnuplot,
-	gst1-plugins-good, jemalloc, kmsxx, libcap, libplist,
-	libuhttpd, libxkbcommon, lynx, mariadb, netsurf, privoxy,
-	s390-tools, setserial, xserver_xorg-server
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#13276: libcap builds libcap.pc incorrectly
-
-2020.11-rc3, released November 28th, 2020
-
-	Fixes all over the tree.
-
-	Updated/fixed packages: c-ares, cage, cdrkit,
-	dovecot-pigeonhole, efl, gvfs, harfbuzz, jpeg-turbo,
-	libcamera, libkrb5, libpam-tacplus, libxkbcommon, minidlna,
-	modem-manager, monkey, musl, ncurses, numactl, openntpd,
-	openrc, postgresql, proftpd, python-flask-cors, python-pip,
-	qemu, raptor, redis, slirp, spandsp, thermald, uhd, vsftpd,
-	webkitgtk, wireless-regdb, wlroots, wpewebkit, xen, xinetd,
-	xorriso
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#13296: host-libcap failed to build
-	#13331: openrc-0.42.1 compilation failure on gcc-10
-	#13336: thermald-1.9.1 compilation failure with musl 1.2.1
-	#13341: Mistake in /etc/init.d/S70vsftpd
-
 2020.11-rc2, released November 14th, 2020
 
 	Fixes all over the tree.

Config.in.legacy

@@ -144,17 +144,16 @@ endif
 
 ###############################################################################
 
-comment "Legacy options removed in 2020.11"
+comment "Legacy options removed in 2021.02"
 
-config BR2_PACKAGE_LIBUPNP18
-	bool "libupnp18 package removed"
+config BR2_PACKAGE_IPSEC_TOOLS
+	bool "ipsec-tools package was removed"
 	select BR2_LEGACY
-	select BR2_PACKAGE_LIBUPNP
 	help
-	  Version 1.8.x of libupnp (i.e. libupnp18) has been removed
-	  because it will never be fixed against CallStranger a.k.a.
-	  CVE-2020-12695. The libupnp package (which has been updated to
-	  version 1.14.x) has been selected instead.
+	  This package has been removed as it has security issues and
+	  has been abandoned since 2014.
+
+comment "Legacy options removed in 2020.11"
 
 config BR2_PACKAGE_OPENCV
 	bool "opencv package was removed"

DEVELOPERS

@@ -405,7 +405,6 @@ F:	package/perl-netaddr-ip/
 F:	package/perl-timedate/
 F:	package/perl-uri/
 F:	package/perl-www-robotrules/
-F:	package/php/
 F:	package/pixman/
 F:	package/pngquant/
 F:	package/pound/
@@ -852,6 +851,7 @@ F:	package/librsync/
 F:	package/libsoup/
 F:	package/libsoxr/
 F:	package/libupnp/
+F:	package/libupnp18/
 F:	package/libv4l/
 F:	package/libxslt/
 F:	package/mbedtls/
@@ -921,6 +921,7 @@ F:	package/netsurf/
 F:	package/perl*
 F:	package/pkg-perl.mk
 F:	package/pkg-luarocks.mk
+F:	package/quickjs/
 F:	package/rings/
 F:	package/tekui/
 F:	package/wpebackend-fdo/
@@ -1863,6 +1864,9 @@ N:	Michel Stempin <michel.stempin@wanadoo.fr>
 F:	board/licheepi/
 F:	configs/licheepi_zero_defconfig
 
+N:	Mike Frampton <mikeframpo@gmail.com>
+F:	package/qcom-db410c-firmware/
+
 N:	Mike Harmony <mike.harmony@snapav.com>
 F:	board/sinovoip/m2-plus/
 F:	configs/bananapi_m2_plus_defconfig
@@ -1960,6 +1964,9 @@ F:	package/openjpeg/
 N:	Olivier Singla <olivier.singla@gmail.com>
 F:	package/shellinabox/
 
+N:	Owen Walpole <owen@walpole.dev>
+F:	package/parprouted/
+
 N:	Parnell Springmeyer <parnell@digitalmentat.com>
 F:	package/scrypt/
 
@@ -2124,7 +2131,7 @@ F:	package/kf5/
 N:	Pierre Floury <pierre.floury@gmail.com>
 F:	package/trace-cmd/
 
-N:	Pierre-Jean Texier <texier.pj2@gmail.com>
+N:	Pierre-Jean Texier <pjtexier@koncepto.io>
 F:	package/fping/
 F:	package/genimage/
 F:	package/haveged/
@@ -2254,7 +2261,6 @@ F:	package/ogre/
 F:	package/openpowerlink/
 F:	package/physfs/
 F:	package/piglit/
-F:	package/qemu/
 F:	package/solarus/
 F:	package/stress-ng/
 F:	package/supertux/
@@ -2494,6 +2500,9 @@ N:	Thomas Claveirole <thomas.claveirole@green-communications.fr>
 F:	package/fcgiwrap/
 F:	package/openlayers/
 
+N:	Thomas Davis <sunsetbrew@sunsetbrew.com>
+F:	package/civetweb/
+
 N:	Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
 F:	docs/manual/
 F:	package/cereal/
@@ -2592,7 +2601,7 @@ F:	toolchain/
 N:	Timo Ketola <timo.ketola@exertus.fi>
 F:	package/fbgrab/
 
-N:	Titouan Christophe <titouanchristophe@gmail.com>
+N:	Titouan Christophe <titouan.christophe@railnova.eu>
 F:	package/avro-c/
 F:	package/mosquitto/
 F:	package/python-avro/

Dockerfile.linux-builder

@@ -1,7 +0,0 @@
-FROM centos:7
-
-RUN yum -y install yum install centos-release-scl && \
-    yum -y install devtoolset-9 && \
-    yum -y install make ncurses-devel which unzip perl cpio rsync fileutils bc bzip2 gzip sed git python file patch wget perl-Thread-Queue perl-Data-Dumper perl-ExtUtils-MakeMaker && \
-    yum clean all
-

Dockerfile.windows-builder

@@ -1,6 +0,0 @@
-FROM fedora:33
-
-RUN dnf -y install mingw32-nsis xz bzip2 zip diffutils texinfo gcc gcc-c++ make mingw64-winpthreads mingw64-winpthreads-static mingw64-gcc mingw64-gcc-c++ curl && \
-    dnf clean all
-
-COPY build-windows.sh /usr/local/bin

Makefile

@@ -92,9 +92,9 @@ all:
 .PHONY: all
 
 # Set and export the version string
-export BR2_VERSION := 2020.11.2
+export BR2_VERSION := 2020.11-rc2
 # Actual time the release is cut (for reproducible builds)
-BR2_VERSION_EPOCH = 1612125000
+BR2_VERSION_EPOCH = 1605361000
 
 # Save running make version since it's clobbered by the make package
 RUNNING_MAKE_VERSION := $(MAKE_VERSION)

README.md

@@ -1,85 +0,0 @@
-# Godot buildroot
-
-This repository contains the Godot buildroot to generate toolchains for building the Godot engine in a portable way for Linux. Using these toolchains is the best way to distribute Linux builds of your custom-compiled Godot game.
-
-*You will only need this if you built the engine manually. If you use official templates you will not need this*
-
-The toolchain current contains the following:
- * gcc-10.2.0
- * glibc-2.19
- * pulseaudio
- * alsa
- * X client libraries
- * udev
- * libGL
-
-# Using the SDKs
-
-This section is first because there's a lot of stuff below and this is likely what you came here for. Don't forget to check out the `Obtaining an SDK` section below!
-
-The first part of an SDK filename referes to the architecture that this SDK will generate binaries *for*. If you want to ship your game to both 32bit and 64bit Intel/AMD users you will need both `x86_64-godot-linux-gnu_sdk-buildroot.tar.gz` and `i686-godot-linux-gnu_sdk-buildroot.tar.gz`.
-
-Unpack the toolchain anywhere you like and run the `relocate-sdk.sh` script within. This needs to happen every time you move the toolchain to a different directory, but only needs to happen once after installation.
-
-After this you can build the engine more-or-less like normal. For instance for `x86_64`:
-
-`PATH=/home/hp/tmp/x86_64-godot-linux-gnu_sdk-buildroot/usr/bin:$PATH scons p=x11 target=release_debug CC=x86_64-godot-linux-gnu-gcc CXX=x86_64-godot-linux-gnu-g++ -j64`
-
-For 32-bit Intel:
-
-`PATH=/home/hp/tmp/i686-godot-linux-gnu_sdk-buildroot/usr/bin/:$PATH scons p=x11 target=release_debug CC=i686-godot-linux-gnu-gcc CXX=i686-godot-linux-gnu-g++ -j64 use_static_cpp=yes bits=32`
-*Note the `bits=32` at the end!*
-
-And for 32bit ARM:
-
-`PATH=/home/hp/tmp/arm-godot-linux-gnueabihf_sdk-buildroot/usr/bin/:$PATH scons p=x11 target=release_debug CC=arm-linux-gcc CXX=arm-linux-g++ -j64 use_static_cpp=yes CCFLAGS="-mtune=cortex-a72 -mcpu=cortex-a72 -mfloat-abi=hard -mlittle-endian -munaligned-access -mfpu=neon-fp-armv8" module_denoise_enabled=no module_raycast_enabled=no module_webm_enabled=no`
-
-For other build-time options please see https://docs.godotengine.org/en/stable/development/compiling/compiling_for_x11.html
-
-# Obtaining an SDK
-
-## Downloading a pre-built SDK
-
-Pre-built toolchains are available on https://download.tuxfamily.org/godotengine/toolchains/linux.
-
-## Using buildroot to generate SDKs
-
-###  Building a toolchain for local use
-
-*Using this method will create a toolchain you yourself can use to create Godot releases that will work on any Linux system currently in use. However the toolchain you generate will not be portable to older Linuxes. If you plan to distribute the toolchain itself use the podman method below*
-
-The basic steps for building a toolchain are:
-
- * copy `config-godot-<arch>` to `.config`
- * run `make olddefconfig`
- * run `make clean sdk`
-
-Afterwards the SDK will be in `output/images/<arch>-godot-linux-gnu_sdk-buildroot.tar.gz`.
-
-**NOTE: that `make clean sdk` will delete old builds. Move them out of the way first!**
-
-###  Building a toolchain for distribution
-
-This method uses a CentOS7 container to make the buildroot *itself* portable so it can be distributed to other users. This is also the way the downloads above are generated.
-
- * run `./build-sdk.sh <arch>` for instance `x86_64`
-
-The toolchain will appear in the `godot-toolchains` directory
-
-## Modifying the toolchain
-
-For detailed information please see https://buildroot.org however a short version is here:
-
-**NOTE: re-running the build-sdk.sh script will overwrite your changes by default. Take care**
-
- * Copy the architecture you would like to change to `.config` for instance `cp config-godot-x86_64 .config`
- * Run `make menuconfig`
- * Make your changes
-
-At this point your changes exist in .config. **Make a backup**. If you're building for local use just run `make clean sdk`, if you're using the container approach copy your `.config` file to the arch config like `config-godot-x64_64`
-
-## Making Pull Requests for this repository
-
-First of all: Thanks for wanting to help! Second of all: Since we support multiple architectures make sure that you make *the same* changes to all architectures and PR them together. If you *specifically* want to make a change to one architecture please note that clearly in the PR message.
-
-Thanks!

board/arm/foundation-v8/readme.txt

@@ -3,17 +3,18 @@ ARM software simulator of the AArch64 architecture.
 
 First, one has to download the AArch64 software simulator from:
 
-  https://silver.arm.com/download/download.tm?pv=2663527
+  https://silver.arm.com/download/download.tm?pv=4807186
 
 Then, use the arm_foundationv8_defconfig configuration to build your
 Buildroot system.
 
 Finally, boot your system with:
 
- ${LOCATION_OF_FOUNDATIONV8_SIMULATOR}/models/Linux64_GCC-4.7/Foundation_Platform \
+ ${LOCATION_OF_FOUNDATIONV8_SIMULATOR}/models/Linux64_GCC-6.4/Foundation_Platform \
     --image output/images/linux-system.axf \
     --block-device output/images/rootfs.ext2 \
-    --network=nat
+    --network=nat \
+    --cores 4
 
 You can get network access from within the simulated environment
 by requesting an IP address using DHCP (run the command 'udhcpc').

board/beaglebone/readme.txt

@@ -7,7 +7,7 @@ Description
 This configuration will build a complete image for the beaglebone and
 the TI AM335x-EVM, the board type is identified by the on-board
 EEPROM. The configuration is based on the
-ti-processor-sdk-06.01.00.08. Device tree blobs for beaglebone
+ti-processor-sdk-02.00.00.00. Device tree blobs for beaglebone
 variants and the evm-sk are built too.
 
 For Qt5 support support use the beaglebone_qt5_defconfig.
@@ -43,20 +43,10 @@ output/images/
 To copy the image file to the sdcard use dd:
 $ dd if=output/images/sdcard.img of=/dev/XXX
 
-
-Running Qt5 hellowindow opengl demo:
-===================
-# export QT_QPA_EGLFS_KMS_CONFIG=/etc/qt5/eglfs_kms_cfg.json
-# export QT_QPA_PLATFORM=eglfs
-# export QT_QPA_EGLFS_INTEGRATION=none
-# /usr/lib/qt/examples/opengl/hellowindow/hellowindow
-
-
 Tested hardware
 ===============
 am335x-evm (rev. 1.1A)
 beagleboneblack (rev. A5A)
 beaglebone (rev. A6)
 
-2020, Adam Duskett <aduskett@gmail.com>
 2016, Lothar Felten <lothar.felten@gmail.com>

board/beaglebone/rootfs_overlay/etc/qt5/eglfs_kms_cfg.json

@@ -1,15 +0,0 @@
-{
-  "device": "/dev/dri/card0",
-  "hwcursor": false,
-  "pbuffers": true,
-  "outputs": [
-    {
-      "name": "VGA1",
-      "mode": "off"
-    },
-    {
-      "name": "HDMI1",
-      "mode": "1024x768"
-    }
-  ]
-}

board/boundarydevices/common/readme.txt

@@ -40,9 +40,3 @@ Where 'sdX' is the device node of the uSD partition.
 To upgrade u-boot, cancel autoboot and type:
 
 > run upgradeu
-
-See Boundary Devices's buildroot-external-boundary project
-for additional and advanced defconfigs using Qt5, gstreamer,
-NXP proprietary packages with demo applications:
-
-https://github.com/boundarydevices/buildroot-external-boundary

boot/arm-trusted-firmware/arm-trusted-firmware.mk

@@ -100,14 +100,6 @@ ARM_TRUSTED_FIRMWARE_MAKE_OPTS += MV_DDR_PATH=$(MV_DDR_MARVELL_DIR)
 ARM_TRUSTED_FIRMWARE_DEPENDENCIES += mv-ddr-marvell
 endif
 
-ifeq ($(BR2_SSP_REGULAR),y)
-ARM_TRUSTED_FIRMWARE_MAKE_OPTS += ENABLE_STACK_PROTECTOR=default
-else ifeq ($(BR2_SSP_STRONG),y)
-ARM_TRUSTED_FIRMWARE_MAKE_OPTS += ENABLE_STACK_PROTECTOR=strong
-else ifeq ($(BR2_SSP_ALL),y)
-ARM_TRUSTED_FIRMWARE_MAKE_OPTS += ENABLE_STACK_PROTECTOR=all
-endif
-
 ARM_TRUSTED_FIRMWARE_MAKE_TARGETS = all
 
 ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP),y)

boot/barebox/barebox.mk

@@ -138,11 +138,6 @@ define $(1)_INSTALL_IMAGES_CMDS
 	$$($(1)_INSTALL_CUSTOM_ENV)
 endef
 
-# Starting with barebox v2020.09.0, the kconfig used calls the
-# cross-compiler to check its capabilities. So we need the
-# toolchain before we can call the configurators.
-$(1)_KCONFIG_DEPENDENCIES += toolchain
-
 ifeq ($$(BR2_TARGET_$(1)_BAREBOXENV),y)
 define $(1)_INSTALL_TARGET_CMDS
 	cp $$(@D)/scripts/bareboxenv-target $$(TARGET_DIR)/usr/bin/bareboxenv

boot/lpc32xxcdl/lpc32xxcdl.hash

@@ -1,2 +0,0 @@
-# Locally computed
-sha256  ded3fa936a96d3fb8188ca6214f57b5208bd49e5416bd69f38bfc810b34197bc  lpc32xx_cdl-v2.11.zip

boot/lpc32xxcdl/lpc32xxcdl.mk

@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-LPC32XXCDL_VERSION = 2.11
-LPC32XXCDL_SOURCE = lpc32xx_cdl-v$(LPC32XXCDL_VERSION).zip
-LPC32XXCDL_SITE = https://community.nxp.com/pwmxy87654/attachments/pwmxy87654/lpcware-archive/61/2
+LPC32XXCDL_VERSION = lpc32xx_cdl_v2.11
+LPC32XXCDL_SITE = http://git.lpcware.com/lpc3xxx_cdl.git
+LPC32XXCDL_SITE_METHOD = git
 
 LPC32XXCDL_INSTALL_TARGET = NO
 LPC32XXCDL_INSTALL_IMAGES = YES
@@ -45,14 +45,13 @@ LPC32XXCDL_BOARD_STARTUP_DIR = \
 # Source files are with dos newlines, which our patch infrastructure doesn't
 # handle. Work around it by converting the affected files to unix newlines
 # before patching
-define LPC32XXCDL_EXTRACT_CMDS
-	unzip $(LPC32XXCDL_DL_DIR)/$(LPC32XXCDL_SOURCE) -d $(@D)
-	mv $(@D)/lpc3xxx_cdl/* $(@D)
-	rmdir $(@D)/lpc3xxx_cdl/
+define LPC32XXCDL_DOS2UNIX_FOR_PATCH
 	sed -n 's|^[+-]\{3\} [^/]\+\([^ \t]*\)\(.*\)|$(@D)\1|p' \
 		boot/lpc32xxcdl/*.patch| sort -u | xargs $(SED) 's/\x0D$$//'
 endef
 
+LPC32XXCDL_POST_EXTRACT_HOOKS += LPC32XXCDL_DOS2UNIX_FOR_PATCH
+
 define LPC32XXCDL_BUILD_CMDS
 	$(MAKE1) $(LPC32XXCDL_BUILD_FLAGS) -C $(@D)
 	$(MAKE1) $(LPC32XXCDL_BUILD_FLAGS) -C $(@D)/$(LPC32XXCDL_BOARD_STARTUP_DIR)/Burners/$(LPC32XXCDL_KICKSTART_BURNER)

build-sdk.sh

@@ -1,97 +0,0 @@
-#!/bin/bash
-set -e
- 
-function usage() {
-  echo "usage: $0 host target"
-  echo "  where host is one of linux-x86_64, windows-x86_64"
-  echo "  where target is one of i686, x86_64, armv7"
-  exit 1
-}
-
-if [ -z $1 ] || [ -z $1 ]; then
-  usage
-fi
-
-case $1 in
-  linux-x86_64)
-    host=$1
-  ;;
-  windows-x86_64)
-    host=$1
-  ;;
-  *)
-    echo "unknown SDK host \"$1\""
-    usage
-esac
-
-case $2 in
-  i686)
-    cp config-godot-i686 .config
-    toolchain_prefix=i686-godot-linux-gnu
-    bits=32
-  ;;
-  x86_64)
-    cp config-godot-x86_64 .config
-    toolchain_prefix=x86_64-godot-linux-gnu
-    bits=64
-  ;;
-  armv7)
-    cp config-godot-armv7 .config
-    toolchain_prefix=arm-godot-linux-gnueabihf
-    bits=32
-  ;;
-  *)
-    echo "unknown SDK target \"$2\""
-    usage
-  ;;
-esac
-
-if which podman &> /dev/null; then
-  container=podman
-elif which docker &> /dev/null; then
-  container=docker
-else
-  echo "Podman or docker have to be in \$PATH"
-  exit 1
-fi
-
-function build_linux_sdk() {
-  ${container} build -f Dockerfile.linux-builder -t godot-buildroot-builder-linux
-  ${container} run -it --rm -v $(pwd):/tmp/buildroot -w /tmp/buildroot -e FORCE_UNSAFE_CONFIGURE=1 --userns=keep-id godot-buildroot-builder scl enable devtoolset-9 "bash -c make syncconfig; make clean sdk"
-
-  mkdir -p godot-toolchains
-  
-  rm -fr godot-toolchains/${toolchain_prefix}_sdk-buildroot
-  tar xf output/images/${toolchain_prefix}_sdk-buildroot.tar.gz -C godot-toolchains
-  
-  pushd godot-toolchains/${toolchain_prefix}_sdk-buildroot
-  ../../clean-linux-toolchain.sh ${toolchain_prefix} ${bits}
-  popd
-  
-  pushd godot-toolchains
-  tar -cjf ${toolchain_prefix}_sdk-buildroot.tar.bz2 ${toolchain_prefix}_sdk-buildroot
-  rm -rf ${toolchain_prefix}_sdk-buildroot
-  popd
-}
-
-function build_windows_sdk() {
-  ${container} build -f Dockerfile.windows-builder -t godot-buildroot-builder-windows
-
-  if [ ! -e godot-toolchains/${toolchain_prefix}_sdk-buildroot.tar.bz2 ]; then
-    build_linux_sdk
-  fi
-
-  ${container} run -it --rm -v $(pwd):/tmp/buildroot -w /tmp/buildroot --userns=keep-id godot-buildroot-builder-windows bash -x /usr/local/bin/build-windows.sh ${toolchain_prefix}
-}
-
-if [ "${host}" == "linux-x86_64" ]; then
-  build_linux_sdk
-fi
-
-if [ "${host}" == "windows-x86_64" ]; then
-  build_windows_sdk
-fi
-
-echo
-echo "***************************************"
-echo "Build succesful your toolchain is in the godot-toolchains directory"

build-windows.sh

@@ -1,216 +0,0 @@
-#!/bin/bash
-
-set -e
-
-binutils_ver=2.35.1
-gcc_ver=10.2.0
-mpc_ver=1.2.1
-mpfr_ver=4.1.0
-gmp_ver=6.2.1
-isl_ver=0.18
-scons_local_ver=4.1.0
-sevenz_ver=1900
-# GNU Make 4.3 cannot be cross compiled
-make_ver=4.2.1
-
-binutils_file=binutils-${binutils_ver}.tar.xz
-binutils_url=https://ftp.gnu.org/gnu/binutils/${binutils_file}
-
-gcc_file=gcc-${gcc_ver}.tar.xz
-gcc_url=https://ftp.gnu.org/gnu/gcc/gcc-${gcc_ver}/${gcc_file}
-
-mpc_file=mpc-${mpc_ver}.tar.gz
-mpc_url=https://ftp.gnu.org/gnu/mpc/${mpc_file}
-
-mpfr_file=mpfr-${mpfr_ver}.tar.xz
-mpfr_url=https://ftp.gnu.org/gnu/mpfr/${mpfr_file}
-
-gmp_file=gmp-${gmp_ver}.tar.xz
-gmp_url=https://ftp.gnu.org/gnu/gmp/${gmp_file}
-
-isl_file=isl-${isl_ver}.tar.bz2
-isl_url=https://gcc.gnu.org/pub/gcc/infrastructure/${isl_file}
-
-scons_local_file=scons-local-${scons_local_ver}.zip
-scons_local_url=https://sourceforge.net/projects/scons/files/${scons_local_file}
-
-make_file=make-${make_ver}.tar.gz
-make_url=http://ftp.gnu.org/gnu/make/${make_file}
-
-case $1 in
-  arm-godot-linux-gnueabihf)
-  ;;
-  i686-godot-linux-gnu)
-  ;;
-  x86_64-godot-linux-gnu)
-  ;;
-  *)
-    echo "usage: $0 <tuple>"
-    echo "tuple can be one of : arm-godot-linux-gnueabihf, i686-godot-linux-gnu, x86_64-godot-linux-gnu"
-    exit 1
-  ;;
-esac
-
-target_arch=$1
-godot_toolchain_dir="$(pwd)/godot-toolchains"
-base_dir="$(pwd)/windows-build"
-target_dir="${base_dir}/${target_arch}_sdk-buildroot"
-
-function unpack_linux_sdk() {
-  mkdir -p "${base_dir}"
-  tar xf "${godot_toolchain_dir}/${target_arch}_sdk-buildroot.tar.bz2" -C "${base_dir}"
-}
-
-function pack_windows_sdk() {
-  pushd "${target_dir}/bin"
-    cp ${base_dir}/../pkg-config.bat .
-    unzip "${base_dir}/download/${scons_local_file}"
-  popd
-
-  pushd "${target_dir}"
-    for link in $(find -type l); do
-      echo "mklink \"${link}\" \"$(readlink ${link})\"" >> fix-sdk.bat
-      rm "${link}"
-    done
-
-    echo "mklink \"bin/gcc.exe\" \"${target_arch}-gcc.exe\"" >> fix-sdk.bat
-    echo "mklink \"bin/g++.exe\" \"${target_arch}-g++.exe\"" >> fix-sdk.bat
-    echo "mklink \"bin/ar.exe\" \"${target_arch}-ar.exe\"" >> fix-sdk.bat
-    echo "mklink \"bin/ranlib.exe\" \"${target_arch}-ranlib.exe\"" >> fix-sdk.bat
-    echo "mklink \"bin/gcc-ar.exe\" \"${target_arch}-gcc-ar.exe\"" >> fix-sdk.bat
-    echo "mklink \"bin/gcc-ranlib.exe\" \"${target_arch}-gcc-ranlib.exe\"" >> fix-sdk.bat
-    echo "mklink \"bin/lto-wrapper.exe\" \"../libexec/gcc/${target_arch}/${gcc_ver}/lto-wrapper.exe\"" >> fix-sdk.bat
-  popd
-
-  pushd ${base_dir}
-    cat ../installer.nsis | sed -e "s/TARGET_ARCH/${target_arch}/g" > installer.nsis
-    makensis installer.nsis
-    mv "Godot-SDK-${target_arch}.exe" ../godot-toolchains
-  popd
-}
-
-function download() {
-  mkdir -p "${base_dir}/download"
-
-  for component in make scons_local binutils gcc mpc mpfr gmp isl; do
-    component_file=${component}_file
-    component_url=${component}_url
-    if [ ! -e "${base_dir}/download/${!component_file}" ]; then
-      curl -L ${!component_url} --output "${base_dir}/download/${!component_file}"
-    fi
-  done
-}
-
-function unpack() {
-  mkdir -p "${base_dir}/src"
-
-  if [ ! -e "${base_dir}/src/gcc" ]; then
-    mkdir -p "${base_dir}/src/gcc"
-    pushd "${base_dir}/src/gcc"
-    tar --strip-components=1 -xf "${base_dir}/download/${gcc_file}"
-    for component in mpc mpfr gmp isl; do
-      component_file=${component}_file
-      mkdir ${component}
-      pushd $component
-      tar --strip-components=1 -xf "${base_dir}/download/${!component_file}"
-      popd
-    done
-    popd
-  fi
-
-  if [ ! -e "${base_dir}/src/binutils" ]; then
-     mkdir -p "${base_dir}/src/binutils"
-     pushd "${base_dir}/src/binutils"
-     tar --strip-components=1 -xf "${base_dir}/download/${binutils_file}"
-     popd
-  fi
-
-  if [ ! -e "${base_dir}/src/make" ]; then
-     mkdir -p "${base_dir}/src/make"
-     pushd "${base_dir}/src/make"
-     tar --strip-components=1 -xf "${base_dir}/download/${make_file}"
-     popd
-  fi
-}
-
-function build_gcc() {
-
-  mkdir -p "${base_dir}/build"
-  rm -rf "${base_dir}/build/gcc"
-  mkdir -p "${base_dir}/build/gcc"
-  pushd "${base_dir}/build/gcc"
-
-  "${base_dir}/src/gcc/configure" --prefix=${target_dir} --sysconfdir=${target_dir}/etc --enable-static --host=x86_64-w64-mingw32  --build=x86_64-linux-gnu --target=${target_arch} --with-sysroot=${target_dir}/${target_arch}/sysroot --enable-__cxa_atexit --with-gnu-ld --disable-libssp --disable-multilib --disable-decimal-float --without-zstd --enable-libquadmath --enable-tls --enable-threads --with-arch=nocona --enable-languages=c,c++ --enable-shared --disable-libgomp --disable-libstdcxx --with-static-standard-libraries LDFLAGS="-lssp"
-  make -j
-  make install-strip
-  popd
-}
-
-function build_binutils() {
-
-  mkdir -p "${base_dir}/build"
-  rm -rf "${base_dir}/build/binutils"
-  mkdir -p "${base_dir}/build/binutils"
-  pushd "${base_dir}/build/binutils"
-
-  "${base_dir}/src/binutils/configure" --with-static-standard-libraries --prefix=${target_dir} --with-sysroot=${target_dir}/${target_arch}/sysroot --enable-lto --host=x86_64-w64-mingw32 --build=x86_64-linux-gnu --target=${target_arch} LDFLAGS="-lssp"
-  make -j
-  make install-strip
-  popd
-}
-
-function build_make() {
-
-  mkdir -p "${base_dir}/build"
-  rm -rf "${base_dir}/build/make"
-  mkdir -p "${base_dir}/build/make"
-  pushd "${base_dir}/build/make"
-
-  "${base_dir}/src/make/configure" --prefix=${target_dir} --host=x86_64-w64-mingw32 --build=x86_64-linux-gnu LDFLAGS="-lssp"
-  make -j
-  make install-strip
-  popd
-}
-
-function cleanup_sdk() {
-  rm -f "${target_dir}/relocate-sdk.sh"
-
-  for directory in $(find ${target_dir} -name *.exe -printf %h\\n | sort -u); do
-    cp /usr/x86_64-w64-mingw32/sys-root/mingw/bin/libssp-0.dll ${directory}
-    cp /usr/x86_64-w64-mingw32/sys-root/mingw/bin/libwinpthread-1.dll ${directory}
-  done
-  
-  while read -r file; do
-    rm -f $(echo $file | sed -e 's/\.exe$//')
-  done < <(find ${target_dir} -name *.exe)
-  
-  while read -r file; do
-    rm -f $(echo $file | sed -e 's/\.dll$/.so/')
-  done < <(find ${target_dir} -name *.dll)
-  
-  find ${target_dir}/bin -type l -delete
-  find ${target_dir}/bin -name 'python*' -delete
-
-  # Filename case issues, kind of breaks the SDK for some uses but probably OK
-  rm -rf "${target_dir}/${target_arch}/sysroot/usr/include/linux/netfilter"
-  rm -rf "${target_dir}/${target_arch}/sysroot/usr/include/linux/netfilter_ipv4"
-  rm -rf "${target_dir}/${target_arch}/sysroot/usr/include/linux/netfilter_ipv6"
-  
-  rm -rf ${target_dir}/lib/python*
-}
-
-export PATH=${target_dir}/bin:${PATH}
-export HOSTCC=${target_arch}-gcc
-export HOSTCXX=${target_arch}-g++
-
-rm -rf "${target_dir}"
-
-download
-unpack
-unpack_linux_sdk
-build_make
-build_binutils
-build_gcc
-
-cleanup_sdk
-pack_windows_sdk

clean-linux-toolchain.sh

@@ -1,99 +0,0 @@
-#!/bin/bash
-
-set -e
-
-if [ -z $1 ] || [ -z $2 ]; then
-  echo "usage: $0 arch bits"
-  exit 1
-fi
-
-arch=$1
-bits=$2
-
-bin_to_keep="aclocal autoconf autoheader automake autoreconf cmake gawk libtool m4 meson ninja pkgconf pkg-config python3 scons tar toolchain-wrapper"
-lib_to_keep="cmake gcc libpkgconf libpython3.9 libz libisl libmpc libmpfr libgmp libffi python3.9 pkgconfig"
-share_to_keep="aclocal autoconf buildroot cmake gcc libtool pkgconfig"
-sysroot_share_to_keep="aclocal pkgconfig"
-
-function clean_directory() {
-  pushd $1
-  files_to_keep="${@:2}"
-
-  for file in $(ls -1); do
-    keep_file=0
-  
-    if echo ${file} | grep -qe "^${arch}"; then
-      keep_file=1
-    fi
-  
-    for keep in ${files_to_keep}; do
-      if echo ${file} | grep -qe "^${keep}"; then
-        keep_file=1
-        break
-      fi
-    done
-  
-    if [ ${keep_file} -eq 0 ]; then
-      rm -rf ${file}
-    fi
-  done
-
-  popd
-}
-
-rm -f $(find -name *.a | grep -vE '(nonshared|gcc|libstdc++)')
-find -regex '.*\.so\(\..*\)?' -exec bin/${arch}-strip {} \; 2> /dev/null
-find bin -exec bin/${arch}-strip {} \; 2> /dev/null
-find ${arch}/bin -exec bin/${arch}-strip {} \; 2> /dev/null
-find libexec/gcc -type f -exec bin/${arch}-strip {} \; 2> /dev/null
-
-clean_directory bin ${bin_to_keep}
-clean_directory lib ${lib_to_keep}
-clean_directory share ${share_to_keep}
-clean_directory ${arch}/sysroot/usr/share ${sysroot_share_to_keep}
-
-find -name *.pyc -delete
-
-rm -f usr lib64
-rm -rf sbin var
-
-for s in bin lib lib64 sbin; do
-  if [ -L ${arch}/sysroot/${s} ]; then
-    rm -f ${arch}/sysroot/${s}
-  fi
-done
-
-if [ ${bits} == 64 ]; then
-  libdir_to_remove=lib
-  libdir_to_keep=lib64
-else
-  libdir_to_remove=lib64
-  libdir_to_keep=lib
-fi
-
-rm -rf ${arch}/sysroot/usr/{bin,sbin}
-
-mkdir -p ${arch}/sysroot/${libdir_to_keep}
-cp ${arch}/sysroot/usr/${libdir_to_keep}/libpthread*so* ${arch}/sysroot/${libdir_to_keep}
-cp ${arch}/sysroot/usr/${libdir_to_keep}/ld-linux*so* ${arch}/sysroot/${libdir_to_keep}
-cp ${arch}/sysroot/usr/${libdir_to_keep}/libc*so* ${arch}/sysroot/${libdir_to_keep}
-
-if [ -L ${arch}/sysroot/usr/${libdir_to_keep} ]; then
-  rm ${arch}/sysroot/usr/${libdir_to_keep}
-  mv ${arch}/sysroot/usr/${libdir_to_remove} ${arch}/sysroot/usr/${libdir_to_keep}
-  mkdir ${arch}/sysroot/usr/${libdir_to_remove}
-  mv ${arch}/sysroot/usr/${libdir_to_keep}/crt*.o ${arch}/sysroot/usr/${libdir_to_remove}
-  mv ${arch}/sysroot/usr/${libdir_to_keep}/pkgconfig ${arch}/sysroot/usr/${libdir_to_remove}
-  # But why tho
-  mv ${arch}/sysroot/usr/${libdir_to_keep}/pulseaudio ${arch}/sysroot/usr/${libdir_to_remove}
-fi
-
-find -name *python2* -exec rm -rf {} \; || true
-
-ln -s bin/gcc ${arch}-gcc
-ln -s bin/g++ ${arch}-g++
-ln -s bin/ar ${arch}-ar
-ln -s bin/ranlib ${arch}-ranlib
-ln -s bin/gcc-ar ${arch}-gcc-ar
-ln -s bin/gcc-ranlib ${arch}-gcc-ranlib
-

configs/aarch64_efi_defconfig

@@ -23,13 +23,13 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="200M"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/aarch64-efi/post-image.sh support/scripts/genimage.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/aarch64-efi/genimage-efi.cfg"
 
-# Linux headers same as kernel, a 4.18 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_18=y
+# Linux headers same as kernel, a 5.9 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_9=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.18.10"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.9.11"
 BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
 BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 

configs/arm_foundationv8_defconfig

@@ -1,15 +1,18 @@
 BR2_aarch64=y
-# Linux headers same as kernel, a 4.4 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y
+# Linux headers same as kernel, a 5.9 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_9=y
 BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.3"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.9.11"
 BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="arm/foundation-v8"
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="arm/foundation-v8-gicv3-psci"
+BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_BOOT_WRAPPER_AARCH64=y
-BR2_TARGET_BOOT_WRAPPER_AARCH64_DTS="arm/foundation-v8"
+BR2_TARGET_BOOT_WRAPPER_AARCH64_DTS="arm/foundation-v8-gicv3-psci"
 BR2_TARGET_BOOT_WRAPPER_AARCH64_BOOTARGS="root=/dev/vda consolelog=9 console=ttyAMA0 rw"
+BR2_TARGET_BOOT_WRAPPER_AARCH64_PSCI=y
+BR2_TARGET_BOOT_WRAPPER_AARCH64_GICV3=y

configs/bananapi_m2_zero_defconfig

@@ -1,13 +1,13 @@
 BR2_arm=y
 BR2_cortex_a7=y
 BR2_ARM_FPU_NEON_VFPV4=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_6=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_9=y
 BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Bananapi M2 Zero"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/bananapi/bananapi-m2-zero/genimage.cfg"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.6.7"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.9.11"
 BR2_LINUX_KERNEL_DEFCONFIG="sunxi"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-bananapi-m2-zero"
@@ -17,7 +17,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="bananapi_m2_zero"
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.04"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_NEEDS_PYTHON3=y
 BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y

configs/beaglebone_qt5_defconfig

@@ -20,8 +20,11 @@ BR2_PACKAGE_FBV=y
 BR2_PACKAGE_QT5=y
 BR2_PACKAGE_QT5BASE_EXAMPLES=y
 BR2_PACKAGE_QT5BASE_EGLFS=y
-BR2_PACKAGE_QT5BASE_DEFAULT_QPA="eglfs"
+BR2_PACKAGE_QT5BASE_DEFAULT_QPA="wayland"
 BR2_PACKAGE_QT5QUICKCONTROLS=y
+BR2_PACKAGE_QT5WAYLAND=y
+BR2_PACKAGE_QT5WAYLAND_COMPOSITOR=y
+BR2_PACKAGE_WESTON=y
 BR2_PACKAGE_TI_SGX_DEMOS=y
 BR2_PACKAGE_TI_SGX_KM=y
 BR2_PACKAGE_TI_SGX_UM=y

configs/chromebook_elm_defconfig

@@ -9,9 +9,6 @@ BR2_GLOBAL_PATCH_DIR="board/chromebook/elm/patches/"
 BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_ROOTFS_EXT2_4=y
 
-# Linux headers same as kernel (5.9 series)
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_9=y
-
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y

configs/nitrogen6x_defconfig

@@ -11,6 +11,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1"
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/boundarydevices/common/post-build.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/boundarydevices/common/post-image.sh"
 BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_UBOOT_TOOLS=y
 
 # filesystem
 BR2_TARGET_ROOTFS_EXT2=y

docs/manual/adding-packages-cmake.txt

@@ -126,19 +126,14 @@ typical packages will therefore only use a few of them.
   in the build step. These are passed after the +make+ command. By
   default, empty.
 
-* +LIBFOO_INSTALL_OPTS+ contains the make options used to
-  install the package to the host directory. By default, the value
-  is +install+, which is correct for most CMake packages. It is still
-  possible to override it.
-
 * +LIBFOO_INSTALL_STAGING_OPTS+ contains the make options used to
   install the package to the staging directory. By default, the value
-  is +DESTDIR=$(STAGING_DIR) install/fast+, which is correct for most
+  is +DESTDIR=$(STAGING_DIR) install+, which is correct for most
   CMake packages. It is still possible to override it.
 
 * +LIBFOO_INSTALL_TARGET_OPTS+ contains the make options used to
   install the package to the target directory. By default, the value
-  is +DESTDIR=$(TARGET_DIR) install/fast+. The default value is correct
+  is +DESTDIR=$(TARGET_DIR) install+. The default value is correct
   for most CMake packages, but it is still possible to override it if
   needed.
 

docs/manual/adding-packages-generic.txt

@@ -502,6 +502,45 @@ LIBFOO_IGNORE_CVES += CVE-2020-12345
 LIBFOO_IGNORE_CVES += CVE-2020-54321
 ----------------------
 
+* +LIBFOO_CPE_ID_*+ variables is a set of variables that allows the
+  package to define its https://nvd.nist.gov/products/cpe[CPE
+  identifier]. The available variables are:
++
+--
+** +LIBFOO_CPE_ID_PREFIX+, specifies the prefix of the CPE identifier,
+   i.e the first three fields. When not defined, the default value is
+   +cpe:2.3:a+.
+
+** +LIBFOO_CPE_ID_VENDOR+, specifies the vendor part of the CPE
+   identifier. When not defined, the default value is
+   +<pkgname>_project+.
+
+** +LIBFOO_CPE_ID_PRODUCT+, specifies the product part of the CPE
+   identifier. When not defined, the default value is +<pkgname>+.
+
+** +LIBFOO_CPE_ID_VERSION+, specifies the version part of the CPE
+   identifier. When not defined the default value is
+   +$(LIBFOO_VERSION)+.
+
+** +LIBFOO_CPE_ID_VERSION_MINOR+ specifies the _update_ part of the
+   CPE identifier. When not defined the default value is +*+.
+--
++
+If any of those variables is defined, then the generic package
+infrastructure assumes the package provides valid CPE information. In
+this case, +LIBFOO_CPE_ID_VALID = YES+ will be set, and the generic
+package infrastructure will define +LIBFOO_CPE_ID+.
++
+Alternatively, a package can also explicitly set +LIBFOO_CPE_ID_VALID
+= YES+ if the default values for +LIBFOO_CPE_ID_PREFIX+,
++LIBFOO_CPE_ID_VENDOR+, +LIBFOO_CPE_ID_PRODUCT+,
++LIBFOO_CPE_ID_VERSION+, +LIBFOO_CPE_ID_VERSION_MINOR+ are all correct
+for this package and don't need to be explicitly overridden.
++
+For a host package, if its +LIBFOO_CPE_ID_*+ variables are not
+defined, it inherits the value of those variables from the
+corresponding target package.
+
 The recommended way to define these variables is to use the following
 syntax:
 

docs/manual/using-buildroot-toolchain.txt

@@ -35,7 +35,7 @@ generating a tarball.
 
 For your convenience, by selecting the option
 +BR2_PACKAGE_HOST_ENVIRONMENT_SETUP+, you can get a
-+environment-setup+ script installed in +output/host/+ and therefore
++setup-environment+ script installed in +output/host/+ and therefore
 in your SDK.  This script can be sourced with
 +. your/sdk/path/environment-setup+ to export a number of environment
 variables that will help cross-compile your projects using the

docs/website/download.html

@@ -42,74 +42,74 @@
 	</div>
       </div>
 
-      <h3 style="text-align: center;">Latest stable release: <b>2020.11</b></h3>
+      <h3 style="text-align: center;">Latest stable release: <b>2020.08.2</b></h3>
 
       <div class="row mt centered">
 	<div class="col-sm-6">
 	  <div class="flip-container center-block" ontouchstart="this.classList.toggle('hover');">
 	    <div class="flipper">
 	      <div class="front">
-		<a href="/downloads/buildroot-2020.11.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
+		<a href="/downloads/buildroot-2020.08.2.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
 	      </div>
 	      <div class="back">
-		<a href="/downloads/buildroot-2020.11.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
+		<a href="/downloads/buildroot-2020.08.2.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
 	      </div>
 	    </div>
 	  </div>
-	  <h3><a href="/downloads/buildroot-2020.11.tar.gz">buildroot-2020.11.tar.gz</a></h3>
-	  <p><a href="/downloads/buildroot-2020.11.tar.gz.sign">PGP signature</a></p>
+	  <h3><a href="/downloads/buildroot-2020.08.2.tar.gz">buildroot-2020.08.2.tar.gz</a></h3>
+	  <p><a href="/downloads/buildroot-2020.08.2.tar.gz.sign">PGP signature</a></p>
 	</div>
 	<div class="col-sm-6">
 	  <div class="flip-container center-block" ontouchstart="this.classList.toggle('hover');">
 	    <div class="flipper">
 	      <div class="front">
-		<a href="/downloads/buildroot-2020.11.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
+		<a href="/downloads/buildroot-2020.08.2.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
 	      </div>
 	      <div class="back">
-		<a href="/downloads/buildroot-2020.11.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
+		<a href="/downloads/buildroot-2020.08.2.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
 	      </div>
 	    </div>
 	  </div>
 
-	  <h3><a href="/downloads/buildroot-2020.11.tar.bz2">buildroot-2020.11.tar.bz2</a></h3>
-	  <p><a href="/downloads/buildroot-2020.11.tar.bz2.sign">PGP signature</a></p>
+	  <h3><a href="/downloads/buildroot-2020.08.2.tar.bz2">buildroot-2020.08.2.tar.bz2</a></h3>
+	  <p><a href="/downloads/buildroot-2020.08.2.tar.bz2.sign">PGP signature</a></p>
 	</div>
       </div>
-<!--
-      <h3 style="text-align: center;">Latest release candidate: <b>2020.11-rc3</b></h3>
+
+      <h3 style="text-align: center;">Latest release candidate: <b>2020.11-rc2</b></h3>
       <div class="row mt centered">
 	<div class="col-sm-6">
 	  <div class="flip-container center-block" ontouchstart="this.classList.toggle('hover');">
 	    <div class="flipper">
 	      <div class="front">
-		<a href="/downloads/buildroot-2020.11-rc3.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
+		<a href="/downloads/buildroot-2020.11-rc2.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
 	      </div>
 	      <div class="back">
-		<a href="/downloads/buildroot-2020.11-rc3.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
+		<a href="/downloads/buildroot-2020.11-rc2.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
 	      </div>
 	    </div>
 	  </div>
 
-	  <h3><a href="/downloads/buildroot-2020.11-rc3.tar.gz">buildroot-2020.11-rc3.tar.gz</a></h3>
-	  <p><a href="/downloads/buildroot-2020.11-rc3.tar.gz.sign">PGP signature</a></p>
+	  <h3><a href="/downloads/buildroot-2020.11-rc2.tar.gz">buildroot-2020.11-rc2.tar.gz</a></h3>
+	  <p><a href="/downloads/buildroot-2020.11-rc2.tar.gz.sign">PGP signature</a></p>
 	</div>
 	<div class="col-sm-6">
 	  <div class="flip-container center-block" ontouchstart="this.classList.toggle('hover');">
 	    <div class="flipper">
 	      <div class="front">
-		<a href="/downloads/buildroot-2020.11-rc3.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
+		<a href="/downloads/buildroot-2020.11-rc2.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
 	      </div>
 	      <div class="back">
-		<a href="/downloads/buildroot-2020.11-rc3.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
+		<a href="/downloads/buildroot-2020.11-rc2.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
 	      </div>
 	    </div>
 	  </div>
 
-	  <h3><a href="/downloads/buildroot-2020.11-rc3.tar.bz2">buildroot-2020.11-rc3.tar.bz2</a></h3>
-	  <p><a href="/downloads/buildroot-2020.11-rc3.tar.bz2.sign">PGP signature</a></p>
+	  <h3><a href="/downloads/buildroot-2020.11-rc2.tar.bz2">buildroot-2020.11-rc2.tar.bz2</a></h3>
+	  <p><a href="/downloads/buildroot-2020.11-rc2.tar.bz2.sign">PGP signature</a></p>
 	</div>
       </div>
--->
+
       This and earlier releases (and their PGP signatures) can always be downloaded from
       <a href="/downloads/">http://buildroot.net/downloads/</a>.
     </div>

docs/website/news.html

@@ -9,45 +9,6 @@
 <h2>News</h2>
 <ul class="timeline">
 
-  <li class="timeline-inverted">
-    <div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
-    <div class="timeline-panel">
-      <div class="timeline-heading">
-	<h4 class="timeline-title">2020.11 released</h4>
-	<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>2 December 2020</small></p>
-      </div>
-      <div class="timeline-body">
-	<p>The stable 2020.11 release is out - Thanks to everyone
-	  contributing and testing the release candidates. See the
-	  <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2020.11">CHANGES</a>
-	  file for more details
-	  and go to the <a href="/downloads/">downloads page</a> to pick up the
-	  <a href="/downloads/buildroot-2020.11.tar.bz2">2020.11 release</a>.</p>
-      </div>
-    </div>
-  </li>
-
-  <li>
-    <div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
-    <div class="timeline-panel">
-      <div class="timeline-heading">
-	<h4 class="timeline-title">2020.11-rc3 released</h4>
-	<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>28 November 2020</small></p>
-      </div>
-      <div class="timeline-body">
-        <p>Another week, another release candidate with more cleanups and build fixes. See the
-	  <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2020.11-rc3">CHANGES</a>
-	  file for details.</p>
-
-	<p>Head to the <a href="/downloads/">downloads page</a> to pick up the
-	  <a href="/downloads/buildroot-2020.11-rc3.tar.bz2">2020.11-rc3
-	  release candidate</a>, and report any problems found to the
-	  <a href="support.html">mailing list</a> or
-	  <a href="https://bugs.buildroot.org">bug tracker</a>.</p>
-      </div>
-    </div>
-  </li>
-
   <li class="timeline-inverted">
     <div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
     <div class="timeline-panel">

installer.nsis

@@ -1,26 +0,0 @@
-Name "Godot SDK for TARGET_ARCH"
-OutFile "Godot-SDK-TARGET_ARCH.exe"
-InstallDir "$ProgramFiles\Godot SDKs\TARGET_ARCH"
-InstallDirRegKey HKLM SOFTWARE\ "Install_Dir"
-
-ShowInstDetails hide
-ShowUninstDetails hide
-
-XPStyle on
-
-Page directory
-Page instfiles
-
-DirText "Please select the installation folder."
-
-Section ""
-  SectionIn RO
-
-  SetOutPath "$INSTDIR"
-  File /r "TARGET_ARCH_sdk-buildroot/*.*"
-SectionEnd
-
-Section -post
-  ExecShell "" "$INSTDIR\fix-sdk.bat"
-SectionEnd
-

linux/Config.in

@@ -125,7 +125,7 @@ endif
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "5.9.16" if BR2_LINUX_KERNEL_LATEST_VERSION
+	default "5.9.8" if BR2_LINUX_KERNEL_LATEST_VERSION
 	default "4.19.152-cip37" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
 	default "4.19.152-cip37-rt16" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \

linux/linux.hash

@@ -1,12 +1,12 @@
 # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc
-sha256  b0d7abae88e5f91893627c645e680a95c818defd1b4fcaf3e2afb4b2b6b4ab86  linux-5.9.16.tar.xz
+sha256  7656733b316562662026ac82a7c0be41440e16bbf1bdc5447b119e34ff3b86a6  linux-5.9.8.tar.xz
 sha256  4ab4a3f694b7b4cfbe78871eab34c8039ad33692144c45c669827a594da85534  linux-5.8.18.tar.xz
-sha256  d37449403664cc3b1bac96d0d9a199dbe619885cd899c0ae3108843f42e3d522  linux-5.4.93.tar.xz
+sha256  a3e03e6970240dddc8174bf9f49b56d774c40125eabe1582d2ebe85b01addbf7  linux-5.4.77.tar.xz
 # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc
-sha256  661e98b9448cbac948c705fd44cd7d30200422ee1cb02950d142aa99a1b3985a  linux-4.4.253.tar.xz
-sha256  9a5b51a8350201bd38e3ff13909323a6571b4572a7b3caed76e462b07619bc18  linux-4.9.253.tar.xz
-sha256  62a36a25431016d98d0f1cff98be432086c51f86fd79042bd10a867b3a924d11  linux-4.14.217.tar.xz
-sha256  f4e352fe0eb986e5b532b99d9b0725a67046cbb3e5f53fcd5b098cbaeb2ac60a  linux-4.19.171.tar.xz
+sha256  95de46b6bd72f66169629eb0e343b005778539864598eae76c3ca999645d58b5  linux-4.4.243.tar.xz
+sha256  d3aa189ca7fcc6e52d6c0333a0d7acd8789e9a492b32dbf9476e926ffaa73984  linux-4.9.243.tar.xz
+sha256  1c233efaa5063983293a02d4692acc9ced9c03e18857364855d4f612347086ac  linux-4.14.206.tar.xz
+sha256  76dca365255c1a13778c3b24f0eae14f4e66bc12fe79f5e6592b116fc57ef755  linux-4.19.157.tar.xz
 # Locally computed
 sha256  d2a06f52143deb929b8d513cf9afc9bd065951389a80fa70bc4d63025b5b3fb9  linux-cip-4.19.152-cip37.tar.gz
 sha256  bc1dacd3d0f526de3e8754a444e8e02a54521527af639ddb907cb35cda775a8c  linux-cip-4.19.152-cip37-rt16.tar.gz

package/Config.in

@@ -402,6 +402,7 @@ menu "Firmware"
 	source "package/linux-firmware/Config.in"
 	source "package/murata-cyw-fw/Config.in"
 	source "package/odroidc2-firmware/Config.in"
+	source "package/qcom-db410c-firmware/Config.in"
 	source "package/rpi-bt-firmware/Config.in"
 	source "package/rpi-firmware/Config.in"
 	source "package/rpi-wifi-firmware/Config.in"
@@ -1245,6 +1246,7 @@ menu "External python modules"
 	source "package/python-zope-interface/Config.in"
 endmenu
 endif
+	source "package/quickjs/Config.in"
 	source "package/ruby/Config.in"
 	source "package/tcl/Config.in"
 if BR2_PACKAGE_TCL
@@ -1764,6 +1766,7 @@ menu "Networking"
 	source "package/libuev/Config.in"
 	source "package/libuhttpd/Config.in"
 	source "package/libupnp/Config.in"
+	source "package/libupnp18/Config.in"
 	source "package/libupnpp/Config.in"
 	source "package/liburiparser/Config.in"
 	source "package/libuwsc/Config.in"
@@ -2110,7 +2113,6 @@ menu "Networking applications"
 	source "package/iperf/Config.in"
 	source "package/iperf3/Config.in"
 	source "package/iproute2/Config.in"
-	source "package/ipsec-tools/Config.in"
 	source "package/ipset/Config.in"
 	source "package/iptables/Config.in"
 	source "package/iptraf-ng/Config.in"

package/Config.in.host

@@ -1,5 +1,6 @@
 menu "Host utilities"
 
+	source "package/abootimg/Config.in.host"
 	source "package/aespipe/Config.in.host"
 	source "package/android-tools/Config.in.host"
 	source "package/asn1c/Config.in.host"
@@ -90,6 +91,5 @@ menu "Host utilities"
 	source "package/xorriso/Config.in.host"
 	source "package/zip/Config.in.host"
 	source "package/zstd/Config.in.host"
-	source "package/python-scons/Config.in.host"
 
 endmenu

package/abootimg/Config.in.host

@@ -0,0 +1,8 @@
+config BR2_PACKAGE_HOST_ABOOTIMG
+	bool "host abootimg"
+	select BR2_PACKAGE_HOST_UTIL_LINUX
+	help
+	  Tool to manipulate Android Boot Images, either on files
+	  or directly on /dev block devices.
+
+	  https://github.com/ggrandou/abootimg

package/abootimg/abootimg.mk

@@ -11,6 +11,7 @@ ABOOTIMG_LICENSE_FILES = LICENSE
 
 # depends on libblkid from util-linux
 ABOOTIMG_DEPENDENCIES = util-linux
+HOST_ABOOTIMG_DEPENDENCIES = host-util-linux
 
 define ABOOTIMG_BUILD_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
@@ -20,4 +21,13 @@ define ABOOTIMG_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 0755 $(@D)/abootimg $(TARGET_DIR)/usr/bin/abootimg
 endef
 
+define HOST_ABOOTIMG_BUILD_CMDS
+	$(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D)
+endef
+
+define HOST_ABOOTIMG_INSTALL_CMDS
+	$(INSTALL) -m 0755 $(@D)/abootimg $(HOST_DIR)/usr/bin/abootimg
+endef
+
 $(eval $(generic-package))
+$(eval $(host-generic-package))

package/apitrace/0003-CMakeLists.txt-respect-BUILD_TESTING-OFF.patch

@@ -1,104 +0,0 @@
-From 7f0f1e7e34f997eef697856804dd478b54bb365e Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Tue, 22 Dec 2020 10:45:21 +0100
-Subject: [PATCH] CMakeLists.txt: respect BUILD_TESTING=OFF
-
-Allow the user to disable unit tests through BUILD_TESTING=OFF:
-https://cmake.org/cmake/help/latest/command/enable_testing.html
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Upstream status: https://github.com/apitrace/apitrace/pull/698]
----
- CMakeLists.txt           | 6 +++++-
- gui/CMakeLists.txt       | 6 ++++--
- lib/guids/CMakeLists.txt | 6 ++++--
- lib/os/CMakeLists.txt    | 6 ++++--
- lib/trace/CMakeLists.txt | 6 ++++--
- 5 files changed, 21 insertions(+), 9 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4a07f069..ee401887 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -41,6 +41,8 @@ option (ENABLE_FRAME_POINTER "Disable frame pointer omission" ON)
- 
- option (ENABLE_ASAN "Enable Address Sanitizer" OFF)
- 
-+option (BUILD_TESTING "Enable unit tests" ON)
-+
- option (ENABLE_TESTS "Enable additional tests" OFF)
- 
- if (ANDROID)
-@@ -433,7 +435,9 @@ endmacro ()
- # which subdirectory they are declared
- set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
- 
--enable_testing ()
-+if (BUILD_TESTING)
-+    enable_testing ()
-+endif ()
- if (CMAKE_CROSSCOMPILING)
-     add_custom_target (check)
- elseif (DEFINED CMAKE_BUILD_TYPE)
-diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt
-index 5baf3552..ad6ee501 100644
---- a/gui/CMakeLists.txt
-+++ b/gui/CMakeLists.txt
-@@ -13,8 +13,10 @@ add_library (qubjson STATIC
-     qubjson.cpp
- )
- 
--add_gtest (qubjson_test qubjson_test.cpp)
--target_link_libraries (qubjson_test qubjson)
-+if (BUILD_TESTING)
-+    add_gtest (qubjson_test qubjson_test.cpp)
-+    target_link_libraries (qubjson_test qubjson)
-+endif ()
- 
- set(qapitrace_SRCS
-    apisurface.cpp
-diff --git a/lib/guids/CMakeLists.txt b/lib/guids/CMakeLists.txt
-index ce0f86da..ea28a18f 100644
---- a/lib/guids/CMakeLists.txt
-+++ b/lib/guids/CMakeLists.txt
-@@ -5,5 +5,7 @@ add_library (guids STATIC
-     guids.hpp
- )
- 
--add_gtest (guids_test guids_test.cpp)
--target_link_libraries (guids_test guids)
-+if (BUILD_TESTING)
-+    add_gtest (guids_test guids_test.cpp)
-+    target_link_libraries (guids_test guids)
-+endif ()
-diff --git a/lib/os/CMakeLists.txt b/lib/os/CMakeLists.txt
-index 222411e0..b7134b57 100644
---- a/lib/os/CMakeLists.txt
-+++ b/lib/os/CMakeLists.txt
-@@ -36,5 +36,7 @@ if (APPLE)
-     )
- endif ()
- 
--add_gtest (os_thread_test os_thread_test.cpp)
--target_link_libraries (os_thread_test os)
-+if (BUILD_TESTING)
-+    add_gtest (os_thread_test os_thread_test.cpp)
-+    target_link_libraries (os_thread_test os)
-+endif ()
-diff --git a/lib/trace/CMakeLists.txt b/lib/trace/CMakeLists.txt
-index c68bd00f..d95df978 100644
---- a/lib/trace/CMakeLists.txt
-+++ b/lib/trace/CMakeLists.txt
-@@ -34,5 +34,7 @@ target_link_libraries (common
-     brotli_dec brotli_common
- )
- 
--add_gtest (trace_parser_flags_test trace_parser_flags_test.cpp)
--target_link_libraries (trace_parser_flags_test common)
-+if (BUILD_TESTING)
-+    add_gtest (trace_parser_flags_test trace_parser_flags_test.cpp)
-+    target_link_libraries (trace_parser_flags_test common)
-+endif ()
--- 
-2.29.2
-

package/axel/axel.hash

@@ -1,2 +1,2 @@
-sha256  f1364d9b55d435efc6d32218097a50a63be7b1300138e698133cf19ad3aa3a54  axel-2.17.9.tar.xz
+sha256  46eb4f10a11c4e50320ae6a034ef03ffe59dc11c3c6542a9867a3e4dc0c4b44e  axel-2.17.10.tar.xz
 sha256  ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6  COPYING

package/axel/axel.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-AXEL_VERSION = 2.17.9
+AXEL_VERSION = 2.17.10
 AXEL_SITE = https://github.com/axel-download-accelerator/axel/releases/download/v$(AXEL_VERSION)
 AXEL_SOURCE = axel-$(AXEL_VERSION).tar.xz
 AXEL_LICENSE = GPL-2.0+

package/azmq/Config.in

@@ -5,7 +5,6 @@ config BR2_PACKAGE_AZMQ
 	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # boost-log
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11
 	depends on BR2_USE_WCHAR # boost
-	depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-thread
 	depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # exception_ptr
 	select BR2_PACKAGE_ZEROMQ
 	select BR2_PACKAGE_BOOST
@@ -22,7 +21,6 @@ config BR2_PACKAGE_AZMQ
 	  https://github.com/zeromq/azmq
 
 comment "azmq needs a toolchain w/ C++11, wchar and NPTL"
-	depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS
 	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \
 		&& BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS_NPTL)
 

package/bctoolbox/bctoolbox.mk

@@ -17,7 +17,6 @@ BCTOOLBOX_CONF_OPTS = \
 	-DENABLE_STRICT=OFF \
 	-DENABLE_TESTS_COMPONENT=OFF \
 	-DENABLE_TESTS=OFF \
-	-DGIT_EXECUTABLE=OFF \
 	-DCMAKE_SKIP_RPATH=ON
 
 ifeq ($(BR2_PACKAGE_LIBICONV),y)

package/bind/0001-cross.patch

@@ -1,15 +1,24 @@
-Use host compiler to build 'gen' since it's run when building.
+From 505cc9fcadda5607dc4c5bacb03928c0b35162a8 Mon Sep 17 00:00:00 2001
+From: Gustavo Zacarias <gustavo@zacarias.com.ar>
+Date: Wed, 4 Nov 2020 17:51:38 +0100
+Subject: [PATCH] Use host compiler to build 'gen' since it's run when
+ building.
 
 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
 [Fabrice: updated for 9.11.10]
 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
+---
+ lib/dns/Makefile.in | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
 
-diff -Nura bind-9.5.1-P1/lib/dns/Makefile.in bind-9.5.1-P1.gencross/lib/dns/Makefile.in
---- bind-9.5.1-P1/lib/dns/Makefile.in	2007-09-11 22:09:08.000000000 -0300
-+++ bind-9.5.1-P1.gencross/lib/dns/Makefile.in	2009-03-04 16:35:23.000000000 -0200
-@@ -160,10 +160,8 @@
+diff --git a/lib/dns/Makefile.in b/lib/dns/Makefile.in
+index 8fc4e94f26..4ac92857e0 100644
+--- a/lib/dns/Makefile.in
++++ b/lib/dns/Makefile.in
+@@ -184,10 +184,8 @@ code.h:	gen
  	./gen -s ${srcdir} > code.h || { rm -f $@ ; exit 1; }
-
+ 
  gen: gen.c
 -	${BUILD_CC} ${BUILD_CFLAGS} -I${top_srcdir}/lib/isc/include \
 -	${LFS_CFLAGS} ${LFS_LDFLAGS} \
@@ -17,7 +26,9 @@ diff -Nura bind-9.5.1-P1/lib/dns/Makefile.in bind-9.5.1-P1.gencross/lib/dns/Make
 -	${BUILD_LIBS} ${LFS_LIBS}
 +	${HOSTCC} ${HOST_CFLAGS} -I${top_srcdir}/lib/isc/include \
 +	${HOST_LDFLAGS} -o $@ ${srcdir}/gen.c
-
+ 
  timestamp: include libdns.@A@
  	touch timestamp
+-- 
+2.29.1
 

package/bind/bind.hash

@@ -1,4 +1,4 @@
-# Verified from https://ftp.isc.org/isc/bind9/9.11.22/bind-9.11.22.tar.gz.asc
-# with key AE3FAC796711EC59FC007AA474BB6B9A4CBB3D38
-sha256  afc6d8015006f1cabf699ff19f517bb8fd9c1811e5231f26baf51c3550262ac9  bind-9.11.22.tar.gz
-sha256  da2aec2b7f6f0feb16bcb080e2c587375fd3195145f047e4d92d112f5b9db501  COPYRIGHT
+# Verified from https://ftp.isc.org/isc/bind9/9.11.24/bind-9.11.24.tar.gz.asc
+# with key 95CEDA256B1CA0A15F302FB59521A7ED5DACE918
+sha256  f261587c5d37c7f14e8393547c4556faefa701a646930f1b6408d71519a30428  bind-9.11.24.tar.gz
+sha256  e316d9d12b3cc3600985d71011d7856f5ff93d28e748155a3a18171b32d98d8b  COPYRIGHT

package/bind/bind.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-BIND_VERSION = 9.11.22
+BIND_VERSION = 9.11.24
 BIND_SITE = https://ftp.isc.org/isc/bind9/$(BIND_VERSION)
 # bind does not support parallel builds.
 BIND_MAKE = $(MAKE1)

package/binutils/Config.in.host

@@ -39,7 +39,7 @@ config BR2_BINUTILS_VERSION_2_35_X
 	depends on !BR2_BINFMT_FLAT
 
 config BR2_BINUTILS_VERSION_ARC
-	bool "binutils arc (2.34.50)"
+	bool "binutils arc (2.31)"
 	depends on BR2_arc
 
 config BR2_BINUTILS_VERSION_CSKY

package/bitcoin/Config.in

@@ -10,7 +10,6 @@ config BR2_PACKAGE_BITCOIN_ARCH_SUPPORTS
 config BR2_PACKAGE_BITCOIN
 	bool "bitcoin"
 	depends on BR2_INSTALL_LIBSTDCPP
-	depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-thread
 	depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::future
 	depends on BR2_PACKAGE_BITCOIN_ARCH_SUPPORTS
 	depends on BR2_TOOLCHAIN_HAS_THREADS # boost
@@ -38,7 +37,6 @@ config BR2_PACKAGE_BITCOIN
 
 comment "bitcoin needs a toolchain w/ C++, threads, wchar"
 	depends on BR2_PACKAGE_BITCOIN_ARCH_SUPPORTS
-	depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS
 	depends on !BR2_INSTALL_LIBSTDCPP || \
 		!BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR
 

package/boost/Config.in

@@ -52,7 +52,6 @@ config BR2_PACKAGE_BOOST_LAYOUT
 
 config BR2_PACKAGE_BOOST_ATOMIC
 	bool "boost-atomic"
-	depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS
 	help
 	  C++11-style atomic<>.
 
@@ -83,8 +82,6 @@ config BR2_PACKAGE_BOOST_CONTEXT_ARCH_SUPPORTS
 config BR2_PACKAGE_BOOST_CONTEXT
 	bool "boost-context"
 	depends on BR2_PACKAGE_BOOST_CONTEXT_ARCH_SUPPORTS
-	depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS \
-		|| BR2_TOOLCHAIN_GCC_AT_LEAST_6 # boost-thread
 	depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735
 	select BR2_PACKAGE_BOOST_THREAD if !BR2_TOOLCHAIN_GCC_AT_LEAST_6
 	help
@@ -104,7 +101,6 @@ comment "boost-contract needs a toolchain w/ NPTL"
 config BR2_PACKAGE_BOOST_COROUTINE
 	bool "boost-coroutine"
 	depends on BR2_PACKAGE_BOOST_CONTEXT_ARCH_SUPPORTS
-	depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-thread
 	depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # boost-context, boost-thread
 	select BR2_PACKAGE_BOOST_CHRONO
 	select BR2_PACKAGE_BOOST_CONTEXT
@@ -117,7 +113,6 @@ config BR2_PACKAGE_BOOST_COROUTINE
 
 comment "boost-coroutine needs a toolchain not affected by GCC bug 64735"
 	depends on BR2_PACKAGE_BOOST_CONTEXT_ARCH_SUPPORTS
-	depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS
 	depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735
 
 config BR2_PACKAGE_BOOST_DATE_TIME
@@ -140,8 +135,6 @@ config BR2_PACKAGE_BOOST_FIBER
 	# mips support uses the "pause" instruction, only available
 	# since mips32r2/mips64r2.
 	depends on !BR2_MIPS_CPU_MIPS32 && !BR2_MIPS_CPU_MIPS64
-	depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS \
-		|| BR2_TOOLCHAIN_GCC_AT_LEAST_6 # boost-context -> boost-thread
 	depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # boost-context
 	select BR2_PACKAGE_BOOST_CONTEXT
 	select BR2_PACKAGE_BOOST_FILESYSTEM
@@ -151,14 +144,10 @@ config BR2_PACKAGE_BOOST_FIBER
 
 comment "boost-fiber needs a toolchain w/ NPTL"
 	depends on BR2_PACKAGE_BOOST_CONTEXT_ARCH_SUPPORTS
-	depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS \
-		|| BR2_TOOLCHAIN_GCC_AT_LEAST_6
 	depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL
 
 comment "boost-fiber needs a toolchain not affected by GCC bug 64735"
 	depends on BR2_PACKAGE_BOOST_CONTEXT_ARCH_SUPPORTS
-	depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS \
-		|| BR2_TOOLCHAIN_GCC_AT_LEAST_6
 	depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735
 
 config BR2_PACKAGE_BOOST_FILESYSTEM
@@ -201,8 +190,6 @@ config BR2_PACKAGE_BOOST_LOCALE
 	# details.
 	depends on !(BR2_STATIC_LIBS && BR2_PACKAGE_ICU)
 	depends on !(BR2_TOOLCHAIN_HAS_GCC_BUG_64735 && BR2_PACKAGE_ICU) # boost-thread
-	depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS \
-		|| !BR2_PACKAGE_ICU # boost-thread
 	select BR2_PACKAGE_BOOST_SYSTEM
 	select BR2_PACKAGE_BOOST_THREAD if BR2_PACKAGE_ICU
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
@@ -210,19 +197,16 @@ config BR2_PACKAGE_BOOST_LOCALE
 	  Provide localization and Unicode handling tools for C++.
 
 comment "boost-locale needs a toolchain w/ dynamic library"
-	depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS
 	depends on BR2_PACKAGE_ICU
 	depends on BR2_STATIC_LIBS
 
 comment "boost-locale needs a toolchain not affected by GCC bug 64735"
-	depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS
 	depends on BR2_PACKAGE_ICU
 	depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735
 
 config BR2_PACKAGE_BOOST_LOG
 	bool "boost-log"
 	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
-	depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-atomic
 	depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # boost-thread
 	select BR2_PACKAGE_BOOST_ATOMIC
 	select BR2_PACKAGE_BOOST_DATE_TIME
@@ -234,7 +218,6 @@ config BR2_PACKAGE_BOOST_LOG
 	  Logging library.
 
 comment "boost-log needs a toolchain w/ NPTL"
-	depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS
 	depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL
 
 comment "boost-log needs a toolchain not affected by GCC bug 64735"
@@ -330,8 +313,8 @@ config BR2_PACKAGE_BOOST_TEST
 
 config BR2_PACKAGE_BOOST_THREAD
 	bool "boost-thread"
-	depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS
 	depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::current_exception
+	select BR2_PACKAGE_BOOST_ATOMIC if !BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS
 	select BR2_PACKAGE_BOOST_CHRONO
 	select BR2_PACKAGE_BOOST_SYSTEM
 	help
@@ -349,7 +332,6 @@ config BR2_PACKAGE_BOOST_TIMER
 
 config BR2_PACKAGE_BOOST_TYPE_ERASURE
 	bool "boost-type_erasure"
-	depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-thread
 	depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # boost-thread
 	select BR2_PACKAGE_BOOST_SYSTEM
 	select BR2_PACKAGE_BOOST_THREAD
@@ -364,7 +346,6 @@ config BR2_PACKAGE_BOOST_WAVE
 	# limitation of assembler for coldfire
 	# error: Tried to convert PC relative branch to absolute jump
 	depends on !BR2_m68k_cf
-	depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-thread
 	depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # boost-thread
 	select BR2_PACKAGE_BOOST_DATE_TIME
 	select BR2_PACKAGE_BOOST_FILESYSTEM

package/botan/0001-src-build-data-arch-arm64.txt-add-aarch64_be.patch

@@ -1,31 +0,0 @@
-From a93bc8503649028852402c61bdda531af2872d0e Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Thu, 15 Oct 2020 09:15:06 +0200
-Subject: [PATCH] src/build-data/arch/arm64.txt: add aarch64_be
-
-Allow the user to set cpu value to aarch64_be.
-Endianness will be correctly guessed by choose_endian function because
-this alias ends with "be"
-
-Fixes:
- - http://autobuild.buildroot.org/results/69ebf03c59b2af4140a39bc26f17d0396b6ec15d
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Retrieved from:
-https://github.com/randombit/botan/commit/a93bc8503649028852402c61bdda531af2872d0e]
----
- src/build-data/arch/arm64.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/build-data/arch/arm64.txt b/src/build-data/arch/arm64.txt
-index 056c5318ff..5205295125 100644
---- a/src/build-data/arch/arm64.txt
-+++ b/src/build-data/arch/arm64.txt
-@@ -5,6 +5,7 @@ family arm
- 
- <aliases>
- aarch64
-+aarch64_be
- armv8
- armv8-a
- </aliases>

package/botan/botan.hash

@@ -1,4 +1,4 @@
 # From https://botan.randombit.net/releases/sha256sums.txt
-sha256  92ed6ebc918d86bd1b04221ca518af4cf29cc326c4760740bd2d22e61cea2628  Botan-2.16.0.tar.xz
+sha256  b97044b312aa718349af7851331b064bc7bd5352400d5f80793bace427d01343  Botan-2.17.0.tar.xz
 # Locally computed
 sha256  fb7f0322d36fba55ca17d77bc203a9f09a40daa8a249b75cf8887aba36cec9d0  license.txt

package/botan/botan.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-BOTAN_VERSION = 2.16.0
+BOTAN_VERSION = 2.17.0
 BOTAN_SOURCE = Botan-$(BOTAN_VERSION).tar.xz
 BOTAN_SITE = http://botan.randombit.net/releases
 BOTAN_LICENSE = BSD-2-Clause

package/brltty/brltty.mk

@@ -96,13 +96,6 @@ else
 BRLTTY_CONF_OPTS += --without-rgx-package
 endif
 
-ifeq ($(BR2_PACKAGE_POLKIT),y)
-BRLTTY_DEPENDENCIES += polkit
-BRLTTY_CONF_OPTS += --enable-polkit
-else
-BRLTTY_CONF_OPTS += --disable-polkit
-endif
-
 ifeq ($(BR2_PACKAGE_SYSTEMD),y)
 BRLTTY_DEPENDENCIES += systemd
 BRLTTY_CONF_OPTS += --with-service-package

package/bustle/bustle.mk

@@ -6,7 +6,7 @@
 
 BUSTLE_VERSION = 0.7.5
 BUSTLE_SITE = https://www.freedesktop.org/software/bustle/$(BUSTLE_VERSION)
-BUSTLE_LICENSE = LGPL-2.1+, GPL-3.0 (binaries)
+BUSTLE_LICENSE = LGPL-2.1+
 BUSTLE_LICENSE_FILES = LICENSE
 BUSTLE_DEPENDENCIES = libglib2 libpcap host-pkgconf
 

package/c-ares/0001-src-lib-Makefile.am-install-ares_dns.h.patch

@@ -1,37 +0,0 @@
-From e2180d95fb67f57b6ffba01fefb4844a1ca4f792 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Wed, 18 Nov 2020 08:12:45 +0100
-Subject: [PATCH] src/lib/Makefile.am: install ares_dns.h
-
-This will avoid the following build failure with resiprocate:
-
-In file included from dns/DnsCnameRecord.cxx:7:
-dns/AresCompat.hxx:5:10: fatal error: ares_dns.h: No such file or directory
- #include "ares_dns.h"
-          ^~~~~~~~~~~~
-
-Fixes:
- - http://autobuild.buildroot.org/results/cbf158f0c037d44ef293a8804d18c84e3b731059
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Upstream status: https://github.com/c-ares/c-ares/pull/376]
----
- src/lib/Makefile.am | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
-index c918667..92a4152 100644
---- a/src/lib/Makefile.am
-+++ b/src/lib/Makefile.am
-@@ -14,6 +14,8 @@ lib_LTLIBRARIES = libcares.la
- 
- man_MANS = $(MANPAGES)
- 
-+include_HEADERS = ares_dns.h
-+
- # adig and ahost are just sample programs and thus not mentioned with the
- # regular sources and headers
- EXTRA_DIST = Makefile.inc config-win32.h CMakeLists.txt \
--- 
-2.29.2
-

package/c-ares/c-ares.mk

@@ -10,8 +10,6 @@ C_ARES_INSTALL_STAGING = YES
 C_ARES_CONF_OPTS = --with-random=/dev/urandom
 C_ARES_LICENSE = MIT
 C_ARES_LICENSE_FILES = LICENSE.md
-# We're patching src/lib/Makefile.am
-C_ARES_AUTORECONF = YES
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

package/ca-certificates/ca-certificates.hash

@@ -1,6 +1,6 @@
 # hashes from: $(CA_CERTIFICATES_SITE)/ca-certificates_$(CA_CERTIFICATES_VERSION).dsc :
-sha1  f17235bc9c3aec538065a655681815c242a6d7d5  ca-certificates_20200601.tar.xz
-sha256  43766d5a436519503dfd65ab83488ae33ab4d4ca3d0993797b58c92eb9ed4e63  ca-certificates_20200601.tar.xz
+sha1   47d4584eae85fc905e4994766eb3930a8a84e2e1                         ca-certificates_20190110.tar.xz
+sha256 ee4bf0f4c6398005f5b5ca4e0b87b82837ac5c3b0280a1cb3a63c47555c3a675 ca-certificates_20190110.tar.xz
 
 # Locally computed
-sha256  e85e1bcad3a915dc7e6f41412bc5bdeba275cadd817896ea0451f2140a93967c  debian/copyright
+sha256 80fd11117df5543d5cf17bfd951b0ead213f7867d0b09f09c6d5a5eca3ff7422 debian/copyright

package/ca-certificates/ca-certificates.mk

@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-CA_CERTIFICATES_VERSION = 20200601
+CA_CERTIFICATES_VERSION = 20190110
 CA_CERTIFICATES_SOURCE = ca-certificates_$(CA_CERTIFICATES_VERSION).tar.xz
-CA_CERTIFICATES_SITE = http://snapshot.debian.org/archive/debian/20200602T145955Z/pool/main/c/ca-certificates
+CA_CERTIFICATES_SITE = http://snapshot.debian.org/archive/debian/20190513T145054Z/pool/main/c/ca-certificates
 CA_CERTIFICATES_DEPENDENCIES = host-openssl
 # ca-certificates can be built with either python 2 or python 3
 # but it must be at least python 2.7

package/cage/Config.in

@@ -3,14 +3,16 @@ comment "cage needs udev, mesa3d w/ EGL and GLES support"
 		!BR2_PACKAGE_MESA3D_OPENGL_ES || \
 		!BR2_PACKAGE_HAS_UDEV
 
-comment "cage needs a toolchain w/ threads, dynamic library"
+comment "cage needs a toolchain w/ threads, locale, dynamic library"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS || \
+		!BR2_ENABLE_LOCALE || \
 		BR2_STATIC_LIBS
 
 config BR2_PACKAGE_CAGE
 	bool "cage"
 	depends on !BR2_STATIC_LIBS # wlroots
 	depends on BR2_TOOLCHAIN_HAS_THREADS # wlroots
+	depends on BR2_ENABLE_LOCALE # wlroots
 	depends on BR2_PACKAGE_HAS_UDEV # wlroots
 	depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # wlroots
 	depends on BR2_PACKAGE_MESA3D_OPENGL_ES # wlroots

package/cdrkit/cdrkit.mk

@@ -18,14 +18,5 @@ else
 CDRKIT_CONF_OPTS += -DBITFIELDS_HTOL=0
 endif
 
-ifeq ($(BR2_PACKAGE_FILE),y)
-CDRKIT_DEPENDENCIES += host-pkgconf file
-CDRKIT_CONF_OPTS += \
-	-DUSE_MAGIC=ON \
-	-DEXTRA_LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs libmagic`"
-else
-CDRKIT_CONF_OPTS += -DUSE_MAGIC=OFF
-endif
-
 $(eval $(cmake-package))
 $(eval $(host-cmake-package))

package/cryptopp/cryptopp.hash

@@ -1,5 +1,5 @@
-# Hash from: https://www.cryptopp.com/release830.html:
-sha512  ad5219a66c5924d330d3646d0ff996dd235006f6812074bc4eb9e8c662a4f000ba20449d377f24b133d19ce682f7b2a3b2eb4c08857ce0f5bb39743d1d425147  cryptopp830.zip
+# Hash from: https://www.cryptopp.com/release820.html:
+sha256  03f0e2242e11b9d19b28d0ec5a3fa8ed5cc7b27640e6bed365744f593e858058  cryptopp820.zip
 
 # Hash for license file:
-sha256  e668af8c73a38a66a1e8951d14ec24e7582fee5254dd6c3dae488a416d105d5f  License.txt
+sha256  f29d65ae3f0c8e327284f193524643ffb4d682fcca3e1740a5c6cbab0e720583  License.txt

package/cryptopp/cryptopp.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-CRYPTOPP_VERSION = 8.3.0
+CRYPTOPP_VERSION = 8.2.0
 CRYPTOPP_SOURCE = cryptopp$(subst .,,$(CRYPTOPP_VERSION)).zip
 CRYPTOPP_SITE = https://cryptopp.com
 CRYPTOPP_LICENSE = BSL-1.0, BSD-3-Clause (CRYPTOGAMS), Public domain (ChaCha SSE2 and AVX)

package/cups-filters/0001-configure.ac-fix-cross-compilation-without-dejavu.patch

@@ -1,41 +0,0 @@
-From 6ad1ed8b7939bf75079b0a770e234bfee7d33dbb Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Mon, 13 Jul 2020 23:02:50 +0200
-Subject: [PATCH] configure.ac: fix cross-compilation without dejavu
-
-Cross-compilation is broken since commit 1d66106. Indeed, when
-cross-compiling, dejavu font won't be installed in /usr/share/fonts. The
-path (e.g. $(TARGET_DIR)/usr/share/fonts/dejavu/DejaVuSans.ttf) could be
-provided through --with-test-font-path which will fix the build failure
-but will result in broken test programs.
-
-So when cross-compiling don't try to check if the test-font-path is
-valid or not and just use the one provided by the user or the default
-one (e.g. /usr/share/fonts/dejavu/DejaVuSans.ttf)
-
-Fix #262
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Retrieved from:
-https://github.com/OpenPrinting/cups-filters/commit/6ad1ed8b7939bf75079b0a770e234bfee7d33dbb]
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index aa905cf5d..4cc4fd6e5 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -796,10 +796,10 @@ AC_ARG_WITH([test-font-path],
- 	[with_test_font_path=`find /usr/share/fonts -name DejaVuSans.ttf || echo /usr/share/fonts/dejavu/DejaVuSans.ttf`]
- )
- 
--AS_IF([test -f "$with_test_font_path"],
--	[AC_DEFINE_UNQUOTED([TESTFONT], ["$with_test_font_path"], [Path to font used in tests])],
-+AS_IF([test "x$cross_compiling" != "xyes" && ! test -f "$with_test_font_path"],
- 	[AC_MSG_ERROR(DejaVuSans.ttf font file is missing. Please install a package providing it.)]
- )
-+AC_DEFINE_UNQUOTED([TESTFONT], ["$with_test_font_path"], [Path to font used in tests])
- 
- # ================
- # Check for cflags

package/cups-filters/cups-filters.hash

@@ -1,3 +1,3 @@
 # Locally computed:
-sha256 08e4081ce50ce2e620af6e950bdcf64cea2ab4c81ab3c5ea05da25d82ad62db6  cups-filters-1.27.5.tar.gz
-sha256 527463af65312372111804589a9624f4c52813e253062ae351e75af5003f317f  COPYING
+sha256 cf90b96b5c7a906a05070e757ee5566d9680db98a279e60567ea5421c38f11de  cups-filters-1.28.4.tar.gz
+sha256 38192ffdaca98b718f78b2d4abc38bb087f0bbcc9a16d212c98b903b985f900f  COPYING

package/cups-filters/cups-filters.mk

@@ -4,12 +4,10 @@
 #
 ################################################################################
 
-CUPS_FILTERS_VERSION = 1.27.5
+CUPS_FILTERS_VERSION = 1.28.4
 CUPS_FILTERS_SITE = http://openprinting.org/download/cups-filters
 CUPS_FILTERS_LICENSE = GPL-2.0, GPL-2.0+, GPL-3.0, GPL-3.0+, LGPL-2, LGPL-2.1+, MIT, BSD-4-Clause
 CUPS_FILTERS_LICENSE_FILES = COPYING
-# We're patching configure.ac
-CUPS_FILTERS_AUTORECONF = YES
 
 CUPS_FILTERS_DEPENDENCIES = cups libglib2 lcms2 qpdf fontconfig freetype jpeg
 

package/dbus/Config.in

@@ -7,7 +7,7 @@ config BR2_PACKAGE_DBUS
 	help
 	  The D-Bus message bus system.
 
-	  https://www.freedesktop.org/wiki/Software/dbus
+	  http://www.freedesktop.org/wiki/Software/dbus
 
 comment "dbus needs a toolchain w/ threads"
 	depends on BR2_USE_MMU

package/dbus/dbus.hash

@@ -1,7 +1,6 @@
 # Locally calculated after checking pgp signature
-# https://dbus.freedesktop.org/releases/dbus/dbus-1.12.20.tar.gz.asc
+# https://dbus.freedesktop.org/releases/dbus/dbus-1.12.18.tar.gz.asc
 # using key 36EC5A6448A4F5EF79BEFE98E05AE1478F814C4F
-sha256  f77620140ecb4cdc67f37fb444f8a6bea70b5b6461f12f1cbe2cec60fa7de5fe  dbus-1.12.20.tar.gz
-
+sha256  64cf4d70840230e5e9bc784d153880775ab3db19d656ead8a0cb9c0ab5a95306  dbus-1.12.18.tar.gz
 # Locally calculated
 sha256  0e46f54efb12d04ab5c33713bacd0e140c9a35b57ae29e03c853203266e8f3a1  COPYING

package/dbus/dbus.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-DBUS_VERSION = 1.12.20
+DBUS_VERSION = 1.12.18
 DBUS_SITE = https://dbus.freedesktop.org/releases/dbus
 DBUS_LICENSE = AFL-2.1 or GPL-2.0+ (library, tools), GPL-2.0+ (tools)
 DBUS_LICENSE_FILES = COPYING

package/dhcpcd/dhcpcd.mk

@@ -11,18 +11,6 @@ DHCPCD_DEPENDENCIES = host-pkgconf
 DHCPCD_LICENSE = BSD-2-Clause
 DHCPCD_LICENSE_FILES = LICENSE
 
-DHCPCD_CONFIG_OPTS = \
-	--libexecdir=/lib/dhcpcd \
-	--os=linux \
-	--privsepuser=dhcpcd
-
-ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
-DHCPCD_CONFIG_OPTS += --with-udev
-DHCPCD_DEPENDENCIES += udev
-else
-DHCPCD_CONFIG_OPTS += --without-udev
-endif
-
 ifeq ($(BR2_STATIC_LIBS),y)
 DHCPCD_CONFIG_OPTS += --enable-static
 endif
@@ -32,16 +20,20 @@ DHCPCD_CONFIG_OPTS += --disable-fork --disable-privsep
 endif
 
 define DHCPCD_CONFIGURE_CMDS
-	(cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure $(DHCPCD_CONFIG_OPTS))
+	(cd $(@D); \
+	$(TARGET_CONFIGURE_OPTS) ./configure \
+		--os=linux \
+		--libexecdir=/lib/dhcpcd \
+		$(DHCPCD_CONFIG_OPTS) )
 endef
 
 define DHCPCD_BUILD_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) all
+	$(TARGET_MAKE_ENV) $(MAKE) \
+		-C $(@D) all
 endef
 
 define DHCPCD_INSTALL_TARGET_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install DESTDIR=$(TARGET_DIR)
-	mkdir -p $(TARGET_DIR)/var/db/dhcpcd
 endef
 
 # When network-manager is enabled together with dhcpcd, it will use
@@ -59,10 +51,6 @@ define DHCPCD_INSTALL_INIT_SYSTEMD
 endef
 endif
 
-define DHCPCD_USERS
-	dhcpcd -1 dhcpcd -1 * - - - dhcpcd user
-endef
-
 # NOTE: Even though this package has a configure script, it is not generated
 # using the autotools, so we have to use the generic package infrastructure.
 

package/dnsmasq/dnsmasq.hash

@@ -1,6 +1,6 @@
 # Locally calculated after checking pgp signature
-# http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.81.tar.xz.asc
-sha256  749ca903537c5197c26444ac24b0dce242cf42595fdfe6b9a5b9e4c7ad32f8fb  dnsmasq-2.81.tar.xz
+# http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.82.tar.xz.asc
+sha256  84523646f3116bb5e1151efb66e645030f6e6a8256f29aab444777a343ebc132  dnsmasq-2.82.tar.xz
 # Locally calculated
 sha256  dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa  COPYING
 sha256  8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  COPYING-v3

package/dnsmasq/dnsmasq.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-DNSMASQ_VERSION = 2.81
+DNSMASQ_VERSION = 2.82
 DNSMASQ_SOURCE = dnsmasq-$(DNSMASQ_VERSION).tar.xz
 DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq
 DNSMASQ_MAKE_ENV = $(TARGET_MAKE_ENV) CC="$(TARGET_CC)"
@@ -77,13 +77,7 @@ DNSMASQ_DEPENDENCIES += ubus
 DNSMASQ_COPTS += -DHAVE_UBUS
 endif
 
-define DNSMASQ_FIX_PKGCONFIG
-	$(SED) 's^PKG_CONFIG = pkg-config^PKG_CONFIG = $(PKG_CONFIG_HOST_BINARY)^' \
-		$(DNSMASQ_DIR)/Makefile
-endef
-
 define DNSMASQ_BUILD_CMDS
-	$(DNSMASQ_FIX_PKGCONFIG)
 	$(DNSMASQ_TWEAK_LIBLUA)
 	$(DNSMASQ_MAKE_ENV) $(MAKE) -C $(@D) $(DNSMASQ_MAKE_OPTS) all$(DNSMASQ_I18N)
 endef

package/docker-containerd/docker-containerd.hash

@@ -1,3 +1,3 @@
 # Computed locally
-sha256	bc6d9452c700af0ebc09c0da8ddba55be4c03ac8928e72ca92d98905800c8018  docker-containerd-1.4.3.tar.gz
+sha256	d410b8efc94e4124990f01de7107223971be8c9258fc651decf9e0ba648485b5  docker-containerd-1.4.1.tar.gz
 sha256	4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4  LICENSE

package/docker-containerd/docker-containerd.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-DOCKER_CONTAINERD_VERSION = 1.4.3
+DOCKER_CONTAINERD_VERSION = 1.4.1
 DOCKER_CONTAINERD_SITE = $(call github,containerd,containerd,v$(DOCKER_CONTAINERD_VERSION))
 DOCKER_CONTAINERD_LICENSE = Apache-2.0
 DOCKER_CONTAINERD_LICENSE_FILES = LICENSE
@@ -12,7 +12,7 @@ DOCKER_CONTAINERD_LICENSE_FILES = LICENSE
 DOCKER_CONTAINERD_GOMOD = github.com/containerd/containerd
 
 DOCKER_CONTAINERD_LDFLAGS = \
-	-X $(DOCKER_CONTAINERD_GOMOD)/version.Version=$(DOCKER_CONTAINERD_VERSION)
+	-X github.com/docker/containerd.GitCommit=$(DOCKER_CONTAINERD_VERSION)
 
 DOCKER_CONTAINERD_BUILD_TARGETS = cmd/ctr cmd/containerd cmd/containerd-shim
 

package/domoticz/Config.in

@@ -8,7 +8,6 @@ config BR2_PACKAGE_DOMOTICZ
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_USE_WCHAR
 	depends on BR2_PACKAGE_LUA_5_3
-	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_DATE_TIME
@@ -31,7 +30,6 @@ config BR2_PACKAGE_DOMOTICZ
 
 comment "domoticz needs lua 5.3 and a toolchain w/ C++, gcc >= 4.8, NPTL, wchar, dynamic library"
 	depends on BR2_USE_MMU
-	depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS
 	depends on !BR2_INSTALL_LIBSTDCPP || \
 		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \
 		!BR2_TOOLCHAIN_HAS_THREADS_NPTL || \

package/dovecot-pigeonhole/dovecot-pigeonhole.hash

@@ -1,3 +1,3 @@
 # Locally computed after checking signature
-sha256  911fe566da5b638eab1b11105314300bc9049cc3832d4bd2aed44c265013bf17  dovecot-2.3-pigeonhole-0.5.13.tar.gz
+sha256  0b972a441f680545ddfacd2f41fb2a705fb03249d46ed5ce7e01fe68b6cfb5f0  dovecot-2.3-pigeonhole-0.5.11.tar.gz
 sha256  fc9e9522216f2a9a28b31300e3c73c1df56acc27dfae951bf516e7995366b51a  COPYING

package/dovecot-pigeonhole/dovecot-pigeonhole.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-DOVECOT_PIGEONHOLE_VERSION = 0.5.13
+DOVECOT_PIGEONHOLE_VERSION = 0.5.11
 DOVECOT_PIGEONHOLE_SOURCE = dovecot-2.3-pigeonhole-$(DOVECOT_PIGEONHOLE_VERSION).tar.gz
 DOVECOT_PIGEONHOLE_SITE = https://pigeonhole.dovecot.org/releases/2.3
 DOVECOT_PIGEONHOLE_LICENSE = LGPL-2.1

package/dovecot/dovecot.hash

@@ -1,5 +1,5 @@
 # Locally computed after checking signature
-sha256  a3f875b80ec11a452480690108660030978c94fa8e796ad6d943a874b496f1c4  dovecot-2.3.13.tar.gz
-sha256  319a9830aab406109cd67cb45496587566a8123203d66d037b209ca3e13de02a  COPYING
+sha256  d3d9ea9010277f57eb5b9f4166a5d2ba539b172bd6d5a2b2529a6db524baafdc  dovecot-2.3.11.3.tar.gz
+sha256  a363b132e494f662d98c820d1481297e6ae72f194c2c91b6c39e1518b86240a8  COPYING
 sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING.LGPL
 sha256  52b8c95fabb19575281874b661ef7968ea47e8f5d74ba0dd40ce512e52b3fc97  COPYING.MIT

package/dovecot/dovecot.mk

@@ -5,7 +5,7 @@
 ################################################################################
 
 DOVECOT_VERSION_MAJOR = 2.3
-DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).13
+DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).11.3
 DOVECOT_SITE = https://dovecot.org/releases/$(DOVECOT_VERSION_MAJOR)
 DOVECOT_INSTALL_STAGING = YES
 DOVECOT_LICENSE = LGPL-2.1, MIT, Public Domain, BSD-3-Clause, Unicode-DFS-2015

package/dtv-scan-tables/dtv-scan-tables.mk

@@ -5,7 +5,7 @@
 ################################################################################
 
 DTV_SCAN_TABLES_VERSION = 6d019038cd04e837d9dd58701202c15924c1c654
-DTV_SCAN_TABLES_SITE = https://git.linuxtv.org/dtv-scan-tables.git
+DTV_SCAN_TABLES_SITE = http://git.linuxtv.org/cgit.cgi/dtv-scan-tables.git
 DTV_SCAN_TABLES_SITE_METHOD = git
 
 # This package only contains the transponders data. This is not a 'work'

package/efl/Config.in

@@ -256,7 +256,6 @@ config BR2_PACKAGE_EFL_TIFF
 config BR2_PACKAGE_EFL_WEBP
 	bool "libevas webp image loader"
 	select BR2_PACKAGE_WEBP
-	select BR2_PACKAGE_WEBP_DEMUX
 	help
 	  This enables the loader code that loads images using WebP.
 

package/ejabberd/0001-Makefile.in-do-not-download-or-compile-dependencies.patch

@@ -1,6 +1,6 @@
-From 277103e886c9b3ddfede8b3f5b92d3e94736f404 Mon Sep 17 00:00:00 2001
+From cb583beba1acba55112fbb4636c1c73d9ae691a0 Mon Sep 17 00:00:00 2001
 From: Johan Oudinet <johan.oudinet@gmail.com>
-Date: Fri, 23 Nov 2018 16:13:21 +0100
+Date: Fri, 20 Nov 2020 00:33:30 +0100
 Subject: [PATCH] Makefile.in: do not download or compile dependencies
 
 Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com>
@@ -9,10 +9,10 @@ Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index 48dca7d8..d2324dae 100644
+index abd64835..06f876bb 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -94,7 +94,7 @@ ifneq ($(INSTALLGROUP),)
+@@ -97,7 +97,7 @@ ifneq ($(INSTALLGROUP),)
    G_USER=-g $(INSTALLGROUP)
  endif
  
@@ -21,7 +21,7 @@ index 48dca7d8..d2324dae 100644
  
  deps: deps/.got
  
-@@ -108,7 +108,7 @@ deps/.built: deps/.got
+@@ -111,7 +111,7 @@ deps/.built: deps/.got
  	$(REBAR) configure-deps
  	$(REBAR) compile && :> deps/.built
  
@@ -31,5 +31,5 @@ index 48dca7d8..d2324dae 100644
  
  update:
 -- 
-2.17.1
+2.29.2
 

package/ejabberd/ejabberd.hash

@@ -1,3 +1,3 @@
 # Locally computed
-sha256 18ddf61af22fc9b59f8afc6835aae2aee9896eb91cc1030056d6bca6a1fa40d2 ejabberd-19.09.1.tgz
-sha256 469bb8cfa3ef22c102875ff31932450c075e6908ff3f7d36893485c0c30898eb COPYING
+sha256  9e922b938458ae9d72d4e5fdd2d08a1fbad651aae47c9a9d15b79d0bbd1e11f8  ejabberd-20.07.tgz
+sha256  469bb8cfa3ef22c102875ff31932450c075e6908ff3f7d36893485c0c30898eb  COPYING

package/ejabberd/ejabberd.mk

@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-EJABBERD_VERSION = 19.09.1
+EJABBERD_VERSION = 20.07
 EJABBERD_SOURCE = ejabberd-$(EJABBERD_VERSION).tgz
-EJABBERD_SITE = https://www.process-one.net/downloads/ejabberd/$(EJABBERD_VERSION)
+EJABBERD_SITE = https://static.process-one.net/ejabberd/downloads/$(EJABBERD_VERSION)
 EJABBERD_LICENSE = GPL-2.0+ with OpenSSL exception
 EJABBERD_LICENSE_FILES = COPYING
 EJABBERD_DEPENDENCIES = getent openssl erlang-eimp host-erlang-lager \

package/environment-setup/environment-setup

@@ -10,6 +10,7 @@ cat <<'EOF'
 Some tips:
 * PATH now contains the SDK utilities
 * Standard autotools variables (CC, LD, CFLAGS) are exported
+* Kernel compilation variables (ARCH, CROSS_COMPILE, KERNELDIR) are exported
 * To configure do "./configure $CONFIGURE_FLAGS" or use
   the "configure" alias
 * To build CMake-based projects, use the "cmake" alias

package/environment-setup/environment-setup.mk

@@ -11,6 +11,7 @@ define HOST_ENVIRONMENT_SETUP_INSTALL_CMDS
 	for var in $(TARGET_CONFIGURE_OPTS); do \
 		printf "export \"$$var\"\n" >> $(ENVIRONMENT_SETUP_FILE); \
 	done
+	printf "export \"ARCH=$(KERNEL_ARCH)\"\n" >> $(ENVIRONMENT_SETUP_FILE)
 	printf "export \"CROSS_COMPILE=$(TARGET_CROSS)\"\n" >> $(ENVIRONMENT_SETUP_FILE)
 	printf "export \"CONFIGURE_FLAGS=--target=$(GNU_TARGET_NAME) \
 		--host=$(GNU_TARGET_NAME) \
@@ -31,6 +32,10 @@ define HOST_ENVIRONMENT_SETUP_INSTALL_CMDS
 		$(ENVIRONMENT_SETUP_FILE)
 	printf "export \"PATH=\$$SDK_PATH/bin:\$$SDK_PATH/sbin:\$$PATH\"\n" \
 		>> $(ENVIRONMENT_SETUP_FILE)
+
+	$(if $(BR2_LINUX_KERNEL),\
+		printf "export \"KERNELDIR=$(LINUX_BUILDDIR)\"\n" \
+			>> $(ENVIRONMENT_SETUP_FILE),)
 endef
 
 $(eval $(host-generic-package))

package/erlang-eimp/erlang-eimp.hash

@@ -1,3 +1,3 @@
 # Locally calculated
-sha256 dfcdc211480f974175af615616c7f8c1e8f9dff5d6be5faa3f20c3eb4c60240e erlang-eimp-1.0.12.tar.gz
-sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt
+sha256  1a529fa6e8264d3cad43861db417a1e841b28c0601aa847857fa0d6a81935922  erlang-eimp-1.0.17.tar.gz
+sha256  cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  LICENSE.txt

package/erlang-eimp/erlang-eimp.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ERLANG_EIMP_VERSION = 1.0.12
+ERLANG_EIMP_VERSION = 1.0.17
 ERLANG_EIMP_SITE = $(call github,processone,eimp,$(ERLANG_EIMP_VERSION))
 ERLANG_EIMP_LICENSE = Apache-2.0
 ERLANG_EIMP_LICENSE_FILES = LICENSE.txt

package/erlang-jiffy/erlang-jiffy.hash

@@ -1,3 +1,3 @@
 # Locally computed
-sha256 c555726f592b79894c253ca1dc3c3aec6a5697271d29364d57f8175f387b86f3 erlang-jiffy-0.14.11.tar.gz
-sha256 0fa8afad2f02c08850a16e36fe55376ee19732b3a116a0207f2a73c857777a49 LICENSE
+sha256  7cf67840c58b8732e12c84c8a3b714774da2601ae5e6a57f286273e25b205516  erlang-jiffy-1.0.6.tar.gz
+sha256  0fa8afad2f02c08850a16e36fe55376ee19732b3a116a0207f2a73c857777a49  LICENSE

package/erlang-jiffy/erlang-jiffy.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ERLANG_JIFFY_VERSION = 0.14.11
+ERLANG_JIFFY_VERSION = 1.0.6
 ERLANG_JIFFY_SITE = $(call github,davisp,jiffy,$(ERLANG_JIFFY_VERSION))
 ERLANG_JIFFY_LICENSE = MIT (core), \
 	BSD-3-Clause (Google double conversion library), \

package/erlang-p1-acme/0001-rebar.config.script-remove-extra-dependency-to-base6.patch

@@ -0,0 +1,26 @@
+From a2422fdf4097d1f5f8c8f88bbe08b9a0f3c35fe6 Mon Sep 17 00:00:00 2001
+From: Johan Oudinet <johan.oudinet@gmail.com>
+Date: Wed, 25 Nov 2020 22:38:22 +0100
+Subject: [PATCH] rebar.config.script: remove extra dependency to base64url
+
+Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com>
+---
+ rebar.config.script | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/rebar.config.script b/rebar.config.script
+index a63895e..41b2970 100644
+--- a/rebar.config.script
++++ b/rebar.config.script
+@@ -62,7 +62,7 @@ Cfg2 = case IsRebar3 of
+                [{plugin_dir, filename:join([filename:dirname(SCRIPT),"plugins"])},
+                 {plugins, [override_deps_versions]}] ++
+                 ModCfg(CONFIG, [deps], fun(V) ->
+-                   V ++ [{base64url, ".*", {git, "git://github.com/dvv/base64url.git", {tag, "v1.0"}}}]
++                   V
+                 end, [])
+        end,
+ 
+-- 
+2.29.2
+

package/erlang-p1-acme/erlang-p1-acme.hash

@@ -1,3 +1,3 @@
 # Locally calculated
-sha256 556a9628c323a5a83116ed78599c891f74447b0bac237c095e776c7009089656 erlang-p1-acme-1.0.1.tar.gz
-sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt
+sha256  e17ba49f45b72200470bc2f176b315bec1028d07a4817859052f98c0a7259632  erlang-p1-acme-1.0.9.tar.gz
+sha256  cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  LICENSE.txt

package/erlang-p1-acme/erlang-p1-acme.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ERLANG_P1_ACME_VERSION = 1.0.1
+ERLANG_P1_ACME_VERSION = 1.0.9
 ERLANG_P1_ACME_SITE = $(call github,processone,p1_acme,$(ERLANG_P1_ACME_VERSION))
 ERLANG_P1_ACME_LICENSE = Apache-2.0
 ERLANG_P1_ACME_LICENSE_FILES = LICENSE.txt

package/erlang-p1-cache-tab/erlang-p1-cache-tab.hash

@@ -1,3 +1,3 @@
 # Locally calculated
-sha256 572b6532dca59c561d994bf2bf8eed3637118c64cdd3a9e51d81b506f5b09e2c erlang-p1-cache-tab-1.0.20.tar.gz
-sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt
+sha256  32cb3a3017f53e66bd1c2b75f60a2c4a14f00f375582a3c511ea39266b2385b9  erlang-p1-cache-tab-1.0.25.tar.gz
+sha256  cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  LICENSE.txt

package/erlang-p1-cache-tab/erlang-p1-cache-tab.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ERLANG_P1_CACHE_TAB_VERSION = 1.0.20
+ERLANG_P1_CACHE_TAB_VERSION = 1.0.25
 ERLANG_P1_CACHE_TAB_SITE = $(call github,processone,cache_tab,$(ERLANG_P1_CACHE_TAB_VERSION))
 ERLANG_P1_CACHE_TAB_LICENSE = Apache-2.0
 ERLANG_P1_CACHE_TAB_LICENSE_FILES = LICENSE.txt

package/erlang-p1-mqtree/erlang-p1-mqtree.hash

@@ -1,3 +1,3 @@
 # Locally calculated
-sha256 034d564e92ca8e9d66668548ea510d2cf9fdbad40609622a87374aa907110884 erlang-p1-mqtree-1.0.5.tar.gz
-sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE
+sha256  4f86e272a97152d3f5166dad583dc1b5bda9582f6777f6294fb8328def8b2189  erlang-p1-mqtree-1.0.10.tar.gz
+sha256  cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  LICENSE

package/erlang-p1-mqtree/erlang-p1-mqtree.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ERLANG_P1_MQTREE_VERSION = 1.0.5
+ERLANG_P1_MQTREE_VERSION = 1.0.10
 ERLANG_P1_MQTREE_SITE = $(call github,processone,mqtree,$(ERLANG_P1_MQTREE_VERSION))
 ERLANG_P1_MQTREE_LICENSE = Apache-2.0
 ERLANG_P1_MQTREE_LICENSE_FILES = LICENSE

package/erlang-p1-oauth2/erlang-p1-oauth2.hash

@@ -1,3 +1,3 @@
 # Locally calculated
-sha256 55bf54133ce0882fab59f813ddf9ed4dac1e051a53fb4bd1c0565136ebb4d6ac erlang-p1-oauth2-0.6.5.tar.gz
-sha256 0ecddd0a5e35b7fcdab451f54c5bb688fac8365cdf6b0da0ac64b7895a0770f3 LICENSE
+sha256  c5cf0d2a9f5874c289cc6044945f4771a79007bda812e5269dea3a4c92fc8811  erlang-p1-oauth2-0.6.7.tar.gz
+sha256  0ecddd0a5e35b7fcdab451f54c5bb688fac8365cdf6b0da0ac64b7895a0770f3  LICENSE