From 854fe94ab1c14273854b86ada000dc73eb6df21c Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Mon, 25 Oct 2021 22:00:01 +0200 Subject: [PATCH] Update buildroot to 2021.02.6 (#1607) * Update buildroot to 2021.02.6 * Renew buildroot-patches This makes sure that docker-proxy gets bumped to the latest Docker version as well. --- .../0001-docker-add-AppArmor-support.patch | 8 +- .../0002-network-manager-wpa_supplicant.patch | 10 +- buildroot-patches/0003-Fix-dhcp-client.patch | 10 +- ...ware-Allow-to-deploy-multiple-firmwa.patch | 10 +- ...rmware-add-RTL87XX-RTL88XX-Bluetooth.patch | 12 +- ...-proxy-bump-version-to-64b7a4574d14.patch} | 26 +- ...-firmware-bump-version-to-1.20210303.patch | 10 +- ...rmware-add-rtl8761b-rtl8761bu-firmwa.patch | 12 +- ...m2-fix-installation-of-systemd-units.patch | 10 +- ...ifi-firmware-bump-version-to-883b726.patch | 10 +- ...-firmware-bump-version-to-1.20210527.patch | 10 +- buildroot/CHANGES | 32 +++ buildroot/DEVELOPERS | 4 +- buildroot/Makefile | 4 +- .../arm-trusted-firmware.hash | 2 +- .../arm-trusted-firmware.mk | 4 +- .../boot/mv-ddr-marvell/mv-ddr-marvell.hash | 2 +- buildroot/boot/syslinux/syslinux.mk | 8 +- buildroot/docs/manual/manual.html | 8 +- buildroot/docs/manual/manual.pdf | Bin 584360 -> 584364 bytes buildroot/docs/manual/manual.text | 8 +- .../docs/manual/using-buildroot-debugger.txt | 2 +- buildroot/fs/ext2/ext2.mk | 16 +- buildroot/package/alsa-lib/Config.in | 2 +- buildroot/package/alsa-lib/alsa-lib.mk | 10 + buildroot/package/apache/Config.in | 2 +- buildroot/package/apache/apache.hash | 6 +- buildroot/package/apache/apache.mk | 4 +- buildroot/package/atftp/atftp.hash | 4 +- buildroot/package/atftp/atftp.mk | 2 +- buildroot/package/bind/bind.hash | 6 +- buildroot/package/bind/bind.mk | 2 +- ...d-using-short-exponents-with-ElGamal.patch | 38 +++ buildroot/package/botan/botan.mk | 5 +- buildroot/package/cryptopp/cryptopp.hash | 4 +- buildroot/package/cryptopp/cryptopp.mk | 2 +- buildroot/package/dash/dash.hash | 4 +- buildroot/package/dash/dash.mk | 2 +- buildroot/package/dc3dd/Config.in | 2 + buildroot/package/docker-cli/docker-cli.hash | 2 +- buildroot/package/docker-cli/docker-cli.mk | 2 +- .../docker-containerd/docker-containerd.hash | 4 +- .../docker-containerd/docker-containerd.mk | 2 +- .../package/docker-engine/docker-engine.hash | 2 +- .../package/docker-engine/docker-engine.mk | 2 +- .../package/docker-proxy/docker-proxy.hash | 2 +- .../package/docker-proxy/docker-proxy.mk | 2 +- buildroot/package/dovecot/dovecot.mk | 2 - buildroot/package/erlang/erlang.mk | 3 + buildroot/package/fetchmail/fetchmail.hash | 8 +- buildroot/package/fetchmail/fetchmail.mk | 2 +- buildroot/package/gdb/gdb.mk | 2 +- ...de-device-specifier-strings-in-acces.patch | 234 ++++++++++++++++++ buildroot/package/ghostscript/ghostscript.mk | 3 + buildroot/package/go/go.hash | 2 +- buildroot/package/go/go.mk | 2 +- .../package/gstreamer1/gst-omx/gst-omx.hash | 4 +- .../package/gstreamer1/gst-omx/gst-omx.mk | 2 +- .../gst1-devtools/gst1-devtools.hash | 4 +- .../gstreamer1/gst1-devtools/gst1-devtools.mk | 2 +- .../gst1-interpipe/gst1-interpipe.hash | 2 +- .../gst1-interpipe/gst1-interpipe.mk | 2 +- .../gstreamer1/gst1-libav/gst1-libav.hash | 4 +- .../gstreamer1/gst1-libav/gst1-libav.mk | 2 +- .../gst1-plugins-bad/gst1-plugins-bad.hash | 4 +- .../gst1-plugins-bad/gst1-plugins-bad.mk | 2 +- .../gst1-plugins-base/gst1-plugins-base.hash | 4 +- .../gst1-plugins-base/gst1-plugins-base.mk | 2 +- .../gst1-plugins-good/gst1-plugins-good.hash | 4 +- .../gst1-plugins-good/gst1-plugins-good.mk | 2 +- .../gst1-plugins-ugly/gst1-plugins-ugly.hash | 4 +- .../gst1-plugins-ugly/gst1-plugins-ugly.mk | 2 +- .../gstreamer1/gst1-python/gst1-python.hash | 4 +- .../gstreamer1/gst1-python/gst1-python.mk | 2 +- .../gst1-rtsp-server/gst1-rtsp-server.hash | 4 +- .../gst1-rtsp-server/gst1-rtsp-server.mk | 2 +- .../gstreamer1/gst1-vaapi/gst1-vaapi.hash | 4 +- .../gstreamer1/gst1-vaapi/gst1-vaapi.mk | 2 +- .../gstreamer1-editing-services.hash | 4 +- .../gstreamer1-editing-services.mk | 2 +- .../gstreamer1/gstreamer1/gstreamer1.hash | 4 +- .../gstreamer1/gstreamer1/gstreamer1.mk | 2 +- buildroot/package/kodi-pvr-octonet/Config.in | 8 +- .../kodi-pvr-octonet/kodi-pvr-octonet.mk | 2 +- buildroot/package/libcurl/Config.in | 1 + buildroot/package/libcurl/libcurl.hash | 4 +- buildroot/package/libcurl/libcurl.mk | 2 +- ...-deref-on-TGS-inner-body-null-server.patch | 47 ++++ buildroot/package/libkrb5/libkrb5.mk | 3 + buildroot/package/libressl/libressl.hash | 2 +- buildroot/package/libressl/libressl.mk | 2 +- ...-ms_adpcm-Fix-and-extend-size-checks.patch | 40 +++ buildroot/package/libsndfile/libsndfile.mk | 3 + buildroot/package/libyang/libyang.hash | 2 +- buildroot/package/libyang/libyang.mk | 2 +- buildroot/package/lxc/Config.in | 2 +- buildroot/package/lxc/lxc.hash | 2 +- buildroot/package/lxc/lxc.mk | 2 +- buildroot/package/lynx/lynx.hash | 1 + buildroot/package/lynx/lynx.mk | 4 + buildroot/package/mesa3d/Config.in | 5 + buildroot/package/mesa3d/mesa3d.mk | 7 + buildroot/package/micropython/micropython.mk | 5 +- buildroot/package/minicom/minicom.mk | 3 - ...-system-libatomic_ops-shared-library.patch | 52 ++++ buildroot/package/mtr/mtr.mk | 11 +- buildroot/package/net-tools/net-tools.mk | 1 + buildroot/package/nmap/nmap.mk | 7 + buildroot/package/nodejs/nodejs.hash | 4 +- buildroot/package/nodejs/nodejs.mk | 2 +- ...an-error-when-failed-to-build-the-mo.patch | 72 ------ buildroot/package/ntfs-3g/ntfs-3g.hash | 2 +- buildroot/package/ntfs-3g/ntfs-3g.mk | 5 +- .../package/openjdk-bin/openjdk-bin.hash | 8 +- buildroot/package/openjdk-bin/openjdk-bin.mk | 18 +- .../14.0.2+12/0001-fix-gcc-10-support.patch | 119 --------- buildroot/package/openjdk/Config.in | 8 +- buildroot/package/openjdk/openjdk.hash | 4 +- buildroot/package/openjdk/openjdk.mk | 16 +- buildroot/package/openldap/Config.in | 2 +- buildroot/package/openldap/openldap.hash | 10 +- buildroot/package/openldap/openldap.mk | 2 +- buildroot/package/openssh/openssh.hash | 4 +- buildroot/package/openssh/openssh.mk | 2 +- buildroot/package/openssl/Config.in | 1 + buildroot/package/php/php.hash | 2 +- buildroot/package/php/php.mk | 2 +- .../python-aioconsole/python-aioconsole.hash | 6 +- .../python-aioconsole/python-aioconsole.mk | 5 +- .../package/python-cffi/python-cffi.hash | 4 +- buildroot/package/python-cffi/python-cffi.mk | 4 +- .../python-dateutil/python-dateutil.hash | 6 +- .../python-dateutil/python-dateutil.mk | 4 +- .../package/python-django/python-django.hash | 4 +- .../package/python-django/python-django.mk | 4 +- ...git-references-on-unicode-separators.patch | 45 ++++ buildroot/package/python-pip/python-pip.mk | 3 + .../python-texttable/python-texttable.hash | 6 +- .../python-texttable/python-texttable.mk | 4 +- .../python-urllib3/python-urllib3.hash | 4 +- .../package/python-urllib3/python-urllib3.mk | 4 +- .../package/python-webob/python-webob.hash | 4 +- .../package/python-webob/python-webob.mk | 4 +- ...gl-native-fix-musl-compile-pthread_g.patch | 47 ++++ buildroot/package/redis/redis.hash | 2 +- buildroot/package/redis/redis.mk | 2 +- buildroot/package/refpolicy/refpolicy.mk | 4 +- buildroot/package/ripgrep/ripgrep.mk | 3 + buildroot/package/runc/Config.in | 2 +- buildroot/package/runc/runc.hash | 2 +- buildroot/package/runc/runc.mk | 6 +- ...rc-schedule.c-fix-build-with-gcc-4.8.patch | 56 ----- buildroot/package/sispmctl/sispmctl.hash | 2 +- buildroot/package/sispmctl/sispmctl.mk | 2 +- buildroot/package/squid/squid.hash | 8 +- buildroot/package/squid/squid.mk | 2 +- buildroot/package/strongswan/Config.in | 1 + buildroot/package/supervisor/Config.in | 1 - ...able-build-for-different-c-libraries.patch | 39 --- buildroot/package/tinycbor/tinycbor.hash | 4 +- buildroot/package/tinycbor/tinycbor.mk | 2 +- buildroot/package/trace-cmd/trace-cmd.mk | 5 + ...ix-C-LD-FLAGS-with-CROSS_BUILD_TOOLS.patch | 34 +++ ...PIC-builds-with-newer-gcc-binutils-w.patch | 91 ------- buildroot/package/uclibc/uclibc.hash | 4 +- buildroot/package/uclibc/uclibc.mk | 2 +- buildroot/package/wavemon/wavemon.mk | 7 + .../wireless-regdb/wireless-regdb.hash | 2 +- .../package/wireless-regdb/wireless-regdb.mk | 2 +- ...-define-inb-outb-and-friends-on-mips.patch | 73 ++++++ ... 0002-Fix-build-with-64-bits-time_t.patch} | 0 ...libs-light-fix-tv_sec-printf-format.patch} | 0 ...ibs-light-fix-tv_sec-fprintf-format.patch} | 0 buildroot/package/xen/xen.hash | 2 +- buildroot/package/xen/xen.mk | 2 +- buildroot/support/kconfig/confdata.c | 4 +- buildroot/support/kconfig/util.c | 2 +- buildroot/support/misc/Vagrantfile | 2 +- .../conf/minimal-x86-qemu-kernel.config | 1 + buildroot/support/testing/infra/emulator.py | 3 + .../tests/core/test_file_capabilities.py | 2 +- .../support/testing/tests/fs/test_f2fs.py | 2 +- .../support/testing/tests/fs/test_iso9660.py | 2 +- .../support/testing/tests/init/test_openrc.py | 12 +- .../testing/tests/init/test_systemd.py | 2 +- .../tests/package/test_docker_compose.py | 9 +- .../testing/tests/package/test_glxinfo.py | 2 +- .../support/testing/tests/package/test_lxc.py | 2 +- .../testing/tests/package/test_openssh.py | 5 +- .../testing/tests/package/test_rust.py | 12 - buildroot/utils/scanpypi | 2 - 191 files changed, 1041 insertions(+), 711 deletions(-) rename buildroot-patches/{0006-package-docker-proxy-bump-version-to-b3507428be5b.patch => 0006-package-docker-proxy-bump-version-to-64b7a4574d14.patch} (62%) create mode 100644 buildroot/package/botan/0004-Avoid-using-short-exponents-with-ElGamal.patch create mode 100644 buildroot/package/ghostscript/0002-Bug-704342-Include-device-specifier-strings-in-acces.patch create mode 100644 buildroot/package/libkrb5/0001-Fix-KDC-null-deref-on-TGS-inner-body-null-server.patch create mode 100644 buildroot/package/libsndfile/0011-ms_adpcm-Fix-and-extend-size-checks.patch create mode 100644 buildroot/package/mono/0001-Fix-linkage-with-a-system-libatomic_ops-shared-library.patch delete mode 100644 buildroot/package/ntfs-3g/0001-Fixed-reporting-an-error-when-failed-to-build-the-mo.patch delete mode 100644 buildroot/package/openjdk/14.0.2+12/0001-fix-gcc-10-support.patch create mode 100644 buildroot/package/python-pip/0001-Don-t-split-git-references-on-unicode-separators.patch create mode 100644 buildroot/package/qt5/qt5location/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch delete mode 100644 buildroot/package/sispmctl/0001-src-schedule.c-fix-build-with-gcc-4.8.patch delete mode 100644 buildroot/package/tinycbor/0001-Enable-build-for-different-c-libraries.patch create mode 100644 buildroot/package/uboot-tools/0005-tools-Makefile-fix-C-LD-FLAGS-with-CROSS_BUILD_TOOLS.patch delete mode 100644 buildroot/package/uclibc/0001-powerpc-fix-PIE-PIC-builds-with-newer-gcc-binutils-w.patch create mode 100644 buildroot/package/x11r7/xserver_xorg-server/0006-compiler.h-don-t-define-inb-outb-and-friends-on-mips.patch rename buildroot/package/xen/{0003-Fix-build-with-64-bits-time_t.patch => 0002-Fix-build-with-64-bits-time_t.patch} (100%) rename buildroot/package/xen/{0004-libs-light-fix-tv_sec-printf-format.patch => 0003-libs-light-fix-tv_sec-printf-format.patch} (100%) rename buildroot/package/xen/{0005-libs-light-fix-tv_sec-fprintf-format.patch => 0004-libs-light-fix-tv_sec-fprintf-format.patch} (100%) diff --git a/buildroot-patches/0001-docker-add-AppArmor-support.patch b/buildroot-patches/0001-docker-add-AppArmor-support.patch index aac4a6a9c..c4a98c30a 100644 --- a/buildroot-patches/0001-docker-add-AppArmor-support.patch +++ b/buildroot-patches/0001-docker-add-AppArmor-support.patch @@ -1,5 +1,5 @@ -From 09f9b55b419ef01ad24998bbacb1a49976b58bfa Mon Sep 17 00:00:00 2001 -Message-Id: <09f9b55b419ef01ad24998bbacb1a49976b58bfa.1627492452.git.stefan@agner.ch> +From 7bc8a611131f89c7773e75863be58a682bfefa46 Mon Sep 17 00:00:00 2001 +Message-Id: <7bc8a611131f89c7773e75863be58a682bfefa46.1635185056.git.stefan@agner.ch> From: Pascal Vizeli Date: Mon, 13 Jan 2020 12:27:06 +0000 Subject: [PATCH 01/11] docker: add AppArmor support @@ -11,7 +11,7 @@ Signed-off-by: Stefan Agner 1 file changed, 5 insertions(+) diff --git a/package/docker-containerd/docker-containerd.mk b/package/docker-containerd/docker-containerd.mk -index e229d9cb54..e968518a69 100644 +index 16026eb8e9..c2aaefdff8 100644 --- a/package/docker-containerd/docker-containerd.mk +++ b/package/docker-containerd/docker-containerd.mk @@ -30,6 +30,11 @@ DOCKER_CONTAINERD_DEPENDENCIES += libapparmor @@ -27,5 +27,5 @@ index e229d9cb54..e968518a69 100644 DOCKER_CONTAINERD_DEPENDENCIES += libseccomp host-pkgconf DOCKER_CONTAINERD_TAGS += seccomp -- -2.32.0 +2.33.1 diff --git a/buildroot-patches/0002-network-manager-wpa_supplicant.patch b/buildroot-patches/0002-network-manager-wpa_supplicant.patch index d331c17d1..9ba4aa824 100644 --- a/buildroot-patches/0002-network-manager-wpa_supplicant.patch +++ b/buildroot-patches/0002-network-manager-wpa_supplicant.patch @@ -1,7 +1,7 @@ -From e06ba47c59eec31475a8302fca569a0315158154 Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: <09f9b55b419ef01ad24998bbacb1a49976b58bfa.1627492452.git.stefan@agner.ch> -References: <09f9b55b419ef01ad24998bbacb1a49976b58bfa.1627492452.git.stefan@agner.ch> +From 8510d87bd5dbbb23a55dd7bb4f17c7f375dfccef Mon Sep 17 00:00:00 2001 +Message-Id: <8510d87bd5dbbb23a55dd7bb4f17c7f375dfccef.1635185056.git.stefan@agner.ch> +In-Reply-To: <7bc8a611131f89c7773e75863be58a682bfefa46.1635185056.git.stefan@agner.ch> +References: <7bc8a611131f89c7773e75863be58a682bfefa46.1635185056.git.stefan@agner.ch> From: Pascal Vizeli Date: Thu, 16 Apr 2020 14:32:45 +0000 Subject: [PATCH 02/11] network-manager: wpa_supplicant @@ -42,5 +42,5 @@ index 607c2b402b..c8351d8730 100644 NETWORK_MANAGER_LICENSE_FILES = COPYING COPYING.LGPL CONTRIBUTING NETWORK_MANAGER_CPE_ID_VENDOR = gnome -- -2.32.0 +2.33.1 diff --git a/buildroot-patches/0003-Fix-dhcp-client.patch b/buildroot-patches/0003-Fix-dhcp-client.patch index c9381d1ad..8982dba2c 100644 --- a/buildroot-patches/0003-Fix-dhcp-client.patch +++ b/buildroot-patches/0003-Fix-dhcp-client.patch @@ -1,7 +1,7 @@ -From 654f5326428f1f442369589ce74333a44293fac2 Mon Sep 17 00:00:00 2001 -Message-Id: <654f5326428f1f442369589ce74333a44293fac2.1627492452.git.stefan@agner.ch> -In-Reply-To: <09f9b55b419ef01ad24998bbacb1a49976b58bfa.1627492452.git.stefan@agner.ch> -References: <09f9b55b419ef01ad24998bbacb1a49976b58bfa.1627492452.git.stefan@agner.ch> +From f4d0ac532040a9194fd939e6be23233ca3976728 Mon Sep 17 00:00:00 2001 +Message-Id: +In-Reply-To: <7bc8a611131f89c7773e75863be58a682bfefa46.1635185056.git.stefan@agner.ch> +References: <7bc8a611131f89c7773e75863be58a682bfefa46.1635185056.git.stefan@agner.ch> From: Pascal Vizeli Date: Thu, 16 Apr 2020 12:01:44 +0000 Subject: [PATCH 03/11] Fix dhcp client @@ -26,5 +26,5 @@ index 1edb3c5e99..b945c46b18 100644 install-sbinPROGRAMS $(INSTALL) -m 0644 -D package/dhcp/dhclient.conf \ -- -2.32.0 +2.33.1 diff --git a/buildroot-patches/0004-package-rpi-firmware-Allow-to-deploy-multiple-firmwa.patch b/buildroot-patches/0004-package-rpi-firmware-Allow-to-deploy-multiple-firmwa.patch index c61bb0e27..8cb9159bd 100644 --- a/buildroot-patches/0004-package-rpi-firmware-Allow-to-deploy-multiple-firmwa.patch +++ b/buildroot-patches/0004-package-rpi-firmware-Allow-to-deploy-multiple-firmwa.patch @@ -1,7 +1,7 @@ -From 81093c8655737f9208df3b75371290600625bec8 Mon Sep 17 00:00:00 2001 -Message-Id: <81093c8655737f9208df3b75371290600625bec8.1627492452.git.stefan@agner.ch> -In-Reply-To: <09f9b55b419ef01ad24998bbacb1a49976b58bfa.1627492452.git.stefan@agner.ch> -References: <09f9b55b419ef01ad24998bbacb1a49976b58bfa.1627492452.git.stefan@agner.ch> +From 9f590c153e042db3e15532c8cf8a9404383e2789 Mon Sep 17 00:00:00 2001 +Message-Id: <9f590c153e042db3e15532c8cf8a9404383e2789.1635185056.git.stefan@agner.ch> +In-Reply-To: <7bc8a611131f89c7773e75863be58a682bfefa46.1635185056.git.stefan@agner.ch> +References: <7bc8a611131f89c7773e75863be58a682bfefa46.1635185056.git.stefan@agner.ch> From: Stefan Agner Date: Mon, 8 Feb 2021 14:08:28 +0100 Subject: [PATCH 04/11] package/rpi-firmware: Allow to deploy multiple firmware @@ -72,5 +72,5 @@ index f3d28ef825..58085a8ca8 100644 $(RPI_FIRMWARE_INSTALL_DTB) $(RPI_FIRMWARE_INSTALL_DTB_OVERLAYS) -- -2.32.0 +2.33.1 diff --git a/buildroot-patches/0005-package-linux-firmware-add-RTL87XX-RTL88XX-Bluetooth.patch b/buildroot-patches/0005-package-linux-firmware-add-RTL87XX-RTL88XX-Bluetooth.patch index 656076b18..f41919426 100644 --- a/buildroot-patches/0005-package-linux-firmware-add-RTL87XX-RTL88XX-Bluetooth.patch +++ b/buildroot-patches/0005-package-linux-firmware-add-RTL87XX-RTL88XX-Bluetooth.patch @@ -1,7 +1,7 @@ -From f93e6246fbc58814dd4547eade63102c7626b76b Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: <09f9b55b419ef01ad24998bbacb1a49976b58bfa.1627492452.git.stefan@agner.ch> -References: <09f9b55b419ef01ad24998bbacb1a49976b58bfa.1627492452.git.stefan@agner.ch> +From d064be35e78b286a30894071a4de353c33bdd09a Mon Sep 17 00:00:00 2001 +Message-Id: +In-Reply-To: <7bc8a611131f89c7773e75863be58a682bfefa46.1635185056.git.stefan@agner.ch> +References: <7bc8a611131f89c7773e75863be58a682bfefa46.1635185056.git.stefan@agner.ch> From: Stefan Agner Date: Wed, 17 Mar 2021 14:48:43 +0100 Subject: [PATCH 05/11] package/linux-firmware: add RTL87XX/RTL88XX Bluetooth @@ -38,7 +38,7 @@ index a41310ff2a..ba3322fa18 100644 bool "TI CC2560" help diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk -index f23da171c6..9c512ab750 100644 +index 9af35ccb1a..45c50e48a2 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 @@ -70,5 +70,5 @@ index f23da171c6..9c512ab750 100644 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT61),y) LINUX_FIRMWARE_FILES += rt2561.bin rt2561s.bin rt2661.bin -- -2.32.0 +2.33.1 diff --git a/buildroot-patches/0006-package-docker-proxy-bump-version-to-b3507428be5b.patch b/buildroot-patches/0006-package-docker-proxy-bump-version-to-64b7a4574d14.patch similarity index 62% rename from buildroot-patches/0006-package-docker-proxy-bump-version-to-b3507428be5b.patch rename to buildroot-patches/0006-package-docker-proxy-bump-version-to-64b7a4574d14.patch index a2b3df0cb..ded9c6da1 100644 --- a/buildroot-patches/0006-package-docker-proxy-bump-version-to-b3507428be5b.patch +++ b/buildroot-patches/0006-package-docker-proxy-bump-version-to-64b7a4574d14.patch @@ -1,13 +1,13 @@ -From 28a2450108743762b3b43629c86248f5fe45aa70 Mon Sep 17 00:00:00 2001 -Message-Id: <28a2450108743762b3b43629c86248f5fe45aa70.1627492452.git.stefan@agner.ch> -In-Reply-To: <09f9b55b419ef01ad24998bbacb1a49976b58bfa.1627492452.git.stefan@agner.ch> -References: <09f9b55b419ef01ad24998bbacb1a49976b58bfa.1627492452.git.stefan@agner.ch> +From 7a63448dce0599dbcf715a311bf63dbaa6ad0f8a Mon Sep 17 00:00:00 2001 +Message-Id: <7a63448dce0599dbcf715a311bf63dbaa6ad0f8a.1635185056.git.stefan@agner.ch> +In-Reply-To: <7bc8a611131f89c7773e75863be58a682bfefa46.1635185056.git.stefan@agner.ch> +References: <7bc8a611131f89c7773e75863be58a682bfefa46.1635185056.git.stefan@agner.ch> From: Stefan Agner -Date: Thu, 15 Apr 2021 17:22:59 +0200 -Subject: [PATCH 06/11] package/docker-proxy: bump version to b3507428be5b +Date: Mon, 11 Oct 2021 14:45:41 +0200 +Subject: [PATCH 06/11] package/docker-proxy: bump version to 64b7a4574d14 -Which is the version used by docker 20.10.6: -https://github.com/moby/moby/commit/88470052e7d42f3dc774442241fd6bab817876f6 +Which is the version used by docker 20.10.7: +https://github.com/moby/moby/commit/d29a55c6c344a536089d6b1bcd92be9cdea20641 Signed-off-by: Stefan Agner --- @@ -16,16 +16,16 @@ Signed-off-by: Stefan Agner 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/docker-proxy/docker-proxy.hash b/package/docker-proxy/docker-proxy.hash -index 58de697929..13da06170c 100644 +index 58de697929..605a559806 100644 --- a/package/docker-proxy/docker-proxy.hash +++ b/package/docker-proxy/docker-proxy.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 866c8d196b9396a383b437b0d775476459ed7c11f527c4f6bbf1fd08524b461d docker-proxy-55685ba49593e67f5e1c8180539379b16736c25e.tar.gz -+sha256 90a8dc84bc5d2d74dee0b2c3544f8786598ff85e9fc9f6a55a15b60b7cd78d63 docker-proxy-b3507428be5b458cb0e2b4086b13531fb0706e46.tar.gz ++sha256 ede21e645ff6552b3a508f6186d3f34d267015ec0f96eefecf6d08c03cbd2987 docker-proxy-64b7a4574d1426139437d20e81c0b6d391130ec8.tar.gz sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 LICENSE diff --git a/package/docker-proxy/docker-proxy.mk b/package/docker-proxy/docker-proxy.mk -index 6600b24ed9..7270834119 100644 +index 6600b24ed9..7745853716 100644 --- a/package/docker-proxy/docker-proxy.mk +++ b/package/docker-proxy/docker-proxy.mk @@ -4,8 +4,8 @@ @@ -34,11 +34,11 @@ index 6600b24ed9..7270834119 100644 -DOCKER_PROXY_VERSION = 55685ba49593e67f5e1c8180539379b16736c25e -DOCKER_PROXY_SITE = $(call github,docker,libnetwork,$(DOCKER_PROXY_VERSION)) -+DOCKER_PROXY_VERSION = b3507428be5b458cb0e2b4086b13531fb0706e46 ++DOCKER_PROXY_VERSION = 64b7a4574d1426139437d20e81c0b6d391130ec8 +DOCKER_PROXY_SITE = $(call github,moby,libnetwork,$(DOCKER_PROXY_VERSION)) DOCKER_PROXY_LICENSE = Apache-2.0 DOCKER_PROXY_LICENSE_FILES = LICENSE -- -2.32.0 +2.33.1 diff --git a/buildroot-patches/0007-package-rpi-firmware-bump-version-to-1.20210303.patch b/buildroot-patches/0007-package-rpi-firmware-bump-version-to-1.20210303.patch index 60906115e..9477e68fc 100644 --- a/buildroot-patches/0007-package-rpi-firmware-bump-version-to-1.20210303.patch +++ b/buildroot-patches/0007-package-rpi-firmware-bump-version-to-1.20210303.patch @@ -1,7 +1,7 @@ -From 30030f11ea80bee5f25136a3caf070a9b97e8b10 Mon Sep 17 00:00:00 2001 -Message-Id: <30030f11ea80bee5f25136a3caf070a9b97e8b10.1627492452.git.stefan@agner.ch> -In-Reply-To: <09f9b55b419ef01ad24998bbacb1a49976b58bfa.1627492452.git.stefan@agner.ch> -References: <09f9b55b419ef01ad24998bbacb1a49976b58bfa.1627492452.git.stefan@agner.ch> +From f9a4d9c76e695d8897f00dc57b6926cd0d3847b4 Mon Sep 17 00:00:00 2001 +Message-Id: +In-Reply-To: <7bc8a611131f89c7773e75863be58a682bfefa46.1635185056.git.stefan@agner.ch> +References: <7bc8a611131f89c7773e75863be58a682bfefa46.1635185056.git.stefan@agner.ch> From: Stefan Agner Date: Mon, 19 Apr 2021 10:59:03 +0200 Subject: [PATCH 07/11] package/rpi-firmware: bump version to 1.20210303 @@ -38,5 +38,5 @@ index 58085a8ca8..ea82836900 100644 RPI_FIRMWARE_LICENSE = BSD-3-Clause RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom -- -2.32.0 +2.33.1 diff --git a/buildroot-patches/0008-package-linux-firmware-add-rtl8761b-rtl8761bu-firmwa.patch b/buildroot-patches/0008-package-linux-firmware-add-rtl8761b-rtl8761bu-firmwa.patch index cb7a4ab67..5f2c827c0 100644 --- a/buildroot-patches/0008-package-linux-firmware-add-rtl8761b-rtl8761bu-firmwa.patch +++ b/buildroot-patches/0008-package-linux-firmware-add-rtl8761b-rtl8761bu-firmwa.patch @@ -1,7 +1,7 @@ -From af2981f04e79fc5d4298e027d7a02ecfd3316bd7 Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: <09f9b55b419ef01ad24998bbacb1a49976b58bfa.1627492452.git.stefan@agner.ch> -References: <09f9b55b419ef01ad24998bbacb1a49976b58bfa.1627492452.git.stefan@agner.ch> +From 05d3380da24004da4e413cfc342e0f97c7aef631 Mon Sep 17 00:00:00 2001 +Message-Id: <05d3380da24004da4e413cfc342e0f97c7aef631.1635185056.git.stefan@agner.ch> +In-Reply-To: <7bc8a611131f89c7773e75863be58a682bfefa46.1635185056.git.stefan@agner.ch> +References: <7bc8a611131f89c7773e75863be58a682bfefa46.1635185056.git.stefan@agner.ch> From: Stefan Agner Date: Sat, 19 Jun 2021 18:20:46 +0200 Subject: [PATCH 08/11] package/linux-firmware: add rtl8761b/rtl8761bu firmware @@ -27,7 +27,7 @@ index 12af68f2d3..df66b87c50 100644 sha256 8d5847d2971241d4d6a51c16e206379de53a6d4e203fa6f8e1c1e9279c7c4ad0 LICENSE.amdgpu sha256 2d6062d63b91eb750bf741498691604f75184b9fee97608ec537cd09bd6a42b4 LICENCE.Marvell diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk -index 9c512ab750..96da50751b 100644 +index 45c50e48a2..a4d54fff21 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -4,7 +4,7 @@ @@ -51,5 +51,5 @@ index 9c512ab750..96da50751b 100644 endif -- -2.32.0 +2.33.1 diff --git a/buildroot-patches/0009-package-lvm2-fix-installation-of-systemd-units.patch b/buildroot-patches/0009-package-lvm2-fix-installation-of-systemd-units.patch index 67f6f23c5..313e35748 100644 --- a/buildroot-patches/0009-package-lvm2-fix-installation-of-systemd-units.patch +++ b/buildroot-patches/0009-package-lvm2-fix-installation-of-systemd-units.patch @@ -1,7 +1,7 @@ -From f358c8ba53970154054bc2140fb4127a116d97ff Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: <09f9b55b419ef01ad24998bbacb1a49976b58bfa.1627492452.git.stefan@agner.ch> -References: <09f9b55b419ef01ad24998bbacb1a49976b58bfa.1627492452.git.stefan@agner.ch> +From 36b65be42d138e54665ee508fc9021f90f134ee9 Mon Sep 17 00:00:00 2001 +Message-Id: <36b65be42d138e54665ee508fc9021f90f134ee9.1635185056.git.stefan@agner.ch> +In-Reply-To: <7bc8a611131f89c7773e75863be58a682bfefa46.1635185056.git.stefan@agner.ch> +References: <7bc8a611131f89c7773e75863be58a682bfefa46.1635185056.git.stefan@agner.ch> From: "Yann E. MORIN" Date: Fri, 21 May 2021 16:44:36 +0200 Subject: [PATCH 09/11] package/lvm2: fix installation of systemd units @@ -58,5 +58,5 @@ index 19e8757e54..87c1c761ea 100644 LVM2_CONF_ENV += ac_cv_flag_HAVE_PIE=no endif -- -2.32.0 +2.33.1 diff --git a/buildroot-patches/0010-package-rpi-wifi-firmware-bump-version-to-883b726.patch b/buildroot-patches/0010-package-rpi-wifi-firmware-bump-version-to-883b726.patch index 726ca5884..2dbc04bb4 100644 --- a/buildroot-patches/0010-package-rpi-wifi-firmware-bump-version-to-883b726.patch +++ b/buildroot-patches/0010-package-rpi-wifi-firmware-bump-version-to-883b726.patch @@ -1,7 +1,7 @@ -From c8de13c1131adab0455eca939c4f168fd0ae30af Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: <09f9b55b419ef01ad24998bbacb1a49976b58bfa.1627492452.git.stefan@agner.ch> -References: <09f9b55b419ef01ad24998bbacb1a49976b58bfa.1627492452.git.stefan@agner.ch> +From 62b542d08b9fee2fca6190daae858239331591b0 Mon Sep 17 00:00:00 2001 +Message-Id: <62b542d08b9fee2fca6190daae858239331591b0.1635185056.git.stefan@agner.ch> +In-Reply-To: <7bc8a611131f89c7773e75863be58a682bfefa46.1635185056.git.stefan@agner.ch> +References: <7bc8a611131f89c7773e75863be58a682bfefa46.1635185056.git.stefan@agner.ch> From: Stefan Agner Date: Wed, 28 Jul 2021 15:52:18 +0200 Subject: [PATCH 10/11] package/rpi-wifi-firmware: bump version to 883b726 @@ -35,5 +35,5 @@ index 24ba5941b0..28926ff4f0 100644 RPI_WIFI_FIRMWARE_LICENSE = PROPRIETARY RPI_WIFI_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx -- -2.32.0 +2.33.1 diff --git a/buildroot-patches/0011-package-rpi-firmware-bump-version-to-1.20210527.patch b/buildroot-patches/0011-package-rpi-firmware-bump-version-to-1.20210527.patch index d51f7a91a..97ea97cac 100644 --- a/buildroot-patches/0011-package-rpi-firmware-bump-version-to-1.20210527.patch +++ b/buildroot-patches/0011-package-rpi-firmware-bump-version-to-1.20210527.patch @@ -1,7 +1,7 @@ -From c92d04a4315c71fcb83caa86130f38fc22b50722 Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: <09f9b55b419ef01ad24998bbacb1a49976b58bfa.1627492452.git.stefan@agner.ch> -References: <09f9b55b419ef01ad24998bbacb1a49976b58bfa.1627492452.git.stefan@agner.ch> +From d52ee79002b228d8af627d9e68b4257aa3d54bd8 Mon Sep 17 00:00:00 2001 +Message-Id: +In-Reply-To: <7bc8a611131f89c7773e75863be58a682bfefa46.1635185056.git.stefan@agner.ch> +References: <7bc8a611131f89c7773e75863be58a682bfefa46.1635185056.git.stefan@agner.ch> From: Stefan Agner Date: Mon, 19 Apr 2021 10:59:03 +0200 Subject: [PATCH 11/11] package/rpi-firmware: bump version to 1.20210527 @@ -38,5 +38,5 @@ index ea82836900..ac4c4a0788 100644 RPI_FIRMWARE_LICENSE = BSD-3-Clause RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom -- -2.32.0 +2.33.1 diff --git a/buildroot/CHANGES b/buildroot/CHANGES index 63cb40721..80382c7f9 100644 --- a/buildroot/CHANGES +++ b/buildroot/CHANGES @@ -1,3 +1,35 @@ +2021.02.6, released October 11, 2021 + + Important / security related fixes. + + gdbinit: Mark the sysroot as a "safe path" before configuring + it, so pretty printers work correctly without having to pass + -ix to gdb + + Updated/fixed packages: alsa-lib, apache, + arm-trusted-firmware, atftp, bind, botan, cryptopp, dash, + dc3dd, docker-cli, docker-containerd, docker-engine, dovecot, + erlang, fetchmail, gdb, ghostscript, go, gst-omx, + gst1-devtools, gst1-interpipe, gst1-libav, gst1-plugins-bad, + gst1-plugins-base, gst1-plugins-good, gst1-plugins-ugly, + gst1-python, gst1-rtsp-server, gst1-vaapi, gstreamer1, + gstreamer1-editing-services, kodi-pvr-octonet, libcurl, + libkrb5, libressl, libsndfile, libyang, lxc, lynx, mesa3d, + micropython, minicom, mono, mtr, mv-ddr-marvell, net-tools, + nmap, nodejs, ntfs-3g, openjdk, openjdk-bin, openldap, + openssh, php, python-aioconsole, python-cffi, python-dateutil, + python-django, python-pip, python-texttable, python-urllib3, + python-webob, qt5location, redis, refpolicy, ripgrep, runc, + sispmctl, squid, strongswan, supervisor, syslinux, tinycbor, + trace-cmd, uboot-tools, uclibc, wavemon, wireless-regdb, xen, + xserver_xorg-server + + Issues resolved (http://bugs.uclibc.org): + + #14206: Kodi: even when not enabled, forcefully selects libevdev.. + #14211: libffi-3.3.tar.gz repacked + #14221: mv-ddr-marvell fails license validation + 2021.02.5, released September 15th, 2021 Important / security related fixes. diff --git a/buildroot/DEVELOPERS b/buildroot/DEVELOPERS index 7018aa31b..1105c4a03 100644 --- a/buildroot/DEVELOPERS +++ b/buildroot/DEVELOPERS @@ -289,7 +289,6 @@ F: package/ebtables/ F: package/i2c-tools/ F: package/libcurl/ F: package/libpcap/ -F: package/openipmi/ F: package/socat/ F: package/strace/ F: package/tcpdump/ @@ -1032,8 +1031,10 @@ F: package/libnspr/ F: package/libnss/ F: package/minicom/ F: package/nfs-utils/ +F: package/python-uvloop/ F: package/sunxi-mali-mainline/ F: package/sunxi-mali-mainline-driver/ +F: package/trace-cmd/ F: package/udisks/ F: toolchain/ @@ -1287,6 +1288,7 @@ F: package/rtty/ N: Joachim Wiberg F: configs/globalscale_espressobin_defconfig F: board/globalscale/espressobin/ +F: package/libite/ F: package/mg/ F: package/netcalc/ F: package/ssdp-responder/ diff --git a/buildroot/Makefile b/buildroot/Makefile index 013b29edb..2b96d5afa 100644 --- a/buildroot/Makefile +++ b/buildroot/Makefile @@ -92,9 +92,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2021.02.5 +export BR2_VERSION := 2021.02.6 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1631718000 +BR2_VERSION_EPOCH = 1633977000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) diff --git a/buildroot/boot/arm-trusted-firmware/arm-trusted-firmware.hash b/buildroot/boot/arm-trusted-firmware/arm-trusted-firmware.hash index 970613f38..9bd17a3cf 100644 --- a/buildroot/boot/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/buildroot/boot/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,3 +1,3 @@ # Locally calculated sha256 4bfda9fdbe5022f2e88ad3344165f7d38a8ae4a0e2d91d44d9a1603425cc642d arm-trusted-firmware-v2.4.tar.gz -sha256 487795b8023df866259fa159bab94706b747fb0d623b7913f1c4955c0ab5f164 license.rst +sha256 13676fa9170d3e6da3f7562d2d47b8b71090b1b45013fbd329ef847841f3a0b1 docs/license.rst diff --git a/buildroot/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/buildroot/boot/arm-trusted-firmware/arm-trusted-firmware.mk index d6979a12c..cccdb3c52 100644 --- a/buildroot/boot/arm-trusted-firmware/arm-trusted-firmware.mk +++ b/buildroot/boot/arm-trusted-firmware/arm-trusted-firmware.mk @@ -18,10 +18,10 @@ else # Handle stable official ATF versions ARM_TRUSTED_FIRMWARE_SITE = $(call github,ARM-software,arm-trusted-firmware,$(ARM_TRUSTED_FIRMWARE_VERSION)) # The licensing of custom or from-git versions is unknown. -# This is valid only for the official v1.4. +# This is valid only for the latest (i.e. known) version. ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION),y) ARM_TRUSTED_FIRMWARE_LICENSE = BSD-3-Clause -ARM_TRUSTED_FIRMWARE_LICENSE_FILES = license.rst +ARM_TRUSTED_FIRMWARE_LICENSE_FILES = docs/license.rst endif endif diff --git a/buildroot/boot/mv-ddr-marvell/mv-ddr-marvell.hash b/buildroot/boot/mv-ddr-marvell/mv-ddr-marvell.hash index e1a86008d..5bfae8af4 100644 --- a/buildroot/boot/mv-ddr-marvell/mv-ddr-marvell.hash +++ b/buildroot/boot/mv-ddr-marvell/mv-ddr-marvell.hash @@ -1,3 +1,3 @@ # Locally calculated sha256 bfab74a625d65238c569b9df282b55c0fc9a1e2d3decedcf194d44774df2ede4 mv-ddr-marvell-305d923e6bc4236cd3b902f6679b0aef9e5fa52d.tar.gz -sha256 69208236fc322026920b92d1d839ebdc521ca65379bfdb3368a24945e794fc78 ddr3_init.c +sha256 48bb930b6fbc3f5db72e29c849b096df3868e4a6d2bdc0e2dd3365c768241cd5 ddr3_init.c diff --git a/buildroot/boot/syslinux/syslinux.mk b/buildroot/boot/syslinux/syslinux.mk index 67bc69254..0643f85a9 100644 --- a/buildroot/boot/syslinux/syslinux.mk +++ b/buildroot/boot/syslinux/syslinux.mk @@ -14,7 +14,12 @@ SYSLINUX_LICENSE_FILES = COPYING SYSLINUX_INSTALL_IMAGES = YES # host-util-linux needed to provide libuuid when building host tools -SYSLINUX_DEPENDENCIES = host-nasm host-upx util-linux host-util-linux +SYSLINUX_DEPENDENCIES = \ + host-nasm \ + host-python3 \ + host-upx \ + host-util-linux \ + util-linux ifeq ($(BR2_TARGET_SYSLINUX_LEGACY_BIOS),y) SYSLINUX_TARGET += bios @@ -59,6 +64,7 @@ define SYSLINUX_BUILD_CMDS CC_FOR_BUILD="$(HOSTCC)" \ CFLAGS_FOR_BUILD="$(HOST_CFLAGS)" \ LDFLAGS_FOR_BUILD="$(HOST_LDFLAGS)" \ + PYTHON=$(HOST_DIR)/bin/python3 \ $(SYSLINUX_EFI_ARGS) -C $(@D) $(SYSLINUX_TARGET) endef diff --git a/buildroot/docs/manual/manual.html b/buildroot/docs/manual/manual.html index c4c26c91a..f4930f490 100644 --- a/buildroot/docs/manual/manual.html +++ b/buildroot/docs/manual/manual.html @@ -1,8 +1,8 @@ -The Buildroot user manual

The Buildroot user manual

Table of Contents

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

List of Examples

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

Buildroot 2021.02.5 manual generated on 2021-09-15 -15:20:55 UTC from git revision 767a2da72f

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

The Buildroot user manual

Table of Contents

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

List of Examples

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

Buildroot 2021.02.6 manual generated on 2021-10-11 +18:45:05 UTC from git revision b1e32fa954

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

Copyright © 2004-2020 The Buildroot developers

logo.png

Part I. Getting started

Chapter 1. About Buildroot

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

In order to achieve this, Buildroot is able to generate a @@ -1077,7 +1077,7 @@ If you are using an external toolchain, y

Now, to start debugging a program called foo, you should run on the target:

gdbserver :2345 foo

This will cause gdbserver to listen on TCP port 2345 for a connection from the cross gdb.

Then, on the host, you should start the cross gdb using the following -command line:

<buildroot>/output/host/bin/<tuple>-gdb -x <buildroot>/output/staging/usr/share/buildroot/gdbinit foo

Of course, foo must be available in the current directory, built +command line:

<buildroot>/output/host/bin/<tuple>-gdb -ix <buildroot>/output/staging/usr/share/buildroot/gdbinit foo

Of course, foo must be available in the current directory, built with debugging symbols. Typically you start this command from the directory where foo is built (and not from output/target/ as the binaries in that directory are stripped).

The <buildroot>/output/staging/usr/share/buildroot/gdbinit file will tell the diff --git a/buildroot/docs/manual/manual.pdf b/buildroot/docs/manual/manual.pdf index 272d1a2d7937711aee83b52f654c4dfdec6e702a..5a43f446cc723c654049b9ffbb7d016ae67032cb 100644 GIT binary patch delta 14570 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 diff --git a/buildroot/docs/manual/manual.text b/buildroot/docs/manual/manual.text index fbf53c5ef..2ea3b4f56 100644 --- a/buildroot/docs/manual/manual.text +++ b/buildroot/docs/manual/manual.text @@ -174,13 +174,13 @@ List of Examples --------------------------------------------------------------------- -Buildroot 2021.02.5 manual generated on 2021-09-15 15:21:07 UTC from -git revision 767a2da72f +Buildroot 2021.02.6 manual generated on 2021-10-11 18:45:17 UTC from +git revision b1e32fa954 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= -767a2da72fc1690fde33b665851f20492ba5cd75] file in the Buildroot +b1e32fa954faae7dce51ebee48981af3ace3c0ba] file in the Buildroot sources for the full text of this license. Copyright © 2004-2020 The Buildroot developers @@ -1750,7 +1750,7 @@ from the cross gdb. Then, on the host, you should start the cross gdb using the following command line: -/output/host/bin/-gdb -x /output/staging/usr/share/buildroot/gdbinit foo +/output/host/bin/-gdb -ix /output/staging/usr/share/buildroot/gdbinit foo Of course, foo must be available in the current directory, built with debugging symbols. Typically you start this command from the diff --git a/buildroot/docs/manual/using-buildroot-debugger.txt b/buildroot/docs/manual/using-buildroot-debugger.txt index d5293beb5..9a8a7dfba 100644 --- a/buildroot/docs/manual/using-buildroot-debugger.txt +++ b/buildroot/docs/manual/using-buildroot-debugger.txt @@ -35,7 +35,7 @@ Then, on the host, you should start the cross gdb using the following command line: ---------------------------- -/output/host/bin/-gdb -x /output/staging/usr/share/buildroot/gdbinit foo +/output/host/bin/-gdb -ix /output/staging/usr/share/buildroot/gdbinit foo ---------------------------- Of course, +foo+ must be available in the current directory, built diff --git a/buildroot/fs/ext2/ext2.mk b/buildroot/fs/ext2/ext2.mk index 74c99bd7b..0b797f315 100644 --- a/buildroot/fs/ext2/ext2.mk +++ b/buildroot/fs/ext2/ext2.mk @@ -4,32 +4,32 @@ # ################################################################################ -EXT2_SIZE = $(call qstrip,$(BR2_TARGET_ROOTFS_EXT2_SIZE)) -ifeq ($(BR2_TARGET_ROOTFS_EXT2)-$(EXT2_SIZE),y-) +ROOTFS_EXT2_SIZE = $(call qstrip,$(BR2_TARGET_ROOTFS_EXT2_SIZE)) +ifeq ($(BR2_TARGET_ROOTFS_EXT2)-$(ROOTFS_EXT2_SIZE),y-) $(error BR2_TARGET_ROOTFS_EXT2_SIZE cannot be empty) endif -EXT2_MKFS_OPTS = $(call qstrip,$(BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS)) +ROOTFS_EXT2_MKFS_OPTS = $(call qstrip,$(BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS)) # qstrip results in stripping consecutive spaces into a single one. So the # variable is not qstrip-ed to preserve the integrity of the string value. -EXT2_LABEL = $(subst ",,$(BR2_TARGET_ROOTFS_EXT2_LABEL)) +ROOTFS_EXT2_LABEL = $(subst ",,$(BR2_TARGET_ROOTFS_EXT2_LABEL)) #" Syntax highlighting... :-/ ) -EXT2_OPTS = \ +ROOTFS_EXT2_OPTS = \ -d $(TARGET_DIR) \ -r $(BR2_TARGET_ROOTFS_EXT2_REV) \ -N $(BR2_TARGET_ROOTFS_EXT2_INODES) \ -m $(BR2_TARGET_ROOTFS_EXT2_RESBLKS) \ -L "$(EXT2_LABEL)" \ - $(EXT2_MKFS_OPTS) + $(ROOTFS_EXT2_MKFS_OPTS) ROOTFS_EXT2_DEPENDENCIES = host-e2fsprogs define ROOTFS_EXT2_CMD rm -f $@ - $(HOST_DIR)/sbin/mkfs.ext$(BR2_TARGET_ROOTFS_EXT2_GEN) $(EXT2_OPTS) $@ \ - "$(EXT2_SIZE)" \ + $(HOST_DIR)/sbin/mkfs.ext$(BR2_TARGET_ROOTFS_EXT2_GEN) $(ROOTFS_EXT2_OPTS) $@ \ + "$(ROOTFS_EXT2_SIZE)" \ || { ret=$$?; \ echo "*** Maybe you need to increase the filesystem size (BR2_TARGET_ROOTFS_EXT2_SIZE)" 1>&2; \ exit $$ret; \ diff --git a/buildroot/package/alsa-lib/Config.in b/buildroot/package/alsa-lib/Config.in index f334b66bf..4168d1f22 100644 --- a/buildroot/package/alsa-lib/Config.in +++ b/buildroot/package/alsa-lib/Config.in @@ -22,7 +22,7 @@ if BR2_PACKAGE_ALSA_LIB config BR2_PACKAGE_ALSA_LIB_PYTHON bool "Python support for alsa-lib" - depends on BR2_PACKAGE_PYTHON + depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 help Add python support for alsa-lib. Python will be built and libpython will be installed diff --git a/buildroot/package/alsa-lib/alsa-lib.mk b/buildroot/package/alsa-lib/alsa-lib.mk index b1bfaf30e..ad205aaa1 100644 --- a/buildroot/package/alsa-lib/alsa-lib.mk +++ b/buildroot/package/alsa-lib/alsa-lib.mk @@ -57,12 +57,22 @@ ALSA_LIB_CONF_OPTS += --disable-old-symbols endif ifeq ($(BR2_PACKAGE_ALSA_LIB_PYTHON),y) +ALSA_LIB_CONF_OPTS += \ + --enable-mixer-pymods +ifeq ($(BR2_PACKAGE_PYTHON),y) ALSA_LIB_CONF_OPTS += \ --with-pythonlibs=-lpython$(PYTHON_VERSION_MAJOR) \ --with-pythonincludes=$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR) ALSA_LIB_CFLAGS += -I$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR) ALSA_LIB_DEPENDENCIES = python else +ALSA_LIB_CONF_OPTS += \ + --with-pythonlibs=-lpython$(PYTHON3_VERSION_MAJOR) \ + --with-pythonincludes=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) +ALSA_LIB_CFLAGS += -I$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) +ALSA_LIB_DEPENDENCIES = python3 +endif +else ALSA_LIB_CONF_OPTS += --disable-python endif diff --git a/buildroot/package/apache/Config.in b/buildroot/package/apache/Config.in index 693ee20a1..8b6a5bf7e 100644 --- a/buildroot/package/apache/Config.in +++ b/buildroot/package/apache/Config.in @@ -13,7 +13,7 @@ config BR2_PACKAGE_APACHE server that provides HTTP services in sync with the current HTTP standards. - http://httpd.apache.org + https://httpd.apache.org if BR2_PACKAGE_APACHE diff --git a/buildroot/package/apache/apache.hash b/buildroot/package/apache/apache.hash index c03934b40..138717c33 100644 --- a/buildroot/package/apache/apache.hash +++ b/buildroot/package/apache/apache.hash @@ -1,5 +1,5 @@ -# From http://archive.apache.org/dist/httpd/httpd-2.4.46.tar.bz2.{sha256,sha512} -sha256 1bc826e7b2e88108c7e4bf43c026636f77a41d849cfb667aa7b5c0b86dbf966c httpd-2.4.48.tar.bz2 -sha512 6c250626f1e7d10428a92d984fd48ff841effcc8705f7816ab71b681bbd51d0012ad158dcd13763fe7d630311f2de258b27574603140d648be42796ab8326724 httpd-2.4.48.tar.bz2 +# From https://downloads.apache.org/httpd/httpd-2.4.51.tar.bz2.{sha256,sha512} +sha256 20e01d81fecf077690a4439e3969a9b22a09a8d43c525356e863407741b838f4 httpd-2.4.51.tar.bz2 +sha512 9fb07c4b176f5c0485a143e2b1bb1085345ca9120b959974f68c37a8911a57894d2cb488b1b42fdf3102860b99e890204f5e9fa7ae3828b481119c563812cc66 httpd-2.4.51.tar.bz2 # Locally computed sha256 47b8c2b6c3309282a99d4a3001575c790fead690cc14734628c4667d2bbffc43 LICENSE diff --git a/buildroot/package/apache/apache.mk b/buildroot/package/apache/apache.mk index 403dc0f76..d55f43148 100644 --- a/buildroot/package/apache/apache.mk +++ b/buildroot/package/apache/apache.mk @@ -4,9 +4,9 @@ # ################################################################################ -APACHE_VERSION = 2.4.48 +APACHE_VERSION = 2.4.51 APACHE_SOURCE = httpd-$(APACHE_VERSION).tar.bz2 -APACHE_SITE = http://archive.apache.org/dist/httpd +APACHE_SITE = https://downloads.apache.org/httpd APACHE_LICENSE = Apache-2.0 APACHE_LICENSE_FILES = LICENSE APACHE_CPE_ID_VENDOR = apache diff --git a/buildroot/package/atftp/atftp.hash b/buildroot/package/atftp/atftp.hash index 158e9e3b3..6b0d9a587 100644 --- a/buildroot/package/atftp/atftp.hash +++ b/buildroot/package/atftp/atftp.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 d3c9cd0d971dfc786d7a5f4055c35d4e66aafc8102ac03473ef225bdf7edb26a atftp-0.7.4.tar.gz -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 LICENSE +sha256 93c87a4fb18218414e008e01c995dadd231ba4c752d0f894b34416d1e6d3038a atftp-0.7.5.tar.gz +sha256 86dc744860e6dfacfeba2f33fea908db03fe67c7e37a878285b7aae8e4596735 LICENSE diff --git a/buildroot/package/atftp/atftp.mk b/buildroot/package/atftp/atftp.mk index a2df4af05..96eaeda6c 100644 --- a/buildroot/package/atftp/atftp.mk +++ b/buildroot/package/atftp/atftp.mk @@ -4,7 +4,7 @@ # ################################################################################ -ATFTP_VERSION = 0.7.4 +ATFTP_VERSION = 0.7.5 ATFTP_SITE = http://sourceforge.net/projects/atftp/files ATFTP_LICENSE = GPL-2.0+ ATFTP_LICENSE_FILES = LICENSE diff --git a/buildroot/package/bind/bind.hash b/buildroot/package/bind/bind.hash index 9311d82d6..12b80149c 100644 --- a/buildroot/package/bind/bind.hash +++ b/buildroot/package/bind/bind.hash @@ -1,4 +1,4 @@ -# Verified from https://ftp.isc.org/isc/bind9/9.11.31/bind-9.11.31.tar.gz.asc -# with key 2455774D42FDFE6B9C383EB8FE1002BC5970811F -sha256 f5f24457f42b2e86870d887596e47500e4d40521a098dcb96f3a06f18adfa36a bind-9.11.31.tar.gz +# Verified from https://ftp.isc.org/isc/bind9/9.11.35/bind-9.11.35.tar.gz.asc +# with key E9AB6E79233C0416E8993F450C03AFA90A5967C4 +sha256 1c882705827b6aafa45d917ae3b20eccccc8d5df3c4477df44b04382e6c47562 bind-9.11.35.tar.gz sha256 cad49daa42654bc241762cd998630168a2542c8fd6fad3881e2eac1510bb6fcd COPYRIGHT diff --git a/buildroot/package/bind/bind.mk b/buildroot/package/bind/bind.mk index a5c246a54..0d95da209 100644 --- a/buildroot/package/bind/bind.mk +++ b/buildroot/package/bind/bind.mk @@ -4,7 +4,7 @@ # ################################################################################ -BIND_VERSION = 9.11.31 +BIND_VERSION = 9.11.35 BIND_SITE = https://ftp.isc.org/isc/bind9/$(BIND_VERSION) # bind does not support parallel builds. BIND_MAKE = $(MAKE1) diff --git a/buildroot/package/botan/0004-Avoid-using-short-exponents-with-ElGamal.patch b/buildroot/package/botan/0004-Avoid-using-short-exponents-with-ElGamal.patch new file mode 100644 index 000000000..e2570cd5f --- /dev/null +++ b/buildroot/package/botan/0004-Avoid-using-short-exponents-with-ElGamal.patch @@ -0,0 +1,38 @@ +From 9a23e4e3bc3966340531f2ff608fa9d33b5185a2 Mon Sep 17 00:00:00 2001 +From: Jack Lloyd +Date: Tue, 3 Aug 2021 18:20:29 -0400 +Subject: [PATCH] Avoid using short exponents with ElGamal + +Some off-brand PGP implementation generates keys where p - 1 is +smooth, as a result short exponents can leak enough information about +k to allow decryption. + +Signed-off-by: Peter Korsgaard +[Peter: Drop tests, CVE-2021-40529] +--- + src/lib/pubkey/elgamal/elgamal.cpp | 8 +++- + 1 file changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/lib/pubkey/elgamal/elgamal.cpp b/src/lib/pubkey/elgamal/elgamal.cpp +index b3ec6df2c..0e33c2ca5 100644 +--- a/src/lib/pubkey/elgamal/elgamal.cpp ++++ b/src/lib/pubkey/elgamal/elgamal.cpp +@@ -113,8 +113,12 @@ ElGamal_Encryption_Operation::raw_encrypt(const uint8_t msg[], size_t msg_len, + if(m >= m_group.get_p()) + throw Invalid_Argument("ElGamal encryption: Input is too large"); + +- const size_t k_bits = m_group.exponent_bits(); +- const BigInt k(rng, k_bits); ++ /* ++ Some ElGamal implementations foolishly use prime fields where p - 1 is ++ smooth, as a result it is unsafe to use short exponents. ++ */ ++ const size_t k_bits = m_group.p_bits() - 1; ++ const BigInt k(rng, k_bits, false); + + const BigInt a = m_group.power_g_p(k, k_bits); + const BigInt b = m_group.multiply_mod_p(m, monty_execute(*m_monty_y_p, k, k_bits)); +- +-- +2.20.1 + diff --git a/buildroot/package/botan/botan.mk b/buildroot/package/botan/botan.mk index 2e3f99b49..aa0bb9b26 100644 --- a/buildroot/package/botan/botan.mk +++ b/buildroot/package/botan/botan.mk @@ -11,6 +11,9 @@ BOTAN_LICENSE = BSD-2-Clause BOTAN_LICENSE_FILES = license.txt BOTAN_CPE_ID_VENDOR = botan_project +# 0001-Avoid-using-short-exponents-with-ElGamal.patch +BOTAN_IGNORE_CVES += CVE-2021-40529 + BOTAN_INSTALL_STAGING = YES BOTAN_CONF_OPTS = \ @@ -50,7 +53,7 @@ ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) BOTAN_CONF_OPTS += --without-os-feature=getauxval endif -ifeq ($(BR2_PACKAGE_BOOST),y) +ifeq ($(BR2_PACKAGE_BOOST_FILESYSTEM)$(BR2_PACKAGE_BOOST_SYSTEM),yy) BOTAN_DEPENDENCIES += boost BOTAN_CONF_OPTS += --with-boost endif diff --git a/buildroot/package/cryptopp/cryptopp.hash b/buildroot/package/cryptopp/cryptopp.hash index 2774dc70e..9a113b8f0 100644 --- a/buildroot/package/cryptopp/cryptopp.hash +++ b/buildroot/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/release860.html: +sha512 e7773f5e4a7dc7e8e735b1702524bee56ba38e5211544c9c9778bc51ed8dc7b376c17f2e406410043b636312336f26f76dc963f298872f8c13933e88c232fc03 cryptopp860.zip # Hash for license file: sha256 e668af8c73a38a66a1e8951d14ec24e7582fee5254dd6c3dae488a416d105d5f License.txt diff --git a/buildroot/package/cryptopp/cryptopp.mk b/buildroot/package/cryptopp/cryptopp.mk index 170610845..6711a37fb 100644 --- a/buildroot/package/cryptopp/cryptopp.mk +++ b/buildroot/package/cryptopp/cryptopp.mk @@ -4,7 +4,7 @@ # ################################################################################ -CRYPTOPP_VERSION = 8.3.0 +CRYPTOPP_VERSION = 8.6.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) diff --git a/buildroot/package/dash/dash.hash b/buildroot/package/dash/dash.hash index 24cc7318b..1803bcdb2 100644 --- a/buildroot/package/dash/dash.hash +++ b/buildroot/package/dash/dash.hash @@ -1,4 +1,4 @@ -# From http://gondor.apana.org.au/~herbert/dash/files/dash-0.5.11.2.tar.gz.sha256sum -sha256 62b9f1676ba6a7e8eaec541a39ea037b325253240d1f378c72360baa1cbcbc2a dash-0.5.11.3.tar.gz +# From http://gondor.apana.org.au/~herbert/dash/files/dash-0.5.11.5.tar.gz.sha512sum +sha512 5387e213820eeb44d812bb4697543023fd4662b51a9ffd52a702810fed8b28d23fbe35a7f371e6686107de9f81902eff109458964b4622f4c5412d60190a66bf dash-0.5.11.5.tar.gz # Locally calculated sha256 254a7894923ff62e69184a991dcbccae97edee58a1105e8efbe78caf10595d72 COPYING diff --git a/buildroot/package/dash/dash.mk b/buildroot/package/dash/dash.mk index 1712dcf59..fed3a9955 100644 --- a/buildroot/package/dash/dash.mk +++ b/buildroot/package/dash/dash.mk @@ -4,7 +4,7 @@ # ################################################################################ -DASH_VERSION = 0.5.11.3 +DASH_VERSION = 0.5.11.5 DASH_SITE = http://gondor.apana.org.au/~herbert/dash/files DASH_LICENSE = BSD-3-Clause, GPL-2.0+ (mksignames.c) DASH_LICENSE_FILES = COPYING diff --git a/buildroot/package/dc3dd/Config.in b/buildroot/package/dc3dd/Config.in index 715451beb..bd181b706 100644 --- a/buildroot/package/dc3dd/Config.in +++ b/buildroot/package/dc3dd/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_DC3DD bool "dc3dd" depends on !BR2_RISCV_32 + depends on !BR2_arc depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_TOOLCHAIN_USES_MUSL help @@ -13,5 +14,6 @@ config BR2_PACKAGE_DC3DD comment "dc3dd needs a glibc or uClibc toolchain w/ threads" depends on !BR2_RISCV_32 + depends on !BR2_arc depends on !BR2_TOOLCHAIN_HAS_THREADS || \ BR2_TOOLCHAIN_USES_MUSL diff --git a/buildroot/package/docker-cli/docker-cli.hash b/buildroot/package/docker-cli/docker-cli.hash index 6d380c2fd..9021362c9 100644 --- a/buildroot/package/docker-cli/docker-cli.hash +++ b/buildroot/package/docker-cli/docker-cli.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 0a7848b1b5031483de075433506d0448ddf834368d9c73770e453e0b89b49747 docker-cli-20.10.7.tar.gz +sha256 cde34bbefd70fa27b44dfa904c40db84b89abf237e5267dcd08603b459a89253 docker-cli-20.10.8.tar.gz sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE diff --git a/buildroot/package/docker-cli/docker-cli.mk b/buildroot/package/docker-cli/docker-cli.mk index 24fd26a8c..10776a4e1 100644 --- a/buildroot/package/docker-cli/docker-cli.mk +++ b/buildroot/package/docker-cli/docker-cli.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CLI_VERSION = 20.10.7 +DOCKER_CLI_VERSION = 20.10.8 DOCKER_CLI_SITE = $(call github,docker,cli,v$(DOCKER_CLI_VERSION)) DOCKER_CLI_LICENSE = Apache-2.0 diff --git a/buildroot/package/docker-containerd/docker-containerd.hash b/buildroot/package/docker-containerd/docker-containerd.hash index bb544e8d6..dc4f1f491 100644 --- a/buildroot/package/docker-containerd/docker-containerd.hash +++ b/buildroot/package/docker-containerd/docker-containerd.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 ac62c64664bf62fd44df0891c896eecdb6d93def3438271d7892dca75bc069d1 docker-containerd-1.4.4.tar.gz -sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4 LICENSE +sha256 3bb9f54be022067847f5930d21ebbfe4e7a67f589d78930aa0ac713492c28bcc docker-containerd-1.4.9.tar.gz +sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4 LICENSE diff --git a/buildroot/package/docker-containerd/docker-containerd.mk b/buildroot/package/docker-containerd/docker-containerd.mk index e968518a6..c2aaefdff 100644 --- a/buildroot/package/docker-containerd/docker-containerd.mk +++ b/buildroot/package/docker-containerd/docker-containerd.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CONTAINERD_VERSION = 1.4.4 +DOCKER_CONTAINERD_VERSION = 1.4.9 DOCKER_CONTAINERD_SITE = $(call github,containerd,containerd,v$(DOCKER_CONTAINERD_VERSION)) DOCKER_CONTAINERD_LICENSE = Apache-2.0 DOCKER_CONTAINERD_LICENSE_FILES = LICENSE diff --git a/buildroot/package/docker-engine/docker-engine.hash b/buildroot/package/docker-engine/docker-engine.hash index d07ca3330..07acb8786 100644 --- a/buildroot/package/docker-engine/docker-engine.hash +++ b/buildroot/package/docker-engine/docker-engine.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b80142035de46904605fb7b8f18075cd94154f8c3d67ff346ea554d1e9d579b9 docker-engine-20.10.7.tar.gz +sha256 2505d00032f5d40ead5ac779c2840303dcead04713c93ba974be4c19b3ab8d0a docker-engine-20.10.8.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/buildroot/package/docker-engine/docker-engine.mk b/buildroot/package/docker-engine/docker-engine.mk index 372717775..7d338a5c0 100644 --- a/buildroot/package/docker-engine/docker-engine.mk +++ b/buildroot/package/docker-engine/docker-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_ENGINE_VERSION = 20.10.7 +DOCKER_ENGINE_VERSION = 20.10.8 DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 diff --git a/buildroot/package/docker-proxy/docker-proxy.hash b/buildroot/package/docker-proxy/docker-proxy.hash index 13da06170..605a55980 100644 --- a/buildroot/package/docker-proxy/docker-proxy.hash +++ b/buildroot/package/docker-proxy/docker-proxy.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 90a8dc84bc5d2d74dee0b2c3544f8786598ff85e9fc9f6a55a15b60b7cd78d63 docker-proxy-b3507428be5b458cb0e2b4086b13531fb0706e46.tar.gz +sha256 ede21e645ff6552b3a508f6186d3f34d267015ec0f96eefecf6d08c03cbd2987 docker-proxy-64b7a4574d1426139437d20e81c0b6d391130ec8.tar.gz sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 LICENSE diff --git a/buildroot/package/docker-proxy/docker-proxy.mk b/buildroot/package/docker-proxy/docker-proxy.mk index 727083411..774585371 100644 --- a/buildroot/package/docker-proxy/docker-proxy.mk +++ b/buildroot/package/docker-proxy/docker-proxy.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_PROXY_VERSION = b3507428be5b458cb0e2b4086b13531fb0706e46 +DOCKER_PROXY_VERSION = 64b7a4574d1426139437d20e81c0b6d391130ec8 DOCKER_PROXY_SITE = $(call github,moby,libnetwork,$(DOCKER_PROXY_VERSION)) DOCKER_PROXY_LICENSE = Apache-2.0 diff --git a/buildroot/package/dovecot/dovecot.mk b/buildroot/package/dovecot/dovecot.mk index cb1cc990a..27aa709a0 100644 --- a/buildroot/package/dovecot/dovecot.mk +++ b/buildroot/package/dovecot/dovecot.mk @@ -15,8 +15,6 @@ DOVECOT_DEPENDENCIES = \ host-pkgconf \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) \ openssl -# add host-gettext for AM_ICONV macro -DOVECOT_DEPENDENCIES += host-gettext # CVE-2016-4983 is an issue in a postinstall script in the dovecot rpm, which # is part of the Red Hat packaging and not part of upstream dovecot diff --git a/buildroot/package/erlang/erlang.mk b/buildroot/package/erlang/erlang.mk index 59fcdba93..527eb15a0 100644 --- a/buildroot/package/erlang/erlang.mk +++ b/buildroot/package/erlang/erlang.mk @@ -16,6 +16,9 @@ ERLANG_CPE_ID_VENDOR = erlang ERLANG_CPE_ID_PRODUCT = erlang\/otp ERLANG_INSTALL_STAGING = YES +# windows specific issue: https://nvd.nist.gov/vuln/detail/CVE-2021-29221 +ERLANG_IGNORE_CVES += CVE-2021-29221 + # Remove the leftover deps directory from the ssl app # See https://bugs.erlang.org/browse/ERL-1168 define ERLANG_REMOVE_SSL_DEPS diff --git a/buildroot/package/fetchmail/fetchmail.hash b/buildroot/package/fetchmail/fetchmail.hash index 30df3eb83..88deb343c 100644 --- a/buildroot/package/fetchmail/fetchmail.hash +++ b/buildroot/package/fetchmail/fetchmail.hash @@ -1,6 +1,4 @@ -# From https://sourceforge.net/p/fetchmail/mailman/message/37327392/ -sha256 6a459c1cafd7a1daa5cd137140da60c18c84b5699cd8e7249a79c33342c99d1d fetchmail-6.4.21.tar.xz -# From https://sourceforge.net/projects/fetchmail/files/branch_6.4/ -sha1 a264c50256c2b42d2c7893f9efae7c9a29350786 fetchmail-6.4.21.tar.xz +# From https://sourceforge.net/p/fetchmail/mailman/message/37350119/ +sha256 cc6818bd59435602169fa292d6d163d56b21c7f53112829470a3aceabe612c84 fetchmail-6.4.22.tar.xz # Locally computed: -sha256 6346b5aa04e258fa4326272ea92372d796b4382aa963535ae98a3bb5f8cd5aeb COPYING +sha256 001d1b8d111a83e3bab8b4d511ea4767d37d3bd0583560fccece630df1ba8f3c COPYING diff --git a/buildroot/package/fetchmail/fetchmail.mk b/buildroot/package/fetchmail/fetchmail.mk index 590057e4a..7f42dd8c6 100644 --- a/buildroot/package/fetchmail/fetchmail.mk +++ b/buildroot/package/fetchmail/fetchmail.mk @@ -5,7 +5,7 @@ ################################################################################ FETCHMAIL_VERSION_MAJOR = 6.4 -FETCHMAIL_VERSION = $(FETCHMAIL_VERSION_MAJOR).21 +FETCHMAIL_VERSION = $(FETCHMAIL_VERSION_MAJOR).22 FETCHMAIL_SOURCE = fetchmail-$(FETCHMAIL_VERSION).tar.xz FETCHMAIL_SITE = http://downloads.sourceforge.net/project/fetchmail/branch_$(FETCHMAIL_VERSION_MAJOR) FETCHMAIL_LICENSE = GPL-2.0; some exceptions are mentioned in COPYING diff --git a/buildroot/package/gdb/gdb.mk b/buildroot/package/gdb/gdb.mk index 17e10e8b1..e69dabd75 100644 --- a/buildroot/package/gdb/gdb.mk +++ b/buildroot/package/gdb/gdb.mk @@ -156,7 +156,7 @@ ifeq ($(BR2_PACKAGE_GDB_DEBUGGER),y) GDB_CONF_OPTS += \ --enable-gdb \ --with-curses -GDB_DEPENDENCIES = ncurses \ +GDB_DEPENDENCIES += ncurses \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) else GDB_CONF_OPTS += \ diff --git a/buildroot/package/ghostscript/0002-Bug-704342-Include-device-specifier-strings-in-acces.patch b/buildroot/package/ghostscript/0002-Bug-704342-Include-device-specifier-strings-in-acces.patch new file mode 100644 index 000000000..81436d822 --- /dev/null +++ b/buildroot/package/ghostscript/0002-Bug-704342-Include-device-specifier-strings-in-acces.patch @@ -0,0 +1,234 @@ +From a9bd3dec9fde03327a4a2c69dad1036bf9632e20 Mon Sep 17 00:00:00 2001 +From: Chris Liddell +Date: Tue, 7 Sep 2021 20:36:12 +0100 +Subject: [PATCH] Bug 704342: Include device specifier strings in access + validation + +for the "%pipe%", %handle%" and %printer% io devices. + +We previously validated only the part after the "%pipe%" Postscript device +specifier, but this proved insufficient. + +This rebuilds the original file name string, and validates it complete. The +slight complication for "%pipe%" is it can be reached implicitly using +"|" so we have to check both prefixes. + +Addresses CVE-2021-3781 + +Signed-off-by: Peter Korsgaard +--- + base/gdevpipe.c | 22 +++++++++++++++- + base/gp_mshdl.c | 11 +++++++- + base/gp_msprn.c | 10 ++++++- + base/gp_os2pr.c | 13 +++++++++- + base/gslibctx.c | 69 ++++++++++--------------------------------------- + 5 files changed, 65 insertions(+), 60 deletions(-) + +diff --git a/base/gdevpipe.c b/base/gdevpipe.c +index 96d71f5d8..5bdc485be 100644 +--- a/base/gdevpipe.c ++++ b/base/gdevpipe.c +@@ -72,8 +72,28 @@ pipe_fopen(gx_io_device * iodev, const char *fname, const char *access, + #else + gs_lib_ctx_t *ctx = mem->gs_lib_ctx; + gs_fs_list_t *fs = ctx->core->fs; ++ /* The pipe device can be reached in two ways, explicltly with %pipe% ++ or implicitly with "|", so we have to check for both ++ */ ++ char f[gp_file_name_sizeof]; ++ const char *pipestr = "|"; ++ const size_t pipestrlen = strlen(pipestr); ++ const size_t preflen = strlen(iodev->dname); ++ const size_t nlen = strlen(fname); ++ int code1; ++ ++ if (preflen + nlen >= gp_file_name_sizeof) ++ return_error(gs_error_invalidaccess); ++ ++ memcpy(f, iodev->dname, preflen); ++ memcpy(f + preflen, fname, nlen + 1); ++ ++ code1 = gp_validate_path(mem, f, access); ++ ++ memcpy(f, pipestr, pipestrlen); ++ memcpy(f + pipestrlen, fname, nlen + 1); + +- if (gp_validate_path(mem, fname, access) != 0) ++ if (code1 != 0 && gp_validate_path(mem, f, access) != 0 ) + return gs_error_invalidfileaccess; + + /* +diff --git a/base/gp_mshdl.c b/base/gp_mshdl.c +index 2b964ed74..8d87ceadc 100644 +--- a/base/gp_mshdl.c ++++ b/base/gp_mshdl.c +@@ -95,8 +95,17 @@ mswin_handle_fopen(gx_io_device * iodev, const char *fname, const char *access, + long hfile; /* Correct for Win32, may be wrong for Win64 */ + gs_lib_ctx_t *ctx = mem->gs_lib_ctx; + gs_fs_list_t *fs = ctx->core->fs; ++ char f[gp_file_name_sizeof]; ++ const size_t preflen = strlen(iodev->dname); ++ const size_t nlen = strlen(fname); + +- if (gp_validate_path(mem, fname, access) != 0) ++ if (preflen + nlen >= gp_file_name_sizeof) ++ return_error(gs_error_invalidaccess); ++ ++ memcpy(f, iodev->dname, preflen); ++ memcpy(f + preflen, fname, nlen + 1); ++ ++ if (gp_validate_path(mem, f, access) != 0) + return gs_error_invalidfileaccess; + + /* First we try the open_handle method. */ +diff --git a/base/gp_msprn.c b/base/gp_msprn.c +index ed4827968..746a974f7 100644 +--- a/base/gp_msprn.c ++++ b/base/gp_msprn.c +@@ -168,8 +168,16 @@ mswin_printer_fopen(gx_io_device * iodev, const char *fname, const char *access, + uintptr_t *ptid = &((tid_t *)(iodev->state))->tid; + gs_lib_ctx_t *ctx = mem->gs_lib_ctx; + gs_fs_list_t *fs = ctx->core->fs; ++ const size_t preflen = strlen(iodev->dname); ++ const size_t nlen = strlen(fname); + +- if (gp_validate_path(mem, fname, access) != 0) ++ if (preflen + nlen >= gp_file_name_sizeof) ++ return_error(gs_error_invalidaccess); ++ ++ memcpy(pname, iodev->dname, preflen); ++ memcpy(pname + preflen, fname, nlen + 1); ++ ++ if (gp_validate_path(mem, pname, access) != 0) + return gs_error_invalidfileaccess; + + /* First we try the open_printer method. */ +diff --git a/base/gp_os2pr.c b/base/gp_os2pr.c +index f852c71fc..ba54cde66 100644 +--- a/base/gp_os2pr.c ++++ b/base/gp_os2pr.c +@@ -107,9 +107,20 @@ os2_printer_fopen(gx_io_device * iodev, const char *fname, const char *access, + FILE ** pfile, char *rfname, uint rnamelen) + { + os2_printer_t *pr = (os2_printer_t *)iodev->state; +- char driver_name[256]; ++ char driver_name[gp_file_name_sizeof]; + gs_lib_ctx_t *ctx = mem->gs_lib_ctx; + gs_fs_list_t *fs = ctx->core->fs; ++ const size_t preflen = strlen(iodev->dname); ++ const int size_t = strlen(fname); ++ ++ if (preflen + nlen >= gp_file_name_sizeof) ++ return_error(gs_error_invalidaccess); ++ ++ memcpy(driver_name, iodev->dname, preflen); ++ memcpy(driver_name + preflen, fname, nlen + 1); ++ ++ if (gp_validate_path(mem, driver_name, access) != 0) ++ return gs_error_invalidfileaccess; + + /* First we try the open_printer method. */ + /* Note that the loop condition here ensures we don't +diff --git a/base/gslibctx.c b/base/gslibctx.c +index 6dfed6cd5..318039fad 100644 +--- a/base/gslibctx.c ++++ b/base/gslibctx.c +@@ -655,82 +655,39 @@ rewrite_percent_specifiers(char *s) + int + gs_add_outputfile_control_path(gs_memory_t *mem, const char *fname) + { +- char *fp, f[gp_file_name_sizeof]; +- const int pipe = 124; /* ASCII code for '|' */ +- const int len = strlen(fname); +- int i, code; ++ char f[gp_file_name_sizeof]; ++ int code; + + /* Be sure the string copy will fit */ +- if (len >= gp_file_name_sizeof) ++ if (strlen(fname) >= gp_file_name_sizeof) + return gs_error_rangecheck; + strcpy(f, fname); +- fp = f; + /* Try to rewrite any %d (or similar) in the string */ + rewrite_percent_specifiers(f); +- for (i = 0; i < len; i++) { +- if (f[i] == pipe) { +- fp = &f[i + 1]; +- /* Because we potentially have to check file permissions at two levels +- for the output file (gx_device_open_output_file and the low level +- fopen API, if we're using a pipe, we have to add both the full string, +- (including the '|', and just the command to which we pipe - since at +- the pipe_fopen(), the leading '|' has been stripped. +- */ +- code = gs_add_control_path(mem, gs_permit_file_writing, f); +- if (code < 0) +- return code; +- code = gs_add_control_path(mem, gs_permit_file_control, f); +- if (code < 0) +- return code; +- break; +- } +- if (!IS_WHITESPACE(f[i])) +- break; +- } +- code = gs_add_control_path(mem, gs_permit_file_control, fp); ++ ++ code = gs_add_control_path(mem, gs_permit_file_control, f); + if (code < 0) + return code; +- return gs_add_control_path(mem, gs_permit_file_writing, fp); ++ return gs_add_control_path(mem, gs_permit_file_writing, f); + } + + int + gs_remove_outputfile_control_path(gs_memory_t *mem, const char *fname) + { +- char *fp, f[gp_file_name_sizeof]; +- const int pipe = 124; /* ASCII code for '|' */ +- const int len = strlen(fname); +- int i, code; ++ char f[gp_file_name_sizeof]; ++ int code; + + /* Be sure the string copy will fit */ +- if (len >= gp_file_name_sizeof) ++ if (strlen(fname) >= gp_file_name_sizeof) + return gs_error_rangecheck; + strcpy(f, fname); +- fp = f; + /* Try to rewrite any %d (or similar) in the string */ +- for (i = 0; i < len; i++) { +- if (f[i] == pipe) { +- fp = &f[i + 1]; +- /* Because we potentially have to check file permissions at two levels +- for the output file (gx_device_open_output_file and the low level +- fopen API, if we're using a pipe, we have to add both the full string, +- (including the '|', and just the command to which we pipe - since at +- the pipe_fopen(), the leading '|' has been stripped. +- */ +- code = gs_remove_control_path(mem, gs_permit_file_writing, f); +- if (code < 0) +- return code; +- code = gs_remove_control_path(mem, gs_permit_file_control, f); +- if (code < 0) +- return code; +- break; +- } +- if (!IS_WHITESPACE(f[i])) +- break; +- } +- code = gs_remove_control_path(mem, gs_permit_file_control, fp); ++ rewrite_percent_specifiers(f); ++ ++ code = gs_remove_control_path(mem, gs_permit_file_control, f); + if (code < 0) + return code; +- return gs_remove_control_path(mem, gs_permit_file_writing, fp); ++ return gs_remove_control_path(mem, gs_permit_file_writing, f); + } + + int +-- +2.20.1 + diff --git a/buildroot/package/ghostscript/ghostscript.mk b/buildroot/package/ghostscript/ghostscript.mk index 5b50c9440..ca24c6167 100644 --- a/buildroot/package/ghostscript/ghostscript.mk +++ b/buildroot/package/ghostscript/ghostscript.mk @@ -21,6 +21,9 @@ GHOSTSCRIPT_DEPENDENCIES = \ libpng \ tiff +# 0002-Bug-704342-Include-device-specifier-strings-in-acces.patch +GHOSTSCRIPT_IGNORE_CVES += CVE-2021-3781 + # Ghostscript includes (old) copies of several libraries, delete them. # Inspired by linuxfromscratch: # http://www.linuxfromscratch.org/blfs/view/svn/pst/gs.html diff --git a/buildroot/package/go/go.hash b/buildroot/package/go/go.hash index bc828f41c..39eec5b22 100644 --- a/buildroot/package/go/go.hash +++ b/buildroot/package/go/go.hash @@ -1,3 +1,3 @@ # From https://golang.org/dl/ -sha256 8f2a8c24b793375b3243df82fdb0c8387486dcc8a892ca1c991aa99ace086b98 go1.16.8.src.tar.gz +sha256 0a1cc7fd7bd20448f71ebed64d846138850d5099b18cf5cc10a4fc45160d8c3d go1.16.9.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/buildroot/package/go/go.mk b/buildroot/package/go/go.mk index 1921b85fc..cff2fa2c5 100644 --- a/buildroot/package/go/go.mk +++ b/buildroot/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.16.8 +GO_VERSION = 1.16.9 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz diff --git a/buildroot/package/gstreamer1/gst-omx/gst-omx.hash b/buildroot/package/gstreamer1/gst-omx/gst-omx.hash index ceeaf4e57..904039350 100644 --- a/buildroot/package/gstreamer1/gst-omx/gst-omx.hash +++ b/buildroot/package/gstreamer1/gst-omx/gst-omx.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.18.4.tar.xz.sha256sum -sha256 e35051cf891eb2f31d6fcf176ff37d985f97f33874ac31b0b3ad3b5b95035043 gst-omx-1.18.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.18.5.tar.xz.sha256sum +sha256 2cd457c1e8deb1a9b39608048fb36a44f6c9a864a6b6115b1453a32e7be93b42 gst-omx-1.18.5.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/buildroot/package/gstreamer1/gst-omx/gst-omx.mk b/buildroot/package/gstreamer1/gst-omx/gst-omx.mk index 36a05be6b..f7be1d59e 100644 --- a/buildroot/package/gstreamer1/gst-omx/gst-omx.mk +++ b/buildroot/package/gstreamer1/gst-omx/gst-omx.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST_OMX_VERSION = 1.18.4 +GST_OMX_VERSION = 1.18.5 GST_OMX_SOURCE = gst-omx-$(GST_OMX_VERSION).tar.xz GST_OMX_SITE = https://gstreamer.freedesktop.org/src/gst-omx diff --git a/buildroot/package/gstreamer1/gst1-devtools/gst1-devtools.hash b/buildroot/package/gstreamer1/gst1-devtools/gst1-devtools.hash index 4c0c5b5b0..c19254c19 100644 --- a/buildroot/package/gstreamer1/gst1-devtools/gst1-devtools.hash +++ b/buildroot/package/gstreamer1/gst1-devtools/gst1-devtools.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.18.4.tar.xz.sha256sum -sha256 ffbd194c40912cb5e7fca2863648bf9dd8257b7af97d3a60c4fcd4efd8526ccf gst-devtools-1.18.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.18.5.tar.xz.sha256sum +sha256 fecffc86447daf5c2a06843c757a991d745caa2069446a0d746e99b13f7cb079 gst-devtools-1.18.5.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 validate/COPYING diff --git a/buildroot/package/gstreamer1/gst1-devtools/gst1-devtools.mk b/buildroot/package/gstreamer1/gst1-devtools/gst1-devtools.mk index 5a10e4fab..1c2582395 100644 --- a/buildroot/package/gstreamer1/gst1-devtools/gst1-devtools.mk +++ b/buildroot/package/gstreamer1/gst1-devtools/gst1-devtools.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_DEVTOOLS_VERSION = 1.18.4 +GST1_DEVTOOLS_VERSION = 1.18.5 GST1_DEVTOOLS_SOURCE = gst-devtools-$(GST1_DEVTOOLS_VERSION).tar.xz GST1_DEVTOOLS_SITE = https://gstreamer.freedesktop.org/src/gst-devtools GST1_DEVTOOLS_LICENSE = LGPL-2.1+ diff --git a/buildroot/package/gstreamer1/gst1-interpipe/gst1-interpipe.hash b/buildroot/package/gstreamer1/gst1-interpipe/gst1-interpipe.hash index 124a2e407..b3fc8ef01 100644 --- a/buildroot/package/gstreamer1/gst1-interpipe/gst1-interpipe.hash +++ b/buildroot/package/gstreamer1/gst1-interpipe/gst1-interpipe.hash @@ -1,5 +1,5 @@ # locally computed hash -sha256 2fd86aebfe03849a19e9d02db3a8f97bf6f77de835d36ae84282d6f734df323c gst1-interpipe-1.1.4-br1.tar.gz +sha256 00d3a91625f6cc5d263f35b9330b4ba6eb40781be2e823231e5b2be9281e1fb4 gst1-interpipe-1.1.6-br1.tar.gz # Hashes for license files: sha256 16d7caa6cabbfd0ca47e064a7b48cb446d013e84ca88c854d6470851752136d5 COPYING diff --git a/buildroot/package/gstreamer1/gst1-interpipe/gst1-interpipe.mk b/buildroot/package/gstreamer1/gst1-interpipe/gst1-interpipe.mk index eb1e6dd53..80e5b577f 100644 --- a/buildroot/package/gstreamer1/gst1-interpipe/gst1-interpipe.mk +++ b/buildroot/package/gstreamer1/gst1-interpipe/gst1-interpipe.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_INTERPIPE_VERSION = 1.1.4 +GST1_INTERPIPE_VERSION = 1.1.6 GST1_INTERPIPE_SITE = https://github.com/RidgeRun/gst-interpipe GST1_INTERPIPE_SITE_METHOD = git # fetch gst-interpipe/common sub module diff --git a/buildroot/package/gstreamer1/gst1-libav/gst1-libav.hash b/buildroot/package/gstreamer1/gst1-libav/gst1-libav.hash index 632c2f865..040a6e33f 100644 --- a/buildroot/package/gstreamer1/gst1-libav/gst1-libav.hash +++ b/buildroot/package/gstreamer1/gst1-libav/gst1-libav.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.18.4.tar.xz.sha256sum -sha256 344a463badca216c2cef6ee36f9510c190862bdee48dc4591c0a430df7e8c396 gst-libav-1.18.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.18.5.tar.xz.sha256sum +sha256 822e008a910e9dd13aedbdd8dc63fedef4040c0ee2e927bab3112e9de693a548 gst-libav-1.18.5.tar.xz sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/buildroot/package/gstreamer1/gst1-libav/gst1-libav.mk b/buildroot/package/gstreamer1/gst1-libav/gst1-libav.mk index 8ae5b87be..01ec4d2c9 100644 --- a/buildroot/package/gstreamer1/gst1-libav/gst1-libav.mk +++ b/buildroot/package/gstreamer1/gst1-libav/gst1-libav.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_LIBAV_VERSION = 1.18.4 +GST1_LIBAV_VERSION = 1.18.5 GST1_LIBAV_SOURCE = gst-libav-$(GST1_LIBAV_VERSION).tar.xz GST1_LIBAV_SITE = https://gstreamer.freedesktop.org/src/gst-libav GST1_LIBAV_LICENSE = LGPL-2.0+ diff --git a/buildroot/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash b/buildroot/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash index 18c4ed4b6..cbb2729da 100644 --- a/buildroot/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash +++ b/buildroot/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.4.tar.xz.sha256sum -sha256 74e806bc5595b18c70e9ca93571e27e79dfb808e5d2e7967afa952b52e99c85f gst-plugins-bad-1.18.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.5.tar.xz.sha256sum +sha256 a164923b94f0d08578a6fcaeaac6e0c05da788a46903a1086870e9ca45ad678e gst-plugins-bad-1.18.5.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/buildroot/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/buildroot/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index f4cf0d534..d8b2e2a5d 100644 --- a/buildroot/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/buildroot/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BAD_VERSION = 1.18.4 +GST1_PLUGINS_BAD_VERSION = 1.18.5 GST1_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST1_PLUGINS_BAD_VERSION).tar.xz GST1_PLUGINS_BAD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-bad GST1_PLUGINS_BAD_INSTALL_STAGING = YES diff --git a/buildroot/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash b/buildroot/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash index dabceac8f..200ba0fe5 100644 --- a/buildroot/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash +++ b/buildroot/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.18.4.tar.xz.sha256sum -sha256 29e53229a84d01d722f6f6db13087231cdf6113dd85c25746b9b58c3d68e8323 gst-plugins-base-1.18.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.18.5.tar.xz.sha256sum +sha256 960b7af4585700db0fdd5b843554e11e2564fed9e061f591fae88a7be6446fa3 gst-plugins-base-1.18.5.tar.xz sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/buildroot/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/buildroot/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk index ccbf75a4d..76757fd6a 100644 --- a/buildroot/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +++ b/buildroot/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BASE_VERSION = 1.18.4 +GST1_PLUGINS_BASE_VERSION = 1.18.5 GST1_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST1_PLUGINS_BASE_VERSION).tar.xz GST1_PLUGINS_BASE_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-base GST1_PLUGINS_BASE_INSTALL_STAGING = YES diff --git a/buildroot/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash b/buildroot/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash index 546fed98f..ea9f43bfd 100644 --- a/buildroot/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash +++ b/buildroot/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.18.4.tar.xz.sha256sum -sha256 b6e50e3a9bbcd56ee6ec71c33aa8332cc9c926b0c1fae995aac8b3040ebe39b0 gst-plugins-good-1.18.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.18.5.tar.xz.sha256sum +sha256 3aaeeea7765fbf8801acce4a503a9b05f73f04e8a35352e9d00232cfd555796b gst-plugins-good-1.18.5.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/buildroot/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk b/buildroot/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk index bace77802..44da3c3c3 100644 --- a/buildroot/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +++ b/buildroot/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_GOOD_VERSION = 1.18.4 +GST1_PLUGINS_GOOD_VERSION = 1.18.5 GST1_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST1_PLUGINS_GOOD_VERSION).tar.xz GST1_PLUGINS_GOOD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-good GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING diff --git a/buildroot/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash b/buildroot/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash index 3ca78ed1b..93945cdec 100644 --- a/buildroot/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash +++ b/buildroot/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.18.4.tar.xz.sha256sum -sha256 218df0ce0d31e8ca9cdeb01a3b0c573172cc9c21bb3d41811c7820145623d13c gst-plugins-ugly-1.18.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.18.5.tar.xz.sha256sum +sha256 df32803e98f8a9979373fa2ca7e05e62f977b1097576d3a80619d9f5c69f66d9 gst-plugins-ugly-1.18.5.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/buildroot/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk b/buildroot/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk index b596a0bca..b3dc765d0 100644 --- a/buildroot/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk +++ b/buildroot/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_UGLY_VERSION = 1.18.4 +GST1_PLUGINS_UGLY_VERSION = 1.18.5 GST1_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST1_PLUGINS_UGLY_VERSION).tar.xz GST1_PLUGINS_UGLY_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-ugly GST1_PLUGINS_UGLY_LICENSE_FILES = COPYING diff --git a/buildroot/package/gstreamer1/gst1-python/gst1-python.hash b/buildroot/package/gstreamer1/gst1-python/gst1-python.hash index f7c2d5707..2035c81fe 100644 --- a/buildroot/package/gstreamer1/gst1-python/gst1-python.hash +++ b/buildroot/package/gstreamer1/gst1-python/gst1-python.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.18.4.tar.xz.sha256sum -sha256 cb68e08a7e825e08b83a12a22dcd6e4f1b328a7b02a7ac84f42f68f4ddc7098e gst-python-1.18.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.18.5.tar.xz.sha256sum +sha256 533685871305959d6db89507f3b3aa6c765c2f2b0dacdc32c5a6543e72e5bc52 gst-python-1.18.5.tar.xz sha256 ea3ad127610e5ded2210b3a86a46314f2b3b28e438eccffdae19a4d6fbcdb0c2 COPYING diff --git a/buildroot/package/gstreamer1/gst1-python/gst1-python.mk b/buildroot/package/gstreamer1/gst1-python/gst1-python.mk index ed127cdba..614cb2239 100644 --- a/buildroot/package/gstreamer1/gst1-python/gst1-python.mk +++ b/buildroot/package/gstreamer1/gst1-python/gst1-python.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PYTHON_VERSION = 1.18.4 +GST1_PYTHON_VERSION = 1.18.5 GST1_PYTHON_SOURCE = gst-python-$(GST1_PYTHON_VERSION).tar.xz GST1_PYTHON_SITE = https://gstreamer.freedesktop.org/src/gst-python GST1_PYTHON_INSTALL_STAGING = YES diff --git a/buildroot/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash b/buildroot/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash index b07b24413..627a451d0 100644 --- a/buildroot/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash +++ b/buildroot/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash @@ -1,4 +1,4 @@ -# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.18.4.tar.xz.sha256sum -sha256 a46bb8de40b971a048580279d2660e616796f871ad3ed00c8a95fe4d273a6c94 gst-rtsp-server-1.18.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.18.5.tar.xz.sha256sum +sha256 04d63bf48816c6f41c73f6de0f912a7cef0aab39c44162a7bcece1923dfc9d1f gst-rtsp-server-1.18.5.tar.xz sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING.LIB diff --git a/buildroot/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk b/buildroot/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk index 878195b74..37942423a 100644 --- a/buildroot/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk +++ b/buildroot/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_RTSP_SERVER_VERSION = 1.18.4 +GST1_RTSP_SERVER_VERSION = 1.18.5 GST1_RTSP_SERVER_SOURCE = gst-rtsp-server-$(GST1_RTSP_SERVER_VERSION).tar.xz GST1_RTSP_SERVER_SITE = http://gstreamer.freedesktop.org/src/gst-rtsp-server GST1_RTSP_SERVER_LICENSE = LGPL-2.0+ diff --git a/buildroot/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash b/buildroot/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash index 10986d3c8..b0c19fc60 100644 --- a/buildroot/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash +++ b/buildroot/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.18.4.tar.xz.sha256sum -sha256 92db98af86f3150d429c9ab17e88d2364f9c07a140c8f445ed739e8f10252aea gstreamer-vaapi-1.18.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.18.5.tar.xz.sha256sum +sha256 4a460fb95559f41444eb24864ad2d9e37922b6eea941510310319fc3e0ba727b gstreamer-vaapi-1.18.5.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/buildroot/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk b/buildroot/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk index 411a32695..497c6df0d 100644 --- a/buildroot/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk +++ b/buildroot/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_VAAPI_VERSION = 1.18.4 +GST1_VAAPI_VERSION = 1.18.5 GST1_VAAPI_SITE = https://gstreamer.freedesktop.org/src/gstreamer-vaapi GST1_VAAPI_SOURCE = gstreamer-vaapi-$(GST1_VAAPI_VERSION).tar.xz GST1_VAAPI_LICENSE = LGPL-2.1+ diff --git a/buildroot/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash b/buildroot/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash index 1795171ee..daaf729c7 100644 --- a/buildroot/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash +++ b/buildroot/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash @@ -1,5 +1,5 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.18.4.tar.xz.sha256sum -sha256 4687b870a7de18aebf50f45ff572ad9e0138020e3479e02a6f056a0c4c7a1d04 gst-editing-services-1.18.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.18.5.tar.xz.sha256sum +sha256 8af4a8394d051f3e18280686db49a6efaccc95c0c59a17f0f564e32000590df5 gst-editing-services-1.18.5.tar.xz # Hashes for license files: sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/buildroot/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk b/buildroot/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk index e7f626ef7..d3de79c5f 100644 --- a/buildroot/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk +++ b/buildroot/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_EDITING_SERVICES_VERSION = 1.18.4 +GSTREAMER1_EDITING_SERVICES_VERSION = 1.18.5 GSTREAMER1_EDITING_SERVICES_SOURCE = gst-editing-services-$(GSTREAMER1_EDITING_SERVICES_VERSION).tar.xz GSTREAMER1_EDITING_SERVICES_SITE = https://gstreamer.freedesktop.org/src/gstreamer-editing-services GSTREAMER1_EDITING_SERVICES_LICENSE = LGPL-2.0+ diff --git a/buildroot/package/gstreamer1/gstreamer1/gstreamer1.hash b/buildroot/package/gstreamer1/gstreamer1/gstreamer1.hash index e9709ef0c..c6282454c 100644 --- a/buildroot/package/gstreamer1/gstreamer1/gstreamer1.hash +++ b/buildroot/package/gstreamer1/gstreamer1/gstreamer1.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.18.4.tar.xz.sha256sum -sha256 9aeec99b38e310817012aa2d1d76573b787af47f8a725a65b833880a094dfbc5 gstreamer-1.18.4.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.18.5.tar.xz.sha256sum +sha256 55862232a63459bbf56abebde3085ca9aec211b478e891dacea4d6df8cafe80a gstreamer-1.18.5.tar.xz sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/buildroot/package/gstreamer1/gstreamer1/gstreamer1.mk b/buildroot/package/gstreamer1/gstreamer1/gstreamer1.mk index 171ea2b8e..9bdd00cae 100644 --- a/buildroot/package/gstreamer1/gstreamer1/gstreamer1.mk +++ b/buildroot/package/gstreamer1/gstreamer1/gstreamer1.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_VERSION = 1.18.4 +GSTREAMER1_VERSION = 1.18.5 GSTREAMER1_SOURCE = gstreamer-$(GSTREAMER1_VERSION).tar.xz GSTREAMER1_SITE = https://gstreamer.freedesktop.org/src/gstreamer GSTREAMER1_INSTALL_STAGING = YES diff --git a/buildroot/package/kodi-pvr-octonet/Config.in b/buildroot/package/kodi-pvr-octonet/Config.in index b8bcd7e21..93f4fbae4 100644 --- a/buildroot/package/kodi-pvr-octonet/Config.in +++ b/buildroot/package/kodi-pvr-octonet/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_KODI_PVR_OCTONET bool "kodi-pvr-octonet" - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # json-for-modern-cpp - select BR2_PACKAGE_JSON_FOR_MODERN_CPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # jsoncpp + select BR2_PACKAGE_JSONCPP select BR2_PACKAGE_KODI_PLATFORM select BR2_PACKAGE_LIBPLATFORM help @@ -9,5 +9,5 @@ config BR2_PACKAGE_KODI_PVR_OCTONET https://github.com/DigitalDevices/pvr.octonet -comment "kodi-pvr-octonet needs a toolchain w/ gcc >= 4.9" - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 +comment "kodi-pvr-octonet needs a toolchain w/ gcc >= 4.7" + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 diff --git a/buildroot/package/kodi-pvr-octonet/kodi-pvr-octonet.mk b/buildroot/package/kodi-pvr-octonet/kodi-pvr-octonet.mk index 890a28356..0b8e19796 100644 --- a/buildroot/package/kodi-pvr-octonet/kodi-pvr-octonet.mk +++ b/buildroot/package/kodi-pvr-octonet/kodi-pvr-octonet.mk @@ -8,6 +8,6 @@ KODI_PVR_OCTONET_VERSION = e35cc373476a92aee11ec8e8a14fb8fc086a4f84 KODI_PVR_OCTONET_SITE = $(call github,DigitalDevices,pvr.octonet,$(KODI_PVR_OCTONET_VERSION)) KODI_PVR_OCTONET_LICENSE = GPL-2.0+ KODI_PVR_OCTONET_LICENSE_FILES = debian/copyright -KODI_PVR_OCTONET_DEPENDENCIES = json-for-modern-cpp kodi-platform libplatform +KODI_PVR_OCTONET_DEPENDENCIES = jsoncpp kodi-platform libplatform $(eval $(cmake-package)) diff --git a/buildroot/package/libcurl/Config.in b/buildroot/package/libcurl/Config.in index 0674701e0..4baef8462 100644 --- a/buildroot/package/libcurl/Config.in +++ b/buildroot/package/libcurl/Config.in @@ -71,6 +71,7 @@ config BR2_PACKAGE_LIBCURL_MBEDTLS config BR2_PACKAGE_LIBCURL_WOLFSSL bool "WolfSSL" depends on BR2_PACKAGE_WOLFSSL + select BR2_PACKAGE_WOLFSSL_ALL config BR2_PACKAGE_LIBCURL_TLS_NONE bool "None" diff --git a/buildroot/package/libcurl/libcurl.hash b/buildroot/package/libcurl/libcurl.hash index 5e5776d1e..b13f01c87 100644 --- a/buildroot/package/libcurl/libcurl.hash +++ b/buildroot/package/libcurl/libcurl.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://curl.se/download/curl-7.78.0.tar.xz.asc +# https://curl.se/download/curl-7.79.1.tar.xz.asc # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 -sha256 be42766d5664a739c3974ee3dfbbcbe978a4ccb1fe628bb1d9b59ac79e445fb5 curl-7.78.0.tar.xz +sha256 0606f74b1182ab732a17c11613cbbaf7084f2e6cca432642d0e3ad7c224c3689 curl-7.79.1.tar.xz sha256 6fd1a1c008b5ef4c4741dd188c3f8af6944c14c25afa881eb064f98fb98358e7 COPYING diff --git a/buildroot/package/libcurl/libcurl.mk b/buildroot/package/libcurl/libcurl.mk index 4e3c6d452..a70ebe411 100644 --- a/buildroot/package/libcurl/libcurl.mk +++ b/buildroot/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 7.78.0 +LIBCURL_VERSION = 7.79.1 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ diff --git a/buildroot/package/libkrb5/0001-Fix-KDC-null-deref-on-TGS-inner-body-null-server.patch b/buildroot/package/libkrb5/0001-Fix-KDC-null-deref-on-TGS-inner-body-null-server.patch new file mode 100644 index 000000000..ec6f62338 --- /dev/null +++ b/buildroot/package/libkrb5/0001-Fix-KDC-null-deref-on-TGS-inner-body-null-server.patch @@ -0,0 +1,47 @@ +From d775c95af7606a51bf79547a94fa52ddd1cb7f49 Mon Sep 17 00:00:00 2001 +From: Greg Hudson +Date: Tue, 3 Aug 2021 01:15:27 -0400 +Subject: [PATCH] Fix KDC null deref on TGS inner body null server + +After the KDC decodes a FAST inner body, it does not check for a null +server. Prior to commit 39548a5b17bbda9eeb63625a201cfd19b9de1c5b this +would typically result in an error from krb5_unparse_name(), but with +the addition of get_local_tgt() it results in a null dereference. Add +a null check. + +Reported by Joseph Sutton of Catalyst. + +CVE-2021-37750: + +In MIT krb5 releases 1.14 and later, an authenticated attacker can +cause a null dereference in the KDC by sending a FAST TGS request with +no server field. + +ticket: 9008 (new) +tags: pullup +target_version: 1.19-next +target_version: 1.18-next + +[Retrieved from: +https://github.com/krb5/krb5/commit/d775c95af7606a51bf79547a94fa52ddd1cb7f49] +Signed-off-by: Fabrice Fontaine +--- + src/kdc/do_tgs_req.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/kdc/do_tgs_req.c b/src/kdc/do_tgs_req.c +index 582e497cc9..32dc65fa8e 100644 +--- a/src/kdc/do_tgs_req.c ++++ b/src/kdc/do_tgs_req.c +@@ -204,6 +204,11 @@ process_tgs_req(krb5_kdc_req *request, krb5_data *pkt, + status = "FIND_FAST"; + goto cleanup; + } ++ if (sprinc == NULL) { ++ status = "NULL_SERVER"; ++ errcode = KRB5KDC_ERR_S_PRINCIPAL_UNKNOWN; ++ goto cleanup; ++ } + + errcode = get_local_tgt(kdc_context, &sprinc->realm, header_server, + &local_tgt, &local_tgt_storage, &local_tgt_key); diff --git a/buildroot/package/libkrb5/libkrb5.mk b/buildroot/package/libkrb5/libkrb5.mk index 89f219d91..d41e7559a 100644 --- a/buildroot/package/libkrb5/libkrb5.mk +++ b/buildroot/package/libkrb5/libkrb5.mk @@ -16,6 +16,9 @@ LIBKRB5_CPE_ID_PRODUCT = kerberos_5 LIBKRB5_DEPENDENCIES = host-bison $(TARGET_NLS_DEPENDENCIES) LIBKRB5_INSTALL_STAGING = YES +# 0001-Fix-KDC-null-deref-on-TGS-inner-body-null-server.patch +LIBKRB5_IGNORE_CVES += CVE-2021-37750 + # The configure script uses AC_TRY_RUN tests to check for those values, # which doesn't work in a cross-compilation scenario. Therefore, # we feed the configure script with the correct answer for those tests diff --git a/buildroot/package/libressl/libressl.hash b/buildroot/package/libressl/libressl.hash index 9f216bf2f..94b50103f 100644 --- a/buildroot/package/libressl/libressl.hash +++ b/buildroot/package/libressl/libressl.hash @@ -1,4 +1,4 @@ # From https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/SHA256 -sha256 798a65fd61d385e09d559810cdfa46512f8def5919264cfef241a7b086ce7cfe libressl-3.2.5.tar.gz +sha256 7c32ff037597ce471c7cfd9dcb8471cda3a02983aeba3315059362ceb3934b84 libressl-3.2.7.tar.gz # Locally computed sha256 5c63613f008f16a9c0025c096bbd736cecf720494d121b5c5203e0ec6e5955b1 COPYING diff --git a/buildroot/package/libressl/libressl.mk b/buildroot/package/libressl/libressl.mk index d09df8f40..9e91fea19 100644 --- a/buildroot/package/libressl/libressl.mk +++ b/buildroot/package/libressl/libressl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBRESSL_VERSION = 3.2.5 +LIBRESSL_VERSION = 3.2.7 LIBRESSL_SITE = https://ftp.openbsd.org/pub/OpenBSD/LibreSSL LIBRESSL_LICENSE = ISC (new additions), OpenSSL or SSLeay (original OpenSSL code) LIBRESSL_LICENSE_FILES = COPYING diff --git a/buildroot/package/libsndfile/0011-ms_adpcm-Fix-and-extend-size-checks.patch b/buildroot/package/libsndfile/0011-ms_adpcm-Fix-and-extend-size-checks.patch new file mode 100644 index 000000000..edacbda01 --- /dev/null +++ b/buildroot/package/libsndfile/0011-ms_adpcm-Fix-and-extend-size-checks.patch @@ -0,0 +1,40 @@ +From deb669ee8be55a94565f6f8a6b60890c2e7c6f32 Mon Sep 17 00:00:00 2001 +From: bobsayshilol +Date: Thu, 18 Feb 2021 21:52:09 +0000 +Subject: [PATCH] ms_adpcm: Fix and extend size checks + +'blockalign' is the size of a block, and each block contains 7 samples +per channel as part of the preamble, so check against 'samplesperblock' +rather than 'blockalign'. Also add an additional check that the block +is big enough to hold the samples it claims to hold. + +https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=26803 +Signed-off-by: Peter Korsgaard +--- + src/ms_adpcm.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/src/ms_adpcm.c b/src/ms_adpcm.c +index 5e8f1a31..a21cb994 100644 +--- a/src/ms_adpcm.c ++++ b/src/ms_adpcm.c +@@ -128,8 +128,14 @@ wavlike_msadpcm_init (SF_PRIVATE *psf, int blockalign, int samplesperblock) + if (psf->file.mode == SFM_WRITE) + samplesperblock = 2 + 2 * (blockalign - 7 * psf->sf.channels) / psf->sf.channels ; + +- if (blockalign < 7 * psf->sf.channels) +- { psf_log_printf (psf, "*** Error blockalign (%d) should be > %d.\n", blockalign, 7 * psf->sf.channels) ; ++ /* There's 7 samples per channel in the preamble of each block */ ++ if (samplesperblock < 7 * psf->sf.channels) ++ { psf_log_printf (psf, "*** Error samplesperblock (%d) should be >= %d.\n", samplesperblock, 7 * psf->sf.channels) ; ++ return SFE_INTERNAL ; ++ } ; ++ ++ if (2 * blockalign < samplesperblock * psf->sf.channels) ++ { psf_log_printf (psf, "*** Error blockalign (%d) should be >= %d.\n", blockalign, samplesperblock * psf->sf.channels / 2) ; + return SFE_INTERNAL ; + } ; + +-- +2.20.1 + diff --git a/buildroot/package/libsndfile/libsndfile.mk b/buildroot/package/libsndfile/libsndfile.mk index eb1542614..81bf804eb 100644 --- a/buildroot/package/libsndfile/libsndfile.mk +++ b/buildroot/package/libsndfile/libsndfile.mk @@ -19,6 +19,9 @@ LIBSNDFILE_IGNORE_CVES += CVE-2018-13139 CVE-2018-19432 LIBSNDFILE_IGNORE_CVES += \ CVE-2017-14245 CVE-2017-14246 CVE-2017-17456 CVE-2017-17457 \ CVE-2018-19661 CVE-2018-19662 +# 0011-ms_adpcm-Fix-and-extend-size-checks.patch +LIBSNDFILE_IGNORE_CVES += CVE-2021-3246 + # disputed, https://github.com/erikd/libsndfile/issues/398 LIBSNDFILE_IGNORE_CVES += CVE-2018-13419 # 0004-src-wav.c-Fix-heap-read-overflow.patch diff --git a/buildroot/package/libyang/libyang.hash b/buildroot/package/libyang/libyang.hash index bc9e948c0..755ecf390 100644 --- a/buildroot/package/libyang/libyang.hash +++ b/buildroot/package/libyang/libyang.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c4498a77a7c12a28c9911f993eeafbf2badd2ecea58bb74781bd61cfc635e4c9 libyang-1.0.215.tar.gz +sha256 8576cad398b451b1c622b0652a2030fcf83ee1d9a39e6cd93d17b0a5a43118d6 libyang-1.0.240.tar.gz sha256 f942fe693e03e4e3ff67a351c00dc8f468a042e0d7273b0aa6bc53060b568112 LICENSE diff --git a/buildroot/package/libyang/libyang.mk b/buildroot/package/libyang/libyang.mk index ee24256be..f784367ea 100644 --- a/buildroot/package/libyang/libyang.mk +++ b/buildroot/package/libyang/libyang.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBYANG_VERSION = 1.0.215 +LIBYANG_VERSION = 1.0.240 LIBYANG_SITE = $(call github,CESNET,libyang,v$(LIBYANG_VERSION)) LIBYANG_LICENSE = BSD-3-Clause LIBYANG_LICENSE_FILES = LICENSE diff --git a/buildroot/package/lxc/Config.in b/buildroot/package/lxc/Config.in index 72b675113..a3f9be0c9 100644 --- a/buildroot/package/lxc/Config.in +++ b/buildroot/package/lxc/Config.in @@ -21,4 +21,4 @@ comment "lxc needs a glibc or musl toolchain w/ threads, headers >= 3.0, dynamic || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 \ || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 \ || BR2_STATIC_LIBS \ - || BR2_TOOLCHAN_USES_UCLIBC + || BR2_TOOLCHAIN_USES_UCLIBC diff --git a/buildroot/package/lxc/lxc.hash b/buildroot/package/lxc/lxc.hash index 85cdecceb..efd7a8e42 100644 --- a/buildroot/package/lxc/lxc.hash +++ b/buildroot/package/lxc/lxc.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 9165dabc0bb6ef7f2fda2009aee90b20fbefe77ed8008347e9f06048eba1e463 lxc-4.0.6.tar.gz +sha256 a10c518056d2e497bd600e4ffac2853bdeab1e835bf455a6d87cc8df128bfae9 lxc-4.0.10.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 diff --git a/buildroot/package/lxc/lxc.mk b/buildroot/package/lxc/lxc.mk index 24a1f3c58..93f6d2535 100644 --- a/buildroot/package/lxc/lxc.mk +++ b/buildroot/package/lxc/lxc.mk @@ -4,7 +4,7 @@ # ################################################################################ -LXC_VERSION = 4.0.6 +LXC_VERSION = 4.0.10 LXC_SITE = https://linuxcontainers.org/downloads/lxc LXC_LICENSE = GPL-2.0 (some tools), LGPL-2.1+ LXC_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 diff --git a/buildroot/package/lynx/lynx.hash b/buildroot/package/lynx/lynx.hash index 76d7614a7..62e2555a9 100644 --- a/buildroot/package/lynx/lynx.hash +++ b/buildroot/package/lynx/lynx.hash @@ -1,3 +1,4 @@ # Locally calculated: sha256 387f193d7792f9cfada14c60b0e5c0bff18f227d9257a39483e14fa1aaf79595 lynx2.8.9rel.1.tar.bz2 +sha256 b2207e757dbbefc34a20a32b1b4a216b4a4316e1dc812bceca4ac6294871119a 90_CVE-2021-38165.patch sha256 8406a30ff3134ec23cf752d1ceda92ddaabbe41b4f2dc07ea3cfa139de12d6d6 COPYING diff --git a/buildroot/package/lynx/lynx.mk b/buildroot/package/lynx/lynx.mk index d115682d6..44d52d90a 100644 --- a/buildroot/package/lynx/lynx.mk +++ b/buildroot/package/lynx/lynx.mk @@ -7,6 +7,10 @@ LYNX_VERSION = 2.8.9rel.1 LYNX_SOURCE = lynx$(LYNX_VERSION).tar.bz2 LYNX_SITE = ftp://ftp.invisible-island.net/lynx/tarballs +LYNX_PATCH = \ + https://salsa.debian.org/lynx-team/lynx/-/raw/debian/2.9.0dev.6-3_deb11u1/debian/patches/90_CVE-2021-38165.patch +# 90_CVE-2021-38165.patch +LYNX_IGNORE_CVES += CVE-2021-38165 LYNX_LICENSE = GPL-2.0 LYNX_LICENSE_FILES = COPYING diff --git a/buildroot/package/mesa3d/Config.in b/buildroot/package/mesa3d/Config.in index 1104071e3..5816d1f79 100644 --- a/buildroot/package/mesa3d/Config.in +++ b/buildroot/package/mesa3d/Config.in @@ -4,6 +4,7 @@ menuconfig BR2_PACKAGE_MESA3D depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_SYNC_1 depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL + depends on !BR2_m68k || BR2_TOOLCHAIN_GCC_AT_LEAST_7 # m68k needs gcc >= 7.x select BR2_PACKAGE_EXPAT select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_WAYLAND_PROTOCOLS if BR2_PACKAGE_WAYLAND @@ -474,3 +475,7 @@ comment "mesa3d needs a toolchain w/ C++, NPTL, dynamic library" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_SYNC_1 + +comment "mesa3d needs a toolchain w/ gcc >= 7" + depends on BR2_m68k + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_7 diff --git a/buildroot/package/mesa3d/mesa3d.mk b/buildroot/package/mesa3d/mesa3d.mk index 36ea72f88..1dc6de787 100644 --- a/buildroot/package/mesa3d/mesa3d.mk +++ b/buildroot/package/mesa3d/mesa3d.mk @@ -261,4 +261,11 @@ else MESA3D_CONF_OPTS += -Dzstd=disabled endif +MESA3D_CFLAGS = $(TARGET_CFLAGS) + +# m68k needs 32-bit offsets in switch tables to build +ifeq ($(BR2_m68k),y) +MESA3D_CFLAGS += -mlong-jump-table-offsets +endif + $(eval $(meson-package)) diff --git a/buildroot/package/micropython/micropython.mk b/buildroot/package/micropython/micropython.mk index 010ac35e8..d5dda43a3 100644 --- a/buildroot/package/micropython/micropython.mk +++ b/buildroot/package/micropython/micropython.mk @@ -6,7 +6,10 @@ MICROPYTHON_VERSION = 1.13 MICROPYTHON_SITE = $(call github,micropython,micropython,v$(MICROPYTHON_VERSION)) -MICROPYTHON_LICENSE = MIT +# Micropython has a lot of code copied from other projects, and also a number +# of submodules for various libs. However, we don't even clone the submodules, +# and most of the copied code is not used in the unix build. +MICROPYTHON_LICENSE = MIT, BSD-1-clause, BSD-3-clause, Zlib MICROPYTHON_LICENSE_FILES = LICENSE MICROPYTHON_DEPENDENCIES = host-pkgconf libffi $(BR2_PYTHON3_HOST_DEPENDENCY) diff --git a/buildroot/package/minicom/minicom.mk b/buildroot/package/minicom/minicom.mk index b81ee5212..5cd1d6b8b 100644 --- a/buildroot/package/minicom/minicom.mk +++ b/buildroot/package/minicom/minicom.mk @@ -11,12 +11,9 @@ MINICOM_SITE = \ MINICOM_LICENSE = GPL-2.0+ MINICOM_LICENSE_FILES = COPYING MINICOM_CPE_ID_VENDOR = minicom_project -MINICOM_AUTORECONF = YES MINICOM_DEPENDENCIES = ncurses $(if $(BR2_ENABLE_LOCALE),,libiconv) \ $(TARGET_NLS_DEPENDENCIES) host-pkgconf -# add host-gettext for AM_ICONV macro -MINICOM_DEPENDENCIES += host-gettext MINICOM_CONF_OPTS = \ --enable-dfl-port=/dev/ttyS1 \ diff --git a/buildroot/package/mono/0001-Fix-linkage-with-a-system-libatomic_ops-shared-library.patch b/buildroot/package/mono/0001-Fix-linkage-with-a-system-libatomic_ops-shared-library.patch new file mode 100644 index 000000000..66d4d8e10 --- /dev/null +++ b/buildroot/package/mono/0001-Fix-linkage-with-a-system-libatomic_ops-shared-library.patch @@ -0,0 +1,52 @@ +From 02a44ee1df8176c72e75fd706d1a8f063d3196d5 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 5 Nov 2018 22:50:40 +0100 +Subject: Fix linkage with a system libatomic_ops shared library + +Issue #247 (bdwgc). + +When bdwgc is linked with the external libatomic_ops, bdw-gc.pc must +contain the needed dynamic libraries (such as -latomic_ops) otherwise +build of applications could fail on the link stage on some hosts: +* libgc.so: undefined reference to 'AO_fetch_compare_and_swap_emulation' +* libgc.so: undefined reference to 'AO_store_full_emulation' + +So, this commit sets ATOMIC_OPS_LIBS to "-latomic_ops" when a system +atomic_ops library is used and uses ATOMIC_OPS_LIBS in bdw-gc.pc.in. + +* bdw-gc.pc.in (Libs): Add @ATOMIC_OPS_LIBS@. +* configure.ac [$with_libatomic_ops!=no && $with_libatomic_ops!=none +&& $THREADS!=none] (ATOMIC_OPS_LIBS): Set to -latomic_ops; do AC_SUBST. + +Fix is cherry-picked from bdwgc upstream + +Link to original commit https://github.com/ivmai/bdwgc/commit/02a44ee1df8176c72e75fd706d1a8f063d3196d5?branch=02a44ee1df8176c72e75fd706d1a8f063d3196d5&diff=unified + +Signed-off-by: Illia Bitkov + +diff --git a/external/bdwgc/bdw-gc.pc.in b/external/bdwgc/bdw-gc.pc.in +index ef4c2341..a32e7598 100644 +--- a/external/bdwgc/bdw-gc.pc.in ++++ b/external/bdwgc/bdw-gc.pc.in +@@ -6,5 +6,5 @@ includedir=@includedir@ + Name: Boehm-Demers-Weiser Conservative Garbage Collector + Description: A garbage collector for C and C++ + Version: @PACKAGE_VERSION@ +-Libs: -L${libdir} -lgc ++Libs: -L${libdir} @ATOMIC_OPS_LIBS@ -lgc + Cflags: -I${includedir} +diff --git a/external/bdwgc/configure.ac b/external/bdwgc/configure.ac +index 21abe8fa..9ffe81de 100644 +--- a/external/bdwgc/configure.ac ++++ b/external/bdwgc/configure.ac +@@ -1081,7 +1081,9 @@ AS_IF([test x"$with_libatomic_ops" = xno \ + AC_MSG_CHECKING([which libatomic_ops to use]) + AS_IF([test x"$with_libatomic_ops" != xno], + [ AS_IF([test x"$with_libatomic_ops" != xnone -a x"$THREADS" != xnone], +- [ AC_MSG_RESULT([external]) ], ++ [ AC_MSG_RESULT([external]) ++ ATOMIC_OPS_LIBS="-latomic_ops" ++ AC_SUBST([ATOMIC_OPS_LIBS]) ], + [ AC_MSG_RESULT([none]) + AS_IF([test x"$THREADS" != xnone], + [ AC_DEFINE([GC_BUILTIN_ATOMIC], [1], diff --git a/buildroot/package/mtr/mtr.mk b/buildroot/package/mtr/mtr.mk index 263482534..0400a1202 100644 --- a/buildroot/package/mtr/mtr.mk +++ b/buildroot/package/mtr/mtr.mk @@ -8,9 +8,18 @@ MTR_VERSION = 0.93 MTR_SITE = $(call github,traviscross,mtr,v$(MTR_VERSION)) MTR_AUTORECONF = YES MTR_CONF_OPTS = --without-gtk -MTR_DEPENDENCIES = host-pkgconf $(if $(BR2_PACKAGE_NCURSES),ncurses) +MTR_DEPENDENCIES = \ + host-pkgconf \ + $(if $(BR2_PACKAGE_LIBCAP),libcap) MTR_LICENSE = GPL-2.0 MTR_LICENSE_FILES = COPYING MTR_SELINUX_MODULES = netutils +ifeq ($(BR2_PACKAGE_NCURSES),y) +MTR_CONF_OPTS += --with-ncurses +MTR_DEPENDENCIES += ncurses +else +MTR_CONF_OPTS += --without-ncurses +endif + $(eval $(autotools-package)) diff --git a/buildroot/package/net-tools/net-tools.mk b/buildroot/package/net-tools/net-tools.mk index 985fe2e35..eb268a6e1 100644 --- a/buildroot/package/net-tools/net-tools.mk +++ b/buildroot/package/net-tools/net-tools.mk @@ -9,6 +9,7 @@ NET_TOOLS_SITE = git://git.code.sf.net/p/net-tools/code NET_TOOLS_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) NET_TOOLS_LICENSE = GPL-2.0+ NET_TOOLS_LICENSE_FILES = COPYING +NET_TOOLS_CPE_ID_VENDOR = net-tools_project define NET_TOOLS_CONFIGURE_CMDS (cd $(@D); yes "" | ./configure.sh config.in ) diff --git a/buildroot/package/nmap/nmap.mk b/buildroot/package/nmap/nmap.mk index 13414a56e..34cf61ff0 100644 --- a/buildroot/package/nmap/nmap.mk +++ b/buildroot/package/nmap/nmap.mk @@ -44,6 +44,13 @@ else NMAP_CONF_OPTS += --without-openssl endif +ifeq ($(BR2_PACKAGE_ZLIB),y) +NMAP_CONF_OPTS += --with-libz="$(STAGING_DIR)/usr" +NMAP_DEPENDENCIES += zlib +else +NMAP_CONF_OPTS += --without-libz +endif + NMAP_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) ifeq ($(BR2_PACKAGE_NMAP_NCAT),y) diff --git a/buildroot/package/nodejs/nodejs.hash b/buildroot/package/nodejs/nodejs.hash index 1552e937b..8d39ef489 100644 --- a/buildroot/package/nodejs/nodejs.hash +++ b/buildroot/package/nodejs/nodejs.hash @@ -1,5 +1,5 @@ -# From https://nodejs.org/dist/v12.22.5/SHASUMS256.txt -sha256 f927ff6c2ac5a7234596031b18ba03febbcadd2650d375f1a3fd02426687fd14 node-v12.22.5.tar.xz +# From https://nodejs.org/dist/v12.22.6/SHASUMS256.txt +sha256 c2022f16b8f689620c3472c2b5261fdabbd0ab976bf9ac3b7db6747a2e9b0f7a node-v12.22.6.tar.xz # Hash for license file sha256 221417a7ca275112a5ac54639b36ee3c5184e74631ea1e1b01b701293b655190 LICENSE diff --git a/buildroot/package/nodejs/nodejs.mk b/buildroot/package/nodejs/nodejs.mk index 39099b53d..38e893698 100644 --- a/buildroot/package/nodejs/nodejs.mk +++ b/buildroot/package/nodejs/nodejs.mk @@ -4,7 +4,7 @@ # ################################################################################ -NODEJS_VERSION = 12.22.5 +NODEJS_VERSION = 12.22.6 NODEJS_SOURCE = node-v$(NODEJS_VERSION).tar.xz NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION) NODEJS_DEPENDENCIES = host-python host-nodejs c-ares \ diff --git a/buildroot/package/ntfs-3g/0001-Fixed-reporting-an-error-when-failed-to-build-the-mo.patch b/buildroot/package/ntfs-3g/0001-Fixed-reporting-an-error-when-failed-to-build-the-mo.patch deleted file mode 100644 index 9ba8aae50..000000000 --- a/buildroot/package/ntfs-3g/0001-Fixed-reporting-an-error-when-failed-to-build-the-mo.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 85c1634a26faa572d3c558d4cf8aaaca5202d4e9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jean-Pierre=20Andr=C3=A9?= -Date: Wed, 19 Dec 2018 15:57:50 +0100 -Subject: [PATCH] Fixed reporting an error when failed to build the mountpoint - -The size check was inefficient because getcwd() uses an unsigned int -argument. - -Fixes CVE-2019-9755: An integer underflow issue exists in ntfs-3g 2017.3.23. -A local attacker could potentially exploit this by running /bin/ntfs-3g with -specially crafted arguments from a specially crafted directory to cause a -heap buffer overflow, resulting in a crash or the ability to execute -arbitrary code. In installations where /bin/ntfs-3g is a setuid-root -binary, this could lead to a local escalation of privileges. - -Signed-off-by: Peter Korsgaard ---- - src/lowntfs-3g.c | 6 +++++- - src/ntfs-3g.c | 6 +++++- - 2 files changed, 10 insertions(+), 2 deletions(-) - -diff --git a/src/lowntfs-3g.c b/src/lowntfs-3g.c -index 993867fa..0660439b 100644 ---- a/src/lowntfs-3g.c -+++ b/src/lowntfs-3g.c -@@ -4411,7 +4411,8 @@ int main(int argc, char *argv[]) - else { - ctx->abs_mnt_point = (char*)ntfs_malloc(PATH_MAX); - if (ctx->abs_mnt_point) { -- if (getcwd(ctx->abs_mnt_point, -+ if ((strlen(opts.mnt_point) < PATH_MAX) -+ && getcwd(ctx->abs_mnt_point, - PATH_MAX - strlen(opts.mnt_point) - 1)) { - strcat(ctx->abs_mnt_point, "/"); - strcat(ctx->abs_mnt_point, opts.mnt_point); -@@ -4419,6 +4420,9 @@ int main(int argc, char *argv[]) - /* Solaris also wants the absolute mount point */ - opts.mnt_point = ctx->abs_mnt_point; - #endif /* defined(__sun) && defined (__SVR4) */ -+ } else { -+ free(ctx->abs_mnt_point); -+ ctx->abs_mnt_point = (char*)NULL; - } - } - } -diff --git a/src/ntfs-3g.c b/src/ntfs-3g.c -index 6ce89fef..4e0912ae 100644 ---- a/src/ntfs-3g.c -+++ b/src/ntfs-3g.c -@@ -4148,7 +4148,8 @@ int main(int argc, char *argv[]) - else { - ctx->abs_mnt_point = (char*)ntfs_malloc(PATH_MAX); - if (ctx->abs_mnt_point) { -- if (getcwd(ctx->abs_mnt_point, -+ if ((strlen(opts.mnt_point) < PATH_MAX) -+ && getcwd(ctx->abs_mnt_point, - PATH_MAX - strlen(opts.mnt_point) - 1)) { - strcat(ctx->abs_mnt_point, "/"); - strcat(ctx->abs_mnt_point, opts.mnt_point); -@@ -4156,6 +4157,9 @@ int main(int argc, char *argv[]) - /* Solaris also wants the absolute mount point */ - opts.mnt_point = ctx->abs_mnt_point; - #endif /* defined(__sun) && defined (__SVR4) */ -+ } else { -+ free(ctx->abs_mnt_point); -+ ctx->abs_mnt_point = (char*)NULL; - } - } - } --- -2.20.1 - diff --git a/buildroot/package/ntfs-3g/ntfs-3g.hash b/buildroot/package/ntfs-3g/ntfs-3g.hash index 63c999f25..668e11a80 100644 --- a/buildroot/package/ntfs-3g/ntfs-3g.hash +++ b/buildroot/package/ntfs-3g/ntfs-3g.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 3e5a021d7b761261836dcb305370af299793eedbded731df3d6943802e1262d5 ntfs-3g_ntfsprogs-2017.3.23.tgz +sha256 55b883aa05d94b2ec746ef3966cb41e66bed6db99f22ddd41d1b8b94bb202efb ntfs-3g_ntfsprogs-2021.8.22.tgz sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING sha256 d7bf9d064ac3e5840f9dd02422b7eeec4f1fd03f37fadbd043602be5e882304f COPYING.LIB diff --git a/buildroot/package/ntfs-3g/ntfs-3g.mk b/buildroot/package/ntfs-3g/ntfs-3g.mk index 1a388af76..21f7cfc46 100644 --- a/buildroot/package/ntfs-3g/ntfs-3g.mk +++ b/buildroot/package/ntfs-3g/ntfs-3g.mk @@ -4,7 +4,7 @@ # ################################################################################ -NTFS_3G_VERSION = 2017.3.23 +NTFS_3G_VERSION = 2021.8.22 NTFS_3G_SOURCE = ntfs-3g_ntfsprogs-$(NTFS_3G_VERSION).tgz NTFS_3G_SITE = http://tuxera.com/opensource NTFS_3G_CONF_OPTS = --disable-ldconfig @@ -14,9 +14,6 @@ NTFS_3G_LICENSE = GPL-2.0+, LGPL-2.0+ NTFS_3G_LICENSE_FILES = COPYING COPYING.LIB NTFS_3G_CPE_ID_VENDOR = tuxera -# 0001-Fixed-reporting-an-error-when-failed-to-build-the-mo.patch -NTFS_3G_IGNORE_CVES += CVE-2019-9755 - ifeq ($(BR2_PACKAGE_LIBFUSE),y) NTFS_3G_CONF_OPTS += --with-fuse=external NTFS_3G_DEPENDENCIES += libfuse diff --git a/buildroot/package/openjdk-bin/openjdk-bin.hash b/buildroot/package/openjdk-bin/openjdk-bin.hash index a08aa16d4..696371eb5 100644 --- a/buildroot/package/openjdk-bin/openjdk-bin.hash +++ b/buildroot/package/openjdk-bin/openjdk-bin.hash @@ -1,8 +1,8 @@ -# From https://github.com/AdoptOpenJDK/openjdk14-binaries/releases -sha256 7d5ee7e06909b8a99c0d029f512f67b092597aa5b0e78c109bd59405bbfa74fe OpenJDK14U-jdk_x64_linux_hotspot_14.0.2_12.tar.gz +# From https://github.com/AdoptOpenJDK/openjdk16-binaries/releases +sha256 323d6d7474a359a28eff7ddd0df8e65bd61554a8ed12ef42fd9365349e573c2c OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz -# From https://github.com/AdoptOpenJDK/openjdk11-binaries/releases -sha256 e99b98f851541202ab64401594901e583b764e368814320eba442095251e78cb OpenJDK11U-jdk_x64_linux_hotspot_11.0.11_9.tar.gz +# From https://github.com/adoptium/temurin11-binaries/releases +sha256 8770f600fc3b89bf331213c7aa21f8eedd9ca5d96036d1cd48cb2748a3dbefd2 OpenJDK11U-jdk_x64_linux_hotspot_11.0.12_7.tar.gz # Locally calculated sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 legal/java.prefs/LICENSE diff --git a/buildroot/package/openjdk-bin/openjdk-bin.mk b/buildroot/package/openjdk-bin/openjdk-bin.mk index 61e7ecac4..a34ba355b 100644 --- a/buildroot/package/openjdk-bin/openjdk-bin.mk +++ b/buildroot/package/openjdk-bin/openjdk-bin.mk @@ -5,18 +5,16 @@ ################################################################################ ifeq ($(BR2_OPENJDK_VERSION_LATEST),y) -HOST_OPENJDK_BIN_VERSION_MAJOR = 14.0.2 -HOST_OPENJDK_BIN_VERSION_MINOR = 12 -HOST_OPENJDK_BIN_VERSION = $(HOST_OPENJDK_BIN_VERSION_MAJOR)_$(HOST_OPENJDK_BIN_VERSION_MINOR) -HOST_OPENJDK_BIN_SOURCE = OpenJDK14U-jdk_x64_linux_hotspot_$(HOST_OPENJDK_BIN_VERSION).tar.gz -HOST_OPENJDK_BIN_SITE = https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-$(HOST_OPENJDK_BIN_VERSION_MAJOR)%2B$(HOST_OPENJDK_BIN_VERSION_MINOR) +HOST_OPENJDK_BIN_VERSION_MAJOR = 16 +HOST_OPENJDK_BIN_VERSION_MINOR = 0.2_7 else -HOST_OPENJDK_BIN_VERSION_MAJOR = 11.0.11 -HOST_OPENJDK_BIN_VERSION_MINOR = 9 -HOST_OPENJDK_BIN_VERSION = $(HOST_OPENJDK_BIN_VERSION_MAJOR)_$(HOST_OPENJDK_BIN_VERSION_MINOR) -HOST_OPENJDK_BIN_SOURCE = OpenJDK11U-jdk_x64_linux_hotspot_$(HOST_OPENJDK_BIN_VERSION).tar.gz -HOST_OPENJDK_BIN_SITE = https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-$(HOST_OPENJDK_BIN_VERSION_MAJOR)%2B$(HOST_OPENJDK_BIN_VERSION_MINOR) +HOST_OPENJDK_BIN_VERSION_MAJOR = 11 +HOST_OPENJDK_BIN_VERSION_MINOR = 0.12_7 endif +HOST_OPENJDK_BIN_VERSION = $(HOST_OPENJDK_BIN_VERSION_MAJOR).$(HOST_OPENJDK_BIN_VERSION_MINOR) +HOST_OPENJDK_BIN_SOURCE = OpenJDK$(HOST_OPENJDK_BIN_VERSION_MAJOR)U-jdk_x64_linux_hotspot_$(HOST_OPENJDK_BIN_VERSION).tar.gz +HOST_OPENJDK_BIN_SITE = https://github.com/adoptium/temurin$(HOST_OPENJDK_BIN_VERSION_MAJOR)-binaries/releases/download/jdk-$(subst _,%2B,$(HOST_OPENJDK_BIN_VERSION)) + HOST_OPENJDK_BIN_LICENSE = GPL-2.0+ with exception HOST_OPENJDK_BIN_LICENSE_FILES = legal/java.prefs/LICENSE legal/java.prefs/ASSEMBLY_EXCEPTION diff --git a/buildroot/package/openjdk/14.0.2+12/0001-fix-gcc-10-support.patch b/buildroot/package/openjdk/14.0.2+12/0001-fix-gcc-10-support.patch deleted file mode 100644 index 5364c4725..000000000 --- a/buildroot/package/openjdk/14.0.2+12/0001-fix-gcc-10-support.patch +++ /dev/null @@ -1,119 +0,0 @@ -From 58911e9de888aece29f491995a8b8a31f7d6b424 Mon Sep 17 00:00:00 2001 -From: Patrick Zhang -Date: Wed, 05 Feb 2020 17:14:15 -0700 -Subject: [PATCH] fix gcc 10 support - -This patch fixes the "multiple definition" link errors with GCC10 due to -GCC10 setting -fno-common by default. - -This is a combination of the following upstream commits: - - https://hg.openjdk.java.net/jdk/jdk/rev/8e6fa89397ca - - https://hg.openjdk.java.net/jdk/jdk/rev/6925fca95959 - - https://hg.openjdk.java.net/jdk/jdk/rev/9e54ea7d9cd9 - -Signed-off-by: Patrick Zhang -Signed-off-by: Adam Duskett ---- - src/java.base/unix/native/libjava/childproc.c | 1 + - src/java.base/unix/native/libjava/childproc.h | 2 +- - .../share/native/libj2gss/NativeFunc.c | 3 +++ - .../share/native/libj2gss/NativeFunc.h | 2 +- - src/jdk.sctp/unix/native/libsctp/Sctp.h | 12 ++++++------ - src/jdk.sctp/unix/native/libsctp/SctpNet.c | 7 +++++++ - 6 files changed, 19 insertions(+), 8 deletions(-) - -diff --git a/src/java.base/unix/native/libjava/childproc.c b/src/java.base/unix/native/libjava/childproc.c -index 811aaeac5..16480bfbf 100644 ---- a/src/java.base/unix/native/libjava/childproc.c -+++ b/src/java.base/unix/native/libjava/childproc.c -@@ -34,6 +34,7 @@ - - #include "childproc.h" - -+const char * const *parentPathv; - - ssize_t - restartableWrite(int fd, const void *buf, size_t count) -diff --git a/src/java.base/unix/native/libjava/childproc.h b/src/java.base/unix/native/libjava/childproc.h -index 091150930..d57e44b6e 100644 ---- a/src/java.base/unix/native/libjava/childproc.h -+++ b/src/java.base/unix/native/libjava/childproc.h -@@ -126,7 +126,7 @@ typedef struct _SpawnInfo { - * The cached and split version of the JDK's effective PATH. - * (We don't support putenv("PATH=...") in native code) - */ --const char * const *parentPathv; -+extern const char * const *parentPathv; - - ssize_t restartableWrite(int fd, const void *buf, size_t count); - int restartableDup2(int fd_from, int fd_to); -diff --git a/src/java.security.jgss/share/native/libj2gss/NativeFunc.c b/src/java.security.jgss/share/native/libj2gss/NativeFunc.c -index da7bc0445..5941f7b5a 100644 ---- a/src/java.security.jgss/share/native/libj2gss/NativeFunc.c -+++ b/src/java.security.jgss/share/native/libj2gss/NativeFunc.c -@@ -27,6 +27,9 @@ - #include - #include "NativeFunc.h" - -+/* global GSS function table */ -+GSS_FUNCTION_TABLE_PTR ftab; -+ - /* standard GSS method names (ordering is from mapfile) */ - static const char RELEASE_NAME[] = "gss_release_name"; - static const char IMPORT_NAME[] = "gss_import_name"; -diff --git a/src/java.security.jgss/share/native/libj2gss/NativeFunc.h b/src/java.security.jgss/share/native/libj2gss/NativeFunc.h -index 82914387c..e4a4981a3 100644 ---- a/src/java.security.jgss/share/native/libj2gss/NativeFunc.h -+++ b/src/java.security.jgss/share/native/libj2gss/NativeFunc.h -@@ -277,6 +277,6 @@ typedef struct GSS_FUNCTION_TABLE { - typedef GSS_FUNCTION_TABLE *GSS_FUNCTION_TABLE_PTR; - - /* global GSS function table */ --GSS_FUNCTION_TABLE_PTR ftab; -+extern GSS_FUNCTION_TABLE_PTR ftab; - - #endif -diff --git a/src/jdk.sctp/unix/native/libsctp/Sctp.h b/src/jdk.sctp/unix/native/libsctp/Sctp.h -index cc1367f78..46b07db0a 100644 ---- a/src/jdk.sctp/unix/native/libsctp/Sctp.h -+++ b/src/jdk.sctp/unix/native/libsctp/Sctp.h -@@ -322,12 +322,12 @@ typedef int sctp_peeloff_func(int sock, sctp_assoc_t id); - - #endif /* __linux__ */ - --sctp_getladdrs_func* nio_sctp_getladdrs; --sctp_freeladdrs_func* nio_sctp_freeladdrs; --sctp_getpaddrs_func* nio_sctp_getpaddrs; --sctp_freepaddrs_func* nio_sctp_freepaddrs; --sctp_bindx_func* nio_sctp_bindx; --sctp_peeloff_func* nio_sctp_peeloff; -+extern sctp_getladdrs_func* nio_sctp_getladdrs; -+extern sctp_freeladdrs_func* nio_sctp_freeladdrs; -+extern sctp_getpaddrs_func* nio_sctp_getpaddrs; -+extern sctp_freepaddrs_func* nio_sctp_freepaddrs; -+extern sctp_bindx_func* nio_sctp_bindx; -+extern sctp_peeloff_func* nio_sctp_peeloff; - - jboolean loadSocketExtensionFuncs(JNIEnv* env); - -diff --git a/src/jdk.sctp/unix/native/libsctp/SctpNet.c b/src/jdk.sctp/unix/native/libsctp/SctpNet.c -index d40c15aa3..ab9b6e093 100644 ---- a/src/jdk.sctp/unix/native/libsctp/SctpNet.c -+++ b/src/jdk.sctp/unix/native/libsctp/SctpNet.c -@@ -43,6 +43,13 @@ static jmethodID isaCtrID = 0; - static const char* nativeSctpLib = "libsctp.so.1"; - static jboolean funcsLoaded = JNI_FALSE; - -+sctp_getladdrs_func* nio_sctp_getladdrs; -+sctp_freeladdrs_func* nio_sctp_freeladdrs; -+sctp_getpaddrs_func* nio_sctp_getpaddrs; -+sctp_freepaddrs_func* nio_sctp_freepaddrs; -+sctp_bindx_func* nio_sctp_bindx; -+sctp_peeloff_func* nio_sctp_peeloff; -+ - JNIEXPORT jint JNICALL DEF_JNI_OnLoad - (JavaVM *vm, void *reserved) { - return JNI_VERSION_1_2; --- -2.26.2 - diff --git a/buildroot/package/openjdk/Config.in b/buildroot/package/openjdk/Config.in index 1b60d80dc..a0d04e572 100644 --- a/buildroot/package/openjdk/Config.in +++ b/buildroot/package/openjdk/Config.in @@ -20,7 +20,7 @@ config BR2_PACKAGE_OPENJDK depends on !BR2_STATIC_LIBS # glibc depends on BR2_INSTALL_LIBSTDCPP # cups depends on BR2_TOOLCHAIN_HAS_THREADS # alsa-lib, cups, libusb - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb, C++14 for OpenJDK16 depends on BR2_TOOLCHAIN_USES_GLIBC depends on BR2_USE_MMU # cups depends on BR2_PACKAGE_XORG7 @@ -59,7 +59,11 @@ config BR2_OPENJDK_VERSION_LTS bool "LTS (OpenJDK 11)" config BR2_OPENJDK_VERSION_LATEST - bool "latest (OpenJDK 14)" + bool "latest (OpenJDK 16)" + depends on BR2_HOST_GCC_AT_LEAST_4_9 # C++14 + +comment "OpenJDK 16 needs a host gcc >= 4.9" + depends on !BR2_HOST_GCC_AT_LEAST_4_9 # C++14 endchoice diff --git a/buildroot/package/openjdk/openjdk.hash b/buildroot/package/openjdk/openjdk.hash index 05a0c12c4..2b4a2c7a6 100644 --- a/buildroot/package/openjdk/openjdk.hash +++ b/buildroot/package/openjdk/openjdk.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 dfb3607f1b675458f29a185a40f1dbbf896439cf33b3aa0f3d89df297e604935 jdk-14.0.2+12.tar.gz -sha256 c8b9d92028f6e46d94bde65ebce3b593fdcc0d1ca1fa00482f38815ed37c92a1 jdk-11.0.11+9.tar.gz +sha256 b4a0e71e41a11175e8a7c1dba86ed5b0aa878413158c8d48813db1b64ac9536c openjdk-16.0.2+7.tar.gz +sha256 9a37c9641b45f5c51fe19c1ccae141daeb5dcdbd59fa2f56e7dea7bf09484bec openjdk-11.0.12+7.tar.gz sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 LICENSE diff --git a/buildroot/package/openjdk/openjdk.mk b/buildroot/package/openjdk/openjdk.mk index 6ed5085fd..aac5c87e7 100644 --- a/buildroot/package/openjdk/openjdk.mk +++ b/buildroot/package/openjdk/openjdk.mk @@ -5,18 +5,14 @@ ################################################################################ ifeq ($(BR2_OPENJDK_VERSION_LATEST),y) -OPENJDK_VERSION_MAJOR = 14.0.2 -OPENJDK_VERSION_MINOR = 12 -OPENJDK_VERSION = $(OPENJDK_VERSION_MAJOR)+$(OPENJDK_VERSION_MINOR) -OPENJDK_SOURCE = jdk-$(OPENJDK_VERSION).tar.gz -OPENJDK_SITE = https://hg.openjdk.java.net/jdk-updates/jdk14u/archive +OPENJDK_VERSION_MAJOR = 16 +OPENJDK_VERSION_MINOR = 0.2+7 else -OPENJDK_VERSION_MAJOR = 11.0.11 -OPENJDK_VERSION_MINOR = 9 -OPENJDK_VERSION = $(OPENJDK_VERSION_MAJOR)+$(OPENJDK_VERSION_MINOR) -OPENJDK_SOURCE = jdk-$(OPENJDK_VERSION).tar.gz -OPENJDK_SITE = https://hg.openjdk.java.net/jdk-updates/jdk11u/archive +OPENJDK_VERSION_MAJOR = 11 +OPENJDK_VERSION_MINOR = 0.12+7 endif +OPENJDK_VERSION = $(OPENJDK_VERSION_MAJOR).$(OPENJDK_VERSION_MINOR) +OPENJDK_SITE = $(call github,openjdk,jdk$(OPENJDK_VERSION_MAJOR)u,jdk-$(OPENJDK_VERSION)) OPENJDK_LICENSE = GPL-2.0+ with exception OPENJDK_LICENSE_FILES = LICENSE diff --git a/buildroot/package/openldap/Config.in b/buildroot/package/openldap/Config.in index bd39d0d02..7a0b2f4b8 100644 --- a/buildroot/package/openldap/Config.in +++ b/buildroot/package/openldap/Config.in @@ -8,7 +8,7 @@ config BR2_PACKAGE_OPENLDAP This only installs client-side support. - http://www.openldap.org/ + https://www.openldap.org/ if BR2_PACKAGE_OPENLDAP diff --git a/buildroot/package/openldap/openldap.hash b/buildroot/package/openldap/openldap.hash index 8ce50d613..71092c93d 100644 --- a/buildroot/package/openldap/openldap.hash +++ b/buildroot/package/openldap/openldap.hash @@ -1,7 +1,7 @@ -# From https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.58.md5 -md5 c203d735ba69976e5b28dc39006f29b5 openldap-2.4.58.tgz -# From https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.58.sha1 -sha1 875416827be3ad63f20004510a354db0aaceb2ed openldap-2.4.58.tgz +# From https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.59.md5 +md5 6036a03b3a67b4a1fe1246e0a2c7265a openldap-2.4.59.tgz +# From https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.59.sha1 +sha1 b154d06bbf40fafafb34fffc4b116946d931efef openldap-2.4.59.tgz # Locally computed -sha256 57b59254be15d0bf6a9ab3d514c1c05777b02123291533134a87c94468f8f47b openldap-2.4.58.tgz +sha256 99f37d6747d88206c470067eda624d5e48c1011e943ec0ab217bae8712e22f34 openldap-2.4.59.tgz sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 LICENSE diff --git a/buildroot/package/openldap/openldap.mk b/buildroot/package/openldap/openldap.mk index 3b35b4daa..b2c9bd2ff 100644 --- a/buildroot/package/openldap/openldap.mk +++ b/buildroot/package/openldap/openldap.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENLDAP_VERSION = 2.4.58 +OPENLDAP_VERSION = 2.4.59 OPENLDAP_SOURCE = openldap-$(OPENLDAP_VERSION).tgz OPENLDAP_SITE = https://www.openldap.org/software/download/OpenLDAP/openldap-release OPENLDAP_LICENSE = OpenLDAP Public License diff --git a/buildroot/package/openssh/openssh.hash b/buildroot/package/openssh/openssh.hash index 0dcd725de..aab3dba09 100644 --- a/buildroot/package/openssh/openssh.hash +++ b/buildroot/package/openssh/openssh.hash @@ -1,4 +1,4 @@ -# From https://www.openssh.com/txt/release-8.6 (base64 encoded) -sha256 c3e6e4da1621762c850d03b47eed1e48dff4cc9608ddeb547202a234df8ed7ae openssh-8.6p1.tar.gz +# From https://www.openssh.com/txt/release-8.8 (base64 encoded) +sha256 4590890ea9bb9ace4f71ae331785a3a5823232435161960ed5fc86588f331fe9 openssh-8.8p1.tar.gz # Locally calculated sha256 432abf7480fb31473a6706627212913fc70032e3fb71b90fecb28ae26a2d741d LICENCE diff --git a/buildroot/package/openssh/openssh.mk b/buildroot/package/openssh/openssh.mk index 61b2c97cf..75c4a0128 100644 --- a/buildroot/package/openssh/openssh.mk +++ b/buildroot/package/openssh/openssh.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENSSH_VERSION_MAJOR = 8.6 +OPENSSH_VERSION_MAJOR = 8.8 OPENSSH_VERSION_MINOR = p1 OPENSSH_VERSION = $(OPENSSH_VERSION_MAJOR)$(OPENSSH_VERSION_MINOR) OPENSSH_CPE_ID_VERSION = $(OPENSSH_VERSION_MAJOR) diff --git a/buildroot/package/openssl/Config.in b/buildroot/package/openssl/Config.in index daf76e706..cf64240b3 100644 --- a/buildroot/package/openssl/Config.in +++ b/buildroot/package/openssl/Config.in @@ -40,6 +40,7 @@ source "package/libopenssl/Config.in" config BR2_PACKAGE_LIBRESSL bool "libressl" depends on !BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL + depends on BR2_TOOLCHAIN_HAS_THREADS # uClibc on noMMU doesn't provide __register_atfork() depends on !(BR2_TOOLCHAIN_USES_UCLIBC && !BR2_USE_MMU) help diff --git a/buildroot/package/php/php.hash b/buildroot/package/php/php.hash index 28ac6c5d6..d82c81a70 100644 --- a/buildroot/package/php/php.hash +++ b/buildroot/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 cea52313fcffe56343bcd3c66dbb23cd5507dc559cc2e3547cf8f5452e88a05d php-7.4.23.tar.xz +sha256 ff7658ee2f6d8af05b48c21146af5f502e121def4e76e862df5ec9fa06e98734 php-7.4.24.tar.xz # License file sha256 a188db807d711536f71e27b7d36879d63480f7994dc18adc08e624b3c5430fff LICENSE diff --git a/buildroot/package/php/php.mk b/buildroot/package/php/php.mk index 805030d88..30c3ee9ca 100644 --- a/buildroot/package/php/php.mk +++ b/buildroot/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 7.4.23 +PHP_VERSION = 7.4.24 PHP_SITE = http://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES diff --git a/buildroot/package/python-aioconsole/python-aioconsole.hash b/buildroot/package/python-aioconsole/python-aioconsole.hash index dea2216fc..45139a660 100644 --- a/buildroot/package/python-aioconsole/python-aioconsole.hash +++ b/buildroot/package/python-aioconsole/python-aioconsole.hash @@ -1,3 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aioconsole/json -md5 66d4b05e3bc75267daf0f773d839f62b aioconsole-0.3.1.tar.gz -sha256 7c038bb40b7690bf5be6b17154830b7bff25e7be1c02d8420a346c3efbd5d8e5 aioconsole-0.3.1.tar.gz +md5 b8cbcb6e00d8e535256526dfe4f27db3 aioconsole-0.3.2.tar.gz +sha256 9355b36d41d5fbdd3dbb01510deb2b985b508b2ebcd5b8bd85af61a707e2f6c8 aioconsole-0.3.2.tar.gz +# Locally computed sha256 checksums +sha256 fe3eea6c599e23a00c08c5f5cb2320c30adc8f8687db5fcec9b79a662c53ff6b LICENSE diff --git a/buildroot/package/python-aioconsole/python-aioconsole.mk b/buildroot/package/python-aioconsole/python-aioconsole.mk index b32d2bea0..75ea3c2a2 100644 --- a/buildroot/package/python-aioconsole/python-aioconsole.mk +++ b/buildroot/package/python-aioconsole/python-aioconsole.mk @@ -4,10 +4,11 @@ # ################################################################################ -PYTHON_AIOCONSOLE_VERSION = 0.3.1 +PYTHON_AIOCONSOLE_VERSION = 0.3.2 PYTHON_AIOCONSOLE_SOURCE = aioconsole-$(PYTHON_AIOCONSOLE_VERSION).tar.gz -PYTHON_AIOCONSOLE_SITE = https://files.pythonhosted.org/packages/5a/12/fce04ddc0a8ebd6482e5ec293d8bda47c9e05c82826b061f7b73523b8601 +PYTHON_AIOCONSOLE_SITE = https://files.pythonhosted.org/packages/7a/b2/747ab3cb965596cd84c5159941613d901d8771acad3c51c4f5da362aa9f0 PYTHON_AIOCONSOLE_SETUP_TYPE = setuptools PYTHON_AIOCONSOLE_LICENSE = GPL-3.0 +PYTHON_AIOCONSOLE_LICENSE_FILES = LICENSE $(eval $(python-package)) diff --git a/buildroot/package/python-cffi/python-cffi.hash b/buildroot/package/python-cffi/python-cffi.hash index 37676f266..8ab672a56 100644 --- a/buildroot/package/python-cffi/python-cffi.hash +++ b/buildroot/package/python-cffi/python-cffi.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/cffi/json -md5 3cc2f1daf62dd66eda79b4d6281cebfc cffi-1.14.2.tar.gz -sha256 ae8f34d50af2c2154035984b8b5fc5d9ed63f32fe615646ab435b05b132ca91b cffi-1.14.2.tar.gz +md5 5c118a18ea897df164dbff67a32876fc cffi-1.14.6.tar.gz +sha256 c9a875ce9d7fe32887784274dd533c57909b7b1dcadcc128a2ac21331a9765dd cffi-1.14.6.tar.gz # Locally computed sha256 checksums sha256 04b80f5b077bbed68808cfebadeb5e3523f2a8c9a96495c587bd96df1eac2a33 LICENSE diff --git a/buildroot/package/python-cffi/python-cffi.mk b/buildroot/package/python-cffi/python-cffi.mk index f882349fd..c2ddbcab1 100644 --- a/buildroot/package/python-cffi/python-cffi.mk +++ b/buildroot/package/python-cffi/python-cffi.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CFFI_VERSION = 1.14.2 +PYTHON_CFFI_VERSION = 1.14.6 PYTHON_CFFI_SOURCE = cffi-$(PYTHON_CFFI_VERSION).tar.gz -PYTHON_CFFI_SITE = https://files.pythonhosted.org/packages/f7/09/88bbe20b76ca76be052c366fe77aa5e3cd6e5f932766e5597fecdd95b2a8 +PYTHON_CFFI_SITE = https://files.pythonhosted.org/packages/2e/92/87bb61538d7e60da8a7ec247dc048f7671afe17016cd0008b3b710012804 PYTHON_CFFI_SETUP_TYPE = setuptools PYTHON_CFFI_DEPENDENCIES = host-pkgconf libffi PYTHON_CFFI_LICENSE = MIT diff --git a/buildroot/package/python-dateutil/python-dateutil.hash b/buildroot/package/python-dateutil/python-dateutil.hash index f3dc69f27..a52fb30a0 100644 --- a/buildroot/package/python-dateutil/python-dateutil.hash +++ b/buildroot/package/python-dateutil/python-dateutil.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/python-dateutil/json -md5 f2a1d4b680b297b367a974664ca3a4f6 python-dateutil-2.8.1.tar.gz -sha256 73ebfe9dbf22e832286dafa60473e4cd239f8592f699aa5adaf10050e6e1823c python-dateutil-2.8.1.tar.gz +md5 5970010bb72452344df3d76a10281b65 python-dateutil-2.8.2.tar.gz +sha256 0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86 python-dateutil-2.8.2.tar.gz # Locally computed sha256 checksums -sha256 ba00f51a0d92823b5a1cde27d8b5b9d2321e67ed8da9bc163eff96d5e17e577e LICENSE +sha256 ba00f51a0d92823b5a1cde27d8b5b9d2321e67ed8da9bc163eff96d5e17e577e LICENSE diff --git a/buildroot/package/python-dateutil/python-dateutil.mk b/buildroot/package/python-dateutil/python-dateutil.mk index 759261d2d..b75f510bc 100644 --- a/buildroot/package/python-dateutil/python-dateutil.mk +++ b/buildroot/package/python-dateutil/python-dateutil.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_DATEUTIL_VERSION = 2.8.1 -PYTHON_DATEUTIL_SITE = https://files.pythonhosted.org/packages/be/ed/5bbc91f03fa4c839c4c7360375da77f9659af5f7086b7a7bdda65771c8e0 +PYTHON_DATEUTIL_VERSION = 2.8.2 +PYTHON_DATEUTIL_SITE = https://files.pythonhosted.org/packages/4c/c4/13b4776ea2d76c115c1d1b84579f3764ee6d57204f6be27119f13a61d0a9 PYTHON_DATEUTIL_SETUP_TYPE = setuptools PYTHON_DATEUTIL_LICENSE = BSD-3-Clause PYTHON_DATEUTIL_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-django/python-django.hash b/buildroot/package/python-django/python-django.hash index 2f5f96a50..ab89f0341 100644 --- a/buildroot/package/python-django/python-django.hash +++ b/buildroot/package/python-django/python-django.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/django/json -md5 46e306a5a775cace03a03d5a158ff767 Django-3.2.5.tar.gz -sha256 3da05fea54fdec2315b54a563d5b59f3b4e2b1e69c3a5841dda35019c01855cd Django-3.2.5.tar.gz +md5 2ade1eecca77640abbde6c4589da27dd Django-3.2.7.tar.gz +sha256 95b318319d6997bac3595517101ad9cc83fe5672ac498ba48d1a410f47afecd2 Django-3.2.7.tar.gz # Locally computed sha256 checksums sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/buildroot/package/python-django/python-django.mk b/buildroot/package/python-django/python-django.mk index 1603063be..0850aa135 100644 --- a/buildroot/package/python-django/python-django.mk +++ b/buildroot/package/python-django/python-django.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_DJANGO_VERSION = 3.2.5 +PYTHON_DJANGO_VERSION = 3.2.7 PYTHON_DJANGO_SOURCE = Django-$(PYTHON_DJANGO_VERSION).tar.gz # The official Django site has an unpractical URL -PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/95/3b/468fa33908feefac03c0a773bd73bb8a1ab1fb4ee06e9dd62d24981f4603 +PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/59/45/c6fbb3a206df0b7dc3e6e8fae738e042c63d4ddf828c6e1ba10d7417a1d9 PYTHON_DJANGO_LICENSE = BSD-3-Clause PYTHON_DJANGO_LICENSE_FILES = LICENSE PYTHON_DJANGO_CPE_ID_VENDOR = djangoproject diff --git a/buildroot/package/python-pip/0001-Don-t-split-git-references-on-unicode-separators.patch b/buildroot/package/python-pip/0001-Don-t-split-git-references-on-unicode-separators.patch new file mode 100644 index 000000000..0e591550d --- /dev/null +++ b/buildroot/package/python-pip/0001-Don-t-split-git-references-on-unicode-separators.patch @@ -0,0 +1,45 @@ +From 62300cf398faacdd0e490b0a1400dec2558612bf Mon Sep 17 00:00:00 2001 +From: Pradyun Gedam +Date: Sat, 24 Apr 2021 10:13:15 +0100 +Subject: [PATCH] Don't split git references on unicode separators + +Previously, maliciously formatted tags could be used to hijack a +commit-based pin. Using the fact that the split here allowed for +all of unicode's whitespace characters as separators -- which git allows +as a part of a tag name -- it is possible to force a different revision +to be installed; if an attacker gains access to the repository. + +This change stops splitting the string on unicode characters, by forcing +the splits to happen on newlines and ASCII spaces. + +(cherry picked from commit ca832b2836e0bffa7cf95589acdcd71230f5834e) +Signed-off-by: Peter Korsgaard +--- + src/pip/_internal/vcs/git.py | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/src/pip/_internal/vcs/git.py b/src/pip/_internal/vcs/git.py +index 7483303a9..d706064e7 100644 +--- a/src/pip/_internal/vcs/git.py ++++ b/src/pip/_internal/vcs/git.py +@@ -137,9 +137,15 @@ class Git(VersionControl): + output = cls.run_command(['show-ref', rev], cwd=dest, + show_stdout=False, on_returncode='ignore') + refs = {} +- for line in output.strip().splitlines(): ++ # NOTE: We do not use splitlines here since that would split on other ++ # unicode separators, which can be maliciously used to install a ++ # different revision. ++ for line in output.strip().split("\n"): ++ line = line.rstrip("\r") ++ if not line: ++ continue + try: +- sha, ref = line.split() ++ sha, ref = line.split(" ", maxsplit=2) + except ValueError: + # Include the offending line to simplify troubleshooting if + # this error ever occurs. +-- +2.20.1 + diff --git a/buildroot/package/python-pip/python-pip.mk b/buildroot/package/python-pip/python-pip.mk index f881a3ce5..43f550062 100644 --- a/buildroot/package/python-pip/python-pip.mk +++ b/buildroot/package/python-pip/python-pip.mk @@ -13,4 +13,7 @@ PYTHON_PIP_LICENSE_FILES = LICENSE.txt PYTHON_PIP_CPE_ID_VENDOR = pypa PYTHON_PIP_CPE_ID_PRODUCT = pip +#0001-Don-t-split-git-references-on-unicode-separators.patch +PYTHON_PIP_IGNORE_CVES += CVE-2021-3572 + $(eval $(python-package)) diff --git a/buildroot/package/python-texttable/python-texttable.hash b/buildroot/package/python-texttable/python-texttable.hash index a69e8ed46..a769e9177 100644 --- a/buildroot/package/python-texttable/python-texttable.hash +++ b/buildroot/package/python-texttable/python-texttable.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/texttable/json -md5 68e6b31d36f5c20221da7d5db3eca772 texttable-1.6.3.tar.gz -sha256 ce0faf21aa77d806bbff22b107cc22cce68dc9438f97a2df32c93e9afa4ce436 texttable-1.6.3.tar.gz +md5 15faadc07ba44d337cc1675ea6092a02 texttable-1.6.4.tar.gz +sha256 42ee7b9e15f7b225747c3fa08f43c5d6c83bc899f80ff9bae9319334824076e9 texttable-1.6.4.tar.gz # Locally computed sha256 checksums -sha256 4ba7bdab54504a3bc44eb33ecca873a26a63ab902822101a87bb46235da63594 LICENSE +sha256 4ba7bdab54504a3bc44eb33ecca873a26a63ab902822101a87bb46235da63594 LICENSE diff --git a/buildroot/package/python-texttable/python-texttable.mk b/buildroot/package/python-texttable/python-texttable.mk index 6af23917b..59df5f6ff 100644 --- a/buildroot/package/python-texttable/python-texttable.mk +++ b/buildroot/package/python-texttable/python-texttable.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TEXTTABLE_VERSION = 1.6.3 +PYTHON_TEXTTABLE_VERSION = 1.6.4 PYTHON_TEXTTABLE_SOURCE = texttable-$(PYTHON_TEXTTABLE_VERSION).tar.gz -PYTHON_TEXTTABLE_SITE = https://files.pythonhosted.org/packages/f5/be/716342325d6d6e05608e3a10e15f192f3723e454a25ce14bc9b9d1332772 +PYTHON_TEXTTABLE_SITE = https://files.pythonhosted.org/packages/d5/78/dbc2a5eab57a01fedaf975f2c16f04e76f09336dbeadb9994258aa0a2b1a PYTHON_TEXTTABLE_SETUP_TYPE = setuptools PYTHON_TEXTTABLE_LICENSE = MIT PYTHON_TEXTTABLE_LICENSE_FILES = LICENSE diff --git a/buildroot/package/python-urllib3/python-urllib3.hash b/buildroot/package/python-urllib3/python-urllib3.hash index 288d986e7..066bfb728 100644 --- a/buildroot/package/python-urllib3/python-urllib3.hash +++ b/buildroot/package/python-urllib3/python-urllib3.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/urllib3/json -md5 3a88ec3bcb761ca23df2c3583949be37 urllib3-1.26.6.tar.gz -sha256 f57b4c16c62fa2760b7e3d97c35b255512fb6b59a259730f36ba32ce9f8e342f urllib3-1.26.6.tar.gz +md5 e0051a87a956e618a6bb514a07fa7773 urllib3-1.26.7.tar.gz +sha256 4987c65554f7a2dbf30c18fd48778ef124af6fab771a377103da0585e2336ece urllib3-1.26.7.tar.gz # Locally computed sha256 checksums sha256 c37bf186e27cf9dbe9619e55edfe3cea7b30091ceb3da63c7dacbe0e6d77907b LICENSE.txt diff --git a/buildroot/package/python-urllib3/python-urllib3.mk b/buildroot/package/python-urllib3/python-urllib3.mk index 775986d51..a1d22e023 100644 --- a/buildroot/package/python-urllib3/python-urllib3.mk +++ b/buildroot/package/python-urllib3/python-urllib3.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_URLLIB3_VERSION = 1.26.6 +PYTHON_URLLIB3_VERSION = 1.26.7 PYTHON_URLLIB3_SOURCE = urllib3-$(PYTHON_URLLIB3_VERSION).tar.gz -PYTHON_URLLIB3_SITE = https://files.pythonhosted.org/packages/4f/5a/597ef5911cb8919efe4d86206aa8b2658616d676a7088f0825ca08bd7cb8 +PYTHON_URLLIB3_SITE = https://files.pythonhosted.org/packages/80/be/3ee43b6c5757cabea19e75b8f46eaf05a2f5144107d7db48c7cf3a864f73 PYTHON_URLLIB3_LICENSE = MIT PYTHON_URLLIB3_LICENSE_FILES = LICENSE.txt PYTHON_URLLIB3_CPE_ID_VENDOR = python diff --git a/buildroot/package/python-webob/python-webob.hash b/buildroot/package/python-webob/python-webob.hash index aab2f1d9e..a46c1dbc9 100644 --- a/buildroot/package/python-webob/python-webob.hash +++ b/buildroot/package/python-webob/python-webob.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/webob/json -md5 dc3cc8c317d4acd03a6fd97cb0a9121a WebOb-1.8.6.tar.gz -sha256 aa3a917ed752ba3e0b242234b2a373f9c4e2a75d35291dcbe977649bd21fd108 WebOb-1.8.6.tar.gz +md5 10191c69fa5a2c00f3b9abfb8937b415 WebOb-1.8.7.tar.gz +sha256 b64ef5141be559cfade448f044fa45c2260351edcb6a8ef6b7e00c7dcef0c323 WebOb-1.8.7.tar.gz # Locally computed sha256 checksums sha256 27bc4919e7e9e6b6cda40644517ca74d32203e32fba89ef832aba1ed93e457b3 docs/license.txt diff --git a/buildroot/package/python-webob/python-webob.mk b/buildroot/package/python-webob/python-webob.mk index 051c11753..11ba10447 100644 --- a/buildroot/package/python-webob/python-webob.mk +++ b/buildroot/package/python-webob/python-webob.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_WEBOB_VERSION = 1.8.6 +PYTHON_WEBOB_VERSION = 1.8.7 PYTHON_WEBOB_SOURCE = WebOb-$(PYTHON_WEBOB_VERSION).tar.gz -PYTHON_WEBOB_SITE = https://files.pythonhosted.org/packages/2a/32/5f3f43d0784bdd9392db0cb98434d7cd23a0d8a420c4d243ad4cb8517f2a +PYTHON_WEBOB_SITE = https://files.pythonhosted.org/packages/c7/45/ee5f034fb4ebe3236fa49e5a4fcbc54444dd22ecf33079cf56f9606d479d PYTHON_WEBOB_SETUP_TYPE = setuptools PYTHON_WEBOB_LICENSE = MIT PYTHON_WEBOB_LICENSE_FILES = docs/license.txt diff --git a/buildroot/package/qt5/qt5location/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch b/buildroot/package/qt5/qt5location/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch new file mode 100644 index 000000000..0894af9ce --- /dev/null +++ b/buildroot/package/qt5/qt5location/0001-3rdparty-mapbox-gl-native-fix-musl-compile-pthread_g.patch @@ -0,0 +1,47 @@ +From acf752757ee4bf2913289ee1142f4968fdb22a4a Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Wed, 15 Sep 2021 23:05:52 +0200 +Subject: [PATCH] 3rdparty: mapbox-gl-native: fix musl compile + (pthread_getname_np) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +- pthread_getname_np not available with musl libc (patch inspired/ported + from [1]) + +Fixes: + + platform/default/thread.cpp: In function ‘std::string mbgl::platform::getCurrentThreadName()’: + platform/default/thread.cpp:14:5: error: ‘pthread_getname_np’ was not declared in this scope; did you mean ‘pthread_setname_np’? + 14 | pthread_getname_np(pthread_self(), name, sizeof(name)); + | ^~~~~~~~~~~~~~~~~~ + | pthread_setname_np + +[1] https://github.com/void-linux/void-packages/blob/e64dd67f43c409d2b2db08214084e842d92ad620/srcpkgs/qt5/patches/0014-musl-set_thread_name_np.patch + +Signed-off-by: Peter Seiderer +[yann.morin.1998@free.fr: add uClibc] +Signed-off-by: Yann E. MORIN +--- + src/3rdparty/mapbox-gl-native/platform/default/thread.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp b/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp +index c7c79b4..3f135eb 100644 +--- a/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp ++++ b/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp +@@ -11,8 +11,9 @@ namespace platform { + + std::string getCurrentThreadName() { + char name[32] = "unknown"; ++#if defined(__GLIBC__) || defined(__UCLIBC__) + pthread_getname_np(pthread_self(), name, sizeof(name)); +- ++#endif + return name; + } + +-- +2.33.0 + diff --git a/buildroot/package/redis/redis.hash b/buildroot/package/redis/redis.hash index d736c0948..344ca4e0a 100644 --- a/buildroot/package/redis/redis.hash +++ b/buildroot/package/redis/redis.hash @@ -1,5 +1,5 @@ # From https://github.com/redis/redis-hashes/blob/master/README -sha256 4bc295264a95bc94423c162a9eee66135a24a51eefe5f53f18fc9bde5c3a9f74 redis-6.0.15.tar.gz +sha256 3639bbf29aca1a1670de1ab2ce224d6511c63969e7e590d3cdf8f7888184fa19 redis-6.0.16.tar.gz # Locally calculated sha256 97f0a15b7bbae580d2609dad2e11f1956ae167be296ab60f4691ab9c30ee9828 COPYING diff --git a/buildroot/package/redis/redis.mk b/buildroot/package/redis/redis.mk index f66397b21..8fac940ec 100644 --- a/buildroot/package/redis/redis.mk +++ b/buildroot/package/redis/redis.mk @@ -4,7 +4,7 @@ # ################################################################################ -REDIS_VERSION = 6.0.15 +REDIS_VERSION = 6.0.16 REDIS_SITE = http://download.redis.io/releases REDIS_LICENSE = BSD-3-Clause (core); MIT and BSD family licenses (Bundled components) REDIS_LICENSE_FILES = COPYING diff --git a/buildroot/package/refpolicy/refpolicy.mk b/buildroot/package/refpolicy/refpolicy.mk index 1180f0d38..ecd8cf226 100644 --- a/buildroot/package/refpolicy/refpolicy.mk +++ b/buildroot/package/refpolicy/refpolicy.mk @@ -14,7 +14,8 @@ REFPOLICY_DEPENDENCIES = \ host-policycoreutils \ host-python3 \ host-setools \ - host-gawk + host-gawk \ + host-libxml2 ifeq ($(BR2_PACKAGE_REFPOLICY_CUSTOM_GIT),y) REFPOLICY_VERSION = $(call qstrip,$(BR2_PACKAGE_REFPOLICY_CUSTOM_REPO_VERSION)) @@ -30,6 +31,7 @@ endif # Cannot use multiple threads to build the reference policy REFPOLICY_MAKE = \ PYTHON=$(HOST_DIR)/usr/bin/python3 \ + XMLLINT=$(LIBXML2_HOST_BINARY) \ TEST_TOOLCHAIN=$(HOST_DIR) \ $(TARGET_MAKE_ENV) \ $(MAKE1) diff --git a/buildroot/package/ripgrep/ripgrep.mk b/buildroot/package/ripgrep/ripgrep.mk index 313f73624..8bc80dd20 100644 --- a/buildroot/package/ripgrep/ripgrep.mk +++ b/buildroot/package/ripgrep/ripgrep.mk @@ -10,6 +10,9 @@ RIPGREP_LICENSE = MIT RIPGREP_LICENSE_FILES = LICENSE-MIT RIPGREP_CPE_ID_VENDOR = ripgrep_project +# CVE only impacts ripgrep on Windows +RIPGREP_IGNORE_CVES += CVE-2021-3013 + RIPGREP_DEPENDENCIES = host-rustc RIPGREP_CARGO_ENV = CARGO_HOME=$(HOST_DIR)/share/cargo diff --git a/buildroot/package/runc/Config.in b/buildroot/package/runc/Config.in index f181ee334..66203896a 100644 --- a/buildroot/package/runc/Config.in +++ b/buildroot/package/runc/Config.in @@ -13,4 +13,4 @@ config BR2_PACKAGE_RUNC comment "runc needs a glibc or musl toolchain w/ threads" depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS && \ BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAN_USES_UCLIBC + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_USES_UCLIBC diff --git a/buildroot/package/runc/runc.hash b/buildroot/package/runc/runc.hash index 598bd3067..365beac21 100644 --- a/buildroot/package/runc/runc.hash +++ b/buildroot/package/runc/runc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 02dac7f1a0dcfe55dd9820df787adedf030060870354915e7bba86f8487ce93c runc-1.0.0-rc95.tar.gz +sha256 6c3cca4bbeb5d9b2f5e3c0c401c9d27bc8a5d2a0db8a2f6a06efd03ad3c38a33 runc-1.0.2.tar.gz sha256 552a739c3b25792263f731542238b92f6f8d07e9a488eae27e6c4690038a8243 LICENSE diff --git a/buildroot/package/runc/runc.mk b/buildroot/package/runc/runc.mk index 62b9f09bf..e77ef8111 100644 --- a/buildroot/package/runc/runc.mk +++ b/buildroot/package/runc/runc.mk @@ -4,15 +4,11 @@ # ################################################################################ -RUNC_VERSION_MAJOR = 1.0.0 -RUNC_VERSION_MINOR = rc95 -RUNC_VERSION = $(RUNC_VERSION_MAJOR)-$(RUNC_VERSION_MINOR) +RUNC_VERSION = 1.0.2 RUNC_SITE = $(call github,opencontainers,runc,v$(RUNC_VERSION)) RUNC_LICENSE = Apache-2.0 RUNC_LICENSE_FILES = LICENSE RUNC_CPE_ID_VENDOR = linuxfoundation -RUNC_CPE_ID_VERSION = $(RUNC_VERSION_MAJOR) -RUNC_CPE_ID_UPDATE = $(RUNC_VERSION_MINOR) RUNC_LDFLAGS = -X main.version=$(RUNC_VERSION) RUNC_TAGS = cgo static_build diff --git a/buildroot/package/sispmctl/0001-src-schedule.c-fix-build-with-gcc-4.8.patch b/buildroot/package/sispmctl/0001-src-schedule.c-fix-build-with-gcc-4.8.patch deleted file mode 100644 index 69dc31e35..000000000 --- a/buildroot/package/sispmctl/0001-src-schedule.c-fix-build-with-gcc-4.8.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 3ccbb67c71aa13b9a37a58363d37a18b8fdbf300 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 29 Oct 2020 13:36:00 +0100 -Subject: [PATCH] src/schedule.c: fix build with gcc 4.8 - -Fix the following build failure with gcc 4.8: - -schedule.c:19:2: error: 'for' loop initial declarations are only allowed in C99 mode - for (int i = 0; i < 4; ++i) { - ^ -schedule.c:19:2: note: use option -std=c99 or -std=gnu99 to compile your code -schedule.c: In function 'pms2_read_block': -schedule.c:39:2: error: 'for' loop initial declarations are only allowed in C99 mode - for (int i = 0; i < 4; ++i) { - ^ - -Fixes: - - http://autobuild.buildroot.org/results/079f1454121d38a83c49529c0f6cc8ed61fd5abb - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://sourceforge.net/p/sispmctl/git/merge-requests/1] ---- - src/schedule.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/schedule.c b/src/schedule.c -index 4dd908d..1725421 100644 ---- a/src/schedule.c -+++ b/src/schedule.c -@@ -15,8 +15,9 @@ - static unsigned char - *pms2_write_block(uint8_t action, uint32_t time, unsigned char *ptr) - { -+ int i; - *ptr++ = action; -- for (int i = 0; i < 4; ++i) { -+ for (i = 0; i < 4; ++i) { - *ptr++ = (uint8_t)time; - time >>= 8; - } -@@ -34,9 +35,10 @@ static unsigned char - static const unsigned char - *pms2_read_block(uint8_t *action, uint32_t *time, const unsigned char *ptr) - { -+ int i; - *action = *ptr++; - *time = 0; -- for (int i = 0; i < 4; ++i) { -+ for (i = 0; i < 4; ++i) { - *time >>= 8; - *time += (uint32_t)*ptr++ << 24; - } --- -2.28.0 - diff --git a/buildroot/package/sispmctl/sispmctl.hash b/buildroot/package/sispmctl/sispmctl.hash index 95129cec0..e22efcfbe 100644 --- a/buildroot/package/sispmctl/sispmctl.hash +++ b/buildroot/package/sispmctl/sispmctl.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 0f8391f7e95cbf1fb96a68686a1dcf1e16747b050ae1b8ff90653c99976068db sispmctl-4.8.tar.gz +sha256 6a9ec7125e8c01bb45d4a3b56f07fb41fc437020c8dcd8c0f29ebb98dc55a647 sispmctl-4.9.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/sispmctl/sispmctl.mk b/buildroot/package/sispmctl/sispmctl.mk index 3e4252a8d..b6e156c66 100644 --- a/buildroot/package/sispmctl/sispmctl.mk +++ b/buildroot/package/sispmctl/sispmctl.mk @@ -4,7 +4,7 @@ # ################################################################################ -SISPMCTL_VERSION = 4.8 +SISPMCTL_VERSION = 4.9 SISPMCTL_SITE = http://downloads.sourceforge.net/project/sispmctl/sispmctl/sispmctl-$(SISPMCTL_VERSION) SISPMCTL_LICENSE = GPL-2.0+ SISPMCTL_LICENSE_FILES = COPYING diff --git a/buildroot/package/squid/squid.hash b/buildroot/package/squid/squid.hash index 12a9e5d29..b1a8feb78 100644 --- a/buildroot/package/squid/squid.hash +++ b/buildroot/package/squid/squid.hash @@ -1,6 +1,6 @@ -# From http://www.squid-cache.org/Versions/v4/squid-4.15.tar.xz.asc -md5 a593de9dc888dfeca4f1f7db2cd7d3b9 squid-4.15.tar.xz -sha1 60bda34ba39657e2d870c8c1d2acece8a69c3075 squid-4.15.tar.xz +# From http://www.squid-cache.org/Versions/v4/squid-4.17.tar.xz.asc +md5 47b94b2d27516f1764c9d5dc1b9645e5 squid-4.17.tar.xz +sha1 f6bd15fabbd67b53a831fe9f67de3279868036c1 squid-4.17.tar.xz # Locally calculated -sha256 b693a4e5ab2811a8a854f60de0a62afbbf3a952bb1d047952c9ae01321f84a25 squid-4.15.tar.xz +sha256 cb928ac08c7c86b151b1c8f827abe1a84d83181a2a86e0d512286163e1e31418 squid-4.17.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/buildroot/package/squid/squid.mk b/buildroot/package/squid/squid.mk index b23a8d26e..e525f2cd9 100644 --- a/buildroot/package/squid/squid.mk +++ b/buildroot/package/squid/squid.mk @@ -4,7 +4,7 @@ # ################################################################################ -SQUID_VERSION = 4.15 +SQUID_VERSION = 4.17 SQUID_SOURCE = squid-$(SQUID_VERSION).tar.xz SQUID_SITE = http://www.squid-cache.org/Versions/v4 SQUID_LICENSE = GPL-2.0+ diff --git a/buildroot/package/strongswan/Config.in b/buildroot/package/strongswan/Config.in index 47c7107f5..368cd1ecc 100644 --- a/buildroot/package/strongswan/Config.in +++ b/buildroot/package/strongswan/Config.in @@ -75,6 +75,7 @@ config BR2_PACKAGE_STRONGSWAN_TNCCS_DYNAMIC config BR2_PACKAGE_STRONGSWAN_EAP bool "Enable EAP protocols" + select BR2_PACKAGE_GMP help Enable various EAP protocols: - mschapv2 diff --git a/buildroot/package/supervisor/Config.in b/buildroot/package/supervisor/Config.in index 623c3a836..7ca3cae13 100644 --- a/buildroot/package/supervisor/Config.in +++ b/buildroot/package/supervisor/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_SUPERVISOR bool "supervisor" depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 - select BR2_PACKAGE_PYTHON_MELD3 select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime dependency help A client/server system that allows its users to control a diff --git a/buildroot/package/tinycbor/0001-Enable-build-for-different-c-libraries.patch b/buildroot/package/tinycbor/0001-Enable-build-for-different-c-libraries.patch deleted file mode 100644 index 40f928860..000000000 --- a/buildroot/package/tinycbor/0001-Enable-build-for-different-c-libraries.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 085ca40781f7c39febe6d14fb7e5cba342e1804b Mon Sep 17 00:00:00 2001 -From: Ricardo Crudo -Date: Sat, 30 May 2020 22:03:01 +0200 -Subject: [PATCH] Enable build for different c libraries - -The open_memstream.c was using GLIBC macro definition to test if the -library is building on a Linux box. This makes impossible to build -tinycbor against other C libraries, as musl for example. - -Signed-off-by: Ricardo Crudo -[Retrieved from: -https://github.com/intel/tinycbor/commit/085ca40781f7c39febe6d14fb7e5cba342e1804b] -Signed-off-by: Fabrice Fontaine ---- - src/open_memstream.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/open_memstream.c b/src/open_memstream.c -index 18f3de8..3365378 100644 ---- a/src/open_memstream.c -+++ b/src/open_memstream.c -@@ -38,7 +38,7 @@ - #ifdef __APPLE__ - typedef int RetType; - typedef int LenType; --#elif __GLIBC__ -+#elif __linux__ - typedef ssize_t RetType; - typedef size_t LenType; - #else -@@ -101,7 +101,7 @@ FILE *open_memstream(char **bufptr, size_t *lenptr) - - #ifdef __APPLE__ - return funopen(b, NULL, write_to_buffer, NULL, close_buffer); --#elif __GLIBC__ -+#elif __linux__ - static const cookie_io_functions_t vtable = { - NULL, - write_to_buffer, diff --git a/buildroot/package/tinycbor/tinycbor.hash b/buildroot/package/tinycbor/tinycbor.hash index 8ff706bb6..29f0cfabf 100644 --- a/buildroot/package/tinycbor/tinycbor.hash +++ b/buildroot/package/tinycbor/tinycbor.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 956eb4b670ea4969eaee67395b5bb6437b153960385b77357d6692e979d1b12d tinycbor-0.5.3.tar.gz -sha256 3c6ba0b5bfa7830505301ffb336a17b0748e0d61c4d34216e9dc98f10e40395e LICENSE +sha256 e63668a71fd6d7abf1727dc31682ec7f107599a3c024a445c3e5da6af9328983 tinycbor-0.5.4.tar.gz +sha256 3c6ba0b5bfa7830505301ffb336a17b0748e0d61c4d34216e9dc98f10e40395e LICENSE diff --git a/buildroot/package/tinycbor/tinycbor.mk b/buildroot/package/tinycbor/tinycbor.mk index ef095ea67..476da6736 100644 --- a/buildroot/package/tinycbor/tinycbor.mk +++ b/buildroot/package/tinycbor/tinycbor.mk @@ -4,7 +4,7 @@ # ################################################################################ -TINYCBOR_VERSION = 0.5.3 +TINYCBOR_VERSION = 0.5.4 TINYCBOR_SITE = $(call github,intel,tinycbor,v$(TINYCBOR_VERSION)) TINYCBOR_LICENSE = MIT TINYCBOR_LICENSE_FILES = LICENSE diff --git a/buildroot/package/trace-cmd/trace-cmd.mk b/buildroot/package/trace-cmd/trace-cmd.mk index cd3fcb975..bc431e5dd 100644 --- a/buildroot/package/trace-cmd/trace-cmd.mk +++ b/buildroot/package/trace-cmd/trace-cmd.mk @@ -31,6 +31,11 @@ endif # redefining it on the command line causes build problems. TRACE_CMD_CFLAGS = $(filter-out -D_LARGEFILE64_SOURCE,$(TARGET_CFLAGS)) +# Sparc64 needs -fPIC +ifeq ($(BR2_sparc64),y) +TRACE_CMD_CFLAGS += -fPIC +endif + # trace-cmd use CPPFLAGS to add some extra flags. # But like for CFLAGS, $(TARGET_CPPFLAGS) contains _LARGEFILE64_SOURCE # that causes build problems. diff --git a/buildroot/package/uboot-tools/0005-tools-Makefile-fix-C-LD-FLAGS-with-CROSS_BUILD_TOOLS.patch b/buildroot/package/uboot-tools/0005-tools-Makefile-fix-C-LD-FLAGS-with-CROSS_BUILD_TOOLS.patch new file mode 100644 index 000000000..502458e21 --- /dev/null +++ b/buildroot/package/uboot-tools/0005-tools-Makefile-fix-C-LD-FLAGS-with-CROSS_BUILD_TOOLS.patch @@ -0,0 +1,34 @@ +From 3b89170333ef0fdfffee14751ce3e1d66d7dfa00 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 14 Sep 2021 19:08:02 +0200 +Subject: [PATCH] tools/Makefile: fix {C,LD}FLAGS with CROSS_BUILD_TOOLS + +When CROSS_BUILD_TOOLS is set, set KBUILD_HOST{CF,LD}FLAGS to +{C,LD}FLAGS otherwise CC will be used with HOST{C,LD}FLAGS which seems +wrong. + +It should be noted that, for an unknown reason, overriding +HOST{C,LD}FLAGS don't work. + +Signed-off-by: Fabrice Fontaine +--- + tools/Makefile | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/tools/Makefile b/tools/Makefile +index 4a86321f64..98bb92990d 100644 +--- a/tools/Makefile ++++ b/tools/Makefile +@@ -316,7 +316,8 @@ subdir- += env + + ifneq ($(CROSS_BUILD_TOOLS),) + override HOSTCC = $(CC) +-override HOSTCFLAGS = $(CFLAGS) ++override KBUILD_HOSTCFLAGS = $(CFLAGS) ++override KBUILD_HOSTLDFLAGS = $(LDFLAGS) + + quiet_cmd_crosstools_strip = STRIP $^ + cmd_crosstools_strip = $(STRIP) $^; touch $@ +-- +2.33.0 + diff --git a/buildroot/package/uclibc/0001-powerpc-fix-PIE-PIC-builds-with-newer-gcc-binutils-w.patch b/buildroot/package/uclibc/0001-powerpc-fix-PIE-PIC-builds-with-newer-gcc-binutils-w.patch deleted file mode 100644 index 040699df8..000000000 --- a/buildroot/package/uclibc/0001-powerpc-fix-PIE-PIC-builds-with-newer-gcc-binutils-w.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 6c95eccff5eb43c8c3ad865d3b1316b7952cc58e Mon Sep 17 00:00:00 2001 -From: Yann Sionneau -Date: Fri, 28 May 2021 08:59:58 +0200 -Subject: [PATCH] powerpc: fix PIE/PIC builds with newer gcc/binutils which use - secureplt by default - -This patch fixes segfault of all user space processes (including init, which caused a panic) on recent buildroot powerpc32 builds. - -The issue has been reported by Romain Naour in this thread: https://mailman.uclibc-ng.org/pipermail/devel/2021-May/002068.html - -Recent buildroot toolchain enables secure PLT in powerpc gcc. -The latter will then supply -msecure-plt to gas invocations by default. -Recent buildroot also enables PIE by default. - -For the secure PLT to work in PIC, the r30 register needs to point to the GOT. -Old "bss plt" was just a one-instruction-wide PLT slot, pointed-to by a R_PPC_JMP_SLOT relocation, which was written on-the-fly to contain a branch instruction to the correct address. It therefore had to stay writable+executable, which you generally want to avoid for security reasons. -New secure PLT only contains read-only code which loads the branch address from the writable GOT. - -Note: secure PLT without PIC does not need r30 to be set. Because offset between plt stub code and got is known at link-time. In this case the PLT entry looks like: -1009b3e0 <__uClibc_main@plt>: -1009b3e0: 3d 60 10 0e lis r11,4110 -1009b3e4: 81 6b 03 74 lwz r11,884(r11) -1009b3e8: 7d 69 03 a6 mtctr r11 -1009b3ec: 4e 80 04 20 bctr - -Whereas secure PLT with PIC - offset between plt and got is unknown at link-time - looks like this: -000af800 <00000000.plt_pic32.__uClibc_main>: - af800: 81 7e 03 80 lwz r11,896(r30) - af804: 7d 69 03 a6 mtctr r11 - af808: 4e 80 04 20 bctr - af80c: 60 00 00 00 nop - -Upstream status: Pending: -https://mailman.uclibc-ng.org/pipermail/devel/2021-May/002091.html - -Signed-off-by: Yann Sionneau -Signed-off-by: Romain Naour ---- - Rules.mak | 3 ++- - ldso/ldso/powerpc/dl-startup.h | 3 +++ - libc/sysdeps/linux/powerpc/crt1.S | 4 ++++ - 3 files changed, 9 insertions(+), 1 deletion(-) - -diff --git a/Rules.mak b/Rules.mak -index 10f88b3de..60ac59b85 100644 ---- a/Rules.mak -+++ b/Rules.mak -@@ -477,9 +477,10 @@ ifeq ($(TARGET_ARCH),powerpc) - PICFLAG:=-fpic - PIEFLAG_NAME:=-fpie - PPC_HAS_REL16:=$(shell printf "\t.text\n\taddis 11,30,_GLOBAL_OFFSET_TABLE_-.@ha\n" | $(CC) -c -x assembler -o /dev/null - 2> /dev/null && echo -n y || echo -n n) -+ PPC_HAS_SECUREPLT:=$(shell $(CC) --verbose 2>&1 | grep -- --enable-secureplt > /dev/null && echo -n y || echo -n n) -+ CPU_CFLAGS-$(PPC_HAS_SECUREPLT) += -DPPC_HAS_SECUREPLT - CPU_CFLAGS-$(PPC_HAS_REL16)+= -DHAVE_ASM_PPC_REL16 - CPU_CFLAGS-$(CONFIG_E500) += "-D__NO_MATH_INLINES" -- - endif - - ifeq ($(TARGET_ARCH),bfin) -diff --git a/ldso/ldso/powerpc/dl-startup.h b/ldso/ldso/powerpc/dl-startup.h -index 8b2a517e2..7749395eb 100644 ---- a/ldso/ldso/powerpc/dl-startup.h -+++ b/ldso/ldso/powerpc/dl-startup.h -@@ -25,6 +25,9 @@ __asm__( - #else - " bl _GLOBAL_OFFSET_TABLE_-4@local\n" /* Put our GOT pointer in r31, */ - " mflr 31\n" -+#endif -+#ifdef PPC_HAS_SECUREPLT -+ " mr 30,31\n" - #endif - " addi 1,1,16\n" /* Restore SP */ - " lwz 7,_dl_skip_args@got(31)\n" /* load EA of _dl_skip_args */ -diff --git a/libc/sysdeps/linux/powerpc/crt1.S b/libc/sysdeps/linux/powerpc/crt1.S -index 27bfc5a5a..3f5d056c0 100644 ---- a/libc/sysdeps/linux/powerpc/crt1.S -+++ b/libc/sysdeps/linux/powerpc/crt1.S -@@ -56,6 +56,10 @@ _start: - # else - bl _GLOBAL_OFFSET_TABLE_-4@local - mflr r31 -+# endif -+ /* in PIC/PIE, plt stubs need r30 to point to the GOT if using secure-plt */ -+# ifdef PPC_HAS_SECUREPLT -+ mr 30,31 - # endif - #endif - /* Set up the small data pointer in r13. */ --- -2.31.1 - diff --git a/buildroot/package/uclibc/uclibc.hash b/buildroot/package/uclibc/uclibc.hash index 2935785f4..25bbabf2e 100644 --- a/buildroot/package/uclibc/uclibc.hash +++ b/buildroot/package/uclibc/uclibc.hash @@ -1,4 +1,4 @@ -# From https://downloads.uclibc-ng.org/releases/1.0.38/uClibc-ng-1.0.38.tar.xz.sha256 -sha256 b1a3328330d2c94a2bec8c1436a8f15673f3a9b5895e155efc2e91d4e1882570 uClibc-ng-1.0.38.tar.xz +# From https://downloads.uclibc-ng.org/releases/1.0.38/uClibc-ng-1.0.39.tar.xz.sha256 +sha256 cb089dfe14867a38f222d6428e85d0e1191dcbb66dd9b1a671484f6bc7c81920 uClibc-ng-1.0.39.tar.xz # Locally calculated sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING.LIB diff --git a/buildroot/package/uclibc/uclibc.mk b/buildroot/package/uclibc/uclibc.mk index d22164106..96607f2f7 100644 --- a/buildroot/package/uclibc/uclibc.mk +++ b/buildroot/package/uclibc/uclibc.mk @@ -4,7 +4,7 @@ # ################################################################################ -UCLIBC_VERSION = 1.0.38 +UCLIBC_VERSION = 1.0.39 UCLIBC_SOURCE = uClibc-ng-$(UCLIBC_VERSION).tar.xz UCLIBC_SITE = https://downloads.uclibc-ng.org/releases/$(UCLIBC_VERSION) UCLIBC_LICENSE = LGPL-2.1+ diff --git a/buildroot/package/wavemon/wavemon.mk b/buildroot/package/wavemon/wavemon.mk index 3ae1141ec..d2af6c2bc 100644 --- a/buildroot/package/wavemon/wavemon.mk +++ b/buildroot/package/wavemon/wavemon.mk @@ -13,4 +13,11 @@ WAVEMON_DEPENDENCIES = host-pkgconf libnl ncurses # Handwritten Makefile.in, automake isn't used WAVEMON_MAKE_OPTS = CC="$(TARGET_CC)" +ifeq ($(BR2_PACKAGE_LIBCAP),y) +WAVEMON_CONF_OPTS += --with-libcap +WAVEMON_DEPENDENCIES += libcap +else +WAVEMON_CONF_OPTS += --without-libcap +endif + $(eval $(autotools-package)) diff --git a/buildroot/package/wireless-regdb/wireless-regdb.hash b/buildroot/package/wireless-regdb/wireless-regdb.hash index d941fc3b1..abe8f6b00 100644 --- a/buildroot/package/wireless-regdb/wireless-regdb.hash +++ b/buildroot/package/wireless-regdb/wireless-regdb.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/software/network/wireless-regdb/sha256sums.asc -sha256 9e4c02b2a9710df4dbdb327c39612e8cbbae6495987afeddaebab28c1ea3d8fa wireless-regdb-2021.04.21.tar.xz +sha256 cff370c410d1e6d316ae0a7fa8ac6278fdf1efca5d3d664aca7cfd2aafa54446 wireless-regdb-2021.08.28.tar.xz # Locally computed sha256 678b0df753c86198fc496d1f1033429bbd57f101472132ee7eaaf9f5e0a7fae1 LICENSE diff --git a/buildroot/package/wireless-regdb/wireless-regdb.mk b/buildroot/package/wireless-regdb/wireless-regdb.mk index 49a3824ce..0db8c6f34 100644 --- a/buildroot/package/wireless-regdb/wireless-regdb.mk +++ b/buildroot/package/wireless-regdb/wireless-regdb.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRELESS_REGDB_VERSION = 2021.04.21 +WIRELESS_REGDB_VERSION = 2021.08.28 WIRELESS_REGDB_SOURCE = wireless-regdb-$(WIRELESS_REGDB_VERSION).tar.xz WIRELESS_REGDB_SITE = $(BR2_KERNEL_MIRROR)/software/network/wireless-regdb WIRELESS_REGDB_LICENSE = ISC diff --git a/buildroot/package/x11r7/xserver_xorg-server/0006-compiler.h-don-t-define-inb-outb-and-friends-on-mips.patch b/buildroot/package/x11r7/xserver_xorg-server/0006-compiler.h-don-t-define-inb-outb-and-friends-on-mips.patch new file mode 100644 index 000000000..469ca7e3f --- /dev/null +++ b/buildroot/package/x11r7/xserver_xorg-server/0006-compiler.h-don-t-define-inb-outb-and-friends-on-mips.patch @@ -0,0 +1,73 @@ +From de5e24b5036a1a5a877f8f30169e3497d0e296d6 Mon Sep 17 00:00:00 2001 +From: Julien Cristau +Date: Wed, 6 Jan 2021 10:20:53 +0100 +Subject: [PATCH] compiler.h: don't define inb/outb and friends on mips +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The definition relies on IOPortBase, which is only ever set in +hw/xfree86/os-support/bsd/arm_video.c + +This caused build failures on linux/mips with GCC 10, due to this +change (from https://gcc.gnu.org/gcc-10/changes.html#c): + +"GCC now defaults to -fno-common. As a result, global variable accesses +are more efficient on various targets. In C, global variables with +multiple tentative definitions now result in linker errors. With +-fcommon such definitions are silently merged during linking." + +As a result anything including compiler.h would get its own definition +of IOPortBase and the linker would error out. + +Signed-off-by: Raphaël Mélotte +--- + hw/xfree86/common/compiler.h | 8 ++------ + hw/xfree86/os-support/bsd/arm_video.c | 3 +++ + 2 files changed, 5 insertions(+), 6 deletions(-) + +diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h +index 2b2008b3f..eb788d3fd 100644 +--- a/hw/xfree86/common/compiler.h ++++ b/hw/xfree86/common/compiler.h +@@ -518,14 +518,10 @@ xf86WriteMmio32Le(__volatile__ void *base, const unsigned long offset, + barrier(); + } + +-#elif defined(__mips__) || (defined(__arm32__) && !defined(__linux__)) +-#if defined(__arm32__) || defined(__mips64) ++#elif defined(__arm32__) && !defined(__linux__) + #define PORT_SIZE long +-#else +-#define PORT_SIZE short +-#endif + +-_X_EXPORT unsigned int IOPortBase; /* Memory mapped I/O port area */ ++extern _X_EXPORT unsigned int IOPortBase; /* Memory mapped I/O port area */ + + static __inline__ void + outb(unsigned PORT_SIZE port, unsigned char val) +diff --git a/hw/xfree86/os-support/bsd/arm_video.c b/hw/xfree86/os-support/bsd/arm_video.c +index dd1020e33..180d70543 100644 +--- a/hw/xfree86/os-support/bsd/arm_video.c ++++ b/hw/xfree86/os-support/bsd/arm_video.c +@@ -65,6 +65,7 @@ + #include "xf86Priv.h" + #include "xf86_OSlib.h" + #include "xf86OSpriv.h" ++#include "compiler.h" + + #if defined(__NetBSD__) && !defined(MAP_FILE) + #define MAP_FLAGS MAP_SHARED +@@ -162,6 +163,8 @@ xf86DisableIO() + + #if defined(USE_ARC_MMAP) || defined(__arm32__) + ++unsigned int IOPortBase; ++ + Bool + xf86EnableIO() + { +-- +2.32.0 + diff --git a/buildroot/package/xen/0003-Fix-build-with-64-bits-time_t.patch b/buildroot/package/xen/0002-Fix-build-with-64-bits-time_t.patch similarity index 100% rename from buildroot/package/xen/0003-Fix-build-with-64-bits-time_t.patch rename to buildroot/package/xen/0002-Fix-build-with-64-bits-time_t.patch diff --git a/buildroot/package/xen/0004-libs-light-fix-tv_sec-printf-format.patch b/buildroot/package/xen/0003-libs-light-fix-tv_sec-printf-format.patch similarity index 100% rename from buildroot/package/xen/0004-libs-light-fix-tv_sec-printf-format.patch rename to buildroot/package/xen/0003-libs-light-fix-tv_sec-printf-format.patch diff --git a/buildroot/package/xen/0005-libs-light-fix-tv_sec-fprintf-format.patch b/buildroot/package/xen/0004-libs-light-fix-tv_sec-fprintf-format.patch similarity index 100% rename from buildroot/package/xen/0005-libs-light-fix-tv_sec-fprintf-format.patch rename to buildroot/package/xen/0004-libs-light-fix-tv_sec-fprintf-format.patch diff --git a/buildroot/package/xen/xen.hash b/buildroot/package/xen/xen.hash index fd0310c92..e30db0951 100644 --- a/buildroot/package/xen/xen.hash +++ b/buildroot/package/xen/xen.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e35099a963070e3c9f425d1e36cbb1c40b7874ef449bfafd6688343783cb25ad xen-4.14.2.tar.gz +sha256 a3dad76a772393a1875e8f44a6059a95fea4bde40f97b800966969ac6f3a498d xen-4.14.3.tar.gz sha256 ecca9538e9d3f7e3c2bff827502f4495e2ef9e22c451298696ea08886b176c2c COPYING diff --git a/buildroot/package/xen/xen.mk b/buildroot/package/xen/xen.mk index b84214ed1..b635996af 100644 --- a/buildroot/package/xen/xen.mk +++ b/buildroot/package/xen/xen.mk @@ -4,7 +4,7 @@ # ################################################################################ -XEN_VERSION = 4.14.2 +XEN_VERSION = 4.14.3 XEN_SITE = https://downloads.xenproject.org/release/xen/$(XEN_VERSION) XEN_LICENSE = GPL-2.0 XEN_LICENSE_FILES = COPYING diff --git a/buildroot/support/kconfig/confdata.c b/buildroot/support/kconfig/confdata.c index 892da74fd..9ab980edd 100644 --- a/buildroot/support/kconfig/confdata.c +++ b/buildroot/support/kconfig/confdata.c @@ -744,7 +744,7 @@ int conf_write(const char *name) struct menu *menu; const char *basename; const char *str; - char dirname[PATH_MAX+1], tmpname[PATH_MAX+1], newname[PATH_MAX+1]; + char dirname[PATH_MAX+1], tmpname[PATH_MAX+20], newname[PATH_MAX+1]; char *env; if (!name) @@ -974,7 +974,7 @@ int conf_write_autoconf(void) const char *name; FILE *out, *tristate, *out_h; int i; - char dir[PATH_MAX+1], buf[PATH_MAX+1]; + char dir[PATH_MAX+1], buf[PATH_MAX+20]; char *s; strcpy(dir, conf_get_configname()); diff --git a/buildroot/support/kconfig/util.c b/buildroot/support/kconfig/util.c index 18a8e5239..8665f5bb8 100644 --- a/buildroot/support/kconfig/util.c +++ b/buildroot/support/kconfig/util.c @@ -35,7 +35,7 @@ struct file *file_lookup(const char *name) int file_write_dep(const char *name) { char *str; - char buf[PATH_MAX+1], buf2[PATH_MAX+1], dir[PATH_MAX+1]; + char buf[PATH_MAX+20], buf2[PATH_MAX+1], dir[PATH_MAX+1]; struct symbol *sym, *env_sym; struct expr *e; struct file *file; diff --git a/buildroot/support/misc/Vagrantfile b/buildroot/support/misc/Vagrantfile index e1f77efdb..409287913 100644 --- a/buildroot/support/misc/Vagrantfile +++ b/buildroot/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2021.02.5' +RELEASE='2021.02.6' ### Change here for more memory/cores ### VM_MEMORY=2048 diff --git a/buildroot/support/testing/conf/minimal-x86-qemu-kernel.config b/buildroot/support/testing/conf/minimal-x86-qemu-kernel.config index cc8ee6a71..45994f804 100644 --- a/buildroot/support/testing/conf/minimal-x86-qemu-kernel.config +++ b/buildroot/support/testing/conf/minimal-x86-qemu-kernel.config @@ -2,6 +2,7 @@ CONFIG_SYSVIPC=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_SMP=y +# CONFIG_RETPOLINE is not set CONFIG_HYPERVISOR_GUEST=y CONFIG_PARAVIRT=y CONFIG_NET=y diff --git a/buildroot/support/testing/infra/emulator.py b/buildroot/support/testing/infra/emulator.py index 5611ec96e..8dbe813f3 100644 --- a/buildroot/support/testing/infra/emulator.py +++ b/buildroot/support/testing/infra/emulator.py @@ -77,6 +77,7 @@ class Emulator(object): self.qemu = pexpect.spawn(qemu_cmd[0], qemu_cmd[1:], timeout=5 * self.timeout_multiplier, encoding='utf-8', + codec_errors='replace', env={"QEMU_AUDIO_DRV": "none"}) # We want only stdout into the log to avoid double echo self.qemu.logfile_read = self.logfile @@ -100,6 +101,8 @@ class Emulator(object): if index != 0: raise SystemError("Cannot login") self.run("dmesg -n 1") + # Prevent the shell from wrapping the commands at 80 columns. + self.run("stty columns 29999") # Run the given 'cmd' with a 'timeout' on the target # return a tuple (output, exit_code) diff --git a/buildroot/support/testing/tests/core/test_file_capabilities.py b/buildroot/support/testing/tests/core/test_file_capabilities.py index b9ece18d7..3d851e113 100644 --- a/buildroot/support/testing/tests/core/test_file_capabilities.py +++ b/buildroot/support/testing/tests/core/test_file_capabilities.py @@ -14,7 +14,7 @@ class TestFileCapabilities(infra.basetest.BRTest): BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y - BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.3" + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.204" BR2_LINUX_KERNEL_DEFCONFIG="vexpress" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{}" BR2_LINUX_KERNEL_DTS_SUPPORT=y diff --git a/buildroot/support/testing/tests/fs/test_f2fs.py b/buildroot/support/testing/tests/fs/test_f2fs.py index 950d4cf25..efbcb191b 100644 --- a/buildroot/support/testing/tests/fs/test_f2fs.py +++ b/buildroot/support/testing/tests/fs/test_f2fs.py @@ -20,7 +20,7 @@ class TestF2FS(infra.basetest.BRTest): # BR2_TARGET_ROOTFS_TAR is not set BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y - BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.204" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="vexpress" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{}" diff --git a/buildroot/support/testing/tests/fs/test_iso9660.py b/buildroot/support/testing/tests/fs/test_iso9660.py index 68f484085..412430318 100644 --- a/buildroot/support/testing/tests/fs/test_iso9660.py +++ b/buildroot/support/testing/tests/fs/test_iso9660.py @@ -18,7 +18,7 @@ BASIC_CONFIG = \ BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y - BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11" + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.204" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="{}" # BR2_TARGET_ROOTFS_TAR is not set diff --git a/buildroot/support/testing/tests/init/test_openrc.py b/buildroot/support/testing/tests/init/test_openrc.py index 14839434e..c6ade7676 100644 --- a/buildroot/support/testing/tests/init/test_openrc.py +++ b/buildroot/support/testing/tests/init/test_openrc.py @@ -5,15 +5,11 @@ class InitSystemOpenrcBase(InitSystemBase): config = \ """ BR2_arm=y + BR2_cortex_a9=y + BR2_ARM_ENABLE_VFP=y BR2_TOOLCHAIN_EXTERNAL=y BR2_INIT_OPENRC=y BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" - BR2_LINUX_KERNEL=y - BR2_LINUX_KERNEL_CUSTOM_VERSION=y - BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.5.7" - BR2_LINUX_KERNEL_DEFCONFIG="vexpress" - BR2_LINUX_KERNEL_DTS_SUPPORT=y - BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9" # BR2_TARGET_ROOTFS_TAR is not set """ @@ -34,7 +30,7 @@ class TestInitSystemOpenrcRoFull(InitSystemOpenrcBase): """ def test_run(self): - self.start_emulator("squashfs", "zImage", "vexpress-v2p-ca9") + self.start_emulator("squashfs") self.check_init() @@ -46,5 +42,5 @@ class TestInitSystemOpenrcRwFull(InitSystemOpenrcBase): """ def test_run(self): - self.start_emulator("ext2", "zImage", "vexpress-v2p-ca9") + self.start_emulator("ext2") self.check_init() diff --git a/buildroot/support/testing/tests/init/test_systemd.py b/buildroot/support/testing/tests/init/test_systemd.py index c0ef5e120..4f3c098c1 100644 --- a/buildroot/support/testing/tests/init/test_systemd.py +++ b/buildroot/support/testing/tests/init/test_systemd.py @@ -13,7 +13,7 @@ class InitSystemSystemdBase(InitSystemBase): BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y - BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.3" + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.204" BR2_LINUX_KERNEL_DEFCONFIG="vexpress" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{}" BR2_LINUX_KERNEL_DTS_SUPPORT=y diff --git a/buildroot/support/testing/tests/package/test_docker_compose.py b/buildroot/support/testing/tests/package/test_docker_compose.py index 7ca81c311..374cb6c5f 100644 --- a/buildroot/support/testing/tests/package/test_docker_compose.py +++ b/buildroot/support/testing/tests/package/test_docker_compose.py @@ -7,10 +7,9 @@ class TestDockerCompose(infra.basetest.BRTest): config = \ """ BR2_x86_64=y - BR2_x86_core2=y - BR2_TOOLCHAIN_BUILDROOT_GLIBC=y - BR2_KERNEL_HEADERS_4_19=y - BR2_TOOLCHAIN_BUILDROOT_CXX=y + BR2_x86_corei7=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_GLIBC_STABLE=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_BUILD_SCRIPT="{}" BR2_ROOTFS_POST_SCRIPT_ARGS="{}" @@ -54,7 +53,7 @@ class TestDockerCompose(infra.basetest.BRTest): self.emulator.boot(arch="x86_64", kernel=kernel, kernel_cmdline=["root=/dev/vda", "console=ttyS0"], - options=["-cpu", "core2duo", + options=["-cpu", "Nehalem", "-m", "512M", "-device", "virtio-rng-pci", "-drive", "file={},format=raw,if=virtio".format(rootfs), diff --git a/buildroot/support/testing/tests/package/test_glxinfo.py b/buildroot/support/testing/tests/package/test_glxinfo.py index f37236d16..ff175894d 100644 --- a/buildroot/support/testing/tests/package/test_glxinfo.py +++ b/buildroot/support/testing/tests/package/test_glxinfo.py @@ -20,7 +20,7 @@ class TestGlxinfo(infra.basetest.BRTest): BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y - BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.204" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux.config" BR2_PACKAGE_MESA3D_DEMOS=y diff --git a/buildroot/support/testing/tests/package/test_lxc.py b/buildroot/support/testing/tests/package/test_lxc.py index b32b7a20c..d98bed876 100644 --- a/buildroot/support/testing/tests/package/test_lxc.py +++ b/buildroot/support/testing/tests/package/test_lxc.py @@ -12,7 +12,7 @@ class TestLxc(infra.basetest.BRTest): BR2_TOOLCHAIN_EXTERNAL=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y - BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.79" + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.204" BR2_LINUX_KERNEL_DEFCONFIG="vexpress" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9" diff --git a/buildroot/support/testing/tests/package/test_openssh.py b/buildroot/support/testing/tests/package/test_openssh.py index 2ae5030d5..fe517e8da 100644 --- a/buildroot/support/testing/tests/package/test_openssh.py +++ b/buildroot/support/testing/tests/package/test_openssh.py @@ -49,9 +49,8 @@ class TestOpenSshGlibc(TestOpensshBase): TestOpensshBase.opensshconfig + \ """ BR2_arm=y - BR2_TOOLCHAIN_BUILDROOT_GLIBC=y - BR2_KERNEL_HEADERS_4_19=y - BR2_TOOLCHAIN_BUILDROOT_CXX=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y BR2_PACKAGE_RNG_TOOLS=y BR2_TARGET_ROOTFS_CPIO=y """ diff --git a/buildroot/support/testing/tests/package/test_rust.py b/buildroot/support/testing/tests/package/test_rust.py index 15bb93dd9..728a24e29 100644 --- a/buildroot/support/testing/tests/package/test_rust.py +++ b/buildroot/support/testing/tests/package/test_rust.py @@ -65,12 +65,6 @@ class TestRustBin(TestRustBase): BR2_TOOLCHAIN_EXTERNAL=y BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" BR2_SYSTEM_DHCP="eth0" - BR2_LINUX_KERNEL=y - BR2_LINUX_KERNEL_CUSTOM_VERSION=y - BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.3" - BR2_LINUX_KERNEL_DEFCONFIG="vexpress" - BR2_LINUX_KERNEL_DTS_SUPPORT=y - BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9" BR2_TARGET_ROOTFS_CPIO=y # BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_RUSTC=y @@ -93,12 +87,6 @@ class TestRust(TestRustBase): BR2_TOOLCHAIN_EXTERNAL=y BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" BR2_SYSTEM_DHCP="eth0" - BR2_LINUX_KERNEL=y - BR2_LINUX_KERNEL_CUSTOM_VERSION=y - BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.3" - BR2_LINUX_KERNEL_DEFCONFIG="vexpress" - BR2_LINUX_KERNEL_DTS_SUPPORT=y - BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9" BR2_TARGET_ROOTFS_CPIO=y # BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_RUSTC=y diff --git a/buildroot/utils/scanpypi b/buildroot/utils/scanpypi index 9dede4e11..1f3326cf4 100755 --- a/buildroot/utils/scanpypi +++ b/buildroot/utils/scanpypi @@ -6,8 +6,6 @@ Utility for building Buildroot packages for existing PyPI packages Any package built by scanpypi should be manually checked for errors. """ -from __future__ import print_function -from __future__ import absolute_import import argparse import json import sys