From 969fe10855e2fbee623d545859a5209dea85534a Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 5 Nov 2020 07:36:04 +0100 Subject: [PATCH 001/125] package/oniguruma: security bump to version 6.9.6 Drop patch (already in version) Fixed many problems found by OSS-Fuzz Fixed many problems found by Coverity https://github.com/kkos/oniguruma/releases/tag/v6.9.6 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- .../0001-207-Out-of-bounds-write.patch | 25 ------------------- package/oniguruma/oniguruma.hash | 2 +- package/oniguruma/oniguruma.mk | 5 +--- 3 files changed, 2 insertions(+), 30 deletions(-) delete mode 100644 package/oniguruma/0001-207-Out-of-bounds-write.patch diff --git a/package/oniguruma/0001-207-Out-of-bounds-write.patch b/package/oniguruma/0001-207-Out-of-bounds-write.patch deleted file mode 100644 index 3317449702..0000000000 --- a/package/oniguruma/0001-207-Out-of-bounds-write.patch +++ /dev/null @@ -1,25 +0,0 @@ -From cbe9f8bd9cfc6c3c87a60fbae58fa1a85db59df0 Mon Sep 17 00:00:00 2001 -From: "K.Kosako" -Date: Mon, 21 Sep 2020 12:58:29 +0900 -Subject: [PATCH] #207: Out-of-bounds write - -[Retrieved from: -https://github.com/kkos/oniguruma/commit/cbe9f8bd9cfc6c3c87a60fbae58fa1a85db59df0] -Signed-off-by: Fabrice Fontaine ---- - src/regcomp.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/regcomp.c b/src/regcomp.c -index f6494b6d..a0a68561 100644 ---- a/src/regcomp.c -+++ b/src/regcomp.c -@@ -6257,7 +6257,7 @@ concat_opt_exact_str(OptStr* to, UChar* s, UChar* end, OnigEncoding enc) - - for (i = to->len, p = s; p < end && i < OPT_EXACT_MAXLEN; ) { - len = enclen(enc, p); -- if (i + len > OPT_EXACT_MAXLEN) break; -+ if (i + len >= OPT_EXACT_MAXLEN) break; - for (j = 0; j < len && p < end; j++) - to->s[i++] = *p++; - } diff --git a/package/oniguruma/oniguruma.hash b/package/oniguruma/oniguruma.hash index 82354d4b9e..668f21d37f 100644 --- a/package/oniguruma/oniguruma.hash +++ b/package/oniguruma/oniguruma.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2f25cc3165e6da4b12dcabdb6b77c48f436d835e127ec2e3cad7abae9ea8e9a6 onig-6.9.5.tar.gz +sha256 bd0faeb887f748193282848d01ec2dad8943b5dfcb8dc03ed52dcc963549e819 onig-6.9.6.tar.gz sha256 6c7038393e8f30fee16257e713f77e383712f1465d6d25929596746b10b42bd3 COPYING diff --git a/package/oniguruma/oniguruma.mk b/package/oniguruma/oniguruma.mk index c2330c7380..e7aaa43c2f 100644 --- a/package/oniguruma/oniguruma.mk +++ b/package/oniguruma/oniguruma.mk @@ -4,7 +4,7 @@ # ################################################################################ -ONIGURUMA_VERSION = 6.9.5 +ONIGURUMA_VERSION = 6.9.6 ONIGURUMA_SITE = \ https://github.com/kkos/oniguruma/releases/download/v$(ONIGURUMA_VERSION) ONIGURUMA_SOURCE = onig-$(ONIGURUMA_VERSION).tar.gz @@ -12,7 +12,4 @@ ONIGURUMA_LICENSE = BSD-2-Clause ONIGURUMA_LICENSE_FILES = COPYING ONIGURUMA_INSTALL_STAGING = YES -# 0001-207-Out-of-bounds-write.patch -ONIGURUMA_IGNORE_CVES += CVE-2020-26159 - $(eval $(autotools-package)) From 5eb9e3624214a2d57bcb8c03a0d08cb12302749a Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 5 Nov 2020 08:47:39 +0100 Subject: [PATCH 002/125] package/modem-manager: fix build without xsltproc Commit 8efb52c1a17210dc79cfb61f56a71ffb760ccbe9 added a libxslt dependency presumably to manage https://github.com/freedesktop/ModemManager/commit/bbd39a457ce2949dd167f9c2e01eecf6a9e14716 However, this is wrong and build will fail on: checking for xsltproc... no configure: error: Please install xsltproc before configuring. xsltproc is used to generate ModemManager-names.h since, at least, version 0.7.990 and https://github.com/freedesktop/ModemManager/commit/365b906a3e1bda05af10f92451a6b6ae60f8b879 However, this file is already available in the official tarball so drop this unneeded dependency and set ac_cv_prog_XSLTPROC_CHECK to yes Fixes: - http://autobuild.buildroot.org/results/edc755b874ea43d1c009ad76c28f05e18519138e Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/modem-manager/Config.in | 1 - package/modem-manager/modem-manager.mk | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/modem-manager/Config.in b/package/modem-manager/Config.in index 062826fd0a..c4c723776d 100644 --- a/package/modem-manager/Config.in +++ b/package/modem-manager/Config.in @@ -6,7 +6,6 @@ config BR2_PACKAGE_MODEM_MANAGER select BR2_PACKAGE_DBUS # runtime dependency select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBGUDEV if BR2_PACKAGE_HAS_UDEV - select BR2_PACKAGE_LIBXSLT help ModemManager is a DBus-activated daemon which controls mobile broadband (2G/3G/4G) devices and connections. diff --git a/package/modem-manager/modem-manager.mk b/package/modem-manager/modem-manager.mk index 53cd0aff9a..372e7da1e4 100644 --- a/package/modem-manager/modem-manager.mk +++ b/package/modem-manager/modem-manager.mk @@ -9,9 +9,10 @@ MODEM_MANAGER_SOURCE = ModemManager-$(MODEM_MANAGER_VERSION).tar.xz MODEM_MANAGER_SITE = http://www.freedesktop.org/software/ModemManager MODEM_MANAGER_LICENSE = GPL-2.0+ (programs, plugins), LGPL-2.0+ (libmm-glib) MODEM_MANAGER_LICENSE_FILES = COPYING COPYING.LIB -MODEM_MANAGER_DEPENDENCIES = host-pkgconf libglib2 libxslt $(TARGET_NLS_DEPENDENCIES) +MODEM_MANAGER_DEPENDENCIES = host-pkgconf libglib2 $(TARGET_NLS_DEPENDENCIES) MODEM_MANAGER_INSTALL_STAGING = YES MODEM_MANAGER_CONF_OPTS = --disable-more-warnings +MODEM_MANAGER_CONF_ENV = ac_cv_prog_XSLTPROC_CHECK=yes ifeq ($(BR2_PACKAGE_MODEM_MANAGER_LIBQMI),y) MODEM_MANAGER_DEPENDENCIES += libqmi From b2019a5183b28d36e52eacc64d50c3e0fc402fb0 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 5 Nov 2020 20:02:06 +0100 Subject: [PATCH 003/125] package/jsoncpp: security bump version to 1.9.4 Release notes of this "Security and build system fixes" release: https://github.com/open-source-parsers/jsoncpp/releases/tag/1.9.4 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/jsoncpp/jsoncpp.hash | 2 +- package/jsoncpp/jsoncpp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/jsoncpp/jsoncpp.hash b/package/jsoncpp/jsoncpp.hash index 45f0b161ff..0070a1874e 100644 --- a/package/jsoncpp/jsoncpp.hash +++ b/package/jsoncpp/jsoncpp.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8593c1d69e703563d94d8c12244e2e18893eeb9a8a9f8aa3d09a327aa45c8f7d jsoncpp-1.9.3.tar.gz +sha256 e34a628a8142643b976c7233ef381457efad79468c67cb1ae0b83a33d7493999 jsoncpp-1.9.4.tar.gz sha256 95039d77a20e75b428207740d9a8f97b2dce3c89da4b21f1ad862b5997160e0a LICENSE diff --git a/package/jsoncpp/jsoncpp.mk b/package/jsoncpp/jsoncpp.mk index 2766716947..cfded2bf07 100644 --- a/package/jsoncpp/jsoncpp.mk +++ b/package/jsoncpp/jsoncpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -JSONCPP_VERSION = 1.9.3 +JSONCPP_VERSION = 1.9.4 JSONCPP_SITE = $(call github,open-source-parsers,jsoncpp,$(JSONCPP_VERSION)) JSONCPP_LICENSE = Public Domain or MIT JSONCPP_LICENSE_FILES = LICENSE From 0a5c9f824aae7da90307193bc2f9410dcb8e0522 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 5 Nov 2020 17:47:35 +0100 Subject: [PATCH 004/125] support/testing/tests: fix flake8 warnings Fixes the following flake8 warnings: support/testing/tests/core/test_selinux.py:21:1: E302 expected 2 blank lines, found 1 support/testing/tests/core/test_selinux.py:38:1: E302 expected 2 blank lines, found 1 support/testing/tests/core/test_selinux.py:51:1: E302 expected 2 blank lines, found 1 support/testing/tests/core/test_selinux.py:62:1: E302 expected 2 blank lines, found 1 support/testing/tests/core/test_selinux.py:65:14: E127 continuation line over-indented for visual indent support/testing/tests/init/test_systemd_selinux.py:53:1: E302 expected 2 blank lines, found 1 support/testing/tests/init/test_systemd_selinux.py:64:1: E302 expected 2 blank lines, found 1 Interestingly, the "continuation line over-indented for visual indent" shows up only once, while the same pattern is there at multiple places in the file. We fix all places with that over-indentation pattern. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- support/testing/tests/core/test_selinux.py | 44 ++++++++++--------- .../tests/init/test_systemd_selinux.py | 2 + 2 files changed, 26 insertions(+), 20 deletions(-) diff --git a/support/testing/tests/core/test_selinux.py b/support/testing/tests/core/test_selinux.py index 28d99d3a69..683a424d6f 100644 --- a/support/testing/tests/core/test_selinux.py +++ b/support/testing/tests/core/test_selinux.py @@ -5,12 +5,12 @@ import infra.basetest class TestSELinuxInfra(infra.basetest.BRTest): config = infra.basetest.BASIC_TOOLCHAIN_CONFIG +\ - """ - BR2_PACKAGE_REFPOLICY=y - BR2_PACKAGE_PYTHON3=y - BR2_PACKAGE_SETOOLS=y - BR2_TARGET_ROOTFS_CPIO=y - """ + """ + BR2_PACKAGE_REFPOLICY=y + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_SETOOLS=y + BR2_TARGET_ROOTFS_CPIO=y + """ def base_test_run(self): cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") @@ -18,11 +18,12 @@ class TestSELinuxInfra(infra.basetest.BRTest): options=["-initrd", cpio_file]) self.emulator.login() + class TestSELinuxExtraModules(TestSELinuxInfra): config = TestSELinuxInfra.config + \ - """ - BR2_REFPOLICY_EXTRA_MODULES="ntp tor" - """ + """ + BR2_REFPOLICY_EXTRA_MODULES="ntp tor" + """ def test_run(self): TestSELinuxInfra.base_test_run(self) @@ -35,11 +36,12 @@ class TestSELinuxExtraModules(TestSELinuxInfra): self.assertEqual(ret, 0) self.assertEqual(out[2].strip(), "tor_t") + class TestSELinuxExtraModulesDirs(TestSELinuxInfra): config = TestSELinuxInfra.config + \ - """ - BR2_REFPOLICY_EXTRA_MODULES_DIRS="{}" - """.format(infra.filepath("tests/core/test_selinux/extra_modules")) + """ + BR2_REFPOLICY_EXTRA_MODULES_DIRS="{}" + """.format(infra.filepath("tests/core/test_selinux/extra_modules")) def test_run(self): TestSELinuxInfra.base_test_run(self) @@ -48,23 +50,25 @@ class TestSELinuxExtraModulesDirs(TestSELinuxInfra): self.assertEqual(ret, 0) self.assertEqual(out[2].strip(), "buildroot_test_t") + class TestSELinuxCustomGit(TestSELinuxInfra): config = TestSELinuxInfra.config + \ - """ - BR2_PACKAGE_REFPOLICY_CUSTOM_GIT=y - BR2_PACKAGE_REFPOLICY_CUSTOM_REPO_URL="https://github.com/SELinuxProject/refpolicy.git" - BR2_PACKAGE_REFPOLICY_CUSTOM_REPO_VERSION="RELEASE_2_20200818" - """ + """ + BR2_PACKAGE_REFPOLICY_CUSTOM_GIT=y + BR2_PACKAGE_REFPOLICY_CUSTOM_REPO_URL="https://github.com/SELinuxProject/refpolicy.git" + BR2_PACKAGE_REFPOLICY_CUSTOM_REPO_VERSION="RELEASE_2_20200818" + """ def test_run(self): pass + class TestSELinuxPackage(TestSELinuxInfra): br2_external = [infra.filepath("tests/core/test_selinux/br2_external")] config = TestSELinuxInfra.config + \ - """ - BR2_PACKAGE_SELINUX_TEST=y - """ + """ + BR2_PACKAGE_SELINUX_TEST=y + """ def test_run(self): TestSELinuxInfra.base_test_run(self) diff --git a/support/testing/tests/init/test_systemd_selinux.py b/support/testing/tests/init/test_systemd_selinux.py index 9a98a32821..73604cfc32 100644 --- a/support/testing/tests/init/test_systemd_selinux.py +++ b/support/testing/tests/init/test_systemd_selinux.py @@ -50,6 +50,7 @@ class TestSELinuxSystemd(infra.basetest.BRTest): self.assertEqual(ret, 0) self.assertEqual(out[0], "system_u:system_r:init_t\0") + class TestSELinuxSystemdExt4(TestSELinuxSystemd): config = TestSELinuxSystemd.config + \ """ @@ -61,6 +62,7 @@ class TestSELinuxSystemdExt4(TestSELinuxSystemd): def test_run(self): self.run_tests("ext4") + class TestSELinuxSystemdSquashfs(TestSELinuxSystemd): config = TestSELinuxSystemd.config + \ """ From 5f83c87abf2454a342ce8d99a0d908b844e7fcda Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 5 Nov 2020 18:18:50 +0100 Subject: [PATCH 005/125] package/openntpd: fix build with gcc 10 Fixes: - http://autobuild.buildroot.org/results/4a7e6b707d061f5f7f5e00f0054f02a0f7fcb452 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...ide-fallback-definition-for-__packed.patch | 43 +++++++++++++++ ...make-ibuf_dns-static-to-avoid-double.patch | 54 +++++++++++++++++++ 2 files changed, 97 insertions(+) create mode 100644 package/openntpd/0002-Provide-fallback-definition-for-__packed.patch create mode 100644 package/openntpd/0003-Zap-double-definition-of-conf-and-make-ibuf_dns-static-to-avoid-double.patch diff --git a/package/openntpd/0002-Provide-fallback-definition-for-__packed.patch b/package/openntpd/0002-Provide-fallback-definition-for-__packed.patch new file mode 100644 index 0000000000..4d8f636b9d --- /dev/null +++ b/package/openntpd/0002-Provide-fallback-definition-for-__packed.patch @@ -0,0 +1,43 @@ +From bc2cd89715155fe1fead19338dac5f4059917dfe Mon Sep 17 00:00:00 2001 +From: Michael Forney +Date: Thu, 20 Jun 2019 13:52:22 -0700 +Subject: [PATCH] Provide fallback definition for __packed + +Otherwise, systems that don't support it will treat it as a name for a +global `struct ntp_msg` variable. + +[Retrieved from: +https://github.com/openntpd-portable/openntpd-portable/commit/bc2cd89715155fe1fead19338dac5f4059917dfe] +Signed-off-by: Fabrice Fontaine +--- + include/sys/types.h | 4 ++++ + m4/check-os-options.m4 | 1 + + 2 files changed, 5 insertions(+) + +diff --git a/include/sys/types.h b/include/sys/types.h +index 86821c7..5492e20 100644 +--- a/include/sys/types.h ++++ b/include/sys/types.h +@@ -22,6 +22,10 @@ + # define __bounded__(x, y, z) + #endif + ++#if !defined(HAVE_ATTRIBUTE__PACKED) && !defined(__packed) ++# define __packed __attribute__((__packed__)) ++#endif ++ + /* + * Define BSD-style unsigned bits types for systems that do not have them. + */ +diff --git a/m4/check-os-options.m4 b/m4/check-os-options.m4 +index d4d02d9..4883d1f 100644 +--- a/m4/check-os-options.m4 ++++ b/m4/check-os-options.m4 +@@ -69,6 +69,7 @@ case $host_os in + HOST_ABI=elf + AC_DEFINE([HAVE_ATTRIBUTE__BOUNDED__], [1], [OpenBSD gcc has bounded]) + AC_DEFINE([HAVE_ATTRIBUTE__DEAD], [1], [OpenBSD gcc has __dead]) ++ AC_DEFINE([HAVE_ATTRIBUTE__PACKED], [1], [OpenBSD gcc has __packed]) + ;; + *solaris*) + HOST_OS=solaris diff --git a/package/openntpd/0003-Zap-double-definition-of-conf-and-make-ibuf_dns-static-to-avoid-double.patch b/package/openntpd/0003-Zap-double-definition-of-conf-and-make-ibuf_dns-static-to-avoid-double.patch new file mode 100644 index 0000000000..f54237e310 --- /dev/null +++ b/package/openntpd/0003-Zap-double-definition-of-conf-and-make-ibuf_dns-static-to-avoid-double.patch @@ -0,0 +1,54 @@ +From 956b4239d919d6922b9ba6ef39be0d1753f8ff34 Mon Sep 17 00:00:00 2001 +From: otto <> +Date: Sat, 11 Apr 2020 07:49:48 +0000 +Subject: [PATCH] Zap double definition of conf and make ibuf_dns static to + avoid double definition; from Michael Forney + +[Retrieved (and backported by updating paths and dropping date and +version updates) from: +https://github.com/openntpd-portable/openntpd-openbsd/commit/956b4239d919d6922b9ba6ef39be0d1753f8ff34] +Signed-off-by: Fabrice Fontaine +--- + src/usr.sbin/ntpd/ntp.c | 4 ++-- + src/usr.sbin/ntpd/ntp_dns.c | 4 ++-- + src/usr.sbin/ntpd/parse.y | 3 +-- + 3 files changed, 5 insertions(+), 6 deletions(-) + +diff --git a/src/ntp.c b/src/ntp.c +index ea9a4e922..ec3d6bc43 100644 +--- a/src/ntp.c ++++ b/src/ntp.c +@@ -42,7 +42,7 @@ + + volatile sig_atomic_t ntp_quit = 0; + struct imsgbuf *ibuf_main; +-struct imsgbuf *ibuf_dns; ++static struct imsgbuf *ibuf_dns; + struct ntpd_conf *conf; + struct ctl_conns ctl_conns; + u_int peer_cnt; +diff --git a/src/ntp_dns.c b/src/ntp_dns.c +index 2e1a97833..88391801c 100644 +--- a/src/ntp_dns.c ++++ b/src/ntp_dns.c +@@ -39,7 +39,7 @@ + #include "ntpd.h" + + volatile sig_atomic_t quit_dns = 0; +-struct imsgbuf *ibuf_dns; ++static struct imsgbuf *ibuf_dns; + + void sighdlr_dns(int); + int dns_dispatch_imsg(struct ntpd_conf *); +diff --git a/src/parse.y b/src/uparse.y +index 8d7ab09de..81d19bbff 100644 +--- a/src/parse.y ++++ b/src/parse.y +@@ -57,7 +57,6 @@ int lgetc(int); + int lungetc(int); + int findeol(void); + +-struct ntpd_conf *conf; + struct sockaddr_in query_addr4; + struct sockaddr_in6 query_addr6; + int poolseqnum; From 46aab84c6fa1c242b304cbd9cd79a7fd94f7a31a Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 5 Nov 2020 18:46:23 +0100 Subject: [PATCH 006/125] package/libsigrokdecode: fix build with python 3.9 This will fix the following build failure with python 3.9 and sigrok-cli: /srv/storage/autobuild/run/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/mips64el-buildroot-linux-uclibc/5.5.0/../../../../mips64el-buildroot-linux-uclibc/bin/ld: /srv/storage/autobuild/run/instance-1/output-1/host/bin/../mips64el-buildroot-linux-uclibc/sysroot/usr/lib/libsigrokdecode.so: undefined reference to `PyList_Insert' Fixes: - http://autobuild.buildroot.org/results/cc6447b926f8223c68d0086428d29a037b18252d Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...figure-ac-Add-support-for-Python-3-9.patch | 28 +++++++++++++++++++ package/libsigrokdecode/libsigrokdecode.mk | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 package/libsigrokdecode/0001-configure-ac-Add-support-for-Python-3-9.patch diff --git a/package/libsigrokdecode/0001-configure-ac-Add-support-for-Python-3-9.patch b/package/libsigrokdecode/0001-configure-ac-Add-support-for-Python-3-9.patch new file mode 100644 index 0000000000..804e931dcb --- /dev/null +++ b/package/libsigrokdecode/0001-configure-ac-Add-support-for-Python-3-9.patch @@ -0,0 +1,28 @@ +From 9b0ad5177bd692f7556a4756bdbd2da81d9c34ce Mon Sep 17 00:00:00 2001 +From: =?utf8?q?Dan=20Hor=C3=A1k?= +Date: Tue, 4 Aug 2020 09:19:44 +0200 +Subject: [PATCH] configure.ac: Add support for Python 3.9. + +[Retrieved from: +https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=commit;h=9b0ad5177bd692f7556a4756bdbd2da81d9c34ce] +Signed-off-by: Fabrice Fontaine +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index f9958b3..2917cb3 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -100,7 +100,7 @@ SR_PKG_CHECK_SUMMARY([srd_pkglibs_summary]) + # first, since usually only that variant will add "-lpython3.8". + # https://docs.python.org/3/whatsnew/3.8.html#debug-build-uses-the-same-abi-as-release-build + SR_PKG_CHECK([python3], [SRD_PKGLIBS], +- [python-3.8-embed], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2], [python3 >= 3.2]) ++ [python-3.9-embed], [python-3.8-embed], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2], [python3 >= 3.2]) + AS_IF([test "x$sr_have_python3" = xno], + [AC_MSG_ERROR([Cannot find Python 3 development headers.])]) + +-- +2.24.0.rc2 + diff --git a/package/libsigrokdecode/libsigrokdecode.mk b/package/libsigrokdecode/libsigrokdecode.mk index 8c9488784c..18f2cbfee3 100644 --- a/package/libsigrokdecode/libsigrokdecode.mk +++ b/package/libsigrokdecode/libsigrokdecode.mk @@ -10,5 +10,7 @@ LIBSIGROKDECODE_LICENSE = GPL-3.0+ LIBSIGROKDECODE_LICENSE_FILES = COPYING LIBSIGROKDECODE_INSTALL_STAGING = YES LIBSIGROKDECODE_DEPENDENCIES = host-pkgconf libglib2 python3 +# We're patching configure.ac +LIBSIGROKDECODE_AUTORECONF = YES $(eval $(autotools-package)) From 1482ef6bb8209044372ebcaf07081524f9b486fa Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Fri, 6 Nov 2020 19:26:41 +0100 Subject: [PATCH 007/125] Revert "Makefile: exclude BR2_DL_DIR from savedefconfig" Although BR2_DL_DIR is indeed a site-local setting, which does not actually define the target system, we've had it in the tree for a long time now, and people have been depending on it for a variety of use-cases. Furthermore, BR2_DL_DIR is far from the only such site-local setting, BR2_CCACHE_DIR springs to mind, and in the less-obvious category, we can also find BR2_JLEVEL, but also BR2_WGET, BR2_SVN, BR2_GIT et al. as they may be tweaked to set the timeout, number of retries or so on to work around stupid proxies. But of course, the most local site-local setting is probably BR2_PACKAGE_OVERRIDE_FILE, with its default value being explicitly just 'local.mk'. Ideally, we would like to have a clear separation between the configuration that actually defines the target system on one hand, and the site-local settings that drive and control how the build is performed, on the other hand. This is by far a much bigger endeavour than just dropping BR2_DL_DIR from the saved defconfig. This reverts commit 36edacce9c2c3b90f9bb11a5d2208e8edf7bbe63 (adapted to keep the fix from 1a7873ec986c817fdd22cc2d9096d9482fee4381). Closes: #13291 Note: thanks to Thomas; some phrasing above was borrowed from a discussion with him. Signed-off-by: Yann E. MORIN Cc: Lance Fredrickson Cc: Sven Oliver Moll Cc: Thomas Petazzoni Cc: Peter Korsgaard Cc: Adam Duskett --- Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 5dc402e73e..f9e9cfa968 100644 --- a/Makefile +++ b/Makefile @@ -1027,9 +1027,7 @@ savedefconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile @$(COMMON_CONFIG_ENV) $< \ --savedefconfig=$(if $(DEFCONFIG),$(DEFCONFIG),$(CONFIG_DIR)/defconfig) \ $(CONFIG_CONFIG_IN) - @$(SED) '/^BR2_DEFCONFIG=/d' \ - -e '/^BR2_DL_DIR=/d' \ - $(if $(DEFCONFIG),$(DEFCONFIG),$(CONFIG_DIR)/defconfig) + @$(SED) '/^BR2_DEFCONFIG=/d' $(if $(DEFCONFIG),$(DEFCONFIG),$(CONFIG_DIR)/defconfig) .PHONY: defconfig savedefconfig update-defconfig From 49624ab4555ea1b8c15e2c9e28a13946a15f04b3 Mon Sep 17 00:00:00 2001 From: Marcin Niestroj Date: Fri, 6 Nov 2020 19:26:59 +0100 Subject: [PATCH 008/125] configs/orangepi_zero_plus: use Python 3.x for U-Boot build New U-Boot versions (such as 2020.10 being used) need Python 3.x for pylibfdt. Fixes: - https://gitlab.com/buildroot.org/buildroot/-/jobs/831421115 Signed-off-by: Marcin Niestroj Signed-off-by: Thomas Petazzoni --- configs/orangepi_zero_plus_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/orangepi_zero_plus_defconfig b/configs/orangepi_zero_plus_defconfig index cff2788f04..cf82f8b3cc 100644 --- a/configs/orangepi_zero_plus_defconfig +++ b/configs/orangepi_zero_plus_defconfig @@ -21,6 +21,7 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero_plus" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y From ec726bde4818d43a7d258ec4182f3653f4a0b9c4 Mon Sep 17 00:00:00 2001 From: Marcin Niestroj Date: Fri, 6 Nov 2020 19:27:00 +0100 Subject: [PATCH 009/125] configs/orangepi_pc: use Python 3.x for U-Boot build New U-Boot versions (such as 2020.07 being used) need Python 3.x for pylibfdt. Fixes: - https://gitlab.com/buildroot.org/buildroot/-/jobs/831421100 Signed-off-by: Marcin Niestroj Signed-off-by: Thomas Petazzoni --- configs/orangepi_pc_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/orangepi_pc_defconfig b/configs/orangepi_pc_defconfig index 90ad50b783..c1afb8566a 100644 --- a/configs/orangepi_pc_defconfig +++ b/configs/orangepi_pc_defconfig @@ -23,6 +23,7 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.07" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_pc" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" From fbac050caeb23c8f864c6367d0642f514e4426c0 Mon Sep 17 00:00:00 2001 From: Marcin Niestroj Date: Fri, 6 Nov 2020 19:27:01 +0100 Subject: [PATCH 010/125] configs/rock_pi_n8: use Python 3.x for U-Boot build New U-Boot versions (such as 2020.07 being used) need Python 3.x for pylibfdt. Fixes: - https://gitlab.com/buildroot.org/buildroot/-/jobs/831421210 Signed-off-by: Marcin Niestroj Signed-off-by: Thomas Petazzoni --- configs/rock_pi_n8_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/rock_pi_n8_defconfig b/configs/rock_pi_n8_defconfig index 9c671d416e..b7135d6311 100644 --- a/configs/rock_pi_n8_defconfig +++ b/configs/rock_pi_n8_defconfig @@ -14,6 +14,7 @@ BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/amarula/u-boot-amarula.git" BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="ba120841bf40ebaed049d64bb4f980083a1cf6b7" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rock-pi-n8-rk3288" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y From 8bb2a9c3601d4ca665af731a92a9db38f113608d Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 6 Nov 2020 22:44:03 +0100 Subject: [PATCH 011/125] package/kmscube: add license file Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/kmscube/kmscube.hash | 1 + package/kmscube/kmscube.mk | 1 + 2 files changed, 2 insertions(+) diff --git a/package/kmscube/kmscube.hash b/package/kmscube/kmscube.hash index 6a4140c541..cb7abd48ea 100644 --- a/package/kmscube/kmscube.hash +++ b/package/kmscube/kmscube.hash @@ -1,2 +1,3 @@ # Locally computed sha256 ec135069d8bee7f4fe38cb9dc96fbbd56e0057290fa25eff8b5b314ee473c502 kmscube-4660a7dca6512b6e658759d00cff7d4ad2a2059d.tar.gz +sha256 f622099ab0d274133f6e62d5fccfe970b61134d80ed036f45f8cf1e90c3d5a05 COPYING diff --git a/package/kmscube/kmscube.mk b/package/kmscube/kmscube.mk index dc8c691864..7b458376dc 100644 --- a/package/kmscube/kmscube.mk +++ b/package/kmscube/kmscube.mk @@ -7,6 +7,7 @@ KMSCUBE_VERSION = 4660a7dca6512b6e658759d00cff7d4ad2a2059d KMSCUBE_SITE = https://gitlab.freedesktop.org/mesa/kmscube/-/archive/$(KMSCUBE_VERSION) KMSCUBE_LICENSE = MIT +KMSCUBE_LICENSE_FILES = COPYING KMSCUBE_DEPENDENCIES = host-pkgconf mesa3d libdrm $(eval $(meson-package)) From 5177f726a08f77f669d763e762cf663449131ab2 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 6 Nov 2020 22:49:31 +0100 Subject: [PATCH 012/125] package/ghostscript: fix build with freetype >= 2.10.3 This patch is needed to fix the build with freetype >= 2.10.3. https://www.freetype.org/index.html#news "A warning for distribution maintainers: Version 2.10.3 and later may break the build of ghostscript, due to ghostscript's use of a with- drawn macro that wasn't intended for external usage." Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- ...g-702985-drop-use-of-FT_CALLBACK_DEF.patch | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 package/ghostscript/0001-bug-702985-drop-use-of-FT_CALLBACK_DEF.patch diff --git a/package/ghostscript/0001-bug-702985-drop-use-of-FT_CALLBACK_DEF.patch b/package/ghostscript/0001-bug-702985-drop-use-of-FT_CALLBACK_DEF.patch new file mode 100644 index 0000000000..044dcc72f1 --- /dev/null +++ b/package/ghostscript/0001-bug-702985-drop-use-of-FT_CALLBACK_DEF.patch @@ -0,0 +1,55 @@ +From 41ef9a0bc36b9db7115fbe9623f989bfb47bbade Mon Sep 17 00:00:00 2001 +From: Chris Liddell +Date: Tue, 20 Oct 2020 09:49:45 +0100 +Subject: [PATCH] Bug 702985: drop use of FT_CALLBACK_DEF() def + +From 2.10.3, Freetype disappeared the FT_CALLBACK_DEF() macro, which is what +we used when defining our callbacks from Freetype. + +No guidance forthcoming from the Freetype developer who made those changes, +so change to explicitly declaring the callbacks file static. + +Should fix the reported build failures. + +Downloaded from upstream commit: +https://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=41ef9a0bc36b + +Signed-off-by: Bernd Kuhls +--- + base/fapi_ft.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/base/fapi_ft.c b/base/fapi_ft.c +index 65fa6dcf4..21aef2f06 100644 +--- a/base/fapi_ft.c ++++ b/base/fapi_ft.c +@@ -125,7 +125,7 @@ static void + delete_inc_int_info(gs_fapi_server * a_server, + FT_IncrementalRec * a_inc_int_info); + +-FT_CALLBACK_DEF(void *) ++static void * + FF_alloc(FT_Memory memory, long size) + { + gs_memory_t *mem = (gs_memory_t *) memory->user; +@@ -133,7 +133,7 @@ FF_alloc(FT_Memory memory, long size) + return (gs_malloc(mem, size, 1, "FF_alloc")); + } + +-FT_CALLBACK_DEF(void *) ++static void * + FF_realloc(FT_Memory memory, long cur_size, long new_size, void *block) + { + gs_memory_t *mem = (gs_memory_t *) memory->user; +@@ -153,7 +153,7 @@ FT_CALLBACK_DEF(void *) + return (tmp); + } + +-FT_CALLBACK_DEF(void) ++static void + FF_free(FT_Memory memory, void *block) + { + gs_memory_t *mem = (gs_memory_t *) memory->user; +-- +2.17.1 + From 1ffe654c6d4e5428520378feb0f04dc1f8c951a0 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 6 Nov 2020 22:49:32 +0100 Subject: [PATCH 013/125] package/freetype: security bump version to 2.10.4 Fixes CVE-2020-15999, https://www.freetype.org/index.html#news "This is an emergency release, fixing a severe vulnerability in embedded PNG bitmap handling [...]. All users should update immediately." Removed md5 hash. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/freetype/freetype.hash | 7 +++---- package/freetype/freetype.mk | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package/freetype/freetype.hash b/package/freetype/freetype.hash index 7fc00f1c97..36571b51af 100644 --- a/package/freetype/freetype.hash +++ b/package/freetype/freetype.hash @@ -1,9 +1,8 @@ -# From https://sourceforge.net/projects/freetype/files/freetype2/2.10.2/ -md5 7c0d5a39f232d7eb9f9d7da76bf08074 freetype-2.10.2.tar.xz -sha1 b074d5c34dc0e3cc150be6e7aa6b07c9ec4ed875 freetype-2.10.2.tar.xz +# From https://sourceforge.net/projects/freetype/files/freetype2/2.10.4/ +sha1 0181862673f7216ad2b5074f95fc131209e30b27 freetype-2.10.4.tar.xz # Locally calculated -sha256 1543d61025d2e6312e0a1c563652555f17378a204a61e99928c9fcef030a2d8b freetype-2.10.2.tar.xz +sha256 86a854d8905b19698bbc8f23b860bc104246ce4854dcea8e3b0fb21284f75784 freetype-2.10.4.tar.xz sha256 fd056de4196903a676208ef58cfddafc7d583d1f28fa2e44c309cf84a59e62fb docs/LICENSE.TXT sha256 08c135755dd589039470f1fdbb400daaabaaa50d0b366d19cebff4d22986baa1 docs/FTL.TXT sha256 c4120c6752c910c299e3bd9cb3a46ff262c268303ca2069b61f92f10a5656c18 docs/GPLv2.TXT diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk index f4d71bedf7..e543aee0b2 100644 --- a/package/freetype/freetype.mk +++ b/package/freetype/freetype.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREETYPE_VERSION = 2.10.2 +FREETYPE_VERSION = 2.10.4 FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.xz FREETYPE_SITE = http://download.savannah.gnu.org/releases/freetype FREETYPE_INSTALL_STAGING = YES From 12acdaa322336a968ebf79a7bd5bebcb6cee3b79 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Fri, 6 Nov 2020 10:36:33 -0300 Subject: [PATCH 014/125] configs/mx6sx_udoo_neo: select host-openssl for the Linux kernel build Select BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y to fix the following build error: scripts/extract-cert.c:21:25: fatal error: openssl/bio.h: No such file or directory #include Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/831421063 Signed-off-by: Fabio Estevam Reviewed-by: Marcin Niestroj Tested-by: Marcin Niestroj Signed-off-by: Thomas Petazzoni --- configs/mx6sx_udoo_neo_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/mx6sx_udoo_neo_defconfig b/configs/mx6sx_udoo_neo_defconfig index 4a2f8b0bc0..2bdcade252 100644 --- a/configs/mx6sx_udoo_neo_defconfig +++ b/configs/mx6sx_udoo_neo_defconfig @@ -23,6 +23,7 @@ BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6sx-udoo-neo-basic imx6sx-udoo-neo-full imx6sx-udoo-neo-extended" BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # required tools to create the SD card image BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y From 21d4061433a8dc3e03fea014bdd34bb427399aab Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Fri, 6 Nov 2020 10:36:34 -0300 Subject: [PATCH 015/125] configs/mx6udoo: select host-openssl for the Linux kernel build Select BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y to fix the following build error: scripts/extract-cert.c:21:25: fatal error: openssl/bio.h: No such file or directory #include Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/831421064 Signed-off-by: Fabio Estevam Reviewed-by: Marcin Niestroj Tested-by: Marcin Niestroj Signed-off-by: Thomas Petazzoni --- configs/mx6udoo_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/mx6udoo_defconfig b/configs/mx6udoo_defconfig index 058dc4534d..60436e8616 100644 --- a/configs/mx6udoo_defconfig +++ b/configs/mx6udoo_defconfig @@ -25,6 +25,7 @@ BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-udoo imx6dl-udoo" BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # required tools to create the SD card image BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y From 1906912a040b8d0d0a890a1a9160e2ee221e732b Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 6 Nov 2020 18:52:49 +0100 Subject: [PATCH 016/125] package/darkhttpd: add license file Add license file and, while at it, update indentation to two spaces Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/darkhttpd/darkhttpd.hash | 3 ++- package/darkhttpd/darkhttpd.mk | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/package/darkhttpd/darkhttpd.hash b/package/darkhttpd/darkhttpd.hash index 39152e3cb9..b6618db89a 100644 --- a/package/darkhttpd/darkhttpd.hash +++ b/package/darkhttpd/darkhttpd.hash @@ -1,2 +1,3 @@ # Locally generated -sha256 a50417b622b32b5f421b3132cb94ebeff04f02c5fb87fba2e31147d23de50505 darkhttpd-1.12.tar.bz2 +sha256 a50417b622b32b5f421b3132cb94ebeff04f02c5fb87fba2e31147d23de50505 darkhttpd-1.12.tar.bz2 +sha256 6e1a2e45d8dd3c8835222e3c82e5cccde8e60f02d55555910e18715ec5dc6d04 darkhttpd.c diff --git a/package/darkhttpd/darkhttpd.mk b/package/darkhttpd/darkhttpd.mk index f4831a9426..4b65cffe60 100644 --- a/package/darkhttpd/darkhttpd.mk +++ b/package/darkhttpd/darkhttpd.mk @@ -8,6 +8,7 @@ DARKHTTPD_VERSION = 1.12 DARKHTTPD_SITE = https://unix4lyfe.org/darkhttpd DARKHTTPD_SOURCE = darkhttpd-$(DARKHTTPD_VERSION).tar.bz2 DARKHTTPD_LICENSE = MIT +DARKHTTPD_LICENSE_FILES = darkhttpd.c define DARKHTTPD_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) From afdaeab7290e8226b47d712290f88a664c07bcda Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 6 Nov 2020 22:49:36 +0100 Subject: [PATCH 017/125] package/lzlib: add license file Add lzlib.c as the license file and, while at it, update indentation to two spaces Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/lzlib/lzlib.hash | 3 ++- package/lzlib/lzlib.mk | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/package/lzlib/lzlib.hash b/package/lzlib/lzlib.hash index f983862e41..4bb4c52c8c 100644 --- a/package/lzlib/lzlib.hash +++ b/package/lzlib/lzlib.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 cbb0cac5825e940b4ea2f31a336d2aaf6db39847d456920afd8e443804420dbb lzlib-0.4.3.tar.gz +sha256 cbb0cac5825e940b4ea2f31a336d2aaf6db39847d456920afd8e443804420dbb lzlib-0.4.3.tar.gz +sha256 f817d4a37077e94e9adf379f46ba5cc0b68775d7add2bbd5b2ca68ba140ad5bb lzlib.c diff --git a/package/lzlib/lzlib.mk b/package/lzlib/lzlib.mk index f468a1c839..74624d5019 100644 --- a/package/lzlib/lzlib.mk +++ b/package/lzlib/lzlib.mk @@ -8,6 +8,7 @@ LZLIB_VERSION = 0.4.3 LZLIB_SITE = $(call github,LuaDist,lzlib,$(LZLIB_VERSION)) LZLIB_DEPENDENCIES = lua zlib LZLIB_LICENSE = MIT +LZLIB_LICENSE_FILES = lzlib.c LZLIB_CONF_OPTS = -DINSTALL_CMOD="/usr/lib/lua/$(LUAINTERPRETER_ABIVER)" \ -DINSTALL_LMOD="/usr/share/lua/$(LUAINTERPRETER_ABIVER)" From a2b98a6add92e38dbcd4ca9fda25454a38c719e3 Mon Sep 17 00:00:00 2001 From: Sven Klomp Date: Thu, 5 Nov 2020 14:11:49 +0100 Subject: [PATCH 018/125] package/davfs2: add davfs2 user and group mount.davfs expects the availability of the user and group davfs2. Signed-off-by: Sven Klomp Signed-off-by: Thomas Petazzoni --- package/davfs2/davfs2.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/davfs2/davfs2.mk b/package/davfs2/davfs2.mk index a82e9d2f7c..bc2aa79646 100644 --- a/package/davfs2/davfs2.mk +++ b/package/davfs2/davfs2.mk @@ -18,4 +18,8 @@ DAVFS2_CONF_ENV += \ ac_cv_path_NEON_CONFIG=$(STAGING_DIR)/usr/bin/neon-config \ LIBS=$(TARGET_NLS_LIBS) +define DAVFS2_USERS + davfs2 -1 davfs2 -1 * - - - davfs user +endef + $(eval $(autotools-package)) From e3c86f5c9e466ed5135e824d6dcebcfd7f5ac1ab Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 6 Nov 2020 19:02:54 +0100 Subject: [PATCH 019/125] package/cryptsetup: break circular dependency Build fails because of the following circular dependency: cryptsetup -> util-linux -> udev -> systemd -> cryptsetup which results in the following build failure: checking uuid/uuid.h usability... no checking uuid/uuid.h presence... no checking for uuid/uuid.h... no configure: error: You need the uuid library. To break it, apply the same ugly workaround that was applied for libglib2 until a better solution is found: https://patchwork.ozlabs.org/project/buildroot/patch/20201101150619.1709959-1-fontaine.fabrice@gmail.com/ Fixes: - http://autobuild.buildroot.org/results/a1a020a3e1c2383a030fcd73eae7c0fe5f82b022 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/cryptsetup/cryptsetup.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk index a2abf776cc..60097595b4 100644 --- a/package/cryptsetup/cryptsetup.mk +++ b/package/cryptsetup/cryptsetup.mk @@ -8,8 +8,10 @@ CRYPTSETUP_VERSION_MAJOR = 2.3 CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).4 CRYPTSETUP_SOURCE = cryptsetup-$(CRYPTSETUP_VERSION).tar.xz CRYPTSETUP_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/cryptsetup/v$(CRYPTSETUP_VERSION_MAJOR) -CRYPTSETUP_DEPENDENCIES = lvm2 popt util-linux host-pkgconf json-c libargon2 \ +CRYPTSETUP_DEPENDENCIES = \ + lvm2 popt util-linux host-pkgconf json-c libargon2 \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_LIBS),util-linux-libs,util-linux) \ $(TARGET_NLS_DEPENDENCIES) CRYPTSETUP_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (library) CRYPTSETUP_LICENSE_FILES = COPYING COPYING.LGPL From 62bb541d99e24177ad0119d347040da00131b510 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 7 Nov 2020 16:55:40 +0100 Subject: [PATCH 020/125] package/davfs2: fix indent Fix the following check-package warning added by commit a2b98a6add92e38dbcd4ca9fda25454a38c719e3: package/davfs2/davfs2.mk:22: expected indent with tabs Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/davfs2/davfs2.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/davfs2/davfs2.mk b/package/davfs2/davfs2.mk index bc2aa79646..1099f1b13b 100644 --- a/package/davfs2/davfs2.mk +++ b/package/davfs2/davfs2.mk @@ -19,7 +19,7 @@ DAVFS2_CONF_ENV += \ LIBS=$(TARGET_NLS_LIBS) define DAVFS2_USERS - davfs2 -1 davfs2 -1 * - - - davfs user + davfs2 -1 davfs2 -1 * - - - davfs user endef $(eval $(autotools-package)) From 06066336084e37ae038b67d0fa51411cc281e8e7 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 8 Nov 2020 18:11:41 +0100 Subject: [PATCH 021/125] package/libexif: add security fix for CVE-2020-0198 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- ...ed-another-unsigned-integer-overflow.patch | 63 +++++++++++++++++++ package/libexif/libexif.mk | 2 + 2 files changed, 65 insertions(+) create mode 100644 package/libexif/0001-fixed-another-unsigned-integer-overflow.patch diff --git a/package/libexif/0001-fixed-another-unsigned-integer-overflow.patch b/package/libexif/0001-fixed-another-unsigned-integer-overflow.patch new file mode 100644 index 0000000000..77bdfe89d2 --- /dev/null +++ b/package/libexif/0001-fixed-another-unsigned-integer-overflow.patch @@ -0,0 +1,63 @@ +From ce03ad7ef4e8aeefce79192bf5b6f69fae396f0c Mon Sep 17 00:00:00 2001 +From: Marcus Meissner +Date: Mon, 8 Jun 2020 17:27:06 +0200 +Subject: [PATCH] fixed another unsigned integer overflow + +first fixed by google in android fork, +https://android.googlesource.com/platform/external/libexif/+/1e187b62682ffab5003c702657d6d725b4278f16%5E%21/#F0 + +(use a more generic overflow check method, also check second overflow instance.) + +https://security-tracker.debian.org/tracker/CVE-2020-0198 + +Downloaded from upstream commit: +https://github.com/libexif/libexif/commit/ce03ad7ef4e8aeefce79192bf5b6f69fae396f0c + +Signed-off-by: Bernd Kuhls +--- + libexif/exif-data.c | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/libexif/exif-data.c b/libexif/exif-data.c +index 8b280d3..b495726 100644 +--- a/libexif/exif-data.c ++++ b/libexif/exif-data.c +@@ -47,6 +47,8 @@ + #undef JPEG_MARKER_APP1 + #define JPEG_MARKER_APP1 0xe1 + ++#define CHECKOVERFLOW(offset,datasize,structsize) (( offset >= datasize) || (structsize > datasize) || (offset > datasize - structsize )) ++ + static const unsigned char ExifHeader[] = {0x45, 0x78, 0x69, 0x66, 0x00, 0x00}; + + struct _ExifDataPrivate +@@ -327,7 +329,7 @@ exif_data_load_data_thumbnail (ExifData *data, const unsigned char *d, + exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", "Bogus thumbnail offset (%u).", o); + return; + } +- if (s > ds - o) { ++ if (CHECKOVERFLOW(o,ds,s)) { + exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", "Bogus thumbnail size (%u), max would be %u.", s, ds-o); + return; + } +@@ -420,9 +422,9 @@ exif_data_load_data_content (ExifData *data, ExifIfd ifd, + } + + /* Read the number of entries */ +- if ((offset + 2 < offset) || (offset + 2 < 2) || (offset + 2 > ds)) { ++ if (CHECKOVERFLOW(offset, ds, 2)) { + exif_log (data->priv->log, EXIF_LOG_CODE_CORRUPT_DATA, "ExifData", +- "Tag data past end of buffer (%u > %u)", offset+2, ds); ++ "Tag data past end of buffer (%u+2 > %u)", offset, ds); + return; + } + n = exif_get_short (d + offset, data->priv->order); +@@ -431,7 +433,7 @@ exif_data_load_data_content (ExifData *data, ExifIfd ifd, + offset += 2; + + /* Check if we have enough data. */ +- if (offset + 12 * n > ds) { ++ if (CHECKOVERFLOW(offset, ds, 12*n)) { + n = (ds - offset) / 12; + exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", + "Short data; only loading %hu entries...", n); diff --git a/package/libexif/libexif.mk b/package/libexif/libexif.mk index c945c275a7..979d592447 100644 --- a/package/libexif/libexif.mk +++ b/package/libexif/libexif.mk @@ -12,5 +12,7 @@ LIBEXIF_INSTALL_STAGING = YES LIBEXIF_DEPENDENCIES = host-pkgconf LIBEXIF_LICENSE = LGPL-2.1+ LIBEXIF_LICENSE_FILES = COPYING +# 0001-fixed-another-unsigned-integer-overflow.patch +LIBEXIF_IGNORE_CVES += CVE-2020-0198 $(eval $(autotools-package)) From 70a036fb307da409652807dc7b7a6d20a8ef0b9e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 8 Nov 2020 18:11:42 +0100 Subject: [PATCH 022/125] package/libexif: add security fix for CVE-2020-0452 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- ...002-fixed-a-incorrect-overflow-check.patch | 36 +++++++++++++++++++ package/libexif/libexif.mk | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 package/libexif/0002-fixed-a-incorrect-overflow-check.patch diff --git a/package/libexif/0002-fixed-a-incorrect-overflow-check.patch b/package/libexif/0002-fixed-a-incorrect-overflow-check.patch new file mode 100644 index 0000000000..1946f78228 --- /dev/null +++ b/package/libexif/0002-fixed-a-incorrect-overflow-check.patch @@ -0,0 +1,36 @@ +From 9266d14b5ca4e29b970fa03272318e5f99386e06 Mon Sep 17 00:00:00 2001 +From: Marcus Meissner +Date: Thu, 5 Nov 2020 09:50:08 +0100 +Subject: [PATCH] fixed a incorrect overflow check that could be optimized + away. + +inspired by: +https://android.googlesource.com/platform/external/libexif/+/8e7345f3bc0bad06ac369d6cbc1124c8ceaf7d4b + +https://source.android.com/security/bulletin/2020-11-01 + +CVE-2020-0452 + +Downloaded from upstream commit, rebased for 0.6.22: +https://github.com/libexif/libexif/commit/9266d14b5ca4e29b970fa03272318e5f99386e06 + +Signed-off-by: Bernd Kuhls +--- + libexif/exif-entry.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libexif/exif-entry.c b/libexif/exif-entry.c +index 3fc0ff9..4b866ce 100644 +--- a/libexif/exif-entry.c ++++ b/libexif/exif-entry.c +@@ -1371,8 +1371,8 @@ exif_entry_get_value (ExifEntry *e, char *val, unsigned int maxlen) + { + unsigned char *utf16; + +- /* Sanity check the size to prevent overflow */ +- if (e->size+sizeof(uint16_t)+1 < e->size) break; ++ /* Sanity check the size to prevent overflow. Note EXIF files are 64kb at most. */ ++ if (e->size >= 65536 - sizeof(uint16_t)*2) break; + + /* The tag may not be U+0000-terminated , so make a local + U+0000-terminated copy before converting it */ diff --git a/package/libexif/libexif.mk b/package/libexif/libexif.mk index 979d592447..594e8855c5 100644 --- a/package/libexif/libexif.mk +++ b/package/libexif/libexif.mk @@ -14,5 +14,7 @@ LIBEXIF_LICENSE = LGPL-2.1+ LIBEXIF_LICENSE_FILES = COPYING # 0001-fixed-another-unsigned-integer-overflow.patch LIBEXIF_IGNORE_CVES += CVE-2020-0198 +# 0002-fixed-a-incorrect-overflow-check.patch +LIBEXIF_IGNORE_CVES += CVE-2020-0452 $(eval $(autotools-package)) From 19275a1a56dbd2cebb9ef91430a0364c0d3a1214 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 7 Nov 2020 15:06:26 +0100 Subject: [PATCH 023/125] package/fbtft: add license file Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/fbtft/fbtft.hash | 1 + package/fbtft/fbtft.mk | 1 + 2 files changed, 2 insertions(+) diff --git a/package/fbtft/fbtft.hash b/package/fbtft/fbtft.hash index 894d9794a9..5d08d0ef85 100644 --- a/package/fbtft/fbtft.hash +++ b/package/fbtft/fbtft.hash @@ -1,2 +1,3 @@ # locally computed sha256 0e81de89fdd7ab810716fc0549e767527f342e829309dee5c2cca1e9d1728770 fbtft-274035404701245e7491c0c6471c5b72ade4d491.tar.gz +sha256 a9ca80d65a5ef10fe614a6c1e8c8d4d3b96637e8855a96c7cf0fa438526097a7 fbtft-core.c diff --git a/package/fbtft/fbtft.mk b/package/fbtft/fbtft.mk index b935e741d5..cc11d867fc 100644 --- a/package/fbtft/fbtft.mk +++ b/package/fbtft/fbtft.mk @@ -7,5 +7,6 @@ FBTFT_VERSION = 274035404701245e7491c0c6471c5b72ade4d491 FBTFT_SITE = $(call github,notro,fbtft,$(FBTFT_VERSION)) FBTFT_LICENSE = GPL-2.0 +FBTFT_LICENSE_FILES = fbtft-core.c $(eval $(generic-package)) From d8dad069c861468b17397f01875b95e7375891d7 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 7 Nov 2020 17:01:22 +0100 Subject: [PATCH 024/125] package/guile: disable jit on ARM with gcc < 5 jit is enabled by default since version 3.0.0 on x86-64, i686, ARMv7 and AArch64 targets however it raises the following build failure on ARM with gcc 4.8: jit.c:232:1: error: initializer element is not constant static const jit_gpr_t THREAD = JIT_V0; ^ This build failure was also reported with ARM on gcc 4.9: https://www.mail-archive.com/guile-user@gnu.org/msg11497.html So just disable jit with ARM and gcc < 5 Fixes: - http://autobuild.buildroot.org/results/ba051bb00a6cad3cfd5ffeb197de20ea0eaef33e Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/guile/guile.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/guile/guile.mk b/package/guile/guile.mk index 5750b85f49..f1623008c8 100644 --- a/package/guile/guile.mk +++ b/package/guile/guile.mk @@ -38,6 +38,11 @@ ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM)$(BR2_OPTIMIZE_S),yy) GUILE_CFLAGS += -O2 endif +# jit triggers build failures on ARM and gcc < 5 +ifeq ($(BR2_arm):$(BR2_TOOLCHAIN_GCC_AT_LEAST_5),y:) +GUILE_CONF_OPTS += --disable-jit +endif + # It can use readline, but on the condition that it was build against # ncurses. If both aren't present disable readline support since the # host readline/ncurses support can poison the build. From dbf2ad443e7988cdb1bed5a153df747de9d2d7ca Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 7 Nov 2020 17:45:47 +0100 Subject: [PATCH 025/125] package/guile: renumber patch Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ....patch => 0003-Makefile.am-fix-build-without-makeinfo.patch} | 0 package/guile/guile.mk | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename package/guile/{0004-Makefile.am-fix-build-without-makeinfo.patch => 0003-Makefile.am-fix-build-without-makeinfo.patch} (100%) diff --git a/package/guile/0004-Makefile.am-fix-build-without-makeinfo.patch b/package/guile/0003-Makefile.am-fix-build-without-makeinfo.patch similarity index 100% rename from package/guile/0004-Makefile.am-fix-build-without-makeinfo.patch rename to package/guile/0003-Makefile.am-fix-build-without-makeinfo.patch diff --git a/package/guile/guile.mk b/package/guile/guile.mk index f1623008c8..5e901bb10f 100644 --- a/package/guile/guile.mk +++ b/package/guile/guile.mk @@ -9,7 +9,7 @@ GUILE_SOURCE = guile-$(GUILE_VERSION).tar.xz GUILE_SITE = $(BR2_GNU_MIRROR)/guile GUILE_INSTALL_STAGING = YES # For 0002-calculate-csqrt_manually.patch and -# 0004-Makefile.am-fix-build-without-makeinfo.patch +# 0003-Makefile.am-fix-build-without-makeinfo.patch GUILE_AUTORECONF = YES GUILE_LICENSE = LGPL-3.0+ GUILE_LICENSE_FILES = LICENSE COPYING COPYING.LESSER From e214b41b00f2feeed46cb953f1a0004df3156320 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 7 Nov 2020 17:38:44 +0100 Subject: [PATCH 026/125] package/tinyproxy: add hash for license file Add hash for license file and update indentation (two spaces). Fixes: http://autobuild.buildroot.net/results/b07/b07052de34ca24d5c62f6facec2ced5e092d26e2/ Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/tinyproxy/tinyproxy.hash | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/tinyproxy/tinyproxy.hash b/package/tinyproxy/tinyproxy.hash index 099c974881..8096741597 100644 --- a/package/tinyproxy/tinyproxy.hash +++ b/package/tinyproxy/tinyproxy.hash @@ -1,2 +1,3 @@ # locally computed -sha256 a23a8f647f622f01e51b93fa882ea5a15c20e026d45c3aafa81ec579e464daf7 tinyproxy-1.10.0.tar.bz2 +sha256 a23a8f647f622f01e51b93fa882ea5a15c20e026d45c3aafa81ec579e464daf7 tinyproxy-1.10.0.tar.bz2 +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING From 101878cd88f606f7e862d4c51a549025fa019119 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 7 Nov 2020 17:42:43 +0100 Subject: [PATCH 027/125] package/{mesa3d, mesa3d-headers}: bump version to 20.2.2 Release notes of this bugfix release:: https://lists.freedesktop.org/archives/mesa-announce/2020-November/000604.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- package/mesa3d/mesa3d.hash | 6 +++--- package/mesa3d/mesa3d.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index afb2e799c4..12020e6551 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -12,7 +12,7 @@ endif # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 20.2.1 +MESA3D_HEADERS_VERSION = 20.2.2 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://mesa.freedesktop.org/archive MESA3D_HEADERS_DL_SUBDIR = mesa3d diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index 287ddc1c0e..7d3a928822 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,6 +1,6 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2020-October/000602.html -sha256 d1a46d9a3f291bc0e0374600bdcb59844fa3eafaa50398e472a36fc65fd0244a mesa-20.2.1.tar.xz -sha512 5d609359754db3e3679bffd5306c1f1d1cf46a2ea98428a9451fe0d99bbf73da863c5d94e6561712cd2012ad13615666cf3d712e54f379b34c091fead39d4795 mesa-20.2.1.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2020-November/000604.html +sha256 1f93eb1090cf71490cd0e204e04f8427a82b6ed534b7f49ca50cea7dcc89b861 mesa-20.2.2.tar.xz +sha512 36673a44fad8c6db3516b23b75825a52df520b9fe1387160301dd5051f420ebf0d1c7b4f8ff96a5547b79c2ba42fd782305ae23ac956f688b695c07b8fe73192 mesa-20.2.2.tar.xz # License sha256 1361129baa4519b6ed27a1bf4aeee33a58b060bf7bb9b6ea415ecede04e35e46 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 620a6eece3..a44d599b03 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 20.2.1 +MESA3D_VERSION = 20.2.2 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://mesa.freedesktop.org/archive MESA3D_LICENSE = MIT, SGI, Khronos From 2185877a805a2a1c6821b49ac74ee3aadfc68f58 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 7 Nov 2020 18:05:59 +0100 Subject: [PATCH 028/125] package/bitcoin: drop boost program-options boost program-options is not needed since version 0.17.0 and https://github.com/bitcoin/bitcoin/commit/f447a0a7079619f0d650084df192781cca9fd826 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/bitcoin/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/bitcoin/Config.in b/package/bitcoin/Config.in index 1f08f9f26f..89ee2e3938 100644 --- a/package/bitcoin/Config.in +++ b/package/bitcoin/Config.in @@ -19,7 +19,6 @@ config BR2_PACKAGE_BITCOIN select BR2_PACKAGE_BOOST_FILESYSTEM select BR2_PACKAGE_BOOST_THREAD select BR2_PACKAGE_BOOST_CHRONO - select BR2_PACKAGE_BOOST_PROGRAM_OPTIONS select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_LIBEVENT help From c04a56af130a6d4276dbbd319639a3cdbf509229 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 7 Nov 2020 18:43:37 +0100 Subject: [PATCH 029/125] package/xen: disable go tools go tools are enabled by default since version 4.14.0 and https://github.com/xen-project/xen/commit/1e13ea98bbb8369d065af4666c45c26dab5240d5 Disable them to avoid the following build failure on arm or aarch64 (when host-go is built before xen): aarch64-none-linux-gnu-gcc: error: unrecognized command line option '-m64' Fixes: - http://autobuild.buildroot.org/results/08948e4c4a88fbf09cae524949e5b656882a6e9a - http://autobuild.buildroot.org/results/d966585c931ca4a4ae6a854a21e07eec4c277a02 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/xen/xen.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/xen/xen.mk b/package/xen/xen.mk index a30e80e5e7..8f1fa7db76 100644 --- a/package/xen/xen.mk +++ b/package/xen/xen.mk @@ -18,6 +18,7 @@ XEN_ARCH = arm32 endif XEN_CONF_OPTS = \ + --disable-golang \ --disable-ocamltools \ --with-initddir=/etc/init.d From c2bfbdecd50d9c63715d2cf9e92d0e115b19e50b Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 7 Nov 2020 23:55:35 +0100 Subject: [PATCH 030/125] package/elf2flt: add support for binutils >= 2.34 Various bfd section macros and functions like bfd_section_size() have been modified starting with binutils >= 2.34. Add a patch to handle this API change. Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- .../0003-elf2flt-handle-binutils-2.34.patch | 377 ++++++++++++++++++ package/elf2flt/elf2flt.mk | 3 + 2 files changed, 380 insertions(+) create mode 100644 package/elf2flt/0003-elf2flt-handle-binutils-2.34.patch diff --git a/package/elf2flt/0003-elf2flt-handle-binutils-2.34.patch b/package/elf2flt/0003-elf2flt-handle-binutils-2.34.patch new file mode 100644 index 0000000000..16d5633385 --- /dev/null +++ b/package/elf2flt/0003-elf2flt-handle-binutils-2.34.patch @@ -0,0 +1,377 @@ +From 26165906f85d82f0a4456f34b5c60fcaaef48535 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Wed, 5 Feb 2020 10:31:32 +0100 +Subject: [PATCH] elf2flt: handle binutils >= 2.34 + +The latest Binutils release (2.34) is not compatible with elf2flt due +to a change in bfd_section_* macros [1]. The issue has been reported +to the Binutils mailing list but Alan Modra recommend to bundle +libbfd library sources into each projects using it [2]. That's +because the API is not stable over the time without any backward +compatibility guaranties. + +On the other hand, the elf2flt tools needs to support modified +version of binutils for specific arch/target [3]. + +Add two tests in the configure script to detect this API change +in order to support binutils < 2.34 and binutils >= 2.34. + +Upstream status: [4] + +[1] https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=fd3619828e94a24a92cddec42cbc0ab33352eeb4 +[2] https://sourceware.org/ml/binutils/2020-02/msg00044.html +[3] https://github.com/uclinux-dev/elf2flt/issues/14 +[4] https://github.com/uclinux-dev/elf2flt/pull/15 + +Signed-off-by: Romain Naour +--- + configure.ac | 16 +++++++++++ + elf2flt.c | 81 +++++++++++++++++++++++++++++----------------------- + 2 files changed, 61 insertions(+), 36 deletions(-) + +diff --git a/configure.ac b/configure.ac +index e82eb1d..cf7dea8 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -229,6 +229,22 @@ AC_CHECK_FUNCS([ \ + strsignal \ + ]) + ++dnl Various bfd section macros and functions like bfd_section_size() have been ++dnl modified starting with binutils >= 2.34. ++dnl Check if the prototypes take a bfd argument. ++if test "$binutils_build_dir" != "NONE"; then ++ CFLAGS="-I$binutils_include_dir -I$bfd_include_dir $CFLAGS" ++fi ++ ++AC_TRY_COMPILE([#include ], ++ [const asection *sec; bfd_section_size(sec);], ++ bfd_section_api_takes_bfd=no, ++ bfd_section_api_takes_bfd=yes) ++if test "$bfd_section_api_takes_bfd" = "yes" ; then ++ AC_DEFINE(HAVE_BFD_SECTION_API_TAKES_BFD, 1, ++ [define to 1 for binutils < 2.34]) ++fi ++ + if test "$GCC" = yes ; then + CFLAGS="-Wall $CFLAGS" + if test "$werror" = 1 ; then +diff --git a/elf2flt.c b/elf2flt.c +index b93aecd..3bcf4fe 100644 +--- a/elf2flt.c ++++ b/elf2flt.c +@@ -149,6 +149,17 @@ const char *elf2flt_progname; + #define O_BINARY 0 + #endif + ++/* ++ * The bfd parameter isn't actually used by any of the bfd_section funcs and ++ * have been removed since binutils 2.34. ++ */ ++#ifdef HAVE_BFD_SECTION_API_TAKES_BFD ++#define elf2flt_bfd_section_size(s) bfd_section_size(NULL, s) ++#define elf2flt_bfd_section_vma(s) bfd_section_vma(NULL, s) ++#else ++#define elf2flt_bfd_section_size(s) bfd_section_size(s) ++#define elf2flt_bfd_section_vma(s) bfd_section_vma(s) ++#endif + + /* Extra output when running. */ + static int verbose = 0; +@@ -323,10 +334,8 @@ compare_relocs (const void *pa, const void *pb) + else if (!rb->sym_ptr_ptr || !*rb->sym_ptr_ptr) + return 1; + +- a_vma = bfd_section_vma(compare_relocs_bfd, +- (*(ra->sym_ptr_ptr))->section); +- b_vma = bfd_section_vma(compare_relocs_bfd, +- (*(rb->sym_ptr_ptr))->section); ++ a_vma = elf2flt_bfd_section_vma((*(ra->sym_ptr_ptr))->section); ++ b_vma = elf2flt_bfd_section_vma((*(rb->sym_ptr_ptr))->section); + va = (*(ra->sym_ptr_ptr))->value + a_vma + ra->addend; + vb = (*(rb->sym_ptr_ptr))->value + b_vma + rb->addend; + return va - vb; +@@ -403,7 +412,7 @@ output_relocs ( + } + + for (a = abs_bfd->sections; (a != (asection *) NULL); a = a->next) { +- section_vma = bfd_section_vma(abs_bfd, a); ++ section_vma = elf2flt_bfd_section_vma(a); + + if (verbose) + printf("SECTION: %s [%p]: flags=0x%x vma=0x%"PRIx32"\n", +@@ -442,7 +451,7 @@ output_relocs ( + continue; + if (verbose) + printf(" RELOCS: %s [%p]: flags=0x%x vma=0x%"BFD_VMA_FMT"x\n", +- r->name, r, r->flags, bfd_section_vma(abs_bfd, r)); ++ r->name, r, r->flags, elf2flt_bfd_section_vma(r)); + if ((r->flags & SEC_RELOC) == 0) + continue; + relsize = bfd_get_reloc_upper_bound(rel_bfd, r); +@@ -694,7 +703,7 @@ output_relocs ( + case R_BFIN_RIMM16: + case R_BFIN_LUIMM16: + case R_BFIN_HUIMM16: +- sym_vma = bfd_section_vma(abs_bfd, sym_section); ++ sym_vma = elf2flt_bfd_section_vma(sym_section); + sym_addr += sym_vma + q->addend; + + if (weak_und_symbol(sym_section->name, (*(q->sym_ptr_ptr)))) +@@ -727,7 +736,7 @@ output_relocs ( + break; + + case R_BFIN_BYTE4_DATA: +- sym_vma = bfd_section_vma(abs_bfd, sym_section); ++ sym_vma = elf2flt_bfd_section_vma(sym_section); + sym_addr += sym_vma + q->addend; + + if (weak_und_symbol (sym_section->name, (*(q->sym_ptr_ptr)))) +@@ -885,7 +894,7 @@ output_relocs ( + #if defined(TARGET_m68k) + case R_68K_32: + relocation_needed = 1; +- sym_vma = bfd_section_vma(abs_bfd, sym_section); ++ sym_vma = elf2flt_bfd_section_vma(sym_section); + sym_addr += sym_vma + q->addend; + break; + case R_68K_PC16: +@@ -910,7 +919,7 @@ output_relocs ( + q->address, sym_addr, + (*p)->howto->rightshift, + *(uint32_t *)r_mem); +- sym_vma = bfd_section_vma(abs_bfd, sym_section); ++ sym_vma = elf2flt_bfd_section_vma(sym_section); + sym_addr += sym_vma + q->addend; + break; + case R_ARM_GOT32: +@@ -938,7 +947,7 @@ output_relocs ( + #ifdef TARGET_v850 + case R_V850_ABS32: + relocation_needed = 1; +- sym_vma = bfd_section_vma(abs_bfd, sym_section); ++ sym_vma = elf2flt_bfd_section_vma(sym_section); + sym_addr += sym_vma + q->addend; + break; + case R_V850_ZDA_16_16_OFFSET: +@@ -960,7 +969,7 @@ output_relocs ( + sym_addr = (*(q->sym_ptr_ptr))->value; + q->address -= 1; + r_mem -= 1; /* tracks q->address */ +- sym_vma = bfd_section_vma(abs_bfd, sym_section); ++ sym_vma = elf2flt_bfd_section_vma(sym_section); + sym_addr += sym_vma + q->addend; + sym_addr |= (*(unsigned char *)r_mem<<24); + break; +@@ -973,7 +982,7 @@ output_relocs ( + /* Absolute symbol done not relocation */ + relocation_needed = !bfd_is_abs_section(sym_section); + sym_addr = (*(q->sym_ptr_ptr))->value; +- sym_vma = bfd_section_vma(abs_bfd, sym_section); ++ sym_vma = elf2flt_bfd_section_vma(sym_section); + sym_addr += sym_vma + q->addend; + break; + case R_H8_DIR32: +@@ -986,7 +995,7 @@ output_relocs ( + } + relocation_needed = 1; + sym_addr = (*(q->sym_ptr_ptr))->value; +- sym_vma = bfd_section_vma(abs_bfd, sym_section); ++ sym_vma = elf2flt_bfd_section_vma(sym_section); + sym_addr += sym_vma + q->addend; + break; + case R_H8_PCREL16: +@@ -1012,7 +1021,7 @@ output_relocs ( + #ifdef TARGET_microblaze + case R_MICROBLAZE_64: + /* work out the relocation */ +- sym_vma = bfd_section_vma(abs_bfd, sym_section); ++ sym_vma = elf2flt_bfd_section_vma(sym_section); + sym_addr += sym_vma + q->addend; + /* Write relocated pointer back */ + r_mem[2] = (sym_addr >> 24) & 0xff; +@@ -1026,7 +1035,7 @@ output_relocs ( + pflags = 0x80000000; + break; + case R_MICROBLAZE_32: +- sym_vma = bfd_section_vma(abs_bfd, sym_section); ++ sym_vma = elf2flt_bfd_section_vma(sym_section); + sym_addr += sym_vma + q->addend; + relocation_needed = 1; + break; +@@ -1058,7 +1067,7 @@ output_relocs ( + case R_NIOS2_BFD_RELOC_32: + relocation_needed = 1; + pflags = (FLAT_NIOS2_R_32 << 28); +- sym_vma = bfd_section_vma(abs_bfd, sym_section); ++ sym_vma = elf2flt_bfd_section_vma(sym_section); + sym_addr += sym_vma + q->addend; + /* modify target, in target order */ + *(unsigned long *)r_mem = htoniosl(sym_addr); +@@ -1068,7 +1077,7 @@ output_relocs ( + unsigned long exist_val; + relocation_needed = 1; + pflags = (FLAT_NIOS2_R_CALL26 << 28); +- sym_vma = bfd_section_vma(abs_bfd, sym_section); ++ sym_vma = elf2flt_bfd_section_vma(sym_section); + sym_addr += sym_vma + q->addend; + + /* modify target, in target order */ +@@ -1099,7 +1108,7 @@ output_relocs ( + ? FLAT_NIOS2_R_HIADJ_LO : FLAT_NIOS2_R_HI_LO; + pflags <<= 28; + +- sym_vma = bfd_section_vma(abs_bfd, sym_section); ++ sym_vma = elf2flt_bfd_section_vma(sym_section); + sym_addr += sym_vma + q->addend; + + /* modify high 16 bits, in target order */ +@@ -1132,7 +1141,7 @@ output_relocs ( + goto NIOS2_RELOC_ERR; + } + /* _gp holds a absolute value, otherwise the ld cannot generate correct code */ +- sym_vma = bfd_section_vma(abs_bfd, sym_section); ++ sym_vma = elf2flt_bfd_section_vma(sym_section); + //printf("sym=%x, %d, _gp=%x, %d\n", sym_addr+sym_vma, sym_addr+sym_vma, gp, gp); + sym_addr += sym_vma + q->addend; + sym_addr -= gp; +@@ -1213,7 +1222,7 @@ NIOS2_RELOC_ERR: + case R_SPARC_32: + case R_SPARC_UA32: + relocation_needed = 1; +- sym_vma = bfd_section_vma(abs_bfd, sym_section); ++ sym_vma = elf2flt_bfd_section_vma(sym_section); + sym_addr += sym_vma + q->addend; + break; + case R_SPARC_PC22: +@@ -1232,7 +1241,7 @@ NIOS2_RELOC_ERR: + case R_SPARC_HI22: + relocation_needed = 1; + pflags = 0x80000000; +- sym_vma = bfd_section_vma(abs_bfd, sym_section); ++ sym_vma = elf2flt_bfd_section_vma(sym_section); + sym_addr += sym_vma + q->addend; + sym_addr |= ( + htonl(*(uint32_t *)r_mem) +@@ -1242,7 +1251,7 @@ NIOS2_RELOC_ERR: + case R_SPARC_LO10: + relocation_needed = 1; + pflags = 0x40000000; +- sym_vma = bfd_section_vma(abs_bfd, sym_section); ++ sym_vma = elf2flt_bfd_section_vma(sym_section); + sym_addr += sym_vma + q->addend; + sym_addr &= 0x000003ff; + sym_addr |= ( +@@ -1256,7 +1265,7 @@ NIOS2_RELOC_ERR: + #ifdef TARGET_sh + case R_SH_DIR32: + relocation_needed = 1; +- sym_vma = bfd_section_vma(abs_bfd, sym_section); ++ sym_vma = elf2flt_bfd_section_vma(sym_section); + sym_addr += sym_vma + q->addend; + break; + case R_SH_REL32: +@@ -1288,7 +1297,7 @@ NIOS2_RELOC_ERR: + case R_E1_CONST31: + relocation_needed = 1; + DBG_E1("Handling Reloc \n"); +- sec_vma = bfd_section_vma(abs_bfd, sym_section); ++ sec_vma = elf2flt_bfd_section_vma(sym_section); + DBG_E1("sec_vma : [0x%x], sym_addr : [0x%x], q->address : [0x%x]\n", + sec_vma, sym_addr, q->address); + sym_addr = sec_vma + sym_addr; +@@ -1303,7 +1312,7 @@ NIOS2_RELOC_ERR: + relocation_needed = 0; + DBG_E1("Handling Reloc \n"); + DBG_E1("DONT RELOCATE AT LOADING\n"); +- sec_vma = bfd_section_vma(abs_bfd, sym_section); ++ sec_vma = elf2flt_bfd_section_vma(sym_section); + DBG_E1("sec_vma : [0x%x], sym_addr : [0x%x], q->address : [0x%x]\n", + sec_vma, sym_addr, q->address); + sym_addr = sec_vma + sym_addr; +@@ -1330,7 +1339,7 @@ NIOS2_RELOC_ERR: + relocation_needed = 0; + DBG_E1("Handling Reloc \n"); + DBG_E1("DONT RELOCATE AT LOADING\n"); +- sec_vma = bfd_section_vma(abs_bfd, sym_section); ++ sec_vma = elf2flt_bfd_section_vma(sym_section); + DBG_E1("sec_vma : [0x%x], sym_addr : [0x%x], q->address : [0x%x]\n", + sec_vma, sym_addr, q->address); + sym_addr = sec_vma + sym_addr; +@@ -1363,7 +1372,7 @@ NIOS2_RELOC_ERR: + DBG_E1("Handling Reloc \n"); + DIS29_RELOCATION: + relocation_needed = 1; +- sec_vma = bfd_section_vma(abs_bfd, sym_section); ++ sec_vma = elf2flt_bfd_section_vma(sym_section); + DBG_E1("sec_vma : [0x%x], sym_addr : [0x%08x]\n", + sec_vma, sym_addr); + sym_addr = sec_vma + sym_addr; +@@ -1380,7 +1389,7 @@ DIS29_RELOCATION: + relocation_needed = 0; + DBG_E1("Handling Reloc \n"); + DBG_E1("DONT RELOCATE AT LOADING\n"); +- sec_vma = bfd_section_vma(abs_bfd, sym_section); ++ sec_vma = elf2flt_bfd_section_vma(sym_section); + DBG_E1("sec_vma : [0x%x], sym_addr : [0x%x]\n", + sec_vma, sym_addr); + sym_addr = sec_vma + sym_addr; +@@ -1406,7 +1415,7 @@ DIS29_RELOCATION: + case R_E1_IMM32: + relocation_needed = 1; + DBG_E1("Handling Reloc \n"); +- sec_vma = bfd_section_vma(abs_bfd, sym_section); ++ sec_vma = elf2flt_bfd_section_vma(sym_section); + DBG_E1("sec_vma : [0x%x], sym_addr : [0x%x]\n", + sec_vma, sym_addr); + sym_addr = sec_vma + sym_addr; +@@ -1422,7 +1431,7 @@ DIS29_RELOCATION: + case R_E1_WORD: + relocation_needed = 1; + DBG_E1("Handling Reloc \n"); +- sec_vma = bfd_section_vma(abs_bfd, sym_section); ++ sec_vma = elf2flt_bfd_section_vma(sym_section); + DBG_E1("sec_vma : [0x%x], sym_addr : [0x%x]\n", + sec_vma, sym_addr); + sym_addr = sec_vma + sym_addr; +@@ -1449,7 +1458,7 @@ DIS29_RELOCATION: + } + + sprintf(&addstr[0], "+0x%lx", sym_addr - (*(q->sym_ptr_ptr))->value - +- bfd_section_vma(abs_bfd, sym_section)); ++ elf2flt_bfd_section_vma(sym_section)); + + + /* +@@ -1887,8 +1896,8 @@ int main(int argc, char *argv[]) + } else + continue; + +- sec_size = bfd_section_size(abs_bfd, s); +- sec_vma = bfd_section_vma(abs_bfd, s); ++ sec_size = elf2flt_bfd_section_size(s); ++ sec_vma = elf2flt_bfd_section_vma(s); + + if (sec_vma < *vma) { + if (*len > 0) +@@ -1913,7 +1922,7 @@ int main(int argc, char *argv[]) + if (s->flags & SEC_CODE) + if (!bfd_get_section_contents(abs_bfd, s, + text + (s->vma - text_vma), 0, +- bfd_section_size(abs_bfd, s))) ++ elf2flt_bfd_section_size(s))) + { + fatal("read error section %s", s->name); + } +@@ -1939,7 +1948,7 @@ int main(int argc, char *argv[]) + if (s->flags & SEC_DATA) + if (!bfd_get_section_contents(abs_bfd, s, + data + (s->vma - data_vma), 0, +- bfd_section_size(abs_bfd, s))) ++ elf2flt_bfd_section_size(s))) + { + fatal("read error section %s", s->name); + } +-- +2.25.4 + diff --git a/package/elf2flt/elf2flt.mk b/package/elf2flt/elf2flt.mk index e7edd8b9de..3239af1b9a 100644 --- a/package/elf2flt/elf2flt.mk +++ b/package/elf2flt/elf2flt.mk @@ -11,6 +11,9 @@ ELF2FLT_LICENSE_FILES = LICENSE.TXT HOST_ELF2FLT_DEPENDENCIES = host-binutils host-zlib +# 0003-elf2flt-handle-binutils-2.34.patch +HOST_ELF2FLT_AUTORECONF = YES + # It is not exactly a host variant, but more a cross variant, which is # why we pass a special --target option. HOST_ELF2FLT_CONF_OPTS = \ From f2d6c5ff9092aa7735c7a739d15180910ae734df Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Mon, 9 Nov 2020 18:18:08 +0200 Subject: [PATCH 031/125] package/stress-ng: disable libbsd on static build Static link with libbsd fails because of multiple definition of the strlcpy symbol. uClibc optionally provides these symbols. Add make options that disable all libbsd tests when linking statically. Fixes: http://autobuild.buildroot.net/results/2c77271b33c9d0e9a39cced2eda6d0df0d6b8124/ http://autobuild.buildroot.net/results/2f98c5d9ca907dd62b30bedfe4e52b014bb3e8d1/ http://autobuild.buildroot.net/results/51c4c065b93a6d11f6b4583f80f932481518905a/ Cc: Romain Naour Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/stress-ng/stress-ng.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/package/stress-ng/stress-ng.mk b/package/stress-ng/stress-ng.mk index 57464e9bbf..4afdb0a329 100644 --- a/package/stress-ng/stress-ng.mk +++ b/package/stress-ng/stress-ng.mk @@ -10,8 +10,11 @@ STRESS_NG_SITE = http://kernel.ubuntu.com/~cking/tarballs/stress-ng STRESS_NG_LICENSE = GPL-2.0+ STRESS_NG_LICENSE_FILES = COPYING -ifeq ($(BR2_PACKAGE_LIBBSD),y) +ifeq ($(BR2_PACKAGE_LIBBSD):$(BR2_STATIC_LIBS),y:) STRESS_NG_DEPENDENCIES += libbsd +else +STRESS_NG_MAKE_OPTS += HAVE_LIB_BSD=0 HAVE_WCSLCAT=0 \ + HAVE_WCSLCPY=0 HAVE_SETPROCTITLE=0 endif ifeq ($(BR2_PACKAGE_KEYUTILS),y) @@ -19,7 +22,7 @@ STRESS_NG_DEPENDENCIES += keyutils endif define STRESS_NG_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) + $(TARGET_CONFIGURE_OPTS) $(MAKE) $(STRESS_NG_MAKE_OPTS) -C $(@D) endef # Don't use make install otherwise stress-ng will be rebuild without From 6ba64976d3f51eb37a199935b9aaedb63ab04f52 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Mon, 9 Nov 2020 01:09:12 -0800 Subject: [PATCH 032/125] package/go: bump to 1.15.4 Bugfix release. From the release notes: go1.15.4 (released 2020/11/05) includes fixes to cgo, the compiler, linker, runtime, and the compress/flate, net/http, reflect, and time packages. Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/go/go.hash | 3 +-- package/go/go.mk | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/package/go/go.hash b/package/go/go.hash index 9d651a1bfb..eb6fe6c85a 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,4 +1,3 @@ # From https://golang.org/dl/ -sha256 28bf9d0bcde251011caae230a4a05d917b172ea203f2a62f2c2f9533589d4b4d go1.15.2.src.tar.gz -sha256 896a602570e54c8cdfc2c1348abd4ffd1016758d0bd086ccd9787dbfc9b64888 go1.15.3.src.tar.gz +sha256 063da6a9a4186b8118a0e584532c8c94e65582e2cd951ed078bfd595d27d2367 go1.15.4.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index dc3b35ff50..ccfddd8001 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.15.3 +GO_VERSION = 1.15.4 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz From b737c6b3513901f736299d842a872bf78073983d Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Sun, 8 Nov 2020 22:29:40 +0100 Subject: [PATCH 033/125] linux: bump CIP kernel to version 4.19.152-cip37 This patch bumps Linux CIP to version 4.19.152-cip37 Signed-off-by: Angelo Compagnucci Signed-off-by: Peter Korsgaard --- linux/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 6d9d0af067..5a29545d41 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -31,7 +31,7 @@ config BR2_LINUX_KERNEL_LATEST_VERSION bool "Latest version (5.9)" config BR2_LINUX_KERNEL_LATEST_CIP_VERSION - bool "Latest CIP SLTS version (4.19.132-cip30)" + bool "Latest CIP SLTS version (4.19.152-cip37)" help CIP launched in the spring of 2016 to address the needs of organizations in industries such as power generation and @@ -126,8 +126,8 @@ endif config BR2_LINUX_KERNEL_VERSION string default "5.9" if BR2_LINUX_KERNEL_LATEST_VERSION - default "4.19.132-cip30" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "4.19.132-cip30-rt12" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION + default "4.19.152-cip37" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL From 642f821ce51588bd69fa3ca5fcd2ae53097257cd Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Sun, 8 Nov 2020 22:33:13 +0100 Subject: [PATCH 034/125] linux: fix linux CIP description typo Version is 4.19 and not 4.4. Signed-off-by: Angelo Compagnucci Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/Config.in b/linux/Config.in index 5a29545d41..2c69b842f3 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -44,7 +44,7 @@ config BR2_LINUX_KERNEL_LATEST_CIP_VERSION implementation of software building blocks that meet these requirements. - The CIP community plans to maintain 4.4 for security and + The CIP community plans to maintain 4.19 for security and bug fixes for more than 10 years. https://www.cip-project.org From 14ed65e3a62999a7cef55c357b18789451522340 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Mon, 9 Nov 2020 00:00:09 +0100 Subject: [PATCH 035/125] support/testing: TestInitSystemSystemdRwIfupdown test expect a RW rootfs When running the TestInitSystemSystemdRwIfupdown test, the rootfs must be in read-write mode. The commit log [1] introducing systemd tests say so: "basic systemd, read-write, network w/ ifupdown" With systemd 246.5, the service systemd-update-done return an error code when it can't write on the filesystem (/etc) [1] 117835d5fcd508f301d62dd08ee658c1982c7fa7 [2] https://github.com/systemd/systemd/commit/8019995e9af9c6d7b5985198cedccd24eda3e26e Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/830981813 Signed-off-by: Romain Naour Cc: Yann E. MORIN Signed-off-by: Peter Korsgaard --- support/testing/tests/init/test_systemd.py | 1 - 1 file changed, 1 deletion(-) diff --git a/support/testing/tests/init/test_systemd.py b/support/testing/tests/init/test_systemd.py index 371be4ad7d..059fb397e8 100644 --- a/support/testing/tests/init/test_systemd.py +++ b/support/testing/tests/init/test_systemd.py @@ -91,7 +91,6 @@ class TestInitSystemSystemdRwIfupdown(InitSystemSystemdBase): """ BR2_SYSTEM_DHCP="eth0" # BR2_PACKAGE_SYSTEMD_NETWORKD is not set - # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set BR2_TARGET_ROOTFS_EXT2=y """ From 9c068b4be804588799ca89b1f6959b4e2b1ffba8 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 9 Nov 2020 00:09:32 +0100 Subject: [PATCH 036/125] package/glmark2: fix wayland build wayland-protocols is needed since https://github.com/glmark2/glmark2/commit/58763e2c13db39ad7c1a994c261146154e4f0afa Fixes: - http://autobuild.buildroot.org/results/6106f07602c014897331daac3de01ac4a74e2016 - http://autobuild.buildroot.org/results/b8d43fad291022cbc6e43988fe6bec14f594591a Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...find_program-to-find-wayland-scanner.patch | 50 +++++++++++++++++++ package/glmark2/Config.in | 2 + package/glmark2/glmark2.mk | 4 +- 3 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 package/glmark2/0001-wscript-use-find_program-to-find-wayland-scanner.patch diff --git a/package/glmark2/0001-wscript-use-find_program-to-find-wayland-scanner.patch b/package/glmark2/0001-wscript-use-find_program-to-find-wayland-scanner.patch new file mode 100644 index 0000000000..681f0c6794 --- /dev/null +++ b/package/glmark2/0001-wscript-use-find_program-to-find-wayland-scanner.patch @@ -0,0 +1,50 @@ +From 303d5c4fef1760ede5786bc62c7012dd7ae93722 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 8 Nov 2020 23:46:49 +0100 +Subject: [PATCH] wscript: use find_program to find wayland-scanner + +Use find_program instead of check_cfg to find wayland-scanner. This will +fix the following build failure when cross-compiling: + +[ 3/73] Compiling doc/glmark2.1.in +/bin/sh: 1: /usr/bin/wayland-scanner: not found + +Fixes: + - http://autobuild.buildroot.org/results//361dc40e558e2646cb93f405c7b1f621d400fea3 + +Signed-off-by: Fabrice Fontaine +--- + src/wscript_build | 2 +- + wscript | 3 +-- + 2 files changed, 2 insertions(+), 3 deletions(-) + +diff --git a/src/wscript_build b/src/wscript_build +index bbe7a77..ed3e8d6 100644 +--- a/src/wscript_build ++++ b/src/wscript_build +@@ -51,7 +51,7 @@ else: + + if 'WAYLAND_SCANNER_wayland_scanner' in bld.env.keys(): + def wayland_scanner_cmd(arg, src): +- return '%s %s < %s > ${TGT}' % (bld.env['WAYLAND_SCANNER_wayland_scanner'], arg, src) ++ return '%s %s < %s > ${TGT}' % (bld.env['WAYLAND_SCANNER_wayland_scanner'][0], arg, src) + + def wayland_proto_src_path(proto, ver): + wp_dir = bld.env['WAYLAND_PROTOCOLS_pkgdatadir'] +diff --git a/wscript b/wscript +index e09fa78..fe2494f 100644 +--- a/wscript ++++ b/wscript +@@ -227,8 +227,7 @@ def configure_linux(ctx): + # wayland-protocols >= 1.12 required for xdg-shell stable + ctx.check_cfg(package = 'wayland-protocols', atleast_version = '1.12', + variables = ['pkgdatadir'], uselib_store = 'WAYLAND_PROTOCOLS') +- ctx.check_cfg(package = 'wayland-scanner', variables = ['wayland_scanner'], +- uselib_store = 'WAYLAND_SCANNER') ++ ctx.find_program('wayland-scanner', var = 'WAYLAND_SCANNER_wayland_scanner') + + # Prepend CXX flags so that they can be overriden by the + # CXXFLAGS environment variable +-- +2.28.0 + diff --git a/package/glmark2/Config.in b/package/glmark2/Config.in index 153eb3b0af..40d0adcc8a 100644 --- a/package/glmark2/Config.in +++ b/package/glmark2/Config.in @@ -24,6 +24,7 @@ config BR2_PACKAGE_GLMARK2_FLAVOR_WAYLAND_GLESV2 depends on BR2_PACKAGE_HAS_LIBGLES depends on BR2_PACKAGE_WAYLAND select BR2_PACKAGE_GLMARK2_FLAVOR_ANY + select BR2_PACKAGE_WAYLAND_PROTOCOLS config BR2_PACKAGE_GLMARK2_FLAVOR_WAYLAND_GL bool @@ -32,6 +33,7 @@ config BR2_PACKAGE_GLMARK2_FLAVOR_WAYLAND_GL depends on BR2_PACKAGE_HAS_LIBGL depends on BR2_PACKAGE_WAYLAND select BR2_PACKAGE_GLMARK2_FLAVOR_ANY + select BR2_PACKAGE_WAYLAND_PROTOCOLS config BR2_PACKAGE_GLMARK2_FLAVOR_X11_GLESV2 bool diff --git a/package/glmark2/glmark2.mk b/package/glmark2/glmark2.mk index ec62faada2..9e47b426fe 100644 --- a/package/glmark2/glmark2.mk +++ b/package/glmark2/glmark2.mk @@ -31,12 +31,12 @@ GLMARK2_FLAVORS += x11-gl endif ifeq ($(BR2_PACKAGE_GLMARK2_FLAVOR_WAYLAND_GLESV2),y) -GLMARK2_DEPENDENCIES += libgles wayland +GLMARK2_DEPENDENCIES += libgles wayland wayland-protocols GLMARK2_FLAVORS += wayland-glesv2 endif ifeq ($(BR2_PACKAGE_GLMARK2_FLAVOR_WAYLAND_GL),y) -GLMARK2_DEPENDENCIES += libgl wayland +GLMARK2_DEPENDENCIES += libgl wayland wayland-protocols GLMARK2_FLAVORS += wayland-gl endif From e6b3803c84da898478b65adae4393b65e3c01333 Mon Sep 17 00:00:00 2001 From: Antoine Tenart Date: Mon, 9 Nov 2020 17:51:24 +0100 Subject: [PATCH 037/125] DEVELOPERS: update Antoine Tenart's email address Signed-off-by: Antoine Tenart Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index 43cc1b55ae..d9d46dc3ea 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -182,7 +182,7 @@ F: package/pkg-golang.mk N: Anthony Viallard F: package/gnuplot/ -N: Antoine Ténart +N: Antoine Tenart F: package/libselinux/ F: package/refpolicy/ F: package/wf111/ From 19932c8e0288f4622611034c2d22fb7ed2cf9571 Mon Sep 17 00:00:00 2001 From: Antoine Tenart Date: Mon, 9 Nov 2020 17:51:25 +0100 Subject: [PATCH 038/125] DEVELOPERS: remove myself for wf111 I haven't looked at that package and touched it for 6 years now, and clearly others have taken care of it when looking at the Git history. Signed-off-by: Antoine Tenart Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 - 1 file changed, 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index d9d46dc3ea..257295358e 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -185,7 +185,6 @@ F: package/gnuplot/ N: Antoine Tenart F: package/libselinux/ F: package/refpolicy/ -F: package/wf111/ F: support/testing/tests/core/test_selinux/ F: support/testing/tests/core/test_selinux.py F: support/testing/tests/init/test_systemd_selinux/ From 780af51d86c80f102a6b2ac189bf546daffe15a2 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 8 Nov 2020 18:15:00 +0100 Subject: [PATCH 039/125] board/qemu/ppc-mpc8544ds: apply Debian patch fixing wrong mcpu When building the linux kernel for PPC_85xx cpus with GCC 8, the build fail with: powerpc-e500v2-linux-gnuspe-gcc: error: unrecognized argument in option '-mcpu=powerpc' powerpc-e500v2-linux-gnuspe-gcc: note: valid arguments to '-mcpu=' are: 8540 8548 native "GCC started treating "PowerPC" and "PowerPC SPE" as two different architectures and that's the reason for the reduced -mcpu list." [1] As suggested in the crosstool-ng issue [1], apply the Debian patch to avoid -mcpu=powerpc or -mcpu=powerpc64. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/830981654 [1] https://github.com/crosstool-ng/crosstool-ng/issues/1152 [2] https://salsa.debian.org/kernel-team/linux/-/blob/buster/debian/patches/bugfix/powerpc/powerpc-fix-mcpu-options-for-spe-only-compiler.patch Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- ...x-mcpu-options-for-SPE-only-compiler.patch | 53 +++++++++++++++++++ configs/qemu_ppc_mpc8544ds_defconfig | 1 + 2 files changed, 54 insertions(+) create mode 100644 board/qemu/ppc-mpc8544ds/patches/linux/0001-powerpc-Fix-mcpu-options-for-SPE-only-compiler.patch diff --git a/board/qemu/ppc-mpc8544ds/patches/linux/0001-powerpc-Fix-mcpu-options-for-SPE-only-compiler.patch b/board/qemu/ppc-mpc8544ds/patches/linux/0001-powerpc-Fix-mcpu-options-for-SPE-only-compiler.patch new file mode 100644 index 0000000000..a7bc31bda2 --- /dev/null +++ b/board/qemu/ppc-mpc8544ds/patches/linux/0001-powerpc-Fix-mcpu-options-for-SPE-only-compiler.patch @@ -0,0 +1,53 @@ +From 44e3424424b447b00fbe1f10ddba81b55817e970 Mon Sep 17 00:00:00 2001 +From: Ben Hutchings +Date: Wed, 26 Dec 2018 00:00:40 +0000 +Subject: [PATCH] powerpc: Fix -mcpu= options for SPE-only compiler + +GCC for Debian's "powerpcspe" architecture only supports 32-bit +SPE targets, and using -mcpu=powerpc or -mcpu=powerpc64 is a fatal +error. + +* Change the test for a biarch compiler to pass both the -m32 and -m64 + options, so that it doesn't catch 32-bit-only compilers +* Add an ifdef CONFIG_PPC64 around the 64-bit CPU option definitions + +Signed-off-by: Ben Hutchings +[Romain: Patch from Debian repository: +https://salsa.debian.org/kernel-team/linux/-/blob/buster/debian/patches/bugfix/powerpc/powerpc-fix-mcpu-options-for-spe-only-compiler.patch] +Signed-off-by: Romain Naour +--- + arch/powerpc/Makefile | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile +index 37ac731a556b..5211ea4f48b1 100644 +--- a/arch/powerpc/Makefile ++++ b/arch/powerpc/Makefile +@@ -12,7 +12,7 @@ + # Rewritten by Cort Dougan and Paul Mackerras + # + +-HAS_BIARCH := $(call cc-option-yn, -m32) ++HAS_BIARCH := $(call cc-option-yn, -m32 -m64) + + # Set default 32 bits cross compilers for vdso and boot wrapper + CROSS32_COMPILE ?= +@@ -166,6 +166,7 @@ CFLAGS-$(CONFIG_PPC32) += $(call cc-option, $(MULTIPLEWORD)) + + CFLAGS-$(CONFIG_PPC32) += $(call cc-option,-mno-readonly-in-sdata) + ++ifdef CONFIG_PPC64 + ifdef CONFIG_PPC_BOOK3S_64 + ifdef CONFIG_CPU_LITTLE_ENDIAN + CFLAGS-$(CONFIG_GENERIC_CPU) += -mcpu=power8 +@@ -177,6 +178,7 @@ endif + else + CFLAGS-$(CONFIG_GENERIC_CPU) += -mcpu=powerpc64 + endif ++endif + + ifdef CONFIG_FUNCTION_TRACER + CC_FLAGS_FTRACE := -pg +-- +2.25.4 + diff --git a/configs/qemu_ppc_mpc8544ds_defconfig b/configs/qemu_ppc_mpc8544ds_defconfig index 98a10b3535..9ec94a4839 100644 --- a/configs/qemu_ppc_mpc8544ds_defconfig +++ b/configs/qemu_ppc_mpc8544ds_defconfig @@ -3,6 +3,7 @@ BR2_powerpc=y BR2_powerpc_8548=y # System +BR2_GLOBAL_PATCH_DIR="board/qemu/ppc-mpc8544ds/patches" BR2_SYSTEM_DHCP="eth0" # Filesystem From 31c7e161c17bae2bc1109fd33e85b0e4df7906e8 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 8 Nov 2020 18:28:22 +0100 Subject: [PATCH 040/125] package/python-m2crypto: fix build on arm and mips Fix build failure on arm and mips (perhaps also other) Fixes: - http://autobuild.buildroot.org/results/7f63e6a2d8681cc3408f344556afd5dd16eb7368 - http://autobuild.buildroot.org/results/d115a082418321e7dc4715c635f94b30b3cad387 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...swig-default-includes-before-openssl.patch | 63 +++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 package/python-m2crypto/0001-setup.py-move-swig-default-includes-before-openssl.patch diff --git a/package/python-m2crypto/0001-setup.py-move-swig-default-includes-before-openssl.patch b/package/python-m2crypto/0001-setup.py-move-swig-default-includes-before-openssl.patch new file mode 100644 index 0000000000..f4d7e428f1 --- /dev/null +++ b/package/python-m2crypto/0001-setup.py-move-swig-default-includes-before-openssl.patch @@ -0,0 +1,63 @@ +From 1aab31787a8d1ef9436d9cf81832691f729b6282 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 7 Nov 2020 23:26:30 +0100 +Subject: [PATCH] setup.py: move swig default includes before openssl + +Move swig default includes before openssl to avoid the following build +failure when cross-compiling for some architectures (e.g. arm, mips): + +swig -python -py3 -D__x86_64__ \ + -I/srv/storage/autobuild/run/instance-0/output-1/host/mipsel-buildroot-linux-gnu/sysroot/usr/include/python3.9 \ + -I/srv/storage/autobuild/run/instance-0/output-1/host/mipsel-buildroot-linux-gnu/sysroot/usr/include \ + -I/srv/storage/autobuild/run/instance-0/output-1/host/mipsel-buildroot-linux-gnu/sysroot/usr/include/openssl \ + -I/srv/storage/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/mipsel-buildroot-linux-gnu/8.3.0/include \ + -I/srv/storage/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/mipsel-buildroot-linux-gnu/8.3.0/include-fixed \ + -I/srv/storage/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/mipsel-buildroot-linux-gnu/8.3.0/../../../../mipsel-buildroot-linux-gnu/include \ + -I/srv/storage/autobuild/run/instance-0/output-1/host/mipsel-buildroot-linux-gnu/sysroot/usr/include \ + -includeall -modern -builtin -outdir \ + /srv/storage/autobuild/run/instance-0/output-1/build/python-m2crypto-0.36.0/M2Crypto -o SWIG/_m2crypto_wrap.c SWIG/_m2crypto.i +Deprecated command line option: -modern. This option is now always on. +/srv/storage/autobuild/run/instance-0/output-1/host/mipsel-buildroot-linux-gnu/sysroot/usr/include/bits/types.h:139: +Error: CPP #error "". Use the -cpperraswarn option to continue swig processing. + +This build failure is probably raised because swig includes a wrong types.h file +from the openssl directory (e.g. +/srv/storage/autobuild/run/instance-0/output-1/host/mipsel-buildroot-linux-gnu/sysroot/usr/include) + +Fixes: + - http://autobuild.buildroot.org/results/7f63e6a2d8681cc3408f344556afd5dd16eb7368 + - http://autobuild.buildroot.org/results/d115a082418321e7dc4715c635f94b30b3cad387 + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://gitlab.com/m2crypto/m2crypto/-/merge_requests/248] +--- + setup.py | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/setup.py b/setup.py +index 89d03bb..0045fda 100644 +--- a/setup.py ++++ b/setup.py +@@ -154,6 +154,9 @@ class _M2CryptoBuildExt(build_ext.build_ext): + if sys.version_info[:1] >= (3,): + self.swig_opts.append('-py3') + ++ # swig seems to need the default header file directories ++ self.swig_opts.extend(['-I%s' % i for i in _get_additional_includes()]) ++ + log.debug('self.include_dirs = %s', self.include_dirs) + log.debug('self.library_dirs = %s', self.library_dirs) + +@@ -204,8 +207,6 @@ class _M2CryptoBuildExt(build_ext.build_ext): + self.swig_opts.append( + '-I' + os.path.join(openssl_include_dir, 'openssl')) + +- # swig seems to need the default header file directories +- self.swig_opts.extend(['-I%s' % i for i in _get_additional_includes()]) + self.swig_opts.append('-includeall') + self.swig_opts.append('-modern') + self.swig_opts.append('-builtin') +-- +2.28.0 + From 73163b3f1a7ac2ce524770bf07b9504223241a85 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 9 Nov 2020 21:54:10 +0100 Subject: [PATCH 041/125] Revert "linux: bump CIP kernel to version 4.19.152-cip37" This reverts commit b737c6b3513901f736299d842a872bf78073983d. This was not supposed to be committed, as the patch did not update linux.hash. Signed-off-by: Peter Korsgaard --- linux/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 2c69b842f3..5e8390647a 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -31,7 +31,7 @@ config BR2_LINUX_KERNEL_LATEST_VERSION bool "Latest version (5.9)" config BR2_LINUX_KERNEL_LATEST_CIP_VERSION - bool "Latest CIP SLTS version (4.19.152-cip37)" + bool "Latest CIP SLTS version (4.19.132-cip30)" help CIP launched in the spring of 2016 to address the needs of organizations in industries such as power generation and @@ -126,8 +126,8 @@ endif config BR2_LINUX_KERNEL_VERSION string default "5.9" if BR2_LINUX_KERNEL_LATEST_VERSION + default "4.19.132-cip30" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "4.19.132-cip30-rt12" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION - default "4.19.152-cip37" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL From 062e5d8a65f31f44723a51ad2086b47bd6d04949 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 7 Nov 2020 15:03:03 +0100 Subject: [PATCH 042/125] package/libiqrf: add license file Add license file and, while at it, update indentation to two spaces Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libiqrf/libiqrf.hash | 3 ++- package/libiqrf/libiqrf.mk | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/package/libiqrf/libiqrf.hash b/package/libiqrf/libiqrf.hash index b7f3b9bf2c..df749def17 100644 --- a/package/libiqrf/libiqrf.hash +++ b/package/libiqrf/libiqrf.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 8111031dd9dd6093a1927eb32dd7476fe22cfee9190043aa8e4c88003c104b16 libiqrf-0.1.2.tar.gz +sha256 8111031dd9dd6093a1927eb32dd7476fe22cfee9190043aa8e4c88003c104b16 libiqrf-0.1.2.tar.gz +sha256 11e0700d7c23604d86fa1e7c54c7caa778d79eeb0035be8f80b5a552224ef015 src/iqrf.c diff --git a/package/libiqrf/libiqrf.mk b/package/libiqrf/libiqrf.mk index cd03373dec..3f4e3e8498 100644 --- a/package/libiqrf/libiqrf.mk +++ b/package/libiqrf/libiqrf.mk @@ -9,5 +9,6 @@ LIBIQRF_SITE = $(call github,nandra,libiqrf,v$(LIBIQRF_VERSION)) LIBIQRF_INSTALL_STAGING = YES LIBIQRF_DEPENDENCIES = libusb LIBIQRF_LICENSE = LGPL-2.1+ +LIBIQRF_LICENSE_FILES = src/iqrf.c $(eval $(cmake-package)) From b62e8beea89fc1a2f8b749d5258a3d9984e1da5e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 9 Nov 2020 21:40:40 +0100 Subject: [PATCH 043/125] package/bitcoin: security bump to version 0.20.1 - openssl is not a dependency since version 0.20.0 and https://github.com/bitcoin/bitcoin/commit/8983ee3e6dd8ab658bd2caf97c326cc53ea50818 - boost chrono is not needed since version 0.20.0 and https://github.com/bitcoin/bitcoin/commit/bd37f2bc26158f85ef1ab73b9ca1fc0da8ea562a - Update hash of COPYING (update in year: https://github.com/bitcoin/bitcoin/commit/8dc9aa90c3c7990dd5b491937ddc0e39bc929d1c) - Update indentation in hash file (two spaces) - Tag as a security bump as having an up to date bitcoin is important: https://patchwork.ozlabs.org/project/buildroot/patch/20200202085526.35742-1-james.hilliard1@gmail.com https://github.com/bitcoin/bitcoin/blob/master/doc/release-notes/release-notes-0.20.1.md https://github.com/bitcoin/bitcoin/blob/master/doc/release-notes/release-notes-0.20.0.md https://github.com/bitcoin/bitcoin/blob/master/doc/release-notes/release-notes-0.19.1.md Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...rc-randomenv.cpp-fix-build-on-uclibc.patch | 48 +++++++++++++++++++ package/bitcoin/Config.in | 2 - package/bitcoin/bitcoin.hash | 6 +-- package/bitcoin/bitcoin.mk | 4 +- 4 files changed, 53 insertions(+), 7 deletions(-) create mode 100644 package/bitcoin/0001-src-randomenv.cpp-fix-build-on-uclibc.patch diff --git a/package/bitcoin/0001-src-randomenv.cpp-fix-build-on-uclibc.patch b/package/bitcoin/0001-src-randomenv.cpp-fix-build-on-uclibc.patch new file mode 100644 index 0000000000..8038a311d3 --- /dev/null +++ b/package/bitcoin/0001-src-randomenv.cpp-fix-build-on-uclibc.patch @@ -0,0 +1,48 @@ +From 330cb33985d0ce97c20f4a0f0bbda0fbffe098d4 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 9 Nov 2020 21:18:40 +0100 +Subject: [PATCH] src/randomenv.cpp: fix build on uclibc + +Check for HAVE_STRONG_GETAUXVAL or HAVE_WEAK_GETAUXVAL before using +getauxval to avoid a build failure on uclibc + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/bitcoin/bitcoin/pull/20358] +--- + src/randomenv.cpp | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/randomenv.cpp b/src/randomenv.cpp +index 07122b7f6..5e07c3db4 100644 +--- a/src/randomenv.cpp ++++ b/src/randomenv.cpp +@@ -53,7 +53,7 @@ + #include + #endif + #endif +-#ifdef __linux__ ++#if defined(HAVE_STRONG_GETAUXVAL) || defined(HAVE_WEAK_GETAUXVAL) + #include + #endif + +@@ -326,7 +326,7 @@ void RandAddStaticEnv(CSHA512& hasher) + // Bitcoin client version + hasher << CLIENT_VERSION; + +-#ifdef __linux__ ++#if defined(HAVE_STRONG_GETAUXVAL) || defined(HAVE_WEAK_GETAUXVAL) + // Information available through getauxval() + # ifdef AT_HWCAP + hasher << getauxval(AT_HWCAP); +@@ -346,7 +346,7 @@ void RandAddStaticEnv(CSHA512& hasher) + const char* exec_str = (const char*)getauxval(AT_EXECFN); + if (exec_str) hasher.Write((const unsigned char*)exec_str, strlen(exec_str) + 1); + # endif +-#endif // __linux__ ++#endif // HAVE_STRONG_GETAUXVAL || HAVE_WEAK_GETAUXVAL + + #ifdef HAVE_GETCPUID + AddAllCPUID(hasher); +-- +2.28.0 + diff --git a/package/bitcoin/Config.in b/package/bitcoin/Config.in index 89ee2e3938..65af15293d 100644 --- a/package/bitcoin/Config.in +++ b/package/bitcoin/Config.in @@ -18,8 +18,6 @@ config BR2_PACKAGE_BITCOIN select BR2_PACKAGE_BOOST_SYSTEM select BR2_PACKAGE_BOOST_FILESYSTEM select BR2_PACKAGE_BOOST_THREAD - select BR2_PACKAGE_BOOST_CHRONO - select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_LIBEVENT help Bitcoin Core is an open source project which maintains and diff --git a/package/bitcoin/bitcoin.hash b/package/bitcoin/bitcoin.hash index fe7c1562a8..d39eb38e92 100644 --- a/package/bitcoin/bitcoin.hash +++ b/package/bitcoin/bitcoin.hash @@ -1,5 +1,5 @@ -# From https://bitcoincore.org/bin/bitcoin-core-0.19.0.1/SHA256SUMS.asc -sha256 7ac9f972249a0a16ed01352ca2a199a5448fe87a4ea74923404a40b4086de284 bitcoin-0.19.0.1.tar.gz +# From https://bitcoincore.org/bin/bitcoin-core-0.20.1/SHA256SUMS.asc +sha256 4bbd62fd6acfa5e9864ebf37a24a04bc2dcfe3e3222f056056288d854c53b978 bitcoin-0.20.1.tar.gz # Hash for license file -sha256 9a0f75d688e9cf5c69d3efdaa2a83af496700d252b212ec6a72f7784b47fed0c COPYING +sha256 96fe807030b21f88305adc32af62f9aa19915f2783509fd6f52aea02cf83f644 COPYING diff --git a/package/bitcoin/bitcoin.mk b/package/bitcoin/bitcoin.mk index 040c55b8a6..d5e3973d9c 100644 --- a/package/bitcoin/bitcoin.mk +++ b/package/bitcoin/bitcoin.mk @@ -4,12 +4,12 @@ # ################################################################################ -BITCOIN_VERSION = 0.19.0.1 +BITCOIN_VERSION = 0.20.1 BITCOIN_SITE = https://bitcoincore.org/bin/bitcoin-core-$(BITCOIN_VERSION) BITCOIN_AUTORECONF = YES BITCOIN_LICENSE = MIT BITCOIN_LICENSE_FILES = COPYING -BITCOIN_DEPENDENCIES = host-pkgconf boost openssl libevent +BITCOIN_DEPENDENCIES = host-pkgconf boost libevent BITCOIN_CONF_OPTS = \ --disable-bench \ --disable-wallet \ From 493b1d7b254a881a3eff43e818cefb3ddc917a8f Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 9 Nov 2020 21:56:08 +0100 Subject: [PATCH 044/125] {linux, linux-headers}: bump 4.{4, 9, 14, 19}.x / 5.{4, 8, 9}.x series Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- linux/linux.hash | 14 +++++++------- package/linux-headers/Config.in.host | 14 +++++++------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 5e8390647a..64efc20394 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -125,7 +125,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "5.9" if BR2_LINUX_KERNEL_LATEST_VERSION + default "5.9.6" if BR2_LINUX_KERNEL_LATEST_VERSION default "4.19.132-cip30" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "4.19.132-cip30-rt12" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ diff --git a/linux/linux.hash b/linux/linux.hash index 4b76398c5d..a12192c137 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,12 +1,12 @@ # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 3239a4ee1250bf2048be988cc8cb46c487b2c8a0de5b1b032d38394d5c6b1a06 linux-5.9.tar.xz -sha256 ee767991808d234ad9acd17f0ba94ba7979d30c528876bee6fba337ea540f0af linux-5.8.14.tar.xz -sha256 c0b3d8085c5ba235df38b00b740e053659709e8a5ca21957a239f6bc22c45007 linux-5.4.70.tar.xz +sha256 6cc182fe19a8f3958c24d453f4ab68eb73fb5cfb8af4c95b02f3db049e655370 linux-5.9.6.tar.xz +sha256 4ab4a3f694b7b4cfbe78871eab34c8039ad33692144c45c669827a594da85534 linux-5.8.18.tar.xz +sha256 d2466fd6eb5433e7bf287b617b11b2640c65a7ea93a57eb7a80d7f537cbc1470 linux-5.4.75.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 067814035c17e77dee84076dcc06a95eb675344cd926b7b79a16b80fee593364 linux-4.4.238.tar.xz -sha256 b1eaf60b771ec4df0546d2b7539e164355008ea2f680a0642ae430e9cb134a3f linux-4.9.238.tar.xz -sha256 5d404a0224a34b5379f1871cc46825487d557c2660459d2b5c3cd4871d699a38 linux-4.14.200.tar.xz -sha256 f2f709ef086a4d8cb3c15a857daa44dfecf1b88d7d7c53c980fb180f6dccbace linux-4.19.150.tar.xz +sha256 32fe14f120436c927d895d3c59a37ca50c0ae3648ba3599d9cab57ffa4699214 linux-4.4.241.tar.xz +sha256 c4c6d04f91d881e68524bda6062b5c1835f285bd03344bf8f2eaeef3394bb32c linux-4.9.241.tar.xz +sha256 9e832899ec75dbfce393c9f7a07df24183b28f0bb95ad4dd8b1fa027bc668ad9 linux-4.14.204.tar.xz +sha256 cbc648f5405cb2b554b7a0f23885742d9969a11d22692287ee756adf940a48d2 linux-4.19.155.tar.xz # Locally computed sha256 c20f9014b89ea3e27f55f1d407aa5a4724ed38ac520c197291e9d644f164c43a linux-cip-4.19.132-cip30.tar.gz sha256 81dd791d9ad6c3fddaeaffc6d7d8df0e13831283a5fe494c437ac7820d79ca39 linux-cip-4.19.132-cip30-rt12.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 16af0449a5..97c30c9b3d 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -346,13 +346,13 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.4.238" if BR2_KERNEL_HEADERS_4_4 - default "4.9.238" if BR2_KERNEL_HEADERS_4_9 - default "4.14.200" if BR2_KERNEL_HEADERS_4_14 - default "4.19.150" if BR2_KERNEL_HEADERS_4_19 - default "5.4.70" if BR2_KERNEL_HEADERS_5_4 - default "5.8.14" if BR2_KERNEL_HEADERS_5_8 - default "5.9" if BR2_KERNEL_HEADERS_5_9 + default "4.4.241" if BR2_KERNEL_HEADERS_4_4 + default "4.9.241" if BR2_KERNEL_HEADERS_4_9 + default "4.14.204" if BR2_KERNEL_HEADERS_4_14 + default "4.19.155" if BR2_KERNEL_HEADERS_4_19 + default "5.4.75" if BR2_KERNEL_HEADERS_5_4 + default "5.8.18" if BR2_KERNEL_HEADERS_5_8 + default "5.9.6" if BR2_KERNEL_HEADERS_5_9 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ From 18729f8d64636db2ddc68d5d94ec10f19021cde7 Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Mon, 9 Nov 2020 22:33:03 +0100 Subject: [PATCH 045/125] linux: bump CIP kernel to version 4.19.152-cip37 This patch bumps Linux CIP to version 4.19.152-cip37 Signed-off-by: Angelo Compagnucci Signed-off-by: Peter Korsgaard --- linux/Config.in | 4 ++-- linux/linux.hash | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 64efc20394..7493030d7b 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -31,7 +31,7 @@ config BR2_LINUX_KERNEL_LATEST_VERSION bool "Latest version (5.9)" config BR2_LINUX_KERNEL_LATEST_CIP_VERSION - bool "Latest CIP SLTS version (4.19.132-cip30)" + bool "Latest CIP SLTS version (4.19.152-cip37)" help CIP launched in the spring of 2016 to address the needs of organizations in industries such as power generation and @@ -126,8 +126,8 @@ endif config BR2_LINUX_KERNEL_VERSION string default "5.9.6" if BR2_LINUX_KERNEL_LATEST_VERSION - default "4.19.132-cip30" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "4.19.132-cip30-rt12" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION + default "4.19.152-cip37" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL diff --git a/linux/linux.hash b/linux/linux.hash index a12192c137..cf592c6feb 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -8,7 +8,7 @@ sha256 c4c6d04f91d881e68524bda6062b5c1835f285bd03344bf8f2eaeef3394bb32c linux- sha256 9e832899ec75dbfce393c9f7a07df24183b28f0bb95ad4dd8b1fa027bc668ad9 linux-4.14.204.tar.xz sha256 cbc648f5405cb2b554b7a0f23885742d9969a11d22692287ee756adf940a48d2 linux-4.19.155.tar.xz # Locally computed -sha256 c20f9014b89ea3e27f55f1d407aa5a4724ed38ac520c197291e9d644f164c43a linux-cip-4.19.132-cip30.tar.gz +sha256 d2a06f52143deb929b8d513cf9afc9bd065951389a80fa70bc4d63025b5b3fb9 linux-cip-4.19.152-cip37.tar.gz sha256 81dd791d9ad6c3fddaeaffc6d7d8df0e13831283a5fe494c437ac7820d79ca39 linux-cip-4.19.132-cip30-rt12.tar.gz # Licenses hashes From 0e4d645cf27dda9898b1c80b26aad99c8c0599de Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Mon, 9 Nov 2020 22:33:04 +0100 Subject: [PATCH 046/125] linux: bump CIP RT kernel to version 4.19.152-cip37-rt16 This patch bumps Linux CIP RT to version 4.19.152-cip37-rt16 Signed-off-by: Angelo Compagnucci Signed-off-by: Peter Korsgaard --- linux/Config.in | 4 ++-- linux/linux.hash | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 7493030d7b..b6c4491b35 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -50,7 +50,7 @@ config BR2_LINUX_KERNEL_LATEST_CIP_VERSION https://www.cip-project.org config BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION - bool "Latest CIP RT SLTS version (4.19.132-cip30-rt12)" + bool "Latest CIP RT SLTS version (4.19.152-cip37-rt16)" help Same as the CIP version, but this is the PREEMPT_RT realtime variant. @@ -126,8 +126,8 @@ endif config BR2_LINUX_KERNEL_VERSION string default "5.9.6" if BR2_LINUX_KERNEL_LATEST_VERSION - default "4.19.132-cip30-rt12" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default "4.19.152-cip37" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION + default "4.19.152-cip37-rt16" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL diff --git a/linux/linux.hash b/linux/linux.hash index cf592c6feb..7f6d8cb2cb 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -9,7 +9,7 @@ sha256 9e832899ec75dbfce393c9f7a07df24183b28f0bb95ad4dd8b1fa027bc668ad9 linux- sha256 cbc648f5405cb2b554b7a0f23885742d9969a11d22692287ee756adf940a48d2 linux-4.19.155.tar.xz # Locally computed sha256 d2a06f52143deb929b8d513cf9afc9bd065951389a80fa70bc4d63025b5b3fb9 linux-cip-4.19.152-cip37.tar.gz -sha256 81dd791d9ad6c3fddaeaffc6d7d8df0e13831283a5fe494c437ac7820d79ca39 linux-cip-4.19.132-cip30-rt12.tar.gz +sha256 bc1dacd3d0f526de3e8754a444e8e02a54521527af639ddb907cb35cda775a8c linux-cip-4.19.152-cip37-rt16.tar.gz # Licenses hashes sha256 fb5a425bd3b3cd6071a3a9aff9909a859e7c1158d54d32e07658398cd67eb6a0 COPYING From f01db4f73b9a7f1250ffc6d6a5aa9f318b83b4c5 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 10 Nov 2020 09:46:00 +0100 Subject: [PATCH 047/125] package/gstreamer1/gst1-plugins-bad: explicitly enable C99 for dvbsubenc/gcc 4.8 dvbsubenc fails to build with gcc 4.8 due to restrict keyword and for loop declarations: ../gst/dvbsubenc/libimagequant/blur.c:10:46: error: expected ';', ',' or ')' before 'src' transposing_1d_blur (unsigned char *restrict src, unsigned char *restrict dst, ^ ../gst/dvbsubenc/libimagequant/blur.c: In function 'liq_min3': ../gst/dvbsubenc/libimagequant/blur.c:101:5: error: 'for' loop initial declarations are only allowed in C99 mode for (unsigned int i = 0; i < width - 1; i++) { ^ ../gst/dvbsubenc/libimagequant/blur.c:101:5: note: use option -std=c99 or -std=gnu99 to compile your code Fixes: - http://autobuild.buildroot.org/results/183e876d63340b5c204f47a4653cbfebb0523277 Both of which are C99 features, so explicitly enable C99 support to fix that. Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index 78a3785449..86aa345b00 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -13,6 +13,7 @@ GST1_PLUGINS_BAD_INSTALL_STAGING = YES GST1_PLUGINS_BAD_LICENSE_FILES = COPYING GST1_PLUGINS_BAD_LICENSE = LGPL-2.0+ +GST1_PLUGINS_BAD_CFLAGS = $(TARGET_CFLAGS) -std=c99 GST1_PLUGINS_BAD_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) GST1_PLUGINS_BAD_CONF_OPTS = \ From 9d1cf2317749868a0097f8a41a80779283664e28 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 10 Nov 2020 09:50:14 +0100 Subject: [PATCH 048/125] package/gstreamer1/gst1-plugins-bad: explicitly enable _GNU_SOURCE for festival/glibc 2.18 festival fails to built with glibc 2.18 due to fopen and the h_addr field in struct hostent: ../gst/festival/gstfestival.c: In function 'gst_festival_chain': ../gst/festival/gstfestival.c:273:3: warning: implicit declaration of function 'fdopen' [-Wimplicit-function-declaration] fd = fdopen (f, "wb"); ^ ../gst/festival/gstfestival.c:273:6: warning: assignment makes pointer from integer without a cast [enabled by default] fd = fdopen (f, "wb"); ^ ../gst/festival/gstfestival.c: In function 'festival_socket_open': ../gst/festival/gstfestival.c:367:45: error: 'struct hostent' has no member named 'h_addr' memmove (&serv_addr.sin_addr, serverhost->h_addr, serverhost->h_length); ^ Both of which are hidden behind _GNU_SOURCE in glibc 2.18, so enable that to fix this build issue. Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index 86aa345b00..a9111ebdb8 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -13,7 +13,7 @@ GST1_PLUGINS_BAD_INSTALL_STAGING = YES GST1_PLUGINS_BAD_LICENSE_FILES = COPYING GST1_PLUGINS_BAD_LICENSE = LGPL-2.0+ -GST1_PLUGINS_BAD_CFLAGS = $(TARGET_CFLAGS) -std=c99 +GST1_PLUGINS_BAD_CFLAGS = $(TARGET_CFLAGS) -std=c99 -D_GNU_SOURCE GST1_PLUGINS_BAD_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) GST1_PLUGINS_BAD_CONF_OPTS = \ From 349cca4e9decf43668c2b306cccd6562929ba53c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 9 Nov 2020 23:30:06 +0100 Subject: [PATCH 049/125] package/domoticz: fix build with python 3.9 Fixes: - http://autobuild.buildroot.org/results/994c95b2e3635c30e4a575fcf707eaa57b89e198 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- .../0003-Build-failure-with-python-3-9.patch | 36 ++++++++++++++++ .../0004-Load-python-3-9-shared-libs.patch | 41 +++++++++++++++++++ 2 files changed, 77 insertions(+) create mode 100644 package/domoticz/0003-Build-failure-with-python-3-9.patch create mode 100644 package/domoticz/0004-Load-python-3-9-shared-libs.patch diff --git a/package/domoticz/0003-Build-failure-with-python-3-9.patch b/package/domoticz/0003-Build-failure-with-python-3-9.patch new file mode 100644 index 0000000000..3b07436e83 --- /dev/null +++ b/package/domoticz/0003-Build-failure-with-python-3-9.patch @@ -0,0 +1,36 @@ +From b3525e2a970ae3e783665040b1e0db5fc3391327 Mon Sep 17 00:00:00 2001 +From: Jose Zapater +Date: Mon, 2 Nov 2020 09:46:17 +0100 +Subject: [PATCH] Build failure with python 3.9 + +Signed-off-by: Jose Zapater + +[Retrieved from: +https://github.com/domoticz/domoticz/commit/b3525e2a970ae3e783665040b1e0db5fc3391327] +Signed-off-by: Fabrice Fontaine +--- + hardware/plugins/DelayedLink.h | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/hardware/plugins/DelayedLink.h b/hardware/plugins/DelayedLink.h +index c90a7d8e69..cb71478685 100644 +--- a/hardware/plugins/DelayedLink.h ++++ b/hardware/plugins/DelayedLink.h +@@ -14,6 +14,17 @@ + #include + #include "../../main/Helper.h" + ++#ifndef _Py_DEC_REFTOTAL ++ /* _Py_DEC_REFTOTAL macro has been removed from Python 3.9 by: ++ https://github.com/python/cpython/commit/49932fec62c616ec88da52642339d83ae719e924 */ ++# ifdef Py_REF_DEBUG ++# define _Py_DEC_REFTOTAL _Py_RefTotal-- ++# else ++# define _Py_DEC_REFTOTAL ++# define _Py_Dealloc ++# endif ++#endif ++ + #if PY_VERSION_HEX >= 0x030800f0 + static inline void + py3__Py_DECREF(const char *filename, int lineno, PyObject *op) diff --git a/package/domoticz/0004-Load-python-3-9-shared-libs.patch b/package/domoticz/0004-Load-python-3-9-shared-libs.patch new file mode 100644 index 0000000000..c157fd354e --- /dev/null +++ b/package/domoticz/0004-Load-python-3-9-shared-libs.patch @@ -0,0 +1,41 @@ +From 4e1d21967d27d286cbc837b98a1a9f031f7dde58 Mon Sep 17 00:00:00 2001 +From: Jose Zapater +Date: Fri, 6 Nov 2020 07:40:37 +0100 +Subject: [PATCH] Load python 3.9 shared libs + +Signed-off-by: Jose Zapater + +[Retrieved from: +https://github.com/domoticz/domoticz/commit/4e1d21967d27d286cbc837b98a1a9f031f7dde58] +Signed-off-by: Fabrice Fontaine +--- + hardware/plugins/DelayedLink.h | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/hardware/plugins/DelayedLink.h b/hardware/plugins/DelayedLink.h +index cb71478685..409c9dce1b 100644 +--- a/hardware/plugins/DelayedLink.h ++++ b/hardware/plugins/DelayedLink.h +@@ -193,12 +193,14 @@ namespace Plugins { + if (!shared_lib_) { + #ifdef WIN32 + # ifdef _DEBUG ++ if (!shared_lib_) shared_lib_ = LoadLibrary("python39_d.dll"); + if (!shared_lib_) shared_lib_ = LoadLibrary("python38_d.dll"); + if (!shared_lib_) shared_lib_ = LoadLibrary("python37_d.dll"); + if (!shared_lib_) shared_lib_ = LoadLibrary("python36_d.dll"); + if (!shared_lib_) shared_lib_ = LoadLibrary("python35_d.dll"); + if (!shared_lib_) shared_lib_ = LoadLibrary("python34_d.dll"); + # else ++ if (!shared_lib_) shared_lib_ = LoadLibrary("python39.dll"); + if (!shared_lib_) shared_lib_ = LoadLibrary("python38.dll"); + if (!shared_lib_) shared_lib_ = LoadLibrary("python37.dll"); + if (!shared_lib_) shared_lib_ = LoadLibrary("python36.dll"); +@@ -206,6 +208,7 @@ namespace Plugins { + if (!shared_lib_) shared_lib_ = LoadLibrary("python34.dll"); + # endif + #else ++ if (!shared_lib_) FindLibrary("python3.9", true); + if (!shared_lib_) FindLibrary("python3.8", true); + if (!shared_lib_) FindLibrary("python3.7", true); + if (!shared_lib_) FindLibrary("python3.6", true); From 97fcae8ddf71b02402225ed1b3d0e3d5ea367ed5 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 7 Nov 2020 19:52:55 +0100 Subject: [PATCH 050/125] package/slirp: security bump to version 4.3.1 - Use an up to date fork (spice slirp is archived and has not been updated since 2012) - Add COPYRIGHT as the license file - BSD-4-Clause has been replaced by BSD-3-Clause since https://gitlab.freedesktop.org/slirp/libslirp/-/commit/3bac39137a652b24b89d5b9e2a39600619fbe1d3 https://gitlab.freedesktop.org/slirp/libslirp/-/commit/f9f6e69c4e1d9a43af30bfe791b31789ffa04954 - Add hash file - Switch to meson-package - Fix multiple security vulnerabilities: CVE-2014-3640, CVE-2017-11434, CVE-2019-6778, CVE-2019-9824, CVE-2019-14378 and CVE-2020-10756 Signed-off-by: Fabrice Fontaine Reviewed-by: Alistair Francis Signed-off-by: Peter Korsgaard --- package/slirp/Config.in | 17 ++++++----------- package/slirp/slirp.hash | 3 +++ package/slirp/slirp.mk | 20 +++++++------------- 3 files changed, 16 insertions(+), 24 deletions(-) create mode 100644 package/slirp/slirp.hash diff --git a/package/slirp/Config.in b/package/slirp/Config.in index 51dea9700f..8f57c4fa6a 100644 --- a/package/slirp/Config.in +++ b/package/slirp/Config.in @@ -1,16 +1,10 @@ config BR2_PACKAGE_SLIRP bool "slirp" help - The Spice project aims to provide a complete open source - solution for interaction with virtualized desktop devices. - The Spice project deals with both the virtualized devices - and the front-end. Interaction between front-end and - back-end is done using VD-Interfaces. + libslirp is a user-mode networking library used by virtual + machines, containers or various tools. - This package implements the slirp-part for Spice. Slirp - emulates a PPP or SLIP connection over a normal terminal. - - http://www.spice-space.org/ + https://gitlab.freedesktop.org/slirp/libslirp/ NOTE: This package has some history of a unique kind: @@ -21,5 +15,6 @@ config BR2_PACKAGE_SLIRP - during that period, QEMU (Fabrice BELLARD) forked the code and included it in QEMU - and it was imported from this breed by the Spice project - around May 2009 - - which is what we use here + around May 2009 which archived it in 2012 + - So we switched to + https://gitlab.freedesktop.org/slirp/libslirp diff --git a/package/slirp/slirp.hash b/package/slirp/slirp.hash new file mode 100644 index 0000000000..3051179df9 --- /dev/null +++ b/package/slirp/slirp.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 6b1641f04d41bc45f94018ac8d42d3c9f3ba0e463cbeacf5f26fe83fc050161e libslirp-v4.3.1.tar.bz2 +sha256 b28aecf4796a6a22054167f0a976de13d9db335669d37afd2dc7ea4c335e1e13 COPYRIGHT diff --git a/package/slirp/slirp.mk b/package/slirp/slirp.mk index 7cfead65e2..4351818952 100644 --- a/package/slirp/slirp.mk +++ b/package/slirp/slirp.mk @@ -4,18 +4,12 @@ # ################################################################################ -# There's no tarball releases of slirp, so we use the git repo -# Also, there's no tag, so we use a random SHA1 (master's HEAD -# of today) -SLIRP_VERSION = 8c2da74c1385242f20799fec8c04f8378edc6550 -SLIRP_SITE = git://anongit.freedesktop.org/spice/slirp -SLIRP_LICENSE = BSD-4-Clause, BSD-2-Clause -# Note: The license file 'COPYRIGHT' is missing from the sources, -# although some files refer to it. +SLIRP_VERSION = 4.3.1 +SLIRP_SOURCE = libslirp-v$(SLIRP_VERSION).tar.bz2 +SLIRP_SITE = \ + https://gitlab.freedesktop.org/slirp/libslirp/-/archive/v$(SLIRP_VERSION) +SLIRP_LICENSE = BSD-3-Clause +SLIRP_LICENSE_FILES = COPYRIGHT SLIRP_INSTALL_STAGING = YES -# As we're using the git tree, there's no ./configure, -# so we need to autoreconf. -SLIRP_AUTORECONF = YES - -$(eval $(autotools-package)) +$(eval $(meson-package)) From a0a5c184efe4fec3bf7edb0a7a8e40bb4ddbea13 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 7 Nov 2020 19:52:56 +0100 Subject: [PATCH 051/125] package/xen: add slirp dependency for tools Build of xen tools fails if slirp is built before xen because xen is not compatible with spice slirp which does not provide libslirp.h: /home/buildroot/autobuild/instance-2/output-1/build/xen-4.13.0/tools/qemu-xen/net/slirp.c:40:10: fatal error: libslirp.h: No such file or directory #include ^~~~~~~~~~~~ Indeed, xen prefers a system-provided slirp over its internal one So add slirp as a mandatory dependency (now that we switched to the up to date https://gitlab.freedesktop.org/slirp/libslirp) This build failure is raised since, at least, version 4.13.0 Fixes: - http://autobuild.buildroot.org/results/b80b33ed558518f7bbb0a3c8586bf2d0b8acc36f Signed-off-by: Fabrice Fontaine Reviewed-by: Alistair Francis Signed-off-by: Peter Korsgaard --- package/xen/Config.in | 1 + package/xen/xen.mk | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/package/xen/Config.in b/package/xen/Config.in index 57ab40eba8..af6acd3530 100644 --- a/package/xen/Config.in +++ b/package/xen/Config.in @@ -28,6 +28,7 @@ config BR2_PACKAGE_XEN_TOOLS select BR2_PACKAGE_NCURSES select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_PIXMAN + select BR2_PACKAGE_SLIRP select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBUUID select BR2_PACKAGE_YAJL diff --git a/package/xen/xen.mk b/package/xen/xen.mk index 8f1fa7db76..8cbe532d2b 100644 --- a/package/xen/xen.mk +++ b/package/xen/xen.mk @@ -41,7 +41,8 @@ XEN_CONF_OPTS += --disable-xen endif ifeq ($(BR2_PACKAGE_XEN_TOOLS),y) -XEN_DEPENDENCIES += dtc libaio libglib2 ncurses openssl pixman util-linux yajl +XEN_DEPENDENCIES += \ + dtc libaio libglib2 ncurses openssl pixman slirp util-linux yajl ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),y) XEN_DEPENDENCIES += argp-standalone endif From 80cbc2922ab95980b7cffac077d58ce43bdfba8f Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 8 Nov 2020 16:27:35 +0100 Subject: [PATCH 052/125] Revert "configs/qemu_arm_versatile_defconfig: increase SD card image size to 64MiB" qemu_arm_versatile doesn't use SD card interface but SCSI, so there is no need to increase the image size. The change was for qemu_arm_vexpress_defconfig instead (notice the name of the defconfig used in gitlab). This reverts commit cb62a8e0a2b88b6c1b3ffe74e9eb370bf686fa62. Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- configs/qemu_arm_versatile_defconfig | 2 -- 1 file changed, 2 deletions(-) diff --git a/configs/qemu_arm_versatile_defconfig b/configs/qemu_arm_versatile_defconfig index 280c313407..6dc212397c 100644 --- a/configs/qemu_arm_versatile_defconfig +++ b/configs/qemu_arm_versatile_defconfig @@ -13,8 +13,6 @@ BR2_TARGET_ROOTFS_EXT2=y # Image BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" -# Qemu >= 5.1 requires SD card size to be a power of 2, e.g. 64 MiB. -BR2_TARGET_ROOTFS_EXT2_SIZE="64M" # Linux headers same as kernel, a 5.4 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y From 4bd2a317a7d6c3b3b19396a9459816da76b2c796 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 8 Nov 2020 16:27:36 +0100 Subject: [PATCH 053/125] configs/qemu_arm_vexpress_defconfig: increase SD card image size to 64MiB Since Qemu 5.1, this defconfig doesn't boot due to the to small SD card image size (60MB). qemu-system-arm: sd_init failed: Invalid SD card size: 60 MiB SD card size has to be a power of 2, e.g. 64 MiB. You can resize disk images with 'qemu-img resize ' (note that this will lose data if you make the image smaller than it currently is). qemu-system-arm: sd_init failed From [1]: "While the possibility to use small SD card images has been seen as a feature, it became a bug with CVE-2020-13253, where the guest is able to do OOB read/write accesses past the image size end." The qemu_arm_vexpress_tz_defconfig doesn't trigger such issue since it doesn't use the same filesystem support (i.e doesn't use -drive file=output/images/rootfs.ext2,if=sd,format=raw). Fixes: https://gitlab.com/kubu93/buildroot/-/jobs/766482935 [1] https://git.qemu.org/?p=qemu.git;a=commitdiff;h=a9bcedd15a5834ca9ae6c3a97933e85ac7edbd36 Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- configs/qemu_arm_vexpress_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/qemu_arm_vexpress_defconfig b/configs/qemu_arm_vexpress_defconfig index f99b87c17a..a106530ec8 100644 --- a/configs/qemu_arm_vexpress_defconfig +++ b/configs/qemu_arm_vexpress_defconfig @@ -16,6 +16,8 @@ BR2_TARGET_ROOTFS_EXT2=y # Image BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" +# Qemu >= 5.1 requires an SD card size to be a power of 2, e.g. 64 MiB. +BR2_TARGET_ROOTFS_EXT2_SIZE="64M" # Linux headers same as kernel, a 5.4 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y From a27f4bd420ab0f81e1eaab18b5ef18bea4425d55 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Tue, 10 Nov 2020 00:13:55 +0100 Subject: [PATCH 054/125] package/webkitgtk: fix opengl configure option - option was renamed from ENABLE_OPENGL to ENABLE_GRAPHICS_CONTEXT_GL since 2.30.0 Signed-off-by: Peter Seiderer Acked-by: Adrian Perez de Castro Signed-off-by: Peter Korsgaard --- package/webkitgtk/webkitgtk.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index 1f8582daf5..5209eeed2d 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -66,7 +66,7 @@ ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y) WEBKITGTK_CONF_OPTS += \ -DENABLE_ACCELERATED_2D_CANVAS=ON \ -DENABLE_GLES2=OFF \ - -DENABLE_OPENGL=ON \ + -DENABLE_GRAPHICS_CONTEXT_GL=ON \ -DENABLE_X11_TARGET=ON WEBKITGTK_DEPENDENCIES += libgl \ xlib_libXcomposite xlib_libXdamage xlib_libXrender xlib_libXt @@ -84,13 +84,13 @@ WEBKITGTK_DEPENDENCIES += libegl ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y) WEBKITGTK_CONF_OPTS += \ -DENABLE_GLES2=ON \ - -DENABLE_OPENGL=ON + -DENABLE_GRAPHICS_CONTEXT_GL=ON WEBKITGTK_DEPENDENCIES += libgles else # Disable general OpenGL (shading) if there's no GLESv2 WEBKITGTK_CONF_OPTS += \ -DENABLE_GLES2=OFF \ - -DENABLE_OPENGL=OFF + -DENABLE_GRAPHICS_CONTEXT_GL=OFF endif # We must explicitly state the wayland target ifeq ($(BR2_PACKAGE_LIBGTK3_WAYLAND),y) From 9eded3afc3c3459edc7d7cab7ff143b43716c13b Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Tue, 10 Nov 2020 00:13:56 +0100 Subject: [PATCH 055/125] package/webkitgtk: add optional systemd dependency - systemd support/USE_SYSTEMD option was added since 2.30.0, so add an optional dependency Fixes: -- Could NOT find Systemd (missing: Systemd_LIBRARY Systemd_INCLUDE_DIR) CMake Error at Source/cmake/OptionsGTK.cmake:425 (message): libsystemd is needed for USE_SYSTEMD Reported-by: C Larbi Signed-off-by: Peter Seiderer Acked-by: Adrian Perez de Castro Signed-off-by: Peter Korsgaard --- package/webkitgtk/webkitgtk.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index 5209eeed2d..84078f8b9a 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -104,6 +104,13 @@ else WEBKITGTK_CONF_OPTS += -DUSE_GSTREAMER_GL=OFF endif +ifeq ($(BR2_INIT_SYSTEMD),y) +WEBKITGTK_CONF_OPTS += -DUSE_SYSTEMD=ON +WEBKITGTK_DEPENDENCIES += systemd +else +WEBKITGTK_CONF_OPTS += -DUSE_SYSTEMD=OFF +endif + # JIT is not supported for MIPS r6, but the WebKit build system does not # have a check for these processors. The same goes for ARMv5 and ARMv6. # Disable JIT forcibly here and use the CLoop interpreter instead. From cfc63898f4dbdf7d9eb7c01252ea8ba4c5242229 Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Sun, 8 Nov 2020 17:33:49 +0100 Subject: [PATCH 056/125] package/cups-filters: fix daemon path for cups service Fix a typo in service location, the right location is indeed /usr/sbin. Signed-off-by: Angelo Compagnucci Signed-off-by: Peter Korsgaard --- package/cups-filters/S82cups-browsed | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/cups-filters/S82cups-browsed b/package/cups-filters/S82cups-browsed index 08909c7f98..f17bbe7465 100644 --- a/package/cups-filters/S82cups-browsed +++ b/package/cups-filters/S82cups-browsed @@ -6,7 +6,7 @@ PIDFILE="/var/run/$DAEMON.pid" start() { printf 'Starting %s: ' "$DAEMON" # shellcheck disable=SC2086 # we need the word splitting - start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/sbin/$DAEMON" \ + start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/sbin/$DAEMON" \ -- -c /etc/cups/cups-browsed.conf status=$? if [ "$status" -eq 0 ]; then From b98934170eaf6b5e4417341e9f6a0e4df9832840 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Tue, 10 Nov 2020 11:02:04 +0200 Subject: [PATCH 057/125] package/wpewebkit: add optional systemd dependency WPE WebKit 2.30.0 added an USE_SYSTEMD buil option, which needs to be set to avoid CMake from trying to use systemd unconditionally. Based on a similar patch for package/webkitgtk by Peter Seiderer. Signed-off-by: Adrian Perez de Castro Reviewed-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- package/wpewebkit/wpewebkit.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index 6233505ca7..6f83775e96 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -63,6 +63,13 @@ else WPEWEBKIT_CONF_OPTS += -DUSE_WOFF2=OFF endif +ifeq ($(BR2_INIT_SYSTEMD),y) +WPEWEBKIT_CONF_OPTS += -DUSE_SYSTEMD=ON +WPEWEBKIT_DEPENDENCIES += systemd +else +WPEWEBKIT_CONF_OPTS += -DUSE_SYSTEMD=OFF +endif + # JIT is not supported for MIPS r6, but the WebKit build system does not # have a check for these processors. The same goes for ARMv5 and ARMv6. # Disable JIT forcibly here and use the CLoop interpreter instead. From ddf40cffeab1552d350a07c26129c9e83239399c Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Tue, 10 Nov 2020 21:56:51 +0100 Subject: [PATCH 058/125] support/testing/test_syslinux: add missing Kconfig symbol BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y is needed to use the custom external toolchain x86-i686--glibc--bleeding-edge-2018.11-1.tar.bz2 Otherwise the symbol BR2_TOOLCHAIN_EXTERNAL_URL is lost. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/830981734 https://gitlab.com/buildroot.org/buildroot/-/jobs/830981733 Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- support/testing/tests/boot/test_syslinux.py | 1 + 1 file changed, 1 insertion(+) diff --git a/support/testing/tests/boot/test_syslinux.py b/support/testing/tests/boot/test_syslinux.py index f25cddfb6c..467d564e18 100644 --- a/support/testing/tests/boot/test_syslinux.py +++ b/support/testing/tests/boot/test_syslinux.py @@ -6,6 +6,7 @@ class TestSysLinuxBase(infra.basetest.BRTest): """ BR2_x86_i686=y BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y BR2_TOOLCHAIN_EXTERNAL_URL="http://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--glibc--bleeding-edge-2018.11-1.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_8=y From 50e4434fc307a209c91a7941a44a3a026263275a Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 10 Nov 2020 21:52:42 +0100 Subject: [PATCH 059/125] package/s390-tools: fix license Fix license file name in hash file Signed-off-by: Fabrice Fontaine Reviewed-by: Alexander Egorenkov Signed-off-by: Peter Korsgaard --- package/s390-tools/s390-tools.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/s390-tools/s390-tools.hash b/package/s390-tools/s390-tools.hash index 4f60b22b05..1de2399e03 100644 --- a/package/s390-tools/s390-tools.hash +++ b/package/s390-tools/s390-tools.hash @@ -1,3 +1,3 @@ # Locally computed: sha256 8dc1180031018756ccd5acf6c26c4175bcac79e512e8a2ea8569fdf5d3f9bd6c s390-tools-2.15.1.tar.gz -sha256 cca17a9a944ebec769adee4aebd805c912c357785ff2705a99ffe68563021f75 COPYING +sha256 cca17a9a944ebec769adee4aebd805c912c357785ff2705a99ffe68563021f75 LICENSE From 82d6abda1a84a2fc126af0bbda532bd545073c0e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 10 Nov 2020 21:17:07 +0100 Subject: [PATCH 060/125] package/bitcoin: set BITCOIN_GENBUILD_NO_GIT Set BITCOIN_GENBUILD_NO_GIT to not include (Buildroot) git version info in build, which is available since version 0.15.0 and https://github.com/bitcoin/bitcoin/commit/e98e3dde6a976a2c8f266ee963d6931fd4b37262 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/bitcoin/bitcoin.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/bitcoin/bitcoin.mk b/package/bitcoin/bitcoin.mk index d5e3973d9c..9d2094c02c 100644 --- a/package/bitcoin/bitcoin.mk +++ b/package/bitcoin/bitcoin.mk @@ -10,6 +10,7 @@ BITCOIN_AUTORECONF = YES BITCOIN_LICENSE = MIT BITCOIN_LICENSE_FILES = COPYING BITCOIN_DEPENDENCIES = host-pkgconf boost libevent +BITCOIN_MAKE_ENV = BITCOIN_GENBUILD_NO_GIT=1 BITCOIN_CONF_OPTS = \ --disable-bench \ --disable-wallet \ From bbfe0858851dae6a203cf0437adea3b056d9137a Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 10 Nov 2020 18:41:14 +0100 Subject: [PATCH 061/125] package/guile: disable jit for host and target gcc < 5 jit also raises build failures with host gcc 4.9.2 and x86_64 so disable it if host gcc < 5 and update workaround added by commit d8dad069c861468b17397f01875b95e7375891d7 to apply it for all architectures and not only ARM Fixes: - http://autobuild.buildroot.org/results/c2c/c2c31ff5c206bd3791d64d953dc1574546644b05 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/guile/guile.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/package/guile/guile.mk b/package/guile/guile.mk index 5e901bb10f..0e7328f199 100644 --- a/package/guile/guile.mk +++ b/package/guile/guile.mk @@ -38,10 +38,13 @@ ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM)$(BR2_OPTIMIZE_S),yy) GUILE_CFLAGS += -O2 endif -# jit triggers build failures on ARM and gcc < 5 -ifeq ($(BR2_arm):$(BR2_TOOLCHAIN_GCC_AT_LEAST_5),y:) +# jit triggers build failures with gcc < 5 +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_5),) GUILE_CONF_OPTS += --disable-jit endif +ifeq ($(BR2_HOST_GCC_AT_LEAST_5),) +HOST_GUILE_CONF_OPTS += --disable-jit +endif # It can use readline, but on the condition that it was build against # ncurses. If both aren't present disable readline support since the From 8d5076fdbab105c1efd41b8f88291a1215ebbe60 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Tue, 10 Nov 2020 00:07:44 +0100 Subject: [PATCH 062/125] package/systemd: fix update-done service for read-only filesystem Backport an upstream patch to fix a regresion introduced in 246.5 by [1]. [1] https://github.com/systemd/systemd-stable/commit/8019995e9af9c6d7b5985198cedccd24eda3e26e Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/830981805 Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- ...o-not-fail-with-read-only-etc-or-var.patch | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 package/systemd/0001-update-done-Do-not-fail-with-read-only-etc-or-var.patch diff --git a/package/systemd/0001-update-done-Do-not-fail-with-read-only-etc-or-var.patch b/package/systemd/0001-update-done-Do-not-fail-with-read-only-etc-or-var.patch new file mode 100644 index 0000000000..01e7f1e906 --- /dev/null +++ b/package/systemd/0001-update-done-Do-not-fail-with-read-only-etc-or-var.patch @@ -0,0 +1,34 @@ +From e2a23672a1bbf4d3411dce0289051b5a72bd4a67 Mon Sep 17 00:00:00 2001 +From: Felix Riemann +Date: Mon, 19 Oct 2020 18:54:53 +0200 +Subject: [PATCH] update-done: Do not fail with read-only /etc or /var + +With the switch from log_debug() to log_debug_errno() in commit c413bb28df +systemd-update-done would fail without any error message if /etc +or /var were read-only. This restores the previous behaviour to +silently ignore these directories again. + +[Romain: backport from 1eee15c3885fcc9f6a40df7e42347cb8fca71280] +Signed-off-by: Romain Naour +--- + src/update-done/update-done.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/update-done/update-done.c b/src/update-done/update-done.c +index e9d589e0e5..92c348d83b 100644 +--- a/src/update-done/update-done.c ++++ b/src/update-done/update-done.c +@@ -31,8 +31,8 @@ static int apply_timestamp(const char *path, struct timespec *ts) { + + r = write_string_file_atomic_label_ts(path, message, ts); + if (r == -EROFS) +- return log_debug_errno(r, "Cannot create \"%s\", file system is read-only.", path); +- if (r < 0) ++ log_debug_errno(r, "Cannot create \"%s\", file system is read-only.", path); ++ else if (r < 0) + return log_error_errno(r, "Failed to write \"%s\": %m", path); + return 0; + } +-- +2.25.4 + From 7b9762f4ab5bf21bdb1cf29cc833c5d4d1ec009d Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Tue, 10 Nov 2020 23:27:01 +0100 Subject: [PATCH 063/125] support/testing/test_hardening: add missing Kconfig symbol BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y is needed to use the custom external toolchain x86-i686--glibc--bleeding-edge-2018.11-1.tar.bz2 Otherwise the symbol BR2_TOOLCHAIN_EXTERNAL_URL is lost. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/830981738 https://gitlab.com/buildroot.org/buildroot/-/jobs/830981739 https://gitlab.com/buildroot.org/buildroot/-/jobs/830981740 https://gitlab.com/buildroot.org/buildroot/-/jobs/830981741 https://gitlab.com/buildroot.org/buildroot/-/jobs/830981742 https://gitlab.com/buildroot.org/buildroot/-/jobs/830981743 Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- support/testing/tests/core/test_hardening.py | 1 + 1 file changed, 1 insertion(+) diff --git a/support/testing/tests/core/test_hardening.py b/support/testing/tests/core/test_hardening.py index edfb3315db..60e14303a3 100644 --- a/support/testing/tests/core/test_hardening.py +++ b/support/testing/tests/core/test_hardening.py @@ -10,6 +10,7 @@ class TestHardeningBase(infra.basetest.BRTest): BR2_powerpc64=y BR2_powerpc_e5500=y BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y BR2_TOOLCHAIN_EXTERNAL_URL="https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e5500/tarballs/powerpc64-e5500--glibc--stable-2018.02-2.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_6=y From f52a9835fa02b02db06ee4ce06708d7b2cdfcfb4 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Tue, 10 Nov 2020 23:29:01 +0100 Subject: [PATCH 064/125] support/testing: update to the new text representation of capabilities Since libcap 2.41, the text representation of capabilities now use the '=' instead of '+' [1]. This break our capabilities tests since we still use the old representation. [1] https://git.kernel.org/pub/scm/linux/kernel/git/morgan/libcap.git/commit/?id=177cd418031b1acfcf73fe3b1af9f3279828681c Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/830981737 Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- support/testing/tests/core/test_file_capabilities.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/testing/tests/core/test_file_capabilities.py b/support/testing/tests/core/test_file_capabilities.py index 945b48a4c3..b9ece18d7b 100644 --- a/support/testing/tests/core/test_file_capabilities.py +++ b/support/testing/tests/core/test_file_capabilities.py @@ -44,4 +44,4 @@ class TestFileCapabilities(infra.basetest.BRTest): self.assertIn("cap_kill", output[0]) self.assertIn("cap_sys_nice", output[0]) self.assertIn("cap_sys_time", output[0]) - self.assertIn("+eip", output[0]) + self.assertIn("=eip", output[0]) From 48d74924dd6f5c3ee8578a17a5cdfadbc8745d8e Mon Sep 17 00:00:00 2001 From: Alexander Egorenkov Date: Wed, 11 Nov 2020 10:21:20 +0100 Subject: [PATCH 065/125] package/s390-tools: fix zkey build Linking of libekmfweb fails when zkey-ekmfweb.so build is enabled. Fixes: - http://autobuild.buildroot.net/results/d41bca3be35d1a48f962be03920f2b81c3e9bb9f Signed-off-by: Alexander Egorenkov Signed-off-by: Peter Korsgaard --- ...ey-ekmfweb-fix-linking-of-libekmfweb.patch | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 package/s390-tools/0001-zkey-ekmfweb-fix-linking-of-libekmfweb.patch diff --git a/package/s390-tools/0001-zkey-ekmfweb-fix-linking-of-libekmfweb.patch b/package/s390-tools/0001-zkey-ekmfweb-fix-linking-of-libekmfweb.patch new file mode 100644 index 0000000000..76a642af70 --- /dev/null +++ b/package/s390-tools/0001-zkey-ekmfweb-fix-linking-of-libekmfweb.patch @@ -0,0 +1,53 @@ +From a4e6f7239d8cee37e58eac974482d6deefa8a137 Mon Sep 17 00:00:00 2001 +From: Alexander Egorenkov +Date: Thu, 5 Nov 2020 17:42:58 +0100 +Subject: [PATCH 1/1] zkey/ekmfweb: fix linking of libekmfweb + +Use -L compiler's parameter instead of the environment variable +LIBRARY_PATH. + +Fixes the following problem on buildroot: + +buildroot/qemu-s390x/host/bin/s390x-linux-gcc -shared -Wl,--version-script=zkey-ekmfweb.map -Wl,-z,defs,-Bsymbolic -Wl,-soname,zkey-ekmfweb.so.1 zkey-ekmfweb.o properties.o pkey.o cca.o ep11.o utils.o ../..//libutil/libutil.a -lekmfweb -ldl -lcrypto -o zkey-ekmfweb.so +buildroot/qemu-s390x/host/bin/s390x-linux-gcc -I ../../include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I ../include -std=gnu99 -Wno-unused-parameter -Wno-missing-field-initializers -DS390_TOOLS_RELEASE=2.15.1-build-20201105 -DS390_TOOLS_LIBDIR=/lib/s390-tools -DS390_TOOLS_DATADIR=/usr/share/s390-tools -DS390_TOOLS_SYSCONFDIR=/etc -DS390_TOOLS_BINDIR=/sbin -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -D_GNU_SOURCE -c udev_ccwgroup.c -o udev_ccwgroup.o +buildroot/qemu-s390x/host/bin/s390x-linux-gcc -I ../../include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I ../include -std=gnu99 -Wno-unused-parameter -Wno-missing-field-initializers -DS390_TOOLS_RELEASE=2.15.1-build-20201105 -DS390_TOOLS_LIBDIR=/lib/s390-tools -DS390_TOOLS_DATADIR=/usr/share/s390-tools -DS390_TOOLS_SYSCONFDIR=/etc -DS390_TOOLS_BINDIR=/sbin -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -D_GNU_SOURCE -c iscsi.c -o iscsi.o +buildroot/qemu-s390x/host/bin/s390x-linux-gcc -I ../../include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I ../include -std=gnu99 -Wno-unused-parameter -Wno-missing-field-initializers -DS390_TOOLS_RELEASE=2.15.1-build-20201105 -DS390_TOOLS_LIBDIR=/lib/s390-tools -DS390_TOOLS_DATADIR=/usr/share/s390-tools -DS390_TOOLS_SYSCONFDIR=/etc -DS390_TOOLS_BINDIR=/sbin -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -D_GNU_SOURCE -c dasd.c -o dasd.o +buildroot/qemu-s390x/host/opt/ext-toolchain/bin/../lib/gcc/s390x-buildroot-linux-gnu/9.3.0/../../../../s390x-buildroot-linux-gnu/bin/ld: cannot find -lekmfweb +collect2: error: ld returned 1 exit status +make[4]: *** [Makefile:36: zkey-ekmfweb.so] Error 1 +make[3]: *** [Makefile:128: ekmfweb] Error 2 +buildroot/qemu-s390x/host/bin/s390x-linux-gcc -I ../../include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I ../include -std=gnu99 -Wno-unused-parameter -Wno-missing-field-initializers -DS390_TOOLS_RELEASE=2.15.1-build-20201105 -DS390_TOOLS_LIBDIR=/lib/s390-tools -DS390_TOOLS_DATADIR=/usr/share/s390-tools -DS390_TOOLS_SYSCONFDIR=/etc -DS390_TOOLS_BINDIR=/sbin -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -D_GNU_SOURCE -c zfcp.c -o zfcp.o +make[2]: *** [Makefile:43: zkey] Error 2 +make[2]: *** Waiting for unfinished jobs.... + +Signed-off-by: Alexander Egorenkov +Acked-by: Ingo Franzki +--- + zkey/ekmfweb/Makefile | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/zkey/ekmfweb/Makefile b/zkey/ekmfweb/Makefile +index 79a16cb5..1a3a4977 100644 +--- a/zkey/ekmfweb/Makefile ++++ b/zkey/ekmfweb/Makefile +@@ -7,8 +7,6 @@ all: zkey-ekmfweb.so + + libs = $(rootdir)/libutil/libutil.a + +-export LIBRARY_PATH = $(rootdir)/libekmfweb:$LIBRARY_PATH +- + zkey-ekmfweb.o: zkey-ekmfweb.c zkey-ekmfweb.h ../kms-plugin.h \ + ../cca.h ../utils.h ../pkey.h ../properties.h \ + $(rootdir)include/ekmfweb/ekmfweb.h libekmfweb.dep +@@ -29,7 +27,7 @@ utils.o: ../utils.c ../utils.h ../pkey.h ../cca.h ../ep11.h + $(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) -fPIC -c $< -o $@ + + zkey-ekmfweb.so: ALL_CFLAGS += -fPIC +-zkey-ekmfweb.so: LDLIBS = -lekmfweb -ldl -lcrypto ++zkey-ekmfweb.so: LDLIBS = -L$(rootdir)/libekmfweb -lekmfweb -ldl -lcrypto + zkey-ekmfweb.so: ALL_LDFLAGS += -shared -Wl,--version-script=zkey-ekmfweb.map \ + -Wl,-z,defs,-Bsymbolic -Wl,-soname,zkey-ekmfweb.so.$(VERM) + zkey-ekmfweb.so: zkey-ekmfweb.o properties.o pkey.o cca.o ep11.o utils.o $(libs) +-- +2.26.2 + From 47ffaa992ca8a179b7cacf5f0c30ea0398eb2fe0 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 11 Nov 2020 11:11:51 +0100 Subject: [PATCH 066/125] package/slirp: switch official tarball Other "official" tarballs don't ship .tarball-version resulting in a build failure: https://gitlab.freedesktop.org/slirp/libslirp/-/issues/24 Fixes: - http://autobuild.buildroot.org/results/0b9cff1bc650876a6fff6102b2cb31dcdf4c5e8f Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/slirp/slirp.hash | 2 +- package/slirp/slirp.mk | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/slirp/slirp.hash b/package/slirp/slirp.hash index 3051179df9..fe295b3bfb 100644 --- a/package/slirp/slirp.hash +++ b/package/slirp/slirp.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 6b1641f04d41bc45f94018ac8d42d3c9f3ba0e463cbeacf5f26fe83fc050161e libslirp-v4.3.1.tar.bz2 +sha256 388b4b08a8cc0996cc5155cb027a097dc1a7f2cfe84b1121496608ab5366cc48 libslirp-4.3.1.tar.xz sha256 b28aecf4796a6a22054167f0a976de13d9db335669d37afd2dc7ea4c335e1e13 COPYRIGHT diff --git a/package/slirp/slirp.mk b/package/slirp/slirp.mk index 4351818952..d046e0cf75 100644 --- a/package/slirp/slirp.mk +++ b/package/slirp/slirp.mk @@ -5,9 +5,10 @@ ################################################################################ SLIRP_VERSION = 4.3.1 -SLIRP_SOURCE = libslirp-v$(SLIRP_VERSION).tar.bz2 -SLIRP_SITE = \ - https://gitlab.freedesktop.org/slirp/libslirp/-/archive/v$(SLIRP_VERSION) +SLIRP_SOURCE = libslirp-$(SLIRP_VERSION).tar.xz +# Other "official" tarballs don't ship .tarball-version resulting in a build +# failure: https://gitlab.freedesktop.org/slirp/libslirp/-/issues/24 +SLIRP_SITE = https://elmarco.fedorapeople.org SLIRP_LICENSE = BSD-3-Clause SLIRP_LICENSE_FILES = COPYRIGHT SLIRP_INSTALL_STAGING = YES From 88a62fac1f659ccf00030e59e2a0720a9f346edf Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 11 Nov 2020 11:11:52 +0100 Subject: [PATCH 067/125] package/slirp: add libglib2 mandatory dependency slirp depends on libglib2, don't update xen as it already depends on it Fixes: - http://autobuild.buildroot.org/results/0b9cff1bc650876a6fff6102b2cb31dcdf4c5e8f Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/slirp/Config.in | 8 ++++++++ package/slirp/slirp.mk | 1 + 2 files changed, 9 insertions(+) diff --git a/package/slirp/Config.in b/package/slirp/Config.in index 8f57c4fa6a..38fd5277af 100644 --- a/package/slirp/Config.in +++ b/package/slirp/Config.in @@ -1,5 +1,9 @@ config BR2_PACKAGE_SLIRP bool "slirp" + depends on BR2_USE_MMU # libglib2 + depends on BR2_USE_WCHAR # libglib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 + select BR2_PACKAGE_LIBGLIB2 help libslirp is a user-mode networking library used by virtual machines, containers or various tools. @@ -18,3 +22,7 @@ config BR2_PACKAGE_SLIRP around May 2009 which archived it in 2012 - So we switched to https://gitlab.freedesktop.org/slirp/libslirp + +comment "slirp needs a toolchain w/ wchar, threads" + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/slirp/slirp.mk b/package/slirp/slirp.mk index d046e0cf75..ed6d8855e5 100644 --- a/package/slirp/slirp.mk +++ b/package/slirp/slirp.mk @@ -12,5 +12,6 @@ SLIRP_SITE = https://elmarco.fedorapeople.org SLIRP_LICENSE = BSD-3-Clause SLIRP_LICENSE_FILES = COPYRIGHT SLIRP_INSTALL_STAGING = YES +SLIRP_DEPENDENCIES = libglib2 $(eval $(meson-package)) From 1989a49feb47b3fbefec8d178b1aac1a1a2e6399 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 8 Nov 2020 21:53:44 +0100 Subject: [PATCH 068/125] support/testing/tests/init/test_systemd: update to BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE The commit [1] moved systemd-journal-gatewayd into systemd-journal-remote option. Update to BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE in the testsuite when BR2_PACKAGE_SYSTEMD_JOURNAL_GATEWAY is used. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/830981805 https://gitlab.com/buildroot.org/buildroot/-/jobs/830981811 [1] e46fe9a6f2b7cef9789f5172332067cac5ff03bd Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- support/testing/tests/init/test_systemd.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/support/testing/tests/init/test_systemd.py b/support/testing/tests/init/test_systemd.py index 059fb397e8..c0ef5e1202 100644 --- a/support/testing/tests/init/test_systemd.py +++ b/support/testing/tests/init/test_systemd.py @@ -105,7 +105,7 @@ class TestInitSystemSystemdRoFull(InitSystemSystemdBase): """ BR2_SYSTEM_DHCP="eth0" # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set - BR2_PACKAGE_SYSTEMD_JOURNAL_GATEWAY=y + BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE=y BR2_PACKAGE_SYSTEMD_BACKLIGHT=y BR2_PACKAGE_SYSTEMD_BINFMT=y BR2_PACKAGE_SYSTEMD_COREDUMP=y @@ -135,7 +135,7 @@ class TestInitSystemSystemdRwFull(InitSystemSystemdBase): config = InitSystemSystemdBase.config + \ """ BR2_SYSTEM_DHCP="eth0" - BR2_PACKAGE_SYSTEMD_JOURNAL_GATEWAY=y + BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE=y BR2_PACKAGE_SYSTEMD_BACKLIGHT=y BR2_PACKAGE_SYSTEMD_BINFMT=y BR2_PACKAGE_SYSTEMD_COREDUMP=y From 083dbf4cca7fd032ad07f3bde97422134b4e0b86 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 12 Apr 2020 14:21:07 +0200 Subject: [PATCH 069/125] package/libnetfilter_conntrack: add libmnl to Libs.Private This will fix a static build failure with dnsmasq on latest libnetfilter_conntrack Fixes: - http://autobuild.buildroot.org/results/3fdc2cba20162eb86eaa5c49a056fb40fb18a392 Signed-off-by: Fabrice Fontaine Tested-by: Baruch Siach [Peter: adjust upstream status as pointed out by Baruch] Signed-off-by: Peter Korsgaard --- ...ntrack.pc.in-add-LIBMNL_LIBS-to-Libs.patch | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 package/libnetfilter_conntrack/0001-libnetfilter_conntrack.pc.in-add-LIBMNL_LIBS-to-Libs.patch diff --git a/package/libnetfilter_conntrack/0001-libnetfilter_conntrack.pc.in-add-LIBMNL_LIBS-to-Libs.patch b/package/libnetfilter_conntrack/0001-libnetfilter_conntrack.pc.in-add-LIBMNL_LIBS-to-Libs.patch new file mode 100644 index 0000000000..0b373d9261 --- /dev/null +++ b/package/libnetfilter_conntrack/0001-libnetfilter_conntrack.pc.in-add-LIBMNL_LIBS-to-Libs.patch @@ -0,0 +1,38 @@ +From 93bbd7e56cefc8488a61892b3bf5df63a175d20d Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 12 Apr 2020 14:05:15 +0200 +Subject: [PATCH] libnetfilter_conntrack.pc.in: add LIBMNL_LIBS to Libs.Private + +Since version 1.0.8 and commit +c1c0f16c1fedb46547c2e104beeaaeac5933b214, libnetfilter_conntrack depends +on libmnl so add it to Libs.Private. + +Otherwise, applications such as dnsmasq will fail to link on: + +/home/buildroot/autobuild/instance-0/output-1/host/bin/arm-linux-gcc -Wl,-elf2flt -static -o dnsmasq cache.o rfc1035.o util.o option.o forward.o network.o dnsmasq.o dhcp.o lease.o rfc2131.o netlink.o dbus.o bpf.o helper.o tftp.o log.o conntrack.o dhcp6.o rfc3315.o dhcp-common.o outpacket.o radv.o slaac.o auth.o ipset.o domain.o dnssec.o blockdata.o tables.o loop.o inotify.o poll.o rrfilter.o edns0.o arp.o crypto.o dump.o ubus.o metrics.o -L/home/buildroot/autobuild/instance-0/output-1/host/bin/../arm-buildroot-uclinux-uclibcgnueabi/sysroot/usr/lib -lnetfilter_conntrack -L/home/buildroot/autobuild/instance-0/output-1/host/bin/../arm-buildroot-uclinux-uclibcgnueabi/sysroot/usr/lib -lnfnetlink +/home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/arm-buildroot-uclinux-uclibcgnueabi/bin/ld.real: /home/buildroot/autobuild/instance-0/output-1/host/bin/../arm-buildroot-uclinux-uclibcgnueabi/sysroot/usr/lib/libnetfilter_conntrack.a(api.o): in function `nfct_fill_hdr.constprop.4': +api.c:(.text+0x34): undefined reference to `mnl_nlmsg_put_header' + +Fixes: + - http://autobuild.buildroot.org/results/3fdc2cba20162eb86eaa5c49a056fb40fb18a392 + +Signed-off-by: Fabrice Fontaine +[Upstream status: commit e94172f09e4d] +--- + libnetfilter_conntrack.pc.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libnetfilter_conntrack.pc.in b/libnetfilter_conntrack.pc.in +index 857f993..fbd7132 100644 +--- a/libnetfilter_conntrack.pc.in ++++ b/libnetfilter_conntrack.pc.in +@@ -12,5 +12,5 @@ Version: @VERSION@ + Requires: libnfnetlink + Conflicts: + Libs: -L${libdir} -lnetfilter_conntrack +-Libs.private: @LIBNFNETLINK_LIBS@ ++Libs.private: @LIBNFNETLINK_LIBS@ @LIBMNL_LIBS@ + Cflags: -I${includedir} +-- +2.25.1 + From 091e2aec683f2a28b3ef5f9014455b56167dc42b Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 8 Nov 2020 18:51:05 +0100 Subject: [PATCH 070/125] package/mesa3d: Add xcb-fixes to loader when using x11 and dri3 "loader_dr3_helper.c uses xcb_xfixes_create_region() that requires dep_xcb_xfixes to link. This is dependent on with_platform_x11 and with_dri3. But the source meson file does not set this up dependent on with_dri3." i686-buildroot-linux-gnu/bin/ld: src/loader/libloader_dri3_helper.a(loader_dri3_helper.c.o): in function `loader_dri3_swap_buffers_msc': loader_dri3_helper.c:(.text.loader_dri3_swap_buffers_msc+0x33e): undefined reference to `xcb_xfixes_create_region' Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/830981830 Signed-off-by: Romain Naour Cc: Bernd Kuhls Signed-off-by: Peter Korsgaard --- ...xes-to-loader-when-using-x11-and-dri.patch | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 package/mesa3d/0005-meson-Add-xcb-fixes-to-loader-when-using-x11-and-dri.patch diff --git a/package/mesa3d/0005-meson-Add-xcb-fixes-to-loader-when-using-x11-and-dri.patch b/package/mesa3d/0005-meson-Add-xcb-fixes-to-loader-when-using-x11-and-dri.patch new file mode 100644 index 0000000000..5746bc221e --- /dev/null +++ b/package/mesa3d/0005-meson-Add-xcb-fixes-to-loader-when-using-x11-and-dri.patch @@ -0,0 +1,35 @@ +From da691ec75cc8a7b2d0ac0c5894521afda4bc601d Mon Sep 17 00:00:00 2001 +From: Duncan Hopkins +Date: Thu, 15 Oct 2020 12:14:57 +0100 +Subject: [PATCH] meson: Add xcb-fixes to loader when using x11 and dri3. Fixes + undefined symbol for xcb_xfixes_create_region in loader_dri3_helper.c + +loader_dr3_helper.c uses xcb_xfixes_create_region() that requires dep_xcb_xfixes to link. This is dependent on with_platform_x11 and with_dri3. +But the source meson file does not set this up dependent on with_dri3. +The build was initialsed using platforms=x11 and gallium-drivers=zink,swrast. + +Reviewed-by: Eric Anholt +Part-of: +(cherry picked from commit cf17d6251653f4a98e7c4f904ea2f0bc0ecedd5c) +Signed-off-by: Romain Naour +--- + meson.build | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index fbd3c4b8e8d..670cb521a2b 100644 +--- a/meson.build ++++ b/meson.build +@@ -1742,7 +1742,8 @@ if with_platform_x11 + dep_xxf86vm = dependency('xxf86vm') + endif + endif +- if (with_egl or ( ++ if (with_egl or ++ with_dri3 or ( + with_gallium_vdpau or with_gallium_xvmc or with_gallium_xa or + with_gallium_omx != 'disabled')) + dep_xcb_xfixes = dependency('xcb-xfixes') +-- +2.25.4 + From ae86067a151b6596ca492d6f94ed513f4f8e18d7 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 5 Nov 2020 17:30:19 +0100 Subject: [PATCH 071/125] support/scripts/pkg-stats: allow to run script outside of the top-level directory Currently, pkg-stats expects being executed from Buildroot's top-level source directory. As we are going to extend pkg-stats to cover only the packages available in the current configuration, it makes sense to be able to run it from the output directory, which can be anywhere compared to Buildroot's top-level directory. This commit adjusts pkg-stats to this, by inferring all Buildroot paths based on the location of the pkg-stats script itself. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- support/scripts/pkg-stats | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index 503cc45c16..fd6e370c18 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -28,7 +28,9 @@ import subprocess import json import sys -sys.path.append('utils/') +brpath = os.path.normpath(os.path.join(os.path.dirname(__file__), "..", "..")) + +sys.path.append(os.path.join(brpath, "utils")) from getdeveloperlib import parse_developers # noqa: E402 import cve as cvecheck # noqa: E402 @@ -66,7 +68,7 @@ def get_defconfig_list(): """ return [ Defconfig(name[:-len('_defconfig')], os.path.join('configs', name)) - for name in os.listdir('configs') + for name in os.listdir(os.path.join(brpath, 'configs')) if name.endswith('_defconfig') ] @@ -108,9 +110,10 @@ class Package: Fills in the .url field """ self.status['url'] = ("warning", "no Config.in") - for filename in os.listdir(os.path.dirname(self.path)): + pkgdir = os.path.dirname(os.path.join(brpath, self.path)) + for filename in os.listdir(pkgdir): if fnmatch.fnmatch(filename, 'Config.*'): - fp = open(os.path.join(os.path.dirname(self.path), filename), "r") + fp = open(os.path.join(pkgdir, filename), "r") for config_line in fp: if URL_RE.match(config_line): self.url = config_line.strip() @@ -138,7 +141,7 @@ class Package: Fills in the .infras field """ self.infras = list() - with open(self.path, 'r') as f: + with open(os.path.join(brpath, self.path), 'r') as f: lines = f.readlines() for l in lines: match = INFRA_RE.match(l) @@ -178,7 +181,7 @@ class Package: return hashpath = self.path.replace(".mk", ".hash") - if os.path.exists(hashpath): + if os.path.exists(os.path.join(brpath, hashpath)): self.status['hash'] = ("ok", "found") else: self.status['hash'] = ("error", "missing") @@ -191,7 +194,7 @@ class Package: self.status['patches'] = ("na", "no valid package infra") return - pkgdir = os.path.dirname(self.path) + pkgdir = os.path.dirname(os.path.join(brpath, self.path)) for subdir, _, _ in os.walk(pkgdir): self.patch_files = fnmatch.filter(os.listdir(subdir), '*.patch') @@ -214,8 +217,8 @@ class Package: """ Fills in the .warnings and .status['pkg-check'] fields """ - cmd = ["./utils/check-package"] - pkgdir = os.path.dirname(self.path) + cmd = [os.path.join(brpath, "utils/check-package")] + pkgdir = os.path.dirname(os.path.join(brpath, self.path)) self.status['pkg-check'] = ("error", "Missing") for root, dirs, files in os.walk(pkgdir): for f in files: @@ -300,11 +303,12 @@ def get_pkglist(npackages, package_list): "toolchain/toolchain-wrapper.mk"] packages = list() count = 0 - for root, dirs, files in os.walk("."): + for root, dirs, files in os.walk(brpath): + root = os.path.relpath(root, brpath) rootdir = root.split("/") - if len(rootdir) < 2: + if len(rootdir) < 1: continue - if rootdir[1] not in WALK_USEFUL_SUBDIRS: + if rootdir[0] not in WALK_USEFUL_SUBDIRS: continue for f in files: if not f.endswith(".mk"): @@ -316,8 +320,7 @@ def get_pkglist(npackages, package_list): pkgpath = os.path.join(root, f) skip = False for exclude in WALK_EXCLUDES: - # pkgpath[2:] strips the initial './' - if re.match(exclude, pkgpath[2:]): + if re.match(exclude, pkgpath): skip = True continue if skip: @@ -678,7 +681,7 @@ def boolean_str(b): def dump_html_pkg(f, pkg): f.write(" \n") - f.write(" %s\n" % pkg.path[2:]) + f.write(" %s\n" % pkg.path) # Patch count td_class = ["centered"] @@ -945,12 +948,13 @@ def __main__(): else: package_list = None date = datetime.datetime.utcnow() - commit = subprocess.check_output(['git', 'rev-parse', + commit = subprocess.check_output(['git', '-C', brpath, + 'rev-parse', 'HEAD']).splitlines()[0].decode() print("Build package list ...") packages = get_pkglist(args.npackages, package_list) print("Getting developers ...") - developers = parse_developers() + developers = parse_developers(brpath) print("Build defconfig list ...") defconfigs = get_defconfig_list() for d in defconfigs: From 7a607dab336e7f78ab069cff1b503d0688950583 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 5 Nov 2020 17:30:20 +0100 Subject: [PATCH 072/125] support/scripts/pkg-stats: support generating stats based on configured packages pkg-stats was initially a Buildroot maintenance oriented tool: it was designed to examine all Buildroot packages and provide statistics/details about them. However, it turns out that a number of details provided by pkg-stats, especially CVEs, are relevant also for Buildroot users, who would like to check regularly if their specific Buildroot configuration is affected by CVEs or not, and possibly check if all packages have license information, license files, etc. The cve-checker script was recently introduced to provide an output relatively similar to pkg-stats, but focused on CVEs only. But in fact, its main difference is on the set of packages that we consider: pkg-stats considers all packages, while cve-checker uses "make show-info" to only consider packages enabled in the current configuration. So, this commit introduces a -c option to pkg-stats, to tell pkg-stats to generate its output based on the list of configured packages. -c is mutually exclusive with the -p option (explicit list of packages) and -n option (a number of packages, picked randomly). Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- support/scripts/pkg-stats | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index fd6e370c18..d44f8241c1 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -333,6 +333,12 @@ def get_pkglist(npackages, package_list): return packages +def get_config_packages(): + cmd = ["make", "--no-print-directory", "show-info"] + js = json.loads(subprocess.check_output(cmd)) + return js.keys() + + def package_init_make_info(): # Fetch all variables at once variables = subprocess.check_output(["make", "BR2_HAVE_DOT_CONFIG=y", "-s", "printvars", @@ -929,6 +935,8 @@ def parse_args(): output.add_argument('--json', dest='json', type=resolvepath, help='JSON output file') packages = parser.add_mutually_exclusive_group() + packages.add_argument('-c', dest='configpackages', action='store_true', + help='Apply to packages enabled in current configuration') packages.add_argument('-n', dest='npackages', type=int, action='store', help='Number of packages') packages.add_argument('-p', dest='packages', action='store', @@ -945,6 +953,8 @@ def __main__(): args = parse_args() if args.packages: package_list = args.packages.split(",") + elif args.configpackages: + package_list = get_config_packages() else: package_list = None date = datetime.datetime.utcnow() From 3de93377814275e07e77f6f9a8616037851de540 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 5 Nov 2020 17:30:21 +0100 Subject: [PATCH 073/125] support/scripts/cve-checker: remove script Now that pkg-stats is able to generate its output based on the list of packages enabled in the current configuration, cve-checker doesn't serve any purpose. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- support/scripts/cve-checker | 196 ------------------------------------ 1 file changed, 196 deletions(-) delete mode 100755 support/scripts/cve-checker diff --git a/support/scripts/cve-checker b/support/scripts/cve-checker deleted file mode 100755 index 998ea5b8af..0000000000 --- a/support/scripts/cve-checker +++ /dev/null @@ -1,196 +0,0 @@ -#!/usr/bin/env python - -# Copyright (C) 2009 by Thomas Petazzoni -# Copyright (C) 2020 by Gregory CLEMENT -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -import argparse -import datetime -import os -import json -import sys -import cve as cvecheck - - -class Package: - def __init__(self, name, version, ignored_cves): - self.name = name - self.version = version - self.cves = list() - self.ignored_cves = ignored_cves - - -def check_package_cves(nvd_path, packages): - if not os.path.isdir(nvd_path): - os.makedirs(nvd_path) - - for cve in cvecheck.CVE.read_nvd_dir(nvd_path): - for pkg_name in cve.pkg_names: - pkg = packages.get(pkg_name, '') - if pkg and cve.affects(pkg.name, pkg.version, pkg.ignored_cves) == cve.CVE_AFFECTS: - pkg.cves.append(cve.identifier) - - -html_header = """ - - - -CVE status for Buildroot configuration - - -

-""" - - -html_footer = """ - - - -""" - - -def dump_html_pkg(f, pkg): - f.write(" \n") - f.write(" %s\n" % pkg.name) - - # Current version - if len(pkg.version) > 20: - version = pkg.version[:20] + "..." - else: - version = pkg.version - f.write(" %s\n" % version) - - # CVEs - td_class = ["centered"] - if len(pkg.cves) == 0: - td_class.append("correct") - else: - td_class.append("wrong") - f.write(" \n" % " ".join(td_class)) - for cve in pkg.cves: - f.write(" %s
\n" % (cve, cve)) - f.write(" \n") - - f.write(" \n") - - -def dump_html_all_pkgs(f, packages): - f.write(""" - - - - - - -""") - for pkg in packages: - dump_html_pkg(f, pkg) - f.write("
PackageVersionCVEs
") - - -def dump_html_gen_info(f, date): - f.write("

Generated on %s

\n" % (str(date))) - - -def dump_html(packages, date, output): - with open(output, 'w') as f: - f.write(html_header) - dump_html_all_pkgs(f, packages) - dump_html_gen_info(f, date) - f.write(html_footer) - - -def dump_json(packages, date, output): - # Format packages as a dictionnary instead of a list - pkgs = { - pkg.name: { - "version": pkg.version, - "cves": pkg.cves, - } for pkg in packages - } - # The actual structure to dump, add date to it - final = {'packages': pkgs, - 'date': str(date)} - with open(output, 'w') as f: - json.dump(final, f, indent=2, separators=(',', ': ')) - f.write('\n') - - -def resolvepath(path): - return os.path.abspath(os.path.expanduser(path)) - - -def parse_args(): - parser = argparse.ArgumentParser() - output = parser.add_argument_group('output', 'Output file(s)') - output.add_argument('--html', dest='html', type=resolvepath, - help='HTML output file') - output.add_argument('--json', dest='json', type=resolvepath, - help='JSON output file') - parser.add_argument('--nvd-path', dest='nvd_path', - help='Path to the local NVD database', type=resolvepath, - required=True) - args = parser.parse_args() - if not args.html and not args.json: - parser.error('at least one of --html or --json (or both) is required') - return args - - -def __main__(): - packages = list() - content = json.load(sys.stdin) - for item in content: - pkg = content[item] - p = Package(item, pkg.get('version', ''), pkg.get('ignore_cves', '')) - packages.append(p) - - args = parse_args() - date = datetime.datetime.utcnow() - - print("Checking packages CVEs") - check_package_cves(args.nvd_path, {p.name: p for p in packages}) - - if args.html: - print("Write HTML") - dump_html(packages, date, args.html) - if args.json: - print("Write JSON") - dump_json(packages, date, args.json) - - -__main__() From 78568465228724efca9d0d98f247c0f253cfa8eb Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 5 Nov 2020 17:30:22 +0100 Subject: [PATCH 074/125] Makefile: add pkg-stats target Now that pkg-stats is not just a maintainer-oriented tool, but a tool generally useful to users, introduce a make target to run pkg-stats. Of course, it is run with the newly introduced -c option, which produces a pkg-stats output for just the selection of packages of the currently defined configuration. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- Makefile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Makefile b/Makefile index f9e9cfa968..fa648d5d54 100644 --- a/Makefile +++ b/Makefile @@ -937,6 +937,14 @@ show-info: ) \ ) +.PHONY: pkg-stats +pkg-stats: + @cd "$(CONFIG_DIR)" ; \ + $(TOPDIR)/support/scripts/pkg-stats -c \ + --json $(O)/pkg-stats.json \ + --html $(O)/pkg-stats.html \ + --nvd-path $(DL_DIR)/buildroot-nvd + else # ifeq ($(BR2_HAVE_DOT_CONFIG),y) # Some subdirectories are also package names. To avoid that "make linux" @@ -1154,6 +1162,7 @@ help: @echo ' external-deps - list external packages used' @echo ' legal-info - generate info about license compliance' @echo ' show-info - generate info about packages, as a JSON blurb' + @echo ' pkg-stats - generate info about packages as JSON and HTML' @echo ' printvars - dump internal variables selected with VARS=...' @echo @echo ' make V=0|1 - 0 => quiet build (default), 1 => verbose build' From 9b9d3dedbb1c690850fc222609cfa7f9613ef8b4 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 5 Nov 2020 17:30:23 +0100 Subject: [PATCH 075/125] docs/manual: add some minimal documentation about show-info and pkg-stats Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- docs/manual/common-usage.txt | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/docs/manual/common-usage.txt b/docs/manual/common-usage.txt index 7cfda10365..9ba87a8339 100644 --- a/docs/manual/common-usage.txt +++ b/docs/manual/common-usage.txt @@ -157,6 +157,29 @@ your filesystem, those parts may not be all-zeroes when read back). You should only use sparse files when handling files on the build machine, not when transferring them to an actual device that will be used on the target. +=== Details about packages + +[[package-details]] + +Buildroot can produce a JSON blurb that describes the set of enabled +packages in the current configuration, together with their +dependencies, licenses and other metadata. This JSON blurb is produced +by using the +show-info+ make target: + +------------------------ +make show-info +------------------------ + +Buildroot can also produce details about packages as HTML and JSON +output using the +pkg-stats+ make target. Amongst other things, these +details include whether known CVEs (security vulnerabilities) affect +the packages in your current configuration. It also shows if there is +a newer upstream version for those packages. + +------------------------ +make pkg-stats +------------------------ + === Graphing the dependencies between packages [[graph-depends]] From edb8823c4c8b1ada67cb987075a34c9eb12d53fd Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Wed, 11 Nov 2020 16:46:37 +0100 Subject: [PATCH 076/125] package/linux-firmware: Add new option for Qualcomm/Atheros 10k (QCA9377) Initial Atheros ath10k QCA9377 support was introduced in Kernel v4.4 [1]. More recently, in v5.7 [2], the SDIO support was also added. This patch adds a new option to install firmware files for this device. [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=a226b519d43a2a6b37267fea051aacb4a79c9614 [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=6e51b0e4913ca2c93059f73ca477ca30ea95b6a0 Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/linux-firmware/Config.in | 5 +++++ package/linux-firmware/linux-firmware.mk | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in index 9b999034da..105daf42b8 100644 --- a/package/linux-firmware/Config.in +++ b/package/linux-firmware/Config.in @@ -113,6 +113,11 @@ config BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_9271 help Firmware files for the Atheros 9271 module +config BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_10K_QCA9377 + bool "Atheros 10k (QCA9377)" + help + Firmware files for the Atheros QCA9377 module + config BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_10K_QCA998X bool "Atheros 10k (QCA998X)" help diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index d9ad942903..8808b5284c 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -189,6 +189,14 @@ LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.atheros_firmware endif # ath10k +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_10K_QCA9377),y) +LINUX_FIRMWARE_FILES += ath10k/QCA9377/hw1.0/board-2.bin \ + ath10k/QCA9377/hw1.0/board.bin \ + ath10k/QCA9377/hw1.0/firmware-5.bin \ + ath10k/QCA9377/hw1.0/firmware-6.bin +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.atheros_firmware +endif + ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_10K_QCA998X),y) LINUX_FIRMWARE_FILES += ath10k/QCA988X/hw2.0/board.bin \ ath10k/QCA988X/hw2.0/firmware-4.bin \ From 7540fbe877d48d75113338430ce3304a00a82cb1 Mon Sep 17 00:00:00 2001 From: Heiko Thiery Date: Wed, 11 Nov 2020 09:18:07 +0100 Subject: [PATCH 077/125] package/libcap: fix regression for static linking issue 9c13e02c35c74eca56e69f2bbfde452b51860f5e already fixed the static linking issue for host-libcap on some distros (e.g. on Fedora32 and openSUSE). This regression was introduced by 8d38eb052e7006b6e74e9453351d7f245144481e. An upstream patch [1] is added to address this problem [2]. Fixes: Bug 13296 [1] https://git.kernel.org/pub/scm/libs/libcap/libcap.git/commit/?id=9b1c003748d4df78416d50fce139f0875224440b [2] https://bugzilla.kernel.org/show_bug.cgi?id=210135 Cc: Peter Seiderer Cc: Dr I J Ormshaw Signed-off-by: Heiko Thiery Tested-by: Ian Ormshaw Tested-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- ...ding-progs-tcapsh-static-to-sudotest.patch | 79 +++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 package/libcap/0001-Migrate-building-progs-tcapsh-static-to-sudotest.patch diff --git a/package/libcap/0001-Migrate-building-progs-tcapsh-static-to-sudotest.patch b/package/libcap/0001-Migrate-building-progs-tcapsh-static-to-sudotest.patch new file mode 100644 index 0000000000..856b7b1bbf --- /dev/null +++ b/package/libcap/0001-Migrate-building-progs-tcapsh-static-to-sudotest.patch @@ -0,0 +1,79 @@ +From 9b1c003748d4df78416d50fce139f0875224440b Mon Sep 17 00:00:00 2001 +From: "Andrew G. Morgan" +Date: Tue, 10 Nov 2020 20:47:45 -0800 +Subject: [PATCH] Migrate building progs/tcapsh-static to sudotest + +This addresses: + + https://bugzilla.kernel.org/show_bug.cgi?id=210135 + https://bugs.busybox.net/show_bug.cgi?id=13296 + +Some notes on expectations: + +When building DYNAMIC=yes folk want to avoid depending on a +static libc.a file in their build tree. The best we can do is +to move building static test tool objects to sudotest. + + make DYNAMIC=yes clean all test + +will build the progs binaries and run the tests with all dynamic +linking. It will, however, build the libcap.a etc libraries too +even though they are not used for linking. + + make DYNAMIC=no clean all test + +will build the progs binaries and run the tests with all static +linking. It will, however, build the libcap.so etc libraries too +even though they are not used for linking. + + make SHARED=no clean all test + +will build and link progs and test binaries statically against +libcap.a. No shared libraries (libcap.so etc) will be built. + +In all cases, whether linked against or not, libcap.a is built. + +Signed-off-by: Andrew G. Morgan +[Patch taken from upstream: +https://git.kernel.org/pub/scm/libs/libcap/libcap.git/commit/?id=9b1c003748d4df78416d50fce139f0875224440b] +Signed-off-by: Heiko Thiery +--- + tests/Makefile | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/tests/Makefile b/tests/Makefile +index fc39fee..1e7039d 100644 +--- a/tests/Makefile ++++ b/tests/Makefile +@@ -17,13 +17,13 @@ install: all + + ifeq ($(DYNAMIC),yes) + LINKEXTRA=-Wl,-rpath,../libcap +-DEPS=../libcap/libcap.so ../progs/tcapsh-static ++DEPS=../libcap/libcap.so + ifeq ($(PTHREADS),yes) + DEPS += ../libcap/libpsx.so + endif + else + LDFLAGS += --static +-DEPS=../libcap/libcap.a ../progs/tcapsh-static ++DEPS=../libcap/libcap.a + ifeq ($(PTHREADS),yes) + DEPS += ../libcap/libpsx.a + endif +@@ -71,10 +71,10 @@ libcap_psx_test: libcap_psx_test.c $(DEPS) + $(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LINKEXTRA) $(LIBCAPLIB) $(LIBPSXLIB) $(LDFLAGS) + + # privileged +-run_libcap_launch_test: libcap_launch_test noop ++run_libcap_launch_test: libcap_launch_test noop ../progs/tcapsh-static + sudo ./libcap_launch_test + +-run_libcap_psx_launch_test: libcap_psx_launch_test ++run_libcap_psx_launch_test: libcap_psx_launch_test ../progs/tcapsh-static + sudo ./libcap_psx_launch_test + + libcap_launch_test: libcap_launch_test.c $(DEPS) +-- +2.20.1 + From 7e0f81a9f65b57c0228466b7f59d222f2011e4d0 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 12 Nov 2020 10:21:45 +0100 Subject: [PATCH 078/125] package/tmux: add upstream security fix for CVE-2020-27347 Fixes CVE-2020-27347: The function input_csi_dispatch_sgr_colon() in file input.c contained a stack-based buffer-overflow that can be exploited by terminal output. For details, see: https://www.openwall.com/lists/oss-security/2020/11/05/3 Signed-off-by: Peter Korsgaard --- ...er-the-end-of-the-array-and-overwrit.patch | 35 +++++++++++++++++++ package/tmux/tmux.mk | 3 ++ 2 files changed, 38 insertions(+) create mode 100644 package/tmux/0001-Do-not-write-after-the-end-of-the-array-and-overwrit.patch diff --git a/package/tmux/0001-Do-not-write-after-the-end-of-the-array-and-overwrit.patch b/package/tmux/0001-Do-not-write-after-the-end-of-the-array-and-overwrit.patch new file mode 100644 index 0000000000..d169322ed7 --- /dev/null +++ b/package/tmux/0001-Do-not-write-after-the-end-of-the-array-and-overwrit.patch @@ -0,0 +1,35 @@ +From a868bacb46e3c900530bed47a1c6f85b0fbe701c Mon Sep 17 00:00:00 2001 +From: nicm +Date: Thu, 29 Oct 2020 16:33:01 +0000 +Subject: [PATCH] Do not write after the end of the array and overwrite the + stack when colon-separated SGR sequences contain empty arguments. Reported by + Sergey Nizovtsev. + +[Peter: Fixes CVE-2020-27347] +Signed-off-by: Peter Korsgaard +--- + input.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/input.c b/input.c +index 42a60c92..c280c0d9 100644 +--- a/input.c ++++ b/input.c +@@ -1976,8 +1976,13 @@ input_csi_dispatch_sgr_colon(struct input_ctx *ictx, u_int i) + free(copy); + return; + } +- } else ++ } else { + n++; ++ if (n == nitems(p)) { ++ free(copy); ++ return; ++ } ++ } + log_debug("%s: %u = %d", __func__, n - 1, p[n - 1]); + } + free(copy); +-- +2.20.1 + diff --git a/package/tmux/tmux.mk b/package/tmux/tmux.mk index 169c9bb83f..00e77ad762 100644 --- a/package/tmux/tmux.mk +++ b/package/tmux/tmux.mk @@ -10,6 +10,9 @@ TMUX_LICENSE = ISC TMUX_LICENSE_FILES = COPYING TMUX_DEPENDENCIES = libevent ncurses host-pkgconf +# 0001-Do-not-write-after-the-end-of-the-array-and-overwrit.patch +TMUX_IGNORE_CVES += CVE-2020-27347 + # Add /usr/bin/tmux to /etc/shells otherwise some login tools like dropbear # can reject the user connection. See man shells. define TMUX_ADD_TMUX_TO_SHELLS From ad0e1d609be6c9fce1d85e8aeff87af63d9ce158 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 12 Nov 2020 20:01:17 +0100 Subject: [PATCH 079/125] package/argp-standalone: add license file Use argp.h as the license file and, while at it, update indentation in hash file Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/argp-standalone/argp-standalone.hash | 5 ++++- package/argp-standalone/argp-standalone.mk | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/package/argp-standalone/argp-standalone.hash b/package/argp-standalone/argp-standalone.hash index 5798214406..c780f9e53f 100644 --- a/package/argp-standalone/argp-standalone.hash +++ b/package/argp-standalone/argp-standalone.hash @@ -1,2 +1,5 @@ # Locally calculated after checking pgp signature -sha256 dec79694da1319acd2238ce95df57f3680fea2482096e483323fddf3d818d8be argp-standalone-1.3.tar.gz +sha256 dec79694da1319acd2238ce95df57f3680fea2482096e483323fddf3d818d8be argp-standalone-1.3.tar.gz + +# License file +sha256 bbb8919aa520069b0234faf5e83a94052d278419ffe97ca8e843ecc9b212d1ab argp.h diff --git a/package/argp-standalone/argp-standalone.mk b/package/argp-standalone/argp-standalone.mk index 977b9547b6..651bc400f4 100644 --- a/package/argp-standalone/argp-standalone.mk +++ b/package/argp-standalone/argp-standalone.mk @@ -8,6 +8,7 @@ ARGP_STANDALONE_VERSION = 1.3 ARGP_STANDALONE_SITE = http://www.lysator.liu.se/~nisse/archive ARGP_STANDALONE_INSTALL_STAGING = YES ARGP_STANDALONE_LICENSE = LGPL-2.0+ +ARGP_STANDALONE_LICENSE_FILES = argp.h ARGP_STANDALONE_CONF_ENV = \ CFLAGS="$(TARGET_CFLAGS) -fPIC -fgnu89-inline" From ffc3d6c240bc98ee6c1500286cca6c499785225d Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 12 Nov 2020 20:06:10 +0100 Subject: [PATCH 080/125] package/bandwidthd: add license file Use README as the license file until upstream provides one: https://github.com/nroach44/bandwidthd/issues/2 While at it, also update indentation in hash file (two spaces) Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/bandwidthd/bandwidthd.hash | 3 ++- package/bandwidthd/bandwidthd.mk | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/package/bandwidthd/bandwidthd.hash b/package/bandwidthd/bandwidthd.hash index c73584de2e..5b1bbce978 100644 --- a/package/bandwidthd/bandwidthd.hash +++ b/package/bandwidthd/bandwidthd.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 0270d0def6cc53c8d47d59a9dd093d51fbca1620adeef85c15e35a32010e26ab bandwidthd-2.0.1-auto-r11.tar.gz +sha256 0270d0def6cc53c8d47d59a9dd093d51fbca1620adeef85c15e35a32010e26ab bandwidthd-2.0.1-auto-r11.tar.gz +sha256 58573c40770e0c0b91f3eef8192952832321a344f66a4fb2d966095cbbfc86c2 README diff --git a/package/bandwidthd/bandwidthd.mk b/package/bandwidthd/bandwidthd.mk index 990d8c5d8f..88222a910e 100644 --- a/package/bandwidthd/bandwidthd.mk +++ b/package/bandwidthd/bandwidthd.mk @@ -10,6 +10,7 @@ BANDWIDTHD_SITE = $(call github,nroach44,bandwidthd,v$(BANDWIDTHD_VERSION)) # Specified as "any version of the GPL that is current as of your # download" by upstream. BANDWIDTHD_LICENSE = GPL +BANDWIDTHD_LICENSE_FILES = README BANDWIDTHD_DEPENDENCIES = gd libpng libpcap host-pkgconf From 1379ef161bb95636aa5b0f7666cdaa3dbefe11d7 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 12 Nov 2020 20:10:42 +0100 Subject: [PATCH 081/125] package/fbset: add license file Use fbset.c as the license file and, while at it, also update indentation in hash file (two spaces) Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/fbset/fbset.hash | 3 ++- package/fbset/fbset.mk | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/package/fbset/fbset.hash b/package/fbset/fbset.hash index ca8cc6d1f0..5d9785d90a 100644 --- a/package/fbset/fbset.hash +++ b/package/fbset/fbset.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 40ff4ab0247b75138a0887ed40f81c1a6184f340b77126c16d074b1075b41c20 fbset-2.1.tar.gz +sha256 40ff4ab0247b75138a0887ed40f81c1a6184f340b77126c16d074b1075b41c20 fbset-2.1.tar.gz +sha256 c3285709a0840899a789faefae1704e87f96f757e905a38a1931a9d4fde95ddd fbset.c diff --git a/package/fbset/fbset.mk b/package/fbset/fbset.mk index 787b4e1dca..8d2a477f8b 100644 --- a/package/fbset/fbset.mk +++ b/package/fbset/fbset.mk @@ -8,6 +8,7 @@ FBSET_VERSION = 2.1 FBSET_SITE = http://users.telenet.be/geertu/Linux/fbdev FBSET_DEPENDENCIES = host-bison host-flex FBSET_LICENSE = GPL-2.0 +FBSET_LICENSE_FILES = fbset.c define FBSET_BUILD_CMDS $(MAKE1) $(TARGET_CONFIGURE_OPTS) -C $(@D) From 8c77548fa93e159572e71d4cb2208ab0706aea11 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 12 Nov 2020 20:22:55 +0100 Subject: [PATCH 082/125] package/waf: add license Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/waf/waf.hash | 1 + package/waf/waf.mk | 2 ++ 2 files changed, 3 insertions(+) diff --git a/package/waf/waf.hash b/package/waf/waf.hash index 15db32f384..afca0f31bf 100644 --- a/package/waf/waf.hash +++ b/package/waf/waf.hash @@ -1,3 +1,4 @@ # Locally computed sha1 92212071a63ce38fdfd69fb8332f04e84d1f6635 waf-2.0.20 sha256 bf971e98edc2414968a262c6aa6b88541a26c3cd248689c89f4c57370955ee7f waf-2.0.20 +sha256 bf971e98edc2414968a262c6aa6b88541a26c3cd248689c89f4c57370955ee7f waf diff --git a/package/waf/waf.mk b/package/waf/waf.mk index 56b6d9e033..9c5e72d9eb 100644 --- a/package/waf/waf.mk +++ b/package/waf/waf.mk @@ -7,6 +7,8 @@ WAF_VERSION = 2.0.20 WAF_SOURCE = waf-$(WAF_VERSION) WAF_SITE = https://waf.io +WAF_LICENSE = BSD-3-Clause +WAF_LICENSE_FILES = waf define HOST_WAF_EXTRACT_CMDS $(INSTALL) -D -m 0755 $(HOST_WAF_DL_DIR)/waf-$(WAF_VERSION) $(@D)/waf From a325eefc1b1e0be4848fc67265c7395abdf08945 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Thu, 12 Nov 2020 21:21:34 +0100 Subject: [PATCH 083/125] package/apparmor: fix permission bits for apparmor.service Avoid setting executable bits for apparmor.service. This gets rid of a corresponding warning during installation: Configuration file ../target/usr/lib/systemd/system/apparmor.service is marked executable. Please remove executable permission bits. Proceeding anyway. Signed-off-by: Stefan Agner Signed-off-by: Peter Korsgaard --- package/apparmor/apparmor.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/apparmor/apparmor.mk b/package/apparmor/apparmor.mk index 4d08b0433b..7ea0fabd91 100644 --- a/package/apparmor/apparmor.mk +++ b/package/apparmor/apparmor.mk @@ -88,7 +88,7 @@ endef define APPARMOR_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0755 $(@D)/parser/apparmor.systemd \ $(TARGET_DIR)/lib/apparmor/apparmor.systemd - $(INSTALL) -D -m 0755 $(@D)/parser/apparmor.service \ + $(INSTALL) -D -m 0644 $(@D)/parser/apparmor.service \ $(TARGET_DIR)/usr/lib/systemd/system/apparmor.service endef From 339d3e82e8e121204523829bb0900fce4b99c923 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 12 Nov 2020 13:44:08 +0100 Subject: [PATCH 084/125] package/asterisk: security bump to version 16.14.1 Fixes the following security issues: - AST-2020-001: Remote crash in res_pjsip_session Upon receiving a new SIP Invite, Asterisk did not return the created dialog locked or referenced. - AST-2020-002: Outbound INVITE loop on challenge with different nonce If Asterisk is challenged on an outbound INVITE and the nonce is changed in each response, Asterisk will continually send INVITEs in a loop. This causes Asterisk to consume more and more memory since the transaction will never terminate (even if the call is hung up), ultimately leading to a restart or shutdown of Asterisk. Outbound authentication must be configured on the endpoint for this to occur. For details, see the announcement: https://www.asterisk.org/asterisk-news/asterisk-13-37-1-16-14-1-17-8-1-18-0-1-and-16-8-cert5-now-available-security/ Signed-off-by: Peter Korsgaard --- package/asterisk/asterisk.hash | 2 +- package/asterisk/asterisk.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/asterisk/asterisk.hash b/package/asterisk/asterisk.hash index 1bb5da7d06..bd83636271 100644 --- a/package/asterisk/asterisk.hash +++ b/package/asterisk/asterisk.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 5ebefa6387f89695361b8c105e2ad7ee6381f87a99012aeb85b886ddf6d518ac asterisk-16.13.0.tar.gz +sha256 226eaef400d2d335ce29d7b3c8aca8dfdfc5e854c215e0c47615c095ced12171 asterisk-16.14.1.tar.gz # sha1 from: http://downloads.asterisk.org/pub/telephony/sounds/releases # sha256 locally computed diff --git a/package/asterisk/asterisk.mk b/package/asterisk/asterisk.mk index b9e2b80dd5..fb3eb6ec8a 100644 --- a/package/asterisk/asterisk.mk +++ b/package/asterisk/asterisk.mk @@ -4,7 +4,7 @@ # ################################################################################ -ASTERISK_VERSION = 16.13.0 +ASTERISK_VERSION = 16.14.1 # Use the github mirror: it's an official mirror maintained by Digium, and # provides tarballs, which the main Asterisk git tree (behind Gerrit) does not. ASTERISK_SITE = $(call github,asterisk,asterisk,$(ASTERISK_VERSION)) From 8b4b9289aac5b6d77a8c8e4644326dafe88bc335 Mon Sep 17 00:00:00 2001 From: Klaus Heinrich Kiwi Date: Thu, 12 Nov 2020 13:48:44 -0300 Subject: [PATCH 085/125] package/busybox: Fix hwclock for glibc 2.31+ Pick the below patch from upstream, in order to fix 'settimeofday: Invalid argument' introduced by using glibc v2.31+. (busybox hasn't tagged a new version since). See https://bugs.busybox.net/show_bug.cgi?id=12756 for more info. Signed-off-by: Klaus Heinrich Kiwi Signed-off-by: Peter Korsgaard --- ...ock-Fix-settimeofday-for-glibc-v2.31.patch | 58 +++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 package/busybox/0003-hwclock-Fix-settimeofday-for-glibc-v2.31.patch diff --git a/package/busybox/0003-hwclock-Fix-settimeofday-for-glibc-v2.31.patch b/package/busybox/0003-hwclock-Fix-settimeofday-for-glibc-v2.31.patch new file mode 100644 index 0000000000..cab346acf3 --- /dev/null +++ b/package/busybox/0003-hwclock-Fix-settimeofday-for-glibc-v2.31.patch @@ -0,0 +1,58 @@ +From 1a5d6fcbb5e606ab4acdf22afa26361a25f1d43b Mon Sep 17 00:00:00 2001 +From: Eddie James +Date: Mon, 10 Aug 2020 09:59:02 -0500 +Subject: [PATCH] hwclock: Fix settimeofday for glibc v2.31+ + +The glibc implementation changed for settimeofday, resulting in "invalid +argument" error when attempting to set both timezone and time with a single +call. Fix this by calling settimeofday twice + +Signed-off-by: Eddie James +Signed-off-by: Denys Vlasenko +--- + util-linux/hwclock.c | 14 +++++++++++--- + 1 file changed, 11 insertions(+), 3 deletions(-) + +diff --git a/util-linux/hwclock.c b/util-linux/hwclock.c +index dc97d8fb4..2479e7416 100644 +--- a/util-linux/hwclock.c ++++ b/util-linux/hwclock.c +@@ -122,16 +122,20 @@ static void to_sys_clock(const char **pp_rtcname, int utc) + struct timeval tv; + struct timezone tz; + +- tz.tz_minuteswest = timezone/60; ++ tz.tz_minuteswest = timezone / 60; + /* ^^^ used to also subtract 60*daylight, but it's wrong: + * daylight!=0 means "this timezone has some DST + * during the year", not "DST is in effect now". + */ + tz.tz_dsttime = 0; + ++ /* glibc v2.31+ returns an error if both args are non-NULL */ ++ if (settimeofday(NULL, &tz)) ++ bb_simple_perror_msg_and_die("settimeofday"); ++ + tv.tv_sec = read_rtc(pp_rtcname, NULL, utc); + tv.tv_usec = 0; +- if (settimeofday(&tv, &tz)) ++ if (settimeofday(&tv, NULL)) + bb_simple_perror_msg_and_die("settimeofday"); + } + +@@ -283,7 +287,11 @@ static void set_system_clock_timezone(int utc) + gettimeofday(&tv, NULL); + if (!utc) + tv.tv_sec += tz.tz_minuteswest * 60; +- if (settimeofday(&tv, &tz)) ++ ++ /* glibc v2.31+ returns an error if both args are non-NULL */ ++ if (settimeofday(NULL, &tz)) ++ bb_simple_perror_msg_and_die("settimeofday"); ++ if (settimeofday(&tv, NULL)) + bb_simple_perror_msg_and_die("settimeofday"); + } + +-- +2.17.1 + From ec493ea4899f7be6500f495a32b4150feff355ef Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Thu, 12 Nov 2020 13:01:54 +0100 Subject: [PATCH 086/125] package/linux-backports: use flex and bison to generate kconfig parser Upstream backports package does not define the LEX/YACC Makefile variables, contrary to the Kernel which is defining those in [1]. The default "lex" and "yacc" are then used. On some systems, "yacc" is Berkeley Yacc. Kconfig parser files are using non-Posix Bison constructs. Attempting to generate the parser with byacc fails with error: yacc: e - line 97 of "zconf.y", syntax error %destructor { ^ This patch defines the LEX and YACC Makefile variable to use flex and bison, to fix this issue. The host-bison and host-flex dependencies are added only if the host does not have them, following the same logic of the Kernel. [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=73a4f6dbe70a1b93c11e2d1d6ca68f3522daf434 Signed-off-by: Julien Olivain Reviewed-by: Petr Vorel Signed-off-by: Yann E. MORIN --- package/linux-backports/linux-backports.mk | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/package/linux-backports/linux-backports.mk b/package/linux-backports/linux-backports.mk index 1d7d6e7f00..030d7a2864 100644 --- a/package/linux-backports/linux-backports.mk +++ b/package/linux-backports/linux-backports.mk @@ -11,6 +11,14 @@ LINUX_BACKPORTS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/projects/backports/stab LINUX_BACKPORTS_LICENSE = GPL-2.0 LINUX_BACKPORTS_LICENSE_FILES = COPYING +# flex and bison are needed to generate kconfig parser. We use the +# same logic as the linux kernel (we add host dependencies only if +# host does not have them). See linux/linux.mk and +# support/dependencies/check-host-bison-flex.mk. +LINUX_BACKPORTS_DEPENDENCIES = \ + $(BR2_BISON_HOST_DEPENDENCY) \ + $(BR2_FLEX_HOST_DEPENDENCY) + ifeq ($(BR2_PACKAGE_LINUX_BACKPORTS_USE_DEFCONFIG),y) LINUX_BACKPORTS_KCONFIG_FILE = $(LINUX_BACKPORTS_DIR)/defconfigs/$(call qstrip,$(BR2_PACKAGE_LINUX_BACKPORTS_DEFCONFIG)) else ifeq ($(BR2_PACKAGE_LINUX_BACKPORTS_USE_CUSTOM_CONFIG),y) @@ -33,6 +41,8 @@ LINUX_BACKPORTS_KCONFIG_OPTS = $(LINUX_BACKPORTS_MAKE_OPTS) # LINUX_BACKPORTS_MODULE_MAKE_OPTS is used by the kernel-module infra. # LINUX_BACKPORTS_MAKE_OPTS = \ + LEX=flex \ + YACC=bison \ BACKPORT_DIR=$(@D) \ KLIB_BUILD=$(LINUX_DIR) \ KLIB=$(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED) \ From 6e5f672139011570a9e099c6bc0d76d1b81e1e36 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Tue, 10 Nov 2020 23:16:29 +0100 Subject: [PATCH 087/125] package/wpewebkit: fix compile without video support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: - https://bugs.busybox.net/show_bug.cgi?id=13306 .../wpewebkit-2.30.2/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp:242:30: error: ‘class WebCore::Settings’ has no member named ‘setGenericCueAPIEnabled’; did you mean ‘setBeaconAPIEnabled’? page->settings().setGenericCueAPIEnabled(enabled); ^~~~~~~~~~~~~~~~~~~~~~~ setBeaconAPIEnabled Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- ...tedBundle-fix-compile-without-video-.patch | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 package/wpewebkit/0002-WebProcess-InjectedBundle-fix-compile-without-video-.patch diff --git a/package/wpewebkit/0002-WebProcess-InjectedBundle-fix-compile-without-video-.patch b/package/wpewebkit/0002-WebProcess-InjectedBundle-fix-compile-without-video-.patch new file mode 100644 index 0000000000..e684c4e3e7 --- /dev/null +++ b/package/wpewebkit/0002-WebProcess-InjectedBundle-fix-compile-without-video-.patch @@ -0,0 +1,42 @@ +From 1ca7dea56db25969844699bc82fe7c78cb3d2eda Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Tue, 10 Nov 2020 23:06:45 +0100 +Subject: [PATCH] WebProcess/InjectedBundle: fix compile without video support +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes: + + .../wpewebkit-2.30.2/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp:242:30: error: ‘class WebCore::Settings’ has no member named ‘setGenericCueAPIEnabled’; did you mean ‘setBeaconAPIEnabled’? + page->settings().setGenericCueAPIEnabled(enabled); + ^~~~~~~~~~~~~~~~~~~~~~~ + setBeaconAPIEnabled + +Signed-off-by: Peter Seiderer +--- + Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp b/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp +index 61326f2e..d7776997 100644 +--- a/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp ++++ b/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp +@@ -236,12 +236,14 @@ void InjectedBundle::overrideBoolPreferenceForTestRunner(WebPageGroupProxy* page + RuntimeEnabledFeatures::sharedFeatures().setWebRTCMDNSICECandidatesEnabled(enabled); + #endif + ++#if ENABLE(VIDEO) + if (preference == "WebKitGenericCueAPIEnabled") { + WebPreferencesStore::overrideBoolValueForKey(WebPreferencesKey::genericCueAPIEnabledKey(), enabled); + for (auto* page : pages) + page->settings().setGenericCueAPIEnabled(enabled); + return; + } ++#endif + + #if ENABLE(GPU_PROCESS) + if (preference == "WebKitUseGPUProcessForMedia" || preference == "WebKitCaptureAudioInGPUProcessEnabledKey") { +-- +2.29.2 + From 5333ada9713f88c8ff87a8ce1d6f2f99ded56712 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Thu, 12 Nov 2020 00:34:28 +0100 Subject: [PATCH 088/125] package/python3: uClibc-ng doesn't set errno when encryption method is not available Since commit [1] in cpython, an exception is raised when an encryption method is not available. This eception is handled only if errno is set to EINVAL by crypt() but uClibc-ng doesn't set errno in crypt() [2]. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/830981961 https://gitlab.com/buildroot.org/buildroot/-/jobs/830981979 [1] https://github.com/python/cpython/commit/0d3fe8ae4961bf551e7d5e42559e2ede1a08fd7c [2] https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/tree/libcrypt/crypt.c?h=v1.0.36#n29 Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- ...-ng-doesn-t-set-errno-when-encryptio.patch | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 package/python3/0034-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch diff --git a/package/python3/0034-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch b/package/python3/0034-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch new file mode 100644 index 0000000000..880277eb1d --- /dev/null +++ b/package/python3/0034-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch @@ -0,0 +1,40 @@ +From 3c83eedcc2df3ecf6c4a17953ca24dff60c1378e Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Thu, 12 Nov 2020 00:16:18 +0100 +Subject: [PATCH] lib/crypt: uClibc-ng doesn't set errno when encryption method + is not available + +Since commit [1] in cpython, an exception is raised when an encryption method +is not available. This eception is handled only if errno is set to EINVAL by +crypt() but uClibc-ng doesn't set errno in crypt() [2]. + +Fixes: +https://gitlab.com/buildroot.org/buildroot/-/jobs/830981961 +https://gitlab.com/buildroot.org/buildroot/-/jobs/830981979 + +[1] https://github.com/python/cpython/commit/0d3fe8ae4961bf551e7d5e42559e2ede1a08fd7c +[2] https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/tree/libcrypt/crypt.c?h=v1.0.36#n29 + +Signed-off-by: Romain Naour +--- + Lib/crypt.py | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/Lib/crypt.py b/Lib/crypt.py +index 33dbc46bb3..4692a5270c 100644 +--- a/Lib/crypt.py ++++ b/Lib/crypt.py +@@ -94,7 +94,9 @@ def _add_method(name, *args, rounds=None): + result = crypt('', salt) + except OSError as e: + # Not all libc libraries support all encryption methods. +- if e.errno == errno.EINVAL: ++ # Not all libc libraries set errno when encryption method is not ++ # available. ++ if e.errno == errno.EINVAL or e.errno == 0: + return False + raise + if result and len(result) == method.total_size: +-- +2.25.4 + From b6bf8b2169b7de7c509a9312bc308c6bccd47f45 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Thu, 12 Nov 2020 00:34:29 +0100 Subject: [PATCH 089/125] package/python-lmdb: bump to version 0.99 This version fix the runtime issue with python 3.9 since _Py_ForgetReference() was removed from the limited C API [1]. $ python sample_python_crossbar.py /usr/bin/python3.9: symbol '_Py_ForgetReference': can't resolve symbol python-lmbd 0.99 contain a refactoring removing _Py_ForgetReference() from the code. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/830981961 https://gitlab.com/buildroot.org/buildroot/-/jobs/830981979 [1] https://docs.python.org/3/whatsnew/3.9.html#id3 [2] https://github.com/jnwatson/py-lmdb/commit/22a3724bdcda62853e8a250094f512eb20abe01f Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- package/python-lmdb/python-lmdb.hash | 4 ++-- package/python-lmdb/python-lmdb.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-lmdb/python-lmdb.hash b/package/python-lmdb/python-lmdb.hash index 569d1d0bd6..cb28536d3f 100644 --- a/package/python-lmdb/python-lmdb.hash +++ b/package/python-lmdb/python-lmdb.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/lmdb/json -md5 ae2efef18202e51c9e4a807a47900ce2 lmdb-0.98.tar.gz -sha256 0625bc28bf0893e6000a83be7234f915ca078c32f9e73d8ae48b3508db7af708 lmdb-0.98.tar.gz +md5 507049767b995c3c6a93b3bd97567c71 lmdb-0.99.tar.gz +sha256 f9eb844aaaacc8a4bc175e1c1f8a8fb538c330e378fd9eb40e8708d4dca7dc89 lmdb-0.99.tar.gz # Locally computed sha256 checksums sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 LICENSE diff --git a/package/python-lmdb/python-lmdb.mk b/package/python-lmdb/python-lmdb.mk index f92c7f775b..bf98ba19c8 100644 --- a/package/python-lmdb/python-lmdb.mk +++ b/package/python-lmdb/python-lmdb.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_LMDB_VERSION = 0.98 +PYTHON_LMDB_VERSION = 0.99 PYTHON_LMDB_SOURCE = lmdb-$(PYTHON_LMDB_VERSION).tar.gz -PYTHON_LMDB_SITE = https://files.pythonhosted.org/packages/c0/5c/d56dbc2532ecf14fa004c543927500c0f645eaca8bd7ec39420c7546396a +PYTHON_LMDB_SITE = https://files.pythonhosted.org/packages/3b/66/aa6f3a3e338a3ca263575ce6f722c2fdcd21039a03b55c722e0ae0b216db PYTHON_LMDB_LICENSE = OLDAP-2.8 PYTHON_LMDB_LICENSE_FILES = LICENSE PYTHON_LMDB_SETUP_TYPE = setuptools From a5fa2469e6506ea4f5a91739aa099f63a10e45ce Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 31 May 2020 16:34:52 +0200 Subject: [PATCH 090/125] configs/rock64_defconfig: remove defconfig MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The rock64 defconfig is currently broken [1][2] since a while due to incompatibility between uboot-2017.09-rockchip-ayufan fork and pylibfdt. Even with the latest uboot-2017.09-rockchip-ayufan fork version [3], it doesn't build. The original submitter tried the uboot upstream rock64-rk3328_defconfig but the board doesn't boot [4]. In order to not release 2020.05 with a broken defconfig, let's remove it. It can be re-added later once the uboot issue has been resolved. [1] 2020.05-rc2: https://gitlab.com/buildroot.org/buildroot/-/jobs/563613273 [2] 2020.02: https://gitlab.com/buildroot.org/buildroot/-/jobs/548596102 [3] https://github.com/ayufan-rock64/linux-u-boot/releases/tag/2017.09-rockchip-ayufan-1065-g95f6152134 [4] http://lists.busybox.net/pipermail/buildroot/2020-May/282164.html Signed-off-by: Romain Naour Cc: Michał Łyszczek Signed-off-by: Yann E. MORIN --- DEVELOPERS | 2 - board/pine64/rock64/extlinux.conf | 4 - board/pine64/rock64/genimage.cfg | 23 ----- ...328-needs-itb-image-to-boot-properly.patch | 32 ------- board/pine64/rock64/post-build.sh | 9 -- board/pine64/rock64/readme.txt | 95 ------------------- configs/rock64_defconfig | 38 -------- 7 files changed, 203 deletions(-) delete mode 100644 board/pine64/rock64/extlinux.conf delete mode 100644 board/pine64/rock64/genimage.cfg delete mode 100644 board/pine64/rock64/patches/uboot/0001-Makefile-rk3328-needs-itb-image-to-boot-properly.patch delete mode 100755 board/pine64/rock64/post-build.sh delete mode 100644 board/pine64/rock64/readme.txt delete mode 100644 configs/rock64_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index 257295358e..6b8083eb47 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1854,8 +1854,6 @@ F: package/libavl/ N: Michał Łyszczek F: board/altera/socrates_cyclone5/ -F: board/pine64/rock64 -F: configs/rock64_defconfig F: configs/socrates_cyclone5_defconfig F: package/netifrc/ F: package/openrc/ diff --git a/board/pine64/rock64/extlinux.conf b/board/pine64/rock64/extlinux.conf deleted file mode 100644 index bf71982a9f..0000000000 --- a/board/pine64/rock64/extlinux.conf +++ /dev/null @@ -1,4 +0,0 @@ -label rock64-buildroot - kernel /boot/Image - devicetree /boot/rk3328-rock64.dtb - append console=ttyS2,1500000n8 root=/dev/mmcblk0p1 ro rootwait diff --git a/board/pine64/rock64/genimage.cfg b/board/pine64/rock64/genimage.cfg deleted file mode 100644 index 0b5a0d8804..0000000000 --- a/board/pine64/rock64/genimage.cfg +++ /dev/null @@ -1,23 +0,0 @@ -image sdcard.img { - hdimage { - } - - partition uboot-spl { - in-partition-table = "no" - image = "u-boot-tpl-spl.img" - offset = 32768 # 512 * 0x40 from start of sd card - } - - partition uboot { - in-partition-table = "no" - image = "u-boot.itb" - offset = 262144 # 512 * 0x200 from start of sd card - } - - partition rootfs { - partition-type = 0x83 - bootable = "yes" - image = "rootfs.ext2" - size = 500M - } -} diff --git a/board/pine64/rock64/patches/uboot/0001-Makefile-rk3328-needs-itb-image-to-boot-properly.patch b/board/pine64/rock64/patches/uboot/0001-Makefile-rk3328-needs-itb-image-to-boot-properly.patch deleted file mode 100644 index 2d35b78daa..0000000000 --- a/board/pine64/rock64/patches/uboot/0001-Makefile-rk3328-needs-itb-image-to-boot-properly.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 211bf049084e6e374dac253138fa813682910146 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20=C5=81yszczek?= -Date: Tue, 5 Feb 2019 22:08:54 +0100 -Subject: [PATCH] Makefile: rk3328 needs itb image to boot properly -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Michał Łyszczek ---- - Makefile | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/Makefile b/Makefile -index 8086f3c93e..a6425b5b03 100644 ---- a/Makefile -+++ b/Makefile -@@ -799,6 +799,11 @@ ifneq ($(BUILD_ROM),) - ALL-$(CONFIG_X86_RESET_VECTOR) += u-boot.rom - endif - -+# rk3328 needs itb image to boot properly -+ifeq ($(CONFIG_ROCKCHIP_RK3328),y) -+ALL-y += u-boot.itb -+endif -+ - # enable combined SPL/u-boot/dtb rules for tegra - ifeq ($(CONFIG_TEGRA)$(CONFIG_SPL),yy) - ALL-y += u-boot-tegra.bin u-boot-nodtb-tegra.bin --- -2.18.1 - diff --git a/board/pine64/rock64/post-build.sh b/board/pine64/rock64/post-build.sh deleted file mode 100755 index 26b53cba8e..0000000000 --- a/board/pine64/rock64/post-build.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -MKIMAGE=$HOST_DIR/bin/mkimage -BOARD_DIR="$(dirname $0)" - -$MKIMAGE -n rk3328 -T rksd -d $BINARIES_DIR/u-boot-tpl.bin $BINARIES_DIR/u-boot-tpl.img -cat $BINARIES_DIR/u-boot-tpl.img $BINARIES_DIR/u-boot-spl.bin > $BINARIES_DIR/u-boot-tpl-spl.img - -install -m 0644 -D $BOARD_DIR/extlinux.conf $TARGET_DIR/boot/extlinux/extlinux.conf diff --git a/board/pine64/rock64/readme.txt b/board/pine64/rock64/readme.txt deleted file mode 100644 index 029c67641e..0000000000 --- a/board/pine64/rock64/readme.txt +++ /dev/null @@ -1,95 +0,0 @@ -Intro -===== - -This default configuration will allow you to start experimenting with the -buildroot environment for the Rock64. With this default configuration you -can log in into board via uart and look around. - -Board homepage: https://www.pine64.org/?page_id=7147 - -Build -===== - -First, load rock64 config for buildroot - - $ make rock64_defconfig - -Optionally make changes to buildroot config (to install more programs) - - $ make menuconfig - -And then build everything - - $ make - -When completed, following files will be generated in output/images directory: - - . - ├── Image - ├── bl31.bin - ├── bl31.elf - ├── rk3328-rock64.dtb - ├── rootfs.ext2 - ├── rootfs.ext4 -> rootfs.ext2 - ├── rootfs.tar - ├── sdcard.img - ├── u-boot-spl.bin - ├── u-boot-tpl-spl.img - ├── u-boot-tpl.bin - ├── u-boot-tpl.img - ├── u-boot.bin - └── u-boot.itb - -Creating bootable SD card -========================= - -!!! THIS COMMAND MAY WIPE YOUR DISK! -!!! MAKE SURE YOU PASSED CORRECT DEVICE! -!!! OR IT THIS WILL WIPE YOUR DISK! - -Simply invoke (as root) - - # dd if=output/images/sdcard.img of=/dev/sdX && sync - -Where X is your SD card device (not partition), of= argument may also be -/dev/mmcblk0 if you are using built-in sd card reader. - -Runtime -======= - -Login ------ - -By default, buildroot has no password, just type 'root' as login user, and -you will be logged in. - -Serial console --------------- - -Serial console needs to be connected to pins (into 40pin rpi compatible part) - -pin 6: gnd -pin 8: tx -pin 10: rx - -Pin numbers are printed on board. - -Uart configuration is not standard. Rock64 uses 1500000 (1,5M) baudrate -with standard 8n1. - -Ethernet --------- - -To enable ethernet you need to load modules for it: - -# modprobe stmmac -# modprobe dwmac-rk - -and since by default there is no dhcp installed, you need to configure ip -address, remember to change address to fit your network. - -# ifconfig eth0 up -# ip addr add 10.1.1.180/24 dev eth0 -# ping 10.1.1.1 -PING 10.1.1.1 (10.1.1.1): 56 data bytes -64 bytes from 10.1.1.1: seq=0 ttl=64 time=0.695 ms diff --git a/configs/rock64_defconfig b/configs/rock64_defconfig deleted file mode 100644 index 30bf12c061..0000000000 --- a/configs/rock64_defconfig +++ /dev/null @@ -1,38 +0,0 @@ -BR2_aarch64=y -BR2_GLOBAL_PATCH_DIR="board/pine64/rock64/patches" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y -BR2_TARGET_GENERIC_GETTY_PORT="ttyS2" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/pine64/rock64/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/pine64/rock64/genimage.cfg" -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.19" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3328-rock64" -BR2_LINUX_KERNEL_INSTALL_TARGET=y -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_SIZE="128M" -BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v1.4" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3328" -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/ayufan-rock64/linux-u-boot.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="2017.09-rockchip-ayufan-1035-gd646df03ac" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rock64-rk3328" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl.bin tpl/u-boot-tpl.bin" -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y From 345b4aa6ce7d2eaa3b5f88e64a03309b71e1695f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 13 Nov 2020 07:24:50 +0100 Subject: [PATCH 091/125] package/tor: security bump version to 0.4.4.6 Release notes: https://blog.torproject.org/node/1952 Fixes TROVE-2020-005. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/tor/tor.hash | 2 +- package/tor/tor.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tor/tor.hash b/package/tor/tor.hash index ddf1a880ff..7aa7280f2b 100644 --- a/package/tor/tor.hash +++ b/package/tor/tor.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 a45ca00afe765e3baa839767c9dd6ac9a46dd01720a3a8ff4d86558c12359926 tor-0.4.4.5.tar.gz +sha256 5f154c155803adf5c89e87cab53017b6908c5ebe50c65839e8cf4fbd2abe1fdc tor-0.4.4.6.tar.gz sha256 ae2afe6cd3fd9d512afbaa1ef218757eb00aa6b6aa5e2dfc2774b6837e373fa1 LICENSE diff --git a/package/tor/tor.mk b/package/tor/tor.mk index fe9b52670b..b7095aa39c 100644 --- a/package/tor/tor.mk +++ b/package/tor/tor.mk @@ -4,7 +4,7 @@ # ################################################################################ -TOR_VERSION = 0.4.4.5 +TOR_VERSION = 0.4.4.6 TOR_SITE = https://dist.torproject.org TOR_LICENSE = BSD-3-Clause TOR_LICENSE_FILES = LICENSE From 0b817d8c8e013c8f1d5263bb68641d2f1ba383ec Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 13 Nov 2020 09:33:20 +0100 Subject: [PATCH 092/125] {linux, linux-headers}: bump 4.{4, 9, 14, 19}.x / 5.{4, 9}.x series Including the fix for CVE-2020-8694: https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00389.html Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- linux/linux.hash | 12 ++++++------ package/linux-headers/Config.in.host | 12 ++++++------ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index b6c4491b35..434623a725 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -125,7 +125,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "5.9.6" if BR2_LINUX_KERNEL_LATEST_VERSION + default "5.9.8" if BR2_LINUX_KERNEL_LATEST_VERSION default "4.19.152-cip37" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "4.19.152-cip37-rt16" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ diff --git a/linux/linux.hash b/linux/linux.hash index 7f6d8cb2cb..4219c7f319 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,12 +1,12 @@ # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 6cc182fe19a8f3958c24d453f4ab68eb73fb5cfb8af4c95b02f3db049e655370 linux-5.9.6.tar.xz +sha256 7656733b316562662026ac82a7c0be41440e16bbf1bdc5447b119e34ff3b86a6 linux-5.9.8.tar.xz sha256 4ab4a3f694b7b4cfbe78871eab34c8039ad33692144c45c669827a594da85534 linux-5.8.18.tar.xz -sha256 d2466fd6eb5433e7bf287b617b11b2640c65a7ea93a57eb7a80d7f537cbc1470 linux-5.4.75.tar.xz +sha256 a3e03e6970240dddc8174bf9f49b56d774c40125eabe1582d2ebe85b01addbf7 linux-5.4.77.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 32fe14f120436c927d895d3c59a37ca50c0ae3648ba3599d9cab57ffa4699214 linux-4.4.241.tar.xz -sha256 c4c6d04f91d881e68524bda6062b5c1835f285bd03344bf8f2eaeef3394bb32c linux-4.9.241.tar.xz -sha256 9e832899ec75dbfce393c9f7a07df24183b28f0bb95ad4dd8b1fa027bc668ad9 linux-4.14.204.tar.xz -sha256 cbc648f5405cb2b554b7a0f23885742d9969a11d22692287ee756adf940a48d2 linux-4.19.155.tar.xz +sha256 95de46b6bd72f66169629eb0e343b005778539864598eae76c3ca999645d58b5 linux-4.4.243.tar.xz +sha256 d3aa189ca7fcc6e52d6c0333a0d7acd8789e9a492b32dbf9476e926ffaa73984 linux-4.9.243.tar.xz +sha256 1c233efaa5063983293a02d4692acc9ced9c03e18857364855d4f612347086ac linux-4.14.206.tar.xz +sha256 76dca365255c1a13778c3b24f0eae14f4e66bc12fe79f5e6592b116fc57ef755 linux-4.19.157.tar.xz # Locally computed sha256 d2a06f52143deb929b8d513cf9afc9bd065951389a80fa70bc4d63025b5b3fb9 linux-cip-4.19.152-cip37.tar.gz sha256 bc1dacd3d0f526de3e8754a444e8e02a54521527af639ddb907cb35cda775a8c linux-cip-4.19.152-cip37-rt16.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 97c30c9b3d..8bd4449efd 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -346,13 +346,13 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.4.241" if BR2_KERNEL_HEADERS_4_4 - default "4.9.241" if BR2_KERNEL_HEADERS_4_9 - default "4.14.204" if BR2_KERNEL_HEADERS_4_14 - default "4.19.155" if BR2_KERNEL_HEADERS_4_19 - default "5.4.75" if BR2_KERNEL_HEADERS_5_4 + default "4.4.243" if BR2_KERNEL_HEADERS_4_4 + default "4.9.243" if BR2_KERNEL_HEADERS_4_9 + default "4.14.206" if BR2_KERNEL_HEADERS_4_14 + default "4.19.157" if BR2_KERNEL_HEADERS_4_19 + default "5.4.77" if BR2_KERNEL_HEADERS_5_4 default "5.8.18" if BR2_KERNEL_HEADERS_5_8 - default "5.9.6" if BR2_KERNEL_HEADERS_5_9 + default "5.9.8" if BR2_KERNEL_HEADERS_5_9 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ From 041cde5c26cd054ec7a822f289747856328286e0 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 13 Nov 2020 11:01:23 +0100 Subject: [PATCH 093/125] package/wireguard-linux-compat: bump version to 1.0.20201112 Fixes a build issue with linux 5.4.76+. For details, see the announcement: https://lists.zx2c4.com/pipermail/wireguard/2020-November/005997.html Signed-off-by: Peter Korsgaard --- package/wireguard-linux-compat/wireguard-linux-compat.hash | 4 ++-- package/wireguard-linux-compat/wireguard-linux-compat.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/wireguard-linux-compat/wireguard-linux-compat.hash b/package/wireguard-linux-compat/wireguard-linux-compat.hash index 833e1af2fc..8895875cf6 100644 --- a/package/wireguard-linux-compat/wireguard-linux-compat.hash +++ b/package/wireguard-linux-compat/wireguard-linux-compat.hash @@ -1,4 +1,4 @@ -# https://lists.zx2c4.com/pipermail/wireguard/2020-September/005817.html -sha256 ad33b2d2267a37e0f65c97e65e7d4d926d5aef7d530c251b63fbf919048eead9 wireguard-linux-compat-1.0.20200908.tar.xz +# https://lists.zx2c4.com/pipermail/wireguard/2020-November/005997.html +sha256 89eae7f0c0bd6c8df3ba2e090984974ff68741a9f26aa0922890f8ca727897e1 wireguard-linux-compat-1.0.20201112.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/wireguard-linux-compat/wireguard-linux-compat.mk b/package/wireguard-linux-compat/wireguard-linux-compat.mk index 082d10c53b..76585e0bc4 100644 --- a/package/wireguard-linux-compat/wireguard-linux-compat.mk +++ b/package/wireguard-linux-compat/wireguard-linux-compat.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIREGUARD_LINUX_COMPAT_VERSION = 1.0.20200908 +WIREGUARD_LINUX_COMPAT_VERSION = 1.0.20201112 WIREGUARD_LINUX_COMPAT_SITE = https://git.zx2c4.com/wireguard-linux-compat/snapshot WIREGUARD_LINUX_COMPAT_SOURCE = wireguard-linux-compat-$(WIREGUARD_LINUX_COMPAT_VERSION).tar.xz WIREGUARD_LINUX_COMPAT_LICENSE = GPL-2.0 From 7269a73102030b71704ccc014399f0761d4ec30f Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 13 Nov 2020 11:31:11 +0100 Subject: [PATCH 094/125] package/go: security bump to 1.15.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes the following security issues: - math/big: panic during recursive division of very large numbers A number of math/big.Int methods (Div, Exp, DivMod, Quo, Rem, QuoRem, Mod, ModInverse, ModSqrt, Jacobi, and GCD) can panic when provided crafted large inputs. For the panic to happen, the divisor or modulo argument must be larger than 3168 bits (on 32-bit architectures) or 6336 bits (on 64-bit architectures). Multiple math/big.Rat methods are similarly affected. crypto/rsa.VerifyPSS, crypto/rsa.VerifyPKCS1v15, and crypto/dsa.Verify may panic when provided crafted public keys and signatures. crypto/ecdsa and crypto/elliptic operations may only be affected if custom CurveParams with unusually large field sizes (several times larger than the largest supported curve, P-521) are in use. Using crypto/x509.Verify on a crafted X.509 certificate chain can lead to a panic, even if the certificates don’t chain to a trusted root. The chain can be delivered via a crypto/tls connection to a client, or to a server that accepts and verifies client certificates. net/http clients can be made to crash by an HTTPS server, while net/http servers that accept client certificates will recover the panic and are unaffected. Moreover, an application might crash invoking crypto/x509.(*CertificateRequest).CheckSignature on an X.509 certificate request or during a golang.org/x/crypto/otr conversation. Parsing a golang.org/x/crypto/openpgp Entity or verifying a signature may crash. Finally, a golang.org/x/crypto/ssh client can panic due to a malformed host key, while a server could panic if either PublicKeyCallback accepts a malformed public key, or if IsUserAuthority accepts a certificate with a malformed public key. Thanks to the Go Ethereum team and the OSS-Fuzz project for reporting this. Thanks to Rémy Oudompheng and Robert Griesemer for their help developing and validating the fix. This issue is CVE-2020-28362 and Go issue golang.org/issue/42552. - cmd/go: arbitrary code execution at build time through cgo The go command may execute arbitrary code at build time when cgo is in use. This may occur when running go get on a malicious package, or any other command that builds untrusted code. This can be caused by malicious gcc flags specified via a #cgo directive, or by a malicious symbol name in a linked object file. Thanks to Imre Rad and to Chris Brown and Tempus Ex respectively for reporting these issues. These issues are CVE-2020-28367 and CVE-2020-28366, and Go issues golang.org/issue/42556 and golang.org/issue/42559 respectively. Signed-off-by: Peter Korsgaard --- package/go/go.hash | 2 +- package/go/go.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/go/go.hash b/package/go/go.hash index eb6fe6c85a..79d6abe8df 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://golang.org/dl/ -sha256 063da6a9a4186b8118a0e584532c8c94e65582e2cd951ed078bfd595d27d2367 go1.15.4.src.tar.gz +sha256 c1076b90cf94b73ebed62a81d802cd84d43d02dea8c07abdc922c57a071c84f1 go1.15.5.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index ccfddd8001..d2ab9b81dd 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.15.4 +GO_VERSION = 1.15.5 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz From fefdd0511e99676aceb09403063f336e631d5067 Mon Sep 17 00:00:00 2001 From: Bartosz Bilas Date: Fri, 13 Nov 2020 12:39:40 +0100 Subject: [PATCH 095/125] package/rauc: prevent occurring the error when directory exists MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add -p argument that ignore that specified directory already exists. Fixes: mkdir: cannot create directory ‘/home/bartekk/buildroot-2020.11-rc1/output/target/usr/lib/systemd/system/rauc.service.d’: File exists Signed-off-by: Bartosz Bilas Signed-off-by: Peter Korsgaard --- package/rauc/rauc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/rauc/rauc.mk b/package/rauc/rauc.mk index 1915c783aa..61c50ab316 100644 --- a/package/rauc/rauc.mk +++ b/package/rauc/rauc.mk @@ -31,7 +31,7 @@ RAUC_DEPENDENCIES += systemd endif define RAUC_INSTALL_INIT_SYSTEMD - mkdir $(TARGET_DIR)/usr/lib/systemd/system/rauc.service.d + mkdir -p $(TARGET_DIR)/usr/lib/systemd/system/rauc.service.d printf '[Install]\nWantedBy=multi-user.target\n' \ >$(TARGET_DIR)/usr/lib/systemd/system/rauc.service.d/buildroot-enable.conf endef From f452490b930882038f57ec3ac5e7f2e5400c2316 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 12 Nov 2020 21:22:02 +0100 Subject: [PATCH 096/125] package/suricata: link with libatomic if needed Fix build of suricata 6.0.0 with mips32r6 app-layer-ftp.o: In function `FTPCheckMemcap': app-layer-ftp.c:(.text+0x284): undefined reference to `__atomic_load_8' app-layer-ftp.c:(.text+0x2d8): undefined reference to `__atomic_fetch_add_8' Fixes: - http://autobuild.buildroot.org/results/f574005204905250702df32b61c85d427ab4feda Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/suricata/suricata.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/suricata/suricata.mk b/package/suricata/suricata.mk index f131fad1be..94c4784dd4 100644 --- a/package/suricata/suricata.mk +++ b/package/suricata/suricata.mk @@ -43,6 +43,10 @@ SURICATA_CONF_OPTS = \ # download through wget/curl) SURICATA_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install install-conf +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +SURICATA_CONF_ENV += LIBS=-latomic +endif + ifeq ($(BR2_PACKAGE_FILE),y) SURICATA_DEPENDENCIES += file SURICATA_CONF_OPTS += --enable-libmagic From 7a5873ce5ae6aab1f4ebf6e8cbc798d8cd2ddf96 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 13 Nov 2020 00:20:52 +0100 Subject: [PATCH 097/125] toolchain/toolchain-buildroot: only riscv64 is supported by uClibc-ng The commit [1] enabled riscv32 and riscv64 for uClibc-ng internal toolchain backend but only riscv64 is curently supported by uClibc-ng. The initial patch [2] from Mark Corbin is only about riscv64. Remove riscv32 from uClibc-ng supported architecture list. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/830981656 [1] 209a082478fca143394512bb9a6c0822f12cfe2c [2] bd9810e176273914eca1208bcba23f0de9e446b3 Signed-off-by: Romain Naour Cc: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/uclibc/Config.in | 1 - toolchain/toolchain-buildroot/Config.in | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in index 494758bd9d..e59fef3c69 100644 --- a/package/uclibc/Config.in +++ b/package/uclibc/Config.in @@ -107,7 +107,6 @@ config BR2_UCLIBC_TARGET_ARCH default "i386" if BR2_i386 default "x86_64" if BR2_x86_64 default "riscv64" if BR2_RISCV_64 - default "riscv32" if BR2_RISCV_32 config BR2_UCLIBC_MIPS_ABI string diff --git a/toolchain/toolchain-buildroot/Config.in b/toolchain/toolchain-buildroot/Config.in index f34dd84c29..2058ff1eb9 100644 --- a/toolchain/toolchain-buildroot/Config.in +++ b/toolchain/toolchain-buildroot/Config.in @@ -31,7 +31,7 @@ config BR2_TOOLCHAIN_BUILDROOT_UCLIBC BR2_arm || BR2_armeb || \ BR2_i386 || BR2_m68k || BR2_microblaze || \ BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el || \ - BR2_or1k || BR2_powerpc || BR2_riscv || BR2_sh2a || \ + BR2_or1k || BR2_powerpc || BR2_RISCV_64 || BR2_sh2a || \ BR2_sh4 || BR2_sh4eb || BR2_sparc || BR2_xtensa || \ BR2_x86_64 select BR2_TOOLCHAIN_USES_UCLIBC From 464bb73b92cacdafd19515d7474a53d8401940dd Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Fri, 13 Nov 2020 14:09:40 +0100 Subject: [PATCH 098/125] package/linux-backports: fix kernel version check The commit 05fea6e4a60a38a797d9bacbf318a2cd7dbd435f "infra/pkg-kconfig: do not rely on package's .config as a timestamp" broke the kernel version check of this linux-backports package (it was no longer executed). Since linux-4.19, the kernel's build system internally touches its .config file, so it can no longer be used as a stamp file. The stamp file defined in KCONFIG_STAMP_DOTCONFIG variable of pkg-kconfig infra need to be used instead. This commit fixes the kernel version check. Signed-off-by: Julien Olivain Reviewed-by: Petr Vorel Tested-by: Petr Vorel Signed-off-by: Yann E. MORIN --- package/linux-backports/linux-backports.mk | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/package/linux-backports/linux-backports.mk b/package/linux-backports/linux-backports.mk index 030d7a2864..1827ee18b7 100644 --- a/package/linux-backports/linux-backports.mk +++ b/package/linux-backports/linux-backports.mk @@ -85,21 +85,24 @@ $(eval $(kconfig-package)) # not have been parsed yet, so the Linux build dir LINUX_DIR is not yet # known. Thus, we use a "secondary expansion" so the rule is re-evaluated # after all Makefiles are parsed, and thus at that time we will have the -# LINUX_DIR variable set to the proper value. +# LINUX_DIR variable set to the proper value. Moreover, since linux-4.19, +# the kernel's build system internally touches its .config file, so we +# can't use it as a stamp file. We use the LINUX_KCONFIG_STAMP_DOTCONFIG +# instead. # # Furthermore, we want to check the kernel version, since linux-backports # only supports kernels >= 3.0. To avoid overriding linux-backports' -# .config rule defined in the kconfig-package infra, we use an -# intermediate stamp-file. +# KCONFIG_STAMP_DOTCONFIG rule defined in the kconfig-package infra, we +# use an intermediate stamp-file. # # Finally, it must also come after the call to kconfig-package, so we get # LINUX_BACKPORTS_DIR properly defined (because the target part of the # rule is not re-evaluated). # -$(LINUX_BACKPORTS_DIR)/.config: $(LINUX_BACKPORTS_DIR)/.stamp_check_kernel_version +$(LINUX_BACKPORTS_DIR)/$(LINUX_BACKPORTS_KCONFIG_STAMP_DOTCONFIG): $(LINUX_BACKPORTS_DIR)/.stamp_check_kernel_version .SECONDEXPANSION: -$(LINUX_BACKPORTS_DIR)/.stamp_check_kernel_version: $$(LINUX_DIR)/.config +$(LINUX_BACKPORTS_DIR)/.stamp_check_kernel_version: $$(LINUX_DIR)/$$(LINUX_KCONFIG_STAMP_DOTCONFIG) $(Q)LINUX_VERSION_PROBED=$(LINUX_VERSION_PROBED); \ if [ $${LINUX_VERSION_PROBED%%.*} -lt 3 ]; then \ printf "Linux version '%s' is too old for linux-backports (needs 3.0 or later)\n" \ From 3277694825cdc3fb8993bbe42609dd93c8959971 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 13 Nov 2020 23:52:07 +0100 Subject: [PATCH 099/125] package/cryptsetup: really break circular dependency The commit [1] should fix a circular dependency by using util-linux-libs instead of util-linux if BR2_PACKAGE_UTIL_LINUX_LIBS is set. But util-linux is still in CRYPTSETUP_DEPENDENCIES. Remove it to really break the circular dependency. [1] e3c86f5c9e466ed5135e824d6dcebcfd7f5ac1ab Signed-off-by: Romain Naour Cc: Fabrice Fontaine Cc: Yann E. MORIN Reviewed-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/cryptsetup/cryptsetup.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk index 60097595b4..a59a0c7570 100644 --- a/package/cryptsetup/cryptsetup.mk +++ b/package/cryptsetup/cryptsetup.mk @@ -9,7 +9,7 @@ CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).4 CRYPTSETUP_SOURCE = cryptsetup-$(CRYPTSETUP_VERSION).tar.xz CRYPTSETUP_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/cryptsetup/v$(CRYPTSETUP_VERSION_MAJOR) CRYPTSETUP_DEPENDENCIES = \ - lvm2 popt util-linux host-pkgconf json-c libargon2 \ + lvm2 popt host-pkgconf json-c libargon2 \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) \ $(if $(BR2_PACKAGE_UTIL_LINUX_LIBS),util-linux-libs,util-linux) \ $(TARGET_NLS_DEPENDENCIES) From 710d71ad4a752ec5f2ea5f3769278c753e4d0fd6 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 13 Nov 2020 20:41:07 +0100 Subject: [PATCH 100/125] package/mp4v2: fix build with gcc 10 Fixes: - http://autobuild.buildroot.org/results/4655626f1827245648a566a7223f247a130714c5 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...tatic-cast-to-unsigned-int-for-cases.patch | 99 +++++++++++++++++++ 1 file changed, 99 insertions(+) create mode 100644 package/mp4v2/0003-Static-cast-to-unsigned-int-for-cases.patch diff --git a/package/mp4v2/0003-Static-cast-to-unsigned-int-for-cases.patch b/package/mp4v2/0003-Static-cast-to-unsigned-int-for-cases.patch new file mode 100644 index 0000000000..6c9b13bed8 --- /dev/null +++ b/package/mp4v2/0003-Static-cast-to-unsigned-int-for-cases.patch @@ -0,0 +1,99 @@ +From a5ca35b044bbf13c0b16f0066bf24646604bb218 Mon Sep 17 00:00:00 2001 +From: "Jason A. Donenfeld" +Date: Thu, 6 Aug 2020 15:22:04 +0200 +Subject: [PATCH] Static cast to unsigned int for cases + +Signed-off-by: Jason A. Donenfeld +[Retrieved from: +https://gitweb.gentoo.org/repo/gentoo.git/tree/media-libs/libmp4v2/files/libmp4v2-2.0.0-unsigned-int-cast.patch] +Signed-off-by: Fabrice Fontaine +--- + libutil/Utility.cpp | 2 +- + util/mp4art.cpp | 2 +- + util/mp4chaps.cpp | 2 +- + util/mp4file.cpp | 2 +- + util/mp4subtitle.cpp | 2 +- + util/mp4track.cpp | 2 +- + 6 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/libutil/Utility.cpp b/libutil/Utility.cpp +index 76cdd12..d6739d4 100644 +--- a/libutil/Utility.cpp ++++ b/libutil/Utility.cpp +@@ -493,7 +493,7 @@ Utility::process_impl() + if( codes.find( code ) == codes.end() ) + continue; + +- switch( code ) { ++ switch( static_cast( code ) ) { + case 'z': + _optimize = true; + break; +diff --git a/util/mp4art.cpp b/util/mp4art.cpp +index add935e..6e7f531 100644 +--- a/util/mp4art.cpp ++++ b/util/mp4art.cpp +@@ -376,7 +376,7 @@ ArtUtility::utility_option( int code, bool& handled ) + { + handled = true; + +- switch( code ) { ++ switch( static_cast ( code ) ) { + case LC_ART_ANY: + _artFilter = numeric_limits::max(); + break; +diff --git a/util/mp4chaps.cpp b/util/mp4chaps.cpp +index 98400f8..ccc8b70 100644 +--- a/util/mp4chaps.cpp ++++ b/util/mp4chaps.cpp +@@ -632,7 +632,7 @@ ChapterUtility::utility_option( int code, bool& handled ) + { + handled = true; + +- switch( code ) { ++ switch( static_cast ( code ) ) { + case 'A': + case LC_CHPT_ANY: + _ChapterType = MP4ChapterTypeAny; +diff --git a/util/mp4file.cpp b/util/mp4file.cpp +index c27844b..b127cd1 100644 +--- a/util/mp4file.cpp ++++ b/util/mp4file.cpp +@@ -189,7 +189,7 @@ FileUtility::utility_option( int code, bool& handled ) + { + handled = true; + +- switch( code ) { ++ switch( static_cast( code ) ) { + case LC_LIST: + _action = &FileUtility::actionList; + break; +diff --git a/util/mp4subtitle.cpp b/util/mp4subtitle.cpp +index 7462153..19d977d 100644 +--- a/util/mp4subtitle.cpp ++++ b/util/mp4subtitle.cpp +@@ -164,7 +164,7 @@ SubtitleUtility::utility_option( int code, bool& handled ) + { + handled = true; + +- switch( code ) { ++ switch( static_cast( code ) ) { + case LC_LIST: + _action = &SubtitleUtility::actionList; + break; +diff --git a/util/mp4track.cpp b/util/mp4track.cpp +index d550506..cd63d7e 100644 +--- a/util/mp4track.cpp ++++ b/util/mp4track.cpp +@@ -788,7 +788,7 @@ TrackUtility::utility_option( int code, bool& handled ) + { + handled = true; + +- switch( code ) { ++ switch( static_cast( code ) ) { + case LC_TRACK_WILDCARD: + _trackMode = TM_WILDCARD; + break; +-- +2.28.0 + From bd85d82f61af0578a64e74e1cfb56c3c1bf46fe1 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 13 Nov 2020 21:00:39 +0100 Subject: [PATCH 101/125] package/libpam-tacplus: disable -Werror Fixes: - http://autobuild.buildroot.org/results/5c17226f12eba104d907693ec37fc101cc6d447f Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...0001-Add-an-option-to-disable-Werror.patch | 55 +++++++++++++++++++ package/libpam-tacplus/libpam-tacplus.mk | 3 + 2 files changed, 58 insertions(+) create mode 100644 package/libpam-tacplus/0001-Add-an-option-to-disable-Werror.patch diff --git a/package/libpam-tacplus/0001-Add-an-option-to-disable-Werror.patch b/package/libpam-tacplus/0001-Add-an-option-to-disable-Werror.patch new file mode 100644 index 0000000000..80da2f35b4 --- /dev/null +++ b/package/libpam-tacplus/0001-Add-an-option-to-disable-Werror.patch @@ -0,0 +1,55 @@ +From 88c78901503d50d0a62d85c96994ca4d67ab61e0 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 13 Nov 2020 20:50:27 +0100 +Subject: [PATCH] Add an option to disable -Werror + +Allow the user to disable -Werror to avoid the following build failure +with gcc 4.8: + +libtac/lib/magic.c:138:13: error: ignoring return value of 'read', declared with attribute warn_unused_result [-Werror=unused-result] + (void) read(rfd, &seed, sizeof(seed)); + ^ + +Fixes: + - http://autobuild.buildroot.org/results/5c17226f12eba104d907693ec37fc101cc6d447f + +Signed-off-by: Fabrice Fontaine +--- + Makefile.am | 6 +++++- + configure.ac | 3 +++ + 2 files changed, 8 insertions(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 0be3cdb..4a137e9 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -8,7 +8,11 @@ + + ACLOCAL_AMFLAGS = -I config + AUTOMAKE_OPTIONS = subdir-objects +-AM_CFLAGS = -Wall -Wextra -Werror ++AM_CFLAGS = -Wall -Wextra ++ ++if ENABLE_WERROR ++AM_CFLAGS += -Werror ++endif + + if TACC + bin_PROGRAMS = tacc +diff --git a/configure.ac b/configure.ac +index d0c5eba..dd8a966 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -100,6 +100,9 @@ AC_SUBST(pamdir) + AC_ARG_ENABLE(doc, AS_HELP_STRING([--disable-doc], [do not build docs])) + AM_CONDITIONAL(DOC, test "x$enable_doc" != "xno") + ++AC_ARG_ENABLE(werror, AS_HELP_STRING([--disable-werror], [do not build with -Werror])) ++AM_CONDITIONAL(ENABLE_WERROR, test "x$enable_werror" != "xno") ++ + dnl -------------------------------------------------------------------- + dnl Switch for run-time debugging + AC_ARG_ENABLE(runtime-debugging, [AS_HELP_STRING([--enable-runtime-debugging], +-- +2.28.0 + diff --git a/package/libpam-tacplus/libpam-tacplus.mk b/package/libpam-tacplus/libpam-tacplus.mk index 4e1f8bd173..9dd8466bf2 100644 --- a/package/libpam-tacplus/libpam-tacplus.mk +++ b/package/libpam-tacplus/libpam-tacplus.mk @@ -14,7 +14,10 @@ LIBPAM_TACPLUS_DEPENDENCIES = \ # Fetching from github, we need to generate the configure script LIBPAM_TACPLUS_AUTORECONF = YES LIBPAM_TACPLUS_INSTALL_STAGING = YES +# We're patching configure.ac +LIBPAM_TACPLUS_AUTORECONF = YES LIBPAM_TACPLUS_CONF_ENV = \ ax_cv_check_cflags___fstack_protector_all=$(if $(BR2_TOOLCHAIN_HAS_SSP),yes,no) +LIBPAM_TACPLUS_CONF_OPTS = --disable-werror $(eval $(autotools-package)) From e3a663f5705c492f52128b4a7ff514480332b6df Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 13 Nov 2020 21:21:15 +0100 Subject: [PATCH 102/125] package/tcpdump: fix CVE-2020-8037 The ppp decapsulator in tcpdump 4.9.3 can be convinced to allocate a large amount of memory. Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...ng-don-t-allocate-a-too-large-buffer.patch | 67 +++++++++++++++++++ package/tcpdump/tcpdump.mk | 3 + 2 files changed, 70 insertions(+) create mode 100644 package/tcpdump/0001-PPP-When-un-escaping-don-t-allocate-a-too-large-buffer.patch diff --git a/package/tcpdump/0001-PPP-When-un-escaping-don-t-allocate-a-too-large-buffer.patch b/package/tcpdump/0001-PPP-When-un-escaping-don-t-allocate-a-too-large-buffer.patch new file mode 100644 index 0000000000..9e8674ac90 --- /dev/null +++ b/package/tcpdump/0001-PPP-When-un-escaping-don-t-allocate-a-too-large-buffer.patch @@ -0,0 +1,67 @@ +From 32027e199368dad9508965aae8cd8de5b6ab5231 Mon Sep 17 00:00:00 2001 +From: Guy Harris +Date: Sat, 18 Apr 2020 14:04:59 -0700 +Subject: [PATCH] PPP: When un-escaping, don't allocate a too-large buffer. + +The buffer should be big enough to hold the captured data, but it +doesn't need to be big enough to hold the entire on-the-network packet, +if we haven't captured all of it. + +(backported from commit e4add0b010ed6f2180dcb05a13026242ed935334) + +[Retrieved from: +https://github.com/the-tcpdump-group/tcpdump/commit/32027e199368dad9508965aae8cd8de5b6ab5231] +Signed-off-by: Fabrice Fontaine +--- + print-ppp.c | 18 ++++++++++++++---- + 1 file changed, 14 insertions(+), 4 deletions(-) + +diff --git a/print-ppp.c b/print-ppp.c +index 891761728..33fb03412 100644 +--- a/print-ppp.c ++++ b/print-ppp.c +@@ -1367,19 +1367,29 @@ print_bacp_config_options(netdissect_options *ndo, + return 0; + } + ++/* ++ * Un-escape RFC 1662 PPP in HDLC-like framing, with octet escapes. ++ * The length argument is the on-the-wire length, not the captured ++ * length; we can only un-escape the captured part. ++ */ + static void + ppp_hdlc(netdissect_options *ndo, + const u_char *p, int length) + { ++ u_int caplen = ndo->ndo_snapend - p; + u_char *b, *t, c; + const u_char *s; +- int i, proto; ++ u_int i; ++ int proto; + const void *se; + ++ if (caplen == 0) ++ return; ++ + if (length <= 0) + return; + +- b = (u_char *)malloc(length); ++ b = (u_char *)malloc(caplen); + if (b == NULL) + return; + +@@ -1388,10 +1398,10 @@ ppp_hdlc(netdissect_options *ndo, + * Do this so that we dont overwrite the original packet + * contents. + */ +- for (s = p, t = b, i = length; i > 0 && ND_TTEST(*s); i--) { ++ for (s = p, t = b, i = caplen; i != 0; i--) { + c = *s++; + if (c == 0x7d) { +- if (i <= 1 || !ND_TTEST(*s)) ++ if (i <= 1) + break; + i--; + c = *s++ ^ 0x20; diff --git a/package/tcpdump/tcpdump.mk b/package/tcpdump/tcpdump.mk index 01a46b9b5f..8db35694ea 100644 --- a/package/tcpdump/tcpdump.mk +++ b/package/tcpdump/tcpdump.mk @@ -18,6 +18,9 @@ TCPDUMP_CONF_OPTS = \ $(if $(BR2_PACKAGE_TCPDUMP_SMB),--enable-smb,--disable-smb) TCPDUMP_DEPENDENCIES = libpcap +# 0001-PPP-When-un-escaping-don-t-allocate-a-too-large-buffer.patch +TCPDUMP_IGNORE_CVES += CVE-2020-8037 + ifeq ($(BR2_STATIC_LIBS),y) TCPDUMP_CONF_OPTS += LIBS="`$(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs`" endif From 8477c41244c1d55b6496195c3a69f261b546dc8e Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 14 Nov 2020 11:48:07 +0100 Subject: [PATCH 103/125] toolchain/toolchain-external/toolchain-external-arm-arm: add dependency on NEON While testing Buildroot on a Cortex-A5 that doesn't provide NEON, we found out that a system generated with the ARM toolchain from Arm didn't boot. It turns out that this ARM toolchain is built with: --with-arch=armv7-a --with-fpu=neon --with-float=hard --with-mode=thumb So, it uses NEON as its FPU, which means it can only work on CPU cores that have NEON support. This commit adds the appropriate dependency to the toolchain-external-arm-arm package, and adjusts the Config.in help text accordingly. While at it, it also drops the part of the Config.in help text that says the code is tuned for Cortex-A9, as it is not the case: it was the case for the Linaro toolchain (built with --with-tune=cortex-a9), but not for the ARM toolchain, for which no specific --with-tune is passed. Signed-off-by: Thomas Petazzoni Cc: Alexandre Belloni Cc: Romain Naour Signed-off-by: Peter Korsgaard --- .../toolchain-external-arm-arm/Config.in | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/toolchain/toolchain-external/toolchain-external-arm-arm/Config.in b/toolchain/toolchain-external/toolchain-external-arm-arm/Config.in index 4748ab53ae..29509635a3 100644 --- a/toolchain/toolchain-external/toolchain-external-arm-arm/Config.in +++ b/toolchain/toolchain-external/toolchain-external-arm-arm/Config.in @@ -1,12 +1,13 @@ -comment "Arm toolchains available for Cortex-A + EABIhf" +comment "Arm toolchains available for Cortex-A with NEON + EABIhf" depends on BR2_arm - depends on !BR2_ARM_CPU_ARMV7A || !BR2_ARM_EABIHF + depends on !BR2_ARM_CPU_ARMV7A || !BR2_ARM_EABIHF || !BR2_ARM_CPU_HAS_NEON depends on !BR2_STATIC_LIBS config BR2_TOOLCHAIN_EXTERNAL_ARM_ARM bool "Arm ARM 2019.12" depends on BR2_arm depends on BR2_ARM_CPU_ARMV7A || BR2_ARM_CPU_ARMV8A + depends on BR2_ARM_CPU_HAS_NEON depends on BR2_HOSTARCH = "x86_64" depends on BR2_ARM_EABIHF depends on !BR2_STATIC_LIBS @@ -20,10 +21,10 @@ config BR2_TOOLCHAIN_EXTERNAL_ARM_ARM select BR2_TOOLCHAIN_HAS_OPENMP help Arm toolchain for the ARM architecture. It uses GCC 9.2.1, - GDB 8.3.0, glibc 2.30, Binutils 2.33.1. It generates code that - runs on all Cortex-A profile devices, but tuned for the - Cortex-A9. The code generated uses the hard floating point - calling convention, and uses the VFPv3-D16 FPU instructions. + GDB 8.3.0, glibc 2.30, Binutils 2.33.1. It generates code + that runs on all Cortex-A profile devices. The code + generated uses the hard floating point calling convention, + and uses the NEON FPU instructions. This is the same toolchain that was previously distributed by Linaro. From abeebe1ea84ef56608b09d07b724a39da4f35fa5 Mon Sep 17 00:00:00 2001 From: Bartosz Bilas Date: Fri, 13 Nov 2020 16:15:58 +0100 Subject: [PATCH 104/125] package/rauc: disable systemd for host build Since there is not necessary to have support of systemd within the host variant let's disable it unconditionally to solve the following errors: /usr/bin/install -c -m 644 data/rauc.service '/usr/lib/systemd/system' /usr/bin/install: cannot create regular file '/usr/lib/systemd/system/rauc.service': Permission denied /usr/bin/install -c -m 644 data/de.pengutronix.rauc.conf 'no' make[4]: *** [Makefile:1700: install-nodist_systemdunitDATA] Error 1 make[4]: *** Waiting for unfinished jobs.... Signed-off-by: Bartosz Bilas Signed-off-by: Peter Korsgaard --- package/rauc/rauc.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/rauc/rauc.mk b/package/rauc/rauc.mk index 61c50ab316..a6c7c01095 100644 --- a/package/rauc/rauc.mk +++ b/package/rauc/rauc.mk @@ -46,7 +46,8 @@ HOST_RAUC_CONF_OPTS += \ --disable-network \ --disable-json \ --disable-service \ - --without-dbuspolicydir + --without-dbuspolicydir \ + --with-systemdunitdir=no $(eval $(autotools-package)) $(eval $(host-autotools-package)) From 6a33ea03b469a35f0dddcabd6e378819dc731024 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 14 Nov 2020 14:51:08 +0100 Subject: [PATCH 105/125] Update for 2020.11-rc2 Signed-off-by: Peter Korsgaard --- CHANGES | 26 ++++++++++++++++++++++++++ Makefile | 4 ++-- docs/website/download.html | 18 +++++++++--------- docs/website/news.html | 21 +++++++++++++++++++++ 4 files changed, 58 insertions(+), 11 deletions(-) diff --git a/CHANGES b/CHANGES index 4f7864c0e0..9957622c34 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,29 @@ +2020.11-rc2, released November 14th, 2020 + + Fixes all over the tree. + + cve-checker script dropped. Instead the pkg-stats logic has + been extended to be able to only generate stats for the + configured packages using 'make pkg-stats' + + Removed defconfigs: rock64 + + Updated/fixed packages: apparmor, asterisk, bitcoin, busybox, + cups-filters, cryptsetup, davfs2, domoticz, elf2flt, freetype, + ghostscript, glmark2, go, gst1-plugins-bad, guile, jsoncpp, + libcap, libexif, libnetfilter_conntrack, libpam-tacplus, + libsigrokdecode, linux-backports, linux-firmware, mesa3d, + modem-manager, mp4v2, oniguruma, openntpd, python3, + python-lmdb, python-m2crypto, rauc, s390-tools, slirp, + stress-ng, suricata, systemd, tcpdump, tmux, tor, webkitgtk, + wireguard-linux-compat, wpewebkit, xen + + Issues resolved (http://bugs.uclibc.org): + + #13281: Raspberry Pi 2: overlays folder missing in genimage-ra.. + #13291: BR2_DL_DIR is ignored when creating defconfig + #13306: wpewebkit build problem in 2020-11-rc1 + 2020.11-rc1, released November 4th, 2020 Fixes all over the tree and new features. diff --git a/Makefile b/Makefile index fa648d5d54..2d911bcee8 100644 --- a/Makefile +++ b/Makefile @@ -92,9 +92,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2020.11-rc1 +export BR2_VERSION := 2020.11-rc2 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1604528000 +BR2_VERSION_EPOCH = 1605361000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) diff --git a/docs/website/download.html b/docs/website/download.html index 7d2a3c1c93..07627d0f34 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -76,37 +76,37 @@ -

Latest release candidate: 2020.11-rc1

+

Latest release candidate: 2020.11-rc2

- +
- +
-

buildroot-2020.11-rc1.tar.gz

-

PGP signature

+

buildroot-2020.11-rc2.tar.gz

+

PGP signature

- +
- +
-

buildroot-2020.11-rc1.tar.bz2

-

PGP signature

+

buildroot-2020.11-rc2.tar.bz2

+

PGP signature

diff --git a/docs/website/news.html b/docs/website/news.html index 5c4cea2d40..eab11e2f8a 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,27 @@

News

    +
  • +
    +
    +
    +

    2020.11-rc2 released

    +

    14 November 2020

    +
    +
    +

    2020.11-rc2 has been released with more cleanups and build fixes. See the + CHANGES + file for details.

    + +

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

    +
    +
    +
    • +
  • From d2159da6a034b8287984f738974f9f8738bac1e6 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Fri, 13 Nov 2020 14:09:41 +0100 Subject: [PATCH 106/125] package/linux-backports: bump version to 5.8 Attempting to compile this package with newer Kernel version (e.g. v5.4) fails with message: Generating local configuration database from kernel ...Kernel version parse failed! Upgrading the package to 5.8 fixes this issue. Anyways, v4.4 is now rather old and beat the very purpose of having newer drivers in older kernels. Since backports tag v4.14-rc4-1, the requirement on minimal kernel version changed from 3.0 to 3.10. See commit [1]. The minimal kernel version check is changed accordingly. License files are also updated: the linux backports package copies the license files from the kernel version used for its generation. v5.8 is now "GPL-2.0 WITH Linux-syscall-note". However, there is no such SPDX identifier (contrary to what is said in the COPYING file), so we keep it as GPL-2.0 (which also keeps it aligned to what we have in linux.mk). [1] https://git.kernel.org/pub/scm/linux/kernel/git/backports/backports.git/commit/?id=a0d05f9f9ca50ea8b1d60726fac6b54167257e76 Signed-off-by: Julien Olivain Reviewed-by: Petr Vorel Tested-by: Petr Vorel [yann.morin.1998@free.fr: keep license as GPL-2.0, like for linux] Signed-off-by: Yann E. MORIN --- package/linux-backports/Config.in | 2 +- package/linux-backports/linux-backports.hash | 8 +++++--- package/linux-backports/linux-backports.mk | 19 ++++++++++++------- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/package/linux-backports/Config.in b/package/linux-backports/Config.in index 362e6e4bc7..251d202fd2 100644 --- a/package/linux-backports/Config.in +++ b/package/linux-backports/Config.in @@ -9,7 +9,7 @@ config BR2_PACKAGE_LINUX_BACKPORTS recent kernels, backported to older ones. This version of linux-backports supports kernels starting - from 3.0. + from 3.10. https://backports.wiki.kernel.org diff --git a/package/linux-backports/linux-backports.hash b/package/linux-backports/linux-backports.hash index f39bc2ed27..3e103424f5 100644 --- a/package/linux-backports/linux-backports.hash +++ b/package/linux-backports/linux-backports.hash @@ -1,4 +1,6 @@ -# From: https://www.kernel.org/pub/linux/kernel/projects/backports/stable/v4.4.2/sha256sums.asc -sha256 a979e194c2ed9fdfca092a448e626d85c5af0e4de5ad993c0967afd15af01285 backports-4.4.2-1.tar.xz +# From: https://www.kernel.org/pub/linux/kernel/projects/backports/stable/v5.8/sha256sums.asc +sha256 19b4174d89bf11ee221458e11f1e8dace26558498774b823051156f522d2036b backports-5.8-1.tar.xz # Locally computed -sha256 af8067302947c01fd9eee72befa54c7e3ef8a48fecde7fd71277f2290b2bf0f7 COPYING +sha256 fb5a425bd3b3cd6071a3a9aff9909a859e7c1158d54d32e07658398cd67eb6a0 COPYING +sha256 8e378ab93586eb55135d3bc119cce787f7324f48394777d00c34fa3d0be3303f LICENSES/exceptions/Linux-syscall-note +sha256 f6b78c087c3ebdf0f3c13415070dd480a3f35d8fc76f3d02180a407c1c812f79 LICENSES/preferred/GPL-2.0 diff --git a/package/linux-backports/linux-backports.mk b/package/linux-backports/linux-backports.mk index 1827ee18b7..068dcffcc8 100644 --- a/package/linux-backports/linux-backports.mk +++ b/package/linux-backports/linux-backports.mk @@ -4,12 +4,15 @@ # ################################################################################ -LINUX_BACKPORTS_VERSION_MAJOR = 4.4.2 +LINUX_BACKPORTS_VERSION_MAJOR = 5.8 LINUX_BACKPORTS_VERSION = $(LINUX_BACKPORTS_VERSION_MAJOR)-1 LINUX_BACKPORTS_SOURCE = backports-$(LINUX_BACKPORTS_VERSION).tar.xz LINUX_BACKPORTS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/projects/backports/stable/v$(LINUX_BACKPORTS_VERSION_MAJOR) LINUX_BACKPORTS_LICENSE = GPL-2.0 -LINUX_BACKPORTS_LICENSE_FILES = COPYING +LINUX_BACKPORTS_LICENSE_FILES = \ + COPYING \ + LICENSES/exceptions/Linux-syscall-note \ + LICENSES/preferred/GPL-2.0 # flex and bison are needed to generate kconfig parser. We use the # same logic as the linux kernel (we add host dependencies only if @@ -91,7 +94,7 @@ $(eval $(kconfig-package)) # instead. # # Furthermore, we want to check the kernel version, since linux-backports -# only supports kernels >= 3.0. To avoid overriding linux-backports' +# only supports kernels >= 3.10. To avoid overriding linux-backports' # KCONFIG_STAMP_DOTCONFIG rule defined in the kconfig-package infra, we # use an intermediate stamp-file. # @@ -103,10 +106,12 @@ $(LINUX_BACKPORTS_DIR)/$(LINUX_BACKPORTS_KCONFIG_STAMP_DOTCONFIG): $(LINUX_BACKP .SECONDEXPANSION: $(LINUX_BACKPORTS_DIR)/.stamp_check_kernel_version: $$(LINUX_DIR)/$$(LINUX_KCONFIG_STAMP_DOTCONFIG) - $(Q)LINUX_VERSION_PROBED=$(LINUX_VERSION_PROBED); \ - if [ $${LINUX_VERSION_PROBED%%.*} -lt 3 ]; then \ - printf "Linux version '%s' is too old for linux-backports (needs 3.0 or later)\n" \ - "$${LINUX_VERSION_PROBED}"; \ + $(Q)KVER=$(LINUX_VERSION_PROBED); \ + KVER_MAJOR=`echo $${KVER} | sed 's/^\([0-9]*\)\..*/\1/'`; \ + KVER_MINOR=`echo $${KVER} | sed 's/^[0-9]*\.\([0-9]*\).*/\1/'`; \ + if [ $${KVER_MAJOR} -lt 3 -o \( $${KVER_MAJOR} -eq 3 -a $${KVER_MINOR} -lt 10 \) ]; then \ + printf "Linux version '%s' is too old for linux-backports (needs 3.10 or later)\n" \ + "$${KVER}"; \ exit 1; \ fi $(Q)touch $(@) From c8721261c742a6af8bcc2fa9179364e07bf20353 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 15 Nov 2020 22:20:50 +0100 Subject: [PATCH 107/125] Revert "package/linux-backports: bump version to 5.8" This reverts commit d2159da6a034b8287984f738974f9f8738bac1e6. which should not have been applied to master, but to next... Signed-off-by: Yann E. MORIN --- package/linux-backports/Config.in | 2 +- package/linux-backports/linux-backports.hash | 8 +++----- package/linux-backports/linux-backports.mk | 19 +++++++------------ 3 files changed, 11 insertions(+), 18 deletions(-) diff --git a/package/linux-backports/Config.in b/package/linux-backports/Config.in index 251d202fd2..362e6e4bc7 100644 --- a/package/linux-backports/Config.in +++ b/package/linux-backports/Config.in @@ -9,7 +9,7 @@ config BR2_PACKAGE_LINUX_BACKPORTS recent kernels, backported to older ones. This version of linux-backports supports kernels starting - from 3.10. + from 3.0. https://backports.wiki.kernel.org diff --git a/package/linux-backports/linux-backports.hash b/package/linux-backports/linux-backports.hash index 3e103424f5..f39bc2ed27 100644 --- a/package/linux-backports/linux-backports.hash +++ b/package/linux-backports/linux-backports.hash @@ -1,6 +1,4 @@ -# From: https://www.kernel.org/pub/linux/kernel/projects/backports/stable/v5.8/sha256sums.asc -sha256 19b4174d89bf11ee221458e11f1e8dace26558498774b823051156f522d2036b backports-5.8-1.tar.xz +# From: https://www.kernel.org/pub/linux/kernel/projects/backports/stable/v4.4.2/sha256sums.asc +sha256 a979e194c2ed9fdfca092a448e626d85c5af0e4de5ad993c0967afd15af01285 backports-4.4.2-1.tar.xz # Locally computed -sha256 fb5a425bd3b3cd6071a3a9aff9909a859e7c1158d54d32e07658398cd67eb6a0 COPYING -sha256 8e378ab93586eb55135d3bc119cce787f7324f48394777d00c34fa3d0be3303f LICENSES/exceptions/Linux-syscall-note -sha256 f6b78c087c3ebdf0f3c13415070dd480a3f35d8fc76f3d02180a407c1c812f79 LICENSES/preferred/GPL-2.0 +sha256 af8067302947c01fd9eee72befa54c7e3ef8a48fecde7fd71277f2290b2bf0f7 COPYING diff --git a/package/linux-backports/linux-backports.mk b/package/linux-backports/linux-backports.mk index 068dcffcc8..1827ee18b7 100644 --- a/package/linux-backports/linux-backports.mk +++ b/package/linux-backports/linux-backports.mk @@ -4,15 +4,12 @@ # ################################################################################ -LINUX_BACKPORTS_VERSION_MAJOR = 5.8 +LINUX_BACKPORTS_VERSION_MAJOR = 4.4.2 LINUX_BACKPORTS_VERSION = $(LINUX_BACKPORTS_VERSION_MAJOR)-1 LINUX_BACKPORTS_SOURCE = backports-$(LINUX_BACKPORTS_VERSION).tar.xz LINUX_BACKPORTS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/projects/backports/stable/v$(LINUX_BACKPORTS_VERSION_MAJOR) LINUX_BACKPORTS_LICENSE = GPL-2.0 -LINUX_BACKPORTS_LICENSE_FILES = \ - COPYING \ - LICENSES/exceptions/Linux-syscall-note \ - LICENSES/preferred/GPL-2.0 +LINUX_BACKPORTS_LICENSE_FILES = COPYING # flex and bison are needed to generate kconfig parser. We use the # same logic as the linux kernel (we add host dependencies only if @@ -94,7 +91,7 @@ $(eval $(kconfig-package)) # instead. # # Furthermore, we want to check the kernel version, since linux-backports -# only supports kernels >= 3.10. To avoid overriding linux-backports' +# only supports kernels >= 3.0. To avoid overriding linux-backports' # KCONFIG_STAMP_DOTCONFIG rule defined in the kconfig-package infra, we # use an intermediate stamp-file. # @@ -106,12 +103,10 @@ $(LINUX_BACKPORTS_DIR)/$(LINUX_BACKPORTS_KCONFIG_STAMP_DOTCONFIG): $(LINUX_BACKP .SECONDEXPANSION: $(LINUX_BACKPORTS_DIR)/.stamp_check_kernel_version: $$(LINUX_DIR)/$$(LINUX_KCONFIG_STAMP_DOTCONFIG) - $(Q)KVER=$(LINUX_VERSION_PROBED); \ - KVER_MAJOR=`echo $${KVER} | sed 's/^\([0-9]*\)\..*/\1/'`; \ - KVER_MINOR=`echo $${KVER} | sed 's/^[0-9]*\.\([0-9]*\).*/\1/'`; \ - if [ $${KVER_MAJOR} -lt 3 -o \( $${KVER_MAJOR} -eq 3 -a $${KVER_MINOR} -lt 10 \) ]; then \ - printf "Linux version '%s' is too old for linux-backports (needs 3.10 or later)\n" \ - "$${KVER}"; \ + $(Q)LINUX_VERSION_PROBED=$(LINUX_VERSION_PROBED); \ + if [ $${LINUX_VERSION_PROBED%%.*} -lt 3 ]; then \ + printf "Linux version '%s' is too old for linux-backports (needs 3.0 or later)\n" \ + "$${LINUX_VERSION_PROBED}"; \ exit 1; \ fi $(Q)touch $(@) From f1bce086f6eb174e154a753c6608b3636345fd62 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 14 Nov 2020 15:48:47 +0100 Subject: [PATCH 108/125] package/redis: security bump to version 6.0.9 This release fixes a potential heap overflow when using a heap allocator other than jemalloc or glibc's malloc. See: https://github.com/redis/redis/pull/7963 https://raw.githubusercontent.com/redis/redis/6.0/00-RELEASENOTES Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/redis/0001-uclibc.patch | 4 +++- package/redis/redis.hash | 2 +- package/redis/redis.mk | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/redis/0001-uclibc.patch b/package/redis/0001-uclibc.patch index 3329a60edc..197f43e7a7 100644 --- a/package/redis/0001-uclibc.patch +++ b/package/redis/0001-uclibc.patch @@ -10,6 +10,8 @@ Signed-off-by: Daniel Price Signed-off-by: Martin Bark [Titouan: adapt to 5.0.4] Signed-off-by: Titouan Christophe +[Fabrice: update for 6.0.9] +Signed-off-by: Fabrice Fontaine ========================================================================= diff -ur old/src/config.h new/src/config.h @@ -21,6 +23,6 @@ diff -ur old/src/config.h new/src/config.h /* Test for backtrace() */ -#if defined(__APPLE__) || (defined(__linux__) && defined(__GLIBC__)) || \ +#if defined(__APPLE__) || (defined(__linux__) && defined(__GLIBC__) && !defined(__UCLIBC__)) || \ - defined(__FreeBSD__) || (defined(__OpenBSD__) && defined(USE_BACKTRACE))\ + defined(__FreeBSD__) || ((defined(__OpenBSD__) || defined(__NetBSD__)) && defined(USE_BACKTRACE))\ || defined(__DragonFly__) #define HAVE_BACKTRACE 1 diff --git a/package/redis/redis.hash b/package/redis/redis.hash index d686d59847..a16bf9dffb 100644 --- a/package/redis/redis.hash +++ b/package/redis/redis.hash @@ -1,5 +1,5 @@ # From https://github.com/redis/redis-hashes/blob/master/README -sha256 04fa1fddc39bd1aecb6739dd5dd73858a3515b427acd1e2947a66dadce868d68 redis-6.0.8.tar.gz +sha256 dc2bdcf81c620e9f09cfd12e85d3bc631c897b2db7a55218fd8a65eaa37f86dd redis-6.0.9.tar.gz # Locally calculated sha256 97f0a15b7bbae580d2609dad2e11f1956ae167be296ab60f4691ab9c30ee9828 COPYING diff --git a/package/redis/redis.mk b/package/redis/redis.mk index c567d3200d..b0d8e1cd51 100644 --- a/package/redis/redis.mk +++ b/package/redis/redis.mk @@ -4,7 +4,7 @@ # ################################################################################ -REDIS_VERSION = 6.0.8 +REDIS_VERSION = 6.0.9 REDIS_SITE = http://download.redis.io/releases REDIS_LICENSE = BSD-3-Clause (core); MIT and BSD family licenses (Bundled components) REDIS_LICENSE_FILES = COPYING From 8e68f00b91126191b642401d13e2be973ce91e8e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 15 Nov 2020 11:51:03 +0100 Subject: [PATCH 109/125] package/postgresql: security bump to version 12.5 Fix the following CVEs: - CVE-2020-25695: Multiple features escape "security restricted operation" sandbox - CVE-2020-25694: Reconnection can downgrade connection security settings - CVE-2020-25696: psql's \gset allows overwriting specially treated variables https://www.postgresql.org/about/news/postgresql-131-125-1110-1015-9620-and-9524-released-2111 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/postgresql/postgresql.hash | 8 ++++---- package/postgresql/postgresql.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/postgresql/postgresql.hash b/package/postgresql/postgresql.hash index 4e410d187a..64fa220714 100644 --- a/package/postgresql/postgresql.hash +++ b/package/postgresql/postgresql.hash @@ -1,7 +1,7 @@ -# From https://ftp.postgresql.org/pub/source/v12.4/postgresql-12.4.tar.bz2.md5 -md5 80ebbf0e55193b123760e5f8e48c6cff postgresql-12.4.tar.bz2 -# From https://ftp.postgresql.org/pub/source/v12.4/postgresql-12.4.tar.bz2.sha256 -sha256 bee93fbe2c32f59419cb162bcc0145c58da9a8644ee154a30b9a5ce47de606cc postgresql-12.4.tar.bz2 +# From https://ftp.postgresql.org/pub/source/v12.5/postgresql-12.5.tar.bz2.md5 +md5 f19e48090bbd59ea81826b5fd99e7e97 postgresql-12.5.tar.bz2 +# From https://ftp.postgresql.org/pub/source/v12.5/postgresql-12.5.tar.bz2.sha256 +sha256 bd0d25341d9578b5473c9506300022de26370879581f5fddd243a886ce79ff95 postgresql-12.5.tar.bz2 # License file, Locally calculated sha256 739e5d454d81d31a482469338b7c856f1f5c6b4cdda1551cea6f0f6d18eef62c COPYRIGHT diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index 3630b5a385..4c5f200bdf 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -4,7 +4,7 @@ # ################################################################################ -POSTGRESQL_VERSION = 12.4 +POSTGRESQL_VERSION = 12.5 POSTGRESQL_SOURCE = postgresql-$(POSTGRESQL_VERSION).tar.bz2 POSTGRESQL_SITE = https://ftp.postgresql.org/pub/source/v$(POSTGRESQL_VERSION) POSTGRESQL_LICENSE = PostgreSQL From 4ceae1b2ed4e16bc7b06c6473e4b1aa34a093a80 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 16 Nov 2020 14:08:08 +0100 Subject: [PATCH 110/125] DEVELOPERS: drop Trent Piepho We change Trent's e-mail address in commit 1c20802d4b5de5836b2ab6000a4c5e273711a8aa, but it turns out the new one also doesn't work: : host synapse-com.mail.protection.outlook.com[104.47.57.138] said: 550 5.4.1 Recipient address rejected: Access denied. AS(201806281) [DM6NAM11FT063.eop-nam11.prod.protection.outlook.com] (in reply to RCPT TO command) So let's drop Trent entirely, which orphans the libp11 package. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- DEVELOPERS | 3 --- 1 file changed, 3 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 6b8083eb47..1900538608 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2606,9 +2606,6 @@ F: package/waf/ F: support/testing/tests/package/test_crudini.py F: support/testing/tests/package/test_redis.py -N: Trent Piepho -F: package/libp11/ - N: Tudor Holton F: package/openjdk/ From 41236c61b186028dcfef3d71c34cf31ca889b090 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 15 Nov 2020 22:55:30 +0100 Subject: [PATCH 111/125] package/xorriso: fix host option --disable-bzip2 is not a recognized option so replace it by --disable-libbz2 to match the target logic. Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/xorriso/xorriso.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/xorriso/xorriso.mk b/package/xorriso/xorriso.mk index 56bf39f764..472623ea5e 100644 --- a/package/xorriso/xorriso.mk +++ b/package/xorriso/xorriso.mk @@ -14,7 +14,7 @@ XORRISO_LICENSE_FILES = COPYING COPYRIGHT HOST_XORRISO_CONF_OPTS = \ --disable-xattr-h-pref-attr \ --disable-zlib \ - --disable-bzip2 \ + --disable-libbz2 \ --disable-libcdio \ --disable-libreadline \ --disable-libedit \ From b8de3cb3741712dff891568cc57751dee7111334 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Mon, 16 Nov 2020 13:18:29 +0200 Subject: [PATCH 112/125] package/openntpd: needs host-bison Build fails when no yacc alternative is installed. Fixes: http://autobuild.buildroot.net/results/1ba8e339cbb5646663d0bf4e158d89e54433b242/ http://autobuild.buildroot.net/results/a00a53d6635c64e72c50d4841658155de5380110/ Signed-off-by: Baruch Siach Acked-by: Yann E. MORIN Signed-off-by: Peter Korsgaard --- package/openntpd/openntpd.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/openntpd/openntpd.mk b/package/openntpd/openntpd.mk index f2eaee7efd..9076f3ddda 100644 --- a/package/openntpd/openntpd.mk +++ b/package/openntpd/openntpd.mk @@ -8,6 +8,7 @@ OPENNTPD_VERSION = 6.2p3 OPENNTPD_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenNTPD OPENNTPD_LICENSE = MIT-like, BSD-2-Clause, BSD-3-Clause OPENNTPD_LICENSE_FILES = COPYING +OPENNTPD_DEPENDENCIES = host-bison # Need to autoreconf for our libtool patch to apply properly OPENNTPD_AUTORECONF = YES From 3b7753fb49a5bd4a412611c3f82efa71c58af435 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 14 Nov 2020 15:51:58 +0100 Subject: [PATCH 113/125] package/libpam-tacplus: remove duplicate LIBPAM_TACPLUS_AUTORECONF The commit [1] added a second LIBPAM_TACPLUS_AUTORECONF because we are now patching configure.ac. But LIBPAM_TACPLUS_AUTORECONF was already used because the package is fetched from github. [1] bd85d82f61af0578a64e74e1cfb56c3c1bf46fe1 Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/849509860 Signed-off-by: Romain Naour Cc: Fabrice Fontaine Reviewed-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libpam-tacplus/libpam-tacplus.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/libpam-tacplus/libpam-tacplus.mk b/package/libpam-tacplus/libpam-tacplus.mk index 9dd8466bf2..b9630d8b37 100644 --- a/package/libpam-tacplus/libpam-tacplus.mk +++ b/package/libpam-tacplus/libpam-tacplus.mk @@ -12,10 +12,9 @@ LIBPAM_TACPLUS_DEPENDENCIES = \ linux-pam \ $(if $(BR2_PACKAGE_OPENSSL),openssl) # Fetching from github, we need to generate the configure script +# 0001-Add-an-option-to-disable-Werror.patch LIBPAM_TACPLUS_AUTORECONF = YES LIBPAM_TACPLUS_INSTALL_STAGING = YES -# We're patching configure.ac -LIBPAM_TACPLUS_AUTORECONF = YES LIBPAM_TACPLUS_CONF_ENV = \ ax_cv_check_cflags___fstack_protector_all=$(if $(BR2_TOOLCHAIN_HAS_SSP),yes,no) LIBPAM_TACPLUS_CONF_OPTS = --disable-werror From 0901355c11f051846744a12f9b2044a751faa47a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 14 Nov 2020 23:10:07 +0100 Subject: [PATCH 114/125] package/dovecot-pigeonhole: fix build with per-package directories Fix wrong path in usr/lib/dovecot-config which was copied from the dovecot staging dir. Fixes: http://autobuild.buildroot.net/results/5fb/5fb1cd57bc3fdf4f75019c7b25d65ef887eea539/ Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/dovecot-pigeonhole/dovecot-pigeonhole.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/dovecot-pigeonhole/dovecot-pigeonhole.mk b/package/dovecot-pigeonhole/dovecot-pigeonhole.mk index d7068cd873..462c992902 100644 --- a/package/dovecot-pigeonhole/dovecot-pigeonhole.mk +++ b/package/dovecot-pigeonhole/dovecot-pigeonhole.mk @@ -13,4 +13,12 @@ DOVECOT_PIGEONHOLE_DEPENDENCIES = dovecot DOVECOT_PIGEONHOLE_CONF_OPTS = --with-dovecot=$(STAGING_DIR)/usr/lib +ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) +define DOVECOT_PIGEONHOLE_FIXUP_DOVECOT_CONFIG + $(SED) 's,$(PER_PACKAGE_DIR)/dovecot/,$(PER_PACKAGE_DIR)/dovecot-pigeonhole/,g' \ + $(STAGING_DIR)/usr/lib/dovecot-config +endef +DOVECOT_PIGEONHOLE_PRE_CONFIGURE_HOOKS = DOVECOT_PIGEONHOLE_FIXUP_DOVECOT_CONFIG +endif + $(eval $(autotools-package)) From 6fe0298eecb50a5145bc20411af24dc22cfcf861 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 14 Nov 2020 23:11:24 +0100 Subject: [PATCH 115/125] package/numactl: needs -fPIC This will avoid the following build failure with qemu 5.0.0 and above: /srv/storage/autobuild/run/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-uclibc/8.3.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: /srv/storage/autobuild/run/instance-2/output-1/host/x86_64-buildroot-linux-uclibc/sysroot/usr/lib/../lib64/libnuma.a(libnuma.o): relocation R_X86_64_32 against `.rodata.str1.1' can not be used when making a PIE object; recompile with -fPIC Fixes: - http://autobuild.buildroot.org/results/616dff216a215dc0494c846d337e03e0795b2fb2 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/numactl/numactl.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/numactl/numactl.mk b/package/numactl/numactl.mk index d0dd5c26f4..cf9c759693 100644 --- a/package/numactl/numactl.mk +++ b/package/numactl/numactl.mk @@ -10,5 +10,6 @@ NUMACTL_LICENSE = LGPL-2.1 (libnuma), GPL-2.0 (programs) NUMACTL_LICENSE_FILES = README.md NUMACTL_INSTALL_STAGING = YES NUMACTL_AUTORECONF = YES +NUMACTL_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -fPIC" $(eval $(autotools-package)) From 1271867831a9fcf8e7ef52a1691386c63205474c Mon Sep 17 00:00:00 2001 From: Garret Kelly Date: Sat, 14 Nov 2020 23:40:43 -0500 Subject: [PATCH 116/125] boot/uboot: fix custom repo error message When using a custom git or mercurial repository for u-boot the error message indicating a version had not been provided incorrectly stated that the URL was missing. Update the error message to indicate that it's the version that's missing. Signed-off-by: Garret Kelly Signed-off-by: Peter Korsgaard --- boot/uboot/uboot.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 72d5df412d..d2b4e8dc60 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -477,7 +477,7 @@ ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_REPO_URL)),) $(error No custom U-Boot repository URL specified. Check your BR2_TARGET_UBOOT_CUSTOM_REPO_URL setting) endif # qstrip BR2_TARGET_UBOOT_CUSTOM_CUSTOM_REPO_URL ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION)),) -$(error No custom U-Boot repository URL specified. Check your BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION setting) +$(error No custom U-Boot repository version specified. Check your BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION setting) endif # qstrip BR2_TARGET_UBOOT_CUSTOM_CUSTOM_REPO_VERSION endif # BR2_TARGET_UBOOT_CUSTOM_GIT || BR2_TARGET_UBOOT_CUSTOM_HG From 00e644adb182681a51d39375d70d0a888d0b950f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 15 Nov 2020 11:23:52 +0100 Subject: [PATCH 117/125] package/harfbuzz: fix build without threads Fixes: - http://autobuild.buildroot.org/results/70c98e89b1d5e5b651d1f6928dc53f465103f57a Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...0002-meson.build-check-for-pthread.h.patch | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 package/harfbuzz/0002-meson.build-check-for-pthread.h.patch diff --git a/package/harfbuzz/0002-meson.build-check-for-pthread.h.patch b/package/harfbuzz/0002-meson.build-check-for-pthread.h.patch new file mode 100644 index 0000000000..128876dfb7 --- /dev/null +++ b/package/harfbuzz/0002-meson.build-check-for-pthread.h.patch @@ -0,0 +1,49 @@ +From 96bbf3a3af45d86f790afdf91a6686c37421e92b Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 15 Nov 2020 10:57:37 +0100 +Subject: [PATCH] meson.build: check for pthread.h + +Check for pthread.h otherwise the build will fail with some toolchains +that have libphtread.so but not pthread.h: + +Run-time dependency threads found: YES + +../src/hb-mutex.hh:53:10: fatal error: pthread.h: No such file or directory + #include + ^~~~~~~~~~~ + +Moreover, fix detection of pthread fallback + +Fixes: + - http://autobuild.buildroot.org/results/70c98e89b1d5e5b651d1f6928dc53f465103f57a + +Signed-off-by: Fabrice Fontaine +--- + meson.build | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/meson.build b/meson.build +index bf3925db..6d263d48 100644 +--- a/meson.build ++++ b/meson.build +@@ -284,13 +284,15 @@ endif + # threads + thread_dep = null_dep + if host_machine.system() != 'windows' +- thread_dep = dependency('threads', required: false) ++ if cpp.has_header('pthread.h') ++ thread_dep = dependency('threads', required: false) ++ endif + + if thread_dep.found() + conf.set('HAVE_PTHREAD', 1) + else + check_headers += ['sched.h'] +- check_funcs += ['sched_yield', {'link_with': 'rt'}] ++ check_funcs += [['sched_yield', {'link_with': 'rt'}]] + endif + endif + +-- +2.29.2 + From 61de073194c46426760ec06372a7863a0eece248 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 14 Nov 2020 22:53:03 +0100 Subject: [PATCH 118/125] package/qemu: fix build with 64 bits time_t Fix build of qemu 5.0.0 and above with 64 bites time_t Fixes: - http://autobuild.buildroot.org/results/efd4474fb4b6c0ce0ab3838ce130429c51e43bbb Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- .../0002-Fix-build-with-64-bits-time_t.patch | 98 +++++++++++++++++++ 1 file changed, 98 insertions(+) create mode 100644 package/qemu/0002-Fix-build-with-64-bits-time_t.patch diff --git a/package/qemu/0002-Fix-build-with-64-bits-time_t.patch b/package/qemu/0002-Fix-build-with-64-bits-time_t.patch new file mode 100644 index 0000000000..7a72047136 --- /dev/null +++ b/package/qemu/0002-Fix-build-with-64-bits-time_t.patch @@ -0,0 +1,98 @@ +From 839e51aa452345b440f8d2d0df84ab58bdedfcd1 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 14 Nov 2020 21:54:17 +0100 +Subject: [PATCH] Fix build with 64 bits time_t + +time element is deprecated on new input_event structure in kernel's +input.h [1] + +This will avoid the following build failure: + +hw/input/virtio-input-host.c: In function 'virtio_input_host_handle_status': +hw/input/virtio-input-host.c:198:28: error: 'struct input_event' has no member named 'time' + 198 | if (gettimeofday(&evdev.time, NULL)) { + | ^ + +Fixes: + - http://autobuild.buildroot.org/results/a538167e288c14208d557cd45446df86d3d599d5 + - http://autobuild.buildroot.org/results/efd4474fb4b6c0ce0ab3838ce130429c51e43bbb + +[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=152194fe9c3f + +Signed-off-by: Fabrice Fontaine +--- + contrib/vhost-user-input/main.c | 10 +++++++++- + hw/input/virtio-input-host.c | 10 +++++++++- + 2 files changed, 18 insertions(+), 2 deletions(-) + +diff --git a/contrib/vhost-user-input/main.c b/contrib/vhost-user-input/main.c +index 6020c6f33a..e688c3e0a9 100644 +--- a/contrib/vhost-user-input/main.c ++++ b/contrib/vhost-user-input/main.c +@@ -17,6 +17,11 @@ + #include "standard-headers/linux/virtio_input.h" + #include "qapi/error.h" + ++#ifndef input_event_sec ++#define input_event_sec time.tv_sec ++#define input_event_usec time.tv_usec ++#endif ++ + enum { + VHOST_USER_INPUT_MAX_QUEUES = 2, + }; +@@ -115,13 +120,16 @@ vi_evdev_watch(VuDev *dev, int condition, void *data) + static void vi_handle_status(VuInput *vi, virtio_input_event *event) + { + struct input_event evdev; ++ struct timeval tval; + int rc; + +- if (gettimeofday(&evdev.time, NULL)) { ++ if (gettimeofday(&tval, NULL)) { + perror("vi_handle_status: gettimeofday"); + return; + } + ++ evdev.input_event_sec = tval.tv_sec; ++ evdev.input_event_usec = tval.tv_usec; + evdev.type = le16toh(event->type); + evdev.code = le16toh(event->code); + evdev.value = le32toh(event->value); +diff --git a/hw/input/virtio-input-host.c b/hw/input/virtio-input-host.c +index 85daf73f1a..2e261737e1 100644 +--- a/hw/input/virtio-input-host.c ++++ b/hw/input/virtio-input-host.c +@@ -16,6 +16,11 @@ + #include + #include "standard-headers/linux/input.h" + ++#ifndef input_event_sec ++#define input_event_sec time.tv_sec ++#define input_event_usec time.tv_usec ++#endif ++ + /* ----------------------------------------------------------------- */ + + static struct virtio_input_config virtio_input_host_config[] = { +@@ -193,13 +198,16 @@ static void virtio_input_host_handle_status(VirtIOInput *vinput, + { + VirtIOInputHost *vih = VIRTIO_INPUT_HOST(vinput); + struct input_event evdev; ++ struct timeval tval; + int rc; + +- if (gettimeofday(&evdev.time, NULL)) { ++ if (gettimeofday(&tval, NULL)) { + perror("virtio_input_host_handle_status: gettimeofday"); + return; + } + ++ evdev.input_event_sec = tval.tv_sec; ++ evdev.input_event_usec = tval.tv_usec; + evdev.type = le16_to_cpu(event->type); + evdev.code = le16_to_cpu(event->code); + evdev.value = le32_to_cpu(event->value); +-- +2.29.2 + From 3e71de910359e20796a50407338b240c9c6397c8 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 16 Nov 2020 23:13:14 +0100 Subject: [PATCH 119/125] Update for 2020.08.2 Signed-off-by: Peter Korsgaard (cherry picked from commit 5a90d87d331aa440cd024c7269a0673d94792896) [Peter: drop Makefile changes] Signed-off-by: Peter Korsgaard --- CHANGES | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/CHANGES b/CHANGES index 9957622c34..41d5ee7a7a 100644 --- a/CHANGES +++ b/CHANGES @@ -106,6 +106,34 @@ #13236: Can't compile linux 5.4.8 (with gcc 10 on host) #13286: The system hangs in vmware workstation on the line.. +2020.08.2, released November 16th, 2020 + + Important / security related fixes. + + Toolchain-wrapper: Pass -fno-tree-loop-distribute-patterns to + fix kernel build on microblaze with gcc 10.x when + optimizations are enabled. + + Updated/fixed packages: apparmor, argp-standalone, asterisk, + bandwidthd, binutils, bitcoin, busybox, collectd, cryptsetup, + cups-filters, darkhttpd, davfs2, docker-cli, + docker-containerd, docker-engine, dovecot-pigeonhole, + dvb-apps, elf2flt, fastd, fbset, fbtft, freetype, gcc, + ghostscript, grpc, gst1-plugins-bad, jsoncpp, + kernel-module-imx-gpu-viv, keepalived, kmscube, libass, + libexif, libiqrf, libnetfilter_conntrack, libpam-tacplus, + libraw, linux-backports, linux-firmware, lzlib, mp4v2, + netsnmp, nginx, numactl, oniguruma, opencv3, openntpd, + patchelf, php, pistache, postgresql, python-pyqt5, qemu, + qt5base, rauc, redis, samba4, slirp, systemd, tcpdump, + tinyproxy, tmux, tor, waf, webkitgtk, wine, + wireguard-linux-compat, wireshark, wpewebkit, xen, xorriso, + xvisor, zeromq, zxing-cpp + + Issues resolved (http://bugs.uclibc.org): + + #11931: Bugs in support/scripts/apply-patches.sh + 2020.08.1, released October 12th, 2020 Important / security related fixes. From e2f77f00af50a44ef7d5cc05e24282acf72ecefc Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 16 Nov 2020 23:44:10 +0100 Subject: [PATCH 120/125] docs/website: update for 2020.08.2 Signed-off-by: Peter Korsgaard --- docs/website/download.html | 18 +++++++++--------- docs/website/news.html | 19 +++++++++++++++++++ 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/docs/website/download.html b/docs/website/download.html index 07627d0f34..4f9a755df0 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -42,37 +42,37 @@
    -

    Latest stable release: 2020.08.1

    +

    Latest stable release: 2020.08.2

    - +
    - +
    -

    buildroot-2020.08.1.tar.gz

    -

    PGP signature

    +

    buildroot-2020.08.2.tar.gz

    +

    PGP signature

    - +
    - +
    -

    buildroot-2020.08.1.tar.bz2

    -

    PGP signature

    +

    buildroot-2020.08.2.tar.bz2

    +

    PGP signature

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

    News

      +
    • +
      +
      +
      +

      2020.08.2 released

      +

      16 November 2020

      +
      +
      +

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

      +
      +
      +
      • +
    • From 00e80cb1769047ad8c768d35003ae68fb4c3b0f0 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 17 Nov 2020 00:04:03 +0100 Subject: [PATCH 121/125] Update for 2020.02.8 Signed-off-by: Peter Korsgaard (cherry picked from commit a4832641bcab4e3487a986ac31110fb2c006b2c0) [Peter: drop Makefile changes] Signed-off-by: Peter Korsgaard --- CHANGES | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/CHANGES b/CHANGES index 41d5ee7a7a..7393f4134c 100644 --- a/CHANGES +++ b/CHANGES @@ -640,6 +640,26 @@ #12796: Update OpenSSL to Version 1.1.1g to patch CVE-2020-1967 #12811: bootstrap stuck and no login prompt +2020.02.8, released November 16th, 2020 + + Important / security related fixes. + + Updated/fixed packages: angularjs, argp-standalone, asterisk, + bandwidthd, bitcoin, busybox, cryptsetup, darkhttpd, davfs2, + docker-cli, docker-containerd, docker-engine, + dovecot-pigeonhole, fastd, fbset, fbtft, freetype, gcc, + ghostscript, gnuradio, grpc, gst1-plugins-bad, jsoncpp, + keepalived, libass, libexif, libiqrf, libpam-tacplus, libraw, + linux-backports, linux-firmware, lzlib, netsnmp, nginx, + oniguruma, opencv3, openntpd, patchelf, php, postgresql, + python-pyqt5, qt5base, rauc, redis, samba4, slirp, systemd, + tcpdump, tmux, tor, webkitgtk, wireguard-linux-compat, + wireshark, wpewebkit, xen, xorriso, zeromq, zxing-cpp + + Issues resolved (http://bugs.uclibc.org): + + #11931: Bugs in support/scripts/apply-patches.sh + 2020.02.7, released October 12th, 2020 Important / security related fixes. From 9bbb6efc81fee71f8045530742f715c933361f77 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 17 Nov 2020 09:07:28 +0100 Subject: [PATCH 122/125] docs/website: update for 2020.02.8 Signed-off-by: Peter Korsgaard --- docs/website/download.html | 18 +++++++++--------- docs/website/news.html | 19 +++++++++++++++++++ 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/docs/website/download.html b/docs/website/download.html index 4f9a755df0..774b82d733 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -8,37 +8,37 @@
      Download
      -

      Latest long term support release: 2020.02.7

      +

      Latest long term support release: 2020.02.8

      - +
      - +
      -

      buildroot-2020.02.7.tar.gz

      -

      PGP signature

      +

      buildroot-2020.02.8.tar.gz

      +

      PGP signature

      - +
      - +
      -

      buildroot-2020.02.7.tar.bz2

      -

      PGP signature

      +

      buildroot-2020.02.8.tar.bz2

      +

      PGP signature

      diff --git a/docs/website/news.html b/docs/website/news.html index ab6c525eca..879eef9b15 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,25 @@

      News

        +
      • +
        +
        +
        +

        2020.02.8 released

        +

        17 November 2020

        +
        +
        +

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

        +
        +
        +
        • +
      • From c7a369a907f988cf193b06fd4a7ce5547976c21a Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 17 Nov 2020 08:10:54 +0100 Subject: [PATCH 123/125] package/c-ares: security bump to version 1.17.0 - avoid read-heap-buffer-overflow in ares_parse_soa_reply found during fuzzing - Avoid theoretical buffer overflow in RC4 loop comparison - Empty hquery->name could lead to invalid memory access - ares_parse_{a,aaaa}_reply() could return a larger *naddrttls than was passed in https://c-ares.haxx.se/changelog.html#1_17_0 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/c-ares/c-ares.hash | 2 +- package/c-ares/c-ares.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/c-ares/c-ares.hash b/package/c-ares/c-ares.hash index 04a87402e9..a24f3d72ea 100644 --- a/package/c-ares/c-ares.hash +++ b/package/c-ares/c-ares.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 d08312d0ecc3bd48eee0a4cc0d2137c9f194e0a28de2028928c0f6cae85f86ce c-ares-1.16.1.tar.gz +sha256 1cecd5dbe21306c7263f8649aa6e9a37aecb985995a3489f487d98df2b40757d c-ares-1.17.0.tar.gz # Hash for license file sha256 db4eb63fe09daebdf57d3f79b091bb5ee5070c0d761040e83264e648d307af4c LICENSE.md diff --git a/package/c-ares/c-ares.mk b/package/c-ares/c-ares.mk index f07a7e566f..d3510b3c81 100644 --- a/package/c-ares/c-ares.mk +++ b/package/c-ares/c-ares.mk @@ -4,7 +4,7 @@ # ################################################################################ -C_ARES_VERSION = 1.16.1 +C_ARES_VERSION = 1.17.0 C_ARES_SITE = http://c-ares.haxx.se/download C_ARES_INSTALL_STAGING = YES C_ARES_CONF_OPTS = --with-random=/dev/urandom From d3343d3f7a6cea5c7261a79ece6cbf01ceaa41de Mon Sep 17 00:00:00 2001 From: Aleksander Morgado Date: Mon, 16 Nov 2020 10:44:39 +0100 Subject: [PATCH 124/125] package/modem-manager: bump to version 1.14.8 There should be no longer any need for the ac_cv_prog_XSLTPROC_CHECK hack, this release already removes xsltproc from being a build dependency when building from dist tarballs. https://lists.freedesktop.org/archives/modemmanager-devel/2020-November/008279.html Signed-off-by: Aleksander Morgado Signed-off-by: Peter Korsgaard --- package/modem-manager/modem-manager.hash | 2 +- package/modem-manager/modem-manager.mk | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/package/modem-manager/modem-manager.hash b/package/modem-manager/modem-manager.hash index 30c4c6988d..81a08295f7 100644 --- a/package/modem-manager/modem-manager.hash +++ b/package/modem-manager/modem-manager.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 783d5da925b2ca69f6233fcead691dd0f5cba06aa479d71495efdc07053fc0fd ModemManager-1.14.6.tar.xz +sha256 fe1a26ba51b4bda7abd09ad4dadedd87d8b8154809fc9d88e94f75fdfff19295 ModemManager-1.14.8.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/modem-manager/modem-manager.mk b/package/modem-manager/modem-manager.mk index 372e7da1e4..47d4eed823 100644 --- a/package/modem-manager/modem-manager.mk +++ b/package/modem-manager/modem-manager.mk @@ -4,7 +4,7 @@ # ################################################################################ -MODEM_MANAGER_VERSION = 1.14.6 +MODEM_MANAGER_VERSION = 1.14.8 MODEM_MANAGER_SOURCE = ModemManager-$(MODEM_MANAGER_VERSION).tar.xz MODEM_MANAGER_SITE = http://www.freedesktop.org/software/ModemManager MODEM_MANAGER_LICENSE = GPL-2.0+ (programs, plugins), LGPL-2.0+ (libmm-glib) @@ -12,7 +12,6 @@ MODEM_MANAGER_LICENSE_FILES = COPYING COPYING.LIB MODEM_MANAGER_DEPENDENCIES = host-pkgconf libglib2 $(TARGET_NLS_DEPENDENCIES) MODEM_MANAGER_INSTALL_STAGING = YES MODEM_MANAGER_CONF_OPTS = --disable-more-warnings -MODEM_MANAGER_CONF_ENV = ac_cv_prog_XSLTPROC_CHECK=yes ifeq ($(BR2_PACKAGE_MODEM_MANAGER_LIBQMI),y) MODEM_MANAGER_DEPENDENCIES += libqmi From 105d61c85062b18bc9555011f909c8c8a5a33277 Mon Sep 17 00:00:00 2001 From: Heiko Stuebner Date: Fri, 13 Nov 2020 13:28:35 +0100 Subject: [PATCH 125/125] package/jpeg-turbo: security bump to version 2.0.5 Fixes the following security issue: - CVE-2020-13790: ibjpeg-turbo 2.0.4, and mozjpeg 4.0.0, has a heap-based buffer over-read in get_rgb_row() in rdppm.c via a malformed PPM input file For more details, see the release notes: https://github.com/libjpeg-turbo/libjpeg-turbo/releases/tag/2.0.5 Signed-off-by: Heiko Stuebner [Peter: mark as security bump / extend commit message] Signed-off-by: Peter Korsgaard --- package/jpeg-turbo/jpeg-turbo.hash | 8 ++++---- package/jpeg-turbo/jpeg-turbo.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/jpeg-turbo/jpeg-turbo.hash b/package/jpeg-turbo/jpeg-turbo.hash index 874f04fc82..abf129bd93 100644 --- a/package/jpeg-turbo/jpeg-turbo.hash +++ b/package/jpeg-turbo/jpeg-turbo.hash @@ -1,7 +1,7 @@ -# From https://sourceforge.net/projects/libjpeg-turbo/files/2.0.4/ -sha1 163d8f96d0999526a117de0388624241b54dcd67 libjpeg-turbo-2.0.4.tar.gz -md5 d01d9e0c28c27bc0de9f4e2e8ff49855 libjpeg-turbo-2.0.4.tar.gz +# From https://sourceforge.net/projects/libjpeg-turbo/files/2.0.5/ +sha1 9d4c565d402b2f5661be78d76098073ec7e30f10 libjpeg-turbo-2.0.5.tar.gz +md5 3a7dc293918775fc933f81e2bce36464 libjpeg-turbo-2.0.5.tar.gz # Locally computed -sha256 33dd8547efd5543639e890efbf2ef52d5a21df81faf41bb940657af916a23406 libjpeg-turbo-2.0.4.tar.gz +sha256 16f8f6f2715b3a38ab562a84357c793dd56ae9899ce130563c72cd93d8357b5d libjpeg-turbo-2.0.5.tar.gz sha256 69e570a251515ced17d4492256d57c89db77ed949652f88a44c80c1ca9607920 LICENSE.md sha256 82fece2bff2669c476495f0fe70096b154e8bc5b40916a64e99836d9a01c3110 README.ijg diff --git a/package/jpeg-turbo/jpeg-turbo.mk b/package/jpeg-turbo/jpeg-turbo.mk index 65debb2510..ddb22bc20b 100644 --- a/package/jpeg-turbo/jpeg-turbo.mk +++ b/package/jpeg-turbo/jpeg-turbo.mk @@ -4,7 +4,7 @@ # ################################################################################ -JPEG_TURBO_VERSION = 2.0.4 +JPEG_TURBO_VERSION = 2.0.5 JPEG_TURBO_SOURCE = libjpeg-turbo-$(JPEG_TURBO_VERSION).tar.gz JPEG_TURBO_SITE = https://downloads.sourceforge.net/project/libjpeg-turbo/$(JPEG_TURBO_VERSION) JPEG_TURBO_LICENSE = IJG (libjpeg), BSD-3-Clause (TurboJPEG), Zlib (SIMD)